RubyGems - contentful - Versions diffs - 2.1.0 → 2.1.1 - Mend

contentful 2.1.0 → 2.1.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 (11) hide show

checksums.yaml +4 -4
data/.travis.yml +0 -4
data/CHANGELOG.md +4 -1
data/README.md +1 -1
data/lib/contentful/entry.rb +4 -1
data/lib/contentful/fields_resource.rb +4 -3
data/lib/contentful/resource_builder.rb +5 -1
data/lib/contentful/version.rb +1 -1
data/spec/entry_spec.rb +18 -0
data/spec/fixtures/vcr_cassettes/entry/marshal_138.yml +159 -0
metadata +5 -3

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64ddb906124dfd977570b56271e874dd105bad5d
-  data.tar.gz: dc3c20c1dadf513ef9429ade5c0e7f796c4a5d1e
+  metadata.gz: 523acf1290d29cdeb2972c104b7897a1e41909b2
+  data.tar.gz: 4ed687d95992bac7c04427d244c98e9bc01ce5d4
 SHA512:
-  metadata.gz: ba13149d7dc6794482c5950f2bb563511041731899f0b757d3efc8aeb7557e0e1670b273755b5c0b422efa7c3d7ed03f2343e014c6608541f6311a9d14e09900
-  data.tar.gz: 899dbabd938a143fba8190e3f1bacdf7c6d46482059a9b1370b393f86688a18535e81d33508b13da7e90d7e4c18c34f2f4daeb403832d2f8d7b0b592750e201f
+  metadata.gz: 1cacccbb9ea40372b8bb393d5ccc6e3b8b6fdeaeff9598cecd165e7a353b6b60e4aa6dc64b44756c934abb6de9016ad113df57802ace3d6102ac3dda46c2dbe4
+  data.tar.gz: 692965f112c62b3b9e4d3dfbaf3ca37add478d78526ce53993e3cab8b394e2c0e6debc78ac58120a7ade93772d25ab622c92bd819ccc2afcdd249564ea623151

data/.travis.yml CHANGED Viewed

@@ -3,10 +3,6 @@ rvm:
   - 2.4.0
   - 2.3.1
   - 2.2.1
-  - 2.1.2
-  - 2.1.1
-  - 2.1
-  - 2.0.0
 notifications:
   slack:
     secure: Zr3mKCiTb0vaTD4MPtTG8BbyYyErFuoxioM25QyrqePKVkDFeZC1MtGmg5klQQrJiWTKZPa/zB8NAHYkoUxg9I+z15JK0hYfz9KRubEpCrXCaqTC9Vzq88kJ3LN8YsTyBF66izaBH2KLsOfaJRxwplFzZqgpg4GG2DUBPtrGtes=

data/CHANGELOG.md CHANGED Viewed

@@ -1,6 +1,9 @@
 # Change Log
-## Unreleased
+## 2.1.1
+### Fixed
+* Fixed Marshalling for resources that have deeply nested resources. [#138](https://github.com/contentful/contentful.rb/issues/138)
 ## 2.1.0
 ### Added

data/README.md CHANGED Viewed

@@ -382,6 +382,6 @@ For more information on the internal changes present in the 2.x release, please
 ## License
 Copyright (c) 2014 Contentful GmbH - Jan Lelis.
-Copyright (c) 2016 Contentfuk GmbH - David Litvak.
+Copyright (c) 2016 Contentful GmbH - David Litvak.
 See LICENSE.txt for further details.

data/lib/contentful/entry.rb CHANGED Viewed

@@ -53,7 +53,10 @@ module Contentful
       ResourceBuilder.new(
         resource,
-        @configuration.merge(includes_for_single: includes),
+        @configuration.merge(
+          includes_for_single:
+            @configuration.fetch(:includes_for_single, []) + includes
+        ),
         localized,
         @depth + 1,
         includes

data/lib/contentful/fields_resource.rb CHANGED Viewed

@@ -44,15 +44,16 @@ module Contentful
     def marshal_dump
       {
         configuration: @configuration,
-        raw: raw_with_links
+        raw: raw_with_links,
+        localized: locales.size > 1
       }
     end
     # @private
     def marshal_load(raw_object)
       super(raw_object)
-      localized = raw_object[:raw].fetch('fields', {}).all? { |_, v| v.is_a?(Hash) }
-      @fields = hydrate_fields(localized, [])
+      localized = raw_object[:localized]
+      @fields = hydrate_fields(localized, raw_object[:configuration].fetch(:includes_for_single, []))
       define_fields_methods!
     end

data/lib/contentful/resource_builder.rb CHANGED Viewed

@@ -88,7 +88,7 @@ module Contentful
     end
     def resource_class(item)
-      return fetch_custom_resource_class(item) if %w(Entry Asset).include?(item['sys']['type'])
+      return fetch_custom_resource_class(item) if %w(Entry DeletedEntry Asset DeletedAsset).include?(item['sys']['type'])
       resource_mapping[item['sys']['type']]
     end
@@ -101,6 +101,10 @@ module Contentful
         return fetch_custom_resource_mapping(item, 'Entry', Entry)
       when 'Asset'
         return fetch_custom_resource_mapping(item, 'Asset', Asset)
+      when 'DeletedEntry'
+        return fetch_custom_resource_mapping(item, 'DeletedEntry', DeletedEntry)
+      when 'DeletedAsset'
+        return fetch_custom_resource_mapping(item, 'DeletedAsset', DeletedAsset)
       end
     end

data/lib/contentful/version.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 # Contentful Namespace
 module Contentful
   # Gem Version
-  VERSION = '2.1.0'
+  VERSION = '2.1.1'
 end

data/spec/entry_spec.rb CHANGED Viewed

@@ -174,6 +174,24 @@ describe Contentful::Entry do
         test_dump(Marshal.load(Marshal.dump(nyancat)))
       }
     end
+    it 'can properly marshal multiple level nested resources - #138' do
+      vcr('entry/marshal_138') {
+        parent = create_client(
+          space: 'j8tb59fszch7',
+          access_token: '5f711401f965951eb724ac72ac905e13d892294ba209268f13a9b32e896c8694',
+          dynamic_entries: :auto,
+          max_include_resolution_depth: 5
+        ).entry('5aV3O0l5jU0cwQ2OkyYsyU')
+        rehydrated = Marshal.load(Marshal.dump(parent))
+        expect(rehydrated.childs.first.image1.url).to eq '//images.contentful.com/j8tb59fszch7/7FjliblAmAoGMwU62MeQ6k/62509df90ef4bed38c0701bb9aa8c74c/Funny-Cat-Pictures-with-Captions-25.jpg'
+        expect(rehydrated.childs.first.image2.url).to eq '//images.contentful.com/j8tb59fszch7/1pbGuWZ27O6GMO0OGemgcA/a4185036a3640ad4491f38d8926003ab/Funny-Cat-Pictures-with-Captions-1.jpg'
+        expect(rehydrated.childs.last.image1.url).to eq '//images.contentful.com/j8tb59fszch7/4SXVTr0KEUyWiMMCOaUeUU/c9fa2246d5529a9c8e1ec6f5387dc4f6/e0194eca1c8135636ce0e014341548c3.jpg'
+        expect(rehydrated.childs.last.image2.url).to eq '//images.contentful.com/j8tb59fszch7/1NU1YcNQJGIA22gAKmKqWo/56fa672bb17a7b7ae2773d08e101d059/57ee64921c25faa649fc79288197c313.jpg'
+      }
+    end
   end
   describe 'select operator' do

data/spec/fixtures/vcr_cassettes/entry/marshal_138.yml ADDED Viewed

@@ -0,0 +1,159 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://cdn.contentful.com/spaces/j8tb59fszch7/content_types?limit=1000
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      X-Contentful-User-Agent:
+      - sdk contentful.rb/2.1.0; platform ruby/2.4.1; os macOS/16;
+      Authorization:
+      - Bearer 5f711401f965951eb724ac72ac905e13d892294ba209268f13a9b32e896c8694
+      Content-Type:
+      - application/vnd.contentful.delivery.v1+json
+      Accept-Encoding:
+      - gzip
+      Connection:
+      - close
+      Host:
+      - cdn.contentful.com
+      User-Agent:
+      - http.rb/2.2.2
+  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/"dbd86bc89681ff36b482b61f9acf6336"
+      Server:
+      - Contentful
+      X-Content-Type-Options:
+      - nosniff
+      X-Contentful-Request-Id:
+      - a05a8b0194705bccd7b5e81126f113f8
+      Content-Length:
+      - '458'
+      Accept-Ranges:
+      - bytes
+      Date:
+      - Tue, 25 Jul 2017 20:12:57 GMT
+      Via:
+      - 1.1 varnish
+      Age:
+      - '2178'
+      Connection:
+      - close
+      X-Served-By:
+      - cache-atl6250-ATL
+      X-Cache:
+      - HIT
+      X-Cache-Hits:
+      - '2'
+      X-Timer:
+      - S1501013577.487146,VS0,VE0
+      Vary:
+      - Accept-Encoding
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        H4sIAAAAAAAAA9VVO2/CMBDe+RWR54KSkJCSDVXt1K1MrRhMYoqL86htkALiv/fsPHCiQJ9ShZfkzr73fXeHgWUhUQgUWgf4BUIWOQEKzTjHBQLe8Ua9kZnEDPiupsSG5kDYmmA0oRIox7ZLBpUkURpftMZSb8eMNiVyHClb9YuSaTijGJpZO/VI0w1SRk8HzKebeeX0k9bYeUBjFc/brVz605XYR+tAhVWfY/OvAy0PKmWiNWWxoa7x4y5LJUmlNmtIRZxgSeKZygZybScY2sHQ9efONHQnoe+OJlPv2RTY5vH3BDjZUUGzVKW78rZxG8VU5AwXD5SA16GVbhmrnUMpTnRZ2yGhmIiI01yWKlHjG1opJaciqrS0ylQmiCb4lTithDeW+u7O1hGxLMKM7olyfIWZIGYRESfvW8rPXELYeMnOXGbQm1CSXq1m58yEIPLUF0YvnAvbvRB25+56wq56aqG/VRKuGMA55gDTP0KwH3r2yHNvv4rg8Tj0g5FnOy0BA8HjHyG4E9NvIawHgujv5b679n5oofQ/MFzvGhOlnyyMHQwaGLsw8vR8W1zYJ/ep5HoJ1sfYFm2oALUYHAcfDww1W1AHAAA=
+    http_version:
+  recorded_at: Tue, 25 Jul 2017 20:12:57 GMT
+- request:
+    method: get
+    uri: https://cdn.contentful.com/spaces/j8tb59fszch7/entries?sys.id=5aV3O0l5jU0cwQ2OkyYsyU
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      X-Contentful-User-Agent:
+      - sdk contentful.rb/2.1.0; platform ruby/2.4.1; os macOS/16;
+      Authorization:
+      - Bearer 5f711401f965951eb724ac72ac905e13d892294ba209268f13a9b32e896c8694
+      Content-Type:
+      - application/vnd.contentful.delivery.v1+json
+      Accept-Encoding:
+      - gzip
+      Connection:
+      - close
+      Host:
+      - cdn.contentful.com
+      User-Agent:
+      - http.rb/2.2.2
+  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/"50b10e6946ba58441081ab4010bcc603"
+      Server:
+      - Contentful
+      X-Content-Type-Options:
+      - nosniff
+      X-Contentful-Request-Id:
+      - '041880d53c1bd822f162ee64f21a38f6'
+      Content-Length:
+      - '1171'
+      Accept-Ranges:
+      - bytes
+      Date:
+      - Tue, 25 Jul 2017 20:12:57 GMT
+      Via:
+      - 1.1 varnish
+      Age:
+      - '2173'
+      Connection:
+      - close
+      X-Served-By:
+      - cache-atl6228-ATL
+      X-Cache:
+      - HIT
+      X-Cache-Hits:
+      - '1'
+      X-Timer:
+      - S1501013578.962881,VS0,VE1
+      Vary:
+      - Accept-Encoding
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        H4sIAAAAAAAAA+2Y3W/iOBDA3/evqHg+iO34I+ENVS3a7bVcj7K99rQPxnHAbQgcCYfoqv/7OQ4fgSahzaW70qp5QImTsWfG85vx8P3TyUkjWkWN9sl3fasf4tVM6qdGZz7nq4Yee/4t+SaexjzQ49A8RY9qph+AeQjURMXJK5A+q1hOkgn/NhOm0x6sYlaKZlwkS22+SAczuiQDZnCj0+8qfGwka+4uvXr4eLPWuW9mPPhAeYk5D048JK4fPYkxS6zaXM/be2NnejVSGcK/2j0QkIcBEMtr1Htc3UWrQWb+rWJnYTxfZV+IueSx9DqJXxoIQNYErInIDXTbNmwj2iIM3GcFFjPvbQJz+a+K1DTc7MlaczENYxnGa4/U59rTzLy5Dp7xuV73uGuDqeCBiTAZNgf9jcDW+w1fycDbBWRiV0OMVTqWxlRqa9a4nPhaO6Qkdkzs7qLncBP3YuHuHN3f/BnMuqd9uhx1VpNl/+I0a60GJRtWWR/9UEWJq+iXED+Nou6gv6Tq89md7N6WaLrV+tv6LrUj+f1m+FahCBaezOSI1FMbwneM5+5CLue5X5qtfv1+5dGeqFvKe8k2bajPd2B2Qwu5T0K1lHyAW4yhLPlapJz9XJF8+pPlC/mvw+XFWWDreINqSbjt+bEgGayLzhrAnISQrDbhIwkPykcdNnaiSMYHRWRrHe7/9fVmDi7OBqtbdXl52uMDORi81lyjM/rROsOrAbwTV9dfup87CI06F5OLf26nJTrvSuImI2w2bZfJ9g4N643KK+h17Mg7gZ6f0mvgHLltjFoUvIHzIpEPzn8O5+z8IVDDoDPpTLuXywFFl/KaPpYwsxc2P4nz2bC7uL1HrEe7lz3Q68rJSHRKdH7JuRkxVV9zmybCX7TKFyTFXPpfVoTSKg/amLWgi99Q5QtECun/H3UzVnF6/CZMSopdBAUiPuf61hfMRY4DXSZsaO+VQH0qN1IHR9nFPOkJG5ZlIj5qrU8f/iLQtxMr23RZ+R63CPU5ZWg4hIyzIeMSMWZ7wJEQQA8Q1zqmZ+thNjrs+TwZcxXsNxGbIqWeEkOIjTHN7rYJeWPGCzPNq6Xy4rERNF3u/tUYSzUaJ80eJfDgbbYt2DvYmGkTv17xiWmIqli6f95LDbAeZnKU5T7T5P7SFR3mZ8AaoNb1GZEWdeDroS4SeVeozxdhuGqe8rj5hxLxYi6j5lLFYz0yi/WfBVET1o51rs8tjqFDgE25TTHgHsYu9G3Hc1xEAbD50DquaTWwKWCwEtgUlYLtIFwZ7Gq2fqBtMmTazxc0XjWgbYM2ZPr/uDec1otE3hVtCfSZQgoOhQNtQm0qJNBj2MaQYEfUXq/zPW4J1+cIYeoRglzuCl2opaA+sR3mCexT65ie1bDGLnMrYU0oLq3XlFTGuoqlH1BnoC7osmqAGjltov9kR2+p1wUi7wr10cqASN0FO9/pFkUEuJ7vAunjofRsRwAG4HDocu4IhsXxgq0PSJWO4rbOZ+4ho685ih+p2Bixymi/Yl/yjK1Kd9p369/nT8+f/gNYpN8blBsAAA==
+    http_version:
+  recorded_at: Tue, 25 Jul 2017 20:12:58 GMT
+recorded_with: VCR 3.0.3

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contentful
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Contentful GmbH (Jan Lelis)
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-05-29 00:00:00.000000000 Z
+date: 2017-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -444,6 +444,7 @@ files:
 - spec/fixtures/vcr_cassettes/entry/include_resolution.yml
 - spec/fixtures/vcr_cassettes/entry/json_objects.yml
 - spec/fixtures/vcr_cassettes/entry/json_objects_client.yml
+- spec/fixtures/vcr_cassettes/entry/marshal_138.yml
 - spec/fixtures/vcr_cassettes/entry/marshall.yml
 - spec/fixtures/vcr_cassettes/entry/raw.yml
 - spec/fixtures/vcr_cassettes/entry/select_empty_array.yml
@@ -507,7 +508,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.5.1
+rubygems_version: 2.6.12
 signing_key:
 specification_version: 4
 summary: contentful
@@ -553,6 +554,7 @@ test_files:
 - spec/fixtures/vcr_cassettes/entry/include_resolution.yml
 - spec/fixtures/vcr_cassettes/entry/json_objects.yml
 - spec/fixtures/vcr_cassettes/entry/json_objects_client.yml
+- spec/fixtures/vcr_cassettes/entry/marshal_138.yml
 - spec/fixtures/vcr_cassettes/entry/marshall.yml
 - spec/fixtures/vcr_cassettes/entry/raw.yml
 - spec/fixtures/vcr_cassettes/entry/select_empty_array.yml