searchkick 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d97f04a7f7678a643933cfd0045ec2e6043ebf02
-  data.tar.gz: c817fb9f49a0b6526beb3a2a2d5266c451258cfe
+  metadata.gz: dfbf6c27b23821e31c3de0338259ee8c2adf5130
+  data.tar.gz: f3b47e7a6d98f990f53d95410c88e2a2fc791b36
 SHA512:
-  metadata.gz: c19441dd8e684d5c1d0b4613dce000535dbd527ff35fce233bcdaba960037c9ec2853c1539ce8b038f3880a30c0a2be7717363f87be93b0789440718509c8c8c
-  data.tar.gz: 247238fb70ade1d5ce6eeff5ddd3c0bf590bec9bb52e8e746fe12db58ffb7bf5bdde5f6385bc4167b8dd67bc151724b215253b15755e1cb75f30ec07fac1c025
+  metadata.gz: 1b0d6d2d11bde9c7a3f316a6ac6dc4886f639b8a02ddc6b49e280ae0535b38f7f43e53e1507528587cdc578b0b1ad165816aa23b89d4e21043a4e480790f181c
+  data.tar.gz: 39b962185cf9b507be764e1175e8bbe2d27822eed2005ad02923849577237c348d80b77e3ee8b3128676f7191ac43f23b2044075051751b532260a32597a877b

data/.travis.yml

@@ -14,5 +14,6 @@ notifications:
     on_failure: change
 gemfile:
   - Gemfile
+  - gemfiles/mongoid2.gemfile
   - gemfiles/mongoid3.gemfile
   - gemfiles/mongoid4.gemfile

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.8.1
+
+- Added `search_method_name` option
+- Fixed `order` for array of hashes
+- Added support for Mongoid 2
+
 ## 0.8.0
 
 - Added support for Elasticsearch 1.2

data/README.md

@@ -651,6 +651,8 @@ For the best performance, add [Patron](https://github.com/toland/patron) to your
 gem 'patron'
 ```
 
+Searchkick will automatically use it.
+
 **Note:** Patron is not available for Windows.
 
 ### Automatic Failover
@@ -757,6 +759,12 @@ Product.enable_search_callbacks # or use Searchkick.enable_callbacks for all mod
 Product.reindex
 ```
 
+Change the search method name in `config/initializers/searchkick.rb`
+
+```ruby
+Searchkick.search_method_name = :lookup
+```
+
 Eager load associations
 
 ```ruby
@@ -822,7 +830,7 @@ class Product < ActiveRecord::Base
 end
 ```
 
-Reindex all models (Rails only)
+Reindex all models - Rails only
 
 ```sh
 rake searchkick:reindex:all

data/gemfiles/mongoid2.gemfile

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

data/gemfiles/mongoid4.gemfile

@@ -3,4 +3,4 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in searchkick.gemspec
 gemspec path: "../"
 
-gem "mongoid", "4.0.0.beta1"
+gem "mongoid", "~> 4.0.0"

data/lib/searchkick.rb

@@ -6,7 +6,6 @@ require "searchkick/index"
 require "searchkick/reindex"
 require "searchkick/results"
 require "searchkick/query"
-require "searchkick/search"
 require "searchkick/similar"
 require "searchkick/model"
 require "searchkick/tasks"
@@ -17,6 +16,11 @@ module Searchkick
   class UnsupportedVersionError < StandardError; end
   class InvalidQueryError < Elasticsearch::Transport::Transport::Errors::BadRequest; end
 
+  class << self
+    attr_accessor :search_method_name
+  end
+  self.search_method_name = :search
+
   def self.client
     @client ||= Elasticsearch::Client.new(url: ENV["ELASTICSEARCH_URL"])
   end

data/lib/searchkick/model.rb

@@ -19,7 +19,14 @@ module Searchkick
           Searchkick::Index.new(index)
         end
 
-        extend Searchkick::Search
+        define_singleton_method(Searchkick.search_method_name) do |term = nil, options={}|
+          query = Searchkick::Query.new(self, term, options)
+          if options[:execute] == false
+            query
+          else
+            query.execute
+          end
+        end
         extend Searchkick::Reindex
         include Searchkick::Similar
 

data/lib/searchkick/query.rb

@@ -228,7 +228,8 @@ module Searchkick
         # order
         if options[:order]
           order = options[:order].is_a?(Enumerable) ? options[:order] : {options[:order] => :asc}
-          payload[:sort] = Hash[ order.map{|k, v| [k.to_s == "id" ? :_id : k, v] } ]
+          # TODO id transformation for arrays
+          payload[:sort] = order.is_a?(Array) ? order : Hash[ order.map{|k, v| [k.to_s == "id" ? :_id : k, v] } ]
         end
 
         # filters

data/lib/searchkick/results.rb

@@ -27,9 +27,14 @@ module Searchkick
               records = records.includes(options[:includes])
             end
             results[type] =
-              if records.respond_to?(:primary_key)
+              if records.respond_to?(:primary_key) and records.primary_key
+                # ActiveRecord
                 records.where(records.primary_key => grouped_hits.map{|hit| hit["_id"] }).to_a
+              elsif records.respond_to?(:all) and records.all.respond_to?(:for_ids)
+                # Mongoid 2
+                records.all.for_ids(grouped_hits.map{|hit| hit["_id"] }).to_a
               else
+                # Mongoid 3+
                 records.queryable.for_ids(grouped_hits.map{|hit| hit["_id"] }).to_a
               end
           end

data/lib/searchkick/similar.rb

@@ -12,7 +12,7 @@ module Searchkick
       options[:where][:_id][:not] = id.to_s
       options[:limit] ||= 10
       options[:similar] = true
-      self.class.search(like_text, options)
+      self.class.send(Searchkick.search_method_name, like_text, options)
     end
 
   end

data/lib/searchkick/version.rb

@@ -1,3 +1,3 @@
 module Searchkick
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end

data/test/facets_test.rb

@@ -5,8 +5,8 @@ class TestFacets < Minitest::Unit::TestCase
   def setup
     super
     store [
-      {name: "Product Show", latitude: 37.7833, longitude: 12.4167, store_id: 1, in_stock: true, color: "blue", price: 21},
-      {name: "Product Hide", latitude: 29.4167, longitude: -98.5000, store_id: 2, in_stock: false, color: "green", price: 25},
+      {name: "Product Show", latitude: 37.7833, longitude: 12.4167, store_id: 1, in_stock: true, color: "blue", price: 21, created_at: 2.days.ago},
+      {name: "Product Hide", latitude: 29.4167, longitude: -98.5000, store_id: 2, in_stock: false, color: "green", price: 25, created_at: 2.days.from_now},
       {name: "Product B", latitude: 43.9333, longitude: -122.4667, store_id: 2, in_stock: false, color: "red", price: 5},
       {name: "Foo", latitude: 43.9333, longitude: 12.4667, store_id: 3, in_stock: false, color: "yellow", price: 15}
     ]
@@ -39,6 +39,15 @@ class TestFacets < Minitest::Unit::TestCase
     assert_equal 2, facet["ranges"][2]["count"]
   end
 
+  def test_ranges_dates
+    ranges = [{to: 1.day.ago}, {from: 1.day.ago, to: 1.day.from_now}, {from: 1.day.from_now}]
+    facet = Product.search("Product", facets: {created_at: {ranges: ranges}}).facets["created_at"]
+
+    assert_equal 1, facet["ranges"][0]["count"]
+    assert_equal 1, facet["ranges"][1]["count"]
+    assert_equal 1, facet["ranges"][2]["count"]
+  end
+
   def test_where_no_smart_facets
     assert_equal ({2 => 2}), store_facet(where: {color: "red"}, facets: {store_id: {where: {in_stock: false}}})
   end

data/test/sql_test.rb

@@ -205,6 +205,11 @@ class TestSql < Minitest::Unit::TestCase
     assert_order "product", [], order: {not_mapped: {ignore_unmapped: true}}, conversions: false
   end
 
+  def test_order_array
+    store [{name: "San Francisco", latitude: 37.7833, longitude: -122.4167}]
+    assert_order "francisco", ["San Francisco"], order: [{_geo_distance: {location: "0,0"}}], conversions: false
+  end
+
   def test_partial
     store_names ["Honey"]
     assert_search "fresh honey", []
@@ -281,7 +286,21 @@ class TestSql < Minitest::Unit::TestCase
 
   def test_select
     store [{name: "Product A", store_id: 1}]
-    assert_equal %w[id name store_id], Product.search("product", load: false, select: [:name, :store_id]).first.keys.reject{|k| k.start_with?("_") }.sort
+    result = Product.search("product", load: false, select: [:name, :store_id]).first
+    assert_equal %w[id name store_id], result.keys.reject{|k| k.start_with?("_") }.sort
+    assert_equal ["Product A"], result.name # this is not great
+  end
+
+  def test_select_array
+    store [{name: "Product A", user_ids: [1, 2]}]
+    result = Product.search("product", load: false, select: [:user_ids]).first
+    assert_equal [1, 2], result.user_ids
+  end
+
+  def test_nested_object
+    aisle = {"id" => 1, "name" => "Frozen"}
+    store [{name: "Product A", aisle: aisle}]
+    assert_equal aisle, Product.search("product", load: false).first.aisle.to_hash
   end
 
   # TODO see if Mongoid is loaded

data/test/test_helper.rb

@@ -10,8 +10,28 @@ File.delete("elasticsearch.log") if File.exists?("elasticsearch.log")
 Searchkick.client.transport.logger = Logger.new("elasticsearch.log")
 
 if defined?(Mongoid)
+
+  def mongoid2?
+    Mongoid::VERSION.starts_with?("2.")
+  end
+
+  if mongoid2?
+    # enable comparison of BSON::ObjectIds
+    module BSON
+      class ObjectId
+        def <=>(other)
+          self.data <=> other.data
+        end
+      end
+    end
+  end
+
   Mongoid.configure do |config|
-    config.connect_to "searchkick_test"
+    if mongoid2?
+      config.master = Mongo::Connection.new.db("searchkick_test")
+    else
+      config.connect_to "searchkick_test"
+    end
   end
 
   class Product
@@ -121,10 +141,16 @@ class Product
     word_middle: [:name],
     word_end: [:name]
 
-  attr_accessor :conversions, :user_ids
+  attr_accessor :conversions, :user_ids, :aisle
 
   def search_data
-    serializable_hash.except("id").merge conversions: conversions, user_ids: user_ids, location: [latitude, longitude], multiple_locations: [[latitude, longitude], [0, 0]]
+    serializable_hash.except("id").merge(
+      conversions: conversions,
+      user_ids: user_ids,
+      location: [latitude, longitude],
+      multiple_locations: [[latitude, longitude], [0, 0]],
+      aisle: aisle
+    )
   end
 
   def should_index?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: searchkick
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-13 00:00:00.000000000 Z
+date: 2014-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -108,6 +108,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- gemfiles/mongoid2.gemfile
 - gemfiles/mongoid3.gemfile
 - gemfiles/mongoid4.gemfile
 - lib/searchkick.rb
@@ -179,3 +180,4 @@ test_files:
 - test/suggest_test.rb
 - test/synonyms_test.rb
 - test/test_helper.rb
+has_rdoc: