elastic_ar_sync 0.1.2 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5064e37715c757321f546ba33bba3804a074ea847abacbd62e2b8c8b97bf650
-  data.tar.gz: 2cc2dd0be8de3705775eed297c0e9b4a1464a73f7ae93f68801b6155bd439746
+  metadata.gz: 53be1f275059f78080af2ed902fbbf5d10af6fcf62b31b189fe22294b9623742
+  data.tar.gz: ef20e4a2d9ee446e9ea741b6758c4609a3f4f015ec0e5815435fa706b9cc2beb
 SHA512:
-  metadata.gz: 2f1d68abc5470a9e7fe8dcea07b20532ace4d9307d20fac684191daff36bfe16e6cd8e77ea3d82680f158c1e685fcb4b25f596d397e0f308ed7c9e75dbf3d100
-  data.tar.gz: 505adfb0db637e619873cb31c54c07d75fa5a7f5056492cf3fc34509dff7592a1d6ee86a111aa48a8ef732a142d5299a7728819b75aa0be81085df8145cc2cbf
+  metadata.gz: 90c15465ed3b20a2055e10cf09c1d6719c5d6c21d7ae070f373e5afbe04f1053fc0d4eda106a905b9d21ae80a7a19e4f2bae1d5d40453abb523f3f8e964bf7c1
+  data.tar.gz: 814e9fb8c93ab4532d546d61f1063f134b4448154be246089cdf45291f0108ac4c1485a3a7853be38f3bde1265c3b7eb65ad3d81028b479c3a7bc536f3f7506e

data/README.md

@@ -9,11 +9,16 @@ Install `gem elasticsearch-rails`, `gem elasticsearch-model` and `gem elasticsea
 
 Include module `ElasticArSync::Elastic::Syncable` on your Model class which is inherited ActiveRecord.
 
+and define `index_config` after `include ElasticArSync::Elastic::Syncable` if you use this module normally.
+
+you can override index_config described after.
+
 example below
 
 ```ruby
 class XXXXX < ActiveRecord
   include ElasticArSync::Elastic::Syncable
+  index_config
 end
 ```
 
@@ -24,6 +29,13 @@ update and delete is same as create.
 
 this module contains class method `index_setup` to setup index.
 
+setup means create new index and put alias to new index and sync whole records of RDB with new index,
+then you can use new index without any command.
+
+```ruby
+XXXXX.index_setup
+```
+
 ### usable methods
 if your Model class included `ElasticArSync::Elastic::Syncable`, it can use class methods below.
 
@@ -66,17 +78,34 @@ you can use `index_config` after `include ElasticArSync::Elastic::Syncable`.
 
 example below
 
-you can override argus `dynamic`, `number_of_shards`, `attr_mappings`.
+you can override args `dynamic`, `number_of_shards`, `attr_mappings`.
 especially default mapping is whole attributes of your Model class, so you can customize mapping attributes by overriding attr_mappings.
 ```ruby
 index_config(dynamic: 'false', number_of_shards: 1, attr_mappings: { id: 'integer', name: 'text', birth: 'date' })
 ```
 
-if you define your original mapping additionally, you can define like below.
+you can also override part of attributes by `override_mappings` like below
 
-tips: just reference here.
+＊As a premise, your model contain [id: integer, name: string, birth: date]
+
+```ruby
+index_config(override_mappings: { birth: :keyword })
+```
+
+then birth will mapping as keyword type in index of elasticsearch.
+
+if you want add mapping which is not defined as schema column of model, you can save method result as well like below.
+
+```ruby
+index_config(override_mappings: { full_name: :keyword })
+```
+
+＊`full_name` is instance method
+
+then full_name will mapped to index mapping as keyword type. but you have to define instance method full_name to your model class.
+
+if you define your original mapping additionally, you can also define like below.
 
-https://github.com/elastic/elasticsearch-rails/tree/master/elasticsearch-model
 ```ruby
   settings index: { number_of_shards: number_of_shards } do
     mappings do
@@ -85,6 +114,9 @@ https://github.com/elastic/elasticsearch-rails/tree/master/elasticsearch-model
   end
 ```
 
+tips: just reference here.
+
+https://github.com/elastic/elasticsearch-rails/tree/master/elasticsearch-model
 
 ## Installation
 Add this line to your application's Gemfile:

data/lib/elastic_ar_sync/elastic/syncable.rb

@@ -37,7 +37,9 @@ module ElasticArSync
         end
 
         def as_indexed_json(_option = {})
-          attributes.symbolize_keys.select { |key, _| self.class.mapping_list_keys.include?(key) }
+          hash = {}
+          self.class.mapping_list_keys.each { |key| hash[key.to_s] = send(key) }
+          hash.as_json
         end
       end
 
@@ -67,30 +69,66 @@ 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|
                 next unless value.is_a?(Hash)
 
+                if value[:type].to_s == 'nested'
+                  indexes key ,value.reject { |k, _| k.to_sym == :nested_attr } do
+                    value[:nested_attr].each { |key, value| indexes key, value }
+                  end
+                  next
+                end
+
                 indexes key, value
               end
             end
           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
           mapping = {}
           attribute_types.each do |attribute, active_model_type|
             type = active_model_type.type
-            type = :text if (active_model_type.type.to_sym == :string) || (type == :integer && defined_enums.symbolize_keys.keys.include?(attribute.to_sym))
+            type = :text if (active_model_type.type.to_sym == :string)
+            type = :keyword if type == :integer && defined_enums.symbolize_keys.keys.include?(attribute.to_sym)
             type = :date if active_model_type.type == :datetime
             mapping[attribute.to_sym] = { type: type }
           end
@@ -110,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/version.rb

@@ -1,3 +1,3 @@
 module ElasticArSync
-  VERSION = '0.1.2'
+  VERSION = '0.1.8'
 end

metadata

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