searchkick 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 633b6ec4127ea2638b8c05db6c1c1c0b536c4193
-  data.tar.gz: 69d65f9ecc57e55a954482e03a0998a1f10023dc
+  metadata.gz: c81923ad42ba7a15c923bf2b2320ed03894b6a14
+  data.tar.gz: 5655aa933464e320c0473b41b9b6a7d644c46dbb
 SHA512:
-  metadata.gz: 669dd3262ff71f967b6d0266851eca6f769befc5317289bb058781cf11d6e46af2e47bf9193a60fbc19117b04c5653551b4966bb349d6a9f88f79baa424b0116
-  data.tar.gz: 024fb4884e8a4d08e3a8954e3d2de0fce7bc7968311da0b64d6c9fe3f24e9b9c6488fa37d11c4c5f4674bdd5e60f72ac4da0ab8d5122c8c60fc07ef8542790c6
+  metadata.gz: fb8db1d17809462eb65aacb6662b9157637b68cc99ac417e2b570a3ff589a547b0bd72d66d50cb1b1b1e3a7d469d5787e653976916b9438ec887c44a3a975373
+  data.tar.gz: ce0f005d8c74c490007d39a9c65d07455a81ab8d2a5ca0377b9f93d3cf6b7d799f45ce6324ebc5bee3060dea1f6d75a8762105dd9e308289e2c130eb5f1400e8

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.6.1
+
+- Fixed huge issue w/ zero-downtime reindexing on 0.90 and elasticsearch-ruby 1.0
+- Restore load: false behavior
+- Restore total_entries method
+
 ## 0.6.0
 
 - Moved to elasticsearch-ruby

data/README.md

@@ -760,7 +760,7 @@ For convenience, this is set by default in the test environment.
 
 ## Thanks
 
-Thanks to Karel Minarik for [Tire](https://github.com/karmi/tire), Jaroslav Kalistsuk for [zero downtime reindexing](https://gist.github.com/jarosan/3124884), and Alex Leschenko for [Elasticsearch autocomplete](https://github.com/leschenko/elasticsearch_autocomplete).
+Thanks to Karel Minarik for [Elasticsearch Ruby](https://github.com/elasticsearch/elasticsearch-ruby) and [Tire](https://github.com/karmi/tire), Jaroslav Kalistsuk for [zero downtime reindexing](https://gist.github.com/jarosan/3124884), and Alex Leschenko for [Elasticsearch autocomplete](https://github.com/leschenko/elasticsearch_autocomplete).
 
 ## Roadmap
 

data/lib/searchkick.rb

@@ -1,6 +1,7 @@
 require "active_model"
 require "patron"
 require "elasticsearch"
+require "hashie"
 require "searchkick/version"
 require "searchkick/index"
 require "searchkick/reindex"

data/lib/searchkick/index.rb

@@ -50,11 +50,11 @@ module Searchkick
     end
 
     def retrieve(document_type, id)
-      client.get_source(
+      client.get(
         index: name,
         type: document_type,
         id: id
-      )
+      )["_source"]
     end
 
     protected

data/lib/searchkick/results.rb

@@ -25,7 +25,7 @@ module Searchkick
           hit_ids = hit_ids.map(&:to_s)
           records.sort_by{|r| hit_ids.index(r.id.to_s)  }
         else
-          hits
+          hits.map{|hit| Hashie::Mash.new(hit["_source"]) }
         end
       end
     end
@@ -63,6 +63,7 @@ module Searchkick
     def total_count
       response["hits"]["total"]
     end
+    alias_method :total_entries, :total_count
 
     def current_page
       options[:page]
@@ -71,15 +72,12 @@ module Searchkick
     def per_page
       options[:per_page]
     end
+    alias_method :limit_value, :per_page
 
     def total_pages
       (total_count / per_page.to_f).ceil
     end
 
-    def limit_value
-      per_page
-    end
-
     def offset_value
       current_page * per_page
     end

data/lib/searchkick/version.rb

@@ -1,3 +1,3 @@
 module Searchkick
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

data/searchkick.gemspec

@@ -19,8 +19,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "activemodel"
-  spec.add_dependency "elasticsearch"
+  spec.add_dependency "elasticsearch", "~> 0.4.11"
   spec.add_dependency "patron" # persistent http connections for performance
+  spec.add_dependency "hashie"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/test/sql_test.rb

@@ -26,6 +26,7 @@ class TestSql < Minitest::Unit::TestCase
     assert_equal 2, products.per_page
     assert_equal 3, products.total_pages
     assert_equal 5, products.total_count
+    assert_equal 5, products.total_entries
     assert_equal 2, products.limit_value
     assert_equal 4, products.offset_value
   end
@@ -250,6 +251,11 @@ class TestSql < Minitest::Unit::TestCase
     assert_kind_of Hash, Product.search("product", load: false).first
   end
 
+  def test_load_false_methods
+    store_names ["Product A"]
+    assert_equal "Product A", Product.search("product", load: false).first.name
+  end
+
   def test_load_false_with_include
     store_names ["Product A"]
     assert_kind_of Hash, Product.search("product", load: false, include: [:store]).first

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: searchkick
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-22 00:00:00.000000000 Z
+date: 2014-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -26,6 +26,20 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: elasticsearch
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.11
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.11
+- !ruby/object:Gem::Dependency
+  name: patron
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: patron
+  name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="