Removed environment_finder and search popup

Braulio Bhavamitra
1 parent 9395097d
Showing 3 changed files with 57 additions and 206 deletions Show diff stats
app/controllers/public/search_controller.rb
app/models/environment_finder.rb
app/views/search/popup.rhtml
@@ -8,7 +8,6 @@ class SearchController &lt; PublicController
   include SearchHelper
   before_filter :load_category
-  before_filter :check_search_whole_site
   before_filter :load_search_assets
   no_design_blocks
@@ -159,7 +158,7 @@ class SearchController &lt; PublicController
     @order = []
     @names = {}
-    where_to_search.select { |key,description| @searching[key]  }.each do |key, description|
+    @enabled_searchs.select { |key,description| @searching[key] }.each do |key, description|
       send(key)
       @order << key
       @names[key] = getterm(description)
@@ -182,7 +181,6 @@ class SearchController &lt; PublicController
   # view the summary of one category
   def category_index
-    @searching
     @results = {}
     @order = []
     @names = {}
@@ -203,13 +201,37 @@ class SearchController &lt; PublicController
     @facets = {}
   end
+  def tags
+    @tags_cache_key = "tags_env_#{environment.id.to_s}"
+    if is_cache_expired?(@tags_cache_key, true)
+      @tags = environment.tag_counts
+    end
+  end
+
+  def tag
+    @tag = params[:tag]
+    @tag_cache_key = "tag_#{CGI.escape(@tag.to_s)}_env_#{environment.id.to_s}_page_#{params[:npage]}"
+    if is_cache_expired?(@tag_cache_key, true)
+      @tagged = environment.articles.find_tagged_with(@tag).paginate(:per_page => 10, :page => params[:npage])
+    end
+  end
+
+  def events_by_day
+    @selected_day = build_date(params[:year], params[:month], params[:day])
+    if params[:category_id] and Category.exists?(params[:category_id])
+      @events_of_the_day = environment.events.by_day(@selected_day).in_category(Category.find(params[:category_id]))
+    else
+      @events_of_the_day = environment.events.by_day(@selected_day)
+    end
+    render :partial => 'events/events_by_day'
+  end
+
+  #######################################################
   protected
   def recent(asset, limit = nil)
     options = {:page => 1, :per_page => limit, :order => 'created_at DESC, id DESC'}
-    @region = Region.find_by_id(options.delete(:region)) if options.has_key?(:region)
-
     if asset == :events
       finder_method = 'find'
       options.delete(:page)
@@ -233,66 +255,6 @@ class SearchController &lt; PublicController
     Event.find(:all, {:include => :categories, :conditions => [ 'categories.id = ? and start_date >= ?', category_id, Date.today ], :order => 'start_date' }.merge(options))
   end
-
-  attr_reader :category
-  attr_reader :category_id
-
-  def load_category
-    unless params[:category_path].blank?
-      path = params[:category_path].join('/')
-      @category = environment.categories.find_by_path(path)
-      if @category.nil?
-        render_not_found(path)
-      end
-      @category_id = @category.id
-    end
-  end
-
-  def where_to_search
-    [
-      [ :articles, N_('Articles') ],
-      [ :enterprises, N_('Enterprises') ],
-      [ :people, N_('People') ],
-      [ :communities, N_('Communities') ],
-      [ :products, N_('Products') ],
-      [ :events, N_('Events') ]
-    ].select {|key, name| !environment.enabled?('disable_asset_' + key.to_s) }
-  end
-
-  #######################################################
-
-  def tags
-    @tags_cache_key = "tags_env_#{environment.id.to_s}"
-    if is_cache_expired?(@tags_cache_key, true)
-      @tags = environment.tag_counts
-    end
-  end
-
-  def tag
-    @tag = params[:tag]
-    @tag_cache_key = "tag_#{CGI.escape(@tag.to_s)}_env_#{environment.id.to_s}_page_#{params[:npage]}"
-    if is_cache_expired?(@tag_cache_key, true)
-      @tagged = environment.articles.find_tagged_with(@tag).paginate(:per_page => 10, :page => params[:npage])
-    end
-  end
-
-  #######################################################
-
-  def popup
-    @regions = Region.find(:all).select{|r|r.lat && r.lng}
-    render :action => 'popup', :layout => false
-  end
-
-  def events_by_day
-    @selected_day = build_date(params[:year], params[:month], params[:day])
-    if params[:category_id] and Category.exists?(params[:category_id])
-      @events_of_the_day = environment.events.by_day(@selected_day).in_category(Category.find(params[:category_id]))
-    else
-      @events_of_the_day = environment.events.by_day(@selected_day)
-    end
-    render :partial => 'events/events_by_day'
-  end
-
   def current_events(year, month, options={})
     options.delete(:page)
     options.delete(:per_page)
@@ -302,6 +264,11 @@ class SearchController &lt; PublicController
     Event.find(:all, {:include => :categories, :conditions => { 'categories.id' => category_id, :start_date => range }}.merge(options))
   end
+  FILTERS = %w(
+    more_recent
+    more_active
+    more_popular
+  )
   def filter
     if FILTERS.include?(params[:filter])
       params[:filter]
@@ -323,26 +290,36 @@ class SearchController &lt; PublicController
     }[str] || str
   end
-  def load_search_assets
-    @search_in = where_to_search
-    @searching = {}
-    @search_in.each do |key, name|
-      @searching[key] = (params[:asset].blank? && (params[:find_in].nil? || params[:find_in].empty? || params[:find_in].include?(key.to_s))) || (params[:asset] == key.to_s)
+  attr_reader :category
+  attr_reader :category_id
+
+  def load_category
+    unless params[:category_path].blank?
+      path = params[:category_path].join('/')
+      @category = environment.categories.find_by_path(path)
+      if @category.nil?
+        render_not_found(path)
+      end
+      @category_id = @category.id
     end
   end
-  def check_search_whole_site
-    if params[:search_whole_site_yes] or params[:search_whole_site] == 'yes'
-      redirect_to params.merge(:category_path => [], :search_whole_site => nil, :search_whole_site_yes => nil)
+  def load_search_assets
+    @enabled_searchs = [
+      [ :articles, N_('Articles') ],
+      [ :enterprises, N_('Enterprises') ],
+      [ :people, N_('People') ],
+      [ :communities, N_('Communities') ],
+      [ :products, N_('Products') ],
+      [ :events, N_('Events') ]
+    ].select {|key, name| !environment.enabled?('disable_asset_' + key.to_s) }
+
+    @searching = {}
+    @enabled_searchs.each do |key, name|
+      @searching[key] = params[:action] == 'index' || params[:action] == key.to_s
     end
   end
-  FILTERS = %w(
-    more_recent
-    more_active
-    more_popular
-  )
-
   def paginate_options(asset, limit, page)
     result = { :per_page => limit, :page => page }
   end
@@ -367,7 +344,7 @@ class SearchController &lt; PublicController
     if params[:display] == 'map'
       MAP_SEARCH_LIMIT
     else
-      (searching.size == 1) ? SINGLE_SEARCH_LIMIT : MULTIPLE_SEARCH_LIMIT
+      (searching.size <= 1) ? SINGLE_SEARCH_LIMIT : MULTIPLE_SEARCH_LIMIT
     end
   end
@@ -1,117 +0,0 @@
-class EnvironmentFinder
-  
-  def initialize env
-    @environment = env
-  end
-
-  def find(asset, query = nil, options={}, finder_method = 'paginate')
-    @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
-
-    product_category = options.delete(:product_category)
-
-    date_range = options.delete(:date_range)
-
-    # FIXME this test is in more than one place
-    if finder_method == 'paginate'
-      options = {:page => 1, :per_page => options.delete(:limit)}.merge(options)
-    end
-
-    if query.blank?
-      options.delete(:facets)
-      options.delete(:order_by)
-
-      # FIXME this test is in more than one place
-      if finder_method == 'paginate'
-        options = {:order => "#{asset_table(asset)}.name"}.merge(options)
-      end
-      if product_category && asset == :products
-        @environment.send(asset).send(finder_method, :all, options.merge(:include => 'product_categorizations', :conditions => ['product_categorizations.category_id = (?)', product_category.id]))
-      elsif product_category && asset == :enterprises
-        @environment.send(asset).send(finder_method, :all, options.merge( :order => 'profiles.name', :joins => 'inner join products on (products.enterprise_id = profiles.id) inner join product_categorizations on (product_categorizations.product_id = products.id)', :conditions => ['product_categorizations.category_id = (?)', product_category.id]))
-      else
-        if asset == :events
-          # Ignore pagination for asset events
-          options.delete(:per_page)
-          options.delete(:page)
-          if date_range
-            @environment.send(asset).send('find', :all, options.merge(:conditions => [
-              'start_date BETWEEN :start_day AND :end_day OR end_date BETWEEN :start_day AND :end_day',
-                 {:start_day => date_range.first, :end_day => date_range.last}
-            ]))
-          else
-            @environment.send(asset).send('find', :all, options)
-          end
-        else
-          @environment.send(asset).send(finder_method, :all, options)
-        end
-      end
-    else
-      pg_options = {:page => options.delete(:page), :per_page => options.delete(:per_page)}
-      solr_options = {:facets => options.delete(:facets), :order => options.delete(:order_by)}
-
-      if product_category && asset == :products
-        # SECURITY no risk of SQL injection, since product_category_ids comes from trusted source
-        ret = @environment.send(asset).find_by_contents(query, pg_options, solr_options, options.merge({:include => 'product_categorizations', :conditions => 'product_categorizations.category_id = (%s)' % product_category.id }))
-      elsif product_category && asset == :enterprises
-        ret = @environment.send(asset).find_by_contents(query, pg_options, solr_options, options.merge(:joins => 'inner join product_categorizations on (product_categorizations.product_id = products.id)', :include => 'products', :conditions => "product_categorizations.category_id = (#{product_category.id})"))
-      else
-        ret = @environment.send(asset).find_by_contents(query, pg_options, solr_options, options)
-      end
-      if solr_options[:facets].nil?
-        ret[:results]
-      else
-        ret
-      end
-    end
-  end
-
-  def recent(asset, limit = nil)
-    find(asset, nil, :limit => limit)
-  end
-
-  def product_categories_count(asset, product_categories_ids, objects_ids=nil)
-    conditions = ['product_categorizations.category_id in (?)', product_categories_ids]
-
-    if asset == :products
-      if objects_ids
-        conditions[0] += ' and product_categorizations.product_id in (?)'
-        conditions << objects_ids
-      end
-      ProductCategory.find(:all, :select => 'categories.id, count(*) as total', :joins => 'inner join product_categorizations on (product_categorizations.category_id = categories.id)', :group => 'categories.id', :conditions => conditions )
-    elsif asset == :enterprises
-      if objects_ids
-        conditions[0] += ' and products.enterprise_id in (?)'
-        conditions << objects_ids
-      end
-      ProductCategory.find(
-        :all,
-        :select => 'categories.id, count(distinct products.enterprise_id) as total',
-        :joins => 'inner join product_categorizations on (product_categorizations.category_id = categories.id) inner join products on (products.id = product_categorizations.product_id)',
-        :group => 'categories.id', 
-        :conditions => conditions 
-      )
-    else
-      raise ArgumentError, 'only products and enterprises supported'
-    end.inject({}) do |results,pc| 
-        results[pc.id]= pc.total.to_i
-        results
-    end
-
-  end
-
-  protected
-
-  def asset_class(asset)
-    asset.to_s.singularize.camelize.constantize
-  end
-  
-  def asset_table(asset)
-    asset_class(asset).table_name
-  end
-
-end
@@ -1,9 +0,0 @@
-<div id="search-popup">
-
-<%= render :partial => 'search_form', :locals => { :form_title => _('Search %s') % @environment.name } %>
-
-<script type='text/javascript'>
-  $('query').focus();
-</script>
-
-</div><!-- fim id="search-popup" -->
	@@ -1,117 +0,0 @@	@@ -1,117 +0,0 @@
1	-class EnvironmentFinder
2	-
3	- def initialize env
4	- @environment = env
5	- end
6	-
7	- def find(asset, query = nil, options={}, finder_method = 'paginate')
8	- @region = Region.find_by_id(options.delete(:region)) if options.has_key?(:region)
9	- if @region && options[:within]
10	- options[:origin] = [@region.lat, @region.lng]
11	- else
12	- options.delete(:within)
13	- end
14	-
15	- product_category = options.delete(:product_category)
16	-
17	- date_range = options.delete(:date_range)
18	-
19	- # FIXME this test is in more than one place
20	- if finder_method == 'paginate'
21	- options = {:page => 1, :per_page => options.delete(:limit)}.merge(options)
22	- end
23	-
24	- if query.blank?
25	- options.delete(:facets)
26	- options.delete(:order_by)
27	-
28	- # FIXME this test is in more than one place
29	- if finder_method == 'paginate'
30	- options = {:order => "#{asset_table(asset)}.name"}.merge(options)
31	- end
32	- if product_category && asset == :products
33	- @environment.send(asset).send(finder_method, :all, options.merge(:include => 'product_categorizations', :conditions => ['product_categorizations.category_id = (?)', product_category.id]))
34	- elsif product_category && asset == :enterprises
35	- @environment.send(asset).send(finder_method, :all, options.merge( :order => 'profiles.name', :joins => 'inner join products on (products.enterprise_id = profiles.id) inner join product_categorizations on (product_categorizations.product_id = products.id)', :conditions => ['product_categorizations.category_id = (?)', product_category.id]))
36	- else
37	- if asset == :events
38	- # Ignore pagination for asset events
39	- options.delete(:per_page)
40	- options.delete(:page)
41	- if date_range
42	- @environment.send(asset).send('find', :all, options.merge(:conditions => [
43	- 'start_date BETWEEN :start_day AND :end_day OR end_date BETWEEN :start_day AND :end_day',
44	- {:start_day => date_range.first, :end_day => date_range.last}
45	- ]))
46	- else
47	- @environment.send(asset).send('find', :all, options)
48	- end
49	- else
50	- @environment.send(asset).send(finder_method, :all, options)
51	- end
52	- end
53	- else
54	- pg_options = {:page => options.delete(:page), :per_page => options.delete(:per_page)}
55	- solr_options = {:facets => options.delete(:facets), :order => options.delete(:order_by)}
56	-
57	- if product_category && asset == :products
58	- # SECURITY no risk of SQL injection, since product_category_ids comes from trusted source
59	- ret = @environment.send(asset).find_by_contents(query, pg_options, solr_options, options.merge({:include => 'product_categorizations', :conditions => 'product_categorizations.category_id = (%s)' % product_category.id }))
60	- elsif product_category && asset == :enterprises
61	- ret = @environment.send(asset).find_by_contents(query, pg_options, solr_options, options.merge(:joins => 'inner join product_categorizations on (product_categorizations.product_id = products.id)', :include => 'products', :conditions => "product_categorizations.category_id = (#{product_category.id})"))
62	- else
63	- ret = @environment.send(asset).find_by_contents(query, pg_options, solr_options, options)
64	- end
65	- if solr_options[:facets].nil?
66	- ret[:results]
67	- else
68	- ret
69	- end
70	- end
71	- end
72	-
73	- def recent(asset, limit = nil)
74	- find(asset, nil, :limit => limit)
75	- end
76	-
77	- def product_categories_count(asset, product_categories_ids, objects_ids=nil)
78	- conditions = ['product_categorizations.category_id in (?)', product_categories_ids]
79	-
80	- if asset == :products
81	- if objects_ids
82	- conditions[0] += ' and product_categorizations.product_id in (?)'
83	- conditions << objects_ids
84	- end
85	- ProductCategory.find(:all, :select => 'categories.id, count(*) as total', :joins => 'inner join product_categorizations on (product_categorizations.category_id = categories.id)', :group => 'categories.id', :conditions => conditions )
86	- elsif asset == :enterprises
87	- if objects_ids
88	- conditions[0] += ' and products.enterprise_id in (?)'
89	- conditions << objects_ids
90	- end
91	- ProductCategory.find(
92	- :all,
93	- :select => 'categories.id, count(distinct products.enterprise_id) as total',
94	- :joins => 'inner join product_categorizations on (product_categorizations.category_id = categories.id) inner join products on (products.id = product_categorizations.product_id)',
95	- :group => 'categories.id',
96	- :conditions => conditions
97	- )
98	- else
99	- raise ArgumentError, 'only products and enterprises supported'
100	- end.inject({}) do \|results,pc\|
101	- results[pc.id]= pc.total.to_i
102	- results
103	- end
104	-
105	- end
106	-
107	- protected
108	-
109	- def asset_class(asset)
110	- asset.to_s.singularize.camelize.constantize
111	- end
112	-
113	- def asset_table(asset)
114	- asset_class(asset).table_name
115	- end
116	-
117	-end
	@@ -1,9 +0,0 @@	@@ -1,9 +0,0 @@
1	-<div id="search-popup">
2	-
3	-<%= render :partial => 'search_form', :locals => { :form_title => _('Search %s') % @environment.name } %>
4	-
5	-<script type='text/javascript'>
6	- $('query').focus();
7	-</script>
8	-
9	-</div><!-- fim id="search-popup" -->