contentful-management 2.8.0 → 2.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0265363d47abf8e932ae34808cd139e236fb01adec5e718226961aef8f54d5c6
-  data.tar.gz: d04f226b50472250b32c4f2e47309189fb1b67e06b858f1186b94389e317a5f6
+  metadata.gz: ec67eaa1e9c178f37793c4f3d1a0545045f7c5469c6fe98a9e96643327dd13b9
+  data.tar.gz: 380d6fe7b7e841bfaea85c1a7ab0c5823265f0fea3a796e9a9865edee2a6672c
 SHA512:
-  metadata.gz: 7b788286f4fd2a20bfc32b6cf34db4f64db2790999d4df3ff1cec3a504baf8c39a5d04ee66104697f42a656dc152d7c8edf6345b854be93c04cb2eec661ff3da
-  data.tar.gz: f1c99f912490d1725f8a8a5bdebed0baf10ad564b3e98a3b6ede3b8497a673896337116348aa38b0f23ab5eedec8abd04ab296750d2df68bab7a24f49077d972
+  metadata.gz: 5d2f055d5981b37a7c8012cf7438143c320f11a2d1aa284f128a52458b4a7005b450649d51d0663610221937fb9e33b6e19ac236a1a9b03a263ab41b37c92b4a
+  data.tar.gz: 3dfff654f229f11794922fa214271a74df7d47d3e8e6a3ca4d7ae302f630daa5884a1d5b3b810006a49f7d817088ba86ba2187a769d592a25b6be395e682e1f1

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Master
 
+## 2.8.1
+### Fixed
+* Fixed `#save` method for multiple resources. [#190](https://github.com/contentful/contentful-management.rb/pull/190)
+
 ## 2.8.0
 ### Added
 * Added environment branching.

data/lib/contentful/management/api_key.rb

@@ -59,6 +59,19 @@ module Contentful
       def preview_api_key
         client.preview_api_keys(space.id).find(properties[:preview_api_key].id)
       end
+
+      protected
+
+      def query_attributes(attributes)
+        self.class.create_attributes(
+          nil,
+          {
+            name: name,
+            description: description,
+            environments: environments
+          }.merge(attributes)
+        )
+      end
     end
   end
 end

data/lib/contentful/management/asset.rb

@@ -116,9 +116,9 @@ module Contentful
       end
 
       def query_attributes(attributes)
-        self.title = attributes[:title] if attributes[:title]
-        self.description = attributes[:description] if attributes[:description]
-        self.file = attributes[:file] if attributes[:file]
+        self.title = attributes[:title] || title
+        self.description = attributes[:description] || description
+        self.file = attributes[:file] || file
 
         { fields: fields_for_query }
       end

data/lib/contentful/management/editor_interface.rb

@@ -85,7 +85,11 @@ module Contentful
       end
 
       def query_attributes(attributes)
-        attributes.each_with_object({}) { |(k, v), result| result[k.to_sym] = v }
+        {
+          controls: controls
+        }.merge(
+          attributes.each_with_object({}) { |(k, v), result| result[k.to_sym] = v }
+        )
       end
     end
   end

data/lib/contentful/management/environment.rb

@@ -147,6 +147,14 @@ module Contentful
       def refresh_find
         self.class.find(client, space.id, id)
       end
+
+      protected
+
+      def query_attributes(attributes)
+        {
+          name: name
+        }.merge(attributes)
+      end
     end
   end
 end

data/lib/contentful/management/locale.rb

@@ -32,7 +32,14 @@ module Contentful
       protected
 
       def query_attributes(attributes)
-        attributes.each_with_object({}) { |(k, v), result| result[k.to_sym] = v }
+        {
+          name: name,
+          code: code,
+          optional: optional,
+          fallbackCode: fallback_code
+        }.merge(
+          attributes.each_with_object({}) { |(k, v), result| result[k.to_sym] = v }
+        )
       end
     end
   end

data/lib/contentful/management/resource/refresher.rb

@@ -12,7 +12,8 @@ module Contentful
 
         # @private
         def refresh_find
-          self.class.find(client, space.id, environment_id, id)
+          return self.class.find(client, space.id, environment_id, id) if environment_id
+          self.class.find(client, space.id, id)
         end
 
         # @private

data/lib/contentful/management/role.rb

@@ -48,7 +48,14 @@ module Contentful
       protected
 
       def query_attributes(attributes)
-        attributes.each_with_object({}) { |(k, v), result| result[k.to_sym] = v }
+        {
+          name: name,
+          description: description,
+          permissions: permissions,
+          policies: policies
+        }.merge(
+          attributes.each_with_object({}) { |(k, v), result| result[k.to_sym] = v }
+        )
       end
 
       # @private

data/lib/contentful/management/space.rb

@@ -166,6 +166,12 @@ module Contentful
 
       protected
 
+      def query_attributes(attributes)
+        {
+          name: name
+        }.merge(attributes)
+      end
+
       def refresh_find
         self.class.find(client, id)
       end

data/lib/contentful/management/version.rb

@@ -3,6 +3,6 @@ module Contentful
   # Management Namespace
   module Management
     # Gem Version
-    VERSION = '2.8.0'.freeze
+    VERSION = '2.8.1'.freeze
   end
 end

data/lib/contentful/management/webhook.rb

@@ -74,7 +74,18 @@ module Contentful
       protected
 
       def query_attributes(attributes)
-        self.class.create_attributes(nil, attributes)
+        self.class.create_attributes(
+          nil,
+          {
+            url: url,
+            name: name,
+            topics: topics,
+            headers: headers,
+            httpBasicUsername: http_basic_username,
+            filters: filters,
+            transformation: transformation
+          }.merge(attributes)
+        )
       end
     end
   end

data/spec/fixtures/vcr_cassettes/api_key/issue_189.yml

@@ -0,0 +1,476 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://api.contentful.com/spaces/facgnwwgj5fe/api_keys/5rjsSfZUvHJnWBDkbcCsem
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      X-Contentful-User-Agent:
+      - sdk contentful-management.rb/2.8.0; platform ruby/2.5.3; os macOS/16;
+      Authorization:
+      - Bearer <ACCESS_TOKEN>
+      Content-Type:
+      - application/vnd.contentful.management.v1+json
+      Connection:
+      - close
+      Host:
+      - api.contentful.com
+      User-Agent:
+      - http.rb/2.2.2
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Accept-Ranges:
+      - bytes
+      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,X-Contentful-Source-Environment,X-Contentful-Team
+      Access-Control-Allow-Methods:
+      - DELETE,GET,HEAD,POST,PUT,OPTIONS
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Expose-Headers:
+      - Etag
+      Access-Control-Max-Age:
+      - '1728000'
+      Cache-Control:
+      - max-age=0
+      Cf-Organization-Id:
+      - 4SsuxQCaMaemfIms52Jr8s
+      Cf-Space-Id:
+      - facgnwwgj5fe
+      Content-Type:
+      - application/vnd.contentful.management.v1+json
+      Contentful-Api:
+      - cma
+      Date:
+      - Tue, 02 Apr 2019 13:29:57 GMT
+      Etag:
+      - W/"ee4064a28cc997b3d479492a6f74b26d"
+      Referrer-Policy:
+      - strict-origin-when-cross-origin
+      Server:
+      - Contentful
+      Strict-Transport-Security:
+      - max-age=15768000
+      X-Content-Type-Options:
+      - nosniff
+      X-Contentful-Ratelimit-Hour-Limit:
+      - '36000'
+      X-Contentful-Ratelimit-Hour-Remaining:
+      - '35999'
+      X-Contentful-Ratelimit-Reset:
+      - '0'
+      X-Contentful-Ratelimit-Second-Limit:
+      - '10'
+      X-Contentful-Ratelimit-Second-Remaining:
+      - '9'
+      X-Contentful-Request-Id:
+      - 1a925fe051f4b74bbf151b50a14a91a6
+      X-Download-Options:
+      - noopen
+      X-Frame-Options:
+      - ALLOWALL
+      X-Permitted-Cross-Domain-Policies:
+      - none
+      X-Xss-Protection:
+      - 1; mode=block
+      Content-Length:
+      - '1160'
+      Connection:
+      - Close
+      Set-Cookie:
+      - incap_ses_1077_673446=baPFJsTWwWXeoWoUCkbyDtRjo1wAAAAA7Kovsj9OUSXsUCzoeAko1A==;
+        path=/; Domain=.contentful.com
+      - nlbi_673446=8gi/C6asIRhEx1XqYMlkBAAAAABJsJAkAt1ahydRN/RUSQLx; path=/; Domain=.contentful.com
+      - visid_incap_673446=roXiP+VsR42ppuS/wI0Od9Rjo1wAAAAAQUIPAAAAAACv3iML2eglTfkNRnifG/rz;
+        expires=Wed, 01 Apr 2020 05:58:50 GMT; path=/; Domain=.contentful.com
+      X-Iinfo:
+      - 12-468673-468674 NNNN CT(114 114 0) RT(1554211796039 57) q(0 0 3 -1) r(4 4)
+        U5
+      X-Cdn:
+      - Incapsula
+    body:
+      encoding: ASCII-8BIT
+      string: |+
+        {
+          "name":"test - updated",
+          "description":"",
+          "accessToken":"a53de8ab24af833c7352f2b3262591b40b4765c42a288e1f54d374620a7bd619",
+          "policies":[
+            {
+              "effect":"allow",
+              "actions":"all"
+            }
+          ],
+          "sys":{
+            "type":"ApiKey",
+            "id":"5rjsSfZUvHJnWBDkbcCsem",
+            "version":4,
+            "space":{
+              "sys":{
+                "type":"Link",
+                "linkType":"Space",
+                "id":"facgnwwgj5fe"
+              }
+            },
+            "createdBy":{
+              "sys":{
+                "type":"Link",
+                "linkType":"User",
+                "id":"4SejVrWT96dvL9IV4Nb7sQ"
+              }
+            },
+            "createdAt":"2018-09-17T09:12:17Z",
+            "updatedBy":{
+              "sys":{
+                "type":"Link",
+                "linkType":"User",
+                "id":"4SejVrWT96dvL9IV4Nb7sQ"
+              }
+            },
+            "updatedAt":"2018-09-17T09:22:09Z"
+          },
+          "environments":[
+            {
+              "sys":{
+                "id":"testing",
+                "type":"Link",
+                "linkType":"Environment"
+              }
+            },
+            {
+              "sys":{
+                "id":"master",
+                "type":"Link",
+                "linkType":"Environment"
+              }
+            }
+          ],
+          "preview_api_key":{
+            "sys":{
+              "type":"Link",
+              "linkType":"PreviewApiKey",
+              "id":"5rkieiBVQBhmVPfgrfTxA6"
+            }
+          }
+        }
+
+    http_version: 
+  recorded_at: Tue, 02 Apr 2019 13:29:57 GMT
+- request:
+    method: put
+    uri: https://api.contentful.com/spaces/facgnwwgj5fe/api_keys/5rjsSfZUvHJnWBDkbcCsem
+    body:
+      encoding: UTF-8
+      string: '{"name":"test - updated 2","description":"","environments":["#<Contentful::Management::Link:0x00007fa74690dba8>","#<Contentful::Management::Link:0x00007fa74690d018>"]}'
+    headers:
+      X-Contentful-User-Agent:
+      - sdk contentful-management.rb/2.8.0; platform ruby/2.5.3; os macOS/16;
+      Authorization:
+      - Bearer <ACCESS_TOKEN>
+      Content-Type:
+      - application/vnd.contentful.management.v1+json
+      X-Contentful-Version:
+      - '4'
+      Version:
+      - '4'
+      Connection:
+      - close
+      Host:
+      - api.contentful.com
+      User-Agent:
+      - http.rb/2.2.2
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Accept-Ranges:
+      - bytes
+      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,X-Contentful-Source-Environment,X-Contentful-Team
+      Access-Control-Allow-Methods:
+      - DELETE,GET,HEAD,POST,PUT,OPTIONS
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Expose-Headers:
+      - Etag
+      Access-Control-Max-Age:
+      - '1728000'
+      Cache-Control:
+      - max-age=0
+      Cf-Organization-Id:
+      - 4SsuxQCaMaemfIms52Jr8s
+      Cf-Space-Id:
+      - facgnwwgj5fe
+      Content-Type:
+      - application/vnd.contentful.management.v1+json
+      Contentful-Api:
+      - cma
+      Date:
+      - Tue, 02 Apr 2019 13:29:57 GMT
+      Etag:
+      - W/"82ea9f73bb585a5686f43861e04ee0a9"
+      Referrer-Policy:
+      - strict-origin-when-cross-origin
+      Server:
+      - Contentful
+      Strict-Transport-Security:
+      - max-age=15768000
+      X-Content-Type-Options:
+      - nosniff
+      X-Contentful-Ratelimit-Hour-Limit:
+      - '36000'
+      X-Contentful-Ratelimit-Hour-Remaining:
+      - '35998'
+      X-Contentful-Ratelimit-Reset:
+      - '0'
+      X-Contentful-Ratelimit-Second-Limit:
+      - '10'
+      X-Contentful-Ratelimit-Second-Remaining:
+      - '8'
+      X-Contentful-Request-Id:
+      - 22ba926216763c4525b94b0064865fa6
+      X-Download-Options:
+      - noopen
+      X-Frame-Options:
+      - ALLOWALL
+      X-Permitted-Cross-Domain-Policies:
+      - none
+      X-Xss-Protection:
+      - 1; mode=block
+      Content-Length:
+      - '1047'
+      Connection:
+      - Close
+      Set-Cookie:
+      - incap_ses_1077_673446=Pl2FOkKQUnDwoWoUCkbyDtVjo1wAAAAAJsiBB2wfMR7tFhAOy3eCjA==;
+        path=/; Domain=.contentful.com
+      - nlbi_673446=CHfkdKUEtyZGK7RHYMlkBAAAAABVBnkYKRhDc+11XV2/V9Nt; path=/; Domain=.contentful.com
+      - visid_incap_673446=6OZjLktRQjCpW2bkGQ64XtVjo1wAAAAAQUIPAAAAAAD9oeNTrhN3FztQM8rablqG;
+        expires=Wed, 01 Apr 2020 05:58:22 GMT; path=/; Domain=.contentful.com
+      X-Iinfo:
+      - 4-1112978-1112979 NNNN CT(107 106 0) RT(1554211796564 51) q(0 0 2 -1) r(4
+        4) U5
+      X-Cdn:
+      - Incapsula
+    body:
+      encoding: ASCII-8BIT
+      string: |+
+        {
+          "name":"test - updated 2",
+          "description":"",
+          "accessToken":"a53de8ab24af833c7352f2b3262591b40b4765c42a288e1f54d374620a7bd619",
+          "policies":[
+            {
+              "effect":"allow",
+              "actions":"all"
+            }
+          ],
+          "sys":{
+            "type":"ApiKey",
+            "id":"5rjsSfZUvHJnWBDkbcCsem",
+            "version":5,
+            "space":{
+              "sys":{
+                "type":"Link",
+                "linkType":"Space",
+                "id":"facgnwwgj5fe"
+              }
+            },
+            "createdBy":{
+              "sys":{
+                "type":"Link",
+                "linkType":"User",
+                "id":"4SejVrWT96dvL9IV4Nb7sQ"
+              }
+            },
+            "createdAt":"2018-09-17T09:12:17Z",
+            "updatedBy":{
+              "sys":{
+                "type":"Link",
+                "linkType":"User",
+                "id":"4SejVrWT96dvL9IV4Nb7sQ"
+              }
+            },
+            "updatedAt":"2019-04-02T13:29:57Z"
+          },
+          "environments":[
+            {
+              "sys":{
+                "id":"master",
+                "type":"Link",
+                "linkType":"Environment"
+              }
+            }
+          ],
+          "preview_api_key":{
+            "sys":{
+              "type":"Link",
+              "linkType":"PreviewApiKey",
+              "id":"5rkieiBVQBhmVPfgrfTxA6"
+            }
+          }
+        }
+
+    http_version: 
+  recorded_at: Tue, 02 Apr 2019 13:29:57 GMT
+- request:
+    method: get
+    uri: https://api.contentful.com/spaces/facgnwwgj5fe/api_keys/5rjsSfZUvHJnWBDkbcCsem
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      X-Contentful-User-Agent:
+      - sdk contentful-management.rb/2.8.0; platform ruby/2.5.3; os macOS/16;
+      Authorization:
+      - Bearer <ACCESS_TOKEN>
+      Content-Type:
+      - application/vnd.contentful.management.v1+json
+      Connection:
+      - close
+      Host:
+      - api.contentful.com
+      User-Agent:
+      - http.rb/2.2.2
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Accept-Ranges:
+      - bytes
+      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,X-Contentful-Source-Environment,X-Contentful-Team
+      Access-Control-Allow-Methods:
+      - DELETE,GET,HEAD,POST,PUT,OPTIONS
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Expose-Headers:
+      - Etag
+      Access-Control-Max-Age:
+      - '1728000'
+      Cache-Control:
+      - max-age=0
+      Cf-Organization-Id:
+      - 4SsuxQCaMaemfIms52Jr8s
+      Cf-Space-Id:
+      - facgnwwgj5fe
+      Content-Type:
+      - application/vnd.contentful.management.v1+json
+      Contentful-Api:
+      - cma
+      Date:
+      - Tue, 02 Apr 2019 13:29:58 GMT
+      Etag:
+      - W/"82ea9f73bb585a5686f43861e04ee0a9"
+      Referrer-Policy:
+      - strict-origin-when-cross-origin
+      Server:
+      - Contentful
+      Strict-Transport-Security:
+      - max-age=15768000
+      X-Content-Type-Options:
+      - nosniff
+      X-Contentful-Ratelimit-Hour-Limit:
+      - '36000'
+      X-Contentful-Ratelimit-Hour-Remaining:
+      - '35999'
+      X-Contentful-Ratelimit-Reset:
+      - '0'
+      X-Contentful-Ratelimit-Second-Limit:
+      - '10'
+      X-Contentful-Ratelimit-Second-Remaining:
+      - '9'
+      X-Contentful-Request-Id:
+      - 7f277f2afca4b7ef050a663d82b6bde8
+      X-Download-Options:
+      - noopen
+      X-Frame-Options:
+      - ALLOWALL
+      X-Permitted-Cross-Domain-Policies:
+      - none
+      X-Xss-Protection:
+      - 1; mode=block
+      Content-Length:
+      - '1047'
+      Connection:
+      - Close
+      Set-Cookie:
+      - incap_ses_1077_673446=lWeSYMEmvlQEomoUCkbyDtVjo1wAAAAArGE5hHQc6mtAiNmohmvOog==;
+        path=/; Domain=.contentful.com
+      - nlbi_673446=np9Ffa4WYUgEV1zMYMlkBAAAAAB5Emvv9J5iQZvMKsIsEYgl; path=/; Domain=.contentful.com
+      - visid_incap_673446=NthvU3CcRT6ZpqTsOU5H6NVjo1wAAAAAQUIPAAAAAAB5bEpQFqHTkxucGLY+j/dF;
+        expires=Wed, 01 Apr 2020 05:58:22 GMT; path=/; Domain=.contentful.com
+      X-Iinfo:
+      - 3-927481-927482 NNNN CT(113 113 0) RT(1554211797082 52) q(0 0 2 -1) r(4 4)
+        U5
+      X-Cdn:
+      - Incapsula
+    body:
+      encoding: ASCII-8BIT
+      string: |+
+        {
+          "name":"test - updated 2",
+          "description":"",
+          "accessToken":"a53de8ab24af833c7352f2b3262591b40b4765c42a288e1f54d374620a7bd619",
+          "policies":[
+            {
+              "effect":"allow",
+              "actions":"all"
+            }
+          ],
+          "sys":{
+            "type":"ApiKey",
+            "id":"5rjsSfZUvHJnWBDkbcCsem",
+            "version":5,
+            "space":{
+              "sys":{
+                "type":"Link",
+                "linkType":"Space",
+                "id":"facgnwwgj5fe"
+              }
+            },
+            "createdBy":{
+              "sys":{
+                "type":"Link",
+                "linkType":"User",
+                "id":"4SejVrWT96dvL9IV4Nb7sQ"
+              }
+            },
+            "createdAt":"2018-09-17T09:12:17Z",
+            "updatedBy":{
+              "sys":{
+                "type":"Link",
+                "linkType":"User",
+                "id":"4SejVrWT96dvL9IV4Nb7sQ"
+              }
+            },
+            "updatedAt":"2019-04-02T13:29:57Z"
+          },
+          "environments":[
+            {
+              "sys":{
+                "id":"master",
+                "type":"Link",
+                "linkType":"Environment"
+              }
+            }
+          ],
+          "preview_api_key":{
+            "sys":{
+              "type":"Link",
+              "linkType":"PreviewApiKey",
+              "id":"5rkieiBVQBhmVPfgrfTxA6"
+            }
+          }
+        }
+
+    http_version: 
+  recorded_at: Tue, 02 Apr 2019 13:29:58 GMT
+recorded_with: VCR 4.0.0