elasticsearch-model-mongoid_extensions 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bff3160ee99ace6e3189b086c28860d85b6e5e199d5b94c221198d2d125fc9fa
-  data.tar.gz: 6cfe79f4e4697bb67abdacd1b9070038beebd43cebce76bcf55d0d3879b20389
+  metadata.gz: 51c2855c08e68e44f7630c57fe03f00cdce0bd4b78de67989436b494f40acc40
+  data.tar.gz: 1f72120ee7612d3d873278b6d6cf431232d9db1c5dcc2056bea82c56b39d9ef4
 SHA512:
-  metadata.gz: eb092fde421904554da329f4dd18fbddbbd7e2d9cbd87ee05b0a25ddb25b93d7c1c440131378ffaba53c7000169f5fbb044e8ac36e1bb5417be46f46c069cd46
-  data.tar.gz: bb99f9c27ea8d2dbc4142f7903aa77b3c3557ee600d63e32986d9093ed3141997e28648ba05defbe1bdfeaab2a42d2db1ad7bcee4b221f449bf7c40a39b2b917
+  metadata.gz: aa7d34e369a02fc8922bf4742a7e0bf1248ea388ce7d9d7a0b38ba8428284c8433051528d6ba227ac3c92d0d636fed09e48818f341515eed4b435934ce0baad0
+  data.tar.gz: bc83083b9d66f8f1c2ed3fbab8f08f030423f673777ef5c3797108f686045ce59492992a84d735a68a24aa164938da86a0805990a6b2b7f188f8623c47544e93

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 1.1.1
+
+* added support for localized fields fallbacks
+
 ## 1.1.0
 
 * fixed localized support in combination with SCI

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

@@ -31,9 +31,22 @@ module Elasticsearch
               fields.select { |_, field| field.localized? }.each do |name, field|
                 aliased_name = field.options[:as].to_s
                 translations_field_name = [name, 'translations'].join('_')
-                if obj.key?(name) then obj[name] = send(translations_field_name)
-                elsif obj.key?(aliased_name) then obj[aliased_name] = send(translations_field_name)
+                field_obj = send(translations_field_name)
+                field_key = aliased_name.presence || name
+
+                obj[field_key] = I18n.available_locales.each_with_object({}) do |locale, res|
+                  res[locale.to_s] = field_obj[locale.to_s].presence || field_obj[locale]
+
+                  next if res[locale].present?
+
+                  if field.send(:fallbacks?) && ::I18n.respond_to?(:fallbacks)
+                    next unless fallbacks_for_locale = ::I18n.fallbacks[locale]
+                    next unless fallback_locale = fallbacks_for_locale.map(&:to_s).find{ |loc| field_obj.has_key?(loc) && field_obj[loc].present? }
+                    res[locale.to_s] = field_obj[fallback_locale]
+                  end
                 end
+
+                obj
               end
             end
           end

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

@@ -1,7 +1,7 @@
 module Elasticsearch
   module Model
     module MongoidExtensions
-      VERSION = '1.1.0'.freeze
+      VERSION = '1.1.1'.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.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Tomas Celizna
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-10 00:00:00.000000000 Z
+date: 2018-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport