searchkick 0.3.5 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8a8a68edbdd1ac1b03fc9fa7396391082a13a64
-  data.tar.gz: 9933087ad09633fbb2b9b0607fc2ec591a62e35b
+  metadata.gz: 84aa6414f91ce1c76d0c247e9a11dfce4417c2ee
+  data.tar.gz: f072c08de08bac3808112ad165199b98b5b2e507
 SHA512:
-  metadata.gz: edbfccd85651bbfb32c13a8c7de4ea15663cc0ff04fcc03969d7268d2c365b59e7272045541b116e9bb0234d8e5976190265d699d6549cc0a6710489927638f6
-  data.tar.gz: eea0fe79ae6396f7c07769a3437640162ded10494600bc69179403e2f11609a9c24609c4eaa08dd287840328417d54323850657fd7791f51212aa287549e6993
+  metadata.gz: b866b6ba7f26bca01b13043c42ae1e9917b664be9bf77ce0c269dde30298fc8d2a08a54ce247dd465e500ebe8e122e804685ab4855984c1a09088b46422900e7
+  data.tar.gz: ab9bae0de9a80123cb85e0a34f221b6dce56efc91471c3037fbce10b2c7e284635291704965c1894c419e3b7610da8e1ffa4d83cde4a76039a530ef0b26e7407

data/.gitignore

@@ -3,7 +3,7 @@
 .bundle
 .config
 .yardoc
-Gemfile.lock
+*.lock
 InstalledFiles
 _yardoc
 coverage

data/.travis.yml

@@ -4,6 +4,7 @@ rvm:
   - 2.0.0
 services:
   - elasticsearch
+  - mongodb
 script: bundle exec rake test
 before_script:
   - psql -c 'create database searchkick_test;' -U postgres
@@ -11,3 +12,7 @@ notifications:
   email:
     on_success: never
     on_failure: change
+gemfile:
+  - Gemfile
+  - gemfiles/mongoid3.gemfile
+  - gemfiles/mongoid4.gemfile

data/CHANGELOG.md

@@ -1,7 +1,16 @@
+## 0.4.1
+
+- Fixed issue w/ inheritance mapping
+
+## 0.4.0
+
+- Added support for Mongoid 4
+- Added support for multiple locations
+
 ## 0.3.5
 
 - Added facet ranges
-- Add all operator
+- Added all operator
 
 ## 0.3.4
 

data/Gemfile

@@ -3,7 +3,5 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in searchkick.gemspec
 gemspec
 
-# gem "mongoid", github: "mongoid/mongoid"
-# gem "mongoid", "~> 3.1.0"
 # gem "activerecord", "~> 3.2.0"
 # gem "activerecord", "~> 3.1.0"

data/README.md

@@ -446,6 +446,12 @@ Animal.search "*" # all animals
 Dog.search "*"    # just dogs
 ```
 
+**Note:** The `suggest` option retrieves suggestions from the parent at the moment.
+
+```ruby
+Dog.search "airbudd", suggest: true # suggestions for all animals
+```
+
 ## Deployment
 
 Searchkick uses `ENV["ELASTICSEARCH_URL"]` for the Elasticsearch server.  This defaults to `http://localhost:9200`.

data/gemfiles/mongoid3.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in searchkick.gemspec
+gemspec path: "../"
+
+gem "mongoid", "~> 3.1.0"

data/gemfiles/mongoid4.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in searchkick.gemspec
+gemspec path: "../"
+
+gem "mongoid", github: "mongoid/mongoid"

data/lib/searchkick/model.rb

@@ -43,6 +43,9 @@ module Searchkick
           # stringify fields
           source = source.inject({}){|memo,(k,v)| memo[k.to_s] = v; memo}
 
+          # Mongoid 4 hack
+          source["_id"] = source["_id"].to_s if source["_id"]
+
           options = self.class.searchkick_options
 
           # conversions
@@ -58,7 +61,13 @@ module Searchkick
 
           # locations
           (options[:locations] || []).map(&:to_s).each do |field|
-            source[field] = source[field].map(&:to_f).reverse if source[field]
+            if source[field]
+              if source[field].first.is_a?(Array) # array of arrays
+                source[field] = source[field].map{|a| a.map(&:to_f).reverse }
+              else
+                source[field] = source[field].map(&:to_f).reverse
+              end
+            end
           end
 
           # change all BigDecimal values to floats due to
@@ -84,6 +93,8 @@ module Searchkick
 
           cast_big_decimal.call(source)
 
+          # p search_data
+
           source.to_json
         end
 

data/lib/searchkick/reindex.rb

@@ -35,6 +35,8 @@ module Searchkick
         searchkick_import(index) # import after swap
       end
 
+      index.refresh
+
       true
     end
 
@@ -223,7 +225,7 @@ module Searchkick
       end
 
       mappings = {
-        searchkick_klass.document_type.to_sym => {
+        _default_: {
           properties: mapping,
           # https://gist.github.com/kimchy/2898285
           dynamic_templates: [

data/lib/searchkick/search.rb

@@ -161,6 +161,8 @@ module Searchkick
         proc do |where|
           filters = []
           (where || {}).each do |field, value|
+            field = :_id if field.to_s == "id"
+
             if field == :or
               value.each do |or_clause|
                 filters << {or: or_clause.map{|or_statement| {and: where_filters.call(or_statement)} }}
@@ -325,7 +327,7 @@ module Searchkick
         status_code = e.message[0..3].to_i
         if status_code == 404
           raise "Index missing - run #{searchkick_klass.name}.reindex"
-        elsif status_code == 500 and e.message.include?("IllegalArgumentException[minimumSimilarity >= 1]")
+        elsif status_code == 500 and (e.message.include?("IllegalArgumentException[minimumSimilarity >= 1]") or e.message.include?("No query registered for [multi_match]"))
           raise "Upgrade Elasticsearch to 0.90.0 or greater"
         else
           raise e

data/lib/searchkick/similar.rb

@@ -9,7 +9,7 @@ module Searchkick
       # TODO deep merge method
       options[:where] ||= {}
       options[:where][:_id] ||= {}
-      options[:where][:_id][:not] = id
+      options[:where][:_id][:not] = id.to_s
       options[:limit] ||= 10
       options[:similar] = true
       self.class.search(like_text, options)

data/lib/searchkick/version.rb

@@ -1,3 +1,3 @@
 module Searchkick
-  VERSION = "0.3.5"
+  VERSION = "0.4.1"
 end

data/searchkick.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "minitest"
+  spec.add_development_dependency "minitest", "~> 4.7"
   spec.add_development_dependency "activerecord"
   spec.add_development_dependency "pg"
 end

data/test/inheritance_test.rb

@@ -30,4 +30,28 @@ class TestInheritance < Minitest::Unit::TestCase
     assert_equal 2, Animal.search("bear").size
   end
 
+  def test_child_autocomplete
+    store_names ["Max"], Cat
+    store_names ["Mark"], Dog
+    assert_equal ["Max"], Cat.search("ma", fields: [:name], autocomplete: true).map(&:name)
+  end
+
+  def test_parent_autocomplete
+    store_names ["Max"], Cat
+    store_names ["Bear"], Dog
+    assert_equal ["Bear"], Animal.search("bea", fields: [:name], autocomplete: true).map(&:name).sort
+  end
+
+  # def test_child_suggest
+  #   store_names ["Shark"], Cat
+  #   store_names ["Sharp"], Dog
+  #   assert_equal ["shark"], Cat.search("shar", fields: [:name], suggest: true).suggestions
+  # end
+
+  def test_parent_suggest
+    store_names ["Shark"], Cat
+    store_names ["Tiger"], Dog
+    assert_equal ["tiger"], Animal.search("tige", fields: [:name], suggest: true).suggestions.sort
+  end
+
 end

data/test/sql_test.rb

@@ -87,7 +87,7 @@ class TestSql < Minitest::Unit::TestCase
   def test_where_id
     store_names ["Product A"]
     product = Product.last
-    assert_search "product", ["Product A"], where: {id: product.id}
+    assert_search "product", ["Product A"], where: {id: product.id.to_s}
   end
 
   def test_near
@@ -115,6 +115,14 @@ class TestSql < Minitest::Unit::TestCase
     assert_search "san", ["San Francisco"], where: {location: {top_left: [38, -123], bottom_right: [37, -122]}}
   end
 
+  def test_multiple_locations
+    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: {multiple_locations: {near: [37.5, -122.5]}}
+  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}
@@ -186,9 +194,12 @@ class TestSql < Minitest::Unit::TestCase
     assert_kind_of Tire::Results::Item, Product.search("product", load: false, include: [:store]).first
   end
 
-  def test_include
-    store_names ["Product A"]
-    assert Product.search("product", include: [:store]).first.association(:store).loaded?
+  # TODO see if Mongoid is loaded
+  if !defined?(Mongoid)
+    def test_include
+      store_names ["Product A"]
+      assert Product.search("product", include: [:store]).first.association(:store).loaded?
+    end
   end
 
 end

data/test/test_helper.rb

@@ -11,14 +11,24 @@ Tire.configure do
   pretty true
 end
 
-if ENV["MONGOID"]
+if defined?(Mongoid)
   Mongoid.configure do |config|
     config.connect_to "searchkick_test"
   end
 
   class Product
     include Mongoid::Document
-    # include Mongoid::Attributes::Dynamic
+    include Mongoid::Timestamps
+
+    field :name
+    field :store_id, type: Integer
+    field :in_stock, type: Boolean
+    field :backordered, type: Boolean
+    field :orders_count, type: Integer
+    field :price, type: Integer
+    field :color
+    field :latitude, type: BigDecimal
+    field :longitude, type: BigDecimal
   end
 
   class Store
@@ -27,6 +37,8 @@ if ENV["MONGOID"]
 
   class Animal
     include Mongoid::Document
+
+    field :name
   end
 
   class Dog < Animal
@@ -100,17 +112,17 @@ class Product
     suggest: [:name, :color],
     conversions: "conversions",
     personalize: "user_ids",
-    locations: ["location"]
+    locations: ["location", "multiple_locations"]
 
   attr_accessor :conversions, :user_ids
 
   def search_data
-    attributes.merge conversions: conversions, user_ids: user_ids, location: [latitude, longitude]
+    serializable_hash.merge conversions: conversions, user_ids: user_ids, location: [latitude, longitude], multiple_locations: [[latitude, longitude], [0, 0]]
   end
 end
 
 class Animal
-  searchkick
+  searchkick autocomplete: [:name], suggest: [:name]
 end
 
 Product.searchkick_index.delete if Product.searchkick_index.exists?
@@ -119,7 +131,7 @@ Product.reindex # run twice for both index paths
 
 Animal.reindex
 
-class MiniTest::Unit::TestCase
+class Minitest::Unit::TestCase
 
   def setup
     Product.destroy_all

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: searchkick
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-08 00:00:00.000000000 Z
+date: 2013-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tire
@@ -70,16 +70,16 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.7'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +122,8 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- gemfiles/mongoid3.gemfile
+- gemfiles/mongoid4.gemfile
 - lib/searchkick.rb
 - lib/searchkick/logger.rb
 - lib/searchkick/model.rb