contentful 2.15.1 → 2.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8c85b0c13bf08766561d80cf44766dc7c3d52d6cd230bbd33df53bee3347293
-  data.tar.gz: 3a652af950c5af6dc28c2c7d1962d64e067bc46b927aec8817ed9feb0561d187
+  metadata.gz: 2baecd9654f25b0d6291acd51d7d1d7c1005d07ce25e388ac3a8786235c3c9db
+  data.tar.gz: eb783626bf3ea0561a02a0d95b228457fbf9f4c22fea2778f1d06de00375b15e
 SHA512:
-  metadata.gz: 2680b3032848974c5e186f11a413ccd67c3bf84cad1d6905ab23128f2d1df3f21baa0fcf8b9600b37412a92f7b0f20b67e797f6a0bc5135dd31761e292afef8e
-  data.tar.gz: 03304dfea1de0c7467e465cf71b87fd091bd2556ad3d0b11cd1766f04925726e19fbc33288a26e9c8bbbc2dca083e11ba958a3222bfd29f9b57ae9748f969271
+  metadata.gz: 1db162611a6a9049f04f5b1bdd35b14e20c0faebd716884efe3a69e8462ff641ce55f334d71ba509218ccb3979433f5e50390988151f257f7d4996bc4bfd475f
+  data.tar.gz: 060ea401389077fcc4f654e2f5888b24137adb0b484495caaf6cc2c5a0c3ca05165749aa84258e7b439902873acd5524d81c43d25935e4c6aff34c559806ffb3

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 2.15.2
+### Fixed
+* Fixed unresolvable single linked entries and assets returning a JSON Link rather than being `nil`, the same way they are filtered from Link arrays.
+
 ## 2.15.1
 ### Fixed
 * Fixed how `entry_mapping` is cached in order to avoid errors when deserializing resources that have been serialized with previously deleted mapping classes. [#212](https://github.com/contentful/contentful.rb/issues/212)

data/lib/contentful/entry.rb

@@ -17,7 +17,8 @@ module Contentful
     private
 
     def coerce(field_id, value, includes, errors, entries = {})
-      if Support.link?(value) && !Support.unresolvable?(value, errors)
+      if Support.link?(value)
+        return nil if Support.unresolvable?(value, errors)
         return build_nested_resource(value, includes, entries, errors)
       end
       return coerce_link_array(value, includes, errors, entries) if Support.link_array?(value)

data/lib/contentful/version.rb

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

data/spec/entry_spec.rb

@@ -486,6 +486,17 @@ describe Contentful::Entry do
   end
 
   describe 'issues' do
+    it 'filters out unresolvable assets' do
+      vcr('entries/unresolvable_assets') {
+        client = create_client(space: 'facgnwwgj5fe', access_token: '4d0f55d940975f78139daae5d965b463c0816e88ad16062d2c1ee3d6cb930521')
+        entry = client.entry('gLVzQlb09IeOeU181fwtz')
+
+        expect(entry.single_asset).to be_nil
+        expect(entry.multi_asset.size).to eq 1
+        expect(entry.raw["fields"]["multiAsset"].size).to eq 2
+      }
+    end
+
     it 'Symbol/Text field with null values should be serialized as nil - #117' do
       vcr('entries/issue_117') {
         client = create_client(space: '8jbbayggj9gj', access_token: '4ce0108f04e55c76476ba84ab0e6149734db73d67cd1b429323ef67f00977e07')

data/spec/fixtures/vcr_cassettes/entries/unresolvable_assets.yml

@@ -0,0 +1,89 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://cdn.contentful.com/spaces/facgnwwgj5fe/environments/master/entries?sys.id=gLVzQlb09IeOeU181fwtz
+    body:
+      encoding: UTF-8
+      string: ''
+    headers:
+      X-Contentful-User-Agent:
+      - sdk contentful.rb/2.15.1; platform ruby/2.6.3; os macOS/18;
+      Authorization:
+      - Bearer 4d0f55d940975f78139daae5d965b463c0816e88ad16062d2c1ee3d6cb930521
+      Content-Type:
+      - application/vnd.contentful.delivery.v1+json
+      Accept-Encoding:
+      - gzip
+      Connection:
+      - close
+      Host:
+      - cdn.contentful.com
+      User-Agent:
+      - http.rb/4.2.0
+  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:
+      - 7df33faa-1d21-4dea-83e9-9ebda5f47ba9
+      Cf-Organization-Id:
+      - 4SsuxQCaMaemfIms52Jr8s
+      Cf-Space-Id:
+      - facgnwwgj5fe
+      Content-Encoding:
+      - gzip
+      Content-Type:
+      - application/vnd.contentful.delivery.v1+json
+      Contentful-Api:
+      - cda_cached
+      Etag:
+      - W/"14036385179019726604"
+      Server:
+      - Contentful
+      X-Content-Type-Options:
+      - nosniff
+      X-Contentful-Region:
+      - us-east-1
+      Content-Length:
+      - '832'
+      Accept-Ranges:
+      - bytes
+      Date:
+      - Thu, 19 Dec 2019 09:54:02 GMT
+      Via:
+      - 1.1 varnish
+      Age:
+      - '0'
+      Connection:
+      - close
+      X-Served-By:
+      - cache-ams21023-AMS
+      X-Cache:
+      - MISS
+      X-Cache-Hits:
+      - '0'
+      Vary:
+      - Accept-Encoding
+      X-Contentful-Request-Id:
+      - e8767cee-9cbe-46be-8fab-47d35d6c5db7
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        H4sIAAAAAAAAA81WW2+bMBR+769APK8J5NbSt25r127VqqZJq22qIgMHYkoMwiZZWuW/zxdIHEpINk3TUBRhG5/znet3Xo8Mw6RLap4Zr/yVL9gyBb4yz7MMLU2+t3onvmEJQzHft+WKPuOULyy5iPEMM3FkqTVmMBMCf0iBSmxFi9REU+QJVeUXalPDIjbkZonpBpNnU+jcPFw7eR4VmO+lxMoH2BfmBMgLyWIRRv0AhFXls1q/SzvVY6o74c3Dy13sWs413MLYPrWDBXvRxK9xXRCWLfUDLwPEwD8XbjE7lu0c251j2xlZzlnf5r9Wtzf4rl/IU//3LgCZ4ywhMyBCx34XKotmiDLIqh461L0Xms69LsxgjilOSJkzhWe9hDCOuYjYftyHYvugya1NgJykuRtjOuVhoRQY3Z8FceKhWBYDkOPxfXlhnShmgCH2N7UjTDQZZurOeKPQKDRqGUYxCWOQ+wfF71A/KIm1HhhEEXr46OZkNIiW6PLh5+XYuRrvd8MsjxkukaqiVsHUo1dT4EXEG5DL5rEp3zrs/BOVup34PWTzG5/ln/E1HV4NrShiCx09b1V6Vuo++KdIH++6wym6fQzpt9GXr/e9IB/M4waga9BPxZsyQ/w/yQYLWZZkh3RU5SmSsCHQJJ4jl2eilnNlJKS8t9nsA0M4rqZz0VorrbcxbgdFrDBSwdtNEv+XSc0lVI0bJl6c+6CRa7WKNnm5RcJF5dQR5N+oszqaXNfZLqJsqK4i3vV5r5fhZriQfW/rqIEye5w1rVZ/YOuUyQE3kOauK7tpc7djG6iTXzq8ve2gzybH1pOoaJv11FRMa0X+1NCTAFwS1Kck9oEYGbAMwxwyg88snJWMFIfUCJKkEqAAS16rtNI8E1Oh2W7jGQqBtjwWIEmvLQKsrSdTuzY/2l3PPUXd7kkHen3/xHVcO+gg1wPUCzpgn1ptBXOyhjlRMCcC5kTAbEVpWB1p6npZWVX4Rdjh2J2T7jZPihoQVryxUhL7Avtsyo/6asxV0sp/cwo4nAoqH/QdjYXEuc5KWwGSYoVbv6KZHDP+yNTtiUpZ0I5SCHcw+xbJCMpZHa2OfgEgI0mYCAwAAA==
+    http_version: 
+  recorded_at: Thu, 19 Dec 2019 09:54:02 GMT
+recorded_with: VCR 5.0.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contentful
 version: !ruby/object:Gem::Version
-  version: 2.15.1
+  version: 2.15.2
 platform: ruby
 authors:
 - Contentful GmbH (Jan Lelis)
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-29 00:00:00.000000000 Z
+date: 2019-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -455,6 +455,7 @@ files:
 - spec/fixtures/vcr_cassettes/entries/rich_text_hydration_issue.yml
 - spec/fixtures/vcr_cassettes/entries/rich_text_nested_fields.yml
 - spec/fixtures/vcr_cassettes/entries/rich_text_unresolved_relationships.yml
+- spec/fixtures/vcr_cassettes/entries/unresolvable_assets.yml
 - spec/fixtures/vcr_cassettes/entries/unresolvable_filter.yml
 - spec/fixtures/vcr_cassettes/entries/unresolvable_filter_deeply_nested.yml
 - spec/fixtures/vcr_cassettes/entry.yml
@@ -604,6 +605,7 @@ test_files:
 - spec/fixtures/vcr_cassettes/entries/rich_text_hydration_issue.yml
 - spec/fixtures/vcr_cassettes/entries/rich_text_nested_fields.yml
 - spec/fixtures/vcr_cassettes/entries/rich_text_unresolved_relationships.yml
+- spec/fixtures/vcr_cassettes/entries/unresolvable_assets.yml
 - spec/fixtures/vcr_cassettes/entries/unresolvable_filter.yml
 - spec/fixtures/vcr_cassettes/entries/unresolvable_filter_deeply_nested.yml
 - spec/fixtures/vcr_cassettes/entry.yml