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

contentful_middleman 1.4.0 → 1.4.1

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 +6 -1
data/lib/contentful_middleman/mappers/base.rb +11 -3
data/lib/contentful_middleman/version.rb +1 -1
data/spec/contentful_middleman/mappers/base_spec.rb +43 -5
data/spec/fixtures/vcr_fixtures/entries/localized_references.yml +214 -0
metadata +4 -2

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68a030c2034591f7185811846ef7291c2d4737f5
-  data.tar.gz: f7a6f9ac89751ed18e9eceea27685a2afc96afa2
+  metadata.gz: 2dac67d35714c539c1f8049c06e3e040521d27b8
+  data.tar.gz: 98de1a200a81d2404ceb89ee8857317c810b0c75
 SHA512:
-  metadata.gz: 3bc49305a332c10297de0d15b0b55ef5c9ef398c7f1ecb94fcc9772656dbe004b8063e6186d652a26272d370ed47bfc16b8648342386b1001c4b31f01363362d
-  data.tar.gz: 988f0484835b53d7373df49c55e69301f3f7aea24908e875a7117cdcf9fb78a7cf7345bbb8b037eb0c989885e9351cdb5660caa29bcfd72c6b6a09d9922052c7
+  metadata.gz: a8f4d774ab03dfad0faea07cd98591bc00873c1647ca498dc3ae1b26e60198ff934059a92d3835db60fc4271105d15583e6a6ccee64cfc37756c5d12ce03d241
+  data.tar.gz: 852d4db734b37f6613ce305e6c7fd146ab32f09ee379700254209b0e2ceb6c0d11d4899b7521aeb4973e3da1f65954d5f9b2ea1b2dd39132bf6aae89c5e199bf

data/CHANGELOG.md CHANGED Viewed

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

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

@@ -44,10 +44,15 @@ module ContentfulMiddleman
         value.hashize
       when ::Array
         value.map {|element| ensure_primitive_data_types(element)}
+      when ::Hash
+        res = {}
+        value.each do |k, v|
+          res[ensure_primitive_data_types(k)] = ensure_primitive_data_types(v)
+        end
+        res
       else
         value
       end
     end
   end
 end

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

@@ -30,8 +30,16 @@ module ContentfulMiddleman
       end
       def map_field(context, field_name, field_value)
-        value_mapping = map_value(field_value)
-        context.set(field_name, value_mapping)
+        if has_multiple_locales?
+          processed_locales = {}
+          field_value.each do |locale, value|
+            processed_locales[locale] = map_value(value)
+          end
+          context.set(field_name, processed_locales)
+        else
+          value_mapping = map_value(field_value)
+          context.set(field_name, value_mapping)
+        end
       end
       def map_value(value)
@@ -66,7 +74,7 @@ module ContentfulMiddleman
         fields = has_multiple_locales? ? entry.fields_with_locales : entry.fields
         # Prevent entries with no values from breaking the import
-        fields ||= []
+        fields ||= {}
         fields.each {|k, v| map_field context, k, v}
       end

data/lib/contentful_middleman/version.rb CHANGED Viewed

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

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

@@ -62,11 +62,9 @@ describe ContentfulMiddleman::Mapper::Base do
           },
           :image=>{
             :'en-US'=>{
-              "sys"=>{
-                "type"=>"Link",
-                "linkType"=>"Asset",
-                "id"=>"1x0xpXu4pSGS4OukSyWGUK"
-              }
+              :title=>"Doge",
+              :description=>"nice picture",
+              :url=>"//images.contentful.com/cfexampleapi/1x0xpXu4pSGS4OukSyWGUK/cc1239c6385428ef26f4180190532818/doge.jpg"
             }
           },
           :description=>{
@@ -78,6 +76,46 @@ describe ContentfulMiddleman::Mapper::Base do
         expect(context.hashize).to eq(expected)
       end
+      it 'maps entries with multiple locales with nested resources' do
+        vcr('entries/localized_references') {
+          subject = described_class.new entries, OptionsDouble.new(cda_query: {locale: '*'})
+          expect(context.hashize).to eq({})
+          expected = {
+            :id=>"42kEjzNj9mIci2eyGOISiQ",
+            :image=>{
+              :'en-US'=>{
+                title: "image-view-1139205 960 720",
+                description: nil,
+                url: "//images.contentful.com/1sjfpsn7l90g/6Rloj9MIxOwg0w2kqCaWS2/464b740a98d711905545f77d56fa3b2b/image-view-1139205_960_720.jpg"
+              },
+              :es=>{
+                title: "background-image-967820 960 720",
+                description: nil,
+                url: "//images.contentful.com/1sjfpsn7l90g/2WGPppy4laAWWgUiWG02SA/3951271109e19ae45b21bb044b24b3ec/background-image-967820_960_720.jpg"
+              },
+              :zh=>{
+                title: "image-view-1139204 960 720",
+                description: nil,
+                url: "//images.contentful.com/1sjfpsn7l90g/6zkhmrCizKuQUG0UmYKe4W/a8f90059b5bfd620791814f2c3edfaa4/image-view-1139204_960_720.jpg"
+              }
+            }
+          }
+          client = Contentful::Client.new(
+            space: '1sjfpsn7l90g',
+            access_token: 'e451a3cdfced9000220be41ed9c899866e8d52aa430eaf7c35b09df8fc6326f9',
+            dynamic_entries: :auto
+          )
+          entries = client.entries(locale: '*')
+          subject.map(context, entries.first)
+          expect(context.hashize).to eq(expected)
+        }
+      end
     end
   end

data/spec/fixtures/vcr_fixtures/entries/localized_references.yml ADDED Viewed

@@ -0,0 +1,214 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://cdn.contentful.com/spaces/1sjfpsn7l90g/content_types?limit=1000
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - RubyContentfulGem/1.0.0
+      Authorization:
+      - Bearer e451a3cdfced9000220be41ed9c899866e8d52aa430eaf7c35b09df8fc6326f9
+      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:
+      - '"a684f9ee6d6e80804ecfc6ad741f3b28"'
+      Server:
+      - Contentful
+      X-Content-Type-Options:
+      - nosniff
+      - nosniff
+      X-Contentful-Request-Id:
+      - eaef9f65adddf842356893d4ff94a061
+      Content-Length:
+      - '809'
+      Accept-Ranges:
+      - bytes
+      Date:
+      - Thu, 29 Sep 2016 22:30:25 GMT
+      Via:
+      - 1.1 varnish
+      Age:
+      - '4828'
+      Connection:
+      - close
+      X-Served-By:
+      - cache-gru7124-GRU
+      X-Cache:
+      - HIT
+      X-Cache-Hits:
+      - '1'
+      X-Timer:
+      - S1475188225.132636,VS0,VE0
+      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": "1sjfpsn7l90g"
+                  }
+                },
+                "id": "test",
+                "type": "ContentType",
+                "createdAt": "2016-09-29T14:46:41.071Z",
+                "updatedAt": "2016-09-29T14:46:41.071Z",
+                "revision": 1
+              },
+              "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: Thu, 29 Sep 2016 22:30:25 GMT
+- request:
+    method: get
+    uri: https://cdn.contentful.com/spaces/1sjfpsn7l90g/entries?locale=*
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - RubyContentfulGem/1.0.0
+      Authorization:
+      - Bearer e451a3cdfced9000220be41ed9c899866e8d52aa430eaf7c35b09df8fc6326f9
+      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/"d74db949e37697354c70ebc8d3ac5301"
+      Server:
+      - Contentful
+      X-Content-Type-Options:
+      - nosniff
+      - nosniff
+      X-Contentful-Request-Id:
+      - 5a58a9b54ff533c49bab5b96f4654c08
+      Content-Length:
+      - '880'
+      Accept-Ranges:
+      - bytes
+      Date:
+      - Thu, 29 Sep 2016 22:30:25 GMT
+      Via:
+      - 1.1 varnish
+      Age:
+      - '4828'
+      Connection:
+      - close
+      X-Served-By:
+      - cache-gru7120-GRU
+      X-Cache:
+      - HIT
+      X-Cache-Hits:
+      - '21'
+      X-Timer:
+      - S1475188225.757896,VS0,VE0
+      Vary:
+      - Accept-Encoding
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        H4sIAAAAAAAAA+2WXW/aMBSG7/srUK4HsR0nwb1DVYWqbu06itA2VVVCHDAk
+        ISOhDCr++2yHgCEhoxtrVWm5gPjj2Ofj9eM8n9VqWrJItPPaM3/ljXQRU97S
+        WtOps9B43+qDmJNOUifg/VC2kjGLeQPIRsBCloohkLVZSkOx4He5YLbs3i5y
+        pyR2+mKrfEbWqfgiOmRn7tNHFo01sef24btH4/u1zx254t4E5olwYDLy4ySy
+        AwIGIqr8WW3eZZzZo2U2GI0vR8ubEQmv+gzRRfv2qsPulPU3jl1G6XShDvSn
+        1Emp1xJ50RCAVh2QOiL3EJ+bxrmJGwayv6kGs9h7mcGUPrGETaK8JmvP+5Mo
+        pVG6zsjpUnuhrFua4JQm6YHErvO6SbDmMxp4W80J1zUWOoOCGmhU73b2JFIi
+        pXXsFTKRMt0KpZUkNN0TivBBSsX6EkxG5NPVz9v5AMzR+MeF0+sgNTZ+KFQJ
+        qfnQ6G5cMjb1gK0lJrpP5C/qtT/H8QIHTqvXG3RZrw1Qp3Wsv8vhq+d3OR6G
+        0wu2vJ7dddugG369prhX4e/2iOZKkv+iBg+SQCzqBzNPybyWFThn0JZCpcUo
+        JVHpTFnN48tWxqONzA4RqUpcmUAPFHxHhhuMF5SuVbMJWQ1sQZVN3ONqOpWa
+        qHzaFlBhbAkERHJZGuxjgHfnINBcpz8eTCezyKtLYtSJZTcRqBEL1GwEdgi0
+        kxCfVa2rglIWeTYVt52m63KXpLHmqj8L+Guoq8XTy+uhG8SEyIYQEAqJQ7Hp
+        Iui6AGMXYdegff1ALI88lkceS2MUD4qM8mjqsKAIGel1wpYiecjEBjF2MS3H
+        yyArBuTgnHmpgAHfumjKx4eUDYbiQuMTFPxl1ioQRY9ym66XFwW4cUL5cfFH
+        ke9ebVks+iimO/f53ukpoiMPbVvxEjy/NyIcuLJORgQTk5cSoWjyj4iQYeCJ
+        0XkdQoMgYL4pDMpLoWMLuzYGDml6HAkEmCY2fdv2TMt3DBe5GWfqahin4AA0
+        kFk8zMdxgGOoaKpywMJ/y4Fi7aqD/o8ACdMduOZfreVfVSdDALatlyKgaPJa
+        CMBvi4DSUuhO0ycAmMQ1Xd+zELAJbELso75BPd9xcBEBuPo0HPMpAA3YtN4V
+        An4T9GkQIL8LHvjv6mx19gvB1oxYBREAAA==
+    http_version:
+  recorded_at: Thu, 29 Sep 2016 22:30:25 GMT
+recorded_with: VCR 3.0.3

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contentful_middleman
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Sascha Konietzke
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-09-26 00:00:00.000000000 Z
+date: 2016-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -239,6 +239,7 @@ files:
 - spec/fixtures/space_hash_fixtures/.foo-space-hash
 - 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/nil_file.yml
 - spec/fixtures/vcr_fixtures/helpers/preview.yml
 - spec/fixtures/vcr_fixtures/instance/entries_1.yml
@@ -300,6 +301,7 @@ test_files:
 - spec/fixtures/space_hash_fixtures/.foo-space-hash
 - 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/nil_file.yml
 - spec/fixtures/vcr_fixtures/helpers/preview.yml
 - spec/fixtures/vcr_fixtures/instance/entries_1.yml