has_searcher 0.0.14 → 0.0.15

data/lib/app/models/boostificator.rb

@@ -1,43 +1,30 @@
 class Boostificator
   MILLIS_IN_YEAR = 1000 * 60 * 60 * 24 * 365
+  PRECISION = 6
 
   attr_accessor :search, :field
 
-  def initialize(options)
-    self.search = options[:search]
-    self.field = options[:field]
-  end
-
-  def m
-    1.0 / MILLIS_IN_YEAR
-  end
+  attr_accessor :m, :x, :a, :b
 
-  def a
-    1.1
-  end
+  attr_accessor :now
 
-  def b
-    1
-  end
-
-  def precision
-    6
+  def initialize(options)
+    options.reverse_merge!(:a => 1.0, :b => 1.0, :m => 1.0 / MILLIS_IN_YEAR, :now => 1.hour.since.change(:min => 0))
+    options.each do |field, value|
+      self.send("#{field}=", value)
+    end
   end
 
   def recip_min
-    sprintf("%f", (recip * 10**precision).floor/10.0**precision)
+    sprintf("%f", (recip * 10**PRECISION).floor/10.0**PRECISION)
   end
 
   def recip_max
-    sprintf("%f", (recip * 10**precision).ceil/10.0**precision)
+    sprintf("%f", (recip * 10**PRECISION).ceil/10.0**PRECISION)
   end
 
   def recip
-    a / (m*now_ms + b)
-  end
-
-  def now
-    1.hour.since.change(:min => 0)
+    a / (m * now_ms + b)
   end
 
   def now_ms
@@ -50,7 +37,7 @@ class Boostificator
 
   def adjust_solr_params
     search.adjust_solr_params do |params|
-      params[:q] = "{!boost b=map(recip(ms(#{now_s},#{field}),#{m},#{a},#{b}),#{recip_min},#{recip_max},1) defType=dismax}#{params[:q]}"
+      params[:q] = "{!boost b=map(recip(ms(#{now_s},#{field}),#{m},#{a},#{b}),#{recip_min},#{recip_max},1) defType=dismax}#{params[:q]}" if params[:q]
     end
   end
 end

data/lib/has_searcher/version.rb

@@ -1,3 +1,3 @@
 module HasSearcher
-  VERSION = "0.0.14"
+  VERSION = "0.0.15"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has_searcher
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-25 00:00:00.000000000 Z
+date: 2012-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &16220020 !ruby/object:Gem::Requirement
+  requirement: &7410960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16220020
+  version_requirements: *7410960
 description: ! "This gem adds ability to construct search objects for indexed models.\n
   \                    It works with sunspot, inherited_resources and formtastic"
 email:
@@ -57,7 +57,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1870017393970293371
+      hash: -3427877683254692333
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -66,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1870017393970293371
+      hash: -3427877683254692333
 requirements: []
 rubyforge_project: has_searcher
 rubygems_version: 1.8.15