searchkick 0.3.2 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff1b17b6561440bad2ebe3c20d1606b13d579310
-  data.tar.gz: 50475abfd988e11bca0b04385a4ec264bac80467
+  metadata.gz: 84aa6414f91ce1c76d0c247e9a11dfce4417c2ee
+  data.tar.gz: f072c08de08bac3808112ad165199b98b5b2e507
 SHA512:
-  metadata.gz: 19e25e2f81fb811f7bf1964cb59a5deccfc6386d10640279bfe6cfb7bb81a1611691ebd6ccb8879c7dcbec4f530d5ccf2fae089e19cc8f783409985092d2315b
-  data.tar.gz: be76d99160e570515a3120ecb517a6faef29f2b3b95eb4ebc6556cbe2839d3554faa7295ff72ccc14caf82fb817b65e2286a74377fd95137d68c6666383bc26f
+  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,3 +1,28 @@
+## 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
+- Added all operator
+
+## 0.3.4
+
+- Added highlighting
+- Added :distance option to misspellings
+- Fixed issue w/ BigDecimal serialization
+
+## 0.3.3
+
+- Better error messages
+- Added where: {field: nil} queries
+
 ## 0.3.2
 
 - Added support for single table inheritance

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

@@ -29,7 +29,7 @@ Plus:
 
 ## Get Started
 
-[Install Elasticsearch](http://www.elasticsearch.org/guide/reference/setup/installation/). For Homebrew, use:
+[Install Elasticsearch](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/setup.html). For Homebrew, use:
 
 ```sh
 brew install elasticsearch
@@ -87,6 +87,7 @@ where: {
   aisle_id: [25, 30],         # in
   store_id: {not: 2},         # not
   aisle_id: {not: [25, 30]},  # not in
+  user_ids: {all: [1, 3]},    # all elements in array
   or: [
     [{in_stock: true}, {backordered: true}]
   ]
@@ -111,6 +112,14 @@ Boost by a field
 boost: "orders_count" # give popular documents a little boost
 ```
 
+### Get Everything
+
+Use a `*` for the query.
+
+```ruby
+Product.search "*"
+```
+
 ### Pagination
 
 Plays nicely with kaminari and will_paginate.
@@ -152,7 +161,13 @@ Call `Product.reindex` after changing synonyms.
 By default, Searchkick handles misspelled queries by returning results with an [edit distance](http://en.wikipedia.org/wiki/Levenshtein_distance) of one. To turn off this feature, use:
 
 ```ruby
-Product.search "zuchini", misspellings: false
+Product.search "zuchini", misspellings: false # no zucchini
+```
+
+You can also change the edit distance with:
+
+```ruby
+Product.search "zucini", misspellings: {distance: 2} # zucchini
 ```
 
 ### Indexing
@@ -342,6 +357,37 @@ Advanced
 Product.search "2% Milk", facets: {store_id: {where: {in_stock: true}, limit: 10}}
 ```
 
+Ranges
+
+```ruby
+price_ranges = [{to: 20}, {from: 20, to: 50}, {from: 50}]
+Product.search "*", facets: {price: {ranges: price_ranges}}
+```
+
+### Highlight
+
+Highlight the search query in the results.
+
+```ruby
+bands = Band.search "cinema", fields: [:name], highlight: true
+```
+
+**Note:** The `fields` option is required.
+
+View the highlighted fields with:
+
+```ruby
+bands.with_details.each do |band, details|
+  puts details[:highlight][:name] # "Two Door <em>Cinema</em> Club"
+end
+```
+
+To change the tag, use:
+
+```ruby
+Band.search "cinema", fields: [:name], highlight: {tag: "<strong>"}
+```
+
 ### Similar Items
 
 Find similar items.
@@ -360,7 +406,7 @@ class City < ActiveRecord::Base
   searchkick locations: ["location"]
 
   def search_data
-    to_hash.merge location: [latitude, longitude]
+    attributes.merge location: [latitude, longitude]
   end
 end
 ```
@@ -377,6 +423,35 @@ Bounded by a box
 City.search "san", where: {location: {top_left: [38, -123], bottom_right: [37, -122]}}
 ```
 
+## Inheritance
+
+Searchkick supports single table inheritance.
+
+```ruby
+class Dog < Animal
+end
+```
+
+The parent and child model can both reindex.
+
+```ruby
+Animal.reindex
+Dog.reindex # equivalent
+```
+
+And to search, use:
+
+```ruby
+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`.
@@ -419,29 +494,6 @@ Then deploy and reindex:
 rake searchkick:reindex CLASS=Product
 ```
 
-## Inheritance
-
-Searchkick supports single table inheritance.
-
-```ruby
-class Dog < Animal
-end
-```
-
-The parent and child model can both reindex.
-
-```ruby
-Animal.reindex
-Dog.reindex # equivalent
-```
-
-And to search, use:
-
-```ruby
-Animal.search "*" # all animals
-Dog.search "*"    # just dogs
-```
-
 ## Reference
 
 Searchkick requires Elasticsearch `0.90.0` or higher.
@@ -528,7 +580,7 @@ rake searchkick:reindex:all
 
   ```ruby
   class Product < ActiveRecord::Base
-      searchkick
+    searchkick
   end
   ```
 
@@ -560,7 +612,6 @@ Thanks to Karel Minarik for [Tire](https://github.com/karmi/tire), Jaroslav Kali
 
 ## TODO
 
-- Analytics for searches and conversions
 - Generate autocomplete predictions from past search queries
 - Automatic failover
 - Make Searchkick work with any language

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
@@ -53,14 +56,45 @@ module Searchkick
 
           # hack to prevent generator field doesn't exist error
           (options[:suggest] || []).map(&:to_s).each do |field|
-            source[field] = "a" if !source[field]
+            source[field] = nil if !source[field]
           end
 
           # 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
+          # https://github.com/rails/rails/issues/6033
+          # possible loss of precision :/
+          cast_big_decimal =
+            proc do |obj|
+              case obj
+              when BigDecimal
+                obj.to_f
+              when Hash
+                obj.each do |k, v|
+                  obj[k] = cast_big_decimal.call(v)
+                end
+              when Enumerable
+                obj.map! do |v|
+                  cast_big_decimal.call(v)
+                end
+              else
+                obj
+              end
+            end
+
+          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
 
@@ -203,6 +205,8 @@ module Searchkick
           fields: {
             field => {type: "string", index: "not_analyzed"},
             "analyzed" => {type: "string", index: "analyzed"}
+            # term_vector: "with_positions_offsets" for fast / correct highlighting
+            # http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-request-highlighting.html#_fast_vector_highlighter
           }
         }
         if autocomplete.include?(field)
@@ -221,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/results.rb

@@ -9,6 +9,16 @@ module Searchkick
       end
     end
 
+    def with_details
+      each_with_hit.map do |model, hit|
+        details = {}
+        if hit["highlight"]
+          details[:highlight] = Hash[ hit["highlight"].map{|k, v| [k.sub(/\.analyzed\z/, "").to_sym, v.first] } ]
+        end
+        [model, details]
+      end
+    end
+
     # fixes deprecation warning
     def __find_records_by_ids(klass, ids)
       @options[:load] === true ? klass.find(ids) : klass.includes(@options[:load][:include]).find(ids)

data/lib/searchkick/search.rb

@@ -70,9 +70,10 @@ module Searchkick
             {multi_match: shared_options.merge(boost: 10, analyzer: "searchkick_search2")}
           ]
           if options[:misspellings] != false
+            distance = (options[:misspellings].is_a?(Hash) && options[:misspellings][:distance]) || 1
             queries.concat [
-              {multi_match: shared_options.merge(fuzziness: 1, max_expansions: 3, analyzer: "searchkick_search")},
-              {multi_match: shared_options.merge(fuzziness: 1, max_expansions: 3, analyzer: "searchkick_search2")}
+              {multi_match: shared_options.merge(fuzziness: distance, max_expansions: 3, analyzer: "searchkick_search")},
+              {multi_match: shared_options.merge(fuzziness: distance, max_expansions: 3, analyzer: "searchkick_search2")}
             ]
           end
           payload = {
@@ -160,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)} }}
@@ -200,6 +203,8 @@ module Searchkick
                     else
                       filters << {not: {term: {field => op_value}}}
                     end
+                  elsif op == :all
+                    filters << {terms: {field => op_value, execution: "and"}}
                   else
                     range_query =
                       case op
@@ -218,7 +223,11 @@ module Searchkick
                   end
                 end
               else
-                filters << {term: {field => value}}
+                if value.nil?
+                  filters << {missing: {"field" => field, existence: true, null_value: true}}
+                else
+                  filters << {term: {field => value}}
+                end
               end
             end
           end
@@ -245,12 +254,22 @@ module Searchkick
         facets.each do |field, facet_options|
           # ask for extra facets due to
           # https://github.com/elasticsearch/elasticsearch/issues/1305
-          payload[:facets][field] = {
-            terms: {
-              field: field,
-              size: facet_options[:limit] ? facet_options[:limit] + 150 : 100000
+
+          if facet_options[:ranges]
+            payload[:facets][field] = {
+              range: {
+                field.to_sym => facet_options[:ranges]
+              }
             }
-          }
+          else
+            payload[:facets][field] = {
+              terms: {
+                field: field,
+                size: facet_options[:limit] ? facet_options[:limit] + 150 : 100000
+              }
+            }
+          end
+
           facet_limits[field] = facet_options[:limit] if facet_options[:limit]
 
           # offset is not possible
@@ -284,6 +303,17 @@ module Searchkick
         end
       end
 
+      # highlight
+      if options[:highlight]
+        payload[:highlight] = {
+          fields: Hash[ fields.map{|f| [f, {}] } ]
+        }
+        if options[:highlight].is_a?(Hash) and tag = options[:highlight][:tag]
+          payload[:highlight][:pre_tags] = [tag]
+          payload[:highlight][:post_tags] = [tag.to_s.gsub(/\A</, "</")]
+        end
+      end
+
       # An empty array will cause only the _id and _type for each hit to be returned
       # http://www.elasticsearch.org/guide/reference/api/search/fields/
       payload[:fields] = [] if load
@@ -291,7 +321,18 @@ module Searchkick
       tire_options = {load: load, payload: payload, size: per_page, from: offset}
       tire_options[:type] = document_type if self != searchkick_klass
       search = Tire::Search::Search.new(index_name, tire_options)
-      response = search.json
+      begin
+        response = search.json
+      rescue Tire::Search::SearchRequestFailed => e
+        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]") or e.message.include?("No query registered for [multi_match]"))
+          raise "Upgrade Elasticsearch to 0.90.0 or greater"
+        else
+          raise e
+        end
+      end
 
       # apply facet limit in client due to
       # https://github.com/elasticsearch/elasticsearch/issues/1305

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/tasks.rb

@@ -23,8 +23,10 @@ namespace :searchkick do
       task :all => :environment do
         Rails.application.eager_load!
         (Searchkick::Reindex.instance_variable_get(:@descendents) || []).each do |model|
+          puts "Reindexing #{model.name}..."
           model.reindex
         end
+        puts "Reindex complete"
       end
     end
 

data/lib/searchkick/version.rb

@@ -1,3 +1,3 @@
 module Searchkick
-  VERSION = "0.3.2"
+  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/facets_test.rb

@@ -5,9 +5,9 @@ class TestFacets < Minitest::Unit::TestCase
   def setup
     super
     store [
-      {name: "Product Show", store_id: 1, in_stock: true, color: "blue"},
-      {name: "Product Hide", store_id: 2, in_stock: false, color: "green"},
-      {name: "Product B", store_id: 2, in_stock: false, color: "red"}
+      {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}
     ]
   end
 
@@ -26,4 +26,15 @@ class TestFacets < Minitest::Unit::TestCase
     assert_equal 1, facet["other"]
   end
 
+  def test_ranges
+    price_ranges = [{to: 10}, {from: 10, to: 20}, {from: 20}]
+    facet = Product.search("Product", facets: {price: {ranges: price_ranges}}).facets["price"]
+
+    assert_equal 3, facet["ranges"].size
+    assert_equal 10.0, facet["ranges"][0]["to"]
+    assert_equal 20.0, facet["ranges"][2]["from"]
+    assert_equal 1, facet["ranges"][0]["count"]
+    assert_equal 0, facet["ranges"][1]["count"]
+    assert_equal 2, facet["ranges"][2]["count"]
+  end
 end

data/test/highlight_test.rb

@@ -0,0 +1,22 @@
+require_relative "test_helper"
+
+class TestHighlight < Minitest::Unit::TestCase
+
+  def test_basic
+    store_names ["Two Door Cinema Club"]
+    assert_equal "Two Door <em>Cinema</em> Club", Product.search("cinema", fields: [:name], highlight: true).with_details.first[1][:highlight][:name]
+  end
+
+  def test_tag
+    store_names ["Two Door Cinema Club"]
+    assert_equal "Two Door <strong>Cinema</strong> Club", Product.search("cinema", fields: [:name], highlight: {tag: "<strong>"}).with_details.first[1][:highlight][:name]
+  end
+
+  def test_multiple_fields
+    store [{name: "Two Door Cinema Club", color: "Cinema Orange"}]
+    highlight = Product.search("cinema", fields: [:name, :color], highlight: true).with_details.first[1][:highlight]
+    assert_equal "Two Door <em>Cinema</em> Club", highlight[:name]
+    assert_equal "<em>Cinema</em> Orange", highlight[:color]
+  end
+
+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

@@ -39,7 +39,7 @@ class TestSql < Minitest::Unit::TestCase
     now = Time.now
     store [
       {name: "Product A", store_id: 1, in_stock: true, backordered: true, created_at: now, orders_count: 4, user_ids: [1, 2, 3]},
-      {name: "Product B", store_id: 2, in_stock: true, backordered: false, created_at: now - 1, orders_count: 3},
+      {name: "Product B", store_id: 2, in_stock: true, backordered: false, created_at: now - 1, orders_count: 3, user_ids: [1]},
       {name: "Product C", store_id: 3, in_stock: false, backordered: true, created_at: now - 2, orders_count: 2},
       {name: "Product D", store_id: 4, in_stock: false, backordered: false, created_at: now - 3, orders_count: 1},
     ]
@@ -64,15 +64,30 @@ class TestSql < Minitest::Unit::TestCase
     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}
+    # all
+    assert_search "product", ["Product A"], where: {user_ids: {all: [1, 3]}}
+    assert_search "product", [], where: {user_ids: {all: [1, 2, 3, 4]}}
   end
 
   def test_where_string
     store [
       {name: "Product A", color: "RED"}
     ]
-    assert_search "product", ["Product A"], where: {color: ["RED"]}
+    assert_search "product", ["Product A"], where: {color: "RED"}
+  end
+
+  def test_where_nil
+    store [
+      {name: "Product A"},
+      {name: "Product B", color: "red"}
+    ]
+    assert_search "product", ["Product A"], where: {color: nil}
+  end
+
+  def test_where_id
+    store_names ["Product A"]
+    product = Product.last
+    assert_search "product", ["Product A"], where: {id: product.id.to_s}
   end
 
   def test_near
@@ -100,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}
@@ -121,6 +144,11 @@ class TestSql < Minitest::Unit::TestCase
     assert_search "abc", ["abc"], misspellings: false
   end
 
+  def test_misspellings_distance
+    store_names ["abbb", "aabb"]
+    assert_search "aaaa", ["aabb"], misspellings: {distance: 2}
+  end
+
   def test_fields
     store [
       {name: "red", color: "light blue"},
@@ -142,6 +170,13 @@ class TestSql < Minitest::Unit::TestCase
     assert_first "blue", "Blue B", fields: [:name, :color]
   end
 
+  def test_big_decimal
+    store [
+      {name: "Product", latitude: 100.0}
+    ]
+    assert_search "product", ["Product"], where: {latitude: {gt: 99}}
+  end
+
   # load
 
   def test_load_default
@@ -159,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/suggest_test.rb

@@ -4,17 +4,17 @@ class TestSuggest < Minitest::Unit::TestCase
 
   def test_basic
     store_names ["Great White Shark", "Hammerhead Shark", "Tiger Shark"]
-    assert_suggest "How Big is a Tigre Shar", "how big is a tiger shark"
+    assert_suggest "How Big is a Tigre Shar", "how big is a tiger shark", fields: [:name]
   end
 
   def test_perfect
     store_names ["Tiger Shark", "Great White Shark"]
-    assert_suggest "Tiger Shark", nil # no correction
+    assert_suggest "Tiger Shark", nil, fields: [:name] # no correction
   end
 
   def test_phrase
     store_names ["Big Tiger Shark", "Tiger Sharp Teeth", "Tiger Sharp Mind"]
-    assert_suggest "How to catch a big tiger shar", "how to catch a big tiger shark"
+    assert_suggest "How to catch a big tiger shar", "how to catch a big tiger shark", fields: [:name]
   end
 
   def test_without_option

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
@@ -53,6 +65,7 @@ else
     t.boolean :in_stock
     t.boolean :backordered
     t.integer :orders_count
+    t.integer :price
     t.string :color
     t.decimal :latitude, precision: 10, scale: 7
     t.decimal :longitude, precision: 10, scale: 7
@@ -99,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?
@@ -118,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.2
+  version: 0.4.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-03 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
@@ -135,6 +137,7 @@ files:
 - test/autocomplete_test.rb
 - test/boost_test.rb
 - test/facets_test.rb
+- test/highlight_test.rb
 - test/index_test.rb
 - test/inheritance_test.rb
 - test/match_test.rb
@@ -171,6 +174,7 @@ test_files:
 - test/autocomplete_test.rb
 - test/boost_test.rb
 - test/facets_test.rb
+- test/highlight_test.rb
 - test/index_test.rb
 - test/inheritance_test.rb
 - test/match_test.rb