contentful_middleman 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d3cf9d63abb5e3bf74efca714827687e72ee6db
-  data.tar.gz: 609b5a7b692b432baeac066758c943201ca6a49a
+  metadata.gz: ee66e9f9a3bd4d95df237d74d9e4e112e2bf3ea3
+  data.tar.gz: 59ce9a704e69c4b5b0c96f82dd5b4e6debe15a92
 SHA512:
-  metadata.gz: 85ebc4e4256b007c9fc3e61a5fb3abfd41eb051cc0f04ee0ecc0471d0f2a02ec878bb5c0d15688dfefbc62b24cb542e107abe027e78c548970b2d205b7cd933f
-  data.tar.gz: 1e135095400bc614778e93253abb36bb2ede7e8532f06776e48694ba9968a0e48f732ab91effddef3c869a0aac0fc998ef42f205904fe652807709f7c70973b2
+  metadata.gz: ac290f4886ea33f87d16b720f9e8ced955524b883a2c7351a4684effb3bae691d015a8d95431ee04e37065d211a26e88fe2333d1c359ef2dbbef20fd83336dcc
+  data.tar.gz: df49b31585e907db09bff424e86c51a3608ce40a97fc4aa9a8e295682e20a277cbcf6ffab7fe731c592bf4e70d67b7b253f769f7ab5f14404f18be5266caa88e

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Change Log
 ## Unreleased
 
+## 2.1.2
+### Fixed
+* `localize` helpers now properly serialized nested resources [#131](https://github.com/contentful/contentful_middleman/pull/131)
+
 ## 2.1.1
 ### Fixed
 * `localize` helpers now properly serialize `_meta` attributes [#124](https://github.com/contentful/contentful_middleman/issues/124) [#128](https://github.com/contentful/contentful_middleman/issues/128)

data/examples/mappers/backref.rb

@@ -48,7 +48,7 @@ def self.BackrefMapper(content_type_id, content_type_field, backref_field)
 
     def map(context, entry)
       super
-      content_type_entries = @entries.select { |e| e.sys[:contentType].id == @@content_type_id }
+      content_type_entries = @entries.select { |e| e.sys[:content_type].id == @@content_type_id }
       referencing_entries = content_type_entries.select{ |e| e.send(@@content_type_field).map{|x| x.id}.include? entry.id }
       referencing_ids = referencing_entries.map{ |e| e.id }
       context.set(@@backref_field, map_value(referencing_ids))

data/lib/contentful_middleman/helpers.rb

@@ -1,3 +1,4 @@
+require 'thor/core_ext/hash_with_indifferent_access'
 require 'contentful_middleman/tools/preview_proxy'
 
 module ContentfulMiddleman
@@ -7,7 +8,7 @@ module ContentfulMiddleman
     end
 
     def localize_entry(entry, locale, fallback_locale='en-US')
-      localized_entry = {}
+      localized_entry = ::Thor::CoreExt::HashWithIndifferentAccess.new
       entry.each do |field, value|
         localized_entry[field] = localize(entry, field, locale, fallback_locale)
       end
@@ -28,10 +29,11 @@ module ContentfulMiddleman
     end
 
     def localize_value(value, locale, fallback_locale='en-US')
-      if value.respond_to? :fetch
-        return value.fetch(locale) if value.key? locale
-        return value.fetch(fallback_locale) if value.key? fallback_locale
-      end
+      value = value.fetch(locale) if value.respond_to?(:fetch) && value.respond_to?(:key?) && value.key?(locale)
+      value = value.fetch(fallback_locale) if value.respond_to?(:fetch) && value.respond_to?(:key?) && value.key?(fallback_locale)
+
+      return localize_array(value, locale, fallback_locale) if value.is_a? ::Array
+      return localize_entry(value, locale, fallback_locale) if value.is_a? ::Hash
       value
     end
 

data/lib/contentful_middleman/version.rb

@@ -1,3 +1,3 @@
 module ContentfulMiddleman
-  VERSION = "2.1.1"
+  VERSION = "2.1.2"
 end

data/spec/contentful_middleman/helpers_spec.rb

@@ -22,7 +22,42 @@ describe ContentfulMiddleman::Helpers do
           'es' => 'foobar',
           'en-US' => 'baz'
         }
-      ]
+      ],
+      nested_array: {
+        'en-US' => [
+          {
+            id: 'foo',
+            _meta: {
+              id: 'foo'
+            },
+            name: {
+              'es' => 'foo',
+              'en-US' => 'bar'
+            }
+          }, {
+            id: 'foo',
+            _meta: {
+              id: 'foo'
+            },
+            name: {
+              'en-NZ' => 'bar',
+              'en-US' => 'foo'
+            },
+          }
+        ]
+      },
+      nested_hash: {
+        'en-US' => {
+          id: 'foo',
+          _meta: {
+            id: 'foo'
+          },
+          name: {
+            'es' => 'foo',
+            'en-US' => 'bar'
+          }
+        }
+      }
     }
   end
 
@@ -92,11 +127,38 @@ describe ContentfulMiddleman::Helpers do
       end
 
       it '#localize_entry' do
-        expect(subject.localize_entry(entry, 'es')).to eq({
-          _meta: { id: 'foo' },
-          value_field: 'foo',
-          array_field: ['foobar']
+        localized_entry = subject.localize_entry(entry, 'es')
+        expect(localized_entry).to eq({
+          '_meta' => { 'id' => 'foo' },
+          'value_field' => 'foo',
+          'array_field' => ['foobar'],
+          'nested_array' => [
+            {
+              'id' => 'foo',
+              '_meta' => {
+                'id' => 'foo'
+              },
+              'name' => 'foo'
+            }, {
+              'id' => 'foo',
+              '_meta' => {
+                'id' => 'foo'
+              },
+              'name' => 'foo'
+            }
+          ],
+          'nested_hash' => {
+            'id' => 'foo',
+            '_meta' => {
+              'id' => 'foo'
+            },
+            'name' => 'foo'
+          }
         })
+
+        expect(localized_entry[:_meta]).to eq({ 'id' => 'foo' })
+        expect(localized_entry[:nested_array][0][:id]).to eq('foo')
+        expect(localized_entry[:nested_hash][:id]).to eq('foo')
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contentful_middleman
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Sascha Konietzke
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-12 00:00:00.000000000 Z
+date: 2017-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -297,7 +297,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Include mangablable content from the Contentful CMS and API into your Middleman