Changeset 324

Timestamp:

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

Author:

jk

Message:

add :if option to acts_as_ferret method

Files:

• trunk/demo/app/models/comment.rb (modified) (2 diffs)
• trunk/demo/test/unit/comment_test.rb (modified) (1 diff)
• trunk/plugin/acts_as_ferret/lib/act_methods.rb (modified) (2 diffs)
• trunk/plugin/acts_as_ferret/lib/acts_as_ferret.rb (modified) (1 diff)
• trunk/plugin/acts_as_ferret/lib/instance_methods.rb (modified) (1 diff)

trunk/demo/app/models/comment.rb

@@ -27 +27 @@
-  # the :ignore flag tells aaf to not try to set this field's value itself (we
-  # do this in our custom to_doc method)
-store_class_name => true, 
+if => Proc.new { |comment| comment.do_index? },
-                  :fields => {
-                    :content => { :store => :yes },
@@ -36 +36 @@
-                  #}, :ferret => { :analyzer => PlainAsciiAnalyzer.new(['fax', 'gsm', 'the', 'or']) } )
-
-
-
+
+
+
-
-  # you can override the default to_doc method 

trunk/demo/test/unit/comment_test.rb

@@ -11 +11 @@
-  def test_truth
-    assert_kind_of Comment, comments(:first)
+  end
+
+  def test_if_option
+    c = Comment.new :content => 'do not index'
+    c.save
+    assert_equal 0, Comment.find_with_ferret('do not index').total_hits
-  end
-

trunk/plugin/acts_as_ferret/lib/act_methods.rb

@@ -31 +31 @@
-    #                      algorithm if this model uses a non-integer primary key named
-    #                      'id' on MySQL.
-    #
-    # raise_drb_errors:: Set this to true if you want aaf to raise Exceptions
-    #                    in case the DRb server cannot be reached (in other word - behave like
-    #                    versions up to 0.4.3). Defaults to false so DRb exceptions
-    #                    are logged but not raised. Be sure to set up some
-    #                    monitoring so you still detect when your DRb server died for
-    #                    whatever reason.
-    #
-    # ferret:: Hash of Options that directly influence the way the Ferret engine works. You 
@@ -98 +91 @@
-      # update our copy of the global index config with options local to this class
-      aaf_configuration[:class_name] ||= self.name
+      aaf_configuration[:if] ||= options[:if]
-
-      # add methods for retrieving field values

trunk/plugin/acts_as_ferret/lib/acts_as_ferret.rb

@@ -73 +73 @@
-# Kasper Weibel Nielsen-Refs (original author)
-# Jens Kraemer <jk@jkraemer.net> (active maintainer)
+#
+#
+# == Global properties
+#
+# raise_drb_errors:: Set this to true if you want aaf to raise Exceptions
+#                    in case the DRb server cannot be reached (in other word - behave like
+#                    versions up to 0.4.3). Defaults to false so DRb exceptions
+#                    are logged but not raised. Be sure to set up some
+#                    monitoring so you still detect when your DRb server died for
+#                    whatever reason.
+#
+# remote:: Set this to false to force acts_as_ferret into local (non-DRb) mode even if
+#          config/ferret_server.yml contains a section for the current RAILS_ENV
+#          Usually you won't need to touch this option - just configure DRb for
+#          production mode in ferret_server.yml.
-#
-module ActsAsFerret

trunk/plugin/acts_as_ferret/lib/instance_methods.rb

@@ -48 +48 @@
-    # records you're still safe).
-    def ferret_enabled?(is_bulk_index = false)
-
+ && (aaf_configuration[:if].nil? || aaf_configuration[:if].call(self))
-    end
-