dato 0.3.15 → 0.3.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d034c59bfa20a0dec3f23b9f74d6ece9da130f2
-  data.tar.gz: ab5566ed36c9fec2e80f8dbc040a33d19359c94f
+  metadata.gz: c14a63b1e904638d14897d5091af398fb1187f71
+  data.tar.gz: 4de50e385d99f41cb99ac08ebba0547d209b3e0b
 SHA512:
-  metadata.gz: 376075bbd1a06c4c37034c001e24be9dcab13b1de80d61b5479883bce71696ac606ac3eda83b2c47db2ba495c51417f3e93bd3bb7b4278ce6d9819b2b4c3b3d3
-  data.tar.gz: 405c4b7e80df6951a7a7c7038c23daddb97b6ae2bed26ff4540eee53791c0bafbf483bfc516950d36f630b74c4c8f17af32f724a30f682ba32debdea8c71b601
+  metadata.gz: 7f09bb97476d5b9e598cb3a8ef71e00c5635583a73b77a6978059516ef389ac96d9d1a8db1718e7f23e8617d67884cde7bf23461b93832c8dc08789b3b024801
+  data.tar.gz: ed9d5bddae54dadc1d07c482e20cb32aba7a2e8237ce9e6e151cfb02103b0f6d4e55832de80b99691216775fce7ab7181c4b0bbeb06106105c1d739a2ad23df0

data/lib/dato/local/item.rb

@@ -122,8 +122,14 @@ module Dato
         field_type = field.field_type
         type_klass_name = "::Dato::Local::FieldType::#{field_type.camelize}"
         type_klass = type_klass_name.safe_constantize
+
         value = if field.localized
-                  (entity.send(method) || {})[I18n.locale]
+                  obj = entity.send(method) || {}
+
+                  locale_with_value = I18n.fallbacks[I18n.locale]
+                    .find { |locale| obj[locale] }
+
+                  obj[locale_with_value || I18n.locale]
                 else
                   entity.send(method)
                 end
@@ -150,14 +156,18 @@ module Dato
         else
           super
         end
-      rescue NoMethodError
-        message = []
-        message << "Undefined method `#{method}`"
-        message << "Available fields for a `#{item_type.api_key}` item:"
-        message += fields.map do |f|
-          "* .#{f.api_key}"
+      rescue NoMethodError => e
+        if e.name === method
+          message = []
+          message << "Undefined method `#{method}`"
+          message << "Available fields for a `#{item_type.api_key}` item:"
+          message += fields.map do |f|
+            "* .#{f.api_key}"
+          end
+          raise NoMethodError, message.join("\n")
+        else
+          raise e
         end
-        raise NoMethodError, message.join("\n")
       end
 
       def respond_to_missing?(method, include_private = false)

data/lib/dato/local/site.rb

@@ -54,7 +54,12 @@ module Dato
 
       def read_attribute(method, type_klass, localized)
         value = if localized
-                  (entity.send(method) || {})[I18n.locale]
+                  obj = entity.send(method) || {}
+
+                  locale_with_value = I18n.fallbacks[I18n.locale]
+                    .find { |locale| obj[locale] }
+
+                  obj[locale_with_value || I18n.locale]
                 else
                   entity.send(method)
                 end

data/lib/dato/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Dato
-  VERSION = '0.3.15'
+  VERSION = '0.3.16'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dato
 version: !ruby/object:Gem::Version
-  version: 0.3.15
+  version: 0.3.16
 platform: ruby
 authors:
 - Stefano Verna
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-29 00:00:00.000000000 Z
+date: 2017-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler