elastic_ar_sync 0.1.6 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 892ccfa7c17e4a02cf8c774eec3ec71eb6dfaf16006052e0d82381b4aec48bb5
-  data.tar.gz: 1c948f281659aec4a29bdbb28471a55127f3fab23080fca7b63fb43454b3d140
+  metadata.gz: bce44a711b1391e382ac02278af2203b1a0cc304f161c6d3f1c6b68f2a3c24b2
+  data.tar.gz: 1f356f4086089f0a7edff3b9355fc35a31a89ad3bc98e01080939c62cca18618
 SHA512:
-  metadata.gz: 4524209a6682d5bf32f8543d54e138b0eb0e271a2ae04e417a8fa0ee905ac32788dfbd92300b2c5431ad54274222935b20b0268e71b37e542c8545e75e21eb46
-  data.tar.gz: cbd985be6b920d6c0f9e910a636ab391261e9187d9d56dce6323906be4cc1d8482e8028f489e2eb355e1cf4e6500cab301368a9ede05434c6636965ab3b0329c
+  metadata.gz: 92a604d4d3e7fcdf6645317c8dbfb4dc2633b5994c8523c2ab66eb773dfc5cca4dee3a82d1d5339208d947a05a6e17a6582d52f1985038dfebb371cf1edbe900
+  data.tar.gz: 4fd9baff81fd0707100e12a9c8d56048d788e4cea1e1b9b9cdb2cc80020fc1b1eb1dac39e4b78549bcd646deb60b9412a8843f05b3d0f107ca9cc2e141f45f10

data/README.md

@@ -1,6 +1,10 @@
 # ElasticArSync
 This repository contains easy set up modules for RDB and elasticsearch index with Active Record.
 This is based on `gem elasticsearch-rails`.
+
+日本語での説明はこちら
+https://ted-tech.hateblo.jp/entry/2020/08/11/103155
+
 ## Usage
 ### Preparation
 Install `gem sidekiq` and `gem redis-rails` to use Asynchronous processing for your app.

data/lib/elastic_ar_sync/elastic/syncable.rb

@@ -13,27 +13,27 @@ module ElasticArSync
         # after_commitでRDBを操作した時にESのインデックスも同期させる
         # アプリのサーバーに負荷をかけ無いように非同期で実行させる
         after_commit on: [:create] do
-          document_sync_create(self.class, id)
+          document_sync_create(self.class.to_s, id)
         end
 
         after_commit on: [:update] do
-          document_sync_update(self.class, id)
+          document_sync_update(self.class.to_s, id)
         end
 
         after_commit on: [:destroy] do
-          document_sync_delete(self.class, id)
+          document_sync_delete(self.class.to_s, id)
         end
 
-        def document_sync_create(klass, record_id)
-          ElasticArSync::Elastic::Worker::IndexWorker.perform_async(klass, :index, record_id)
+        def document_sync_create(klass_str, record_id)
+          ElasticArSync::Elastic::Worker::IndexWorker.perform_async(klass_str, :index, record_id)
         end
 
-        def document_sync_update(klass, record_id)
-          ElasticArSync::Elastic::Worker::IndexWorker.perform_async(klass, :index, record_id)
+        def document_sync_update(klass_str, record_id)
+          ElasticArSync::Elastic::Worker::IndexWorker.perform_async(klass_str, :index, record_id)
         end
 
-        def document_sync_delete(klass, record_id)
-          ElasticArSync::Elastic::Worker::IndexWorker.perform_async(klass, :delete, record_id)
+        def document_sync_delete(klass_str, record_id)
+          ElasticArSync::Elastic::Worker::IndexWorker.perform_async(klass_str, :delete, record_id)
         end
 
         def as_indexed_json(_option = {})
@@ -60,7 +60,7 @@ module ElasticArSync
 
         # DBの内容をESのインデックスに同期する
         def import_all_record(target_index: ,batch_size: 100)
-          ElasticArSync::Elastic::Worker::IndexImportWorker.perform_async(self, target_index, batch_size)
+          ElasticArSync::Elastic::Worker::IndexImportWorker.perform_async(self.to_s, target_index, batch_size)
         end
 
         # ダウンタイムなしでインデックスを切り替える
@@ -69,10 +69,10 @@ module ElasticArSync
           ElasticArSync::Elastic::Services::IndexHandler.new(self).switch_alias(alias_name: index_name, new_index_name: new_index_name)
         end
 
-        def index_config(dynamic: 'false', override_settings: {}, attr_mappings: default_index_mapping, override_mappings: {})
+        def index_config(dynamic: 'false', override_settings: {}, attr_mappings: default_index_mapping, override_mappings: {}, kuromoji_default: false)
           attr_mappings.merge!(override_mappings) if override_mappings.present?
 
-          settings default_index_setting.merge!(override_settings) do
+          settings default_index_setting(kuromoji_default).merge!(override_settings) do
             # ES6からStringが使えないのでtextかkeywordにする。
             mappings dynamic: dynamic do
               attr_mappings.each do |key, value|
@@ -91,8 +91,36 @@ module ElasticArSync
           end
         end
 
-        def default_index_setting
-          { index: { number_of_shards: 1 } }
+        def default_index_setting(kuromoji_default = false)
+          setting_attr = { index: { number_of_shards: 1 } }
+          setting_attr.merge!(ja_analyze_default) if kuromoji_default
+          setting_attr
+        end
+
+        def ja_analyze_default
+          {
+            "analysis": {
+              "analyzer": {
+                "normal_ja_analyzer": {
+                  "type": "custom",
+                  "tokenizer": "kuromoji_tokenizer",
+                  "mode": "search",
+                  "char_filter": [
+                    "icu_normalizer",
+                    "kuromoji_iteration_mark"
+                  ],
+                  "filter": [
+                    "kuromoji_baseform",
+                    "kuromoji_part_of_speech",
+                    "ja_stop",
+                    "lowercase",
+                    "kuromoji_number",
+                    "kuromoji_stemmer"
+                  ]
+                }
+              }
+            }
+          }
         end
 
         def default_index_mapping
@@ -120,12 +148,16 @@ module ElasticArSync
         end
 
         def current_index
-          get_aliases.select { |_, value| value["aliases"].present? }.keys.first
+          __elasticsearch__.client.indices.get_alias(index: index_name).keys.first
         end
 
         def current_mapping
           __elasticsearch__.client.indices.get_mapping[current_index]["mappings"]["_doc"]["properties"]
         end
+
+        def current_settings
+          __elasticsearch__.client.indices.get_settings[current_index]
+        end
       end
     end
   end

data/lib/elastic_ar_sync/elastic/worker/index_import_worker.rb

@@ -2,11 +2,11 @@ class ElasticArSync::Elastic::Worker::IndexImportWorker
   include Sidekiq::Worker
   sidekiq_options queue: :elasticsearch, retry: false
 
-  def perform(klass, target_index, batch_size)
+  def perform(klass_str, target_index, batch_size)
     Rails.logger.debug "[elastic IndexImportWorker] start import #{target_index}"
 
     begin
-      ElasticArSync::Elastic::Services::IndexHandler.new(Object.const_get(klass)).import_all_record(target_index, batch_size)
+      ElasticArSync::Elastic::Services::IndexHandler.new(Object.const_get(klass_str)).import_all_record(target_index, batch_size)
     rescue => e
       Rails.logger.debug "[elastic IndexImportWorker] error occur #{target_index} \n #{e.message}"
     end

data/lib/elastic_ar_sync/elastic/worker/index_worker.rb

@@ -2,8 +2,8 @@ class ElasticArSync::Elastic::Worker::IndexWorker
   include Sidekiq::Worker
   sidekiq_options queue: :elasticsearch, retry: false
 
-  def perform(klass, operation, record_id)
-    Rails.logger.debug "[elasticsearch IndexWorker] operation: #{operation} #{klass} ID: #{record_id}"
-    ElasticArSync::Elastic::Services::DocumentIndexer.new.index_document(klass, operation, record_id)
+  def perform(klass_str, operation, record_id)
+    Rails.logger.debug "[elasticsearch IndexWorker] operation: #{operation} #{klass_str} ID: #{record_id}"
+    ElasticArSync::Elastic::Services::DocumentIndexer.new.index_document(klass_str.constantize, operation, record_id)
   end
 end

data/lib/elastic_ar_sync/version.rb

@@ -1,3 +1,3 @@
 module ElasticArSync
-  VERSION = '0.1.6'
+  VERSION = '0.1.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elastic_ar_sync
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.9
 platform: ruby
 authors:
 - KitakatsuTed
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-14 00:00:00.000000000 Z
+date: 2022-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails