searchkick 0.6.3 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e333fde534928a49167a9af2098eeb2aaeae55f
-  data.tar.gz: c5077e61c89975a0411acf57f9429ce8f946cf34
+  metadata.gz: 60615f96360c3f13f09db4893caa5f2cb0b2a4e1
+  data.tar.gz: 74809a67cc8c765acae2acebcafd9636b93cdc3b
 SHA512:
-  metadata.gz: ac18482615c6a1d5fa4854c17c9e907a507bcea1701f783371a0be657ba848727182a1e2fbd38e547dc675a7545874584cdaa84b861755f99b0d08f7dbda0ca4
-  data.tar.gz: c1b5edee46e4bf3d6d5ecbc6a425930630cc80ecb2a4034c1c71d39a78ab344f0aadee822d2130e9359ccf247407b44d9a025c5c3db0c04c82a979feaf512020
+  metadata.gz: 3975e9b63fbf249f0d2ccb945275c39e426b02606a0a3433feed84f32c7f158b363311fe16ad13c54ac56eccfda9a40901e8d4ac527fd4268ddd8080751f752f
+  data.tar.gz: ddc5145efa1ac5c96c72728d42ce6fca5a8609490de52f89a974901b421c698df1d12c15c04cb2e6d84b14b1f672eb2fe08322a8b2b0fc17f147950a16c5a53f

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.7.0
+
+- Added support for Elasticsearch 1.1
+- Dropped support for Elasticsearch below 0.90.4 (unfortunate side effect of above)
+
 ## 0.6.3
 
 - Removed patron since no support for Windows

data/README.md

@@ -595,7 +595,7 @@ products = query.execute
 
 ## Reference
 
-Searchkick requires Elasticsearch `0.90.0` or higher.
+Searchkick requires Elasticsearch `0.90.4` or higher.
 
 Reindex one record
 
@@ -791,7 +791,5 @@ Everyone is encouraged to help improve this project. Here are a few ways you can
 To get started with development and testing:
 
 1. Clone the repo
-2. Install PostgreSQL and create a database called `searchkick_test` (`psql -d postgres -c "create database searchkick_test"`)
-3. Install Elasticsearch
-4. `bundle`
-5. `rake test`
+2. `bundle`
+3. `rake test`

data/lib/searchkick/query.rb

@@ -78,9 +78,9 @@ module Searchkick
                 fields: [field],
                 query: term,
                 use_dis_max: false,
-                operator: operator,
-                cutoff_frequency: 0.001
+                operator: operator
               }
+              shared_options[:cutoff_frequency] = 0.001 unless operator == "and"
               queries.concat [
                 {multi_match: shared_options.merge(boost: 10, analyzer: "searchkick_search")},
                 {multi_match: shared_options.merge(boost: 10, analyzer: "searchkick_search2")}
@@ -121,13 +121,16 @@ module Searchkick
                   path: conversions_field,
                   score_mode: "total",
                   query: {
-                    custom_score: {
+                    function_score: {
+                      boost_mode: "replace",
                       query: {
                         match: {
                           query: term
                         }
                       },
-                      script: "doc['count'].value"
+                      script_score: {
+                        script: "doc['count'].value"
+                      }
                     }
                   }
                 }
@@ -146,7 +149,9 @@ module Searchkick
               field: options[:boost]
             }
           },
-          script: "log(doc['#{options[:boost]}'].value + 2.718281828)"
+          script_score: {
+            script: "log(doc['#{options[:boost]}'].value + 2.718281828)"
+          }
         }
       end
 
@@ -157,7 +162,7 @@ module Searchkick
               personalize_field => options[:user_id]
             }
           },
-          boost: 100
+          boost_factor: 100
         }
       end
 
@@ -166,16 +171,16 @@ module Searchkick
           filter: {
             term: options[:personalize]
           },
-          boost: 100
+          boost_factor: 100
         }
       end
 
       if custom_filters.any?
         payload = {
-          custom_filters_score: {
+          function_score: {
+            functions: custom_filters,
             query: payload,
-            filters: custom_filters,
-            score_mode: "total"
+            score_mode: "sum"
           }
         }
       end
@@ -319,8 +324,14 @@ module Searchkick
         status_code = e.message[1..3].to_i
         if status_code == 404
           raise "Index missing - run #{searchkick_klass.name}.reindex"
-        elsif status_code == 500 and (e.message.include?("IllegalArgumentException[minimumSimilarity >= 1]") or e.message.include?("No query registered for [multi_match]") or e.message.include?("[match] query does not support [cutoff_frequency]]"))
-          raise "Upgrade Elasticsearch to 0.90.0 or greater"
+        elsif status_code == 500 and (
+            e.message.include?("IllegalArgumentException[minimumSimilarity >= 1]") or
+            e.message.include?("No query registered for [multi_match]") or
+            e.message.include?("[match] query does not support [cutoff_frequency]]") or
+            e.message.include?("No query registered for [function_score]]")
+          )
+
+          raise "This version of Searchkick requires Elasticsearch 0.90.4 or greater"
         else
           raise e
         end

data/lib/searchkick/version.rb

@@ -1,3 +1,3 @@
 module Searchkick
-  VERSION = "0.6.3"
+  VERSION = "0.7.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.0.0"
   spec.add_dependency "hashie"
 
   spec.add_development_dependency "bundler", "~> 1.3"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: searchkick
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.7.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-09 00:00:00.000000000 Z
+date: 2014-04-11 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.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.11
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement