has_searcher 0.0.95.3 → 0.0.95.4

data/app/models/searcher/boostificator.rb

@@ -6,50 +6,56 @@ class Searcher::Boostificator
 
   attr_accessor :m, :x, :a, :b
 
-  attr_accessor :extra_boost
+  attr_accessor :now
+
+  attr_accessor :boosts
 
   def initialize(boost_field, options={})
     self.boost_field = boost_field
-    options.reverse_merge!(:a => 1.0, :b => 1.0, :m => 1.0 / MILLIS_IN_YEAR, :extra_boost => 1.0)
+    options.reverse_merge!(:a => 1.0, :b => 1.0, :m => 1.0 / MILLIS_IN_YEAR)
     options.each do |attribute, value|
       self.send("#{attribute}=", value)
     end
   end
 
-
-  def adjust_solr_params(sunspot)
-    sunspot.adjust_solr_params do |params|
-      params[:boost] = "product(#{extra_boost},#{recip_s})"
-      params[:defType] = 'edismax'
+  def adjust_solr_params(searcher)
+    searcher.configuration.scope do |sunspot|
+      sunspot.adjust_solr_params do |params|
+        params[:boost] = boosts + [recip_s]
+        params[:defType] = 'edismax'
+      end
     end
   end
 
-  private
-    def recip_s
-      @recip_s ||= "map(recip(abs(ms(#{now_s},#{boost_field})),#{m},#{a},#{b}),#{recip_min},#{recip_max},1)"
-    end
+  def boosts
+    @boosts ||= []
+  end
 
-    def now
-      @now ||= HasSearcher.cacheable_now
-    end
+  def recip_s
+    @recip_s ||= "map(recip(abs(ms(#{now_s},#{boost_field})),#{m},#{a},#{b}),#{recip_min},#{recip_max},1)"
+  end
 
-    def recip
-      @recip ||= a / (m * now_ms + b)
-    end
+  def now
+    @now ||= HasSearcher.cacheable_now
+  end
 
-    def now_ms
-      @now_ms ||= now.to_i * 1000
-    end
+  def recip
+    @recip ||= a / (m * now_ms + b)
+  end
 
-    def now_s
-      @now_s ||= now.utc.to_datetime.to_time.iso8601
-    end
+  def now_ms
+    @now_ms ||= now.to_i * 1000
+  end
 
-    def recip_min
-      @recip_min ||= sprintf("%f", (recip * 10**PRECISION).floor/10.0**PRECISION)
-    end
+  def now_s
+    @now_s ||= now.utc.to_datetime.to_time.iso8601
+  end
 
-    def recip_max
-      @recip_max ||= sprintf("%f", (recip * 10**PRECISION).ceil/10.0**PRECISION)
-    end
+  def recip_min
+    @recip_min ||= sprintf("%f", (recip * 10**PRECISION).floor/10.0**PRECISION)
+  end
+
+  def recip_max
+    @recip_max ||= sprintf("%f", (recip * 10**PRECISION).ceil/10.0**PRECISION)
+  end
 end

data/lib/has_searcher/version.rb

@@ -1,3 +1,3 @@
 module HasSearcher
-  VERSION = "0.0.95.3"
+  VERSION = "0.0.95.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has_searcher
 version: !ruby/object:Gem::Version
-  version: 0.0.95.3
+  version: 0.0.95.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-09 00:00:00.000000000 Z
+date: 2012-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -146,7 +146,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4088489999752866781
+      hash: 979056079572079856
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -155,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4088489999752866781
+      hash: 979056079572079856
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24