find_by_contents: pass the responsability of filter to the engines

Since there are plugins that need to receive the scope clean (that is without filters applied to it) and since the plugin has the power to not apply the filter when conveys it (also rewriting the interface to keep its consistency), I decided to pass the reposability of applying any filter provided by the core to the engines. Nevertheless, if the plugin returns nil (that's the same that it would return if it was disabled) the core will deal with the filters through the default way (that is without any engine).

find_by_contents: pass the responsability of filter to the engines
Since there are plugins that need to receive the scope clean (that is without filters applied to it) and since the plugin has the power to not apply the filter when conveys it (also rewriting the interface to keep its consistency), I decided to pass the reposability of applying any filter provided by the core to the engines. Nevertheless, if the plugin returns nil (that's the same that it would return if it was disabled) the core will deal with the filters through the default way (that is without any engine).
Rodrigo Souto
1 parent 7eb7d4bf
Showing 4 changed files with 9 additions and 12 deletions Show diff stats
app/controllers/application_controller.rb
app/controllers/public/search_controller.rb
plugins/pg_search/lib/pg_search_plugin.rb
plugins/solr/lib/solr_plugin.rb
@@ -181,8 +181,9 @@ class ApplicationController &lt; ActionController::Base
   private
   def fallback_find_by_contents(asset, scope, query, paginate_options, options)
-    return {:results => scope.paginate(paginate_options)} if query.blank?
-    {:results => scope.like_search(query).paginate(paginate_options)}
+    scope = scope.like_search(query) unless query.blank?
+    scope = scope.send(options[:filter]) unless options[:filter].blank?
+    {:results => scope.paginate(paginate_options)}
   end
 end
@@ -214,13 +214,6 @@ class SearchController &lt; PublicController
     @searches[@asset] = find_by_contents(@asset, @scope, @query, paginate_options, {:category => @category, :filter => @filter})
   end
-  def find_by_contents asset, scope, query, paginate_options={:page => 1}, options={}
-    # only apply fitlers to empty query, sorting is engine specific
-    scope = scope.send(options[:filter]) if options[:filter] and @empty_query
-
-    super asset, scope, query, paginate_options, options
-  end
-
   private
   def visible_profiles(klass, *extra_relations)
@@ -9,8 +9,9 @@ class PgSearchPlugin &lt; Noosfero::Plugin
   end
   def find_by_contents(asset, scope, query, paginate_options={}, options={})
-    return if query.blank?
-    {:results => scope.pg_search_plugin_search(query).paginate(paginate_options)}
+    scope = scope.pg_search_plugin_search(query) unless query.blank?
+    scope = scope.send(options[:filter]) unless options[:filter]
+    {:results => scope.paginate(paginate_options)}
   end
 end
@@ -27,7 +27,9 @@ class SolrPlugin &lt; Noosfero::Plugin
     category = options[:category]
     empty_query = empty_query? query, category
-    return unless solr_search? empty_query, klass
+    unless solr_search? empty_query, klass
+      return options[:filter] ?  {:results => scope.send(options[:filter]).paginate(paginate_options)} : nil
+    end
     solr_options = solr_options(class_asset(klass), category)
     solr_options[:filter_queries] ||= []
	@@ -214,13 +214,6 @@ class SearchController < PublicController		@@ -214,13 +214,6 @@ class SearchController < PublicController
214	@searches[@asset] = find_by_contents(@asset, @scope, @query, paginate_options, {:category => @category, :filter => @filter})	214	@searches[@asset] = find_by_contents(@asset, @scope, @query, paginate_options, {:category => @category, :filter => @filter})
215	end	215	end
216		216
217	- def find_by_contents asset, scope, query, paginate_options={:page => 1}, options={}
218	- # only apply fitlers to empty query, sorting is engine specific
219	- scope = scope.send(options[:filter]) if options[:filter] and @empty_query
220	-
221	- super asset, scope, query, paginate_options, options
222	- end
223	-
224	private	217	private
225		218
226	def visible_profiles(klass, *extra_relations)	219	def visible_profiles(klass, *extra_relations)