Concentrating find_by_contents on application controller

Rodrigo Souto
1 parent 00620c69
Showing 14 changed files with 24 additions and 56 deletions Show diff stats
app/controllers/admin/region_validators_controller.rb
app/controllers/application_controller.rb
app/controllers/my_profile/cms_controller.rb
app/controllers/public/profile_search_controller.rb
app/controllers/public/search_controller.rb
app/models/region.rb
app/views/layouts/application-ng.rhtml
app/views/search/_profile.rhtml
app/views/search/category_index.rhtml
app/views/search/index.rhtml
lib/noosfero/plugin.rb
lib/noosfero/plugin/manager.rb
plugins/solr/lib/solr_plugin.rb
test/unit/plugin_manager_test.rb
@@ -33,7 +33,7 @@ class RegionValidatorsController &lt; AdminController
   def load_region_and_search
     @region = environment.regions.find(params[:id])
     if params[:search]
-      @search = @region.search_possible_validators(params[:search])
+      @search = find_by_contents(Organization, params[:search])[:results].docs.reject {|item| @region.validator_ids.include?(item.id) }
     end
   end
@@ -154,4 +154,9 @@ class ApplicationController &lt; ActionController::Base
     end
   end
+  def find_by_contents(klass, query, paginate_options{}, options={})
+    @plugins.first(:find_by_contents, klass, query, paginate_options, options) ||
+    # Failback search using like
+  end
+
 end
@@ -270,8 +270,7 @@ class CmsController &lt; MyProfileController
   def search
     query = params[:q]
-    results = profile.files.published.find_by_contents(query)[:results]
-   # results = @plugins.first(:find_by_contents, profile.files.published, query)[:results]
+    results = find_by_contents(profile.files.published, query)[:results]
     render :text => article_list_to_json(results), :content_type => 'application/json'
   end
@@ -11,7 +11,7 @@ class ProfileSearchController &lt; PublicController
       if params[:where] == 'environment'
         redirect_to :controller => 'search', :query => @q
       else
-        @results = @plugins.first(:find_by_contents, profile.articles.published, @q, {:per_page => 10, :page => params[:page]})[:results]
+        @results = find_by_contents(profile.articles.published, @q, {:per_page => 10, :page => params[:page]})[:results]
       end
     end
   end
@@ -8,7 +8,6 @@ class SearchController &lt; PublicController
   before_filter :load_category
   before_filter :load_search_assets
   before_filter :load_query
-  before_filter :load_search_engine
   # Backwards compatibility with old URLs
   def redirect_asset_param
@@ -58,7 +57,7 @@ class SearchController &lt; PublicController
   end
   def articles
-    if @search_engine && !@empty_query
+    if !@empty_query
       full_text_search
     else
       @searches[@asset] = {}
@@ -71,7 +70,7 @@ class SearchController &lt; PublicController
   end
   def people
-    if @search_engine && !@empty_query
+    if !@empty_query
       full_text_search
     else
       @searches[@asset] = {}
@@ -80,7 +79,7 @@ class SearchController &lt; PublicController
   end
   def products
-    if @search_engine
+    if !@empty_query
       full_text_search
     else
       @searches[@asset] = {}
@@ -89,7 +88,7 @@ class SearchController &lt; PublicController
   end
   def enterprises
-    if @search_engine && !@empty_query
+    if !@empty_query
       full_text_search
     else
       @filter_title = _('Enterprises from network')
@@ -99,7 +98,7 @@ class SearchController &lt; PublicController
   end
   def communities
-    if @search_engine && !@empty_query
+    if !@empty_query
       full_text_search
     else
       @searches[@asset] = {}
@@ -123,7 +122,7 @@ class SearchController &lt; PublicController
         environment.events.by_day(@selected_day)
     end
-    if @search_engine && !@empty_query
+    if !@empty_query
       full_text_search
     else
       @searches[@asset] = {}
@@ -192,10 +191,6 @@ class SearchController &lt; PublicController
     end
   end
-  def load_search_engine
-    @search_engine = @plugins.first_plugin(:search_engine?)
-  end
-
   FILTERS = %w(
     more_recent
     more_active
@@ -261,7 +256,7 @@ class SearchController &lt; PublicController
   end
   def full_text_search
-    @searches[@asset] = @plugins.first(:find_by_contents, asset_class(@asset), @query, paginate_options(params[:page]), {:category => @category})
+    @searches[@asset] = find_by_contents(asset_class(@asset), @query, paginate_options(params[:page]), {:category => @category})
   end
   private
@@ -4,14 +4,6 @@ class Region &lt; Category
   require_dependency 'enterprise' # enterprises can also be validators
-  include Noosfero::Plugin::HotSpot
-
-  # searches for organizations that could become validators for this region.
-  # <tt>search</tt> is passed as is to find_by_contents on Organization.
-  def search_possible_validators(search)
-    plugins.find_by_contents(Organization, search)[:results].docs.reject {|item| self.validator_ids.include?(item.id) }
-  end
-
   def has_validator?
     validators.count > 0
   end
@@ -69,13 +69,11 @@
               <% end %>
           </span>
-          <% if @plugins.first(:search_engine?) %>
-            <form action="/search" class="search_form" method="get" class="clean">
-              <input name="query" size="15" title="<%=_('Search...')%>" onfocus="this.form.className='focused';" onblur="this.form.className=''" />
-              <div><%=_('Press <strong>Enter</strong> to send the search query.')%></div>
-              <%= javascript_tag 'jQuery("#user form input").hint();' %>
-            </form>
-          <% end %>
+          <form action="/search" class="search_form" method="get" class="clean">
+            <input name="query" size="15" title="<%=_('Search...')%>" onfocus="this.form.className='focused';" onblur="this.form.className=''" />
+            <div><%=_('Press <strong>Enter</strong> to send the search query.')%></div>
+            <%= javascript_tag 'jQuery("#user form input").hint();' %>
+          </form>
         </div><!-- end id="user" -->
         <h1 id="site-title">
 <li class="search-profile-item">
-<% if @empty_query || multiple_search? || !profile.enterprise? || !@search_engine  %>
+<% if @empty_query || multiple_search? || !profile.enterprise?  %>
   <%= profile_image_link profile, :portrait, 'div',
     @filter == 'more_recent' ? profile.send(@filter + '_label') + show_date(profile.created_at) : profile.send(@filter + '_label') %>
 <% else %>
@@ -5,7 +5,7 @@
   <% end %>
   <%= search_page_title(_('Search Results'), @category) %>
-  <%= render :partial => 'search_form', :locals => { :hint => '' } if @search_engine %>
+  <%= render :partial => 'search_form', :locals => { :hint => '' } %>
   <%= category_context(@category, params) %>
   <%= display_results %>
@@ -5,7 +5,7 @@
   <% end %>
   <%= search_page_title(_('Search Results'), @category) %>
-  <%= render :partial => 'search_form', :locals => { :hint => '' } if @search_engine %>
+  <%= render :partial => 'search_form', :locals => { :hint => '' } %>
   <%= category_context(@category, params) %>
   <%= display_results(@asset) %>
@@ -351,18 +351,11 @@ class Noosfero::Plugin
     nil
   end
-  # -> Specifies plugin that works as a search engine
-  # returns = true/false
-  def search_engine?
-    false
-  end
-
   # -> Finds objects by their contents
   # returns = {:results => [a, b, c, ...], ...}
   # P.S.: The plugin might add other informations on the return hash for its
   # own use in specific views
   def find_by_contents(klass, query, paginate_options={}, options={})
-    {:results => []}
   end
   def method_missing(method, *args, &block)
@@ -39,7 +39,7 @@ class Noosfero::Plugin::Manager
       result = plugin.send(event, *args)
       break if result.present?
     end
-    result || Noosfero::Plugin.new.send(event, *args)
+    result
   end
   def first_plugin(event, *args)
@@ -12,10 +12,6 @@ class SolrPlugin &lt; Noosfero::Plugin
     _("Uses Solr as search engine.")
   end
-  def search_engine?
-    true
-  end
-
   def find_by_contents(klass, query, paginate_options={}, options={})
     category = options.delete(:category)
     solr_options = solr_options(class_asset(klass), category)
@@ -140,15 +140,5 @@ class PluginManagerTest &lt; ActiveSupport::TestCase
     assert_equal Plugin2, manager.first_plugin(:random_event)
   end
-  should 'use default value defined on the base plugin class when no plugin enabled for the first method' do
-    class Noosfero::Plugin
-      def random_event
-        1
-      end
-    end
-
-    assert_equal 1, manager.first(:random_event)
-  end
-
 end
	@@ -33,7 +33,7 @@ class RegionValidatorsController < AdminController		@@ -33,7 +33,7 @@ class RegionValidatorsController < AdminController
33	def load_region_and_search	33	def load_region_and_search
34	@region = environment.regions.find(params[:id])	34	@region = environment.regions.find(params[:id])
35	if params[:search]	35	if params[:search]
36	- @search = @region.search_possible_validators(params[:search])	36	+ @search = find_by_contents(Organization, params[:search])[:results].docs.reject {\|item\| @region.validator_ids.include?(item.id) }
37	end	37	end
38	end	38	end
39		39
	@@ -154,4 +154,9 @@ class ApplicationController < ActionController::Base		@@ -154,4 +154,9 @@ class ApplicationController < ActionController::Base
154	end	154	end
155	end	155	end
156		156
		157	+ def find_by_contents(klass, query, paginate_options{}, options={})
		158	+ @plugins.first(:find_by_contents, klass, query, paginate_options, options) \|\|
		159	+ # Failback search using like
		160	+ end
		161	+
157	end	162	end
	@@ -270,8 +270,7 @@ class CmsController < MyProfileController		@@ -270,8 +270,7 @@ class CmsController < MyProfileController
270		270
271	def search	271	def search
272	query = params[:q]	272	query = params[:q]
273	- results = profile.files.published.find_by_contents(query)[:results]
274	- # results = @plugins.first(:find_by_contents, profile.files.published, query)[:results]	273	+ results = find_by_contents(profile.files.published, query)[:results]
275	render :text => article_list_to_json(results), :content_type => 'application/json'	274	render :text => article_list_to_json(results), :content_type => 'application/json'
276	end	275	end
277		276
	@@ -11,7 +11,7 @@ class ProfileSearchController < PublicController		@@ -11,7 +11,7 @@ class ProfileSearchController < PublicController
11	if params[:where] == 'environment'	11	if params[:where] == 'environment'
12	redirect_to :controller => 'search', :query => @q	12	redirect_to :controller => 'search', :query => @q
13	else	13	else
14	- @results = @plugins.first(:find_by_contents, profile.articles.published, @q, {:per_page => 10, :page => params[:page]})[:results]	14	+ @results = find_by_contents(profile.articles.published, @q, {:per_page => 10, :page => params[:page]})[:results]
15	end	15	end
16	end	16	end
17	end	17	end
	@@ -4,14 +4,6 @@ class Region < Category		@@ -4,14 +4,6 @@ class Region < Category
4		4
5	require_dependency 'enterprise' # enterprises can also be validators	5	require_dependency 'enterprise' # enterprises can also be validators
6		6
7	- include Noosfero::Plugin::HotSpot
8	-
9	- # searches for organizations that could become validators for this region.
10	- # <tt>search</tt> is passed as is to find_by_contents on Organization.
11	- def search_possible_validators(search)
12	- plugins.find_by_contents(Organization, search)[:results].docs.reject {\|item\| self.validator_ids.include?(item.id) }
13	- end
14	-
15	def has_validator?	7	def has_validator?
16	validators.count > 0	8	validators.count > 0
17	end	9	end
1	<li class="search-profile-item">	1	<li class="search-profile-item">
2	-<% if @empty_query \|\| multiple_search? \|\| !profile.enterprise? \|\| !@search_engine %>	2	+<% if @empty_query \|\| multiple_search? \|\| !profile.enterprise? %>
3	<%= profile_image_link profile, :portrait, 'div',	3	<%= profile_image_link profile, :portrait, 'div',
4	@filter == 'more_recent' ? profile.send(@filter + '_label') + show_date(profile.created_at) : profile.send(@filter + '_label') %>	4	@filter == 'more_recent' ? profile.send(@filter + '_label') + show_date(profile.created_at) : profile.send(@filter + '_label') %>
5	<% else %>	5	<% else %>
	@@ -5,7 +5,7 @@		@@ -5,7 +5,7 @@
5	<% end %>	5	<% end %>
6		6
7	<%= search_page_title(_('Search Results'), @category) %>	7	<%= search_page_title(_('Search Results'), @category) %>
8	- <%= render :partial => 'search_form', :locals => { :hint => '' } if @search_engine %>	8	+ <%= render :partial => 'search_form', :locals => { :hint => '' } %>
9	<%= category_context(@category, params) %>	9	<%= category_context(@category, params) %>
10	<%= display_results %>	10	<%= display_results %>
11		11
	@@ -39,7 +39,7 @@ class Noosfero::Plugin::Manager		@@ -39,7 +39,7 @@ class Noosfero::Plugin::Manager
39	result = plugin.send(event, *args)	39	result = plugin.send(event, *args)
40	break if result.present?	40	break if result.present?
41	end	41	end
42	- result \|\| Noosfero::Plugin.new.send(event, *args)	42	+ result
43	end	43	end
44		44
45	def first_plugin(event, *args)	45	def first_plugin(event, *args)
	@@ -140,15 +140,5 @@ class PluginManagerTest < ActiveSupport::TestCase		@@ -140,15 +140,5 @@ class PluginManagerTest < ActiveSupport::TestCase
140	assert_equal Plugin2, manager.first_plugin(:random_event)	140	assert_equal Plugin2, manager.first_plugin(:random_event)
141	end	141	end
142		142
143	- should 'use default value defined on the base plugin class when no plugin enabled for the first method' do
144	- class Noosfero::Plugin
145	- def random_event
146	- 1
147	- end
148	- end
149	-
150	- assert_equal 1, manager.first(:random_event)
151	- end
152	-
153	end	143	end
154		144