Adapt acts_as_searcheable to Solr

Change acts_as_searcheable to always index schema_path. If multitenancy if off or the database isn't PostgreSQL, then schema_path method returns an empty string and is not used at find_by_contents. Change find_by_contents adding options separating options from paginate, solr and rails's find. With Solr search capabilities, combined search (solr + rails find) won't be necessary in the future. Also change find_by_contents to return a hash where there are the facets found and also the results. Related tests pass with this change

Adapt acts_as_searcheable to Solr
Change acts_as_searcheable to always index schema_path. If multitenancy if off or the database isn't PostgreSQL, then schema_path method returns an empty string and is not used at find_by_contents. Change find_by_contents adding options separating options from paginate, solr and rails's find. With Solr search capabilities, combined search (solr + rails find) won't be necessary in the future. Also change find_by_contents to return a hash where there are the facets found and also the results. Related tests pass with this change
Braulio Bhavamitra
1 parent 85198748
Showing 19 changed files with 124 additions and 109 deletions Show diff stats
app/controllers/my_profile/profile_members_controller.rb
app/controllers/public/browse_controller.rb
app/models/article.rb
app/models/category_finder.rb
app/models/enterprise.rb
app/models/environment_finder.rb
app/models/region.rb
lib/acts_as_searchable.rb
test/test_helper.rb
test/unit/article_test.rb
test/unit/category_finder_test.rb
test/unit/enterprise_test.rb
test/unit/environment_finder_test.rb
test/unit/environment_test.rb
test/unit/event_test.rb
test/unit/product_test.rb
test/unit/profile_test.rb
test/unit/tiny_mce_article_test.rb
vendor/plugins/acts_as_solr/lib/parser_methods.rb
@@ -126,11 +126,11 @@ class ProfileMembersController &lt; MyProfileController
     if !params[:query] || params[:query].length <= 2
       @users_found = []
     elsif params[:scope] == 'all_users'
-      @users_found = Person.find_by_contents(params[:query] + '*').select {|user| !profile.members.include?(user)}
+      @users_found = Person.find_by_contents(params[:query] + '*')[:results].select {|user| !profile.members.include?(user)}
       @button_alt = _('Add member')
       @add_action = {:action => 'add_member'}
     elsif params[:scope] == 'new_admins'
-      @users_found = Person.find_by_contents(params[:query] + '*').select {|user| profile.members.include?(user) && !profile.admins.include?(user)}
+      @users_found = Person.find_by_contents(params[:query] + '*')[:results].select {|user| profile.members.include?(user) && !profile.admins.include?(user)}
       @button_alt = _('Add member')
       @add_action = {:action => 'add_admin'}
     end
@@ -19,7 +19,7 @@ class BrowseController &lt; PublicController
     @results = @environment.people.visible.send(@filter)
     if !params[:query].blank?
-      @results = @results.find_by_contents(params[:query])
+      @results = @results.find_by_contents(params[:query])[:results]
     end
     @results = @results.compact.paginate(:per_page => per_page, :page => params[:page])
   end
@@ -31,7 +31,7 @@ class BrowseController &lt; PublicController
     @results = @environment.communities.visible.send(@filter)
     if !params[:query].blank?
-      @results = @results.find_by_contents(params[:query])
+      @results = @results.find_by_contents(params[:query])[:results]
     end
     @results = @results.compact.paginate(:per_page => per_page, :page => params[:page])
   end
@@ -388,7 +388,7 @@ class Article &lt; ActiveRecord::Base
   end
   def comments_updated
-    ferret_update
+    solr_save
   end
   def accept_category?(cat)
@@ -30,8 +30,8 @@ class CategoryFinder
     if query.blank?
       asset_class(asset).send(finder_method, :all, options_for_find(asset_class(asset), {:order => "#{asset_table(asset)}.name"}.merge(options), date_range))
     else
-      ferret_options = {:page => options.delete(:page), :per_page => options.delete(:per_page)}
-      asset_class(asset).find_by_contents(query, ferret_options, options_for_find(asset_class(asset), options, date_range))
+      pg_options = {:page => options.delete(:page), :per_page => options.delete(:per_page)}
+      asset_class(asset).find_by_contents(query, pg_options, {}, options_for_find(asset_class(asset), options, date_range))[:results]
     end
   end
@@ -71,7 +71,7 @@ class Enterprise &lt; Organization
   end
   def product_updated
-    ferret_update
+    solr_save
   end
   after_save do |e|
@@ -48,14 +48,14 @@ class EnvironmentFinder
         end
       end
     else
-      ferret_options = {:page => options.delete(:page), :per_page => options.delete(:per_page)}
+      pg_options = {:page => options.delete(:page), :per_page => options.delete(:per_page)}
       if product_category && asset == :products
         # SECURITY no risk of SQL injection, since product_category_ids comes from trusted source
-        @environment.send(asset).find_by_contents(query, ferret_options, options.merge({:include => 'product_categorizations', :conditions => 'product_categorizations.category_id = (%s)' % product_category.id }))
+        @environment.send(asset).find_by_contents(query, pg_options, {}, options.merge({:include => 'product_categorizations', :conditions => 'product_categorizations.category_id = (%s)' % product_category.id }))[:results]
       elsif product_category && asset == :enterprises
-        @environment.send(asset).find_by_contents(query, ferret_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})"))
+        @environment.send(asset).find_by_contents(query, pg_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})"))[:results]
       else
-        @environment.send(asset).find_by_contents(query, ferret_options, options)
+        @environment.send(asset).find_by_contents(query, pg_options, {}, options)[:results]
       end
     end
   end
@@ -5,10 +5,9 @@ class Region &lt; Category
   require_dependency 'enterprise' # enterprises can also be validators
   # searches for organizations that could become validators for this region.
-  # <tt>search</tt> is passed as is to ferret's find_by_contents on Organizatio
-  # find_by_contents on Organization class.
+  # <tt>search</tt> is passed as is to find_by_contents on Organization.
   def search_possible_validators(search)
-    Organization.find_by_contents(search).reject {|item| self.validator_ids.include?(item.id) }
+    Organization.find_by_contents(search)[:results].reject {|item| self.validator_ids.include?(item.id) }
   end
   def has_validator?
@@ -2,56 +2,59 @@ module ActsAsSearchable
   module ClassMethods
     def acts_as_searchable(options = {})
-      if Noosfero::MultiTenancy.on? and ActiveRecord::Base.postgresql?
-        options[:additional_fields] ||= {}
-        options[:additional_fields] = Hash[*options[:additional_fields].collect{ |v| [v, {}] }.flatten] if options[:additional_fields].is_a?(Array)
-        options[:additional_fields].merge!(:schema_name => { :index => :untokenized })
+      if (!options[:fields])
+        options[:additional_fields] |= [{:schema_name => :string}]
+      else
+        options[:fields] << {:schema_name => :string}
       end
-      acts_as_ferret({ :remote => true }.merge(options))
+      acts_as_solr options
       extend FindByContents
       send :include, InstanceMethods
     end
     module InstanceMethods
       def schema_name
-        ActiveRecord::Base.connection.schema_search_path
+        (Noosfero::MultiTenancy.on? and ActiveRecord::Base.postgresql?) ? ActiveRecord::Base.connection.schema_search_path : ''
       end
     end
     module FindByContents
       def schema_name
-        ActiveRecord::Base.connection.schema_search_path
+        (Noosfero::MultiTenancy.on? and ActiveRecord::Base.postgresql?) ? ActiveRecord::Base.connection.schema_search_path : ''
       end
-      def find_by_contents(query, ferret_options = {}, db_options = {})
-        pg_options = {}
-        if ferret_options[:page]
-          pg_options[:page] = ferret_options.delete(:page)
-        end
-        if ferret_options[:per_page]
-          pg_options[:per_page] = ferret_options.delete(:per_page)
-        end
-
-        ferret_options[:limit] = :all
-
-        ferret_query = (Noosfero::MultiTenancy.on? and ActiveRecord::Base.postgresql?) ? "+schema_name:\"#{schema_name}\" AND #{query}" : query
-        # FIXME this is a HORRIBLE HACK
-        ids = find_ids_with_ferret(ferret_query, ferret_options)[1][0..8000].map{|r|r[:id].to_i}
-
-        if ids.empty?
-          ids << -1
-        end
+      def find_by_contents(query, pg_options = {}, options = {}, db_options = {})
+        pg_options[:page] ||= 1
+        options[:limit] = 1000000;
+        options[:scores] = true;
-        if db_options[:conditions]
-          db_options[:conditions] = sanitize_sql_for_conditions(db_options[:conditions]) + " and #{table_name}.id in (#{ids.join(', ')})"
+        query = !schema_name.empty? ? "+schema_name:\"#{schema_name}\" AND #{query}" : query
+        solr_result = find_by_solr(query, options)
+        if solr_result.nil?
+          results = facets = []
         else
-          db_options[:conditions] = "#{table_name}.id in (#{ids.join(', ')})"
+          facets = options.include?(:facets) ? solr_result.facets : {}
+          if db_options.empty?
+            results = solr_result.results.paginate(pg_options)
+          else
+            ids = solr_result.results.map{|r|r[:id].to_i}
+            if ids.empty?
+              ids << -1
+            end
+
+            if db_options[:conditions]
+              db_options[:conditions] = sanitize_sql_for_conditions(db_options[:conditions]) + " and #{table_name}.id in (#{ids.join(', ')})"
+            else
+              db_options[:conditions] = "#{table_name}.id in (#{ids.join(', ')})"
+            end
+
+            result = find(:all, db_options)
+            results = result.paginate(pg_options)
+          end
         end
-        pg_options[:page] ||= 1
-        result = find(:all, db_options)
-        result.paginate(pg_options)
+        {:results => results, :facets => facets}
       end
     end
   end
@@ -47,6 +47,10 @@ class Test::Unit::TestCase
   include AuthenticatedTestHelper
   fixtures :environments, :roles
+
+  def self.setup
+    ActsAsSolr::Post.execute(Solr::Request::Delete.new(:query => '*:*'))
+  end
   def self.all_fixtures
     Dir.glob(File.join(RAILS_ROOT, 'test', 'fixtures', '*.yml')).each do |item|
@@ -190,7 +194,6 @@ class Test::Unit::TestCase
     adapter.any_instance.stubs(:adapter_name).returns('PostgreSQL')
     adapter.any_instance.stubs(:schema_search_path).returns(schema_name)
     Noosfero::MultiTenancy.stubs(:on?).returns(true)
-    reload_for_ferret
   end
   def uses_sqlite
@@ -199,20 +202,6 @@ class Test::Unit::TestCase
     Noosfero::MultiTenancy.stubs(:on?).returns(false)
   end
-  def reload_for_ferret
-    ActsAsFerret.send(:remove_const, :DEFAULT_FIELD_OPTIONS)
-    load File.join(RAILS_ROOT, 'lib', 'acts_as_searchable.rb')
-    load File.join(RAILS_ROOT, 'vendor', 'plugins', 'acts_as_ferret', 'lib', 'acts_as_ferret.rb')
-    [Article, Profile, Product].each do |clazz|
-      inst_meth = clazz.instance_methods.reject{ |m| m =~ /_to_ferret$/ }
-      clazz.stubs(:instance_methods).returns(inst_meth)
-    end
-    #FIXME Is there a way to avoid this replication from model code?
-    Article.acts_as_searchable :additional_fields => [ :comment_data ]
-    Profile.acts_as_searchable :additional_fields => [ :extra_data_for_index ]
-    Product.acts_as_searchable :fields => [ :name, :description, :category_full_name ]
-  end
-
 end
 module NoosferoTestHelper
@@ -5,6 +5,7 @@ class ArticleTest &lt; Test::Unit::TestCase
   fixtures :environments
   def setup
+    Test::Unit::TestCase::setup
     @profile = create_user('testing').person
   end
   attr_reader :profile
@@ -356,7 +357,7 @@ class ArticleTest &lt; Test::Unit::TestCase
   should 'reindex when comments are changed' do
     a = Article.new
-    a.expects(:ferret_update)
+    a.expects(:solr_save)
     a.comments_updated
   end
@@ -365,7 +366,7 @@ class ArticleTest &lt; Test::Unit::TestCase
     art = owner.articles.build(:name => 'ytest'); art.save!
     c1 = art.comments.build(:title => 'a nice comment', :body => 'anything', :author => owner); c1.save!
-    assert_includes Article.find_by_contents('nice'), art
+    assert_includes Article.find_by_contents('nice')[:results], art
   end
   should 'index comments body together with article' do
@@ -373,7 +374,7 @@ class ArticleTest &lt; Test::Unit::TestCase
     art = owner.articles.build(:name => 'ytest'); art.save!
     c1 = art.comments.build(:title => 'test comment', :body => 'anything', :author => owner); c1.save!
-    assert_includes Article.find_by_contents('anything'), art
+    assert_includes Article.find_by_contents('anything')[:results], art
   end
   should 'cache children count' do
@@ -1506,24 +1507,24 @@ class ArticleTest &lt; Test::Unit::TestCase
   should 'index by schema name when database is postgresql' do
     uses_postgresql 'schema_one'
     art1 = Article.create!(:name => 'some thing', :profile_id => @profile.id)
-    assert_equal Article.find_by_contents('thing'), [art1]
+    assert_equal Article.find_by_contents('thing')[:results], [art1]
     uses_postgresql 'schema_two'
     art2 = Article.create!(:name => 'another thing', :profile_id => @profile.id)
-    assert_not_includes Article.find_by_contents('thing'), art1
-    assert_includes Article.find_by_contents('thing'), art2
+    assert_not_includes Article.find_by_contents('thing')[:results], art1
+    assert_includes Article.find_by_contents('thing')[:results], art2
     uses_postgresql 'schema_one'
-    assert_includes Article.find_by_contents('thing'), art1
-    assert_not_includes Article.find_by_contents('thing'), art2
+    assert_includes Article.find_by_contents('thing')[:results], art1
+    assert_not_includes Article.find_by_contents('thing')[:results], art2
     uses_sqlite
   end
   should 'not index by schema name when database is not postgresql' do
     uses_sqlite
     art1 = Article.create!(:name => 'some thing', :profile_id => @profile.id)
-    assert_equal Article.find_by_contents('thing'), [art1]
+    assert_equal Article.find_by_contents('thing')[:results], [art1]
     art2 = Article.create!(:name => 'another thing', :profile_id => @profile.id)
-    assert_includes Article.find_by_contents('thing'), art1
-    assert_includes Article.find_by_contents('thing'), art2
+    assert_includes Article.find_by_contents('thing')[:results], art1
+    assert_includes Article.find_by_contents('thing')[:results], art2
   end
   should 'get images paths in article body' do
@@ -3,11 +3,12 @@ require File.dirname(__FILE__) + &#39;/../test_helper&#39;
 class CategoryFinderTest < ActiveSupport::TestCase
   def setup
+    Test::Unit::TestCase::setup
     @category = Category.create!(:name => 'my category', :environment => Environment.default)
     @finder = CategoryFinder.new(@category)
     @product_category = fast_create(ProductCategory, :name => 'Products')
-    Profile.rebuild_index
+    Profile.rebuild_solr_index
   end
   should 'search for articles in a specific category' do
@@ -4,6 +4,7 @@ class EnterpriseTest &lt; Test::Unit::TestCase
   fixtures :profiles, :environments, :users
   def setup
+    Test::Unit::TestCase::setup
     @product_category = fast_create(ProductCategory, :name => 'Products')
   end
@@ -91,7 +92,7 @@ class EnterpriseTest &lt; Test::Unit::TestCase
     ent2 = fast_create(Enterprise, :name => 'test2', :identifier => 'test2')
-    result = Enterprise.find_by_contents(prod_cat.name)
+    result = Enterprise.find_by_contents(prod_cat.name)[:results]
     assert_includes result, ent1
     assert_not_includes result, ent2
@@ -105,7 +106,7 @@ class EnterpriseTest &lt; Test::Unit::TestCase
     ent2 = fast_create(Enterprise, :name => 'test2', :identifier => 'test2')
-    result = Enterprise.find_by_contents(prod_cat.name)
+    result = Enterprise.find_by_contents(prod_cat.name)[:results]
     assert_includes result, ent1
     assert_not_includes result, ent2
@@ -406,6 +407,12 @@ class EnterpriseTest &lt; Test::Unit::TestCase
     assert_equal product.inputs, enterprise.inputs
   end
+  
+  should 'reindex when products are changed' do
+    a = Enterprise.new
+    a.expects(:solr_save)
+    a.product_updated
+  end
   should "the followed_by? be true only to members" do
     e = fast_create(Enterprise)
@@ -3,6 +3,7 @@ require File.dirname(__FILE__) + &#39;/../test_helper&#39;
 class EnvironmentFinderTest < ActiveSupport::TestCase
   def setup
+    Test::Unit::TestCase::setup
     @product_category = fast_create(ProductCategory, :name => 'Products')
   end
@@ -3,6 +3,10 @@ require File.dirname(__FILE__) + &#39;/../test_helper&#39;
 class EnvironmentTest < Test::Unit::TestCase
   fixtures :environments
+  def setup
+    Test::Unit::TestCase::setup
+  end
+
   def test_exists_default_and_it_is_unique
     Environment.delete_all
     vc = Environment.new(:name => 'Test Community')
@@ -444,7 +448,7 @@ class EnvironmentTest &lt; Test::Unit::TestCase
   should 'find by contents from articles' do
     environment = fast_create(Environment)
     assert_nothing_raised do
-      environment.articles.find_by_contents('')
+      environment.articles.find_by_contents('')[:results]
     end
   end
@@ -561,7 +565,7 @@ class EnvironmentTest &lt; Test::Unit::TestCase
       Enterprise.create!(:name => 'test ' + n, :identifier => 'test_' + n)
     end
-    assert_equal 20, env.enterprises.find_by_contents('test').total_entries
+    assert_equal 20, env.enterprises.find_by_contents('test')[:results].total_entries
   end
   should 'set replace_enterprise_template_when_enable on environment' do
@@ -2,6 +2,10 @@ require File.dirname(__FILE__) + &#39;/../test_helper&#39;
 class EventTest < ActiveSupport::TestCase
+  def setup
+    Test::Unit::TestCase::setup
+  end
+
   should 'be an article' do
     assert_kind_of Article, Event.new
   end
@@ -59,13 +63,13 @@ class EventTest &lt; ActiveSupport::TestCase
   should 'be indexed by title' do
     profile = create_user('testuser').person
     e = Event.create!(:name => 'my surprisingly nice event', :start_date => Date.new(2008, 06, 06), :profile => profile)
-    assert_includes Event.find_by_contents('surprisingly'), e
+    assert_includes Event.find_by_contents('surprisingly')[:results], e
   end
   should 'be indexed by body' do
     profile = create_user('testuser').person
     e = Event.create!(:name => 'bli', :start_date => Date.new(2008, 06, 06), :profile => profile, :body => 'my surprisingly long description about my freaking nice event')
-    assert_includes Event.find_by_contents('surprisingly'), e
+    assert_includes Event.find_by_contents('surprisingly')[:results], e
   end
   should 'use its own icon' do
@@ -3,6 +3,7 @@ require File.dirname(__FILE__) + &#39;/../test_helper&#39;
 class ProductTest < Test::Unit::TestCase
   def setup
+    Test::Unit::TestCase::setup
     @product_category = fast_create(ProductCategory, :name => 'Products')
   end
@@ -92,7 +93,7 @@ class ProductTest &lt; Test::Unit::TestCase
     p.stubs(:category_full_name).returns('interesting category')
     p.save!
-    assert_includes Product.find_by_contents('interesting'), p
+    assert_includes Product.find_by_contents('interesting')[:results], p
   end
   should 'have same lat and lng of its enterprise' do
@@ -355,24 +356,24 @@ class ProductTest &lt; Test::Unit::TestCase
   should 'index by schema name when database is postgresql' do
     uses_postgresql 'schema_one'
     p1 = Product.create!(:name => 'some thing', :product_category => @product_category)
-    assert_equal Product.find_by_contents('thing'), [p1]
+    assert_equal Product.find_by_contents('thing')[:results], [p1]
     uses_postgresql 'schema_two'
     p2 = Product.create!(:name => 'another thing', :product_category => @product_category)
-    assert_not_includes Product.find_by_contents('thing'), p1
-    assert_includes Product.find_by_contents('thing'), p2
+    assert_not_includes Product.find_by_contents('thing')[:results], p1
+    assert_includes Product.find_by_contents('thing')[:results], p2
     uses_postgresql 'schema_one'
-    assert_includes Product.find_by_contents('thing'), p1
-    assert_not_includes Product.find_by_contents('thing'), p2
+    assert_includes Product.find_by_contents('thing')[:results], p1
+    assert_not_includes Product.find_by_contents('thing')[:results], p2
     uses_sqlite
   end
   should 'not index by schema name when database is not postgresql' do
     uses_sqlite
     p1 = Product.create!(:name => 'some thing', :product_category => @product_category)
-    assert_equal Product.find_by_contents('thing'), [p1]
+    assert_equal Product.find_by_contents('thing')[:results], [p1]
     p2 = Product.create!(:name => 'another thing', :product_category => @product_category)
-    assert_includes Product.find_by_contents('thing'), p1
-    assert_includes Product.find_by_contents('thing'), p2
+    assert_includes Product.find_by_contents('thing')[:results], p1
+    assert_includes Product.find_by_contents('thing')[:results], p2
   end
 end
@@ -3,6 +3,10 @@ require File.dirname(__FILE__) + &#39;/../test_helper&#39;
 class ProfileTest < Test::Unit::TestCase
   fixtures :profiles, :environments, :users, :roles, :domains
+  def setup
+    Test::Unit::TestCase::setup
+  end
+
   def test_identifier_validation
     p = Profile.new
     p.valid?
@@ -100,8 +104,8 @@ class ProfileTest &lt; Test::Unit::TestCase
   def test_find_by_contents
     p = create(Profile, :name => 'wanted')
-    assert Profile.find_by_contents('wanted').include?(p)
-    assert ! Profile.find_by_contents('not_wanted').include?(p)
+    assert Profile.find_by_contents('wanted')[:results].include?(p)
+    assert ! Profile.find_by_contents('not_wanted')[:results].include?(p)
   end
   should 'remove pages when removing profile' do
@@ -192,10 +196,10 @@ class ProfileTest &lt; Test::Unit::TestCase
     small = create(Profile, :name => 'A small profile for testing')
     big = create(Profile, :name => 'A big profile for testing')
-    assert Profile.find_by_contents('small').include?(small)
-    assert Profile.find_by_contents('big').include?(big)
+    assert Profile.find_by_contents('small')[:results].include?(small)
+    assert Profile.find_by_contents('big')[:results].include?(big)
-    both = Profile.find_by_contents('profile testing')
+    both = Profile.find_by_contents('profile testing')[:results]
     assert both.include?(small)
     assert both.include?(big)
   end
@@ -517,18 +521,18 @@ class ProfileTest &lt; Test::Unit::TestCase
   should 'actually index by results of extra_data_for_index' do
     profile = TestingExtraDataForIndex.create!(:name => 'testprofile', :identifier => 'testprofile')
-    assert_includes TestingExtraDataForIndex.find_by_contents('sample'), profile
+    assert_includes TestingExtraDataForIndex.find_by_contents('sample')[:results], profile
   end
   should 'index profile identifier for searching' do
     Profile.destroy_all
     p = create(Profile, :identifier => 'lalala')
-    assert_includes Profile.find_by_contents('lalala'), p
+    assert_includes Profile.find_by_contents('lalala')[:results], p
   end
   should 'index profile name for searching' do
     p = create(Profile, :name => 'Interesting Profile')
-    assert_includes Profile.find_by_contents('interesting'), p
+    assert_includes Profile.find_by_contents('interesting')[:results], p
   end
   should 'enabled by default on creation' do
@@ -1671,24 +1675,24 @@ class ProfileTest &lt; Test::Unit::TestCase
   should 'index by schema name when database is postgresql' do
     uses_postgresql 'schema_one'
     p1 = Profile.create!(:name => 'some thing', :identifier => 'some-thing')
-    assert_equal Profile.find_by_contents('thing'), [p1]
+    assert_equal Profile.find_by_contents('thing')[:results], [p1]
     uses_postgresql 'schema_two'
     p2 = Profile.create!(:name => 'another thing', :identifier => 'another-thing')
-    assert_not_includes Profile.find_by_contents('thing'), p1
-    assert_includes Profile.find_by_contents('thing'), p2
+    assert_not_includes Profile.find_by_contents('thing')[:results], p1
+    assert_includes Profile.find_by_contents('thing')[:results], p2
     uses_postgresql 'schema_one'
-    assert_includes Profile.find_by_contents('thing'), p1
-    assert_not_includes Profile.find_by_contents('thing'), p2
+    assert_includes Profile.find_by_contents('thing')[:results], p1
+    assert_not_includes Profile.find_by_contents('thing')[:results], p2
     uses_sqlite
   end
   should 'not index by schema name when database is not postgresql' do
     uses_sqlite
     p1 = Profile.create!(:name => 'some thing', :identifier => 'some-thing')
-    assert_equal Profile.find_by_contents('thing'), [p1]
+    assert_equal Profile.find_by_contents('thing')[:results], [p1]
     p2 = Profile.create!(:name => 'another thing', :identifier => 'another-thing')
-    assert_includes Profile.find_by_contents('thing'), p1
-    assert_includes Profile.find_by_contents('thing'), p2
+    assert_includes Profile.find_by_contents('thing')[:results], p1
+    assert_includes Profile.find_by_contents('thing')[:results], p2
   end
   should 'know if url is the profile homepage' do
@@ -3,7 +3,8 @@ require File.dirname(__FILE__) + &#39;/../test_helper&#39;
 class TinyMceArticleTest < Test::Unit::TestCase
   def setup
-    Article.rebuild_index
+    Test::Unit::TestCase::setup
+    Article.rebuild_solr_index
     @profile = create_user('zezinho').person
   end
   attr_reader :profile
@@ -23,8 +24,8 @@ class TinyMceArticleTest &lt; Test::Unit::TestCase
   should 'be found when searching for articles by query' do
     tma = TinyMceArticle.create!(:name => 'test tinymce article', :body => '---', :profile => profile)
-    assert_includes TinyMceArticle.find_by_contents('article'), tma
-    assert_includes Article.find_by_contents('article'), tma
+    assert_includes TinyMceArticle.find_by_contents('article')[:results], tma
+    assert_includes Article.find_by_contents('article')[:results], tma
   end
   should 'not sanitize target attribute' do
@@ -87,7 +87,7 @@ module ActsAsSolr #:nodoc:
     def solr_type_condition
       subclasses.inject("(#{solr_configuration[:type_field]}:#{self.name}") do |condition, subclass|
-        condition << " OR #{solr_configuration[:type_field]}:#{subclass.name}"
+        condition << (subclass.name.empty? ? "" : " OR #{solr_configuration[:type_field]}:#{subclass.name}")
       end << ')'
     end
@@ -198,4 +198,4 @@ module ActsAsSolr #:nodoc:
     end
   end
-end
 \ No newline at end of file
+end
	@@ -126,11 +126,11 @@ class ProfileMembersController < MyProfileController		@@ -126,11 +126,11 @@ class ProfileMembersController < MyProfileController
126	if !params[:query] \|\| params[:query].length <= 2	126	if !params[:query] \|\| params[:query].length <= 2
127	@users_found = []	127	@users_found = []
128	elsif params[:scope] == 'all_users'	128	elsif params[:scope] == 'all_users'
129	- @users_found = Person.find_by_contents(params[:query] + '*').select {\|user\| !profile.members.include?(user)}	129	+ @users_found = Person.find_by_contents(params[:query] + '*')[:results].select {\|user\| !profile.members.include?(user)}
130	@button_alt = _('Add member')	130	@button_alt = _('Add member')
131	@add_action = {:action => 'add_member'}	131	@add_action = {:action => 'add_member'}
132	elsif params[:scope] == 'new_admins'	132	elsif params[:scope] == 'new_admins'
133	- @users_found = Person.find_by_contents(params[:query] + '*').select {\|user\| profile.members.include?(user) && !profile.admins.include?(user)}	133	+ @users_found = Person.find_by_contents(params[:query] + '*')[:results].select {\|user\| profile.members.include?(user) && !profile.admins.include?(user)}
134	@button_alt = _('Add member')	134	@button_alt = _('Add member')
135	@add_action = {:action => 'add_admin'}	135	@add_action = {:action => 'add_admin'}
136	end	136	end
	@@ -19,7 +19,7 @@ class BrowseController < PublicController		@@ -19,7 +19,7 @@ class BrowseController < PublicController
19	@results = @environment.people.visible.send(@filter)	19	@results = @environment.people.visible.send(@filter)
20		20
21	if !params[:query].blank?	21	if !params[:query].blank?
22	- @results = @results.find_by_contents(params[:query])	22	+ @results = @results.find_by_contents(params[:query])[:results]
23	end	23	end
24	@results = @results.compact.paginate(:per_page => per_page, :page => params[:page])	24	@results = @results.compact.paginate(:per_page => per_page, :page => params[:page])
25	end	25	end
	@@ -31,7 +31,7 @@ class BrowseController < PublicController		@@ -31,7 +31,7 @@ class BrowseController < PublicController
31	@results = @environment.communities.visible.send(@filter)	31	@results = @environment.communities.visible.send(@filter)
32		32
33	if !params[:query].blank?	33	if !params[:query].blank?
34	- @results = @results.find_by_contents(params[:query])	34	+ @results = @results.find_by_contents(params[:query])[:results]
35	end	35	end
36	@results = @results.compact.paginate(:per_page => per_page, :page => params[:page])	36	@results = @results.compact.paginate(:per_page => per_page, :page => params[:page])
37	end	37	end
	@@ -388,7 +388,7 @@ class Article < ActiveRecord::Base		@@ -388,7 +388,7 @@ class Article < ActiveRecord::Base
388	end	388	end
389		389
390	def comments_updated	390	def comments_updated
391	- ferret_update	391	+ solr_save
392	end	392	end
393		393
394	def accept_category?(cat)	394	def accept_category?(cat)
	@@ -71,7 +71,7 @@ class Enterprise < Organization		@@ -71,7 +71,7 @@ class Enterprise < Organization
71	end	71	end
72		72
73	def product_updated	73	def product_updated
74	- ferret_update	74	+ solr_save
75	end	75	end
76		76
77	after_save do \|e\|	77	after_save do \|e\|
	@@ -48,14 +48,14 @@ class EnvironmentFinder		@@ -48,14 +48,14 @@ class EnvironmentFinder
48	end	48	end
49	end	49	end
50	else	50	else
51	- ferret_options = {:page => options.delete(:page), :per_page => options.delete(:per_page)}	51	+ pg_options = {:page => options.delete(:page), :per_page => options.delete(:per_page)}
52	if product_category && asset == :products	52	if product_category && asset == :products
53	# SECURITY no risk of SQL injection, since product_category_ids comes from trusted source	53	# SECURITY no risk of SQL injection, since product_category_ids comes from trusted source
54	- @environment.send(asset).find_by_contents(query, ferret_options, options.merge({:include => 'product_categorizations', :conditions => 'product_categorizations.category_id = (%s)' % product_category.id }))	54	+ @environment.send(asset).find_by_contents(query, pg_options, {}, options.merge({:include => 'product_categorizations', :conditions => 'product_categorizations.category_id = (%s)' % product_category.id }))[:results]
55	elsif product_category && asset == :enterprises	55	elsif product_category && asset == :enterprises
56	- @environment.send(asset).find_by_contents(query, ferret_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})"))	56	+ @environment.send(asset).find_by_contents(query, pg_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})"))[:results]
57	else	57	else
58	- @environment.send(asset).find_by_contents(query, ferret_options, options)	58	+ @environment.send(asset).find_by_contents(query, pg_options, {}, options)[:results]
59	end	59	end
60	end	60	end
61	end	61	end
	@@ -3,6 +3,7 @@ require File.dirname(__FILE__) + '/../test_helper'		@@ -3,6 +3,7 @@ require File.dirname(__FILE__) + '/../test_helper'
3	class EnvironmentFinderTest < ActiveSupport::TestCase	3	class EnvironmentFinderTest < ActiveSupport::TestCase
4		4
5	def setup	5	def setup
		6	+ Test::Unit::TestCase::setup
6	@product_category = fast_create(ProductCategory, :name => 'Products')	7	@product_category = fast_create(ProductCategory, :name => 'Products')
7	end	8	end
8		9