contentful-management 2.9.1 → 2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4874bf1c1821fdad9b895fb83cfb53f01dbeb161220c2d5e35f6b266b70a75bc
-  data.tar.gz: 31a641e0b306c5608187591ca2eb7f89024952ece5989243683c2d7ff3effa5a
+  metadata.gz: a8e47f9397c8d3c6481770f27abc03ad28789d7c4a60f504a9ce9ebd862fa634
+  data.tar.gz: 71e9d37e046d4c5027bbe2b596f2ddf94d6000d36bfad0c088dd6f7fbff63846
 SHA512:
-  metadata.gz: e8eb04ac563ffc9e81b47dd2078023d27caa879472c96ea02863e2491819b9bcc2f6e73f25d636ebc2957e40863dc76afbd2bdb4b63232b2dbb2c59012670c58
-  data.tar.gz: a2332fbc5da6136910d0f7232cc8a9ca6d545aaec1804cdce12f6c8272f086f6951bf90fd6e668d1b002f55cccac9c02ca29a834b8c34a6d69f122ecaa030d92
+  metadata.gz: 232a59d47e991f9f01acbadc31136b877729f6c51efd198280fbb29311aea0bfb4b85f8ae3ac866d8a90b9aad68c3c2004fd04ebeded9dec1ab5f24c902bf865
+  data.tar.gz: 5915e699b6f16935b5266ab0964b105d60728b8ecf1d6796e5c2e9d685475f32ae5e81b6c50220b9828f7403f30a5db2b5caadd8d63568480cf2c2e225721f79

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 ## Master
 
+## 2.10.0
+### Added
+* Added support for query parameters on the Space endpoints. [#197](https://github.com/contentful/contentful-management.rb/pull/197)
+
+### Fixed
+* Fixed environment aware resources that were not having the `environment_id` properly calculated. [#195](https://github.com/contentful/contentful-management.rb/pull/195)
+
+### Changed
+* Relaxed maximum allowed version of the `json` gem. [#196](https://github.com/contentful/contentful-management.rb/pull/196)
+
 ## 2.9.1
 ### Fixed
 * Default locale is now fetched from the client instead of passed around. [#194](https://github.com/contentful/contentful-management.rb/pull/194)

data/contentful-management.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'http', '> 1.0', '< 3.0'
   spec.add_dependency 'multi_json', '~> 1'
-  spec.add_dependency 'json', '~> 1.8'
+  spec.add_dependency 'json', '>= 1.8', '< 3.0'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake', '< 11.0'
@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'guard-yard'
   spec.add_development_dependency 'rubocop', '~> 0.49.1'
   spec.add_development_dependency 'listen', '~> 3.0'
-  spec.add_development_dependency 'vcr'
+  spec.add_development_dependency 'vcr', '~> 4.0'
   spec.add_development_dependency 'webmock', '~> 1', '>= 1.17.3'
   spec.add_development_dependency 'simplecov'
 end

data/lib/contentful/management/client_space_methods_factory.rb

@@ -15,8 +15,8 @@ module Contentful
       # Gets a collection of spaces.
       #
       # @return [Contentful::Management::Array<Contentful::Management::Space>]
-      def all
-        @resource_requester.all
+      def all(query = {})
+        @resource_requester.all({}, query)
       end
 
       # Gets a specific space.

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

@@ -6,14 +6,17 @@ module Contentful
         # Gets the environment ID for the resource.
         def environment_id
           env = sys.fetch(:environment, {})
-          case env
-          when ::Hash
-            env.fetch(:id, 'master')
-          when ::Contentful::Management::Link
-            env.id
-          else
-            'master'
-          end
+          env_from_sys =
+            case env
+            when ::Hash
+              env.fetch(:id, nil)
+            when ::Contentful::Management::Link, ::Contentful::Management::Environment
+              env.id
+            end
+
+          return env_from_sys if env_from_sys
+
+          respond_to?(:content_type) && content_type && content_type.environment_id || 'master'
         end
       end
     end

data/lib/contentful/management/space.rb

@@ -35,8 +35,8 @@ module Contentful
       # @param [Contentful::Management::Client] client
       #
       # @return [Contentful::Management::Array<Contentful::Management::Space>]
-      def self.all(client)
-        ClientSpaceMethodsFactory.new(client).all
+      def self.all(client, query = {})
+        ClientSpaceMethodsFactory.new(client).all(query)
       end
 
       # Gets a specific space.

data/lib/contentful/management/version.rb

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

data/spec/fixtures/vcr_cassettes/asset/196_environment_id.yml

@@ -0,0 +1,140 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://api.contentful.com/spaces/facgnwwgj5fe/environments/testing
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      X-Contentful-User-Agent:
+      - sdk contentful-management.rb/2.10.0; platform ruby/2.6.3; os macOS/18;
+      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,X-Contentful-Parent-Id
+      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:
+      - Wed, 12 Jun 2019 09:50:55 GMT
+      Etag:
+      - W/"b5f8d465c58fdb2d4de7e800b00f1eaa"
+      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:
+      - 2373953b0bf0c685ba5661a9fe0b5d67
+      X-Download-Options:
+      - noopen
+      X-Frame-Options:
+      - ALLOWALL
+      X-Permitted-Cross-Domain-Policies:
+      - none
+      X-Xss-Protection:
+      - 1; mode=block
+      Content-Length:
+      - '692'
+      Connection:
+      - Close
+      Set-Cookie:
+      - incap_ses_1077_673446=RtgaHDXP7XMdFb6xI0byDv/KAF0AAAAACSGiFccitmBt23MZnqPWxA==;
+        path=/; Domain=.contentful.com
+      - nlbi_673446=7nwaCaO7f3nYLwxVYMlkBAAAAAD3ZpP6TCMI5gIrwYpyuK9W; path=/; Domain=.contentful.com
+      - visid_incap_673446=HtXBvewwRv2t0RzGAoorGv/KAF0AAAAAQUIPAAAAAABa3NNCQ4sPwmHFDGhpUKoq;
+        expires=Thu, 11 Jun 2020 08:51:05 GMT; path=/; Domain=.contentful.com
+      X-Iinfo:
+      - 4-7987266-7987270 NNNN CT(108 108 0) RT(1560333054770 102) q(0 0 2 -1) r(4
+        4) U5
+      X-Cdn:
+      - Incapsula
+    body:
+      encoding: ASCII-8BIT
+      string: |+
+        {
+          "name":"testing 2",
+          "sys":{
+            "type":"Environment",
+            "id":"testing",
+            "version":7,
+            "space":{
+              "sys":{
+                "type":"Link",
+                "linkType":"Space",
+                "id":"facgnwwgj5fe"
+              }
+            },
+            "status":{
+              "sys":{
+                "type":"Link",
+                "linkType":"Status",
+                "id":"ready"
+              }
+            },
+            "createdBy":{
+              "sys":{
+                "type":"Link",
+                "linkType":"User",
+                "id":"4SejVrWT96dvL9IV4Nb7sQ"
+              }
+            },
+            "createdAt":"2018-02-27T10:19:01Z",
+            "updatedBy":{
+              "sys":{
+                "type":"Link",
+                "linkType":"User",
+                "id":"4SejVrWT96dvL9IV4Nb7sQ"
+              }
+            },
+            "updatedAt":"2019-04-02T13:32:30Z"
+          }
+        }
+
+    http_version: 
+  recorded_at: Wed, 12 Jun 2019 09:50:55 GMT
+recorded_with: VCR 4.0.0

data/spec/fixtures/vcr_cassettes/content_type/196_retain_environment_id.yml

@@ -0,0 +1,150 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://api.contentful.com/spaces/facgnwwgj5fe/environments/testing/content_types/foo
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      X-Contentful-User-Agent:
+      - sdk contentful-management.rb/2.10.0; platform ruby/2.6.3; os macOS/18;
+      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:
+      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,X-Contentful-Parent-Id
+      Access-Control-Allow-Methods:
+      - DELETE,GET,HEAD,POST,PUT,OPTIONS
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Expose-Headers:
+      - Etag
+      Access-Control-Max-Age:
+      - '1728000'
+      Cf-Environment-Id:
+      - testing
+      Cf-Space-Id:
+      - facgnwwgj5fe
+      Content-Type:
+      - application/vnd.contentful.management.v1+json
+      Contentful-Api:
+      - cma
+      Date:
+      - Wed, 12 Jun 2019 09:53:39 GMT
+      Etag:
+      - '"0b2c5704e213e8a4a0dd2c52b41f69f6"'
+      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:
+      - f5fddca25cc4f8e04c8d81881e6e7701
+      Content-Length:
+      - '1291'
+      Connection:
+      - Close
+      Set-Cookie:
+      - incap_ses_1077_673446=BpbBNbCuYjrQIb6xI0byDqPLAF0AAAAAZh/XsY8rfyTQa65eQDXXQA==;
+        path=/; Domain=.contentful.com
+      - nlbi_673446=EDV6F0YIwmCvoc7iYMlkBAAAAACzIXkMlBj6/0YOnyu4iuW5; path=/; Domain=.contentful.com
+      - visid_incap_673446=RDpZ/bR1RpCWIvRJhiD7DaPLAF0AAAAAQUIPAAAAAADdNxoQbzqM+ClPhb8yvpKl;
+        expires=Thu, 11 Jun 2020 08:51:29 GMT; path=/; Domain=.contentful.com
+      X-Iinfo:
+      - 13-3220957-3220958 NNNN CT(0 0 0) RT(1560333218442 92) q(0 0 0 -1) r(10 10)
+        U5
+      X-Cdn:
+      - Incapsula
+    body:
+      encoding: ASCII-8BIT
+      string: |
+        {
+          "sys": {
+            "space": {
+              "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "facgnwwgj5fe"
+              }
+            },
+            "id": "foo",
+            "type": "ContentType",
+            "createdAt": "2017-03-02T19:32:52.225Z",
+            "updatedAt": "2017-03-10T15:38:16.371Z",
+            "environment": {
+              "sys": {
+                "id": "testing",
+                "type": "Link",
+                "linkType": "Environment"
+              }
+            },
+            "publishedVersion": 6,
+            "publishedAt": "2017-03-02T22:41:20.685Z",
+            "firstPublishedAt": "2017-03-02T21:51:34.581Z",
+            "createdBy": {
+              "sys": {
+                "type": "Link",
+                "linkType": "User",
+                "id": "4SejVrWT96dvL9IV4Nb7sQ"
+              }
+            },
+            "updatedBy": {
+              "sys": {
+                "type": "Link",
+                "linkType": "User",
+                "id": "4SejVrWT96dvL9IV4Nb7sQ"
+              }
+            },
+            "publishedCounter": 3,
+            "version": 9,
+            "publishedBy": {
+              "sys": {
+                "type": "Link",
+                "linkType": "User",
+                "id": "4SejVrWT96dvL9IV4Nb7sQ"
+              }
+            }
+          },
+          "displayField": "name",
+          "name": "foo",
+          "description": "",
+          "fields": [
+            {
+              "id": "name",
+              "name": "name",
+              "type": "Symbol",
+              "localized": false,
+              "required": false,
+              "validations": [],
+              "disabled": false,
+              "omitted": false
+            }
+          ]
+        }
+    http_version: 
+  recorded_at: Wed, 12 Jun 2019 09:53:40 GMT
+recorded_with: VCR 4.0.0

data/spec/lib/contentful/management/asset_spec.rb

@@ -465,6 +465,14 @@ module Contentful
             end
           end
         end
+        describe 'Assets created through environment retain environment identity - #196' do
+          it 'should return proper environment id' do
+            vcr('asset/196_environment_id') do
+              environment = client.environments('facgnwwgj5fe').find('testing')
+              expect(environment.assets.new.environment_id).to eq 'testing'
+            end
+          end
+        end
       end
     end
   end

data/spec/lib/contentful/management/content_type_spec.rb

@@ -849,6 +849,12 @@ module Contentful
             expect(content_type.sys[:version] > 0).to be_truthy
           }
         end
+        it 'entries created through a content type retain environment id - #196' do
+          vcr('content_type/196_retain_environment_id') {
+            content_type = described_class.find(client, 'facgnwwgj5fe', 'testing', 'foo')
+            expect(content_type.entries.new.environment_id).to eq 'testing'
+          }
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contentful-management
 version: !ruby/object:Gem::Version
-  version: 2.9.1
+  version: 2.10.0
 platform: ruby
 authors:
 - Piotr Protas
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-08 00:00:00.000000000 Z
+date: 2019-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -50,16 +50,22 @@ dependencies:
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.8'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.8'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -218,16 +224,16 @@ dependencies:
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -422,6 +428,7 @@ files:
 - spec/fixtures/vcr_cassettes/api_usage/all.yml
 - spec/fixtures/vcr_cassettes/array_page_1.yml
 - spec/fixtures/vcr_cassettes/asset/143_assets_next_page.yml
+- spec/fixtures/vcr_cassettes/asset/196_environment_id.yml
 - spec/fixtures/vcr_cassettes/asset/all.yml
 - spec/fixtures/vcr_cassettes/asset/archive.yml
 - spec/fixtures/vcr_cassettes/asset/archive_published.yml
@@ -456,6 +463,7 @@ files:
 - spec/fixtures/vcr_cassettes/asset/update_file.yml
 - spec/fixtures/vcr_cassettes/asset/update_to_specified_locale.yml
 - spec/fixtures/vcr_cassettes/asset/update_with_default_locale_without_file.yml
+- spec/fixtures/vcr_cassettes/content_type/196_retain_environment_id.yml
 - spec/fixtures/vcr_cassettes/content_type/activate.yml
 - spec/fixtures/vcr_cassettes/content_type/activate_with_invalid_version.yml
 - spec/fixtures/vcr_cassettes/content_type/activated_false.yml
@@ -822,6 +830,7 @@ test_files:
 - spec/fixtures/vcr_cassettes/api_usage/all.yml
 - spec/fixtures/vcr_cassettes/array_page_1.yml
 - spec/fixtures/vcr_cassettes/asset/143_assets_next_page.yml
+- spec/fixtures/vcr_cassettes/asset/196_environment_id.yml
 - spec/fixtures/vcr_cassettes/asset/all.yml
 - spec/fixtures/vcr_cassettes/asset/archive.yml
 - spec/fixtures/vcr_cassettes/asset/archive_published.yml
@@ -856,6 +865,7 @@ test_files:
 - spec/fixtures/vcr_cassettes/asset/update_file.yml
 - spec/fixtures/vcr_cassettes/asset/update_to_specified_locale.yml
 - spec/fixtures/vcr_cassettes/asset/update_with_default_locale_without_file.yml
+- spec/fixtures/vcr_cassettes/content_type/196_retain_environment_id.yml
 - spec/fixtures/vcr_cassettes/content_type/activate.yml
 - spec/fixtures/vcr_cassettes/content_type/activate_with_invalid_version.yml
 - spec/fixtures/vcr_cassettes/content_type/activated_false.yml