searchkick 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 357856a821b11d5671469d3bdd8e7e9f4a2051db
-  data.tar.gz: 7986b966d2b34b4e05e53bc8feb9e737ade83f87
+  metadata.gz: 7cffd1af1407a4da1aedcc1a7af63202939586c5
+  data.tar.gz: 3fa1d499bb7f1fd4ff7a71a92fc2237931cc04fd
 SHA512:
-  metadata.gz: 856a6df897efc1bdd28f09bbf996ae1101575ae41971001f5be9688d2de052674a5ff5baf2a079d32308cd8dfdeb1d112890111e69b3275e3f1c8e4232ef2a19
-  data.tar.gz: 242d7f27d25952405a6a06745d4dc83a2e116da5d6f365a7be6a5fba3261080405b79541898d20d2bbe1719299c3b999589d04d2e42093da876e71ad25f49d6b
+  metadata.gz: 0c98bdf5690ec1bb4b837033f9e08c80cd6aacaa2d811c651108fedcee940df68168ec015c4207b210c3003315a9910517d7fd8210e7b3b2daec1d50c280cf15
+  data.tar.gz: a101b6f2ccd2d7c65d8290b9da7bdc5da8da1efceef7cd51371c743e7bef5cb988b9a6193ef50bf2d5f206c019712090b30f573046bed2058bc3eeef611ab9f1

data/.gitignore

@@ -17,3 +17,4 @@ test/version_tmp
 tmp
 *.log
 .DS_Store
+.ruby-*

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.7.2
+
+- Added smart facets
+- Added more fields to `load: false` result
+- Fixed logging for multi-index searches
+- Added `first_page?` and `last_page?` for improved Kaminari support
+
 ## 0.7.1
 
 - Fixed huge issue w/ zero-downtime reindexing on 0.90

data/README.md

@@ -43,6 +43,8 @@ Add this line to your application’s Gemfile:
 gem "searchkick"
 ```
 
+For Elasticsearch 0.90, use version `0.6.3`.
+
 Add searchkick to models you want to search.
 
 ```ruby
@@ -403,10 +405,29 @@ products = Product.search "chuck taylor", facets: [:product_type, :gender, :bran
 p products.facets
 ```
 
-Advanced
+By default, `where` conditions are not applied to facets (for backward compatibility).
+
+```ruby
+Product.search "wingtips", where: {color: "brandy"}, facets: [:size]
+# facets *not* filtered by color :(
+```
+
+Change this with:
+
+```ruby
+Product.search "wingtips", where: {color: "brandy"}, facets: [:size], smart_facets: true
+```
+
+or set `where` conditions for each facet separately:
 
 ```ruby
-Product.search "2% Milk", facets: {store_id: {where: {in_stock: true}, limit: 10}}
+Product.search "wingtips", facets: {size: {where: {color: "brandy"}}}
+```
+
+Limit
+
+```ruby
+Product.search "2% Milk", facets: {store_id: {limit: 10}}
 ```
 
 Ranges
@@ -595,8 +616,6 @@ products = query.execute
 
 ## Reference
 
-Searchkick requires Elasticsearch `0.90.4` or higher.
-
 Reindex one record
 
 ```ruby
@@ -746,7 +765,7 @@ rake searchkick:reindex:all
 
 ## Note about 0.6.0 and 0.7.0
 
-If running Searchkick `0.6.0` or `0.7.0` and Elasticsearch `0.90`, we recommend upgrading to Searchkick `0.7.1` to fix an issue that causes downtime when reindexing.
+If running Searchkick `0.6.0` or `0.7.0` and Elasticsearch `0.90`, we recommend upgrading to Searchkick `0.6.1` or `0.7.1` to fix an issue that causes downtime when reindexing.
 
 ## Elasticsearch Gotchas
 

data/lib/searchkick/logging.rb

@@ -37,10 +37,11 @@ module Searchkick
       payload = event.payload
       name = "#{payload[:name]} (#{event.duration.round(1)}ms)"
       type = payload[:query][:type]
+      index = payload[:query][:index].is_a?(Array) ? payload[:query][:index].join(",") : payload[:query][:index]
 
       # no easy way to tell which host the client will use
       host = Searchkick.client.transport.hosts.first
-      debug "  #{color(name, YELLOW, true)}  curl #{host[:protocol]}://#{host[:host]}:#{host[:port]}/#{CGI.escape(payload[:query][:index])}#{type ? "/#{type.map{|t| CGI.escape(t) }.join(",")}" : ""}/_search?pretty -d '#{payload[:query][:body].to_json}'"
+      debug "  #{color(name, YELLOW, true)}  curl #{host[:protocol]}://#{host[:host]}:#{host[:port]}/#{CGI.escape(index)}#{type ? "/#{type.map{|t| CGI.escape(t) }.join(",")}" : ""}/_search?pretty -d '#{payload[:query][:body].to_json}'"
     end
   end
 

data/lib/searchkick/query.rb

@@ -239,6 +239,7 @@ module Searchkick
           # offset is not possible
           # http://elasticsearch-users.115913.n3.nabble.com/Is-pagination-possible-in-termsStatsFacet-td3422943.html
 
+          facet_options.deep_merge!(where: options[:where].reject{|k| k == field}) if options[:smart_facets] == true
           facet_filters = where_filters(facet_options[:where])
           if facet_filters.any?
             payload[:facets][field][:facet_filter] = {
@@ -448,4 +449,4 @@ module Searchkick
     end
 
   end
-end
+end

data/lib/searchkick/results.rb

@@ -25,7 +25,11 @@ module Searchkick
           hit_ids = hit_ids.map(&:to_s)
           records.sort_by{|r| hit_ids.index(r.id.to_s)  }
         else
-          hits.map{|hit| Hashie::Mash.new(hit["_source"]) }
+          hits.map do |hit|
+            result = hit.except("_source").merge(hit["_source"])
+            result["id"] = result["_id"]
+            Hashie::Mash.new(result)
+          end
         end
       end
     end
@@ -90,6 +94,14 @@ module Searchkick
       current_page < total_pages ? (current_page + 1) : nil
     end
 
+    def first_page?
+      previous_page.nil?
+    end
+
+    def last_page?
+      next_page.nil?
+    end
+
     protected
 
     def hits

data/lib/searchkick/version.rb

@@ -1,3 +1,3 @@
 module Searchkick
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 end

data/test/facets_test.rb

@@ -5,18 +5,19 @@ class TestFacets < Minitest::Unit::TestCase
   def setup
     super
     store [
-      {name: "Product Show", store_id: 1, in_stock: true, color: "blue", price: 21},
-      {name: "Product Hide", store_id: 2, in_stock: false, color: "green", price: 25},
-      {name: "Product B", store_id: 2, in_stock: false, color: "red", price: 5}
+      {name: "Product Show", latitude: 37.7833, longitude: 12.4167, store_id: 1, in_stock: true, color: "blue", price: 21},
+      {name: "Product Hide", latitude: 29.4167, longitude: -98.5000, store_id: 2, in_stock: false, color: "green", price: 25},
+      {name: "Product B", latitude: 43.9333, longitude: -122.4667, store_id: 2, in_stock: false, color: "red", price: 5},
+      {name: "Foo", latitude: 43.9333, longitude: 12.4667, store_id: 3, in_stock: false, color: "yellow", price: 15}
     ]
   end
 
   def test_basic
-    assert_equal 2, Product.search("Product", facets: [:store_id]).facets["store_id"]["terms"].size
+    assert_equal ({1 => 1, 2 => 2}), store_facet(facets: [:store_id])
   end
 
   def test_where
-    assert_equal 1, Product.search("Product", facets: {store_id: {where: {in_stock: true}}}).facets["store_id"]["terms"].size
+    assert_equal ({1 => 1}), store_facet(facets: {store_id: {where: {in_stock: true}}})
   end
 
   def test_limit
@@ -37,4 +38,31 @@ class TestFacets < Minitest::Unit::TestCase
     assert_equal 0, facet["ranges"][1]["count"]
     assert_equal 2, facet["ranges"][2]["count"]
   end
+
+  def test_where_no_smart_facets
+    assert_equal ({2 => 2}), store_facet(where: {color: "red"}, facets: {store_id: {where: {in_stock: false}}})
+  end
+
+  def test_smart_facets
+    assert_equal ({1 => 1}), store_facet(where: {in_stock: true}, facets: [:store_id], smart_facets: true)
+  end
+
+  def test_smart_facets_where
+    assert_equal ({2 => 1}), store_facet(where: {color: "red"}, facets: {store_id: {where: {in_stock: false}}}, smart_facets: true)
+  end
+
+  def test_smart_facets_skip_facet
+    assert_equal ({1 => 1, 2 => 2}), store_facet(where: {store_id: 2}, facets: [:store_id], smart_facets: true)
+  end
+
+  def test_smart_facets_skip_facet_complex
+    assert_equal ({1 => 1, 2 => 1}), store_facet(where: {store_id: 2, price: {gt: 5}}, facets: [:store_id], smart_facets: true)
+  end
+
+  protected
+
+  def store_facet(options)
+    Hash[ Product.search("Product", options).facets["store_id"]["terms"].map{|v| [v["term"], v["count"]] } ]
+  end
+
 end

data/test/sql_test.rb

@@ -29,6 +29,8 @@ class TestSql < Minitest::Unit::TestCase
     assert_equal 5, products.total_entries
     assert_equal 2, products.limit_value
     assert_equal 4, products.offset_value
+    assert !products.first_page?
+    assert !products.last_page?
   end
 
   def test_pagination_nil_page
@@ -36,6 +38,7 @@ class TestSql < Minitest::Unit::TestCase
     products = Product.search("product", order: {name: :asc}, page: nil, per_page: 2)
     assert_equal ["Product A", "Product B"], products.map(&:name)
     assert_equal 1, products.current_page
+    assert products.first_page?
   end
 
   def test_where

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: searchkick
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-12 00:00:00.000000000 Z
+date: 2014-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel