searchkick 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7e8d412864f6c87ba170611a9b2cdfb6d6f6cc8
-  data.tar.gz: 98d9385aa9ad6c967ccdae9924f15d8bf0c1ee69
+  metadata.gz: 81763af637b2e95a2eebbcecf303a23274b46221
+  data.tar.gz: dee89361eb8976c550ad20f413fc8ca42c5a696b
 SHA512:
-  metadata.gz: 00cfd0a2da2ce78127466636d5176c89356ef90311335b26f0050d58375cd3eb082113255a7eb3c71a5e0860e5c2b45a0a463363d1665e8e765ce14bb0d4d371
-  data.tar.gz: a90e126bfe9c460538ef89570e1da4512b93c804b45d43b01384c0bd5cb29d128db88668c3fa2fd009dcdc5abd4870f9216b6b6b3f4f580833703c42709e5d35
+  metadata.gz: bdf78091a6aa79ae75eed94e54b0f0e5c53e9515adfd4914e82b92882dfe4308af5d9cd1c4333586244f94eef69ef4c921ff53c77188f47cb1db16a4467b9087
+  data.tar.gz: 18773058d6ba94a0f1b2da546e426884483f45c50428babd4e172178ad0804f219648fe5de97d82c55a723886cef4d9d39b053cedc0b2d5a66d0c1cf58b3edd3

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.2.5
+
+- Added geospartial searches
+- Create alias before importing document if no alias exists
+- Fixed exception when :per_page option is a string
+- Check `RAILS_ENV` if `RACK_ENV` is not set
+
 ## 0.2.4
 
 - Use `to_hash` instead of `as_json` for default `search_data` method

data/README.md

@@ -341,6 +341,24 @@ product = Product.first
 product.similar(fields: ["name"])
 ```
 
+### Geospatial Searches
+
+```ruby
+class City < ActiveRecord::Base
+  searchkick locations: ["location"]
+
+  def search_data
+    to_hash.merge location: [latitude.to_f, longitude.to_f]
+  end
+end
+```
+
+Reindex and search with:
+
+```ruby
+City.search "san", where: {location: {near: [37, -114], within: "100mi"}} # or 160km
+```
+
 ## Deployment
 
 Searchkick uses `ENV["ELASTICSEARCH_URL"]` for the Elasticsearch server.  This defaults to `http://localhost:9200`.
@@ -468,12 +486,17 @@ class Product < ActiveRecord::Base
 end
 ```
 
+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).
 
 ## TODO
 
+- Analytics for searches and conversions
+- Generate autocomplete predictions from past search queries
+- Automatic failover
 - Make Searchkick work with any language
 
 ## History

data/lib/searchkick/model.rb

@@ -3,6 +3,8 @@ module Searchkick
 
     def searchkick(options = {})
       @searchkick_options = options.dup
+      @searchkick_env = ENV["RACK_ENV"] || ENV["RAILS_ENV"] || "development"
+      searchkick_env = @searchkick_env # for class_eval
 
       class_eval do
         extend Searchkick::Search
@@ -11,7 +13,7 @@ module Searchkick
         include Tire::Model::Search
         include Tire::Model::Callbacks
         tire do
-          index_name options[:index_name] || [klass.model_name.plural, ENV["RACK_ENV"] || "development"].join("_")
+          index_name options[:index_name] || [klass.model_name.plural, searchkick_env].join("_")
         end
 
         def reindex

data/lib/searchkick/reindex.rb

@@ -12,41 +12,30 @@ module Searchkick
       success = index.create searchkick_index_options
       raise index.response.to_s if !success
 
-      # use scope for import
-      scope = respond_to?(:search_import) ? search_import : self
-      if scope.respond_to?(:find_in_batches)
-        scope.find_in_batches do |batch|
-          index.import batch
-        end
-      else
-        # https://github.com/karmi/tire/blob/master/lib/tire/model/import.rb
-        # use cursor for Mongoid
-        items = []
-        scope.all.each do |item|
-          items << item
-          if items.length % 1000 == 0
-            index.import items
-            items = []
-          end
-        end
-        index.import items
-      end
-
       if a = Tire::Alias.find(alias_name)
-        a.indices.each do |index|
-          a.indices.delete index
+        searchkick_import(index) # import before swap
+
+        a.indices.each do |i|
+          a.indices.delete i
         end
 
         a.indices.add new_index
         response = a.save
 
-        clean_indices if response.success?
+        if response.success?
+          clean_indices
+        else
+          raise response.to_s
+        end
       else
         tire.index.delete if tire.index.exists?
         response = Tire::Alias.create(name: alias_name, indices: [new_index])
+        raise response.to_s if !response.success?
+
+        searchkick_import(index) # import after swap
       end
 
-      response.success? || (raise response.to_s)
+      true
     end
 
     # remove old indices that start w/ index_name
@@ -65,6 +54,28 @@ module Searchkick
 
     private
 
+    def searchkick_import(index)
+      # use scope for import
+      scope = respond_to?(:search_import) ? search_import : self
+      if scope.respond_to?(:find_in_batches)
+        scope.find_in_batches do |batch|
+          index.import batch
+        end
+      else
+        # https://github.com/karmi/tire/blob/master/lib/tire/model/import.rb
+        # use cursor for Mongoid
+        items = []
+        scope.all.each do |item|
+          items << item
+          if items.length % 1000 == 0
+            index.import items
+            items = []
+          end
+        end
+        index.import items
+      end
+    end
+
     def searchkick_index_options
       options = @searchkick_options
 
@@ -137,7 +148,7 @@ module Searchkick
         }
       }
 
-      if ENV["RACK_ENV"] == "test"
+      if @searchkick_env == "test"
         settings.merge!(number_of_shards: 1, number_of_replicas: 0)
       end
 
@@ -196,6 +207,12 @@ module Searchkick
         mapping[field] = field_mapping
       end
 
+      (options[:locations] || []).each do |field|
+        mapping[field] = {
+          type: "geo_point"
+        }
+      end
+
       mappings = {
         document_type.to_sym => {
           properties: mapping,

data/lib/searchkick/search.rb

@@ -26,7 +26,7 @@ module Searchkick
 
       # pagination
       page = [options[:page].to_i, 1].max
-      per_page = options[:limit] || options[:per_page] || 100000
+      per_page = (options[:limit] || options[:per_page] || 100000).to_i
       offset = options[:offset] || (page - 1) * per_page
       index_name = options[:index_name] || tire.index.name
 
@@ -168,6 +168,15 @@ module Searchkick
               if value.is_a?(Array) # in query
                 filters << {terms: {field => value}}
               elsif value.is_a?(Hash)
+                if value[:near]
+                  filters << {
+                    geo_distance: {
+                      field => value.delete(:near),
+                      distance: value.delete(:within) || "50mi"
+                    }
+                  }
+                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.4"
+  VERSION = "0.2.5"
 end

data/test/sql_test.rb

@@ -72,6 +72,23 @@ class TestSql < Minitest::Unit::TestCase
     assert_search "product", ["Product A"], where: {color: ["RED"]}
   end
 
+  def test_near
+    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: {near: [37, -122]}}
+  end
+
+  def test_near_within
+    store [
+      {name: "San Francisco", latitude: 37.7833, longitude: -122.4167},
+      {name: "San Antonio", latitude: 29.4167, longitude: -98.5000},
+      {name: "San Marino", latitude: 43.9333, longitude: 12.4667}
+    ]
+    assert_search "san", ["San Francisco", "San Antonio"], where: {location: {near: [37, -122], within: "2000mi"}}
+  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}

data/test/test_helper.rb

@@ -44,6 +44,8 @@ else
     t.boolean :backordered
     t.integer :orders_count
     t.string :color
+    t.decimal :latitude, precision: 10, scale: 7
+    t.decimal :longitude, precision: 10, scale: 7
     t.timestamps
   end
 
@@ -72,12 +74,13 @@ class Product
     autocomplete: [:name],
     suggest: [:name, :color],
     conversions: "conversions",
-    personalize: "user_ids"
+    personalize: "user_ids",
+    locations: ["location"]
 
   attr_accessor :conversions, :user_ids
 
   def search_data
-    to_hash.merge conversions: conversions, user_ids: user_ids
+    to_hash.merge conversions: conversions, user_ids: user_ids, location: [latitude.to_f, longitude.to_f]
   end
 end
 

metadata

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