jekyll-contentful-data-import 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a023acf8f4a522069e34d5a64bb70bc4be81cf01
-  data.tar.gz: f8eceedfbc009522bb3e8142a7ab0f9b66367bb2
+  metadata.gz: 1cf5c41ca9aca767ca77b9d1442959f64ced7e01
+  data.tar.gz: 4bc77e0deb86dec284616db98a4f7f6cf203767d
 SHA512:
-  metadata.gz: 7cd71f3134d5c1ca3987b009c4b239ea0b49ab9e73d327ffeb86cf7e3734e921f13acc2b1271ca399bbf3b6b9e382f89c4dbe0f363dd8f69b4125079b5ff5c05
-  data.tar.gz: b31cf5afb8989d8ffb313352328deb6b6894ea30075693083aae7cc8c359857dbe860f7b86adcc05fa2e8626a4933d52c4a4cd24f71cbcd561c415cdbbcb697e
+  metadata.gz: 4334226a3e39567e23bfd2954312adc08f6178f777fedb0ad822d9f7e8c8e85754fcaf33381fb08aeb9b8bc4a25895cc19cd2e24d5a2b90f1c8b8c155f25af10
+  data.tar.gz: 07bcd6073b737c35f42e4bef68e8fb37df92e029b1d8cf85a31ed41fa44f3db7d99371b3a01e17a264ac4bd1774bfe07dec1853be6acdb3e555d52b217398e29

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## v1.4.2
+### Fixed
+* Fixed localization issues for included assets [#29](https://github.com/contentful/jekyll-contentful-data-import/issues/29)
+
 ## v1.4.1
 ### Changed
 * Changed `Location` fields to use strings as keys instead of symbols to make it consistent with the rest of the serialization

data/lib/jekyll-contentful-data-import/mappers/base.rb

@@ -29,7 +29,7 @@ module Jekyll
           fields = has_multiple_locales? ? entry.fields_with_locales : entry.fields
 
           fields.each do |k, v|
-            name, value = map_field k, v
+            name, value = map_field(k, v)
             result[name] = value
           end
 
@@ -41,14 +41,24 @@ module Jekyll
         end
 
         def map_field(field_name, field_value)
-          value_mapping = map_value(field_value)
+          value_mapping = nil
+
+          if has_multiple_locales?
+            value_mapping = {}
+            field_value.each do |locale, value|
+              value_mapping[locale.to_s] = map_value(value, locale.to_s)
+            end
+          else
+            value_mapping = map_value(field_value)
+          end
+
           return field_name.to_s, value_mapping
         end
 
-        def map_value(value)
+        def map_value(value, locale = nil)
           case value
           when ::Contentful::Asset
-            map_asset(value)
+            map_asset(value, locale)
           when ::Contentful::Location
             map_location(value)
           when ::Contentful::Link
@@ -56,13 +66,13 @@ module Jekyll
           when ::Contentful::DynamicEntry
             map_entry(value)
           when ::Array
-            map_array(value)
+            map_array(value, locale)
           when ::Symbol
             value.to_s
           when ::Hash
             result = {}
             value.each do |k, v|
-              result[k.to_s] = map_value(v)
+              result[k.to_s] = map_value(v, locale)
             end
             result
           else
@@ -70,8 +80,26 @@ module Jekyll
           end
         end
 
-        def map_asset(asset)
-          {'title' => asset.title, 'url' => asset.file.url}
+        def map_asset(asset, locale = nil)
+          if locale
+            file = asset.fields(locale)[:file]
+            file_url = file.nil? ? '' : file.url
+
+            return {
+              'title' => asset.fields(locale)[:title],
+              'description' => asset.fields(locale)[:description],
+              'url' => file_url
+            }
+          end
+
+          file = asset.file
+          file_url = file.nil? ? '' : file.url
+
+          {
+            'title' => asset.title,
+            'description' => asset.description,
+            'url' => file_url
+          }
         end
 
         def map_entry(child)
@@ -90,8 +118,8 @@ module Jekyll
           {'sys' => {'id' => link.id}}
         end
 
-        def map_array(array)
-          array.map {|element| map_value(element)}
+        def map_array(array, locale)
+          array.map {|element| map_value(element, locale)}
         end
       end
     end

data/lib/jekyll-contentful-data-import/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Contentful
-    VERSION = "1.4.1"
+    VERSION = "1.4.2"
   end
 end

data/spec/jekyll-contentful/mappers/base_spec.rb

@@ -33,10 +33,25 @@ describe Jekyll::Contentful::Mappers::Base do
       end
 
       class AssetDouble < Contentful::Asset
-        attr_reader :title, :file
-        def initialize(title, url)
+        attr_reader :title, :description, :file
+        def initialize(title, description, url, fields = nil)
           @title = title
+          @description = description
           @file = FileDouble.new(url)
+          @fields = {
+            'en-US' => {
+              title: title,
+              description: description,
+              file: file
+            }
+          } if fields.nil?
+
+          @fields ||= fields
+        end
+
+        def fields(locale = nil)
+          return { title: title, description: description, file: file } if locale.nil?
+          @fields[locale]
         end
       end
 
@@ -66,7 +81,7 @@ describe Jekyll::Contentful::Mappers::Base do
 
       it 'maps a complete entry' do
         entry = EntryDouble.new('foo', ContentTypeDouble.new, {
-          'asset' => AssetDouble.new('some_title', 'some_url'),
+          'asset' => AssetDouble.new('some_title', 'foo', 'some_url'),
           'location' => LocationDouble.new(12.32, 43.34),
           'link' => LinkDouble.new('bar'),
           'entry' => EntryDouble.new('baz'),
@@ -83,6 +98,7 @@ describe Jekyll::Contentful::Mappers::Base do
           'sys' => { 'id' => 'foo' },
           'asset' => {
             'title' => 'some_title',
+            'description' => 'foo',
             'url' => 'some_url'
           },
           'location' => {
@@ -129,5 +145,45 @@ describe Jekyll::Contentful::Mappers::Base do
         expect(mapper.map).to match expected
       end
     end
+
+    describe '#29 - Assets should pull the correct locale if the field is localized' do
+      it 'should fetch the correct locale for the asset' do
+        config = {'cda_query' => { 'locale' => '*' } }
+        fields = {
+          'en-US' => {
+            'asset' => AssetDouble.new('some_title', 'foo', 'some_url')
+          },
+          'de-DE' => {
+            'asset' => AssetDouble.new('some_title', 'foo', 'some_url', {
+                'de-DE' => {
+                  title: 'other_title',
+                  description: 'other description',
+                  file: FileDouble.new('other_url')
+                }
+            })
+          }
+        }
+        entry = EntryDouble.new('foo', ContentTypeDouble.new, fields, true)
+        mapper = described_class.new(entry, config)
+
+        expected = {
+          'sys' => { 'id' => 'foo' },
+          'asset' => {
+            "en-US" => {
+              "title" => "some_title",
+              "description" => "foo",
+              "url" => 'some_url'
+            },
+            "de-DE" => {
+              "title" => "other_title",
+              "description" => "other description",
+              "url" => 'other_url'
+            }
+          }
+        }
+
+        expect(mapper.map).to match expected
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-contentful-data-import
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Contentful GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-23 00:00:00.000000000 Z
+date: 2016-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll