searchkick 0.5.3 → 0.6.0

data/lib/searchkick/similar.rb

@@ -3,7 +3,7 @@ module Searchkick
 
     def similar(options = {})
       like_text = self.class.searchkick_index.retrieve(document_type, id).to_hash
-        .keep_if{|k,v| k[0] != "_" and (!options[:fields] or options[:fields].map(&:to_sym).include?(k)) }
+        .keep_if{|k,v| !options[:fields] || options[:fields].map(&:to_s).include?(k) }
         .values.compact.join(" ")
 
       # TODO deep merge method

data/lib/searchkick/version.rb

@@ -1,3 +1,3 @@
 module Searchkick
-  VERSION = "0.5.3"
+  VERSION = "0.6.0"
 end

data/searchkick.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = Searchkick::VERSION
   spec.authors       = ["Andrew Kane"]
   spec.email         = ["andrew@chartkick.com"]
-  spec.description   = %q{Search made easy}
-  spec.summary       = %q{Search made easy}
+  spec.description   = %q{Intelligent search made easy}
+  spec.summary       = %q{Searchkick learns what your users are looking for. As more people search, it gets smarter and the results get better. It’s friendly for developers - and magical for your users.}
   spec.homepage      = "https://github.com/ankane/searchkick"
   spec.license       = "MIT"
 
@@ -18,12 +18,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "tire"
-  spec.add_dependency "tire-contrib"
+  spec.add_dependency "activemodel"
+  spec.add_dependency "elasticsearch"
+  spec.add_dependency "patron" # persistent http connections for performance
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest", "~> 4.7"
-  spec.add_development_dependency "activerecord"
-  spec.add_development_dependency "pg"
 end

data/test/index_test.rb

@@ -3,8 +3,11 @@ require_relative "test_helper"
 class TestIndex < Minitest::Unit::TestCase
 
   def test_clean_indices
-    old_index = Tire::Index.new("products_test_20130801000000000")
-    different_index = Tire::Index.new("items_test_20130801000000000")
+    old_index = Searchkick::Index.new("products_test_20130801000000000")
+    different_index = Searchkick::Index.new("items_test_20130801000000000")
+
+    old_index.delete if old_index.exists?
+    different_index.delete if different_index.exists?
 
     # create indexes
     old_index.create
@@ -18,7 +21,7 @@ class TestIndex < Minitest::Unit::TestCase
   end
 
   def test_clean_indices_old_format
-    old_index = Tire::Index.new("products_test_20130801000000")
+    old_index = Searchkick::Index.new("products_test_20130801000000")
     old_index.create
 
     Product.clean_indices

data/test/query_test.rb

@@ -0,0 +1,14 @@
+require_relative "test_helper"
+
+class TestQuery < Minitest::Unit::TestCase
+
+  def test_basic
+    store_names ["Milk", "Apple"]
+    query = Product.search("milk", execute: false)
+    # query.body = {query: {match_all: {}}}
+    # query.body = {query: {match: {name: "Apple"}}}
+    query.body[:query] = {match_all: {}}
+    assert_equal ["Apple", "Milk"], query.execute.map(&:name).sort
+  end
+
+end

data/test/sql_test.rb

@@ -26,6 +26,8 @@ class TestSql < Minitest::Unit::TestCase
     assert_equal 2, products.per_page
     assert_equal 3, products.total_pages
     assert_equal 5, products.total_count
+    assert_equal 2, products.limit_value
+    assert_equal 4, products.offset_value
   end
 
   def test_pagination_nil_page
@@ -40,7 +42,7 @@ class TestSql < Minitest::Unit::TestCase
     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, user_ids: [1]},
-      {name: "Product C", store_id: 3, in_stock: false, backordered: true, created_at: now - 2, orders_count: 2},
+      {name: "Product C", store_id: 3, in_stock: false, backordered: true, created_at: now - 2, orders_count: 2, user_ids: [1, 3]},
       {name: "Product D", store_id: 4, in_stock: false, backordered: false, created_at: now - 3, orders_count: 1},
     ]
     assert_search "product", ["Product A", "Product B"], where: {in_stock: true}
@@ -66,11 +68,13 @@ class TestSql < Minitest::Unit::TestCase
     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}]]}
     # all
-    assert_search "product", ["Product A"], where: {user_ids: {all: [1, 3]}}
+    assert_search "product", ["Product A", "Product C"], where: {user_ids: {all: [1, 3]}}
     assert_search "product", [], where: {user_ids: {all: [1, 2, 3, 4]}}
+    # any / nested terms
+    assert_search "product", ["Product B", "Product C"], where: {user_ids: {not: [2], in: [1,3]}}
     # not / exists
-    assert_search "product", ["Product C", "Product D"], where: {user_ids: nil}
-    assert_search "product", ["Product A", "Product B"], where: {user_ids: {not: nil}}
+    assert_search "product", ["Product D"], where: {user_ids: nil}
+    assert_search "product", ["Product A", "Product B", "Product C"], where: {user_ids: {not: nil}}
     assert_search "product", ["Product A", "Product C", "Product D"], where: {user_ids: [3, nil]}
     assert_search "product", ["Product B"], where: {user_ids: {not: [3, nil]}}
   end
@@ -190,6 +194,12 @@ class TestSql < Minitest::Unit::TestCase
     assert_search "fresh honey", ["Honey"], partial: true
   end
 
+  def test_operator
+    store_names ["Honey"]
+    assert_search "fresh honey", []
+    assert_search "fresh honey", ["Honey"], operator: "or"
+  end
+
   def test_misspellings
     store_names ["abc", "abd", "aee"]
     assert_search "abc", ["abc"], misspellings: false
@@ -237,12 +247,12 @@ class TestSql < Minitest::Unit::TestCase
 
   def test_load_false
     store_names ["Product A"]
-    assert_kind_of Tire::Results::Item, Product.search("product", load: false).first
+    assert_kind_of Hash, Product.search("product", load: false).first
   end
 
   def test_load_false_with_include
     store_names ["Product A"]
-    assert_kind_of Tire::Results::Item, Product.search("product", load: false, include: [:store]).first
+    assert_kind_of Hash, Product.search("product", load: false, include: [:store]).first
   end
 
   # TODO see if Mongoid is loaded

data/test/test_helper.rb

@@ -2,14 +2,12 @@ require "bundler/setup"
 Bundler.require(:default)
 require "minitest/autorun"
 require "minitest/pride"
+require "logger"
 
 ENV["RACK_ENV"] = "test"
 
 File.delete("elasticsearch.log") if File.exists?("elasticsearch.log")
-Tire.configure do
-  logger "elasticsearch.log", :level => "debug"
-  pretty true
-end
+Searchkick.client.transport.logger = Logger.new("elasticsearch.log")
 
 if defined?(Mongoid)
   Mongoid.configure do |config|
@@ -59,9 +57,9 @@ else
   ActiveRecord::Base.time_zone_aware_attributes = true
 
   # migrations
-  ActiveRecord::Base.establish_connection :adapter => "postgresql", :database => "searchkick_test"
+  ActiveRecord::Base.establish_connection adapter: "sqlite3", database: ":memory:"
 
-  ActiveRecord::Migration.create_table :products, :force => true do |t|
+  ActiveRecord::Migration.create_table :products do |t|
     t.string :name
     t.integer :store_id
     t.boolean :in_stock
@@ -74,11 +72,11 @@ else
     t.timestamps
   end
 
-  ActiveRecord::Migration.create_table :stores, :force => true do |t|
+  ActiveRecord::Migration.create_table :stores do |t|
     t.string :name
   end
 
-  ActiveRecord::Migration.create_table :animals, :force => true do |t|
+  ActiveRecord::Migration.create_table :animals do |t|
     t.string :name
     t.string :type
   end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: searchkick
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-25 00:00:00.000000000 Z
+date: 2014-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: tire
+  name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: tire-contrib
+  name: elasticsearch
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,27 +39,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: rake
+  name: patron
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -67,21 +53,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,20 +81,20 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pg
+  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'
-description: Search made easy
+        version: '4.7'
+description: Intelligent search made easy
 email:
 - andrew@chartkick.com
 executables: []
@@ -125,8 +111,9 @@ files:
 - gemfiles/mongoid3.gemfile
 - gemfiles/mongoid4.gemfile
 - lib/searchkick.rb
-- lib/searchkick/logger.rb
+- lib/searchkick/index.rb
 - lib/searchkick/model.rb
+- lib/searchkick/query.rb
 - lib/searchkick/reindex.rb
 - lib/searchkick/results.rb
 - lib/searchkick/search.rb
@@ -142,6 +129,7 @@ files:
 - test/inheritance_test.rb
 - test/match_test.rb
 - test/model_test.rb
+- test/query_test.rb
 - test/should_index_test.rb
 - test/similar_test.rb
 - test/sql_test.rb
@@ -168,10 +156,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Search made easy
+summary: Searchkick learns what your users are looking for. As more people search,
+  it gets smarter and the results get better. It’s friendly for developers - and magical
+  for your users.
 test_files:
 - test/autocomplete_test.rb
 - test/boost_test.rb
@@ -181,6 +171,7 @@ test_files:
 - test/inheritance_test.rb
 - test/match_test.rb
 - test/model_test.rb
+- test/query_test.rb
 - test/should_index_test.rb
 - test/similar_test.rb
 - test/sql_test.rb

data/lib/searchkick/logger.rb

@@ -1,19 +0,0 @@
-require "tire/rails/logger"
-require "tire/rails/logger/log_subscriber"
-
-class Tire::Rails::LogSubscriber
-
-  # better output format
-  def search(event)
-    self.class.runtime += event.duration
-    return unless logger.debug?
-
-    payload = event.payload
-
-    name    = "%s (%.1fms)" % [payload[:name], event.duration]
-    query   = payload[:search].to_s
-
-    debug "  #{color(name, YELLOW, true)}  #{query}"
-  end
-
-end