searchkick 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9afc0023095cdc587ed6df4faedb9c6ba0927b61
-  data.tar.gz: ff38cab705eb7d2692e81510ff237707820f1bda
+  metadata.gz: 2b15fd3f6aa1493ee75fee109a3420fb8e79bed7
+  data.tar.gz: c8cf011a7e5fb72bb25fe131eaa655be2713def7
 SHA512:
-  metadata.gz: af68e2a80fc2f8cead9075b8e2e2928ab81dcf98952949f2901d24f151de235b5e648316dce80c84b9197d6b549efc43fb9ed1f04e8f79a8a834e671e68171aa
-  data.tar.gz: b0a23d33695f2b82d84eb2152b07ca43d610ff1ba2200b917baaba61c3a7e8e7292161108270800afba3673484fefc8f19a7757ff2cbac0d131e7c36cccd3a5c
+  metadata.gz: b7c45c3c3627c02a45c7cc4380d59404d334fb2a0e1e4a327b472cb14dcac12df59843f5bf146185c76998409fcadb850393b0c92e89e0f6a20972445fbe1735
+  data.tar.gz: 616ca8f2a7776ca7f830cb2679bdbd7769460061107ed833f607896cfa2d637927011a40c958e026f0717de9471dd64f2bad157fbb55b79d93019132a7f8a605

data/README.md

@@ -287,6 +287,8 @@ Product.search "2% Milk", facets: {store_id: {where: {in_stock: true}}}
 
 ## Deployment
 
+Searchkick uses `ENV["ELASTICSEARCH_URL"]` for the Elasticsearch server.  This defaults to `http://localhost:9200`.
+
 ### Heroku
 
 Choose an add-on: [SearchBox](https://addons.heroku.com/searchbox), [Bonsai](https://addons.heroku.com/bonsai), or [Found](https://addons.heroku.com/foundelasticsearch).
@@ -294,25 +296,29 @@ Choose an add-on: [SearchBox](https://addons.heroku.com/searchbox), [Bonsai](htt
 ```sh
 # SearchBox
 heroku addons:add searchbox:starter
+heroku config:add ELASTICSEARCH_URL=`heroku config:get SEARCHBOX_URL`
 
 # Bonsai
 heroku addons:add bonsai
+heroku config:add ELASTICSEARCH_URL=`heroku config:get BONSAI_URL`
 
 # Found
 heroku addons:add foundelasticsearch
+heroku config:add ELASTICSEARCH_URL=`heroku config:get FOUNDELASTICSEARCH_URL`
 ```
 
-And create an initializer `config/initializers/elasticsearch.rb` with:
+Then deploy and reindex:
 
-```ruby
-# SearchBox
-ENV["ELASTICSEARCH_URL"] = ENV["SEARCHBOX_URL"]
+```sh
+heroku run rake searchkick:reindex CLASS=Product
+```
 
-# Bonsai
-ENV["ELASTICSEARCH_URL"] = ENV["BONSAI_URL"]
+### Other
 
-# Found
-ENV["ELASTICSEARCH_URL"] = ENV["FOUNDELASTICSEARCH_URL"]
+Create an initializer `config/initializers/elasticsearch.rb` with:
+
+```ruby
+ENV["ELASTICSEARCH_URL"] = "http://username:password@api.searchbox.io"
 ```
 
 Then deploy and reindex:

data/lib/searchkick.rb

@@ -5,6 +5,7 @@ require "searchkick/results"
 require "searchkick/search"
 require "searchkick/model"
 require "searchkick/tasks"
+require "searchkick/logger" if defined?(Rails)
 
 # TODO find better ActiveModel hook
 ActiveModel::AttributeMethods::ClassMethods.send(:include, Searchkick::Model)

data/lib/searchkick/logger.rb

@@ -0,0 +1,19 @@
+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

data/lib/searchkick/reindex.rb

@@ -57,12 +57,12 @@ module Searchkick
               tokenizer: "standard",
               # synonym should come last, after stemming and shingle
               # shingle must come before snowball
-              filter: ["standard", "lowercase", "asciifolding", "stop", "snowball", "searchkick_index_shingle", "snowball"]
+              filter: ["standard", "lowercase", "asciifolding", "stop", "searchkick_index_shingle", "snowball"]
             },
             searchkick_search: {
               type: "custom",
               tokenizer: "standard",
-              filter: ["standard", "lowercase", "asciifolding", "stop", "snowball", "searchkick_search_shingle", "snowball"]
+              filter: ["standard", "lowercase", "asciifolding", "stop", "searchkick_search_shingle", "snowball"]
             },
             searchkick_search2: {
               type: "custom",

data/lib/searchkick/search.rb

@@ -182,6 +182,10 @@ module Searchkick
 
       payload = s.to_hash
 
+      # 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
+
       # suggestions
       if options[:suggest]
         suggest_fields = (@searchkick_options[:suggest] || []).map(&:to_s)

data/lib/searchkick/version.rb

@@ -1,3 +1,3 @@
 module Searchkick
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/searchkick.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "tire"
+  spec.add_dependency "tire-contrib"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/test/match_test.rb

@@ -29,6 +29,11 @@ class TestMatch < Minitest::Unit::TestCase
     assert_search "dish soap", ["Dish Washer Amazing Organic Soap"]
   end
 
+  def test_middle_token_wine
+    store_names ["Beringer Wine Founders Estate Chardonnay"]
+    assert_search "beringer chardonnay", ["Beringer Wine Founders Estate Chardonnay"]
+  end
+
   def test_percent
     store_names ["1% Milk", "2% Milk", "Whole Milk"]
     assert_search "1%", ["1% Milk"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: searchkick
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Andrew Kane
@@ -24,6 +24,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: tire-contrib
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -107,6 +121,7 @@ files:
 - README.md
 - Rakefile
 - lib/searchkick.rb
+- lib/searchkick/logger.rb
 - lib/searchkick/model.rb
 - lib/searchkick/reindex.rb
 - lib/searchkick/results.rb