searchkick 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bbb1863e16cb46d246eb067805b4a2cc1471c68
-  data.tar.gz: ea1bc2af0dcb8eb2e059aae9586697086a3cbc0e
+  metadata.gz: 48b011f59eaeb3f3b2213e20bf2206d4963f7bb0
+  data.tar.gz: d3ffbd07eda7ca733915c251ce8b1e1c9c146e44
 SHA512:
-  metadata.gz: 50d82877150dc9a875e8d67539f1992d29870b8cef227b7e81eb1c05f8e6e8346b952914035af8d2b1b5177cd8c730f5e55eb57c0a725feeaf0a2d6bfad6a29a
-  data.tar.gz: 45bea9181b909710ff9f446df5151f536e002caf11249d3d53c40ea7a1eecb465e797acf896c23ab15fc9b54f7028ce9d0244c1680dcb6f5281d7f3dc4f6d754
+  metadata.gz: 910eaa5810045780efabe7874e0c4e6bb669ad30c3f1bead3c37ab1f817e21a5e73c55acfcf7ffeacc63be95e163ddb5470b4912967379062afab45413d9d8ea
+  data.tar.gz: eae561c188d98071116695b8997f95ac31f1d0229fc56f968193aaac423020ee1219344568c61e2e1d7ddeee94f583189300845b5f5927a7122ab2cf5305f127

data/.travis.yml

@@ -20,7 +20,7 @@ gemfile:
   - test/gemfiles/mongoid5.gemfile
   - test/gemfiles/mongoid6.gemfile
 env:
-  - ELASTICSEARCH_VERSION=6.0.0
+  - ELASTICSEARCH_VERSION=6.2.1
 jdk: oraclejdk8
 matrix:
   include:
@@ -36,3 +36,6 @@ matrix:
     - gemfile: Gemfile
       env: ELASTICSEARCH_VERSION=5.6.4
       jdk: oraclejdk8
+    - gemfile: Gemfile
+      env: ELASTICSEARCH_VERSION=6.0.0
+      jdk: oraclejdk8

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 2.5.0
+
+- Try requests 3 times before raising error
+- Better exception when trying to access results for failed multi-search query
+- More efficient aggregations with `where` clauses
+- Added support for `faraday_middleware-aws-sigv4`
+- Added `credentials` option to `aws_credentials`
+- Added `modifier` option to `boost_by`
+- Added `scope_results` option
+- Added `factor` option to `boost_by_distance`
+
 ## 2.4.0
 
 - Fixed `similar` for Elasticsearch 6

data/CONTRIBUTING.md

@@ -0,0 +1,51 @@
+# Contributing
+
+First, thanks for wanting to contribute. You’re awesome! :heart:
+
+## Questions
+
+Use [Stack Overflow](https://stackoverflow.com/) with the tag `searchkick`.
+
+## Feature Requests
+
+Create an issue. Start the title with `[Idea]`.
+
+## Issues
+
+Think you’ve discovered an issue?
+
+1. Search existing issues to see if it’s been reported.
+2. Try the `master` branch to make sure it hasn’t been fixed.
+
+```rb
+gem "searchkick", github: "ankane/searchkick"
+```
+
+3. Try the `debug` option when searching. This can reveal useful info.
+
+```ruby
+Product.search("something", debug: true)
+```
+
+If the above steps don’t help, create an issue.
+
+- For incorrect search results, recreate the problem by forking [this gist](https://gist.github.com/ankane/f80b0923d9ae2c077f41997f7b704e5c). Include a link to your gist and the output in the issue.
+- For exceptions, include the complete backtrace.
+
+## Pull Requests
+
+Fork the project and create a pull request. A few tips:
+
+- Keep changes to a minimum. If you have multiple features or fixes, submit multiple pull requests.
+- Follow the existing style. The code should read like it’s written by a single person.
+- Add one or more tests if possible. Make sure existing tests pass with:
+
+```sh
+bundle exec rake test
+```
+
+Feel free to open an issue to get feedback on your idea before spending too much time on it.
+
+---
+
+This contributing guide is released under [CCO](https://creativecommons.org/publicdomain/zero/1.0/) (public domain). Use it for your own project without attribution.

data/README.md

@@ -299,6 +299,8 @@ end
 
 Call `Product.reindex` after changing synonyms.
 
+Synonyms cannot be more than two words at the moment.
+
 To read synonyms from a file, use:
 
 ```ruby
@@ -759,6 +761,12 @@ Date histogram
 Product.search "pear", aggs: {products_per_year: {date_histogram: {field: :created_at, interval: :year}}}
 ```
 
+For other aggregation types, including sub-aggregations, use `body_options`:
+
+```ruby
+Product.search "orange", body_options: {aggs: {price: {histogram: {field: :price, interval: 10}}}
+```
+
 #### Moving From Facets
 
 1. Replace `facets` with `aggs` in searches. **Note:** Stats facets are not supported at this time.
@@ -895,6 +903,8 @@ Bounded by a box
 Restaurant.search "sushi", where: {location: {top_left: {lat: 38, lon: -123}, bottom_right: {lat: 37, lon: -122}}}
 ```
 
+**Note:** `top_right` and `bottom_left` also work
+
 Bounded by a polygon
 
 ```ruby
@@ -1047,20 +1057,32 @@ Searchkick uses `ENV["ELASTICSEARCH_URL"]` for the Elasticsearch server. This de
 
 ### Heroku
 
-Choose an add-on: [SearchBox](https://elements.heroku.com/addons/searchbox), [Bonsai](https://elements.heroku.com/addons/bonsai), or [Elastic Cloud](https://elements.heroku.com/addons/foundelasticsearch).
+Choose an add-on: [Bonsai](https://elements.heroku.com/addons/bonsai) or [Elastic Cloud](https://elements.heroku.com/addons/foundelasticsearch). [SearchBox](https://elements.heroku.com/addons/searchbox) does not work at the moment.
 
-```sh
-# SearchBox
-heroku addons:create searchbox:starter
-heroku config:set ELASTICSEARCH_URL=`heroku config:get SEARCHBOX_URL`
+For Bonsai:
 
-# Bonsai
+```sh
 heroku addons:create bonsai
 heroku config:set ELASTICSEARCH_URL=`heroku config:get BONSAI_URL`
+```
+
+For Found:
 
-# Found
+```sh
 heroku addons:create foundelasticsearch
-heroku config:set ELASTICSEARCH_URL=`heroku config:get FOUNDELASTICSEARCH_URL`
+heroku addons:open foundelasticsearch
+```
+
+Visit the Shield page and reset your password. You’ll need to add the username and password to your url. Get the existing url with:
+
+```sh
+heroku config:get FOUNDELASTICSEARCH_URL
+```
+
+And add `elastic:password@` right after `https://`:
+
+```sh
+heroku config:set ELASTICSEARCH_URL=https://elastic:password@12345.us-east-1.aws.found.io
 ```
 
 Then deploy and reindex:
@@ -1415,7 +1437,7 @@ class Product < ApplicationRecord
   searchkick mappings: {
     product: {
       properties: {
-        name: {type: "string", analyzer: "keyword"}
+        name: {type: "keyword"}
       }
     }
   }
@@ -1506,20 +1528,6 @@ To query nested data, use dot notation.
 User.search "san", fields: ["address.city"], where: {"address.zip_code" => 12345}
 ```
 
-## Search Concepts
-
-### Precision and Recall
-
-[Precision and recall](https://en.wikipedia.org/wiki/Precision_and_recall) are two key concepts in search (also known as *information retrieval*). To help illustrate, let’s walk through an example.
-
-You have a store with 16 types of apples. A user searches for `apples` gets 10 results. 8 of the results are for apples, and 2 are for apple juice.
-
-**Precision** is the fraction of documents in the results that are relevant. There are 10 results and 8 are relevant, so precision is 80%.
-
-**Recall** is the fraction of relevant documents in the results out of all relevant documents. There are 16 apples and only 8 in the results, so recall is 50%.
-
-There’s typically a trade-off between the two. As you tweak your search to increase precision (not return irrelevant documents), there’s are greater chance a relevant document also isn’t returned, which decreases recall. The opposite also applies. As you try to increase recall (return a higher number of relevent documents), there’s a greater chance you also return an irrelevant document, decreasing precision.
-
 ## Reference
 
 Reindex one record
@@ -1658,6 +1666,12 @@ Eager load different associations by model
 Searchkick.search("*",  index_name: [Product, Store], model_includes: {Product => [:store], Store => [:product]})
 ```
 
+Run additional scopes on results [master]
+
+```ruby
+Product.search "milk", scope_results: ->(r) { r.with_attached_images }
+```
+
 Specify default fields to search
 
 ```ruby

data/lib/searchkick/bulk_reindex_job.rb

@@ -1,6 +1,6 @@
 module Searchkick
   class BulkReindexJob < ActiveJob::Base
-    queue_as :searchkick
+    queue_as { Searchkick.queue_name }
 
     def perform(class_name:, record_ids: nil, index_name: nil, method_name: nil, batch_id: nil, min_id: nil, max_id: nil)
       klass = class_name.constantize

data/lib/searchkick/hash_wrapper.rb

@@ -0,0 +1,12 @@
+module Searchkick
+  # Subclass of `Hashie::Mash` to wrap Hash-like structures
+  # (responses from Elasticsearch)
+  #
+  # The primary goal of the subclass is to disable the
+  # warning being printed by Hashie for re-defined
+  # methods, such as `sort`.
+  #
+  class HashWrapper < ::Hashie::Mash
+    disable_warnings if respond_to?(:disable_warnings)
+  end
+end

data/lib/searchkick/index_options.rb

@@ -174,7 +174,8 @@ module Searchkick
         if synonyms.any?
           settings[:analysis][:filter][:searchkick_synonym] = {
             type: "synonym",
-            synonyms: synonyms.select { |s| s.size > 1 }.map { |s| s.is_a?(Array) ? s.join(",") : s }.map(&:downcase)
+            # only remove a single space from synonyms so three-word synonyms will fail noisily instead of silently
+            synonyms: synonyms.select { |s| s.size > 1 }.map { |s| s.is_a?(Array) ? s.map { |s| s.sub(/\s+/, "") }.join(",") : s }.map(&:downcase)
           }
           # choosing a place for the synonym filter when stemming is not easy
           # https://groups.google.com/forum/#!topic/elasticsearch/p7qcQlgHdB8

data/lib/searchkick/process_batch_job.rb

@@ -1,6 +1,6 @@
 module Searchkick
   class ProcessBatchJob < ActiveJob::Base
-    queue_as :searchkick
+    queue_as { Searchkick.queue_name }
 
     def perform(class_name:, record_ids:)
       klass = class_name.constantize

data/lib/searchkick/process_queue_job.rb

@@ -1,6 +1,6 @@
 module Searchkick
   class ProcessQueueJob < ActiveJob::Base
-    queue_as :searchkick
+    queue_as { Searchkick.queue_name }
 
     def perform(class_name:)
       model = class_name.constantize

data/lib/searchkick/query.rb

@@ -19,7 +19,7 @@ module Searchkick
         :boost_by, :boost_by_distance, :boost_where, :conversions, :conversions_term, :debug, :emoji, :exclude, :execute, :explain,
         :fields, :highlight, :includes, :index_name, :indices_boost, :limit, :load,
         :match, :misspellings, :model_includes, :offset, :operator, :order, :padding, :page, :per_page, :profile,
-        :request_params, :routing, :select, :similar, :smart_aggs, :suggest, :track, :type, :where]
+        :request_params, :routing, :scope_results, :select, :similar, :smart_aggs, :suggest, :track, :type, :where]
       raise ArgumentError, "unknown keywords: #{unknown_keywords.join(", ")}" if unknown_keywords.any?
 
       term = term.to_s
@@ -98,7 +98,7 @@ module Searchkick
       # no easy way to tell which host the client will use
       host = Searchkick.client.transport.hosts.first
       credentials = host[:user] || host[:password] ? "#{host[:user]}:#{host[:password]}@" : nil
-      "curl #{host[:protocol]}://#{credentials}#{host[:host]}:#{host[:port]}/#{CGI.escape(index)}#{type ? "/#{type.map { |t| CGI.escape(t) }.join(',')}" : ''}/_search?pretty -d '#{query[:body].to_json}'"
+      "curl #{host[:protocol]}://#{credentials}#{host[:host]}:#{host[:port]}/#{CGI.escape(index)}#{type ? "/#{type.map { |t| CGI.escape(t) }.join(',')}" : ''}/_search?pretty -H 'Content-Type: application/json' -d '#{query[:body].to_json}'"
     end
 
     def handle_response(response)
@@ -112,7 +112,9 @@ module Searchkick
         json: !@json.nil?,
         match_suffix: @match_suffix,
         highlighted_fields: @highlighted_fields || [],
-        misspellings: @misspellings
+        misspellings: @misspellings,
+        term: term,
+        scope_results: options[:scope_results]
       }
 
       if options[:debug]
@@ -455,12 +457,16 @@ module Searchkick
           where[:type] = [options[:type] || klass].flatten.map { |v| searchkick_index.klass_document_type(v, true) }
         end
 
-        # filters
+        # start everything as efficient filters
+        # move to post_filters as aggs demand
         filters = where_filters(where)
-        set_filters(payload, filters) if filters.any?
+        post_filters = []
 
         # aggregations
-        set_aggregations(payload) if options[:aggs]
+        set_aggregations(payload, filters, post_filters) if options[:aggs]
+
+        # filters
+        set_filters(payload, filters, post_filters)
 
         # suggestions
         set_suggestions(payload, options[:suggest]) if options[:suggest]
@@ -545,6 +551,7 @@ module Searchkick
         function_params = attributes.select { |k, _| [:origin, :scale, :offset, :decay].include?(k) }
         function_params[:origin] = location_value(function_params[:origin])
         custom_filters << {
+          weight: attributes[:factor] || 1,
           attributes[:function] => {
             field => function_params
           }
@@ -653,12 +660,11 @@ module Searchkick
       @highlighted_fields = payload[:highlight][:fields].keys
     end
 
-    def set_aggregations(payload)
+    def set_aggregations(payload, filters, post_filters)
       aggs = options[:aggs]
       payload[:aggs] = {}
 
       aggs = Hash[aggs.map { |f| [f, {}] }] if aggs.is_a?(Array) # convert to more advanced syntax
-
       aggs.each do |field, agg_options|
         size = agg_options[:limit] ? agg_options[:limit] : 1_000
         shared_agg_options = agg_options.slice(:order, :min_doc_count)
@@ -703,6 +709,17 @@ module Searchkick
         where = {}
         where = (options[:where] || {}).reject { |k| k == field } unless options[:smart_aggs] == false
         agg_filters = where_filters(where.merge(agg_options[:where] || {}))
+
+        # only do one level comparison for simplicity
+        filters.select! do |filter|
+          if agg_filters.include?(filter)
+            true
+          else
+            post_filters << filter
+            false
+          end
+        end
+
         if agg_filters.any?
           payload[:aggs][field] = {
             filter: {
@@ -718,14 +735,16 @@ module Searchkick
       end
     end
 
-    def set_filters(payload, filters)
-      if options[:aggs]
+    def set_filters(payload, filters, post_filters)
+      if post_filters.any?
         payload[:post_filter] = {
           bool: {
-            filter: filters
+            filter: post_filters
           }
         }
-      else
+      end
+
+      if filters.any?
         # more efficient query if no aggs
         payload[:query] = {
           bool: {
@@ -769,7 +788,7 @@ module Searchkick
           if value.is_a?(Hash)
             value.each do |op, op_value|
               case op
-              when :within, :bottom_right
+              when :within, :bottom_right, :bottom_left
                 # do nothing
               when :near
                 filters << {
@@ -804,6 +823,15 @@ module Searchkick
                     }
                   }
                 }
+              when :top_right
+                filters << {
+                  geo_bounding_box: {
+                    field => {
+                      top_right: location_value(op_value),
+                      bottom_left: location_value(value[:bottom_left])
+                    }
+                  }
+                }
               when :regexp # support for regexp queries without using a regexp ruby object
                 filters << {regexp: {field => {value: op_value}}}
               when :not # not equal
@@ -886,7 +914,7 @@ module Searchkick
           field_value_factor: {
             field: field,
             factor: value[:factor].to_f,
-            modifier: log ? "ln2p" : nil
+            modifier: value[:modifier] || (log ? "ln2p" : nil)
           }
         }
 

data/lib/searchkick/results.rb

@@ -68,7 +68,7 @@ module Searchkick
             end
 
             result["id"] ||= result["_id"] # needed for legacy reasons
-            Hashie::Mash.new(result)
+            HashWrapper.new(result)
           end
         end
       end
@@ -77,6 +77,8 @@ module Searchkick
     def suggestions
       if response["suggest"]
         response["suggest"].values.flat_map { |v| v.first["options"] }.sort_by { |o| -o["score"] }.map { |o| o["text"] }.uniq
+      elsif options[:term] == "*"
+        []
       else
         raise "Pass `suggest: true` to the search method for suggestions"
       end
@@ -187,7 +189,11 @@ module Searchkick
     end
 
     def hits
-      @response["hits"]["hits"]
+      if error
+        raise Searchkick::Error, "Query error - use the error method to view it"
+      else
+        @response["hits"]["hits"]
+      end
     end
 
     def misspellings?
@@ -215,6 +221,10 @@ module Searchkick
           end
       end
 
+      if options[:scope_results]
+        records = options[:scope_results].call(records)
+      end
+
       Searchkick.load_records(records, ids)
     end
 

data/lib/searchkick/version.rb

@@ -1,3 +1,3 @@
 module Searchkick
-  VERSION = "2.4.0"
+  VERSION = "2.5.0"
 end

data/lib/searchkick.rb

@@ -6,6 +6,7 @@ require "searchkick/index_options"
 require "searchkick/index"
 require "searchkick/indexer"
 require "searchkick/reindex_queue"
+require "searchkick/hash_wrapper"
 require "searchkick/results"
 require "searchkick/query"
 require "searchkick/multi_search"
@@ -54,14 +55,11 @@ module Searchkick
 
       Elasticsearch::Client.new({
         url: ENV["ELASTICSEARCH_URL"],
-        transport_options: {request: {timeout: timeout}, headers: {content_type: "application/json"}}
+        transport_options: {request: {timeout: timeout}, headers: {content_type: "application/json"}},
+        retry_on_failure: 2
       }.deep_merge(client_options)) do |f|
         f.use Searchkick::Middleware
-        f.request :aws_signers_v4, {
-          credentials: Aws::Credentials.new(aws_credentials[:access_key_id], aws_credentials[:secret_access_key]),
-          service_name: "es",
-          region: aws_credentials[:region] || "us-east-1"
-        } if aws_credentials
+        f.request signer_middleware_key, signer_middleware_aws_params if aws_credentials
       end
     end
   end
@@ -136,7 +134,11 @@ module Searchkick
   end
 
   def self.aws_credentials=(creds)
-    require "faraday_middleware/aws_signers_v4"
+    begin
+      require "faraday_middleware/aws_signers_v4"
+    rescue LoadError
+      require "faraday_middleware/aws_sigv4"
+    end
     @aws_credentials = creds
     @client = nil # reset client
   end
@@ -200,6 +202,24 @@ module Searchkick
   def self.callbacks_value=(value)
     Thread.current[:searchkick_callbacks_enabled] = value
   end
+
+  # private
+  def self.signer_middleware_key
+    defined?(FaradayMiddleware::AwsSignersV4) ? :aws_signers_v4 : :aws_sigv4
+  end
+
+  # private
+  def self.signer_middleware_aws_params
+    if signer_middleware_key == :aws_sigv4
+      {service: "es", region: "us-east-1"}.merge(aws_credentials)
+    else
+      {
+        credentials: aws_credentials[:credentials] || Aws::Credentials.new(aws_credentials[:access_key_id], aws_credentials[:secret_access_key]),
+        service_name: "es",
+        region: aws_credentials[:region] || "us-east-1"
+      }
+    end
+  end
 end
 
 # TODO find better ActiveModel hook

data/test/aggs_test.rb

@@ -178,6 +178,26 @@ class AggsTest < Minitest::Test
     assert_equal 66, products.aggs["sum_price"]["value"]
   end
 
+  def test_body_options
+    products =
+      Product.search("*",
+        body_options: {
+          aggs: {
+            price: {
+              histogram: {field: :price, interval: 10}
+            }
+          }
+        }
+      )
+
+    expected = [
+      {"key" => 0.0, "doc_count" => 1},
+      {"key" => 10.0, "doc_count" => 1},
+      {"key" => 20.0, "doc_count" => 2}
+    ]
+    assert_equal products.aggs["price"]["buckets"], expected
+  end
+
   protected
 
   def buckets_as_hash(agg)

data/test/boost_test.rb

@@ -191,6 +191,17 @@ class BoostTest < Minitest::Test
     assert_order "san", ["San Francisco", "San Antonio", "San Marino"], boost_by_distance: {location: {origin: {lat: 37, lon: -122}, scale: "1000mi"}}
   end
 
+  def test_boost_by_distance_v2_factor
+    store [
+      {name: "San Francisco", latitude: 37.7833, longitude: -122.4167, found_rate: 0.1},
+      {name: "San Antonio", latitude: 29.4167, longitude: -98.5000, found_rate: 0.99},
+      {name: "San Marino", latitude: 43.9333, longitude: 12.4667, found_rate: 0.2}
+    ]
+
+    assert_order "san", ["San Antonio","San Francisco", "San Marino"], boost_by: {found_rate: {factor: 100}}, boost_by_distance: {location: {origin: [37, -122], scale: "1000mi"}}
+    assert_order "san", ["San Francisco", "San Antonio", "San Marino"], boost_by: {found_rate: {factor: 100}}, boost_by_distance: {location: {origin: [37, -122], scale: "1000mi", factor: 100}}
+  end
+
   def test_boost_by_indices
     skip if cequel?
 

data/test/ci/before_install.sh

@@ -14,4 +14,4 @@ fi
 tar -xvf elasticsearch-$ELASTICSEARCH_VERSION.tar.gz
 cd elasticsearch-$ELASTICSEARCH_VERSION/bin
 ./elasticsearch -d
-wget -O- --waitretry=1 --tries=30 --retry-connrefused -v http://127.0.0.1:9200/
+wget -O- --waitretry=1 --tries=60 --retry-connrefused -v http://127.0.0.1:9200/

data/test/multi_search_test.rb

@@ -33,4 +33,12 @@ class MultiSearchTest < Minitest::Test
     Searchkick.multi_search([products], retry_misspellings: true)
     assert_equal ["abc", "abd"], products.map(&:name)
   end
+
+  def test_error
+    products = Product.search("*", order: {bad_column: :asc}, execute: false)
+    Searchkick.multi_search([products])
+    assert products.error
+    error = assert_raises(Searchkick::Error) { products.results }
+    assert_equal error.message, "Query error - use the error method to view it"
+  end
 end

data/test/sql_test.rb

@@ -211,4 +211,11 @@ class SqlTest < Minitest::Test
       assert records.first.association(associations[klass].first).loaded?
     end
   end
+
+  def test_scope_results
+    skip unless defined?(ActiveRecord)
+
+    store_names ["Product A", "Product B"]
+    assert_search "product", ["Product A"], scope_results: ->(r) { r.where(name: "Product A") }
+  end
 end

data/test/suggest_test.rb

@@ -68,6 +68,7 @@ class SuggestTest < Minitest::Test
   end
 
   def test_multiple_models
+    skip # flaky test
     store_names ["Great White Shark", "Hammerhead Shark", "Tiger Shark"]
     assert_equal "how big is a tiger shark", Searchkick.search("How Big is a Tigre Shar", suggest: [:name], fields: [:name]).suggestions.first
   end
@@ -77,6 +78,10 @@ class SuggestTest < Minitest::Test
     assert_raises(ArgumentError) { Searchkick.search("How Big is a Tigre Shar", suggest: true) }
   end
 
+  def test_star
+    assert_equal [], Product.search("*", suggest: true).suggestions
+  end
+
   protected
 
   def assert_suggest(term, expected, options = {})

data/test/test_helper.rb

@@ -399,7 +399,7 @@ class Product
     synonyms: [
       ["clorox", "bleach"],
       ["scallion", "greenonion"],
-      ["saranwrap", "plasticwrap"],
+      ["saran wrap", "plastic wrap"],
       ["qtip", "cottonswab"],
       ["burger", "hamburger"],
       ["bandaid", "bandag"],

data/test/where_test.rb

@@ -189,6 +189,22 @@ class WhereTest < Minitest::Test
     assert_search "san", ["San Francisco"], where: {location: {top_left: {lat: 38, lon: -123}, bottom_right: {lat: 37, lon: -122}}}
   end
 
+  def test_top_right_bottom_left
+    store [
+      {name: "San Francisco", latitude: 37.7833, longitude: -122.4167},
+      {name: "San Antonio", latitude: 29.4167, longitude: -98.5000}
+    ]
+    assert_search "san", ["San Francisco"], where: {location: {top_right: [38, -122], bottom_left: [37, -123]}}
+  end
+
+  def test_top_right_bottom_left_hash
+    store [
+      {name: "San Francisco", latitude: 37.7833, longitude: -122.4167},
+      {name: "San Antonio", latitude: 29.4167, longitude: -98.5000}
+    ]
+    assert_search "san", ["San Francisco"], where: {location: {top_right: {lat: 38, lon: -122}, bottom_left: {lat: 37, lon: -123}}}
+  end
+
   def test_multiple_locations
     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: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-15 00:00:00.000000000 Z
+date: 2018-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -104,6 +104,7 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -112,6 +113,7 @@ files:
 - benchmark/benchmark.rb
 - lib/searchkick.rb
 - lib/searchkick/bulk_reindex_job.rb
+- lib/searchkick/hash_wrapper.rb
 - lib/searchkick/index.rb
 - lib/searchkick/index_options.rb
 - lib/searchkick/indexer.rb