Changeset 319

Timestamp:

02/18/08 20:36:04 (8 months ago)

Author:

jk

Message:

only some failures left

Files:

• trunk/demo/app/controllers/admin/backend_controller.rb (modified) (1 diff)
• trunk/demo/test/unit/comment_test.rb (modified) (11 diffs)
• trunk/demo/test/unit/content_test.rb (modified) (9 diffs)
• trunk/demo/test/unit/shared_index1_test.rb (modified) (6 diffs)
• trunk/demo/test/unit/special_content_test.rb (modified) (1 diff)
• trunk/plugin/acts_as_ferret/lib/acts_as_ferret.rb (modified) (4 diffs)
• trunk/plugin/acts_as_ferret/lib/class_methods.rb (modified) (14 diffs)
• trunk/plugin/acts_as_ferret/lib/index.rb (modified) (1 diff)
• trunk/plugin/acts_as_ferret/lib/local_index.rb (modified) (4 diffs)
• trunk/plugin/acts_as_ferret/lib/more_like_this.rb (modified) (1 diff)
• trunk/plugin/acts_as_ferret/lib/multi_index.rb (modified) (6 diffs)
• trunk/plugin/acts_as_ferret/lib/remote_index.rb (modified) (1 diff)
• trunk/plugin/acts_as_ferret/lib/shared_index_class_methods.rb (modified) (4 diffs)

trunk/demo/app/controllers/admin/backend_controller.rb

@@ -4 +4 @@
-    @query = params[:query] || ''
-    unless @query.blank?
-by_contents
+with_ferret
-    end
-  end

trunk/demo/test/unit/comment_test.rb

@@ -31 +31 @@
-  def test_search_for_id
-    # don't search the id field by default:
-by_contents
+with_ferret
-    # explicit query for id field works:
-by_contents
+with_ferret
-  end
-
@@ -45 +45 @@
-    # TODO: check why this fails, but querying for 'comment fixture' works.
-    # maybe different analyzers at index creation and searching time ?
-by_contents
-by_contents
+with_ferret
+with_ferret
-    assert_equal 2, comments_from_ferret.size
-    assert comments_from_ferret.include?(comments(:first))
@@ -54 +54 @@
-  def test_rebuild_index
-    Comment.aaf_index.ferret_index.query_delete('comment')
-by_contents
+with_ferret
-    assert comments_from_ferret.empty?
-    Comment.rebuild_index
-by_contents
+with_ferret
-    assert_equal 2, comments_from_ferret.size
-  end
-
-  def test_total_hits
-by_contents
+with_ferret
-    assert_equal 1, comments_from_ferret.size
-    assert_equal 2, comments_from_ferret.total_hits
-
-by_contents
+with_ferret
-    assert_equal 1, comments_from_ferret.size
-    assert_equal 1, comments_from_ferret.total_hits
@@ -72 +72 @@
-
-  def test_score
-by_contents
+with_ferret
-    assert comments_from_ferret.first
-    assert comments_from_ferret.first.ferret_score > 0
@@ -81 +81 @@
-      Comment.create( :author => 'multi-commenter', :content => "This is multicomment no #{i}" )
-    end
-by_contents
+with_ferret
-    assert_equal 20, res.total_hits
-by_contents
+with_ferret
-    assert_equal 20, res.total_hits
-by_contents
+with_ferret
-    assert_equal 20, res.total_hits
-  end
@@ -101 +101 @@
-  end
-
-by_contents
+with_ferret
-    comment = Comment.create( :author => 'john doe', :content => 'This is a useless comment' )
-    comment2 = Comment.create( :author => 'another', :content => 'content' )
-
-by_contents
+with_ferret
-    assert_equal 2, comments_from_ferret.size
-    assert comments_from_ferret.include?(comment)
@@ -111 +111 @@
-    
-    # find options
-by_contents
+with_ferret
-    assert_equal 1, comments_from_ferret.size
-    assert comments_from_ferret.include?(comment2)
-    
-by_contents
-
-
-by_contents
+with_ferret
+
+
+with_ferret
-    assert_equal 1, comments_from_ferret.size
-    assert_equal comment2.id, comments_from_ferret.first.id
-    
-by_contents
-
-
-
-by_contents
+with_ferret
+
+
+
+with_ferret
-    assert_equal 1, comments_from_ferret.size
-    assert_equal comment.id, comments_from_ferret.first.id
-  
-    # no monkeys here
-by_contents
+with_ferret
-    assert comments_from_ferret.empty?
-    
-    # multiple terms are ANDed by default...
-by_contents
+with_ferret
-    assert comments_from_ferret.empty?
-    # ...unless you connect them by OR
-by_contents
+with_ferret
-    assert_equal 3, comments_from_ferret.size
-    assert comments_from_ferret.include?(comment)
@@ -146 +146 @@
-    # multiple terms, each term has to occur in a document to be found, 
-    # but they may occur in different fields
-by_contents
+with_ferret
-    assert_equal 1, comments_from_ferret.size
-    assert_equal comment.id, comments_from_ferret.first.id
@@ -152 +152 @@
-
-    # search for an exact string by enclosing it in "
-by_contents
-
-by_contents
+with_ferret
+
+with_ferret
-    assert_equal 1, comments_from_ferret.size
-    assert_equal comment.id, comments_from_ferret.first.id
@@ -187 +187 @@
-    comment = Comment.create( :author => 'john doe', :content => 'Move or shake' )
-    ['move shake', 'Move shake', 'move Shake', 'move or shake', 'move the shake'].each do |q|
-by_contents
+with_ferret
-      assert_equal comment, comments_from_ferret.first, "query #{q} failed"
-    end
@@ -194 +194 @@
-
-  def test_array_conditions_combining 
-by_contents
+with_ferret
-    assert_equal 1, comments_from_ferret.size 
-    assert_equal 1, comments_from_ferret.total_hits 

trunk/demo/test/unit/content_test.rb

@@ -29 +29 @@
-
-  def test_limit_all
-by_contents
+with_ferret
-  end
-
@@ -49 +49 @@
-  end
-
-  # weiter: single index / multisearch lazy loading
-  def test_lazy_loading
-    results = Content.find_with_ferret 'description', :lazy => true
@@ -356 +355 @@
-  end
-  
-  def test_total_hits_multi
-    q = '*:title OR *:comment'
-    assert_equal 3, Comment.total_hits(q)
-    assert_equal 2, Content.total_hits(q)
-    assert_equal 5, ActsAsFerret::total_hits(q, [ Comment, Content ])
-  end
-
-  def test_multi_search_sorting
-    sorting = [ Ferret::Search::SortField.new(:id) ]
-    result = Content.find_with_ferret('*:title OR *:comment', :multi => [Comment], :sort => sorting)
-    assert_equal result.map(&:id).sort, result.map(&:id)
-
-    sorting = [ Ferret::Search::SortField.new(:title) ]
-    result = Content.find_with_ferret('*:title OR *:comment', :multi => [Comment], :sort => sorting)
-    sorting = [ Ferret::Search::SortField.new(:title, :reverse => true) ]
-    result2 = Content.find_with_ferret('*:title OR *:comment', :multi => [Comment], :sort => sorting)
-    assert result.any?
-    assert result.map(&:id) != result2.map(&:id)
-
-    sorting = [ Ferret::Search::SortField::SCORE ]
-    result = Content.find_with_ferret('*:title OR *:comment', :multi => Comment, :sort => sorting)
-    assert result.any?
-    assert_equal result.map(&:ferret_score).sort.reverse, result.map(&:ferret_score)
-
-    sorting = [ Ferret::Search::SortField::SCORE_REV ]
-    result2 = Content.find_with_ferret('*:title OR *:comment', :multi => Comment, :sort => sorting)
-    assert_equal result2.map(&:ferret_score).sort, result2.map(&:ferret_score)
-    assert_equal result.map(&:ferret_score), result2.map(&:ferret_score).reverse
-  end
-
-  def test_sort_class
-    sorting = Ferret::Search::Sort.new(Ferret::Search::SortField.new(:id, :reverse => true))
@@ -414 +383 @@
-  end
-  
-  # remote index rebuilds will create an index in a directory with a timestamped name.
-  # the local MultiIndex instance doesn't know about this (because it's running in 
-  # another interpreter instance than the server) and therefore fails to use the 
-  # correct index directories.
-  # TODO strange, still doesn't work but it should now...
-  unless Content.aaf_configuration[:remote]
-    def test_multi_index
-      i =  ActsAsFerret::MultiIndex.new([Content, Comment])
-      hits = i.search(TermQuery.new(:title,"title"))
-      assert_equal 1, hits.total_hits
-
-      qp = Ferret::QueryParser.new(:default_field => "title", 
-                                  :analyzer => Ferret::Analysis::WhiteSpaceAnalyzer.new)
-      hits = i.search(qp.parse("title"))
-      assert_equal 1, hits.total_hits
-      
-      qp = Ferret::QueryParser.new(:fields => ['title', 'content', 'description'],
-                        :analyzer => Ferret::Analysis::WhiteSpaceAnalyzer.new)
-      hits = i.search(qp.parse("title"))
-      assert_equal 2, hits.total_hits
-      hits = i.search(qp.parse("title:title OR description:title"))
-      assert_equal 2, hits.total_hits
-
-      hits = i.search("title:title OR description:title OR title:comment OR description:comment OR content:comment")
-      assert_equal 5, hits.total_hits
-
-      hits = i.search("title OR comment")
-      assert_equal 5, hits.total_hits
-
-      hits = i.search("title OR comment", :limit => 2)
-      count = 0
-      hits.hits.each { |hit, score| count += 1 }
-      assert_equal 2, count
-
-      hits = i.search("title OR comment", :offset => 2)
-      count = 0
-      hits.hits.each { |hit, score| count += 1 }
-      assert_equal 3, count
-    end
-  end
-
-  def test_add_rebuilds_index
@@ -467 +396 @@
-  end
-
-  def test_multi_search_rebuilds_index
-    remove_index Content
-    contents_from_ferret = Content.find_with_ferret('description:title', :multi => Comment)
-    assert_equal 1, contents_from_ferret.size
-  end
-
-  # remote index rebuilds will create an index in a directory with a timestamped name...
-  unless Content.aaf_configuration[:remote]
-    def test_multi_index_rebuilds_index
-      remove_index Content
-      i =  ActsAsFerret::MultiIndex.new([Content])
-      assert File.exists?("#{ActsAsFerret::index_definition(Content)[:index_dir]}/segments")
-      hits = i.search("description:title")
-      assert_equal 1, hits.total_hits, hits.inspect
-    end
-  end
-
-  def test_multi_search_find_options
-    contents_from_ferret = Content.find_with_ferret('title', { :multi => Comment }, :order => 'id desc')
-    assert_equal 2, contents_from_ferret.size
-    assert contents_from_ferret.first.id > contents_from_ferret.last.id
-    contents_from_ferret = Content.find_with_ferret('title', { :multi => Comment }, :order => 'id asc')
-    assert contents_from_ferret.first.id < contents_from_ferret.last.id
-
-    contents_from_ferret = Content.find_with_ferret('title', :multi => Comment, :limit => 1)
-    assert_equal 1, contents_from_ferret.size
-    contents_from_ferret = Content.find_with_ferret('title', { :multi => Comment }, :limit => 1)
-    assert_equal 1, contents_from_ferret.size
-
-
-    more_contents(true)
-    r = Content.find_with_ferret('title OR comment', { :multi => Comment, :limit => :all } )
-    assert_equal 60, r.size
-    assert_equal 60, r.total_hits
-
-    id = Content.find_with_ferret('title').first.id
-    r = Content.find_with_ferret('title OR comment', { :multi => Comment, :limit => :all },
-                                                     { :conditions => { :content => ["id != ?", id] }})
-    assert_equal 59, r.size
-    assert_equal 59, r.total_hits
-
-    r = Content.find_with_ferret('title OR comment', { :multi => Comment, :limit => 20 },
-                                                     { :conditions => { :content => ["id != ?", id] }})
-    assert_equal 20, r.size
-    assert_equal 59, r.total_hits
-
-    r = Content.find_with_ferret('title OR comment', { :multi => Comment, :limit => 20 },
-                                                     { :conditions => { :comment => 'content is null',
-                                                                        :content => ["id != ?", id] }})
-    assert_equal 20, r.size
-    assert_equal 29, r.total_hits
-
-    r = Content.find_with_ferret('title OR comment', { :multi => Comment },
-                                                     { :conditions => { :content => ["id != ?", id] }, :limit => 20 })
-    assert_equal 20, r.size
-    assert_equal 59, r.total_hits
-  end
-
-  def test_multi_search
-    assert_equal 4, ContentBase.find(:all).size
-    
-    Content.aaf_index.ferret_index.flush
-    contents_from_ferret = Content.find_with_ferret('description:title', :multi => [])
-    assert_equal 1, contents_from_ferret.size
-    contents_from_ferret = Content.find_with_ferret('title:title OR description:title', :multi => [])
-    assert_equal 2, contents_from_ferret.size
-    contents_from_ferret = Content.find_with_ferret('title:title', :multi => [])
-    assert_equal 1, contents_from_ferret.size
-    contents_from_ferret = Content.find_with_ferret('*:title', :multi => [])
-    assert_equal 2, contents_from_ferret.size
-    contents_from_ferret = Content.find_with_ferret('title', :multi => [])
-    assert_equal 2, contents_from_ferret.size
-    
-    assert_equal contents(:first).id, contents_from_ferret.first.id
-    assert_equal @another_content.id, contents_from_ferret.last.id
-    
-    contents_from_ferret = Content.find_with_ferret('title', :multi => [])
-    assert_equal 2, contents_from_ferret.size
-    contents_from_ferret = Content.find_with_ferret('title', :multi => [], :limit => 1)
-    assert_equal 1, contents_from_ferret.size
-    contents_from_ferret = Content.find_with_ferret('title', :multi => [], :offset => 1)
-    assert_equal 1, contents_from_ferret.size
-
-    contents_from_ferret = Content.find_with_ferret('title:title OR content:comment OR description:title', :multi => [Comment])
-    assert_equal 5, contents_from_ferret.size
-    contents_from_ferret = Content.find_with_ferret('title:title OR content:comment OR description:title', :multi => [Comment], :limit => 2)
-    assert_equal 2, contents_from_ferret.size
-
-    contents_from_ferret = Content.find_with_ferret('*:title OR *:comment', :multi => Comment)
-    assert_equal 5, contents_from_ferret.size
-    contents_from_ferret = Content.find_with_ferret('*:title OR *:comment', :multi => [Comment])
-    assert_equal 5, contents_from_ferret.size
-    contents_from_ferret = Content.find_with_ferret('title:(title OR comment) OR description:(title OR comment) OR content:(title OR comment)', :multi => [Comment])
-    assert_equal 5, contents_from_ferret.size
-  end
-
-  def test_multi_search_lazy
-    contents_from_ferret = Content.find_with_ferret('title', :multi => Comment, :lazy => true)
-    assert_equal 2, contents_from_ferret.size
-    contents_from_ferret.each do |record|
-      assert ActsAsFerret::FerretResult === record, record.inspect
-      assert !record.description.blank?
-      assert_nil record.instance_variable_get(:"@ar_record")
-    end
-  end
-
-  def test_id_multi_search
-    assert_equal 4, ContentBase.find(:all).size
-    
-    [ 'title:title OR description:title OR content:title', 'title', '*:title'].each do |query|
-      total_hits, contents_from_ferret = Content.id_multi_search(query)
-      assert_equal 2, contents_from_ferret.size, query
-      assert_equal 2, total_hits, query
-      assert_equal contents(:first).id, contents_from_ferret.first[:id].to_i
-      assert_equal @another_content.id, contents_from_ferret.last[:id].to_i
-    end
-
-    ContentBase.rebuild_index
-    Comment.rebuild_index
-    ['title OR comment', 'title:(title OR comment) OR description:(title OR comment) OR content:(title OR comment)'].each do |query|
-      total_hits, contents_from_ferret = Content.id_multi_search(query, [Comment])
-      assert_equal 5, contents_from_ferret.size, query
-      assert_equal 5, total_hits
-    end
-  end
-
-  def test_id_multi_search_lazy
-    total_hits, contents_from_ferret = Content.id_multi_search('title', [Comment], :lazy => true)
-    assert_equal 2, contents_from_ferret.size
-    assert_equal 2, total_hits
-    found = 0
-    contents_from_ferret.each do |data|
-      next if data[:model] != 'Content'
-      found += 1
-      assert !data[:data][:description].blank?
-    end
-    assert_equal 2, found
-  end
-
-  def test_total_hits
-    assert_equal 2, Content.total_hits('title:title OR description:title')
@@ -611 +401 @@
-  end
-
-_by_contents
-_by_contents
+s_with_ferret
+s_with_ferret
-    assert_equal 2, contents_from_ferret.size
-    assert_equal 2, total_hits
@@ -622 +412 @@
-     
-    # give description field higher boost:
-_by_contents
+s_with_ferret
-    assert_equal 2, contents_from_ferret.size
-    assert_equal 2, total_hits
@@ -732 +522 @@
-  end
-
-  def test_multi_pagination
-    more_contents(true)
-
-    r = Content.find_with_ferret 'title OR comment', :multi => Comment, :per_page => 10, :sort => 'title'
-    assert_equal 60, r.total_hits
-    assert_equal 10, r.size
-    assert_equal "0", r.first.description
-    assert_equal "9", r.last.description
-    assert_equal 1, r.current_page
-    assert_equal 6, r.page_count
-
-    r = Content.find_with_ferret 'title OR comment', :multi => Comment, :page => '2', :per_page => 10, :sort => 'title'
-    assert_equal 60, r.total_hits
-    assert_equal 10, r.size
-    assert_equal "10", r.first.description
-    assert_equal "19", r.last.description
-    assert_equal 2, r.current_page
-    assert_equal 6, r.page_count
-
-    r = Content.find_with_ferret 'title OR comment', :multi => Comment, :page => 7, :per_page => 10, :sort => 'title'
-    assert_equal 60, r.total_hits
-    assert_equal 0, r.size
-  end
-
-  def test_pagination
-    more_contents
@@ -845 +611 @@
-    assert_equal 3, r.current_page
-    assert_equal 3, r.page_count
-  end
-
-  def test_multi_pagination_with_ar_conditions
-    more_contents(true)
-    id = Content.find_with_ferret('title').first.id
-    r = Content.find_with_ferret 'title OR comment', { :page => 1, :per_page => 10, :multi => Comment }, 
-                                          { :conditions => { :content => ["id != ?", id] }, :order => 'id ASC' }
-    assert_equal 59, r.total_hits
-    assert_equal 10, r.size
-    assert_equal "Comment for content 00", r.first.content
-    assert_equal "Comment for content 09", r.last.content
-    assert_equal 1, r.current_page
-    assert_equal 6, r.page_count
-
-    r = Content.find_with_ferret 'title OR comment', { :page => 6, :per_page => 10, :multi => Comment },
-                                          { :conditions => { :content => [ "id != ?", id ] }, :order => 'id ASC' }
-    assert_equal 59, r.total_hits
-    assert_equal 9, r.size
-    assert_equal "21", r.first.description
-    assert_equal "29", r.last.description
-    assert_equal 6, r.current_page
-    assert_equal 6, r.page_count
-  end
-

trunk/demo/test/unit/shared_index1_test.rb

@@ -9 +9 @@
-
-  def test_lazy_loading_shared_index
-by_contents
+with_ferret
-    assert_equal 2, results.size
-    found_lazy_result = false
@@ -24 +24 @@
-  end
-
-_by_contents
-_by_contents
+s_with_ferret
+s_with_ferret
-    assert_equal 2, result.size
-  end
-
-by_contents
-by_contents
+with_ferret
+with_ferret
-    assert_equal 1, result.size, result.inspect
-    assert_equal shared_index1s(:first), result.first
-
-by_contents
+with_ferret
-    assert_equal 1, result.size
-    assert_equal shared_index1s(:first), result.first
@@ -40 +40 @@
-
-  def test_custom_query
-by_contents
+with_ferret
-    assert_equal 1, result.size
-    assert_equal shared_index1s(:first), result.first
-  end
-
-by_contents
-by_contents
+with_ferret
+with_ferret
-    assert_equal 2, result.size
-    assert result.include?(shared_index1s(:first))
-    assert result.include?(shared_index2s(:first))
-
-by_contents
+with_ferret
-    assert_equal 2, result.size
-    assert result.include?(shared_index1s(:first))
@@ -63 +63 @@
-
-  def test_destroy
-by_contents
+with_ferret
-    assert_equal 4, result.size
-    SharedIndex1.destroy(shared_index1s(:first))
-by_contents
+with_ferret
-    assert_equal 3, result.size
-    shared_index2s(:first).destroy
-by_contents
+with_ferret
-    assert_equal 2, result.size
-  end
@@ -75 +75 @@
-  def test_ferret_destroy
-    SharedIndex1.rebuild_index
-_by_contents
+s_with_ferret
-    assert_equal 4, result.first
-    shared_index1s(:first).ferret_destroy
-_by_contents
+s_with_ferret
-    assert_equal 3, result.first
-  end
@@ -84 +84 @@
-  def test_ferret_destroy_ticket_88
-    SharedIndex1.rebuild_index
-_by_contents
+s_with_ferret
-    assert_equal 4, result.first
-_by_contents
+s_with_ferret
-    assert_equal 4, result.first
-    SharedIndex1.destroy(shared_index1s(:first))
-_by_contents
+s_with_ferret
-    assert_equal 3, result.first
-_by_contents
+s_with_ferret
-    assert_equal 3, result.first
-    shared_index2s(:first).destroy
-_by_contents
+s_with_ferret
-    assert_equal 2, result.first
-_by_contents
+s_with_ferret
-    assert_equal 2, result.first
-  end
-
-  def test_update
-by_contents
+with_ferret
-    shared_index1s(:first).name = "new name"
-    shared_index1s(:first).save
-by_contents
-by_contents
-by_contents
-by_contents
+with_ferret
+with_ferret
+with_ferret
+with_ferret
-  end
-end

trunk/demo/test/unit/special_content_test.rb

@@ -15 +15 @@
-  end
-
-by_contents
-by_contents
+with_ferret
+with_ferret
-    assert_equal 1, contents_from_ferret.size
-    assert_equal ContentBase.find(3), contents_from_ferret.first
-by_contents
+with_ferret
-    assert contents_from_ferret.empty?
-    

trunk/plugin/acts_as_ferret/lib/acts_as_ferret.rb

@@ -195 +195 @@
-  end
-
-across
+with
-  def self.total_hits(query, models, options = {})
-    models = [models] unless Array === models
-    get_index_for(*models).total_hits query, options.merge( :models => models )
+  end
+
+  # find ids of records with multiple models
+  def self.find_ids(query, models, options = {})
+    get_index_for(*models).find_ids query, options.merge( :models => models )
+  end
+
+  def self.find(query, models, options = {}, ar_options = {})
+    # TODO generalize local/remote index so we can remove the workaround below
+    # (replace logic in class_methods#find_with_ferret)
+    if Class === models or models.size == 1
+      return (Class === models ? models : models.shift).find_with_ferret query, options, ar_options
+    end
+    index = get_index_for(*models)
+    multi = (MultiIndex === index or index.shared?)
+    if options[:per_page]
+      options[:page] = options[:page] ? options[:page].to_i : 1
+      limit = options[:per_page]
+      offset = (options[:page] - 1) * limit
+      if ar_options[:conditions] && !multi
+        ar_options[:limit] = limit
+        ar_options[:offset] = offset
+        options[:limit] = :all
+        options.delete :offset
+      else
+        # do pagination with ferret (or after everything is done in the case
+        # of multi_search)
+        options[:limit] = limit
+        options[:offset] = offset
+      end
+    elsif ar_options[:conditions]
+      if multi
+        # multisearch ignores find_options limit and offset
+        options[:limit] ||= ar_options.delete(:limit)
+        options[:offset] ||= ar_options.delete(:offset)
+      else
+        # let the db do the limiting and offsetting for single-table searches
+        unless options[:limit] == :all
+          ar_options[:limit] ||= options.delete(:limit)
+        end
+        ar_options[:offset] ||= options.delete(:offset)
+        options[:limit] = :all
+      end
+    end
+
+    total_hits, result = index.find_records query, options.merge(:models => models), ar_options
+    logger.debug "Query: #{query}\ntotal hits: #{total_hits}, results delivered: #{result.size}"
+    SearchResults.new(result, total_hits, options[:page], options[:per_page])
-  end
-
@@ -258 +305 @@
-  end
-
+  # retrieves search result records from a data structure like this:
+  # { 'Model1' => { '1' => [ rank, score ], '2' => [ rank, score ] }
+  #
+  # TODO: in case of STI AR will filter out hits from other 
+  # classes for us, but this
+  # will lead to less results retrieved --> scoping of ferret query
+  # to self.class is still needed.
+  # from the ferret ML (thanks Curtis Hatter)
+  # > I created a method in my base STI class so I can scope my query. For scoping
+  # > I used something like the following line:
+  # > 
+  # > query << " role:#{self.class.eql?(Contents) '*' : self.class}"
+  # > 
+  # > Though you could make it more generic by simply asking
+  # > "self.descends_from_active_record?" which is how rails decides if it should
+  # > scope your "find" query for STI models. You can check out "base.rb" in
+  # > activerecord to see that.
+  # but maybe better do the scoping in find_ids_with_ferret...
+  def self.retrieve_records(id_arrays, find_options = {})
+    result = []
+    # get objects for each model
+    id_arrays.each do |model, id_array|
+      next if id_array.empty?
+      model_class = begin
+        model.constantize
+      rescue
+        raise "Please use ':store_class_name => true' if you want to use multi_search.\n#{$!}"
+      end
+
+      # check for per-model conditions and take these if provided
+      if conditions = find_options[:conditions]
+        key = model.underscore.to_sym
+        conditions = conditions[key] if Hash === conditions
+      end
+
+      # merge conditions
+      conditions = combine_conditions([ "#{model_class.table_name}.#{model_class.primary_key} in (?)", 
+                                        id_array.keys ], 
+                                      conditions)
+
+
+      # check for include association that might only exist on some models in case of multi_search
+      filtered_include_options = []
+      if include_options = find_options[:include]
+        include_options = [ include_options ] unless include_options.respond_to?(:each)
+        include_options.each do |include_option|
+          filtered_include_options << include_option if model_class.reflections.has_key?(include_option.is_a?(Hash) ? include_option.keys[0].to_sym : include_option.to_sym)
+        end
+      end
+      filtered_include_options = nil if filtered_include_options.empty?
+
+      # fetch
+      tmp_result = model_class.find(:all, find_options.merge(:conditions => conditions, 
+                                                              :include    => filtered_include_options))
+
+      # set scores and rank
+      tmp_result.each do |record|
+        record.ferret_rank, record.ferret_score = id_array[record.id.to_s]
+      end
+      # merge with result array
+      result.concat tmp_result
+    end
+    
+    # order results as they were found by ferret, unless an AR :order
+    # option was given
+    result.sort! { |a, b| a.ferret_rank <=> b.ferret_rank } unless find_options[:order]
+    return result
+  end
+  
+  # combine our conditions with those given by user, if any
+  def self.combine_conditions(conditions, additional_conditions = [])
+    returning conditions do
+      if additional_conditions && additional_conditions.any?
+        cust_opts = (Array === additional_conditions) ? additional_conditions.dup : [ additional_conditions ]
+        logger.debug "cust_opts: #{cust_opts.inspect}"
+        conditions.first << " and " << cust_opts.shift
+        conditions.concat(cust_opts)
+      end
+    end
+  end
+
-  def self.build_field_config(fields)
-    field_config = {}
@@ -304 +432 @@
-    # other fields
-    index_definition[:ferret_fields].each_pair do |field, options|
+      options = options.dup
+      options.delete :via
+      options.delete :boost if options[:boost].is_a?(Symbol) # dynamic boost
-      fi.add_field(field, options)
-    end
@@ -326 +457 @@
-  def self.field_config_for(fieldname, options = {})
-    config = DEFAULT_FIELD_OPTIONS.merge options
+    config[:via] ||= fieldname
-    config[:term_vector] = :no if config[:index] == :no
-    config.delete :via
-    config.delete :boost if config[:boost].is_a?(Symbol) # dynamic boosts aren't handled here
-    return config
-  end

trunk/plugin/acts_as_ferret/lib/class_methods.rb

@@ -141 +141 @@
-    #               to explicitly state the fields you want to fetch, true won't
-    #               work here)
-    # models::      only for single_index scenarios: an Array of other Model classes to 
-    #               include in this search. Use :all to query all models.
-    # multi::       Specify additional model classes to search through. Each of
-    #               these, as well as this class, has to have the
-    #               :store_class_name option set to true. This option replaces the
-    #               multi_search method.
-    #
-    # +find_options+ is a hash passed on to active_record's find when
@@ -167 +161 @@
-        limit = options[:per_page]
-        offset = (options[:page] - 1) * limit
- && !options[:multi]
+
-          find_options[:limit] = limit
-          find_options[:offset] = offset
@@ -173 +167 @@
-          options.delete :offset
-        else
-
-
+
-          options[:limit] = limit
-          options[:offset] = offset
-        end
-      elsif find_options[:conditions]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-      logger.debug "Query: #{q}\ntotal hits: #{total_hits}, results delivered: #{result.size}"
-      SearchResults.new(result, total_hits, options[:page], options[:per_page])
-    end 
-    alias find_by_contents find_with_ferret
-
-   
@@ -211 +190 @@
-    #
-    def total_hits(q, options={})
-      if options[:models]
-        # backwards compatibility
-        logger.warn "the :models option of total_hits is deprecated, please use :multi instead"
-        options[:multi] = options[:models] 
-      end
-      if models = options[:multi]
-        options[:multi] = add_self_to_model_list_if_necessary(models).map(&:to_s)
-      end
-      aaf_index.total_hits(q, options)
-    end
@@ -229 +200 @@
-    #
-    # A block can be given too, it will be executed with every result:
-_by_contents
+s_with_ferret
-    #    id_array << id
-    #    scores_by_id[id] = score 
@@ -236 +207 @@
-    # instead of the [total_hits, results] array!
-    # 
-
-
-
+
+
-    end
-
@@ -248 +218 @@
-    # be yielded, and the total number of hits is returned.
-    def id_multi_search(query, additional_models = [], options = {}, &proc)
-deprecated_options_support(options)
+logger.warn "Model.id_multi_search is deprecated, use ActsAsFerret::find_ids instead!"
-      models = add_self_to_model_list_if_necessary(additional_models)
-aaf_index.id_multi_search(query, models.map(&:to_s)
+ActsAsFerret::find_ids(query, models
-    end
-    
-
-    protected
-
-    def _multi_search(query, additional_models = [], options = {}, find_options = {})
-      result = []
-
-      rank = 0
-      if options[:lazy]
-        logger.warn "find_options #{find_options} are ignored because :lazy => true" unless find_options.empty?
-        total_hits = id_multi_search(query, additional_models, options) do |model, id, score, data|
-          result << FerretResult.new(model, id, score, rank += 1, data)
-        end
-      else
-        id_arrays = {}
-
-        limit = options.delete(:limit)