Solr on the way...

Rodrigo Souto
1 parent e1b600b8
Showing 18 changed files with 78 additions and 55 deletions Show diff stats
app/controllers/my_profile/cms_controller.rb
app/controllers/public/profile_search_controller.rb
app/controllers/public/search_controller.rb
app/helpers/search_helper.rb
app/models/region.rb
app/views/search/_display_results.rhtml
app/views/search/_google_maps.rhtml
app/views/search/_results_header.rhtml
app/views/search/search_page.html.erb
lib/noosfero/plugin.rb
lib/noosfero/plugin/manager.rb
lib/set_profile_region_from_city_state.rb
plugins/solr/lib/solr_plugin.rb
plugins/solr/lib/solr_plugin/results_helper.rb
plugins/solr/lib/solr_plugin/search_helper.rb
plugins/solr/views/search/_results.html.erb
plugins/solr/views/search/_results_header.html.erb
test/unit/plugin_manager_test.rb
@@ -271,6 +271,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]
     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 = profile.articles.published.find_by_contents(@q, {:per_page => 10, :page => params[:page]})[:results]
+        @results = @plugins.first(:find_by_contents, profile.articles.published, @q, {:per_page => 10, :page => params[:page]})[:results]
       end
     end
   end
@@ -19,7 +19,7 @@ class SearchController &lt; PublicController
   no_design_blocks
   def index
-    @results = {}
+    @searches = {}
     @order = []
     @names = {}
     @results_only = true
@@ -33,12 +33,12 @@ class SearchController &lt; PublicController
     end
     @asset = nil
-    render :action => @results.keys.first if @results.keys.size == 1
+    render :action => @searches.keys.first if @searches.keys.size == 1
   end
   # view the summary of one category
   def category_index
-    @results = {}
+    @searches = {}
     @order = []
     @names = {}
     limit = MULTIPLE_SEARCH_LIMIT
@@ -51,8 +51,8 @@ class SearchController &lt; PublicController
       [ :articles, _('Contents'), :recent_articles ]
     ].each do |asset, name, filter|
       @order << asset
-      @results[asset] = @category.send(filter, limit)
-      raise "No total_entries for: #{asset}" unless @results[asset].respond_to?(:total_entries)
+      @searches[asset] = @category.send(filter, limit)
+      raise "No total_entries for: #{asset}" unless @searches[asset][:results].respond_to?(:total_entries)
       @names[asset] = name
     end
   end
@@ -61,7 +61,8 @@ class SearchController &lt; PublicController
     if @search_engine && !@empty_query
       full_text_search
     else
-      @results[@asset] = @environment.articles.public.send(@filter).paginate(paginate_options)
+      @searches[@asset] = {}
+      @searches[@asset][:results] = @environment.articles.public.send(@filter).paginate(paginate_options)
     end
   end
@@ -73,7 +74,8 @@ class SearchController &lt; PublicController
     if @search_engine && !@empty_query
       full_text_search
     else
-      @results[@asset] = visible_profiles(Person).send(@filter).paginate(paginate_options)
+      @searches[@asset] = {}
+      @searches[@asset][:results] = visible_profiles(Person).send(@filter).paginate(paginate_options)
     end
   end
@@ -81,7 +83,8 @@ class SearchController &lt; PublicController
     if @search_engine
       full_text_search
     else
-      @results[@asset] = @environment.products.send(@filter).paginate(paginate_options)
+      @searches[@asset] = {}
+      @searches[@asset][:results] = @environment.products.send(@filter).paginate(paginate_options)
     end
   end
@@ -90,7 +93,8 @@ class SearchController &lt; PublicController
       full_text_search
     else
       @filter_title = _('Enterprises from network')
-      @results[@asset] = visible_profiles(Enterprise, [{:products => :product_category}]).paginate(paginate_options)
+      @searches[@asset] = {}
+      @searches[@asset][:results] = visible_profiles(Enterprise, [{:products => :product_category}]).paginate(paginate_options)
     end
   end
@@ -98,7 +102,8 @@ class SearchController &lt; PublicController
     if @search_engine && !@empty_query
       full_text_search
     else
-      @results[@asset] = visible_profiles(Community).send(@filter).paginate(paginate_options)
+      @searches[@asset] = {}
+      @searches[@asset][:results] = visible_profiles(Community).send(@filter).paginate(paginate_options)
     end
   end
@@ -121,10 +126,11 @@ class SearchController &lt; PublicController
     if @search_engine && !@empty_query
       full_text_search
     else
-      @results[@asset] = date_range ? environment.events.by_range(date_range) : environment.events
+      @searches[@asset] = {}
+      @searches[@asset][:results] = date_range ? environment.events.by_range(date_range) : environment.events
     end
-    events = @results[@asset]
+    events = @searches[@asset][:results]
     @calendar = populate_calendar(date, events)
     @previous_calendar = populate_calendar(date - 1.month, events)
     @next_calendar = populate_calendar(date + 1.month, events)
@@ -147,7 +153,7 @@ class SearchController &lt; PublicController
     @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)
-      @results[@asset] = environment.articles.find_tagged_with(@tag).paginate(paginate_options)
+      @searches[@asset] = environment.articles.find_tagged_with(@tag).paginate(paginate_options)
     end
   end
@@ -164,7 +170,7 @@ class SearchController &lt; PublicController
     @asset = (params[:asset] || params[:action]).to_sym
     @order ||= [@asset]
     params[:display] ||= 'list'
-    @results ||= {}
+    @searches ||= {}
     @filter = filter
     @filter_title = filter_description(@asset, @filter)
@@ -254,8 +260,8 @@ class SearchController &lt; PublicController
     { :per_page => limit, :page => page }
   end
-  def full_text_search(options = {})
-    @results[@asset] = @plugins.first(:full_text_search, @asset, @query, @category, paginate_options(params[:page]))
+  def full_text_search
+    @searches[@asset] = @plugins.first(:find_by_contents, asset_class(@asset), @query, paginate_options(params[:page]), {:category => @category})
   end
   private
@@ -18,13 +18,17 @@ module SearchHelper
   include EventsHelper
   def multiple_search?
-    ['index', 'category_index'].include?(params[:action]) or @results.size > 1
+    ['index', 'category_index'].include?(params[:action]) or @searches.size > 1
   end
   def map_search?
     !multiple_search? and params[:display] == 'map'
   end
+  def asset_class(asset)
+    asset.to_s.singularize.camelize.constantize
+  end
+
   def search_page_title(title, category = nil)
     title = "<h1>" + title
     title += ' - <small>' + category.name + '</small>' if category
@@ -4,10 +4,12 @@ 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)
-    Organization.find_by_contents(search)[:results].docs.reject {|item| self.validator_ids.include?(item.id) }
+    plugins.find_by_contents(Organization, search)[:results].docs.reject {|item| self.validator_ids.include?(item.id) }
   end
   def has_validator?
 <div id="search-results" class="<%= !multiple_search? ? 'only-one-result-box' : 'multiple-results-boxes' %>">
   <% @order.each do |name| %>
-    <% results = @results[name] %>
+    <% search = @searches[name] %>
-    <div class="search-results-<%= name %> search-results-box <%= "search-results-empty" if results.blank? %>">
-      <% if !results.blank? %>
+    <div class="search-results-<%= name %> search-results-box <%= "search-results-empty" if search[:results].blank? %>">
+      <% if !search[:results].blank? %>
         <% partial = partial_for_class(name.to_s.singularize.camelize.constantize) %>
         <% if multiple_search? %>
           <h3><%= @names[name] %></h3>
-          <% if results.total_entries > SearchController::MULTIPLE_SEARCH_LIMIT %>
-            <%= link_to(_('see all (%d)') % results.total_entries, params.merge(:action => name), :class => 'see-more' ) %>
+          <% if search[:results].total_entries > SearchController::MULTIPLE_SEARCH_LIMIT %>
+            <%= link_to(_('see all (%d)') % search[:results].total_entries, params.merge(:action => name), :class => 'see-more' ) %>
           <% end %>
         <% end %>
         <div class="search-results-innerbox search-results-type-<%= partial %> <%= 'common-profile-list-block' if partial == 'profile' %>">
           <ul>
-          <% results.each do |hit| %>
+          <% search[:results].each do |hit| %>
             <%= render :partial => partial_for_class(hit.class), :object => hit %>
           <% end %>
           </ul>
@@ -13,7 +13,7 @@
 <script type='text/javascript'>
   mapLoad(<%= GoogleMaps.initial_zoom.to_json %>);
-  <% @results.each do |name,results| %>
+  <% @searches.each do |name,results| %>
     <% results.each do |item| %>
       <% if item.lat && item.lng %>
         mapPutMarker(<%= item.lat.to_json %>, <%= item.lng.to_json %>, <%= item.name.to_json %>, '<%= icon %>',
-<div class="search-results-header <%= "search-no-results" if @results[@asset].nil? or @results[@asset].length == 0 %>">
+<div class="search-results-header <%= "search-no-results" if @searches[@asset].nil? or @searches[@asset].length == 0 %>">
   <div id='search-filter-title'><%= @filter_title if @filter_title %></div>
   <%= display_filter(@asset, params[:display]) if map_capable?(@asset) %>
   <div style="clear: both"></div>
@@ -4,7 +4,7 @@
 <%= display_results(@asset) %>
 <% if params[:display] != 'map' %>
-  <%= pagination_links @results[@asset] %>
+  <%= pagination_links @searches[@asset] %>
 <% end %>
 <div style="clear: both"></div>
@@ -357,9 +357,12 @@ class Noosfero::Plugin
     false
   end
-  # -> Realizes a full text search
-  # returns = whatever the plugin needs to render the view
-  def full_text_search(asset, query, category, paginate_options)
+  # -> 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
+    result || Noosfero::Plugin.new.send(event, *args)
   end
   def first_plugin(event, *args)
@@ -11,6 +11,7 @@ module SetProfileRegionFromCityState
   end
   module InstanceMethods
+    include Noosfero::Plugin::HotSpot
     def city_with_region=(value)
       self.city_without_region = value
@@ -24,9 +25,9 @@ module SetProfileRegionFromCityState
     def region_from_city_and_state
       if @change_region
-        s = State.find_by_contents(self.state)[:results].first
+        s = plugins.first(:find_by_contents, State, self.state)[:results].first
         if s
-          c = City.find_by_contents(self.city, {}, :filter_queries => ["parent_id:#{s.id}"])[:results].first
+          c = plugins.first(:find_by_contents, City, self.city, {}, {:filter_queries => ["parent_id:#{s.id}"]})[:results].first
           self.region = c
         else
           self.region = nil
@@ -16,16 +16,12 @@ class SolrPlugin &lt; Noosfero::Plugin
     true
   end
-  def full_text_search(asset, query, category, paginate_options)
-    asset_class = asset_class(asset)
-    solr_options = solr_options(asset, category)
-    solr_options.merge!(products_options(context.send(:user))) if asset == :products && empty_query?(query, category)
-    search = asset_class.find_by_contents(query, paginate_options, solr_options)
-    if context.params[:action] == 'index'
-      return search[:results]
-    else
-      return search
-    end
+  def find_by_contents(klass, query, paginate_options={}, options={})
+    category = options.delete(:category)
+    solr_options = solr_options(class_asset(klass), category)
+    user = context.respond_to?(:user) ? context.send(:user) : nil
+    solr_options.merge!(products_options(user)) if klass == Product && empty_query?(query, category)
+    klass.find_by_contents(query, paginate_options, solr_options.merge(options))
   end
 end
@@ -5,12 +5,8 @@ class SolrPlugin &lt; Noosfero::Plugin
     end
     def set_results_variables
-      if @results[@asset].kind_of?(Hash)
-        ret = @results[@asset]
-        @results[@asset] = ret[:results]
-        @facets = ret[:facets]
-        @all_facets = ret[:all_facets]
-      end
+      @facets = @searches[@asset][:facets]
+      @all_facets = @searches[@asset][:all_facets]
     end
     def order_by(asset)
@@ -34,6 +34,10 @@ class SolrPlugin &lt; Noosfero::Plugin
     def asset_class(asset)
       asset.to_s.singularize.camelize.constantize
     end
+
+    def class_asset(klass)
+      klass.name.underscore.pluralize.to_sym
+    end
     def asset_table(asset)
       asset_class(asset).table_name
@@ -3,5 +3,5 @@
 <%= display_results(@asset) %>
 <% if params[:display] != 'map' %>
-  <%= pagination_links @results[@asset] %>
+  <%= pagination_links @searches[@asset][:results] %>
 <% end %>
-<div class="search-results-header <%= "search-no-results" if @results[@asset].nil? or @results[@asset].length == 0 %>">
+<div class="search-results-header <%= "search-no-results" if @searches[@asset][:results].nil? or @searches[@asset][:results].length == 0 %>">
   <% if !@empty_query %>
     <div class="search-results-header-information">
-      <% if @results[@asset].total_entries > 0 %>
-        <%= label_total_found(@asset, @results[@asset].total_entries) %>
+      <% if @searches[@asset][:results].total_entries > 0 %>
+        <%= label_total_found(@asset, @searches[@asset][:results].total_entries) %>
         <% if params[:display] != 'map' %>
-          <span class="current-page"><%= _("Showing page %s of %s") % [@results[@asset].current_page, @results[@asset].total_pages] %></span>
+          <span class="current-page"><%= _("Showing page %s of %s") % [@searches[@asset][:results].current_page, @searches[@asset][:results].total_pages] %></span>
         <% end %>
       <% end %>
     </div>
@@ -140,5 +140,15 @@ 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
	@@ -271,6 +271,7 @@ class CmsController < MyProfileController		@@ -271,6 +271,7 @@ class CmsController < MyProfileController
271	def search	271	def search
272	query = params[:q]	272	query = params[:q]
273	results = profile.files.published.find_by_contents(query)[:results]	273	results = profile.files.published.find_by_contents(query)[:results]
		274	+ # results = @plugins.first(:find_by_contents, profile.files.published, query)[:results]
274	render :text => article_list_to_json(results), :content_type => 'application/json'	275	render :text => article_list_to_json(results), :content_type => 'application/json'
275	end	276	end
276		277
	@@ -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 = profile.articles.published.find_by_contents(@q, {:per_page => 10, :page => params[:page]})[:results]	14	+ @results = @plugins.first(: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
	@@ -13,7 +13,7 @@		@@ -13,7 +13,7 @@
13	<script type='text/javascript'>	13	<script type='text/javascript'>
14	mapLoad(<%= GoogleMaps.initial_zoom.to_json %>);	14	mapLoad(<%= GoogleMaps.initial_zoom.to_json %>);
15		15
16	- <% @results.each do \|name,results\| %>	16	+ <% @searches.each do \|name,results\| %>
17	<% results.each do \|item\| %>	17	<% results.each do \|item\| %>
18	<% if item.lat && item.lng %>	18	<% if item.lat && item.lng %>
19	mapPutMarker(<%= item.lat.to_json %>, <%= item.lng.to_json %>, <%= item.name.to_json %>, '<%= icon %>',	19	mapPutMarker(<%= item.lat.to_json %>, <%= item.lng.to_json %>, <%= item.name.to_json %>, '<%= icon %>',
1	-<div class="search-results-header <%= "search-no-results" if @results[@asset].nil? or @results[@asset].length == 0 %>">	1	+<div class="search-results-header <%= "search-no-results" if @searches[@asset].nil? or @searches[@asset].length == 0 %>">
2	<div id='search-filter-title'><%= @filter_title if @filter_title %></div>	2	<div id='search-filter-title'><%= @filter_title if @filter_title %></div>
3	<%= display_filter(@asset, params[:display]) if map_capable?(@asset) %>	3	<%= display_filter(@asset, params[:display]) if map_capable?(@asset) %>
4	<div style="clear: both"></div>	4	<div style="clear: both"></div>
	@@ -4,7 +4,7 @@		@@ -4,7 +4,7 @@
4		4
5	<%= display_results(@asset) %>	5	<%= display_results(@asset) %>
6	<% if params[:display] != 'map' %>	6	<% if params[:display] != 'map' %>
7	- <%= pagination_links @results[@asset] %>	7	+ <%= pagination_links @searches[@asset] %>
8	<% end %>	8	<% end %>
9		9
10	<div style="clear: both"></div>	10	<div style="clear: both"></div>
	@@ -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	42	+ result \|\| Noosfero::Plugin.new.send(event, *args)
43	end	43	end
44		44
45	def first_plugin(event, *args)	45	def first_plugin(event, *args)
	@@ -3,5 +3,5 @@		@@ -3,5 +3,5 @@
3		3
4	<%= display_results(@asset) %>	4	<%= display_results(@asset) %>
5	<% if params[:display] != 'map' %>	5	<% if params[:display] != 'map' %>
6	- <%= pagination_links @results[@asset] %>	6	+ <%= pagination_links @searches[@asset][:results] %>
7	<% end %>	7	<% end %>
	@@ -140,5 +140,15 @@ class PluginManagerTest < ActiveSupport::TestCase		@@ -140,5 +140,15 @@ 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	+
143	end	153	end
144		154