From de7aba86b443e86345347d89c135f1a2233be17c Mon Sep 17 00:00:00 2001
From: Joenio Costa <joenio@colivre.coop.br>
Date: Mon, 25 May 2015 15:56:09 -0300
Subject: [PATCH] small fixes on chat

---
 app/models/chat_message.rb                        |  2 ++
 db/migrate/20141014205254_create_chat_messages.rb | 10 +++++-----
 db/schema.rb                                      |  4 ++--
 debian/noosfero.install                           |  1 -
 debian/update-noosfero-apache                     |  8 ++------
 etc/noosfero/apache.d/noosfero-chat               |  2 --
 test/functional/chat_controller_test.rb           |  6 +++---
 7 files changed, 14 insertions(+), 19 deletions(-)
 delete mode 100644 etc/noosfero/apache.d/noosfero-chat

diff --git a/app/models/chat_message.rb b/app/models/chat_message.rb
index af8caf8..6a90d39 100644
--- a/app/models/chat_message.rb
+++ b/app/models/chat_message.rb
@@ -3,4 +3,6 @@ class ChatMessage < ActiveRecord::Base
 
   belongs_to :to, :class_name => 'Profile'
   belongs_to :from, :class_name => 'Profile'
+
+  validates_presence_of :from, :to
 end
diff --git a/db/migrate/20141014205254_create_chat_messages.rb b/db/migrate/20141014205254_create_chat_messages.rb
index ff65b56..66ace71 100644
--- a/db/migrate/20141014205254_create_chat_messages.rb
+++ b/db/migrate/20141014205254_create_chat_messages.rb
@@ -1,8 +1,8 @@
 class CreateChatMessages < ActiveRecord::Migration
   def up
     create_table :chat_messages do |t|
-      t.references :from
-      t.references :to
+      t.references :from, :null => false
+      t.references :to, :null => false
       t.text   :body
       t.timestamps
     end
@@ -12,9 +12,9 @@ class CreateChatMessages < ActiveRecord::Migration
   end
 
   def down
-    drop_table :chat_messages
-    remove_index :chat_messages, :from
-    remove_index :chat_messages, :to
+    remove_index :chat_messages, :from_id
+    remove_index :chat_messages, :to_id
     remove_index :chat_messages, :created_at
+    drop_table :chat_messages
   end
 end
diff --git a/db/schema.rb b/db/schema.rb
index 6430958..917363d 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -245,8 +245,8 @@ ActiveRecord::Schema.define(:version => 20150513213939) do
   end
 
   create_table "chat_messages", :force => true do |t|
-    t.integer  "from_id"
-    t.integer  "to_id"
+    t.integer  "from_id",    :null => false
+    t.integer  "to_id",      :null => false
     t.text     "body"
     t.datetime "created_at", :null => false
     t.datetime "updated_at", :null => false
diff --git a/debian/noosfero.install b/debian/noosfero.install
index 3f9419a..0eef3ee 100644
--- a/debian/noosfero.install
+++ b/debian/noosfero.install
@@ -34,4 +34,3 @@ public                            usr/share/noosfero
 script                            usr/share/noosfero
 util                              usr/share/noosfero
 vendor                            usr/share/noosfero
-
diff --git a/debian/update-noosfero-apache b/debian/update-noosfero-apache
index 06fcfa9..359cd26 100755
--- a/debian/update-noosfero-apache
+++ b/debian/update-noosfero-apache
@@ -18,18 +18,14 @@ if test -x /usr/share/noosfero/script/apacheconf; then
   fi
 
   apache_site='/etc/apache2/sites-available/noosfero'
-  apache_site_configs='/etc/noosfero/apache.d'
   if ! test -e "$apache_site"; then
     echo "Generating apache virtual host ..."
     cd /usr/share/noosfero && su noosfero -c "RAILS_ENV=production ./script/apacheconf virtualhosts" > "$apache_site"
-    if ! test -d "$apache_site_configs"; then
-      echo "Creating noosfero site config folder ..."
-      mkdir $apache_site_configs
-    fi
   else
     pattern="Include \/etc\/noosfero\/apache\/virtualhost.conf"
-    include="Include \/etc\/noosfero\/apache.d\/*"
+    include="Include \/usr\/share\/noosfero\/util\/chat\/apache\/xmpp.conf"
     if ! cat $apache_site | grep "^ *$include" > /dev/null ; then
+      echo "Updating apache virtual host ..."
       sed -i "s/.*$pattern.*/  $include\n&/" $apache_site
     fi
   fi
diff --git a/etc/noosfero/apache.d/noosfero-chat b/etc/noosfero/apache.d/noosfero-chat
deleted file mode 100644
index 7b4875a..0000000
--- a/etc/noosfero/apache.d/noosfero-chat
+++ /dev/null
@@ -1,2 +0,0 @@
-RewriteEngine On
-Include /usr/share/noosfero/util/chat/apache/xmpp.conf
diff --git a/test/functional/chat_controller_test.rb b/test/functional/chat_controller_test.rb
index 7d85d89..44d3720 100644
--- a/test/functional/chat_controller_test.rb
+++ b/test/functional/chat_controller_test.rb
@@ -100,7 +100,7 @@ class ChatControllerTest < ActionController::TestCase
     @request.stubs(:xhr?).returns(true)
 
     post :save_message, {:body =>'Hello!'}
-    assert ActiveSupport::JSON.decode(@response.body)['status'] == 1
+    assert_equal 3, ActiveSupport::JSON.decode(@response.body)['status']
   end
 
   should 'forbid to register a message without body' do
@@ -108,7 +108,7 @@ class ChatControllerTest < ActionController::TestCase
     @request.stubs(:xhr?).returns(true)
 
     post :save_message, {:to =>'mary'}
-    assert ActiveSupport::JSON.decode(@response.body)['status'] == 1
+    assert_equal 3, ActiveSupport::JSON.decode(@response.body)['status']
   end
 
   should 'forbid user to register a message to a stranger' do
@@ -116,7 +116,7 @@ class ChatControllerTest < ActionController::TestCase
     @request.stubs(:xhr?).returns(true)
 
     post :save_message, {:to =>'random', :body => 'Hello, stranger!'}
-    assert ActiveSupport::JSON.decode(@response.body)['status'] == 2
+    assert_equal 3, ActiveSupport::JSON.decode(@response.body)['status']
   end
 
   should 'register a message to a friend' do
--
libgit2 0.21.2