elasticsearch-model-mongoid_extensions 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83ae68f2327ac0a29070798111ed65724b3f14108f55985c9d356a655a3cb742
-  data.tar.gz: 16392943f8ef6d971a43acc2cfb5672e1d00c387ce9b3d26bde0827241aa7b00
+  metadata.gz: bff3160ee99ace6e3189b086c28860d85b6e5e199d5b94c221198d2d125fc9fa
+  data.tar.gz: 6cfe79f4e4697bb67abdacd1b9070038beebd43cebce76bcf55d0d3879b20389
 SHA512:
-  metadata.gz: 44c88ff3857330feded922b34736b452b8a9a1e5559e2d5bc687e07505b44e51a570fd7e6b7ab07a8395ed5fe2c903f074b559650b1b29a8ff3dd8a2ef5dcc0e
-  data.tar.gz: 3dbc352f073198c5b741bc555880843a481d1222170021afe549eec41e4bf2a1bbe1a1af4361bf09430ee8352668401e374a9e35934dfe5dd6c3ef691550fd85
+  metadata.gz: eb092fde421904554da329f4dd18fbddbbd7e2d9cbd87ee05b0a25ddb25b93d7c1c440131378ffaba53c7000169f5fbb044e8ac36e1bb5417be46f46c069cd46
+  data.tar.gz: bb99f9c27ea8d2dbc4142f7903aa77b3c3557ee600d63e32986d9093ed3141997e28648ba05defbe1bdfeaab2a42d2db1ad7bcee4b221f449bf7c40a39b2b917

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 1.1.0
+
+* fixed localized support in combination with SCI
+
 ## 1.0.1
 
 * Mongoid 7 compatibility

data/lib/elasticsearch/model/mongoid_extensions/localized.rb

@@ -6,22 +6,22 @@ module Elasticsearch
       module Localized
         extend ActiveSupport::Concern
 
-        class Mappings < Elasticsearch::Model::Indexing::Mappings
-          def indexes(name, options = {}, &block)
-            # take the cls from options on the Mappings object
-            @cls ||= @options.delete(:cls) if @options[:cls]
-
-            return super(name, options, &block) unless @cls
-
-            field = @cls.fields[name.to_s] || @cls.fields.detect { |_, meta| meta.options[:as] == name.to_sym }.try(:last)
-
-            return super(name, options, &block) unless field.present? && field.localized?
+        class ProcessMappings < Struct.new(:cls, :mapping)
+          def self.call(*args)
+            new(*args).call
+          end
 
-            super(name) do
-              Array(::I18n.available_locales).each do |locale|
-                super(locale, options, &block)
+          def call
+            mapping.each do |field_name, options|
+              next unless field = cls.fields[field_name.to_s] || cls.fields.detect { |_, meta| meta.options[:as] == field_name.to_sym }.try(:last)
+              next unless field.localized?
+              next if mapping[field_name]&.frozen?
+              mapping[field_name] = ::I18n.available_locales.each_with_object({ type: 'object', properties: {} }) do |locale, res|
+                res[:properties][locale] = options.dup
               end
+              mapping[field_name].freeze
             end
+            mapping
           end
         end
 
@@ -41,8 +41,14 @@ module Elasticsearch
 
         included do
           def self.mapping(options = {}, &block)
-            __elasticsearch__.instance_variable_set(:@mapping, Mappings.new(document_type, { cls: self }.merge(options))) unless __elasticsearch__.instance_variable_get(:@mapping)
-            __elasticsearch__.mapping(options, &block)
+            mappings = __elasticsearch__.mapping(options, &block)
+            if mappings.is_a?(Elasticsearch::Model::Indexing::Mappings)
+              if mapping = mappings.instance_variable_get(:@mapping)
+                updated_mapping = ProcessMappings.call(self, mapping)
+                mappings.instance_variable_set(:@mapping, updated_mapping)
+              end
+            end
+            mappings
           end
 
           prepend Serializing

data/lib/elasticsearch/model/mongoid_extensions/version.rb

@@ -1,7 +1,7 @@
 module Elasticsearch
   module Model
     module MongoidExtensions
-      VERSION = '1.0.1'.freeze
+      VERSION = '1.1.0'.freeze
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-model-mongoid_extensions
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Tomas Celizna
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-03 00:00:00.000000000 Z
+date: 2018-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -216,7 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Elasticsearch::Model extensions for Mongoid adding support of single collection