ActionItem405: reverting commit in the wrong item

Revert "ActionItem410: removed comments from search" This reverts commit 065dc05fbe43bcc5d53b3f0c9edf0691c979fdca. git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1898 3f533792-8f58-4932-b0fe-aaf55b0a4547

ActionItem405: reverting commit in the wrong item
Revert "ActionItem410: removed comments from search" This reverts commit 065dc05fbe43bcc5d53b3f0c9edf0691c979fdca. git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1898 3f533792-8f58-4932-b0fe-aaf55b0a4547
AntonioTerceiro
1 parent 065dc05f
Showing 6 changed files with 21 additions and 57 deletions Show diff stats
app/controllers/public/search_controller.rb
app/helpers/assets_helper.rb
app/models/article.rb
app/models/comment.rb
test/unit/article_test.rb
test/unit/comment_test.rb
@@ -90,6 +90,7 @@ class SearchController &lt; ApplicationController
   SEARCH_IN = [
     [ :articles, N_('Articles') ],
+    [ :comments, N_('Comments') ],
     [ :enterprises, N_('Enterprises') ],
     [ :people, N_('People') ],
     [ :communities, N_('Communities') ],
@@ -9,6 +9,7 @@ module AssetsHelper
       [ options.merge(:asset => 'products'), "icon-menu-product",    _('Products') ],
       [ options.merge(:asset => 'enterprises'), "icon-menu-enterprise", _('Enterprises') ],
       [ options.merge(:asset => 'communities'), "icon-menu-community",  _('Communities') ],
+      [ options.merge(:asset => 'comments'), "icon-menu-comments",   _('Comments') ],
       [ options.merge(:asset => 'events'), "icon-menu-events",   _('Events') ],
     ].map do |target,css_class,name|
@@ -21,11 +21,7 @@ class Article &lt; ActiveRecord::Base
   acts_as_versioned
-  acts_as_searchable :additional_fields => [ :comment_data ]
-
-  def comment_data
-    comments.map {|item| [item.title, item.body].join(' ') }.join(' ')
-  end
+  acts_as_searchable
   before_update do |article|
     article.advertise = true
@@ -124,10 +120,6 @@ class Article &lt; ActiveRecord::Base
     end
   end
-  def comments_updated
-    ferret_update
-  end
-
   private
   def sanitize_tag_list
 class Comment < ActiveRecord::Base
+  acts_as_searchable :fields => [:title, :body]  
+  
   validates_presence_of :title, :body
   belongs_to :article, :counter_cache => true
   belongs_to :author, :class_name => 'Person', :foreign_key => 'author_id'
@@ -43,10 +45,4 @@ class Comment &lt; ActiveRecord::Base
     self.find(:all, :order => 'comments.title', :conditions => ['comments.title like (?) or comments.title like (?)', initial + '%', initial.upcase + '%'])
   end
-  after_save :notify_article
-  after_destroy :notify_article
-  def notify_article
-    article.comments_updated
-  end
-
 end
@@ -286,26 +286,5 @@ class ArticleTest &lt; Test::Unit::TestCase
     assert_equal true, a1.display_to?(member)
   end
-  should 'reindex when comments are changed' do
-    a = Article.new
-    a.expects(:ferret_update)
-    a.comments_updated
-  end
-
-  should 'index comments title together with article' do
-    owner = create_user('testuser').person
-    art = owner.articles.build(:name => 'ytest'); art.save!
-    c1 = art.comments.build(:title => 'a nice comment', :body => 'anything', :author => owner); c1.save!
-
-    assert_includes Article.find_by_contents('nice'), art
-  end
-
-  should 'index comments body together with article' do
-    owner = create_user('testuser').person
-    art = owner.articles.build(:name => 'ytest'); art.save!
-    c1 = art.comments.build(:title => 'test comment', :body => 'anything', :author => owner); c1.save!
-
-    assert_includes Article.find_by_contents('anything'), art
-  end
 end
@@ -93,6 +93,22 @@ class CommentTest &lt; Test::Unit::TestCase
     assert_equal 'comment-4321', comment.anchor
   end
+  should 'be searched by contents of title' do 
+    owner = create_user('testuser').person
+    art = owner.articles.build(:name => 'ytest'); art.save!
+    c1 = art.comments.build(:title => 'a nice comment', :body => 'anything', :author => owner); c1.save!
+
+    assert_includes Comment.find_by_contents('nice'), c1
+  end
+
+  should 'be searched by contents of body' do 
+    owner = create_user('testuser').person
+    art = owner.articles.build(:name => 'ytest'); art.save!
+    c1 = art.comments.build(:title => 'test comment', :body => 'anything', :author => owner); c1.save!
+
+    assert_includes Comment.find_by_contents('anything'), c1
+  end
+
   should 'be able to find recent comments' do
     Comment.delete_all
@@ -139,25 +155,4 @@ class CommentTest &lt; Test::Unit::TestCase
     assert_not_includes list, c2
   end
-  should 'notify article to reindex after saving' do
-    owner = create_user('testuser').person
-    article = owner.articles.create!(:name => 'test', :body => '...')
-
-    article.expects(:comments_updated)
-
-    c1 = article.comments.new(:title => "A comment", :body => '...', :author => owner)
-    c1.stubs(:article).returns(article)
-    c1.save!
-  end
-
-  should 'notify article to reindex after being removed' do
-    owner = create_user('testuser').person
-    article = owner.articles.create!(:name => 'test', :body => '...')
-    c1 = article.comments.create!(:title => "A comment", :body => '...', :author => owner)
-
-    c1.stubs(:article).returns(article)
-    article.expects(:comments_updated)
-    c1.destroy
-  end
-
 end
	@@ -90,6 +90,7 @@ class SearchController < ApplicationController		@@ -90,6 +90,7 @@ class SearchController < ApplicationController
90		90
91	SEARCH_IN = [	91	SEARCH_IN = [
92	[ :articles, N_('Articles') ],	92	[ :articles, N_('Articles') ],
		93	+ [ :comments, N_('Comments') ],
93	[ :enterprises, N_('Enterprises') ],	94	[ :enterprises, N_('Enterprises') ],
94	[ :people, N_('People') ],	95	[ :people, N_('People') ],
95	[ :communities, N_('Communities') ],	96	[ :communities, N_('Communities') ],
	@@ -9,6 +9,7 @@ module AssetsHelper		@@ -9,6 +9,7 @@ module AssetsHelper
9	[ options.merge(:asset => 'products'), "icon-menu-product", _('Products') ],	9	[ options.merge(:asset => 'products'), "icon-menu-product", _('Products') ],
10	[ options.merge(:asset => 'enterprises'), "icon-menu-enterprise", _('Enterprises') ],	10	[ options.merge(:asset => 'enterprises'), "icon-menu-enterprise", _('Enterprises') ],
11	[ options.merge(:asset => 'communities'), "icon-menu-community", _('Communities') ],	11	[ options.merge(:asset => 'communities'), "icon-menu-community", _('Communities') ],
		12	+ [ options.merge(:asset => 'comments'), "icon-menu-comments", _('Comments') ],
12	[ options.merge(:asset => 'events'), "icon-menu-events", _('Events') ],	13	[ options.merge(:asset => 'events'), "icon-menu-events", _('Events') ],
13		14
14	].map do \|target,css_class,name\|	15	].map do \|target,css_class,name\|
	@@ -286,26 +286,5 @@ class ArticleTest < Test::Unit::TestCase		@@ -286,26 +286,5 @@ class ArticleTest < Test::Unit::TestCase
286	assert_equal true, a1.display_to?(member)	286	assert_equal true, a1.display_to?(member)
287	end	287	end
288		288
289	- should 'reindex when comments are changed' do
290	- a = Article.new
291	- a.expects(:ferret_update)
292	- a.comments_updated
293	- end
294	-
295	- should 'index comments title together with article' do
296	- owner = create_user('testuser').person
297	- art = owner.articles.build(:name => 'ytest'); art.save!
298	- c1 = art.comments.build(:title => 'a nice comment', :body => 'anything', :author => owner); c1.save!
299	-
300	- assert_includes Article.find_by_contents('nice'), art
301	- end
302	-
303	- should 'index comments body together with article' do
304	- owner = create_user('testuser').person
305	- art = owner.articles.build(:name => 'ytest'); art.save!
306	- c1 = art.comments.build(:title => 'test comment', :body => 'anything', :author => owner); c1.save!
307	-
308	- assert_includes Article.find_by_contents('anything'), art
309	- end
310		289
311	end	290	end