searchkick 1.3.6 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2665e44b0bd2b8e4bcceb5d9963acb49505914bb
-  data.tar.gz: f44ddcee8dd2b1ff0607aac73243a36a458179c5
+  metadata.gz: f7ebf358ab6ac1ae3d08be867a20c9617a4ef0e9
+  data.tar.gz: 4935de64421b02b6a27505888f588c9e161f13f0
 SHA512:
-  metadata.gz: ea59d44e55010236af8b16a1c3b1d7e7f160081f137cbdd44e298d291c6ae84a966be25a405f21f970885f07c73bf6e76c6e56edf29cba234c2ba308b6ba5241
-  data.tar.gz: 28c80bb3061751507605bebf0a4dacb541a4f8cfd6b98156c3cbfad2aa9de03c916aa12715bc47769a3a79b154d82f4c2bc901d34a7d314e57f2ac0d96fe5ee4
+  metadata.gz: dfd3083681354eb0b1aab35d6b1f2d383326d8b6a2106af167b3f9cc9420ac974fec80c4dec30881e7e6903fb785a6492c643a14e36429bdb93fac21f0dc2193
+  data.tar.gz: 136e074de01969cb08fc54c35ee3468477b9d4612583510d327559fceee0218950e459b1228c32b3b5a54c60e81f3653ad7e22c0ab626a5193a9a355253bcc88

data/.travis.yml

@@ -24,7 +24,7 @@ gemfile:
   - test/gemfiles/mongoid4.gemfile
   - test/gemfiles/mongoid5.gemfile
 env:
-  - ELASTICSEARCH_VERSION=2.4.0
+  - ELASTICSEARCH_VERSION=2.4.1
 matrix:
   include:
     - gemfile: Gemfile
@@ -34,11 +34,7 @@ matrix:
     - gemfile: Gemfile
       env: ELASTICSEARCH_VERSION=2.0.0
     - gemfile: Gemfile
-      env: ELASTICSEARCH_VERSION=5.0.0-beta1
-    # - gemfile: test/gemfiles/nobrainer.gemfile
-    #   env: NOBRAINER=true
+      env: ELASTICSEARCH_VERSION=5.0.0
   allow_failures:
     - gemfile: Gemfile
-      env: ELASTICSEARCH_VERSION=5.0.0-beta1
-    # - gemfile: test/gemfiles/nobrainer.gemfile
-    #   env: NOBRAINER=true
+      env: ELASTICSEARCH_VERSION=5.0.0

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.4.0
+
+- Boost exact matches for partial matching
+- Added `searchkick_debug` method
+- Added `geo_polygon` filter
+
 ## 1.3.6
 
 - Fixed `Job adapter not found` error

data/README.md

@@ -44,7 +44,7 @@ Add this line to your application’s Gemfile:
 gem 'searchkick'
 ```
 
-For Elasticsearch 2.0, use the version `1.0` and above. For Elasticsearch 0.90, use version `0.6.3` and [this readme](https://github.com/ankane/searchkick/blob/v0.6.3/README.md).
+For Elasticsearch 5.0, use the version `1.4` and above. For Elasticsearch 2.0, use the version `1.0` and above.
 
 Add searchkick to models you want to search.
 
@@ -852,6 +852,12 @@ Bounded by a box
 City.search "san", where: {location: {top_left: {lat: 38, lon: -123}, bottom_right: {lat: 37, lon: -122}}}
 ```
 
+Bounded by a polygon [master]
+
+```ruby
+City.search "san", where: {location: {geo_polygon: {points: [{lat: 38, lon: -123}, {lat: 39, lon: -123}, {lat: 37, lon: 122}]}}}
+```
+
 ### Boost By Distance
 
 Boost results by distance - closer results are boosted more
@@ -1046,7 +1052,7 @@ And create an initializer with:
 
 ```ruby
 require "typhoeus/adapters/faraday"
-Ethon.logger = Logger.new("/dev/null")
+Ethon.logger.level = Logger::WARN
 ```
 
 **Note:** Typhoeus is not available for Windows.

data/lib/searchkick/index.rb

@@ -33,6 +33,10 @@ module Searchkick
       client.indices.get_mapping index: name
     end
 
+    def settings
+      client.indices.get_settings index: name
+    end
+
     def swap(new_name)
       old_indices =
         begin

data/lib/searchkick/model.rb

@@ -69,6 +69,35 @@ module Searchkick
           def searchkick_index_options
             searchkick_index.index_options
           end
+
+          def searchkick_debug
+            require "pp"
+
+            puts "Model Searchkick Options"
+            pp searchkick_options
+            puts
+
+            puts "Model Sample Search Data"
+            begin
+              pp first(3).map { |r| {index: searchkick_index.record_data(r).merge(data: searchkick_index.send(:search_data, r))}}
+            rescue => e
+              puts "#{e.class.name}: #{e.message}"
+            end
+            puts
+
+            puts "Elasticsearch Mapping"
+            puts JSON.pretty_generate(searchkick_index.mapping)
+            puts
+
+            puts "Elasticsearch Settings"
+            puts JSON.pretty_generate(searchkick_index.settings)
+            puts
+
+            puts "Elasticsearch Sample Results"
+            puts JSON.pretty_generate(search("*", load: false, limit: 3).response)
+
+            nil # do not return anything, as this is strictly used for manual debugging
+          end
         end
         extend Searchkick::Reindex # legacy for Searchjoy
 

data/lib/searchkick/query.rb

@@ -271,7 +271,21 @@ module Searchkick
                 qs.concat qs.map { |q| q.except(:cutoff_frequency).merge(fuzziness: edit_distance, prefix_length: prefix_length, max_expansions: max_expansions, boost: factor).merge(transpositions) }
               end
 
-              queries.concat(qs.map { |q| {match_type => {field => q}} })
+              # boost exact matches more
+              if field =~ /\.word_(start|middle|end)\z/ && searchkick_options[:word] != false
+                queries << {
+                  bool: {
+                    must: {
+                      bool: {
+                        should: qs.map { |q| {match_type => {field => q}} }
+                      }
+                    },
+                    should: {match_type => {field.sub(/\.word_(start|middle|end)\z/, ".analyzed") => qs.first}}
+                  }
+                }
+              else
+                queries.concat(qs.map { |q| {match_type => {field => q}} })
+              end
             end
 
             payload = {
@@ -748,6 +762,12 @@ module Searchkick
                     distance: value[:within] || "50mi"
                   }
                 }
+              when :geo_polygon
+                filters << {
+                  geo_polygon: {
+                    field => op_value
+                  }
+                }
               when :top_left
                 filters << {
                   geo_bounding_box: {

data/lib/searchkick/version.rb

@@ -1,3 +1,3 @@
 module Searchkick
-  VERSION = "1.3.6"
+  VERSION = "1.4.0"
 end

data/test/autocomplete_test.rb

@@ -56,6 +56,16 @@ class AutocompleteTest < Minitest::Test
     assert_search "dark grey", ["Dark Grey"], fields: [{name: :word_start}]
   end
 
+  def test_word_start_exact
+    store_names ["Back Scratcher", "Backpack"]
+    assert_order "back", ["Back Scratcher", "Backpack"], fields: [{name: :word_start}]
+  end
+
+  def test_word_start_exact_martin
+    store_names ["Martina", "Martin"]
+    assert_order "martin", ["Martin", "Martina"], fields: [{name: :word_start}]
+  end
+
   # TODO find a better place
 
   def test_exact

data/test/ci/before_install.sh

@@ -1,21 +1,18 @@
 #!/usr/bin/env bash
 
+set -e
+
 gem install bundler
 
+# https://docs.travis-ci.com/user/database-setup/#ElasticSearch
 sudo apt-get purge elasticsearch
 if [[ $ELASTICSEARCH_VERSION == 1* ]]; then
-  wget https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-$ELASTICSEARCH_VERSION.deb
+  curl -O https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-$ELASTICSEARCH_VERSION.deb
+elif [[ $ELASTICSEARCH_VERSION == 2* ]]; then
+  curl -O https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/deb/elasticsearch/$ELASTICSEARCH_VERSION/elasticsearch-$ELASTICSEARCH_VERSION.deb
 else
-  wget https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/deb/elasticsearch/$ELASTICSEARCH_VERSION/elasticsearch-$ELASTICSEARCH_VERSION.deb
-fi
-sudo dpkg -i elasticsearch-$ELASTICSEARCH_VERSION.deb
-sudo service elasticsearch start
-
-if [ -n "$NOBRAINER" ]; then
-  source /etc/lsb-release && echo "deb http://download.rethinkdb.com/apt $DISTRIB_CODENAME main" | sudo tee /etc/apt/sources.list.d/rethinkdb.list
-  wget -qO- http://download.rethinkdb.com/apt/pubkey.gpg | sudo apt-key add -
-  sudo apt-get update -q
-  sudo apt-get install rethinkdb
-  sudo cp /etc/rethinkdb/default.conf.sample /etc/rethinkdb/instances.d/instance1.conf
-  sudo service rethinkdb restart
+  curl -O https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-$ELASTICSEARCH_VERSION.deb
 fi
+sudo dpkg -i --force-confnew elasticsearch-$ELASTICSEARCH_VERSION.deb
+sudo service elasticsearch restart
+sleep 10

data/test/where_test.rb

@@ -137,6 +137,21 @@ class WhereTest < Minitest::Test
     assert_search "san", ["San Francisco", "San Antonio"], where: {location: {near: {lat: 37, lon: -122}, within: "2000mi"}}
   end
 
+  def test_geo_polygon
+    store [
+      {name: "San Francisco", latitude: 37.7833, longitude: -122.4167},
+      {name: "San Antonio", latitude: 29.4167, longitude: -98.5000},
+      {name: "San Marino", latitude: 43.9333, longitude: 12.4667}
+    ]
+    polygon = [
+      {lat: 42.185695, lon: -125.496146},
+      {lat: 42.185695, lon: -94.125535},
+      {lat: 27.122789, lon: -94.125535},
+      {lat: 27.12278, lon: -125.496146}
+    ]
+    assert_search "san", ["San Francisco", "San Antonio"], where: {location: {geo_polygon: {points: polygon}}}
+  end
+
   def test_top_left_bottom_right
     store [
       {name: "San Francisco", latitude: 37.7833, longitude: -122.4167},

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: searchkick
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 1.4.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-08 00:00:00.000000000 Z
+date: 2016-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel