Changeset 248

Timestamp:

10/01/07 14:50:29 (1 year ago)

Author:

jk

Message:

add :optimize boolean option to bulk_index

Files:

• trunk/demo/test/unit/content_test.rb (modified) (2 diffs)
• trunk/plugin/acts_as_ferret/lib/class_methods.rb (modified) (1 diff)
• trunk/plugin/acts_as_ferret/lib/ferret_extensions.rb (modified) (2 diffs)
• trunk/plugin/acts_as_ferret/lib/local_index.rb (modified) (1 diff)

trunk/demo/test/unit/content_test.rb

@@ -26 +26 @@
-    ContentBase.find(:all).each { |c| c.destroy }
-    Comment.find(:all).each { |c| c.destroy }
+  end
+
+  def test_include_option
+    assert_equal 1, Content.find_with_ferret('description', {}, :include => :comments).size
-  end
-
@@ -181 +185 @@
-      assert_equal 6, records.size
-    end
+  end
+
+  def test_bulk_index_no_optimize
+    Content.disable_ferret do
+      more_contents
+    end
+
+    assert Content.find_with_ferret('title').empty?
+    min = Content.find(:all, :order => 'id asc').first.id
+    Content.bulk_index(min, min+1, min+2, min+3, min+4, min+6, :optimize => false)
+    assert_equal 6, Content.find_with_ferret('title').size
-  end
-

trunk/plugin/acts_as_ferret/lib/class_methods.rb

@@ -38 +38 @@
-    # indexing jobs i.e. after modifying a lot of records with Ferret disabled.
-    def bulk_index(*ids)
+      options = Hash === ids.last ? ids.pop : {}
-      ids = ids.first if ids.size == 1 && ids.first.is_a?(Enumerable)
-
+, options
-    end
-

trunk/plugin/acts_as_ferret/lib/ferret_extensions.rb

@@ -55 +55 @@
-    end
-
-
+
+
-      orig_flush = @auto_flush
-      @auto_flush = false
@@ -64 +65 @@
-        bulk_indexer.index_records(records, offset)
-      end
+      logger.info 'finishing bulk index...'
-      flush
-
+
+
+
+
-      @auto_flush = orig_flush
-    end

trunk/plugin/acts_as_ferret/lib/local_index.rb

@@ -63 +63 @@
-    end
-
-
-
+, options
+, options
-    end
-