searchkick 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b8625d5f69db773beb2bda77ee3b78fdd54398e
-  data.tar.gz: d796061050099ca9a13ec01e61511b4e66e2a760
+  metadata.gz: f2b3dc0e591516c6ddd76101c1053211ae7f9fe9
+  data.tar.gz: f56695cbbfcc4e92b6d751add7c00ec6bbdb82ed
 SHA512:
-  metadata.gz: 8e9774402df7d1e076cbfac13f577fe1ec51464405d1e157c2f9078ddc8d757ab64ce7d4a0d96427897f62e34d58753a7045c6e1731a18c9c3f2ca009010c8d6
-  data.tar.gz: ecf0c24cc9908419d018d31118ff3f744534f7d426936e4daa8ddc90ee30759e65e452087c697bfa60d87aa330e2c39692f902e2c260c67c159b0e374df86643
+  metadata.gz: 1a4ca76c448e90b4d838aa1e0076b01355866b837a046618222aaa7e65b9142b3370c8f93fc622be57e248a5ed8fd4941155fa915dda118c1781893266c832c6
+  data.tar.gz: 2d7f62a4329cf8005f57ae60968f3e2aea626cff87e5073a8fa141250ec135424ba8bb2ccff46ddf8033bdf07d05ecad3dec59fceeb5d67d044911e7ffa9f561

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.7.5
+
+- Do not throw errors when index becomes out of sync with database
+- Added custom exception types
+- Fixed `offset` and `offset_value`
+
 ## 0.7.4
 
 - Fixed reindex with inheritance

data/README.md

@@ -353,7 +353,7 @@ Typically, you want to use a JavaScript library like [typeahead.js](http://twitt
 
 #### Here’s how to make it work with Rails
 
-First, add a controller action.
+First, add a route and controller action.
 
 ```ruby
 # app/controllers/cities_controller.rb

data/lib/searchkick.rb

@@ -13,6 +13,9 @@ require "searchkick/tasks"
 require "searchkick/logging" if defined?(Rails)
 
 module Searchkick
+  class MissingIndexError < StandardError; end
+  class UnsupportedVersionError < StandardError; end
+  class InvalidQueryError < Elasticsearch::Transport::Transport::Errors::BadRequest; end
 
   def self.client
     @client ||= Elasticsearch::Client.new(url: ENV["ELASTICSEARCH_URL"])

data/lib/searchkick/index.rb

@@ -26,7 +26,7 @@ module Searchkick
       client.index(
         index: name,
         type: document_type(record),
-        id: record.id,
+        id: search_id(record),
         body: search_data(record)
       )
     end
@@ -35,7 +35,7 @@ module Searchkick
       client.delete(
         index: name,
         type: document_type(record),
-        id: record.id
+        id: search_id(record)
       )
     end
 
@@ -44,7 +44,7 @@ module Searchkick
         client.bulk(
           index: name,
           type: type,
-          body: batch.map{|r| data = search_data(r); {index: {_id: data["_id"] || data["id"] || r.id, data: data}} }
+          body: batch.map{|r| data = search_data(r); {index: {_id: search_id(r), data: data}} }
         )
       end
     end
@@ -71,16 +71,15 @@ module Searchkick
       klass_document_type(record.class)
     end
 
+    def search_id(record)
+      record.id.is_a?(Numeric) ? record.id : record.id.to_s
+    end
+
     def search_data(record)
       source = record.search_data
 
       # stringify fields
-      source = source.inject({}){|memo,(k,v)| memo[k.to_s] = v; memo}
-
-      # Mongoid 4 hack
-      if defined?(BSON::ObjectId) and source["_id"].is_a?(BSON::ObjectId)
-        source["_id"] = source["_id"].to_s
-      end
+      source = source.inject({}){|memo,(k,v)| memo[k.to_s] = v; memo}.except("id", "_id")
 
       options = record.class.searchkick_options
 

data/lib/searchkick/query.rb

@@ -328,7 +328,7 @@ module Searchkick
       rescue => e # TODO rescue type
         status_code = e.message[1..3].to_i
         if status_code == 404
-          raise "Index missing - run #{searchkick_klass.name}.reindex"
+          raise MissingIndexError, "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
@@ -336,7 +336,13 @@ module Searchkick
             e.message.include?("No query registered for [function_score]]")
           )
 
-          raise "This version of Searchkick requires Elasticsearch 0.90.4 or greater"
+          raise UnsupportedVersionError, "This version of Searchkick requires Elasticsearch 0.90.4 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"
+          else
+            raise InvalidQueryError, e.message
+          end
         else
           raise e
         end

data/lib/searchkick/reindex.rb

@@ -127,11 +127,6 @@ module Searchkick
                 tokenizer: "standard",
                 filter: ["lowercase", "asciifolding", "searchkick_suggest_shingle"]
               },
-              searchkick_suggest_index: {
-                type: "custom",
-                tokenizer: "standard",
-                filter: ["lowercase", "asciifolding", "searchkick_suggest_shingle"]
-              },
               searchkick_text_start_index: {
                 type: "custom",
                 tokenizer: "keyword",

data/lib/searchkick/results.rb

@@ -24,13 +24,18 @@ module Searchkick
             if options[:includes]
               records = records.includes(options[:includes])
             end
-            results[type] = records.find(grouped_hits.map{|hit| hit["_id"] })
+            results[type] =
+              if records.respond_to?(:primary_key)
+                records.where(records.primary_key => grouped_hits.map{|hit| hit["_id"] }).to_a
+              else
+                records.queryable.for_ids(grouped_hits.map{|hit| hit["_id"] }).to_a
+              end
           end
 
           # sort
           hits.map do |hit|
             results[hit["_type"]].find{|r| r.id.to_s == hit["_id"].to_s }
-          end
+          end.compact
         else
           hits.map do |hit|
             result = hit.except("_source").merge(hit["_source"])
@@ -88,9 +93,10 @@ module Searchkick
     def total_pages
       (total_count / per_page.to_f).ceil
     end
+    alias_method :num_pages, :total_pages
 
     def offset_value
-      current_page * per_page
+      (current_page - 1) * per_page
     end
     alias_method :offset, :offset_value
 

data/lib/searchkick/version.rb

@@ -1,3 +1,3 @@
 module Searchkick
-  VERSION = "0.7.4"
+  VERSION = "0.7.5"
 end

data/test/index_test.rb

@@ -35,6 +35,35 @@ class TestIndex < Minitest::Unit::TestCase
     assert_equal ["Dollar Tree"], Store.search(query: {match: {name: "Dollar Tree"}}).map(&:name)
   end
 
+  def test_record_not_found
+    store_names ["Product A", "Product B"]
+    Product.where(name: "Product A").delete_all
+    assert_search "product", ["Product B"]
+  end
+
+  def test_bad_mapping
+    Product.searchkick_index.delete
+    store_names ["Product A"]
+    assert_raises(Searchkick::InvalidQueryError){ Product.search "test" }
+  ensure
+    Product.reindex
+  end
+
+  def test_missing_index
+    assert_raises(Searchkick::MissingIndexError){ Product.search "test", index_name: "not_found" }
+  end
+
+  def test_unsupported_version
+    raises_exception = lambda { |s| raise Elasticsearch::Transport::Transport::Error.new("[500] No query registered for [multi_match]") }
+    Searchkick.client.stub :search, raises_exception do
+      assert_raises(Searchkick::UnsupportedVersionError){ Product.search("test") }
+    end
+  end
+
+  def test_invalid_query
+    assert_raises(Searchkick::InvalidQueryError){ Product.search(query: {}) }
+  end
+
   if defined?(ActiveRecord)
 
     def test_transaction

data/test/sql_test.rb

@@ -30,8 +30,8 @@ class TestSql < Minitest::Unit::TestCase
     assert_equal 5, products.total_count
     assert_equal 5, products.total_entries
     assert_equal 2, products.limit_value
-    assert_equal 4, products.offset_value
-    assert_equal 4, products.offset
+    assert_equal 2, products.offset_value
+    assert_equal 2, products.offset
     assert !products.first_page?
     assert !products.last_page?
     assert !products.empty?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: searchkick
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-07 00:00:00.000000000 Z
+date: 2014-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel