ActionItem410: refactoring search controller

To unify interface _and_ add the possibility of having specific result pages for each type of content git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1881 3f533792-8f58-4932-b0fe-aaf55b0a4547

ActionItem410: refactoring search controller
To unify interface _and_ add the possibility of having specific result pages for each type of content git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1881 3f533792-8f58-4932-b0fe-aaf55b0a4547
AntonioTerceiro
1 parent 43a5b255
Showing 5 changed files with 52 additions and 21 deletions Show diff stats
app/controllers/public/search_controller.rb
app/models/category_finder.rb
app/models/environment_finder.rb
app/views/search/_display_results.rhtml
test/functional/search_controller_test.rb
@@ -69,6 +69,8 @@ class SearchController &lt; ApplicationController
   def index
     @query = params[:query] || ''
     @filtered_query = remove_stop_words(@query)
+
+    # FIXME name is not unique
     @region = Region.find_by_name(params[:region][:name]) if params[:region]
     @results = {}
@@ -81,6 +83,12 @@ class SearchController &lt; ApplicationController
       end
       @names[key] = gettext(description)
     end
+
+    if @results.keys.size == 1
+      specific_action = @results.keys.first
+      send(specific_action)
+      render :action => specific_action
+    end
   end
   #######################################################
@@ -90,12 +98,13 @@ class SearchController &lt; ApplicationController
     @results = {}
     @names = {}
     [
-      [ :recent_people, _('Recently registered people'), @finder.recent('people') ],
-      [ :recent_communities, _('Recently created communities'), @finder.recent('communities') ],
-      [ :recent_articles, _('Recent articles'), @finder.recent('articles') ],
+      [ :people, _('Recently registered people'), @finder.recent('people') ],
+      [ :communities, _('Recently created communities'), @finder.recent('communities') ],
+      [ :articles, _('Recent articles'), @finder.recent('articles') ],
       [ :comments, _('Recent comments'), @finder.recent('comments') ],
       [ :most_commented_articles, _('Most commented articles'), @finder.most_commented_articles ],
-      [ :recent_enterptises, _('Recently created enterprises'), @finder.recent('enterprises') ]
+      [ :enterprises, _('Recently created enterprises'), @finder.recent('enterprises') ],
+      [ :events, _('Recently added events'), @finder.recent('events') ]
     ].each do |key, name, list|
       @results[key] = list
       @names[key] = name
@@ -7,12 +7,16 @@ class CategoryFinder
   attr_reader :category_ids
-  def find(asset, query, options={})
-    find_in_categorized(asset.to_s.singularize.camelize.constantize, query, options)
+  def find(asset, query = nil, options={}, limit = nil)
+    if query.blank?
+      asset_class(asset).find(:all, options_for_find(asset_class(asset), {:limit => limit, :order => "created_at desc, #{asset_table(asset)}.id desc"}))
+    else
+      find_in_categorized(asset.to_s.singularize.camelize.constantize, query, options)
+    end
   end
-  def recent(asset, limit = 10)
-    asset_class(asset).find(:all, options_for_find(asset_class(asset), {:limit => limit, :order => "created_at desc, #{asset_table(asset)}.id desc"}))
+  def recent(asset, limit = nil)
+    find(asset, nil, {}, limit)
   end
   def find_by_initial(asset, initial)
@@ -4,22 +4,27 @@ class EnvironmentFinder
     @environment = env
   end
-  def find(asset, query, options={})
-   @region = Region.find_by_id(options.delete(:region)) if options.has_key?(:region)
+  def find(asset, query = nil, options={}, limit = nil)
+    @region = Region.find_by_id(options.delete(:region)) if options.has_key?(:region)
     if @region && options[:within]
       options[:origin] = [@region.lat, @region.lng]
     else
       options.delete(:within)
     end
-    @environment.send(asset).find_by_contents(query, {}, options)
-  end
-  def recent(asset, limit = 10)
-    with_options :limit => limit, :order => 'created_at desc, id desc' do |finder|
-      @environment.send(asset).recent(limit)
+    if query.blank?
+      with_options :limit => limit, :order => 'created_at desc, id desc' do |finder|
+        @environment.send(asset).recent(limit)
+      end
+    else
+      @environment.send(asset).find_by_contents(query, {}, options)
     end
   end
+  def recent(asset, limit = nil)
+    find(asset, nil, {}, limit)
+  end
+
   def find_by_initial(asset, initial)
     @environment.send(asset).find_by_initial(initial)
   end
@@ -12,7 +12,10 @@
   <% if !results.nil? and !results.empty? %>
     <div class="search-results-<%= name %> search-results-box <%= pos2 %> <%= 'col%s_of3' % pos3.to_s %>">
       <% if @controller.action_name != 'assets' %>
-        <h3><%= @names[name] %></h3>
+        <h3>
+          <%= @names[name] %>
+          <%= link_to _('(see more ...)'), params.merge(:action => 'index', :find_in => [ name ]) %>
+        </h3>
       <% end %>
       <% partial = partial_for_class results.first.class %>
       <div class="search-results-innerbox search-results-type-<%= partial %> <%= 'common-profile-list-block' if partial == 'profile' %>">
@@ -22,6 +25,7 @@
         <% end %>
         </ul>
       </div><!-- end class="search-results-innerbox" -->
+
     </div><!-- end class="search-results-<%= name %>" -->
   <% else %>
     <div class="search-results-<%= name %> search-results-empty search-results-box <%= pos2 %> <%= 'col%s_of3' % pos3.to_s %>">
@@ -362,7 +362,7 @@ class SearchControllerTest &lt; Test::Unit::TestCase
         :products => 'Products',
     }
     names.each do |thing, description|
-      assert_tag :tag => 'div', :attributes => { :class => /search-results-#{thing}/ }, :descendant => { :tag => 'h3', :content => description }
+      assert_tag :tag => 'div', :attributes => { :class => /search-results-#{thing}/ }, :descendant => { :tag => 'h3', :content => Regexp.new(description) }
       assert_tag :tag => 'a', :content => "display #{thing.to_s.singularize}"
     end
   end
@@ -447,7 +447,7 @@ class SearchControllerTest &lt; Test::Unit::TestCase
     CategoryFinder.expects(:new).with(@category).returns(finger)
     get :category_index, :category_path => [ 'my-category' ]
-    assert_same recent, assigns(:results)[:recent_articles]
+    assert_same recent, assigns(:results)[:articles]
   end
   should 'list recent comments in the category' do
@@ -479,7 +479,7 @@ class SearchControllerTest &lt; Test::Unit::TestCase
     CategoryFinder.expects(:new).with(@category).returns(finger)
     get :category_index, :category_path => [ 'my-category' ]
-    assert_same recent_people, assigns(:results)[:recent_people]
+    assert_same recent_people, assigns(:results)[:people]
   end
   should 'list recently registered communities in the category' do
@@ -490,7 +490,7 @@ class SearchControllerTest &lt; Test::Unit::TestCase
     CategoryFinder.expects(:new).with(@category).returns(finger)
     get :category_index, :category_path => [ 'my-category' ]
-    assert_same recent_communities, assigns(:results)[:recent_communities]
+    assert_same recent_communities, assigns(:results)[:communities]
   end
   should 'list recently registered enterprises in the category' do
@@ -501,7 +501,7 @@ class SearchControllerTest &lt; Test::Unit::TestCase
     CategoryFinder.expects(:new).with(@category).returns(finger)
     get :category_index, :category_path => [ 'my-category' ]
-    assert_same recent_enterptises, assigns(:results)[:recent_enterptises]
+    assert_same recent_enterptises, assigns(:results)[:enterprises]
   end
   should 'not list "Search for ..." in category_index' do
@@ -900,6 +900,15 @@ class SearchControllerTest &lt; Test::Unit::TestCase
     assert_not_includes assigns(:results)[:events], ev3
   end
+  %w[ people enterprises articles events communities products comments ].each do |asset|
+
+    should "render asset-specific template when searching for #{asset}" do
+      get :index, :find_in => [ asset ]
+      assert_template asset
+    end
+
+  end
+
   ##################################################################
   ##################################################################