searchkick 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf72e82ba04fdb0dad02352ce84d8d7844b9097d
-  data.tar.gz: 53739b3ac5968665fb53d73f6966b63e2c9bf3c3
+  metadata.gz: 755a0e68ea42b18bb5d3ab111bec8d7f95a0bce2
+  data.tar.gz: 5ed049addff00159cfe9a4c7db03ea81cb9383ca
 SHA512:
-  metadata.gz: f1e26f41eda3b67dae70f0fe0502f46bef521565bdf69b70d1762430292e941f1fb581f6a485779705afe869f2728d9bd5e18abcd7537de1bcb2307831a84c75
-  data.tar.gz: 03c79e33d55fd712d4b75ff9830d00c9fa78acdc65aeb80a78cc23931055ecec0a3e892d239491236ecedc7184c8d37a062a0ece6a45779b1244e9117eed28d9
+  metadata.gz: cab627210801732d119796bce578d42289d808199a1f3a3510343ded21c4513ecad2f2e7259a435fc4c31db13e89995bf659195fa783c5d5747c0c0e554ee76f
+  data.tar.gz: 4b06af47509a66eafc9f8bc6080e28a72fbd03998c4b7307b4e26cb950a5d52417ace6261a9b974dcf809fb535af75c5789a2e1ae96c45c66dd630dd9e0b76fc

data/CHANGELOG.md

@@ -1,7 +1,14 @@
+## 3.0.2
+
+- Added support for Korean and Vietnamese
+- Fixed `Unsupported argument type: Symbol` for async partial reindex
+- Fixed infinite recursion with multi search and misspellings below
+- Do not raise an error when `id` is indexed
+
 ## 3.0.1
 
 - Added `scope` option for partial reindex
-- Added support for Japanese, Polish, and Ukranian
+- Added support for Japanese, Polish, and Ukrainian
 
 ## 3.0.0
 

data/README.md

@@ -22,7 +22,7 @@ Plus:
 - supports many languages
 - works with ActiveRecord, Mongoid, and NoBrainer
 
-:speech_balloon: Get [handcrafted updates](http://chartkick.us7.list-manage.com/subscribe?u=952c861f99eb43084e0a49f98&id=6ea6541e8e&group[0][4]=true) for new features
+:speech_balloon: Get [handcrafted updates](https://chartkick.us7.list-manage.com/subscribe?u=952c861f99eb43084e0a49f98&id=6ea6541e8e&group[0][4]=true) for new features
 
 :tangerine: Battle-tested at [Instacart](https://www.instacart.com/opensource)
 
@@ -302,10 +302,12 @@ end
 
 A few languages require plugins:
 
-- `chinese` - [elasticsearch-analysis-ik plugin](https://github.com/medcl/elasticsearch-analysis-ik)
+- `chinese` - [analysis-ik plugin](https://github.com/medcl/elasticsearch-analysis-ik)
 - `japanese` - [analysis-kuromoji plugin](https://www.elastic.co/guide/en/elasticsearch/plugins/6.2/analysis-kuromoji.html)
+- `korean` - [analysis-openkoreantext plugin](https://github.com/open-korean-text/elasticsearch-analysis-openkoreantext)
 - `polish` - [analysis-stempel plugin](https://www.elastic.co/guide/en/elasticsearch/plugins/6.2/analysis-stempel.html)
 - `ukrainian` - [analysis-ukrainian plugin](https://www.elastic.co/guide/en/elasticsearch/plugins/6.2/analysis-ukrainian.html)
+- `vietnamese` - [analysis-vietnamese plugin](https://github.com/duydo/elasticsearch-analysis-vietnamese)
 
 ### Synonyms
 
@@ -654,7 +656,7 @@ Reindex and search with:
 Movie.search "jurassic pa", fields: [:title], match: :word_start
 ```
 
-Typically, you want to use a JavaScript library like [typeahead.js](http://twitter.github.io/typeahead.js/) or [jQuery UI](http://jqueryui.com/autocomplete/).
+Typically, you want to use a JavaScript library like [typeahead.js](https://twitter.github.io/typeahead.js/) or [jQuery UI](https://jqueryui.com/autocomplete/).
 
 #### Here’s how to make it work with Rails
 
@@ -854,7 +856,7 @@ class Restaurant < ApplicationRecord
   searchkick locations: [:location]
 
   def search_data
-    attributes.merge location: {lat: latitude, lon: longitude}
+    attributes.merge(location: {lat: latitude, lon: longitude})
   end
 end
 ```

data/lib/searchkick/index_options.rb

@@ -169,6 +169,30 @@ module Searchkick
               type: "kuromoji"
             }
           )
+        when "korean"
+          settings[:analysis][:analyzer].merge!(
+            default_analyzer => {
+              type: "openkoreantext-analyzer"
+            },
+            searchkick_search: {
+              type: "openkoreantext-analyzer"
+            },
+            searchkick_search2: {
+              type: "openkoreantext-analyzer"
+            }
+          )
+        when "vietnamese"
+          settings[:analysis][:analyzer].merge!(
+            default_analyzer => {
+              type: "vi_analyzer"
+            },
+            searchkick_search: {
+              type: "vi_analyzer"
+            },
+            searchkick_search2: {
+              type: "vi_analyzer"
+            }
+          )
         when "polish", "ukrainian", "smartcn"
           settings[:analysis][:analyzer].merge!(
             default_analyzer => {

data/lib/searchkick/multi_search.rb

@@ -14,12 +14,12 @@ module Searchkick
 
     private
 
-    def perform_search(queries)
-      responses = client.msearch(body: queries.flat_map { |q| [q.params.except(:body), q.body] })["responses"]
+    def perform_search(search_queries, perform_retry: true)
+      responses = client.msearch(body: search_queries.flat_map { |q| [q.params.except(:body), q.body] })["responses"]
 
       retry_queries = []
-      queries.each_with_index do |query, i|
-        if query.retry_misspellings?(responses[i])
+      search_queries.each_with_index do |query, i|
+        if perform_retry && query.retry_misspellings?(responses[i])
           query.send(:prepare) # okay, since we don't want to expose this method outside Searchkick
           retry_queries << query
         else
@@ -28,10 +28,10 @@ module Searchkick
       end
 
       if retry_queries.any?
-        perform_search(retry_queries)
+        perform_search(retry_queries, perform_retry: false)
       end
 
-      queries
+      search_queries
     end
 
     def client

data/lib/searchkick/query.rb

@@ -317,7 +317,7 @@ module Searchkick
               qs << shared_options.merge(analyzer: "searchkick_search")
 
               # searchkick_search and searchkick_search2 are the same for ukrainian
-              unless %w(japanese polish ukrainian).include?(searchkick_options[:language])
+              unless %w(japanese korean polish ukrainian vietnamese).include?(searchkick_options[:language])
                 qs << shared_options.merge(analyzer: "searchkick_search2")
               end
               exclude_analyzer = "searchkick_search2"

data/lib/searchkick/record_data.rb

@@ -1,6 +1,5 @@
 module Searchkick
   class RecordData
-    EXCLUDED_ATTRIBUTES = ["id", :id]
     TYPE_KEYS = ["type", :type]
 
     attr_reader :index, :record
@@ -50,11 +49,7 @@ module Searchkick
     def search_data(method_name = nil)
       partial_reindex = !method_name.nil?
 
-      # remove _id since search_id is used instead
       source = record.send(method_name || :search_data)
-      EXCLUDED_ATTRIBUTES.each do |attr|
-        raise Searchkick::Error, "Cannot index a field with name: #{attr}" if source[attr]
-      end
 
       # conversions
       index.conversions_fields.each do |conversions_field|

data/lib/searchkick/record_indexer.rb

@@ -26,7 +26,11 @@ module Searchkick
           raise Searchkick::Error, "Active Job not found"
         end
 
-        Searchkick::ReindexV2Job.perform_later(record.class.name, record.id.to_s, method_name)
+        Searchkick::ReindexV2Job.perform_later(
+          record.class.name,
+          record.id.to_s,
+          method_name ? method_name.to_s : nil
+        )
       else # bulk, true
         reindex_record(method_name)
 

data/lib/searchkick/version.rb

@@ -1,3 +1,3 @@
 module Searchkick
-  VERSION = "3.0.1"
+  VERSION = "3.0.2"
 end

data/test/language_test.rb

@@ -38,6 +38,16 @@ class LanguageTest < Minitest::Test
     end
   end
 
+  def test_korean
+    # requires https://github.com/open-korean-text/elasticsearch-analysis-openkoreantext
+    with_options(Song, language: "korean") do
+      store_names ["한국어를 처리하는 예시입니닼ㅋㅋ"], Song
+      assert_language_search "처리", ["한국어를 처리하는 예시입니닼ㅋㅋ"]
+      assert_language_search "한국어", ["한국어를 처리하는 예시입니닼ㅋㅋ"]
+      assert_language_search "를", []
+    end
+  end
+
   def test_polish
     # requires https://www.elastic.co/guide/en/elasticsearch/plugins/6.2/analysis-stempel.html
     with_options(Song, language: "polish") do
@@ -54,6 +64,15 @@ class LanguageTest < Minitest::Test
     end
   end
 
+  def test_vietnamese
+    # requires https://github.com/duydo/elasticsearch-analysis-vietnamese
+    with_options(Song, language: "vietnamese") do
+      store_names ["công nghệ thông tin Việt Nam"], Song
+      assert_language_search "công nghệ thông tin", ["công nghệ thông tin Việt Nam"]
+      assert_language_search "công", []
+    end
+  end
+
   def assert_language_search(term, expected)
     assert_search term, expected, {misspellings: false}, Song
   end

data/test/multi_search_test.rb

@@ -22,7 +22,7 @@ class MultiSearchTest < Minitest::Test
 
   def test_misspellings_below_unmet
     store_names ["abc", "abd", "aee"]
-    products = Product.search("abc", misspellings: {below: 2}, execute: false)
+    products = Product.search("abc", misspellings: {below: 5}, execute: false)
     Searchkick.multi_search([products])
     assert_equal ["abc", "abd"], products.map(&:name)
   end

data/test/partial_reindex_test.rb

@@ -55,4 +55,11 @@ class PartialReindexTest < Minitest::Test
     assert_search "bye", ["Bye"], fields: [:name], load: false
     assert_search "blue", ["Bye"], fields: [:color], load: false
   end
+
+  def test_instance_method_async
+    skip unless defined?(ActiveJob)
+
+    product = Product.create!(name: "Hi")
+    product.reindex(:search_data, mode: :async)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: searchkick
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-15 00:00:00.000000000 Z
+date: 2018-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel