RubyGems - contentful - Versions diffs - 2.13.2 → 2.13.3 - Mend

contentful 2.13.2 → 2.13.3

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/array.rb +3 -1
data/lib/contentful/fields_resource.rb +1 -1
data/lib/contentful/version.rb +1 -1
data/spec/array_spec.rb +26 -0
data/spec/fixtures/vcr_cassettes/array/marshal_unpublished.yml +315 -0
metadata +4 -2

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a64b9fa9568c2d2a26ff203279e1a38241acc5faa7fb06cd748e4c67b9d786c
-  data.tar.gz: 7833adc9a98931215a6a01a6463a20ee7fef2f15debff96c9b825b371fbaeb3d
+  metadata.gz: 769988762e5d05e6732adafc3a34e25ddb05bb400f8095ac22e58214ffb1d87b
+  data.tar.gz: 2a0d52533d6d0fb85b3565aef3eaf17300cce71aab610fb822e2bb6bd3a167d1
 SHA512:
-  metadata.gz: 583e43111095e7aedcddbd92727d603d2302b60d8fedab98cb77af53dc47e1b937800c736b2cc25960d870476489c2678fa6023941f81a9bd0ec327d2f7ab914
-  data.tar.gz: fe4173f920702c5ca6d2699de67720b59e8263b627d3ab6e804d64e63e69f9d8c453ddff69fdf03471d742cee5708bb4c882c447571aa22c836b40b6ef091cf0
+  metadata.gz: 9b9c166d8697fe28733f0224f2af8e0fa7d00471a2c8ce385aa8d762427d5405a91ced44173f5bacf3226bf4eb6f94d68be99c11172bb6f7f3cfd52ab330cb60
+  data.tar.gz: b7d577d79b2c7ee318a88aa63592fa1b0e15670b3fe159108a4919e501bd15c8e54ad9753463c560934288f4ee448bbf688be11c4ae5761f87b0b9cbd20d62d0

data/CHANGELOG.md CHANGED

@@ -2,6 +2,10 @@
 ## Unreleased
+## 2.13.3
+### Fixed
+* Fixed unfiltered unresolvable entries and assets from re-marshalled entries. [#207](https://github.com/contentful/contentful.rb/pull/207)
 ## 2.13.2
 ### Fixed
 * Removed unnecessary object dups and moved some static arrays that were regenerated each time to constants.

data/lib/contentful/array.rb CHANGED

@@ -44,7 +44,9 @@ module Contentful
         ResourceBuilder.new(
           item.raw,
           raw_object[:configuration].merge(includes_for_single: Support.includes_from_response(raw, false)),
-          item.respond_to?(:localized) ? item.localized : false
+          item.respond_to?(:localized) ? item.localized : false,
+          0,
+          raw_object[:configuration][:errors] || []
         ).run
       end
     end

data/lib/contentful/fields_resource.rb CHANGED

@@ -110,8 +110,8 @@ module Contentful
     end
     def hydrate_nonlocalized_fields(includes, errors, entries)
-      result = { locale => {} }
       locale = internal_resource_locale
+      result = { locale => {} }
       raw['fields'].each do |name, value|
         name = Support.snakify(name, @configuration[:use_camel_case])
         result[locale][name.to_sym] = coerce(

data/lib/contentful/version.rb CHANGED

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

data/spec/array_spec.rb CHANGED

@@ -118,5 +118,31 @@ describe Contentful::Array do
         expect(dehydrated.first.inspect).to eq "<CustomClass[parent] id='5aV3O0l5jU0cwQ2OkyYsyU'>"
       }
     end
+    it 'filters out unpublished resources after rehydration' do
+      vcr('array/marshal_unpublished') {
+        parent = create_client(
+          space: 'z3eix6mwjid2',
+          access_token: '9047c4394a2130dff8e9dc544a7a3ec299703fdac8e52575eb5a6678be06c468',
+          dynamic_entries: :auto
+        ).entries('sys.id': '5Etc0jWzIWwMeSu4W0SCi8')
+        rehydrated = Marshal.load(Marshal.dump(parent))
+        expect(rehydrated.first.children).to be_empty
+        preview_parent = create_client(
+          space: 'z3eix6mwjid2',
+          access_token: '38153b942011a70b5482fda61c6a3a9d22f5e8a512662dac00fcf7eb344b75f4',
+          dynamic_entries: :auto,
+          api_url: 'preview.contentful.com'
+        ).entries('sys.id': '5Etc0jWzIWwMeSu4W0SCi8')
+        preview_rehydrated = Marshal.load(Marshal.dump(preview_parent))
+        expect(preview_rehydrated.first.children).not_to be_empty
+        expect(preview_rehydrated.first.children.first.title).to eq 'Child'
+      }
+    end
   end
 end

data/spec/fixtures/vcr_cassettes/array/marshal_unpublished.yml ADDED

@@ -0,0 +1,315 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://cdn.contentful.com/spaces/z3eix6mwjid2/environments/master/content_types?limit=1000
+    body:
+      encoding: UTF-8
+      string: ''
+    headers:
+      X-Contentful-User-Agent:
+      - sdk contentful.rb/2.13.2; platform ruby/2.5.1; os macOS/18;
+      Authorization:
+      - Bearer 9047c4394a2130dff8e9dc544a7a3ec299703fdac8e52575eb5a6678be06c468
+      Content-Type:
+      - application/vnd.contentful.delivery.v1+json
+      Accept-Encoding:
+      - gzip
+      Connection:
+      - close
+      Host:
+      - cdn.contentful.com
+      User-Agent:
+      - http.rb/4.1.1
+  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,X-Contentful-Enable-Alpha-Feature
+      Access-Control-Allow-Methods:
+      - GET,HEAD,OPTIONS
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Expose-Headers:
+      - Etag
+      Access-Control-Max-Age:
+      - '86400'
+      Cf-Environment-Id:
+      - master
+      Cf-Environment-Uuid:
+      - af9a7896-4d98-4865-a9e6-640c4e1bbc34
+      Cf-Organization-Id:
+      - 4SsuxQCaMaemfIms52Jr8s
+      Cf-Space-Id:
+      - z3eix6mwjid2
+      Content-Encoding:
+      - gzip
+      Content-Type:
+      - application/vnd.contentful.delivery.v1+json
+      Contentful-Api:
+      - cda_cached
+      Etag:
+      - W/"615557992524905107"
+      Server:
+      - Contentful
+      X-Content-Type-Options:
+      - nosniff
+      X-Contentful-Region:
+      - us-east-1
+      Content-Length:
+      - '473'
+      Accept-Ranges:
+      - bytes
+      Date:
+      - Thu, 12 Sep 2019 15:05:30 GMT
+      Via:
+      - 1.1 varnish
+      Age:
+      - '0'
+      Connection:
+      - close
+      X-Served-By:
+      - cache-eze19321-EZE
+      X-Cache:
+      - MISS
+      X-Cache-Hits:
+      - '0'
+      Vary:
+      - Accept-Encoding
+      X-Contentful-Request-Id:
+      - 00f39ca9-52aa-43ba-bc7d-3389d267a120
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        H4sIAAAAAAAAA+VUO2/CMBDe+RXIc0EhtOWxIUSnDpVgasVgEqNecZzUNrQB8d97dh7EKBQqVZUqvCR353t9/u52jWaTqFSRYXOHvyjoNGEokZGUNCWo29+YOzrWlKPet5JaQYKCZwUOEWiUOp6XKUCzyER8sRGzuEdpbCqV0MDkKm5kykoxRmGVRVGPIFbEJD0cTC9Ws7zoqY14dAFC08+2y+DzPvp4g9A3bRVnX/7bRrNDMp+ESiZ0JV5ZyDgWGk02b8UtkIxqFo4MHMT3Ov1Wx2t1ejNvMOzeDn2v7fu956rDOgnPOfQdByY2IGMRmbouQS5rJKJKM3kMzKWoTio5zyIn2QYUxMIQIr9cAktCUAmn6QMwbh9Fg+YHAImgkeXek4s7CZkKJCQ6C0vKPsjSBDpQzTyeQ6asezeLuVRmmjkFWFOByjSNFjF3MCM8DiiHLTPFLylXrEo1Itn7GuQJI7ZOF/yEMcYJQt4UUesoWdNX8Ao8RIa6NRYgjmut7ng75f9Rc07OYlVUuzsz7xt8ARwa5IJ9+Pk362AitLQ7rDiVYc+1c/vNGfqPV5Xlwq9tqu5d2x8MfrCpahyuYlPZITvso+tdVO44oTRv7Btf4t85pl4IAAA=
+    http_version:
+  recorded_at: Thu, 12 Sep 2019 15:05:30 GMT
+- request:
+    method: get
+    uri: https://cdn.contentful.com/spaces/z3eix6mwjid2/environments/master/entries?sys.id=5Etc0jWzIWwMeSu4W0SCi8
+    body:
+      encoding: UTF-8
+      string: ''
+    headers:
+      X-Contentful-User-Agent:
+      - sdk contentful.rb/2.13.2; platform ruby/2.5.1; os macOS/18;
+      Authorization:
+      - Bearer 9047c4394a2130dff8e9dc544a7a3ec299703fdac8e52575eb5a6678be06c468
+      Content-Type:
+      - application/vnd.contentful.delivery.v1+json
+      Accept-Encoding:
+      - gzip
+      Connection:
+      - close
+      Host:
+      - cdn.contentful.com
+      User-Agent:
+      - http.rb/4.1.1
+  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,X-Contentful-Enable-Alpha-Feature
+      Access-Control-Allow-Methods:
+      - GET,HEAD,OPTIONS
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Expose-Headers:
+      - Etag
+      Access-Control-Max-Age:
+      - '86400'
+      Cf-Environment-Id:
+      - master
+      Cf-Environment-Uuid:
+      - af9a7896-4d98-4865-a9e6-640c4e1bbc34
+      Cf-Organization-Id:
+      - 4SsuxQCaMaemfIms52Jr8s
+      Cf-Space-Id:
+      - z3eix6mwjid2
+      Content-Encoding:
+      - gzip
+      Content-Type:
+      - application/vnd.contentful.delivery.v1+json
+      Contentful-Api:
+      - cda_cached
+      Etag:
+      - W/"5995236694422390602"
+      Server:
+      - Contentful
+      X-Content-Type-Options:
+      - nosniff
+      X-Contentful-Region:
+      - us-east-1
+      Content-Length:
+      - '452'
+      Accept-Ranges:
+      - bytes
+      Date:
+      - Thu, 12 Sep 2019 15:05:31 GMT
+      Via:
+      - 1.1 varnish
+      Age:
+      - '0'
+      Connection:
+      - close
+      X-Served-By:
+      - cache-eze19322-EZE
+      X-Cache:
+      - MISS
+      X-Cache-Hits:
+      - '0'
+      Vary:
+      - Accept-Encoding
+      X-Contentful-Request-Id:
+      - d0aafe1f-1ad3-4318-b0b3-cd9cbbfba3ff
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        H4sIAAAAAAAAA41UTW+CQBC9+yvMnqtZQK16I4ZDk5q0xcakjYctbNMVWMiyatH437sfgCs1IAfDzO7Me/Ocx6nX74O8yMG8fxKvIuBFhkUEXMZQAUTu/CDv8JSjWOQtFeURyUQAVRCThHB5BHVMOE5kw0/VULdtoCikPEOBhKpu6KTBRSZUsuL0TGgEJOblEeg0WpWcfdWxcYGEcpyjg8nvJDlsSWjLqarnXL+rOfUDdM3Y4wHcro9P68MS+7vRGvoLMjX618Q8yllhHgQMI45DV+oCbGhNBxYcWI8rOJs74zm0h87I/jALdlnYUmA5QzibXBVguicspQmmEqNbQz1SgnKOWVOie/X1DMxODRnek5ykVLCzDWmDlHLBufzLunnfy21h9L25ARliUqtO3nEaoFhZANPBu18V1OsBvgmOw4tj5MoATriuedEo5sA/JA4FdO0IvWPm5DfcUS5iy/TKeZfdb67g9SZvLep6+QS9LpOph+yd5/peZGohfH5TmU2Z1afyd6NMjxlL2T0u13tHU/6G8zTeoy+hk6FONaDq91/rEHNE4qbYpd0bn4NWOSpLtwphDNk79/4AE+L2WxwFAAA=
+    http_version:
+  recorded_at: Thu, 12 Sep 2019 15:05:31 GMT
+- request:
+    method: get
+    uri: https://preview.contentful.com/spaces/z3eix6mwjid2/environments/master/content_types?limit=1000
+    body:
+      encoding: UTF-8
+      string: ''
+    headers:
+      X-Contentful-User-Agent:
+      - sdk contentful.rb/2.13.2; platform ruby/2.5.1; os macOS/18;
+      Authorization:
+      - Bearer 38153b942011a70b5482fda61c6a3a9d22f5e8a512662dac00fcf7eb344b75f4
+      Content-Type:
+      - application/vnd.contentful.delivery.v1+json
+      Accept-Encoding:
+      - gzip
+      Connection:
+      - close
+      Host:
+      - preview.contentful.com
+      User-Agent:
+      - http.rb/4.1.1
+  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,X-Contentful-Enable-Alpha-Feature
+      Access-Control-Allow-Methods:
+      - GET,HEAD,OPTIONS
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Expose-Headers:
+      - Etag
+      Access-Control-Max-Age:
+      - '1728000'
+      Cf-Environment-Id:
+      - master
+      Cf-Environment-Uuid:
+      - af9a7896-4d98-4865-a9e6-640c4e1bbc34
+      Cf-Organization-Id:
+      - 4SsuxQCaMaemfIms52Jr8s
+      Cf-Space-Id:
+      - z3eix6mwjid2
+      Content-Encoding:
+      - gzip
+      Content-Type:
+      - application/vnd.contentful.delivery.v1+json
+      Contentful-Api:
+      - cpa
+      Date:
+      - Thu, 12 Sep 2019 15:05:31 GMT
+      Etag:
+      - W/"17838756496079127115"
+      Server:
+      - Contentful
+      X-Content-Type-Options:
+      - nosniff
+      X-Contentful-Request-Id:
+      - 1a8fb386d633e0e10bb136d7ccae0a3c
+      Content-Length:
+      - '491'
+      Connection:
+      - Close
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        H4sIAAAAAAAAA+VWO0/DMBDe+ysqz1Al6YOGDaEyMSC1E6iDSYw46jjBdgtp1f/O2WkSu7S8BgawKsV3du67+3KPbjrdLlGlIufdDW5R0GXBUCIXUtKSoG57Yu7oXFOO+shKagEFCoEVOGSgUQqDoFKAZpmxeGctVnb3YCyUKmhisOobldJxxiissnbqGsSCGNB2IbxYzHZOT63FvQuQmnjWfQavo+zlCdLIhFWvbbO3gVarAbzMhWZCW/vOcWUyeQSeumrJVqAgF4YM53YiGdUsvTAkkSgIx6dhcBqezYL4vD/AX288HN66dpZF+tELw14Ux94LTKxA5iJDV7/EZ+V/RpVmcp+ur3I9cTAP87nTNrySFFTBaXkFDHlDLjRo3vJKBM1s6l16vJKUqURCoStiSeMveTB22kQzn85LpSpKH8RcaoBmHr49qqOfltl9zj1uCM8TymHNjO8PlCvmJhqR7HkJ8sghRk7v+ZHDHOsH86O22ibkbje3zx2Nf7ecCipN/jqF86N6Cse9eDD6Rj1FQS+Kxn+4nm58Yv9xQbW5daBR2HaOKegXvdeU3p3609LrB7/ULTzMevK60X0yPlfY0nDaYHO1nXTu2rPDvZ2uE6Gl/UtQL2d2+q0KpXln23kDbfbADF4IAAA=
+    http_version:
+  recorded_at: Thu, 12 Sep 2019 15:05:32 GMT
+- request:
+    method: get
+    uri: https://preview.contentful.com/spaces/z3eix6mwjid2/environments/master/entries?sys.id=5Etc0jWzIWwMeSu4W0SCi8
+    body:
+      encoding: UTF-8
+      string: ''
+    headers:
+      X-Contentful-User-Agent:
+      - sdk contentful.rb/2.13.2; platform ruby/2.5.1; os macOS/18;
+      Authorization:
+      - Bearer 38153b942011a70b5482fda61c6a3a9d22f5e8a512662dac00fcf7eb344b75f4
+      Content-Type:
+      - application/vnd.contentful.delivery.v1+json
+      Accept-Encoding:
+      - gzip
+      Connection:
+      - close
+      Host:
+      - preview.contentful.com
+      User-Agent:
+      - http.rb/4.1.1
+  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,X-Contentful-Enable-Alpha-Feature
+      Access-Control-Allow-Methods:
+      - GET,HEAD,OPTIONS
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Expose-Headers:
+      - Etag
+      Access-Control-Max-Age:
+      - '1728000'
+      Cf-Environment-Id:
+      - master
+      Cf-Environment-Uuid:
+      - af9a7896-4d98-4865-a9e6-640c4e1bbc34
+      Cf-Organization-Id:
+      - 4SsuxQCaMaemfIms52Jr8s
+      Cf-Space-Id:
+      - z3eix6mwjid2
+      Content-Encoding:
+      - gzip
+      Content-Type:
+      - application/vnd.contentful.delivery.v1+json
+      Contentful-Api:
+      - cpa
+      Date:
+      - Thu, 12 Sep 2019 15:05:32 GMT
+      Etag:
+      - W/"12271069325331278122"
+      Server:
+      - Contentful
+      X-Content-Type-Options:
+      - nosniff
+      X-Contentful-Request-Id:
+      - b6099fa706cf83cf6c377b6b25ef1da5
+      Content-Length:
+      - '550'
+      Connection:
+      - Close
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        H4sIAAAAAAAAA61VTW+CMBi++ytMz9MUFKfcjOGwZCZbcDHZ4qGBLqtCIVC36eJ/Xz/4KKSgB3tQ3tK+n8/z8DcYDkF+yoE7/OOP3GCnFHMLLLMMnQDfuzyIMyxhKOL7lrTyA0m5AaURkZgw8QoqmzAcC4cf0qFy24oiI+UpCkSo8oTa1HIRG3KzzOmZ0AMQMevFo9PDpsjZlx5bB0goyjlPMPmdxT97EtqiqnJdqmdZp1pVQI+y7KQ5BMqZ47EA7rfnp+3PGvvH6Rb6KzLXzwUJZZiyIrH7VbjS/BrrTFHG416vMMPfJCcJ5b2xtcKDDCOGw6WYJ7ChNR9ZcGQ9buDCnUxdZzq2nNm7XugxDTsvOK41GcPFY+MCpt8kS2gssrxl9qrjMcoZztqjvRUXnhbz6uyjJECRpACmoze/bGUFD/BJcBTWjBGQAYwwdedF9V9v6ReJQj6UihEKYzomDOxoAdGAfMm8GvttqBYOCsDuLbr08hl6XcdzD9lHb+l7Bx0lnOfGzuyKXfVW/O4k6QkNomOINeFQCZS0r4lvLM5IfuNJ1d6C4NfbYJIAkW6vCLSK14nVKQWVU8fc24aTbjm4R83dolAlGQgQ9sy7ka2mDVLRywX61MFxoTN24FQnOw/frw9wPp4sYOtKt0J0N6tHJfilHp3gb5ssqtVJq7wPIB16UXw4CxoaNEPkVarGqjmekorqX1DwMrgM/gHeBX0nrAcAAA==
+    http_version:
+  recorded_at: Thu, 12 Sep 2019 15:05:33 GMT
+recorded_with: VCR 5.0.0

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contentful
 version: !ruby/object:Gem::Version
-  version: 2.13.2
+  version: 2.13.3
 platform: ruby
 authors:
 - Contentful GmbH (Jan Lelis)
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-07-26 00:00:00.000000000 Z
+date: 2019-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -433,6 +433,7 @@ files:
 - spec/fixtures/json_responses/unparsable.json
 - spec/fixtures/vcr_cassettes/array.yml
 - spec/fixtures/vcr_cassettes/array/marshal_custom_classes.yml
+- spec/fixtures/vcr_cassettes/array/marshal_unpublished.yml
 - spec/fixtures/vcr_cassettes/array/nested_resources.yml
 - spec/fixtures/vcr_cassettes/arrayField.yml
 - spec/fixtures/vcr_cassettes/array_page_1.yml
@@ -579,6 +580,7 @@ test_files:
 - spec/fixtures/json_responses/unparsable.json
 - spec/fixtures/vcr_cassettes/array.yml
 - spec/fixtures/vcr_cassettes/array/marshal_custom_classes.yml
+- spec/fixtures/vcr_cassettes/array/marshal_unpublished.yml
 - spec/fixtures/vcr_cassettes/array/nested_resources.yml
 - spec/fixtures/vcr_cassettes/arrayField.yml
 - spec/fixtures/vcr_cassettes/array_page_1.yml