searchkick 0.2.8 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 017b8175ed8d15abb422c8ac7ee965ea2e527799
-  data.tar.gz: f88f3e7cb91c76f6f3ae2c71bb08de14c56c4d8f
+  metadata.gz: 08d3471564b063d98692fa8db6e27635b826d9eb
+  data.tar.gz: 23ff81861bf090b967eacce86c31b99f18370738
 SHA512:
-  metadata.gz: 04881e972883815eee7df6e2cf1a12d6e121611b82736553ea2efdc307e9af046cde691450a7610ac29ee21aae5dca9b58ff55b3891ea8856f538c0de84f135d
-  data.tar.gz: 6f1471121e4882f0c9f3207e7f88769047bb9f99de85626e34a72978cd18c706c3c9754ac1c2d79235ca5ec4163ebf9e1705d4ad266d05b4f3983a23c0453ff6
+  metadata.gz: 0e3fb6959b85a1d63908e7fe7c6086eb817ee597132f701205fa0942f7982e43a6eecdb6b1924e2c7e7d4f1650071df95a2281b1b548e8099a3e2eeffbd1c475
+  data.tar.gz: 1c774316a7f8833239e27c4e15578c537729ce37c6c9cb54b7202f71b4ee44978d2dda2bad4d330b7e34acfbc643a002fdc92a436af79cfb41e0147d6bda9322

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.3.0
+
+- Fixed reversed coordinates
+- Added bounded by a box queries
+- Expanded `or` queries
+
 ## 0.2.8
 
 - Added option to disable callbacks

data/README.md

@@ -21,6 +21,8 @@ Plus:
 - “Did you mean” suggestions
 - works with ActiveRecord and Mongoid
 
+:zap: Even better with [Searchjoy](http://ankane.github.io/searchjoy/)
+
 :tangerine: Battle-tested at [Instacart](https://www.instacart.com)
 
 [![Build Status](https://travis-ci.org/ankane/searchkick.png?branch=master)](https://travis-ci.org/ankane/searchkick)
@@ -351,6 +353,8 @@ product.similar(fields: ["name"])
 
 ### Geospatial Searches
 
+**Note:** Before `0.3.0`, locations were indexed incorrectly. When upgrading, be sure to reindex immediately.
+
 ```ruby
 class City < ActiveRecord::Base
   searchkick locations: ["location"]
@@ -367,6 +371,12 @@ Reindex and search with:
 City.search "san", where: {location: {near: [37, -114], within: "100mi"}} # or 160km
 ```
 
+Bounded by a box
+
+```ruby
+City.search "san", where: {location: {top_left: [38, -123], bottom_right: [37, -122]}}
+```
+
 ## Deployment
 
 Searchkick uses `ENV["ELASTICSEARCH_URL"]` for the Elasticsearch server.  This defaults to `http://localhost:9200`.
@@ -406,7 +416,7 @@ ENV["ELASTICSEARCH_URL"] = "http://username:password@api.searchbox.io"
 Then deploy and reindex:
 
 ```sh
-heroku run rake searchkick:reindex CLASS=Product
+rake searchkick:reindex CLASS=Product
 ```
 
 ## Reference

data/lib/searchkick/model.rb

@@ -17,7 +17,7 @@ module Searchkick
         end
 
         def reindex
-          update_index
+          tire.update_index
         end
 
         def search_data
@@ -43,6 +43,11 @@ module Searchkick
             source[field] = "a" if !source[field]
           end
 
+          # locations
+          (options[:locations] || []).map(&:to_s).each do |field|
+            source[field] = source[field].reverse if source[field]
+          end
+
           source.to_json
         end
       end

data/lib/searchkick/reindex.rb

@@ -41,7 +41,7 @@ module Searchkick
     # remove old indices that start w/ index_name
     def clean_indices
       all_indices = JSON.parse(Tire::Configuration.client.get("#{Tire::Configuration.url}/_aliases").body)
-      indices = all_indices.select{|k, v| v["aliases"].empty? && k =~ /\A#{Regexp.escape(index_name)}_\d{14,17}\z/ }.keys
+      indices = all_indices.select{|k, v| v["aliases"].empty? && k =~ /\A#{Regexp.escape(tire.index.name)}_\d{14,17}\z/ }.keys
       indices.each do |index|
         Tire::Index.new(index).delete
       end

data/lib/searchkick/search.rb

@@ -156,14 +156,13 @@ module Searchkick
       end
 
       # where
-      # TODO expand or
       where_filters =
         proc do |where|
           filters = []
           (where || {}).each do |field, value|
             if field == :or
               value.each do |or_clause|
-                filters << {or: or_clause.map{|or_statement| {term: or_statement} }}
+                filters << {or: or_clause.map{|or_statement| {and: where_filters.call(or_statement)} }}
               end
             else
               # expand ranges
@@ -177,12 +176,23 @@ module Searchkick
                 if value[:near]
                   filters << {
                     geo_distance: {
-                      field => value.delete(:near),
+                      field => value.delete(:near).reverse,
                       distance: value.delete(:within) || "50mi"
                     }
                   }
                 end
 
+                if value[:top_left]
+                  filters << {
+                    geo_bounding_box: {
+                      field => {
+                        top_left: value.delete(:top_left).reverse,
+                        bottom_right: value.delete(:bottom_right).reverse
+                      }
+                    }
+                  }
+                end
+
                 value.each do |op, op_value|
                   if op == :not # not equal
                     if op_value.is_a?(Array)

data/lib/searchkick/version.rb

@@ -1,3 +1,3 @@
 module Searchkick
-  VERSION = "0.2.8"
+  VERSION = "0.3.0"
 end

data/test/sql_test.rb

@@ -60,7 +60,10 @@ class TestSql < Minitest::Unit::TestCase
     assert_search "product", ["Product A", "Product B"], where: {store_id: [1, 2]}
     assert_search "product", ["Product B", "Product C", "Product D"], where: {store_id: {not: 1}}
     assert_search "product", ["Product C", "Product D"], where: {store_id: {not: [1, 2]}}
+    # or
     assert_search "product", ["Product A", "Product B", "Product C"], where: {or: [[{in_stock: true}, {store_id: 3}]]}
+    assert_search "product", ["Product A", "Product B", "Product C"], where: {or: [[{orders_count: [2, 4]}, {store_id: [1, 2]}]]}
+    assert_search "product", ["Product A", "Product D"], where: {or: [[{orders_count: 1}, {created_at: {gte: now - 1}, backordered: true}]]}
     # array
     assert_search "product", ["Product A"], where: {user_ids: 2}
   end
@@ -77,7 +80,7 @@ class TestSql < Minitest::Unit::TestCase
       {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: {near: [37, -122]}}
+    assert_search "san", ["San Francisco"], where: {location: {near: [37.5, -122.5]}}
   end
 
   def test_near_within
@@ -89,6 +92,14 @@ class TestSql < Minitest::Unit::TestCase
     assert_search "san", ["San Francisco", "San Antonio"], where: {location: {near: [37, -122], within: "2000mi"}}
   end
 
+  def test_top_left_bottom_right
+    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_left: [38, -123], bottom_right: [37, -122]}}
+  end
+
   def test_order_hash
     store_names ["Product A", "Product B", "Product C", "Product D"]
     assert_order "product", ["Product D", "Product C", "Product B", "Product A"], order: {name: :desc}

metadata

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