searchkick 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e592f63efa26867238f106cdede925736897c39e
-  data.tar.gz: b873c66a18f69cffcd9227fe92a1cf314e602090
+  metadata.gz: 92b9786d3ffe96d4accab83ae00accbaa5b2ffb3
+  data.tar.gz: 9b60f5ab8f709d9138cbe4823b14d29a06e4aa77
 SHA512:
-  metadata.gz: 74566048b5471575f1c7f2e269a6fa23fa62dbbd717696a077a26875f43883be128cbbb731578634ec948c51a5e9d336ed3595ea631717ac3056f784c813f19c
-  data.tar.gz: 5c1a40b9633f70201a13e003a1852d5a3cfcf0d16d23024cea19ddce523b2f32e5675119e5899b1b4c3e7f057466cd09a80a788a655933923a78172b5b95ebb0
+  metadata.gz: f8e3324376e90052bbf854fe3d04200857d06ac6cde06bea08ee2fe573462de243d558ed1d0592d92b7794d5c1fd761f396812c4ea09ff5fce1e30cdac2119a8
+  data.tar.gz: c5bc1d098f59c17945af081727ef92cd7d297cfebe3f0acd1c5401dd95bca71a208c10208b07f7d473e9e387fc37f4643c8dc9b373dec2006c4507f30c598808

data/.travis.yml

@@ -6,7 +6,7 @@ services:
   - redis-server
 before_install:
   - ./test/ci/before_install.sh
-script: RUBYOPT=W0 bundle exec rake test
+script: bundle exec rake test
 before_script:
   - psql -c 'create database searchkick_test;' -U postgres
 notifications:
@@ -15,11 +15,12 @@ notifications:
     on_failure: change
 gemfile:
   - Gemfile
+  - test/gemfiles/activerecord50.gemfile
   - test/gemfiles/activerecord42.gemfile
   - test/gemfiles/mongoid5.gemfile
   - test/gemfiles/mongoid6.gemfile
 env:
-  - ELASTICSEARCH_VERSION=5.3.0
+  - ELASTICSEARCH_VERSION=5.4.0
 jdk: oraclejdk8
 matrix:
   include:

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 2.3.0
+
+- Fixed analyzer on dynamically mapped fields
+- Fixed error with `similar` method and `_all` field
+- Throw error when fields are needed
+- Added `queue_name` option
+- No longer require synonyms to be lowercase
+
 ## 2.2.1
 
 - Added `avg`, `cardinality`, `max`, `min`, and `sum` aggregations

data/Gemfile

@@ -4,7 +4,7 @@ source "https://rubygems.org"
 gemspec
 
 gem "sqlite3"
-gem "activerecord", "~> 5.0.0"
+gem "activerecord", "~> 5.1.0"
 gem "gemoji-parser"
 gem "typhoeus"
 gem "activejob"

data/README.md

@@ -27,8 +27,6 @@ Plus:
 
 [![Build Status](https://travis-ci.org/ankane/searchkick.svg?branch=master)](https://travis-ci.org/ankane/searchkick)
 
-**Searchkick 2.0 was just released!** See [notable changes](#200).
-
 ## Contents
 
 - [Getting Started](#getting-started)
@@ -1606,12 +1604,18 @@ Set a lower timeout for searches
 Searchkick.search_timeout = 3
 ```
 
-Change the search method name in `config/initializers/searchkick.rb`
+Change the search method name
 
 ```ruby
 Searchkick.search_method_name = :lookup
 ```
 
+Change search queue name
+
+```ruby
+Searchkick.queue_name = :search_reindex
+```
+
 Eager load associations
 
 ```ruby
@@ -1763,11 +1767,25 @@ end
 
 ### Factory Girl
 
-Manually reindex after an instance is created.
+Use a trait and an after `create` hook for each indexed model:
 
 ```ruby
-product = FactoryGirl.create(:product)
-product.reindex(refresh: true)
+FactoryGirl.define do
+  factory :product do
+    # ...
+
+    # Note: This should be the last trait in the list so `reindex` is called
+    # after all the other callbacks complete.
+    trait :reindex do
+      after(:create) do |product, _evaluator|
+        product.reindex(refresh: true)
+      end
+    end
+  end
+end
+
+# use it
+FactoryGirl.create(:product, :some_trait, :reindex, some_attribute: "foo")
 ```
 
 ### Parallel Tests

data/lib/searchkick/index_options.rb

@@ -167,7 +167,7 @@ module Searchkick
         if synonyms.any?
           settings[:analysis][:filter][:searchkick_synonym] = {
             type: "synonym",
-            synonyms: synonyms.select { |s| s.size > 1 }.map { |s| s.is_a?(Array) ? s.join(",") : s }
+            synonyms: synonyms.select { |s| s.size > 1 }.map { |s| s.is_a?(Array) ? s.join(",") : s }.map(&:downcase)
           }
           # choosing a place for the synonym filter when stemming is not easy
           # https://groups.google.com/forum/#!topic/elasticsearch/p7qcQlgHdB8
@@ -229,6 +229,8 @@ module Searchkick
 
         mapping_options[:searchable].delete("_all")
 
+        analyzed_field_options = {type: default_type, index: "analyzed", analyzer: default_analyzer}
+
         mapping_options.values.flatten.uniq.each do |field|
           fields = {}
 
@@ -240,7 +242,7 @@ module Searchkick
 
           if !options[:searchable] || mapping_options[:searchable].include?(field)
             if word
-              fields["analyzed"] = {type: default_type, index: "analyzed", analyzer: default_analyzer}
+              fields["analyzed"] = analyzed_field_options
 
               if mapping_options[:highlight].include?(field)
                 fields["analyzed"][:term_vector] = "with_positions_offsets"
@@ -294,7 +296,7 @@ module Searchkick
           end
 
           if word
-            dynamic_fields["analyzed"] = {type: default_type, index: "analyzed"}
+            dynamic_fields["analyzed"] = analyzed_field_options
           end
         end
 
@@ -305,7 +307,7 @@ module Searchkick
 
         mappings = {
           _default_: {
-            _all: all_enabled ? {type: default_type, index: "analyzed", analyzer: default_analyzer} : {enabled: false},
+            _all: all_enabled ? analyzed_field_options : {enabled: false},
             properties: mapping,
             _routing: routing,
             # https://gist.github.com/kimchy/2898285

data/lib/searchkick/query.rb

@@ -223,13 +223,15 @@ module Searchkick
         if options[:similar]
           payload = {
             more_like_this: {
-              fields: fields,
               like_text: term,
               min_doc_freq: 1,
               min_term_freq: 1,
               analyzer: "searchkick_search2"
             }
           }
+          if fields != ["_all"]
+            payload[:more_like_this][:fields] = fields
+          end
         elsif all
           payload = {
             match_all: {}
@@ -277,7 +279,13 @@ module Searchkick
 
             match_type =
               if field.end_with?(".phrase")
-                field = field.sub(/\.phrase\z/, ".analyzed")
+                field =
+                  if field == "_all.phrase"
+                    "_all"
+                  else
+                    field.sub(/\.phrase\z/, ".analyzed")
+                  end
+
                 :match_phrase
               else
                 :match
@@ -482,17 +490,22 @@ module Searchkick
     def set_fields
       boost_fields = {}
       fields = options[:fields] || searchkick_options[:searchable]
+      default_match = options[:match] || searchkick_options[:match] || :word
       fields =
         if fields
           fields.map do |value|
-            k, v = value.is_a?(Hash) ? value.to_a.first : [value, options[:match] || searchkick_options[:match] || :word]
+            k, v = value.is_a?(Hash) ? value.to_a.first : [value, default_match]
             k2, boost = k.to_s.split("^", 2)
             field = "#{k2}.#{v == :word ? 'analyzed' : v}"
             boost_fields[field] = boost.to_f if boost
             field
           end
-        else
+        elsif default_match == :word
           ["_all"]
+        elsif default_match == :phrase
+          ["_all.phrase"]
+        else
+          raise ArgumentError, "Must specify fields"
         end
       [boost_fields, fields]
     end

data/lib/searchkick/reindex_v2_job.rb

@@ -7,7 +7,7 @@ module Searchkick
       "Cequel::Record::RecordNotFound"
     ]
 
-    queue_as :searchkick
+    queue_as { Searchkick.queue_name }
 
     def perform(klass, id)
       model = klass.constantize

data/lib/searchkick/version.rb

@@ -1,3 +1,3 @@
 module Searchkick
-  VERSION = "2.2.1"
+  VERSION = "2.3.0"
 end

data/lib/searchkick.rb

@@ -36,7 +36,7 @@ module Searchkick
   class ImportError < Error; end
 
   class << self
-    attr_accessor :search_method_name, :wordnet_path, :timeout, :models, :client_options, :redis, :index_suffix
+    attr_accessor :search_method_name, :wordnet_path, :timeout, :models, :client_options, :redis, :index_suffix, :queue_name
     attr_writer :client, :env, :search_timeout
     attr_reader :aws_credentials
   end
@@ -45,6 +45,7 @@ module Searchkick
   self.timeout = 10
   self.models = []
   self.client_options = {}
+  self.queue_name = :searchkick
 
   def self.client
     @client ||= begin
@@ -206,4 +207,7 @@ end
 
 # TODO find better ActiveModel hook
 ActiveModel::Callbacks.send(:include, Searchkick::Model)
-ActiveRecord::Base.send(:extend, Searchkick::Model) if defined?(ActiveRecord)
+
+ActiveSupport.on_load(:active_record) do
+  extend Searchkick::Model
+end

data/test/errors_test.rb

@@ -2,8 +2,8 @@ require_relative "test_helper"
 
 class ErrorsTest < Minitest::Test
   def test_bulk_import_raises_error
-    valid_dog = Product.new(name: "2016-01-02")
-    invalid_dog = Product.new(name: "Ol' One-Leg")
+    valid_dog = Product.create(name: "2016-01-02")
+    invalid_dog = Product.create(name: "Ol' One-Leg")
     index = Searchkick::Index.new "dogs", mappings: {
       dog: {
         properties: {

data/test/gemfiles/{activerecord51.gemfile → activerecord50.gemfile}

@@ -4,4 +4,4 @@ source 'https://rubygems.org'
 gemspec path: "../../"
 
 gem "sqlite3"
-gem "activerecord", "~> 5.1.0.beta1"
+gem "activerecord", "~> 5.0.0"

data/test/match_test.rb

@@ -243,6 +243,11 @@ class MatchTest < Minitest::Test
     assert_order "wheat bread", ["Wheat Bread", "Whole Wheat Bread"], match: :phrase
   end
 
+  def test_dynamic_fields
+    store_names ["Red Bull"], Speaker
+    assert_search "redbull", ["Red Bull"], {fields: [:name]}, Speaker
+  end
+
   def test_unsearchable
     store [
       {name: "Unsearchable", description: "Almond"}

data/test/synonyms_test.rb

@@ -59,4 +59,9 @@ class SynonymsTest < Minitest::Test
     assert_search "Halogen Lamp", ["Lightbulb"]
     assert_search "onions", ["Green Onions"]
   end
+
+  def test_case
+    store_names ["Uppercase"]
+    assert_search "lowercase", ["Uppercase"]
+  end
 end

data/test/test_helper.rb

@@ -372,6 +372,7 @@ class Product
       ["qtip", "cottonswab"],
       ["burger", "hamburger"],
       ["bandaid", "bandag"],
+      ["UPPERCASE", "lowercase"],
       "lightbulb => led,lightbulb",
       "lightbulb => halogenlamp"
     ],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: searchkick
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-16 00:00:00.000000000 Z
+date: 2017-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -138,7 +138,7 @@ files:
 - test/gemfiles/activerecord40.gemfile
 - test/gemfiles/activerecord41.gemfile
 - test/gemfiles/activerecord42.gemfile
-- test/gemfiles/activerecord51.gemfile
+- test/gemfiles/activerecord50.gemfile
 - test/gemfiles/apartment.gemfile
 - test/gemfiles/cequel.gemfile
 - test/gemfiles/mongoid2.gemfile
@@ -193,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Searchkick learns what your users are looking for. As more people search,
@@ -213,7 +213,7 @@ test_files:
 - test/gemfiles/activerecord40.gemfile
 - test/gemfiles/activerecord41.gemfile
 - test/gemfiles/activerecord42.gemfile
-- test/gemfiles/activerecord51.gemfile
+- test/gemfiles/activerecord50.gemfile
 - test/gemfiles/apartment.gemfile
 - test/gemfiles/cequel.gemfile
 - test/gemfiles/mongoid2.gemfile