searchkick 0.7.9 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2bc8db79f3c60a5694ccd3400713d0dc8788ffd
-  data.tar.gz: 163dfde8a0f72d3f9584ad7e6f94b6370bafceb3
+  metadata.gz: d97f04a7f7678a643933cfd0045ec2e6043ebf02
+  data.tar.gz: c817fb9f49a0b6526beb3a2a2d5266c451258cfe
 SHA512:
-  metadata.gz: 83f9f13181e205843a72d3539b4ebba790c98f3abdbb9f1be1a3bfda539eb415304bd8e9eaf9acea062f64f6dbbc227db0892cd76623178d0ab20783119a91d4
-  data.tar.gz: 2123d48c3269eb517108f8864740bb2d1cfdc3e0130ed99c161a51d09d97f24799625fc83896912ce4351cfd678434665cefcf176935c2b08f5b5006a23d031a
+  metadata.gz: c19441dd8e684d5c1d0b4613dce000535dbd527ff35fce233bcdaba960037c9ec2853c1539ce8b038f3880a30c0a2be7717363f87be93b0789440718509c8c8c
+  data.tar.gz: 247238fb70ade1d5ce6eeff5ddd3c0bf590bec9bb52e8e746fe12db58ffb7bf5bdde5f6385bc4167b8dd67bc151724b215253b15755e1cb75f30ec07fac1c025

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.8.0
+
+- Added support for Elasticsearch 1.2
+
 ## 0.7.9
 
 - Added `tokens` method

data/README.md

@@ -45,12 +45,6 @@ Add this line to your application’s Gemfile:
 gem 'searchkick'
 ```
 
-For Elasticsearch 1.2, use:
-
-```ruby
-gem 'searchkick', github: 'ankane/searchkick', branch: 'elasticsearch-1.2'
-```
-
 For Elasticsearch 0.90, use version `0.6.3` and [this readme](https://github.com/ankane/searchkick/blob/v0.6.3/README.md).
 
 Add searchkick to models you want to search.
@@ -161,11 +155,20 @@ Plays nicely with kaminari and will_paginate.
 ```ruby
 # controller
 @products = Product.search "milk", page: params[:page], per_page: 20
+```
+
+View with kaminari
 
-# view
+```erb
 <%= paginate @products %>
 ```
 
+View with will_paginate
+
+```erb
+<%= will_paginate @products %>
+```
+
 ### Partial Matches
 
 By default, results must match all words in the query.
@@ -215,7 +218,7 @@ fields: [{"name^2" => :word_start}] # better interface on the way
 ### Exact Matches
 
 ```ruby
-User.search "hi@searchkick.org", fields: [{email: :exact}]
+User.search "hi@searchkick.org", fields: [{email: :exact}, :name]
 ```
 
 ### Language
@@ -640,6 +643,16 @@ Then deploy and reindex:
 rake searchkick:reindex CLASS=Product
 ```
 
+### Performance
+
+For the best performance, add [Patron](https://github.com/toland/patron) to your Gemfile.
+
+```ruby
+gem 'patron'
+```
+
+**Note:** Patron is not available for Windows.
+
 ### Automatic Failover
 
 Create an initializer `config/initializers/elasticsearch.rb` with multiple hosts:

data/lib/searchkick.rb

@@ -25,6 +25,10 @@ module Searchkick
     @client = client
   end
 
+  def self.server_version
+    @server_version ||= client.info["version"]["number"]
+  end
+
   @callbacks = true
 
   def self.enable_callbacks

data/lib/searchkick/query.rb

@@ -6,7 +6,7 @@ module Searchkick
     def initialize(klass, term, options = {})
       if term.is_a?(Hash)
         options = term
-        term = nil
+        term = "*"
       else
         term = term.to_s
       end
@@ -15,6 +15,8 @@ module Searchkick
       @term = term
       @options = options
 
+      below12 = Gem::Version.new(Searchkick.server_version) < Gem::Version.new("1.2")
+
       boost_fields = {}
       fields =
         if options[:fields]
@@ -127,6 +129,13 @@ module Searchkick
 
           if conversions_field and options[:conversions] != false
             # wrap payload in a bool query
+            script_score =
+              if below12
+                {script_score: {script: "doc['count'].value"}}
+              else
+                {field_value_factor: {field: "count"}}
+              end
+
             payload = {
               bool: {
                 must: payload,
@@ -141,11 +150,8 @@ module Searchkick
                           match: {
                             query: term
                           }
-                        },
-                        script_score: {
-                          script: "doc['count'].value"
                         }
-                      }
+                      }.merge(script_score)
                     }
                   }
                 }
@@ -165,16 +171,20 @@ module Searchkick
         end
 
         boost_by.each do |field, value|
+          script_score =
+            if below12
+              {script_score: {script: "#{value[:factor].to_f} * log(doc['#{field}'].value + 2.718281828)"}}
+            else
+              {field_value_factor: {field: field, factor: value[:factor].to_f, modifier: "ln2p"}}
+            end
+
           custom_filters << {
             filter: {
               exists: {
                 field: field
               }
-            },
-            script_score: {
-              script: "#{value[:factor].to_f} * log(doc['#{field}'].value + 2.718281828)"
             }
-          }
+          }.merge(script_score)
         end
 
         boost_where = options[:boost_where] || {}
@@ -370,7 +380,7 @@ module Searchkick
             e.message.include?("No query registered for [function_score]]")
           )
 
-          raise UnsupportedVersionError, "This version of Searchkick requires Elasticsearch 0.90.4 or greater"
+          raise UnsupportedVersionError, "This version of Searchkick requires Elasticsearch 1.0 or greater"
         elsif status_code == 400
           if e.message.include?("[multi_match] analyzer [searchkick_search] not found")
             raise InvalidQueryError, "Bad mapping - run #{searchkick_klass.name}.reindex"

data/lib/searchkick/search.rb

@@ -1,7 +1,7 @@
 module Searchkick
   module Search
 
-    def search(term, options = {})
+    def search(term = nil, options = {})
       query = Searchkick::Query.new(self, term, options)
       if options[:execute] == false
         query

data/lib/searchkick/version.rb

@@ -1,3 +1,3 @@
 module Searchkick
-  VERSION = "0.7.9"
+  VERSION = "0.8.0"
 end

data/searchkick.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "activemodel"
-  spec.add_dependency "elasticsearch", "~> 0.4.11"
+  spec.add_dependency "elasticsearch", ">= 1"
   spec.add_dependency "hashie"
 
   spec.add_development_dependency "bundler", "~> 1.3"

data/test/match_test.rb

@@ -139,6 +139,15 @@ class TestMatch < Minitest::Unit::TestCase
     assert_search "*", ["Product A", "Product B"]
   end
 
+  def test_no_arguments
+    assert_equal [], Product.search.to_a
+  end
+
+  def test_no_term
+    store_names ["Product A"]
+    assert_equal ["Product A"], Product.search(where: {name: "Product A"}).map(&:name)
+  end
+
   def test_to_be_or_not_to_be
     store_names ["to be or not to be"]
     assert_search "to be", ["to be or not to be"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: searchkick
 version: !ruby/object:Gem::Version
-  version: 0.7.9
+  version: 0.8.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-01 00:00:00.000000000 Z
+date: 2014-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -28,16 +28,16 @@ dependencies:
   name: elasticsearch
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.11
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.11
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement