RubyGems - contentful_middleman - Versions diffs - 1.4.1 → 1.4.2 - Mend

contentful_middleman 1.4.1 → 1.4.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

checksums.yaml +4 -4
data/CHANGELOG.md +4 -0
data/lib/contentful_middleman/commands/context.rb +4 -0
data/lib/contentful_middleman/mappers/base.rb +16 -10
data/lib/contentful_middleman/version.rb +1 -1
data/spec/contentful_middleman/mappers/base_spec.rb +36 -0
data/spec/fixtures/vcr_fixtures/entries/localized_references_localized_assets.yml +214 -0
metadata +4 -2

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2dac67d35714c539c1f8049c06e3e040521d27b8
-  data.tar.gz: 98de1a200a81d2404ceb89ee8857317c810b0c75
+  metadata.gz: 4803cd6c6ea14906e4ed4d4a533d9ddb11d262b3
+  data.tar.gz: f3706b7c56d6f84723efb1a56cd42d757a07c8e9
 SHA512:
-  metadata.gz: a8f4d774ab03dfad0faea07cd98591bc00873c1647ca498dc3ae1b26e60198ff934059a92d3835db60fc4271105d15583e6a6ccee64cfc37756c5d12ce03d241
-  data.tar.gz: 852d4db734b37f6613ce305e6c7fd146ab32f09ee379700254209b0e2ceb6c0d11d4899b7521aeb4973e3da1f65954d5f9b2ea1b2dd39132bf6aae89c5e199bf
+  metadata.gz: df23abc8d6ced3f47311cc19f0b8cb929c37854fdf628813dff8652215ee2ceda1febc7e06d53a42e86686018652835741f02b79ce5fa92cd32e8cc86f0cfd09
+  data.tar.gz: 60fb4dc515c2d4d9a034752f8f6138f95b911b5baa6cea976a080c01e23c9b7003ca960eadb0a869da21380bf4a01e9b935830dbc12c68ef3fd3d1bb2623216f

data/CHANGELOG.md CHANGED

@@ -1,6 +1,10 @@
 # Change Log
 ## Unreleased
+## 1.4.2
+### Fixed
+* Fix localized resource serialization for localized Assets[#95](https://github.com/contentful/contentful_middleman/issues/95)
 ## 1.4.1
 ### Fixed
 * Fix localized resource serialization[#95](https://github.com/contentful/contentful_middleman/issues/95)

data/lib/contentful_middleman/commands/context.rb CHANGED

@@ -23,6 +23,10 @@ module ContentfulMiddleman
       @variables.fetch(name.to_sym)
     end
+    def has?(name)
+      @variables.key?(name)
+    end
     def is_a?(klass)
       Context == klass
     end

data/lib/contentful_middleman/mappers/base.rb CHANGED

@@ -33,7 +33,7 @@ module ContentfulMiddleman
         if has_multiple_locales?
           processed_locales = {}
           field_value.each do |locale, value|
-            processed_locales[locale] = map_value(value)
+            processed_locales[locale] = map_value(value, locale.to_s)
           end
           context.set(field_name, processed_locales)
         else
@@ -42,10 +42,10 @@ module ContentfulMiddleman
         end
       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
@@ -53,17 +53,23 @@ module ContentfulMiddleman
         when Contentful::DynamicEntry
           map_entry(value)
         when Array
-          map_array(value)
+          map_array(value, locale)
         else
           value
         end
       end
-      def map_asset(asset)
+      def map_asset(asset, locale = nil)
         context = Context.new
-        context.title = asset.title
-        context.description = asset.description
-        context.url = asset.file.url unless asset.file.nil?
+        if locale
+          context.title = asset.fields(locale)[:title]
+          context.description = asset.fields(locale)[:description]
+          context.url = asset.fields(locale)[:file].url unless asset.fields(locale)[:file].nil?
+        end
+        context.title = asset.title unless context.has?(:title) && !context.title.nil?
+        context.description = asset.description unless context.has?(:description) && !context.description.nil?
+        context.url = asset.file.url unless asset.file.nil? || (context.has?(:url) && !context.url.nil?)
         context
       end
@@ -100,8 +106,8 @@ module ContentfulMiddleman
         context
       end
-      def map_array(array)
-        array.map {|element| map_value(element)}
+      def map_array(array, locale = nil)
+        array.map {|element| map_value(element, locale)}
       end
     end
   end

data/lib/contentful_middleman/version.rb CHANGED

@@ -1,3 +1,3 @@
 module ContentfulMiddleman
-  VERSION = "1.4.1"
+  VERSION = "1.4.2"
 end

data/spec/contentful_middleman/mappers/base_spec.rb CHANGED

@@ -116,6 +116,42 @@ describe ContentfulMiddleman::Mapper::Base do
           expect(context.hashize).to eq(expected)
         }
       end
+      it 'maps entries with multiple locales with nested resources that are also localized' do
+        vcr('entries/localized_references_localized_assets') {
+          subject = described_class.new entries, OptionsDouble.new(cda_query: {locale: '*'})
+          expect(context.hashize).to eq({})
+          expected = {
+            id: "2HjFERK39eeCYegCayUkMK",
+            image: {
+              :"en-US" => {
+                title: "EN Title",
+                description: "EN Description",
+                url: "//assets.contentful.com/bht13amj0fva/14bZJKTr6AoaGyeg4kYiWq/13f00bdf75c1320061ce471a3881e831/Flag_of_the_United_States.svg"
+              },
+              es: {
+                title: "ES Title",
+                description: "ES Description",
+                url: "//assets.contentful.com/bht13amj0fva/14bZJKTr6AoaGyeg4kYiWq/5501c98c296af77b9acba1146ea3e211/Flag_of_Spain.svg"
+              }
+            }
+          }
+          client = Contentful::Client.new(
+            space: 'bht13amj0fva',
+            access_token: 'bb703a05e107148bed6ee246a9f6b3678c63fed7335632eb68fe1b689c801534',
+            dynamic_entries: :auto
+          )
+          entry = client.entries(locale: '*').first
+          subject.map(context, entry)
+          expect(entry.image.id).to eq(entry.fields('es')[:image].id)
+          expect(context.hashize).to eq(expected)
+        }
+      end
     end
   end

data/spec/fixtures/vcr_fixtures/entries/localized_references_localized_assets.yml ADDED

@@ -0,0 +1,214 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://cdn.contentful.com/spaces/bht13amj0fva/content_types?limit=1000
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - RubyContentfulGem/1.0.1
+      Authorization:
+      - Bearer bb703a05e107148bed6ee246a9f6b3678c63fed7335632eb68fe1b689c801534
+      Content-Type:
+      - application/vnd.contentful.delivery.v1+json
+      Accept-Encoding:
+      - gzip
+      Connection:
+      - close
+      Host:
+      - cdn.contentful.com
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Access-Control-Allow-Headers:
+      - Accept,Accept-Language,Authorization,Cache-Control,Content-Length,Content-Range,Content-Type,DNT,Destination,Expires,If-Match,If-Modified-Since,If-None-Match,Keep-Alive,Last-Modified,Origin,Pragma,Range,User-Agent,X-Http-Method-Override,X-Mx-ReqToken,X-Requested-With,X-Contentful-Version,X-Contentful-Content-Type,X-Contentful-Organization,X-Contentful-Skip-Transformation,X-Contentful-User-Agent
+      Access-Control-Allow-Methods:
+      - GET,HEAD,OPTIONS
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Expose-Headers:
+      - Etag
+      Access-Control-Max-Age:
+      - '86400'
+      Cache-Control:
+      - max-age=0
+      Content-Type:
+      - application/vnd.contentful.delivery.v1+json
+      Etag:
+      - '"79ff2349ce217bd8393ccf0929f39692"'
+      Server:
+      - Contentful
+      Strict-Transport-Security:
+      - max-age=0
+      X-Content-Type-Options:
+      - nosniff
+      - nosniff
+      X-Contentful-Request-Id:
+      - a946bc1a0976f80a014f06d1a9ee246b
+      Content-Length:
+      - '809'
+      Accept-Ranges:
+      - bytes
+      Date:
+      - Wed, 05 Oct 2016 14:33:01 GMT
+      Via:
+      - 1.1 varnish
+      Age:
+      - '0'
+      Connection:
+      - close
+      X-Served-By:
+      - cache-gru7120-GRU
+      X-Cache:
+      - MISS
+      X-Cache-Hits:
+      - '0'
+      X-Timer:
+      - S1475677981.403335,VS0,VE335
+      Vary:
+      - Accept-Encoding
+    body:
+      encoding: ASCII-8BIT
+      string: |
+        {
+          "sys": {
+            "type": "Array"
+          },
+          "total": 1,
+          "skip": 0,
+          "limit": 1000,
+          "items": [
+            {
+              "sys": {
+                "space": {
+                  "sys": {
+                    "type": "Link",
+                    "linkType": "Space",
+                    "id": "bht13amj0fva"
+                  }
+                },
+                "id": "test",
+                "type": "ContentType",
+                "createdAt": "2016-10-05T14:29:07.531Z",
+                "updatedAt": "2016-10-05T14:31:56.190Z",
+                "revision": 2
+              },
+              "displayField": null,
+              "name": "Test",
+              "description": "",
+              "fields": [
+                {
+                  "id": "image",
+                  "name": "image",
+                  "type": "Link",
+                  "localized": true,
+                  "required": false,
+                  "disabled": false,
+                  "omitted": false,
+                  "linkType": "Asset"
+                }
+              ]
+            }
+          ]
+        }
+    http_version:
+  recorded_at: Wed, 05 Oct 2016 14:33:01 GMT
+- request:
+    method: get
+    uri: https://cdn.contentful.com/spaces/bht13amj0fva/entries?locale=*
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - RubyContentfulGem/1.0.1
+      Authorization:
+      - Bearer bb703a05e107148bed6ee246a9f6b3678c63fed7335632eb68fe1b689c801534
+      Content-Type:
+      - application/vnd.contentful.delivery.v1+json
+      Accept-Encoding:
+      - gzip
+      Connection:
+      - close
+      Host:
+      - cdn.contentful.com
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Access-Control-Allow-Headers:
+      - Accept,Accept-Language,Authorization,Cache-Control,Content-Length,Content-Range,Content-Type,DNT,Destination,Expires,If-Match,If-Modified-Since,If-None-Match,Keep-Alive,Last-Modified,Origin,Pragma,Range,User-Agent,X-Http-Method-Override,X-Mx-ReqToken,X-Requested-With,X-Contentful-Version,X-Contentful-Content-Type,X-Contentful-Organization,X-Contentful-Skip-Transformation,X-Contentful-User-Agent
+      Access-Control-Allow-Methods:
+      - GET,HEAD,OPTIONS
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Expose-Headers:
+      - Etag
+      Access-Control-Max-Age:
+      - '86400'
+      Cache-Control:
+      - max-age=0
+      Content-Encoding:
+      - gzip
+      Content-Type:
+      - application/vnd.contentful.delivery.v1+json
+      Etag:
+      - W/"9eb6afcb4d25e10d50af4c9240520a51"
+      Server:
+      - Contentful
+      Strict-Transport-Security:
+      - max-age=0
+      X-Content-Type-Options:
+      - nosniff
+      - nosniff
+      X-Contentful-Request-Id:
+      - d623eaae9eb80e5eaaec79eecc075d97
+      Content-Length:
+      - '695'
+      Accept-Ranges:
+      - bytes
+      Date:
+      - Wed, 05 Oct 2016 14:33:02 GMT
+      Via:
+      - 1.1 varnish
+      Age:
+      - '0'
+      Connection:
+      - close
+      X-Served-By:
+      - cache-gru7124-GRU
+      X-Cache:
+      - MISS
+      X-Cache-Hits:
+      - '0'
+      X-Timer:
+      - S1475677981.908967,VS0,VE168
+      Vary:
+      - Accept-Encoding
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        H4sIAAAAAAAAA8VVTY/aMBC98yuQry3ETiAf3BBlW5V2DwVU7VYrZBKH9ZIE
+        mpjVpiv+e20nISYkUVm1qi/xOLZn5s1749dOtwuSNAGj7iufcoOle8ItMI5j
+        nAK+dnwv9rAdwwFfR9JKtnTPDSiNgIaUiV8wsykjobjwh7wwu7biRXpK9tgV
+        rood2aISi1iQi0VMX2i0BcJnObj3aLvIY57LGysbqCfSWT8yZODwCfrPWGRV
+        jONpLvPMBsjO6J+ebqbfZoZDyOSObCY4XW6/zpT7T4FNIxan6g83JpgRbyxw
+        ATpEZg/BHhwu0GBk6CNo9S3DuVcPHPbedQdi8kwTuouKmuSRu7uIkYjliPw9
+        aCfKvbUAM5KwBmBzXE8AA5+SwCs5J0IHNMSbCzaQqLecVyhSQ6U89xaaSJqW
+        RBknCWEVoogYJFXQYH3/ebaIzfEOf0zJZrC9o99/qrlxUagUUvEA5DwvmZsq
+        sJxiYvl/xVtSvqiM/IqcHqSiaeQGB0/JBGSAFZouVV2bXK2ya3dKdP4chjp9
+        n8rWpPC2YrUW/Kysp7Z4wRzQpnU0Msw+tHVV6zziNrU3HFH1XhZQ6Vk1ohLg
+        UhZUZcWXC2GB6W13IbdURC2LD6bz/G8j3TlL3JjuWdaJ1H5T8fJB2djkS93T
+        6NGnbQmdRyCgjsWzBTQNi8ol/bxB+oeAT0NNZY2GapWvIcOHcO351tBFhg6h
+        iVwysBA2bBsR20DaTYA3q52/Yo9ktYz4++et5oy386SfPG8u24xHGKbBZZ/I
+        egX9JeplO46CgJTnOWo8NYHELQ7lc31lCOfPRNZ8NR7su5cwqHS6umL9C5SH
+        Q4hcx3Z1x8S+Za0d7K4xQgOTYIPoqESZdwEavR1ZE+rD4ZuwbXF8BZ4qsUsh
+        57PsXXng1rFz7PwG7Hlx6Z4JAAA=
+    http_version:
+  recorded_at: Wed, 05 Oct 2016 14:33:02 GMT
+recorded_with: VCR 3.0.3

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contentful_middleman
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Sascha Konietzke
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-10-04 00:00:00.000000000 Z
+date: 2016-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -240,6 +240,7 @@ files:
 - spec/fixtures/space_hash_fixtures/.foobar-space-hash
 - spec/fixtures/space_hash_fixtures/.my_space-space-hash
 - spec/fixtures/vcr_fixtures/entries/localized_references.yml
+- spec/fixtures/vcr_fixtures/entries/localized_references_localized_assets.yml
 - spec/fixtures/vcr_fixtures/entries/nil_file.yml
 - spec/fixtures/vcr_fixtures/helpers/preview.yml
 - spec/fixtures/vcr_fixtures/instance/entries_1.yml
@@ -302,6 +303,7 @@ test_files:
 - spec/fixtures/space_hash_fixtures/.foobar-space-hash
 - spec/fixtures/space_hash_fixtures/.my_space-space-hash
 - spec/fixtures/vcr_fixtures/entries/localized_references.yml
+- spec/fixtures/vcr_fixtures/entries/localized_references_localized_assets.yml
 - spec/fixtures/vcr_fixtures/entries/nil_file.yml
 - spec/fixtures/vcr_fixtures/helpers/preview.yml
 - spec/fixtures/vcr_fixtures/instance/entries_1.yml