searchkick 0.7.6 → 0.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d9d6517d9d49a09f8827ea95a866e4a162fa7f3
-  data.tar.gz: cb53edf08c5f05e95e6bb11aa2e00f010f6e2043
+  metadata.gz: 4a044b56c37732d857fe1dfa7109dc1b87259f15
+  data.tar.gz: 6fa27e15c4317b20e87f81c22e0ca0f3e69d68cc
 SHA512:
-  metadata.gz: 3a9fb661de8eaa36d5f1c979ee1bb0a3779716b4983e17d94de72883fd1a549c874cbd2a41f8498b7f4110e5d62ed7511f3d873df9a42d51aa590cf55156d72f
-  data.tar.gz: 000f1e7fb07a5d00659f21a8116e8fd57dcaf6b41adcc261d7687e6cccccd2edb811738c7e3552f0ac1c594dffd818ae4966cdda36ed8fe334843df1350e4137
+  metadata.gz: 6669b630d244570056a3c2373dda6d99c0c59e25af9c4a716401b9b3178b8867d572a7b553156d69e0b7728fa2ba24e256d347ef39597033d845b9d15e05e7d6
+  data.tar.gz: b351f5f4d832e80dd9e16acbbebbeb2db89a9ac0ea470394391f033ab66da728e811ee9b25f99de6bb0a65c6bedf5d2e572b10eef879d4f225d488f2cf2b3453

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.7.7
+
+- Added support for automatic failover
+- Fixed default operator for partial queries
+
 ## 0.7.6
 
 - Added `stats` option to facets

data/README.md

@@ -45,7 +45,7 @@ Add this line to your application’s Gemfile:
 gem "searchkick"
 ```
 
-For Elasticsearch 0.90, use version `0.6.3`.
+For Elasticsearch 0.90, use version `0.6.3` and [this readme](https://github.com/ankane/searchkick/blob/v0.6.3/README.md).
 
 Add searchkick to models you want to search.
 
@@ -443,7 +443,7 @@ price_ranges = [{to: 20}, {from: 20, to: 50}, {from: 50}]
 Product.search "*", facets: {price: {ranges: price_ranges}}
 ```
 
-Use the `stats` option to get to max, min, mean, and total scores for each facet [master]
+Use the `stats` option to get to max, min, mean, and total scores for each facet
 
 ```ruby
 Product.search "*", facets: {store_id: {stats: true}}
@@ -580,6 +580,16 @@ Then deploy and reindex:
 rake searchkick:reindex CLASS=Product
 ```
 
+### Automatic Failover
+
+Create an initializer `config/initializers/elasticsearch.rb` with multiple hosts:
+
+```ruby
+Searchkick.client = Elasticsearch::Client.new(hosts: ["localhost:9200", "localhost:9201"], retry_on_failure: true)
+```
+
+See [elasticsearch-transport](https://github.com/elasticsearch/elasticsearch-ruby/blob/master/elasticsearch-transport) for a complete list of options.
+
 ## Advanced
 
 Prefer to use the [Elasticsearch DSL](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-queries.html) but still want awesome features like zero-downtime reindexing?

data/lib/searchkick.rb

@@ -21,6 +21,10 @@ module Searchkick
     @client ||= Elasticsearch::Client.new(url: ENV["ELASTICSEARCH_URL"])
   end
 
+  def self.client=(client)
+    @client = client
+  end
+
   @callbacks = true
 
   def self.enable_callbacks

data/lib/searchkick/query.rb

@@ -74,13 +74,13 @@ module Searchkick
         else
           queries = []
           fields.each do |field|
+            shared_options = {
+              fields: [field],
+              query: term,
+              use_dis_max: false,
+              operator: operator
+            }
             if field == "_all" or field.end_with?(".analyzed")
-              shared_options = {
-                fields: [field],
-                query: term,
-                use_dis_max: false,
-                operator: operator
-              }
               shared_options[:cutoff_frequency] = 0.001 unless operator == "and"
               queries.concat [
                 {multi_match: shared_options.merge(boost: 10, analyzer: "searchkick_search")},
@@ -95,13 +95,7 @@ module Searchkick
               end
             else
               analyzer = field.match(/\.word_(start|middle|end)\z/) ? "searchkick_word_search" : "searchkick_autocomplete_search"
-              queries << {
-                multi_match: {
-                  fields: [field],
-                  query: term,
-                  analyzer: analyzer
-                }
-              }
+              queries << {multi_match: shared_options.merge(analyzer: analyzer)}
             end
           end
 

data/lib/searchkick/version.rb

@@ -1,3 +1,3 @@
 module Searchkick
-  VERSION = "0.7.6"
+  VERSION = "0.7.7"
 end

data/test/autocomplete_test.rb

@@ -52,4 +52,9 @@ class TestAutocomplete < Minitest::Unit::TestCase
     assert_search "rld men ego", ["Where in the World is Carmen San Diego"], fields: [{name: :word_end}]
   end
 
+  def test_word_start_multiple_words
+    store_names ["Dark Grey", "Dark Blue"]
+    assert_search "dark grey", ["Dark Grey"], fields: [{name: :word_start}]
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: searchkick
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.7.7
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-21 00:00:00.000000000 Z
+date: 2014-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel