Preparing search filter scheme

Rodrigo Souto
1 parent 1e4f68ac
Showing 8 changed files with 63 additions and 51 deletions Show diff stats
app/controllers/public/search_controller.rb
app/helpers/search_helper.rb
app/models/article.rb
app/models/organization.rb
app/models/person.rb
app/models/product.rb
app/models/profile.rb
test/unit/article_test.rb
@@ -8,6 +8,7 @@ class SearchController &lt; PublicController
   before_filter :load_category
   before_filter :load_search_assets
   before_filter :load_query
+  before_filter :load_filter
   # Backwards compatibility with old URLs
   def redirect_asset_param
@@ -145,8 +146,6 @@ class SearchController &lt; PublicController
     @order ||= [@asset]
     params[:display] ||= 'list'
     @searches ||= {}
-    @filter = filter
-    @filter_title = filter_description(@asset, @filter)
     @query = params[:query] || ''
     @empty_query = @category.nil? && @query.blank?
@@ -166,42 +165,13 @@ class SearchController &lt; PublicController
     end
   end
-  FILTERS = %w(
-    more_recent
-    more_active
-    more_popular
-    more_comments
-  )
-  def filter
-    if FILTERS.include?(params[:filter])
-      params[:filter]
-    else
-      'more_recent'
-    end
-  end
-
-  def filter_description(asset, filter)
-    {
-      'articles_more_recent' => _('More recent contents from network'),
-      'articles_more_popular' => _('More viewed contents from network'),
-      'articles_more_comments' => _('Most commented contents from network'),
-      'people_more_recent' => _('More recent people from network'),
-      'people_more_active' => _('More active people from network'),
-      'people_more_popular' => _('More popular people from network'),
-      'communities_more_recent' => _('More recent communities from network'),
-      'communities_more_active' => _('More active communities from network'),
-      'communities_more_popular' => _('More popular communities from network'),
-      'products_more_recent' => _('Highlights'),
-    }[asset.to_s + '_' + filter]
-  end
-
   def load_search_assets
-    if Searches.keys.include?(params[:action].to_sym) and environment.enabled?("disable_asset_#{params[:action]}")
+    if SEARCHES.keys.include?(params[:action].to_sym) && environment.enabled?("disable_asset_#{params[:action]}")
       render_not_found
       return
     end
-    @enabled_searches = Searches.select {|key, name| environment.disabled?("disable_asset_#{params[:action]}") }
+    @enabled_searches = SEARCHES.select {|key, name| environment.disabled?("disable_asset_#{params[:action]}") }
     @searching = {}
     @titles = {}
     @enabled_searches.each do |key, name|
@@ -211,6 +181,14 @@ class SearchController &lt; PublicController
     @names = @titles if @names.nil?
   end
+  def load_filter
+    @filter = 'more_recent'
+    if SEARCHES.keys.include?(@asset.to_sym)
+      available_filters = asset_class(@asset)::SEARCH_FILTERS
+      @filter = params[:filter] if available_filters.include?(params[:filter])
+    end
+  end
+
   def limit
     if map_search?
       MAP_SEARCH_LIMIT
@@ -226,7 +204,7 @@ class SearchController &lt; PublicController
   end
   def paginate_options(page = params[:page])
-    page = 1 if multiple_search? or @display == 'map'
+    page = 1 if multiple_search? || params[:display] == 'map'
     { :per_page => limit, :page => page }
   end
@@ -5,7 +5,7 @@ module SearchHelper
   BLOCKS_SEARCH_LIMIT = 24
   MULTIPLE_SEARCH_LIMIT = 8
-  Searches = ActiveSupport::OrderedHash[
+  SEARCHES = ActiveSupport::OrderedHash[
     :articles, _('Contents'),
     :enterprises, _('Enterprises'),
     :people, _('People'),
@@ -22,7 +22,7 @@ module SearchHelper
   end
   def map_search?
-    !multiple_search? and params[:display] == 'map'
+    !multiple_search? && params[:display] == 'map'
   end
   def asset_class(asset)
@@ -86,4 +86,22 @@ module SearchHelper
     end
   end
+  def filter_title(asset, filter)
+    {
+      'articles_more_recent' => _('More recent contents from network'),
+      'articles_more_popular' => _('More viewed contents from network'),
+      'articles_more_comments' => _('Most commented contents from network'),
+      'people_more_recent' => _('More recent people from network'),
+      'people_more_active' => _('More active people from network'),
+      'people_more_popular' => _('More popular people from network'),
+      'communities_more_recent' => _('More recent communities from network'),
+      'communities_more_active' => _('More active communities from network'),
+      'communities_more_popular' => _('More popular communities from network'),
+      'enterprises_more_recent' => _('More recent enterprises from network'),
+      'enterprises_more_active' => _('More active enterprises from network'),
+      'enterprises_more_popular' => _('More popular enterprises from network'),
+      'products_more_recent' => _('Highlights'),
+    }[asset.to_s + '_' + filter].to_s
+  end
+
 end
@@ -10,6 +10,12 @@ class Article &lt; ActiveRecord::Base
     :filename => 1,
   }
+  SEARCH_FILTERS = %w[
+    more_recent
+    more_popular
+    more_comments
+  ]
+
   track_actions :create_article, :after_create, :keep_params => [:name, :url, :lead, :first_image], :if => Proc.new { |a| a.is_trackable? && !a.image? }
   # xss_terminate plugin can't sanitize array fields
@@ -198,20 +204,12 @@ class Article &lt; ActiveRecord::Base
   named_scope :public,
     :conditions => [ "advertise = ? AND published = ? AND profiles.visible = ? AND profiles.public_profile = ?", true, true, true, true ]
-  named_scope :more_recent,
-    :conditions => [ "advertise = ? AND published = ? AND profiles.visible = ? AND profiles.public_profile = ? AND
-      ((articles.type != ?) OR articles.type is NULL)",
-      true, true, true, true, 'RssFeed'
-    ],
-    :order => 'articles.published_at desc, articles.id desc'
-
   # retrives the most commented articles, sorted by the comment count (largest
   # first)
   def self.most_commented(limit)
     paginate(:order => 'comments_count DESC', :page => 1, :per_page => limit)
   end
-  named_scope :more_popular, :order => 'hits DESC'
   named_scope :relevant_as_recent, :conditions => ["(articles.type != 'UploadedFile' and articles.type != 'RssFeed' and articles.type != 'Blog') OR articles.type is NULL"]
   def self.recent(limit = nil, extra_conditions = {}, pagination = true)
@@ -418,8 +416,8 @@ class Article &lt; ActiveRecord::Base
   named_scope :images, :conditions => { :is_image => true }
   named_scope :text_articles, :conditions => [ 'articles.type IN (?)', text_article_types ]
+  named_scope :more_popular, :order => 'hits DESC'
   named_scope :more_comments, :order => "comments_count DESC"
-  named_scope :more_views, :order => "hits DESC"
   named_scope :more_recent, :order => "created_at DESC"
   def self.display_filter(user, profile)
@@ -608,7 +606,7 @@ class Article &lt; ActiveRecord::Base
   end
-  def more_views_label
+  def more_popular_label
     amount = self.hits
     {
       0 => _('no views'),
 # Represents any organization of the system
 class Organization < Profile
+  SEARCH_FILTERS += %w[
+    more_popular
+    more_active
+  ]
+
   settings_items :closed, :type => :boolean, :default => false
   def closed?
     closed
 # A person is the profile of an user holding all relationships with the rest of the system
 class Person < Profile
+  SEARCH_FILTERS += %w[
+    more_popular
+    more_active
+  ]
+
   def self.type_name
     _('Person')
   end
@@ -5,6 +5,10 @@ class Product &lt; ActiveRecord::Base
     :description => 1,
   }
+  SEARCH_FILTERS = %w[
+    more_recent
+  ]
+
   belongs_to :enterprise
   has_one :region, :through => :enterprise
   validates_presence_of :enterprise
@@ -9,6 +9,10 @@ class Profile &lt; ActiveRecord::Base
     :nickname => 2,
   }
+  SEARCH_FILTERS = %w[
+    more_recent
+  ]
+
   module Roles
     def self.admin(env_id)
       find_role('admin', env_id)
@@ -1480,8 +1480,8 @@ class ArticleTest &lt; ActiveSupport::TestCase
     assert_respond_to Article, :more_comments
   end
-  should 'respond to more views' do
-    assert_respond_to Article, :more_views
+  should 'respond to more popular' do
+    assert_respond_to Article, :more_popular
   end
   should "return the more recent label" do
@@ -1510,19 +1510,19 @@ class ArticleTest &lt; ActiveSupport::TestCase
   should "return no views if profile has 0 views" do
     a = Article.new
     assert_equal 0, a.hits
-    assert_equal "no views", a.more_views_label
+    assert_equal "no views", a.more_popular_label
   end
   should "return 1 view on label if the content has 1 view" do
     a = Article.new(:hits => 1)
     assert_equal 1, a.hits
-    assert_equal "one view", a.more_views_label
+    assert_equal "one view", a.more_popular_label
   end
   should "return number of views on label if the content has more than one view" do
     a = Article.new(:hits => 4)
     assert_equal 4, a.hits
-    assert_equal "4 views", a.more_views_label
+    assert_equal "4 views", a.more_popular_label
   end
   should 'return only text articles' do
	@@ -5,7 +5,7 @@ module SearchHelper		@@ -5,7 +5,7 @@ module SearchHelper
5	BLOCKS_SEARCH_LIMIT = 24	5	BLOCKS_SEARCH_LIMIT = 24
6	MULTIPLE_SEARCH_LIMIT = 8	6	MULTIPLE_SEARCH_LIMIT = 8
7		7
8	- Searches = ActiveSupport::OrderedHash[	8	+ SEARCHES = ActiveSupport::OrderedHash[
9	:articles, _('Contents'),	9	:articles, _('Contents'),
10	:enterprises, _('Enterprises'),	10	:enterprises, _('Enterprises'),
11	:people, _('People'),	11	:people, _('People'),
	@@ -22,7 +22,7 @@ module SearchHelper		@@ -22,7 +22,7 @@ module SearchHelper
22	end	22	end
23		23
24	def map_search?	24	def map_search?
25	- !multiple_search? and params[:display] == 'map'	25	+ !multiple_search? && params[:display] == 'map'
26	end	26	end
27		27
28	def asset_class(asset)	28	def asset_class(asset)
	@@ -86,4 +86,22 @@ module SearchHelper		@@ -86,4 +86,22 @@ module SearchHelper
86	end	86	end
87	end	87	end
88		88
		89	+ def filter_title(asset, filter)
		90	+ {
		91	+ 'articles_more_recent' => _('More recent contents from network'),
		92	+ 'articles_more_popular' => _('More viewed contents from network'),
		93	+ 'articles_more_comments' => _('Most commented contents from network'),
		94	+ 'people_more_recent' => _('More recent people from network'),
		95	+ 'people_more_active' => _('More active people from network'),
		96	+ 'people_more_popular' => _('More popular people from network'),
		97	+ 'communities_more_recent' => _('More recent communities from network'),
		98	+ 'communities_more_active' => _('More active communities from network'),
		99	+ 'communities_more_popular' => _('More popular communities from network'),
		100	+ 'enterprises_more_recent' => _('More recent enterprises from network'),
		101	+ 'enterprises_more_active' => _('More active enterprises from network'),
		102	+ 'enterprises_more_popular' => _('More popular enterprises from network'),
		103	+ 'products_more_recent' => _('Highlights'),
		104	+ }[asset.to_s + '_' + filter].to_s
		105	+ end
		106	+
89	end	107	end