RubyGems - contentful - Versions diffs - 2.9.1 → 2.9.2 - Mend

contentful 2.9.1 → 2.9.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/README.md +0 -5
data/lib/contentful/coercions.rb +8 -3
data/lib/contentful/version.rb +1 -1
data/spec/entry_spec.rb +44 -0
data/spec/fixtures/vcr_cassettes/entries/structured_text_nested_fields.yml +167 -0
metadata +4 -2

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98009b534c8ea22dbfa1f4b1192aa715b8ead44425dbaf71ee2523ed67ec9202
-  data.tar.gz: 1a0f6a62fcc889d813d9e4d3ea603c37bfc09744a7d77541fc00bfbf0c9134b3
+  metadata.gz: '086e72b9a7ea3bbc5921407727c14aff220358887fea2bb80180a7e33a977b8e'
+  data.tar.gz: 5580a3b84e07ee8346c6b0cbce69fcc7b65d749a091ccc2abc859ca37f3f0708
 SHA512:
-  metadata.gz: 9347ad13c5afd28b1da636e2468acf097c139175d3399eaae93cd627c7868d53d2c334b5a8a78c8f2ed2d91c656a1a46565a35f44f1297262b906dec7873e3b3
-  data.tar.gz: ec4acb6965b3e9c2a7dcd8a9045ac5fa8f02edb8a0e2a15fb2213e18c7837e798fb47a892f4df1fe909c68154520cd015e55dc8a27be51ec6180231e8af854bb
+  metadata.gz: 3417c39de8d5432d4b61590812ba6dffd85d350e4bcd1fa4635a404a96abfd7415c37cbdc7bd525dff8120c0224292dc9730e9ee2f1edcd3c4493d36aae14a9c
+  data.tar.gz: 51a479869d7265fb85aa154d0541e94f3b9bce0da935e658f8fa5f4d6c66b22efe8db4b3a6b2899e15ff99192a152341cee1adff70380effd470874b7ab24933

data/CHANGELOG.md CHANGED Viewed

@@ -2,6 +2,10 @@
 ## Unreleased
+## 2.9.2
+### Added
+* Added support for `StructuredText` inline Entry include resolution.
 ## 2.9.1
 **Note:** This release includes support for `StructuredText`, this is an **alpha** feature and changes are to be expected. Further releases of this feature

data/README.md CHANGED Viewed

@@ -214,11 +214,6 @@ client = Contentful::Client.new(
       <td><code>'en-US'</code></td>
       <td>Defines default locale for the client.</td>
     </tr>
-    <tr>
-      <td><code>environment</code></td>
-      <td><code>'master'</code></td>
-      <td>Defines default environment to access.</td>
-    </tr>
     <tr>
       <td><code>secure</code></td>
       <td><code>true</code></td>

data/lib/contentful/coercions.rb CHANGED Viewed

@@ -108,17 +108,18 @@ module Contentful
     private
     def link?(node)
-      node['nodeClass'] == 'block' && node.key?('data')
+      !node.fetch('data', {}).empty? && node['data']['target']
     end
     def content_block?(node)
-      node['nodeClass'] == 'block' && node.key?('content')
+      !node.fetch('content', []).empty?
     end
     def coerce_block(block, configuration)
       return block unless block.is_a?(Hash) && block.key?('content')
       invalid_nodes = []
+      coerced_nodes = {}
       block['content'].each_with_index do |node, index|
         if link?(node)
           link = coerce_link(node, configuration)
@@ -129,10 +130,14 @@ module Contentful
             invalid_nodes << index
           end
         elsif content_block?(node)
-          node['content'] = coerce_block(node, configuration)
+          coerced_nodes[index] = coerce_block(node, configuration)
         end
       end
+      coerced_nodes.each do |index, coerced_node|
+        block['content'][index] = coerced_node
+      end
       invalid_nodes.each do |index|
         block['content'].delete_at(index)
       end

data/lib/contentful/version.rb CHANGED Viewed

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

data/spec/entry_spec.rb CHANGED Viewed

@@ -538,5 +538,49 @@ describe Contentful::Entry do
         expect(expected_entry_occurrances).to eq 0
       }
     end
+    it 'respects content in data attribute if its not a Link' do
+      vcr('entries/structured_text_nested_fields') {
+        entry = create_client(
+          space: 'jd7yc4wnatx3',
+          access_token: '6256b8ef7d66805ca41f2728271daf27e8fa6055873b802a813941a0fe696248',
+          raise_errors: true,
+          dynamic_entries: :auto
+        ).entry('6NGLswCREsGA28kGouScyY')
+        expect(entry.body['content'][0]).to eq({
+            'data' => {},
+            'content' => [
+                {'marks' => [], 'value' => 'A link to ', 'nodeType' => 'text', 'nodeClass' => 'text'},
+                {
+                    'data' => {'uri' => 'https://google.com'},
+                    'content' => [{'marks' => [], 'value' => 'google', 'nodeType' => 'text', 'nodeClass' => 'text'}],
+                    'nodeType' => 'hyperlink',
+                    'nodeClass' => 'inline'
+                },
+                {'marks' => [], 'value' => '', 'nodeType' => 'text', 'nodeClass' => 'text'}
+            ],
+            'nodeType' => 'paragraph',
+            'nodeClass' => 'block'
+        })
+      }
+    end
+    it 'supports includes in nested fields' do
+      vcr('entries/structured_text_nested_fields') {
+        entry = create_client(
+          space: 'jd7yc4wnatx3',
+          access_token: '6256b8ef7d66805ca41f2728271daf27e8fa6055873b802a813941a0fe696248',
+          raise_errors: true,
+          dynamic_entries: :auto
+        ).entry('6NGLswCREsGA28kGouScyY')
+        expect(entry.body['content'][3]['nodeType']).to eq('unordered-list')
+        expect(entry.body['content'][3]['content'][2]['content'][0]['data'].is_a?(Contentful::Entry)).to be_truthy
+        expect(entry.body['content'][4]['nodeType']).to eq('ordered-list')
+        expect(entry.body['content'][4]['content'][2]['content'][0]['data'].is_a?(Contentful::Entry)).to be_truthy
+      }
+    end
   end
 end

data/spec/fixtures/vcr_cassettes/entries/structured_text_nested_fields.yml ADDED Viewed

@@ -0,0 +1,167 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://cdn.contentful.com/spaces/jd7yc4wnatx3/environments/master/content_types?limit=1000
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      X-Contentful-User-Agent:
+      - sdk contentful.rb/2.9.1; platform ruby/2.5.1; os macOS/16;
+      Authorization:
+      - Bearer 6256b8ef7d66805ca41f2728271daf27e8fa6055873b802a813941a0fe696248
+      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,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'
+      Cache-Control:
+      - max-age=0
+      Content-Encoding:
+      - gzip
+      Content-Type:
+      - application/vnd.contentful.delivery.v1+json
+      Contentful-Api:
+      - cda_cached
+      Etag:
+      - W/"0ecb92174772cc7a40d4a981e109aaab"
+      Server:
+      - Contentful
+      X-Content-Type-Options:
+      - nosniff
+      X-Contentful-Region:
+      - us-east-1
+      X-Contentful-Request-Id:
+      - 3c7c404eef18163c9a6b5d49eb95e0ed
+      Content-Length:
+      - '459'
+      Accept-Ranges:
+      - bytes
+      Date:
+      - Wed, 12 Sep 2018 11:18:32 GMT
+      Via:
+      - 1.1 varnish
+      Age:
+      - '0'
+      Connection:
+      - close
+      X-Served-By:
+      - cache-hhn1539-HHN
+      X-Cache:
+      - MISS
+      X-Cache-Hits:
+      - '0'
+      X-Timer:
+      - S1536751113.535747,VS0,VE319
+      Vary:
+      - Accept-Encoding
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        H4sIAAAAAAAAA91VPW/CMBDd+RXIc0Em0DbKRis6VV1gasVg4kNycZzUNpQU8d9rOyRxoqJSFakfXvCdfffuXu6ZXafbRSpXKOruzNYYOs/AWGgsJcmR8e0v7B2dasKNP3CWWrHMGNgZnCVMG2uAceFgGhKb8cllLPK2YByUykhsscobhdMrxjqcsyzqnokVsqD1MvBiNTsUPXUZWxcYtf080+s8Hr0KordD21a59tXeNVosVMRAsgBKgXoZq1JuU6FBaIfsBcYSiAY6toSgAA/CHg57QTAb4Gg0ivB1PwyvHv2AdUa/FgBiw2QqEgN+EndFKwlRGmSbmlN5nXiYn3InYcMUS4UdicPlilpEmco4ye8YcPdZFinNq6qQIIkbvkmbeERBxZJlusiL6pClzVRPm/1+jXkq2m/A2DsV1I1fgDspSZnmySLlDcoQT2PC2ZsZiai7JFyBP2tIwsuaySOHpnOy4EcOUyMhMzZl1nomD7u5+z3Q+IcVpfQMlD6TnobRJe6HODhZTx8G/C89OQWVQ1kN+bRJ+3fV1ABpqOnBh/99aqrVeq43Qst1rNdG8zPY+nNt/xd/9q0wL8a8s++8A8NDyyriBwAA
+    http_version:
+  recorded_at: Wed, 12 Sep 2018 11:18:31 GMT
+- request:
+    method: get
+    uri: https://cdn.contentful.com/spaces/jd7yc4wnatx3/environments/master/entries?sys.id=6NGLswCREsGA28kGouScyY
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      X-Contentful-User-Agent:
+      - sdk contentful.rb/2.9.1; platform ruby/2.5.1; os macOS/16;
+      Authorization:
+      - Bearer 6256b8ef7d66805ca41f2728271daf27e8fa6055873b802a813941a0fe696248
+      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,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'
+      Cache-Control:
+      - max-age=0
+      Content-Encoding:
+      - gzip
+      Content-Type:
+      - application/vnd.contentful.delivery.v1+json
+      Contentful-Api:
+      - cda_cached
+      Etag:
+      - W/"ad6896d8b4604d1307178a506ce1b102"
+      Server:
+      - Contentful
+      X-Content-Type-Options:
+      - nosniff
+      X-Contentful-Region:
+      - us-east-1
+      X-Contentful-Request-Id:
+      - f59d940c76009e6aea7642be6cee10d5
+      Content-Length:
+      - '1409'
+      Accept-Ranges:
+      - bytes
+      Date:
+      - Wed, 12 Sep 2018 11:18:33 GMT
+      Via:
+      - 1.1 varnish
+      Age:
+      - '4243'
+      Connection:
+      - close
+      X-Served-By:
+      - cache-hhn1524-HHN
+      X-Cache:
+      - HIT
+      X-Cache-Hits:
+      - '1'
+      X-Timer:
+      - S1536751113.010665,VS0,VE1
+      Vary:
+      - Accept-Encoding
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        H4sIAAAAAAAAA+0ay27bOPCerxB0XruS67i2b0GQDYLNtmidoGgXPTASHavWwyvRbowi/14+RJqkSEppjcBNrUNiUcOZ4XBeHM73E8/zq23lT73v+Cd+QdsVxG/+WVmCrY/HHv8iMKhAIMXjIX2rlskKvwT0JU2yBJFPAXtPEMwIwv8oQoZWo0IpVSsQEVIcgg1KvJABOsh5uk7ypU9o7h5MPV/e1DzPKEYNIInJcr7Gb7bR8FsO0MNrsir+PIrfdJ3s8dmc0dvL6+rb+YeL6vJsMF5eFutZtP0k4ReMXeSo3MofohICBOMzIhd/EITjXjDpheFNMJkOg+kw7J++Dj/LE9ar2DBhcBMG02A4DUf9yUSdAPNNUhZ5BnNCo12GbEkZqBAsdRF1le+FRLNVhiXcJFVS5Ji7gSTaqMgR5rnesna+u/J2LuE1akCFbmCF2vc+LSKQUhOAee92xicI9fDnCUzjncUQlfFzkNEphIR3lWOlhN4MredzD+SxR/S2knf7roi3+q7VgsHDzHC4MsoiorSwogAyWVLYWm1tKMhnHQ1FlYESM4YpflFFVuPbgHTNnIFHzMxDhaepTg2YFzHkRojgA7JDnaegIhR9CqaYMsHVWJOFcS6DBgK6rHWZEBILhFbV9NWr+6K4T2E/KrImQSNJjMIlSkLDJE5K2y1SCiLEyhgzCosCdhKrgGwRLYHbeTvyxh7z1sukF9i9lkQBjJxSLgXthOp+U85dN9Ytvp3o7KzsRw81xWoISdmbFSjBfQlWiwZXqnDusG9ZqrLR5KKr1T6N3eo3qAY9i8LPigx6/68LHBo9q5+g7ByI6tt3VnApVN+wuwRItzm3KlHhHLQa/ZYWutBznlrFXJv3+5um0+I7WT0B0n0SGeNPh3BH6YiQt86LMoYltn9yTGgouoK7sw+gJJQwZM4uOHbdJPl4wzTFMmVW3D6hyYvFLxBAEyNGJhR/mCYV6lnF1xpyKOFmvmfaZnv4ocv86ZhxgIoJ8gItYOkdFZQr/VFBHa7PR6C8h/rRWxYdtRC5tKJ/5O91tWE4KYv59WbzcP4uufr3KhllyzFInB4SE3Acj3V6SqmEVSyMxyc2z+Sa3F8MPoVNaPUTBMzkfoSE3DmHABNRxim17rklQfx8cQVmdzCOYdzD5ZFy22Nho+mna5kq4c4VYswYbOJ2e3wqkDavT4Bs6CmCP2I3X0SW8KRTsIicPZKgNEywNS855tvMtPdqO/OkxBVJa7LIKNZerrVyokB3KDcReFscMaa51D0cc21DWG71ujatOUSHXkEcQ44nQJt5GE3jhZ4ADarOvMz+E+zTz39P3g//GSUfZ5+ubgfvbqvgFrxvxCnu5Dgb9d2i4e5RhcSeS76LPCbY7B7ZWeYV/v5ZgskxwVY0tuUyhcMe6nHpz0uw68rp4afX7gNei95107cux3I99WzEVYXUgV8RdJUpvWIzBrU9CrZZUzCln7uDvjHKm6bQgNBeHeZVrwhfPRvXSvEUd19hRDtwiPCad9IESNcRMtbQE4pNFJfYFbdnpb1HOT/p/G13iKqxGIpFshSU1StriYtoTfuN5O1XcQsQwTlHzf6Tv5SAn+RRuo6h1HnGMqZd+8tOPwxlVGP3GEZrLri6y6StPWSEXWcXmapHSiGje3XX2k2GyRv6yca9AW0PG55OB0F/ND6V+8nwFENHmT5lpE2x95TZJevoK8OTnOVpLV/e9bMpai/rpipZqcOMtiXyh5+VDT1m9nV059TeaSb0hGeaWq+HxKO6EkvPmXJPZ+o7wwTrVjL/oq4ee+GOqLA9Lp0XZVIdznO/YFKT/pvwiSZlmnI0Kc83Hp0V4z9wkxoYTIra8hf89/Hk8eQHimwRyEctAAA=
+    http_version:
+  recorded_at: Wed, 12 Sep 2018 11:18:31 GMT
+recorded_with: VCR 4.0.0

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contentful
 version: !ruby/object:Gem::Version
-  version: 2.9.1
+  version: 2.9.2
 platform: ruby
 authors:
 - Contentful GmbH (Jan Lelis)
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-08-24 00:00:00.000000000 Z
+date: 2018-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -454,6 +454,7 @@ files:
 - spec/fixtures/vcr_cassettes/entries/issue_117.yml
 - spec/fixtures/vcr_cassettes/entries/issue_125.yml
 - spec/fixtures/vcr_cassettes/entries/structured_text.yml
+- spec/fixtures/vcr_cassettes/entries/structured_text_nested_fields.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
@@ -596,6 +597,7 @@ test_files:
 - spec/fixtures/vcr_cassettes/entries/issue_117.yml
 - spec/fixtures/vcr_cassettes/entries/issue_125.yml
 - spec/fixtures/vcr_cassettes/entries/structured_text.yml
+- spec/fixtures/vcr_cassettes/entries/structured_text_nested_fields.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