searchkick 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff1b17b6561440bad2ebe3c20d1606b13d579310
-  data.tar.gz: 50475abfd988e11bca0b04385a4ec264bac80467
+  metadata.gz: 32cdf7dc806463087e8de7a1178b759b18621a3e
+  data.tar.gz: 354388509186cbd11616c958832182a892aacff9
 SHA512:
-  metadata.gz: 19e25e2f81fb811f7bf1964cb59a5deccfc6386d10640279bfe6cfb7bb81a1611691ebd6ccb8879c7dcbec4f530d5ccf2fae089e19cc8f783409985092d2315b
-  data.tar.gz: be76d99160e570515a3120ecb517a6faef29f2b3b95eb4ebc6556cbe2839d3554faa7295ff72ccc14caf82fb817b65e2286a74377fd95137d68c6666383bc26f
+  metadata.gz: 0154a4d77e5c9308a26c8524db04dbbe75b471ab5875835cb1d0c0594e0543e1e7bd9bb8f31384eb166bb513af6faede705d11964942674ec9452df7b113aac3
+  data.tar.gz: f5477b6069d310f813a2e0f84a6452920583458ba4ded63cc973976181dcf033271d90e3d30e5d7c1edbc3288bc4516adcbaee29dcbb12c96ebb7639e9c263c5

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.3.3
+
+- Better error messages
+- Added where: {field: nil} queries
+
 ## 0.3.2
 
 - Added support for single table inheritance

data/README.md

@@ -360,7 +360,7 @@ class City < ActiveRecord::Base
   searchkick locations: ["location"]
 
   def search_data
-    to_hash.merge location: [latitude, longitude]
+    attributes.merge location: [latitude, longitude]
   end
 end
 ```

data/lib/searchkick/model.rb

@@ -53,7 +53,7 @@ module Searchkick
 
           # hack to prevent generator field doesn't exist error
           (options[:suggest] || []).map(&:to_s).each do |field|
-            source[field] = "a" if !source[field]
+            source[field] = nil if !source[field]
           end
 
           # locations

data/lib/searchkick/search.rb

@@ -218,7 +218,11 @@ module Searchkick
                   end
                 end
               else
-                filters << {term: {field => value}}
+                if value.nil?
+                  filters << {missing: {"field" => field, existence: true, null_value: true}}
+                else
+                  filters << {term: {field => value}}
+                end
               end
             end
           end
@@ -291,7 +295,18 @@ module Searchkick
       tire_options = {load: load, payload: payload, size: per_page, from: offset}
       tire_options[:type] = document_type if self != searchkick_klass
       search = Tire::Search::Search.new(index_name, tire_options)
-      response = search.json
+      begin
+        response = search.json
+      rescue Tire::Search::SearchRequestFailed => e
+        status_code = e.message[0..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]")
+          raise "Upgrade Elasticsearch to 0.90.0 or greater"
+        else
+          raise e
+        end
+      end
 
       # apply facet limit in client due to
       # https://github.com/elasticsearch/elasticsearch/issues/1305

data/lib/searchkick/version.rb

@@ -1,3 +1,3 @@
 module Searchkick
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/test/sql_test.rb

@@ -75,6 +75,14 @@ class TestSql < Minitest::Unit::TestCase
     assert_search "product", ["Product A"], where: {color: ["RED"]}
   end
 
+  def test_where_nil
+    store [
+      {name: "Product A"},
+      {name: "Product B", color: "red"}
+    ]
+    assert_search "product", ["Product A"], where: {color: nil}
+  end
+
   def test_near
     store [
       {name: "San Francisco", latitude: 37.7833, longitude: -122.4167},

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: searchkick
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-03 00:00:00.000000000 Z
+date: 2013-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tire