dato 0.3.17 → 0.3.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5312e73132db1c3e40025457a136c2a19277c678
-  data.tar.gz: 841bf4766c9ccdf46e579ae90404db20030638c4
+  metadata.gz: 45883210ac90fc2276bd26e334681558f175918f
+  data.tar.gz: 2a821e2b293057fc1a0675a0df829225f2a3c75b
 SHA512:
-  metadata.gz: 5ce372671115413972baa6db2fef3eef123e18445604f13f2f376dade987c1dcf8c85486e203eda7edfa27f38718104b3259da6c7b9f0204673dd4a9316e8b5d
-  data.tar.gz: 7fceeea2f83645aecee686869e3531725ff1b8f7b97409274625b940df62f3d8b2bcfce70f7e65fe632445188c87d48afe2397ecbc50ce180f3bda9fc0aa2f16
+  metadata.gz: ba2db4547fc55b31a9baf71098551bc11e9d35ffd39f3ab7b3362eb1e2a9864dc86cb72f25de02bb2f6d54a16f55e8ad4b23486e9fe9af6553dea2d86cde6ab2
+  data.tar.gz: 5e6b1d9fcfc323182fcbba4d3d17f50762494fb91686bf0d2b502ca4b596ef94c77fa1c312ba7b4db359b36a0f2732573d496875c4acaa090956308e964c8698

data/lib/dato/local/item.rb

@@ -2,6 +2,7 @@
 require 'forwardable'
 require 'active_support/inflector/transliterate'
 require 'active_support/hash_with_indifferent_access'
+require 'dato/utils/locale_value'
 
 Dir[File.dirname(__FILE__) + '/field_type/*.rb'].each do |file|
   require file
@@ -125,11 +126,7 @@ module Dato
 
         value = if field.localized
                   obj = entity.send(method) || {}
-
-                  locale_with_value = I18n.fallbacks[I18n.locale]
-                    .find { |locale| obj[locale] }
-
-                  obj[locale_with_value || I18n.locale]
+                  Utils::LocaleValue.find(obj)
                 else
                   entity.send(method)
                 end

data/lib/dato/local/site.rb

@@ -2,6 +2,7 @@
 require 'forwardable'
 require 'active_support/inflector/transliterate'
 require 'active_support/hash_with_indifferent_access'
+require 'dato/utils/locale_value'
 
 module Dato
   module Local
@@ -56,10 +57,7 @@ module Dato
         value = if localized
                   obj = entity.send(method) || {}
 
-                  locale_with_value = I18n.fallbacks[I18n.locale]
-                    .find { |locale| obj[locale] }
-
-                  obj[locale_with_value || I18n.locale]
+                  Utils::LocaleValue.find(obj)
                 else
                   entity.send(method)
                 end

data/lib/dato/utils/locale_value.rb

@@ -0,0 +1,14 @@
+require 'i18n/backend/fallbacks'
+
+module Dato
+  module Utils
+    module LocaleValue
+      def self.find(obj)
+        locale_with_value = I18n.fallbacks[I18n.locale]
+          .find { |locale| obj[locale] }
+
+        obj[locale_with_value || I18n.locale]
+      end
+    end
+  end
+end

data/lib/dato/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dato
 version: !ruby/object:Gem::Version
-  version: 0.3.17
+  version: 0.3.18
 platform: ruby
 authors:
 - Stefano Verna
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-07 00:00:00.000000000 Z
+date: 2017-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -433,6 +433,7 @@ files:
 - lib/dato/upload/file.rb
 - lib/dato/upload/image.rb
 - lib/dato/utils/favicon_tags_builder.rb
+- lib/dato/utils/locale_value.rb
 - lib/dato/utils/meta_tags/article_modified_time.rb
 - lib/dato/utils/meta_tags/article_publisher.rb
 - lib/dato/utils/meta_tags/base.rb