Changeset 203

Timestamp:

07/13/07 21:13:22 (1 year ago)

Author:

jk

Message:

#143

Files:

• trunk/demo/test/unit/comment_test.rb (modified) (1 diff)
• trunk/plugin/acts_as_ferret/lib/class_methods.rb (modified) (4 diffs)

trunk/demo/test/unit/comment_test.rb

@@ -181 +181 @@
-  end
-
+  def test_array_conditions_combining 
+    comments_from_ferret = Comment.find_by_contents('comment AND fixture', {}, :conditions => [ 'id IN (?)', [ 2, 3 ] ]) 
+    assert_equal 1, comments_from_ferret.size 
+    assert_equal 1, comments_from_ferret.total_hits 
+  end
+
-end

trunk/plugin/acts_as_ferret/lib/class_methods.rb

@@ -218 +218 @@
-        end
-
-        # merge conditions
-        conditions = combine_conditions([ "#{model.table_name}.#{model.primary_key} in (?)", 
-                                          id_array.keys ], 
-                                        find_options[:conditions])
-
-        # check for include association that might only exist on some models in case of multi_search
-        filtered_include_options = []
@@ -233 +228 @@
-
-        # fetch
-
-
+
+
+
+
+
+
+
-        # set scores and rank
-        tmp_result.each do |record|
@@ -255 +255 @@
-        begin
-          model = model.constantize
-# merge conditions
-conditions = combine_conditions([ "#{model.table_name}.#{model.primary_key} in (?)", id_array.keys ], 
-find_options[:conditions])
-count += model.count(find_options.merge(:conditions => conditions))
+model.send(:with_scope, :find => find_options) do 
+  count += model.count(:conditions => [ "#{model.table_name}.#{model.primary_key} in (?)",
+        id_array.keys ]) 
+end
-        rescue TypeError
-          raise "#{model} must use :store_class_name option if you want to use multi_search against it.\n#{$!}"
@@ -274 +274 @@
-        logger.warn ":first_doc is deprecated, use :offset instead!"
-        options[:offset] ||= options[:first_doc]
-      end
-    end
-
-    # combine our conditions with those given by user, if any
-    def combine_conditions(conditions, *additional_conditions)
-      returning conditions do
-        if additional_conditions.any?
-          cust_opts = additional_conditions.dup.flatten
-          conditions.first << " and " << cust_opts.shift
-          conditions.concat(cust_opts)
-        end
-      end
-    end