Changeset 244

Timestamp:

09/17/07 09:15:10 (1 year ago)

Author:

jk

Message:

#166

Files:

• trunk/demo/app/models/content_base.rb (modified) (1 diff)
• trunk/demo/test/unit/content_test.rb (modified) (3 diffs)
• 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) (3 diffs)

trunk/demo/app/models/content_base.rb

@@ -12 +12 @@
-  # descriptions
-  acts_as_ferret( :fields => { :comment_count => {},
-2
+:title_boost
-                               :description   => { :boost => 1, :store => :yes },
-                               :special       => {} },
-                  :store_class_name => true,
+                  :boost => :record_boost,
-                  :remote           => ENV['AAF_REMOTE'] )
-
-  def comment_count; 0 end
-
+  attr_accessor :record_boost
+  attr_writer :title_boost
+  def title_boost
+    @title_boost || 2
+  end
-end
-

trunk/demo/test/unit/content_test.rb

@@ -556 +556 @@
-     
-    # give description field higher boost:
-1
+20
-    assert_equal 2, contents_from_ferret.size
-    assert_equal 2, total_hits
@@ -569 +569 @@
-  def test_find_by_contents_boost
-    # give description field higher boost:
-1
+20
-    assert_equal 2, contents_from_ferret.size
-    assert_equal @another_content.id, contents_from_ferret.first.id
@@ -736 +736 @@
-  end
-
+  def test_per_field_boost
+    Content.destroy_all
+    Content.create! :title => 'the title'
+    boosted = Content.new :title => 'the title'
+    boosted.title_boost = 100
+    boosted.save!
+    Content.create! :title => 'the title'
+    results = Content.find_with_ferret 'title:title'
+    assert_equal 3, results.size
+    assert_equal boosted.id, results.first.id
+  end
+
+  def test_per_document_boost
+    Content.destroy_all
+    Content.create! :title => 'the title'
+    boosted = Content.new :title => 'the title'
+    boosted.record_boost = 10
+    boosted.save!
+    Content.create! :title => 'the title'
+    results = Content.find_with_ferret 'title'
+    assert_equal 3, results.size
+    assert_equal boosted.id, results.first.id
+  end
+
+
-  protected
-  def more_contents

trunk/plugin/acts_as_ferret/lib/act_methods.rb

@@ -212 +212 @@
-    # document instance
-    def define_to_field_method(field, options = {})
+      if options[:boost].is_a?(Symbol)
+        dynamic_boost = options[:boost]
+        options.delete :boost
+      end
-      options.reverse_merge!( :store       => :no, 
-                              :highlight   => :yes, 
@@ -219 +223 @@
-      options[:term_vector] = :no if options[:index] == :no
-      aaf_configuration[:ferret_fields][field] = options
+
-      define_method("#{field}_to_ferret".to_sym) do
-        begin
-
+, dynamic_boost
-        rescue
-          logger.warn("Error retrieving value for field #{field}: #{$!}")

trunk/plugin/acts_as_ferret/lib/acts_as_ferret.rb

@@ -123 +123 @@
-    end
-    fields.each_pair do |field, options|
+      options = options.dup
+      options.delete(:boost) if options[:boost].is_a?(Symbol)
-      fi.add_field(field, { :store => :no, 
-                            :index => :yes }.update(options)) 

trunk/plugin/acts_as_ferret/lib/instance_methods.rb

@@ -108 +108 @@
-    def to_doc
-      logger.debug "creating doc for class: #{self.class.name}, id: #{self.id}"
-doc = Ferret::Document.new do
+Ferret::Document.new do |doc|
-        # store the id of each item
-        doc[:id] = self.id
@@ -118 +118 @@
-        aaf_configuration[:ferret_fields].each_pair do |field, config|
-          doc[field] = self.send("#{field}_to_ferret") unless config[:ignore]
+        end
+        if aaf_configuration[:boost]
+          if self.respond_to?(aaf_configuration[:boost])
+            boost = self.send aaf_configuration[:boost]
+            doc.boost = boost.to_i if boost
+          else
+            logger.error "boost option should point to an instance method: #{aaf_configuration[:boost]}"
+          end
-        end
-      end
@@ -130 +138 @@
-    end
-
-
-
+
+
+
+
+
+
+
+
-    end
-