contentful-management 2.11.0 → 2.12.0

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

@@ -0,0 +1,36 @@
+require 'spec_helper'
+require 'contentful/management/space'
+require 'contentful/management/client'
+
+module Contentful
+  module Management
+    describe OrganizationPeriodicUsage do
+      let(:token) { ENV.fetch('CF_TEST_CMA_TOKEN', '<ACCESS_TOKEN>') }
+      let(:organization_id) { 'org_id' }
+
+      let!(:client) { Client.new(token) }
+
+      subject { client.organization_periodic_usages(organization_id) }
+
+      describe '.all' do
+        it 'class method also works' do
+          vcr('organization_periodic_usage/all') { expect(Contentful::Management::OrganizationPeriodicUsage.all(client, organization_id)).to be_kind_of Contentful::Management::Array }
+        end
+        it 'returns a Contentful::Array' do
+          vcr('organization_periodic_usage/all') { expect(subject.all).to be_kind_of Contentful::Management::Array }
+        end
+        it 'builds a Contentful::Management::OrganizationPeriodicUsage object' do
+          vcr('organization_periodic_usage/all') { expect(subject.all.first).to be_kind_of Contentful::Management::OrganizationPeriodicUsage }
+        end
+        it 'builds a Contentful::Management::OrganizationPeriodicUsage object' do
+          vcr('organization_periodic_usage/filters') { 
+            result = subject.all('metric[in]' => 'cda')
+            expect(result.size).to eq 1
+            expect(result.first).to be_kind_of Contentful::Management::OrganizationPeriodicUsage
+            expect(result.first.metric).to eq 'cda'
+          }
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,36 @@
+require 'spec_helper'
+require 'contentful/management/space'
+require 'contentful/management/client'
+
+module Contentful
+  module Management
+    describe SpacePeriodicUsage do
+      let(:token) { ENV.fetch('CF_TEST_CMA_TOKEN', '<ACCESS_TOKEN>') }
+      let(:organization_id) { 'org_id' }
+
+      let!(:client) { Client.new(token) }
+
+      subject { client.space_periodic_usages(organization_id) }
+
+      describe '.all' do
+        it 'class method also works' do
+          vcr('space_periodic_usage/all') { expect(Contentful::Management::SpacePeriodicUsage.all(client, organization_id)).to be_kind_of Contentful::Management::Array }
+        end
+        it 'returns a Contentful::Array' do
+          vcr('space_periodic_usage/all') { expect(subject.all).to be_kind_of Contentful::Management::Array }
+        end
+        it 'builds a Contentful::Management::SpacePeriodicUsage object' do
+          vcr('space_periodic_usage/all') { expect(subject.all.first).to be_kind_of Contentful::Management::SpacePeriodicUsage }
+        end
+        it 'builds a Contentful::Management::SpacePeriodicUsage object' do
+          vcr('space_periodic_usage/filters') { 
+            result = subject.all('metric[in]' => 'cda')
+            expect(result.all? { |pu| pu.metric == 'cda' }).to be_truthy
+            expect(result.first).to be_kind_of Contentful::Management::SpacePeriodicUsage
+            expect(result.first.metric).to eq 'cda'
+          }
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contentful-management
 version: !ruby/object:Gem::Version
-  version: 2.11.0
+  version: 2.12.0
 platform: ruby
 authors:
 - Piotr Protas
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-19 00:00:00.000000000 Z
+date: 2020-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -307,12 +307,10 @@ files:
 - examples/create_space.rb
 - lib/contentful/management.rb
 - lib/contentful/management/api_key.rb
-- lib/contentful/management/api_usage.rb
 - lib/contentful/management/array.rb
 - lib/contentful/management/asset.rb
 - lib/contentful/management/client.rb
 - lib/contentful/management/client_api_key_methods_factory.rb
-- lib/contentful/management/client_api_usage_methods_factory.rb
 - lib/contentful/management/client_asset_methods_factory.rb
 - lib/contentful/management/client_association_all_published_method_factory.rb
 - lib/contentful/management/client_association_methods_factory.rb
@@ -322,15 +320,16 @@ files:
 - lib/contentful/management/client_environment_methods_factory.rb
 - lib/contentful/management/client_locale_methods_factory.rb
 - lib/contentful/management/client_organization_methods_factory.rb
+- lib/contentful/management/client_organization_periodic_usage_methods_factory.rb
 - lib/contentful/management/client_personal_access_tokens_methods_factory.rb
 - lib/contentful/management/client_preview_api_key_methods_factory.rb
 - lib/contentful/management/client_role_methods_factory.rb
 - lib/contentful/management/client_snapshot_methods_factory.rb
 - lib/contentful/management/client_space_membership_methods_factory.rb
 - lib/contentful/management/client_space_methods_factory.rb
+- lib/contentful/management/client_space_periodic_usage_methods_factory.rb
 - lib/contentful/management/client_ui_extension_methods_factory.rb
 - lib/contentful/management/client_upload_methods_factory.rb
-- lib/contentful/management/client_usage_period_methods_factory.rb
 - lib/contentful/management/client_user_methods_factory.rb
 - lib/contentful/management/client_webhook_call_methods_factory.rb
 - lib/contentful/management/client_webhook_health_methods_factory.rb
@@ -359,6 +358,7 @@ files:
 - lib/contentful/management/locale.rb
 - lib/contentful/management/location.rb
 - lib/contentful/management/organization.rb
+- lib/contentful/management/organization_periodic_usage.rb
 - lib/contentful/management/personal_access_token.rb
 - lib/contentful/management/preview_api_key.rb
 - lib/contentful/management/request.rb
@@ -384,6 +384,7 @@ files:
 - lib/contentful/management/space_association_methods_factory.rb
 - lib/contentful/management/space_environment_methods_factory.rb
 - lib/contentful/management/space_membership.rb
+- lib/contentful/management/space_periodic_usage.rb
 - lib/contentful/management/space_preview_api_key_methods_factory.rb
 - lib/contentful/management/space_role_methods_factory.rb
 - lib/contentful/management/space_space_membership_methods_factory.rb
@@ -391,7 +392,6 @@ files:
 - lib/contentful/management/support.rb
 - lib/contentful/management/ui_extension.rb
 - lib/contentful/management/upload.rb
-- lib/contentful/management/usage_period.rb
 - lib/contentful/management/user.rb
 - lib/contentful/management/validation.rb
 - lib/contentful/management/version.rb
@@ -433,7 +433,6 @@ files:
 - spec/fixtures/vcr_cassettes/api_key/find_for_space_not_found.yml
 - spec/fixtures/vcr_cassettes/api_key/issue_189.yml
 - spec/fixtures/vcr_cassettes/api_key/preview.yml
-- 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
@@ -647,6 +646,8 @@ files:
 - spec/fixtures/vcr_cassettes/locale/update_code.yml
 - spec/fixtures/vcr_cassettes/locale/update_name.yml
 - spec/fixtures/vcr_cassettes/organization/all.yml
+- spec/fixtures/vcr_cassettes/organization_periodic_usage/all.yml
+- spec/fixtures/vcr_cassettes/organization_periodic_usage/filters.yml
 - spec/fixtures/vcr_cassettes/personal_access_token/all.yml
 - spec/fixtures/vcr_cassettes/personal_access_token/create.yml
 - spec/fixtures/vcr_cassettes/personal_access_token/find.yml
@@ -722,6 +723,8 @@ files:
 - spec/fixtures/vcr_cassettes/space_memberships/delete.yml
 - spec/fixtures/vcr_cassettes/space_memberships/find.yml
 - spec/fixtures/vcr_cassettes/space_memberships/find_2.yml
+- spec/fixtures/vcr_cassettes/space_periodic_usage/all.yml
+- spec/fixtures/vcr_cassettes/space_periodic_usage/filters.yml
 - spec/fixtures/vcr_cassettes/ui_extension/all.yml
 - spec/fixtures/vcr_cassettes/ui_extension/create.yml
 - spec/fixtures/vcr_cassettes/ui_extension/create_parameters.yml
@@ -733,7 +736,6 @@ files:
 - spec/fixtures/vcr_cassettes/upload/destroy.yml
 - spec/fixtures/vcr_cassettes/upload/find.yml
 - spec/fixtures/vcr_cassettes/upload/find_not_found.yml
-- spec/fixtures/vcr_cassettes/usage_period/all.yml
 - spec/fixtures/vcr_cassettes/user/find.yml
 - spec/fixtures/vcr_cassettes/webhook/all.yml
 - spec/fixtures/vcr_cassettes/webhook/create.yml
@@ -752,7 +754,6 @@ files:
 - spec/fixtures/vcr_cassettes/webhook_call/find_not_found.yml
 - spec/fixtures/vcr_cassettes/webhook_health/find.yml
 - spec/lib/contentful/management/api_key_spec.rb
-- spec/lib/contentful/management/api_usage_spec.rb
 - spec/lib/contentful/management/array_spec.rb
 - spec/lib/contentful/management/asset_spec.rb
 - spec/lib/contentful/management/client_spec.rb
@@ -762,15 +763,16 @@ files:
 - spec/lib/contentful/management/environment_spec.rb
 - spec/lib/contentful/management/error_class_spec.rb
 - spec/lib/contentful/management/locale_spec.rb
+- spec/lib/contentful/management/organization_periodic_usage_spec.rb
 - spec/lib/contentful/management/organization_spec.rb
 - spec/lib/contentful/management/personal_access_token_spec.rb
 - spec/lib/contentful/management/role_spec.rb
 - spec/lib/contentful/management/snapshot_spec.rb
 - spec/lib/contentful/management/space_membership_spec.rb
+- spec/lib/contentful/management/space_periodic_usage_spec.rb
 - spec/lib/contentful/management/space_spec.rb
 - spec/lib/contentful/management/ui_extension_spec.rb
 - spec/lib/contentful/management/upload_spec.rb
-- spec/lib/contentful/management/usage_period_spec.rb
 - spec/lib/contentful/management/user_spec.rb
 - spec/lib/contentful/management/webhook_calls_spec.rb
 - spec/lib/contentful/management/webhook_health_spec.rb
@@ -835,7 +837,6 @@ test_files:
 - spec/fixtures/vcr_cassettes/api_key/find_for_space_not_found.yml
 - spec/fixtures/vcr_cassettes/api_key/issue_189.yml
 - spec/fixtures/vcr_cassettes/api_key/preview.yml
-- 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
@@ -1049,6 +1050,8 @@ test_files:
 - spec/fixtures/vcr_cassettes/locale/update_code.yml
 - spec/fixtures/vcr_cassettes/locale/update_name.yml
 - spec/fixtures/vcr_cassettes/organization/all.yml
+- spec/fixtures/vcr_cassettes/organization_periodic_usage/all.yml
+- spec/fixtures/vcr_cassettes/organization_periodic_usage/filters.yml
 - spec/fixtures/vcr_cassettes/personal_access_token/all.yml
 - spec/fixtures/vcr_cassettes/personal_access_token/create.yml
 - spec/fixtures/vcr_cassettes/personal_access_token/find.yml
@@ -1124,6 +1127,8 @@ test_files:
 - spec/fixtures/vcr_cassettes/space_memberships/delete.yml
 - spec/fixtures/vcr_cassettes/space_memberships/find.yml
 - spec/fixtures/vcr_cassettes/space_memberships/find_2.yml
+- spec/fixtures/vcr_cassettes/space_periodic_usage/all.yml
+- spec/fixtures/vcr_cassettes/space_periodic_usage/filters.yml
 - spec/fixtures/vcr_cassettes/ui_extension/all.yml
 - spec/fixtures/vcr_cassettes/ui_extension/create.yml
 - spec/fixtures/vcr_cassettes/ui_extension/create_parameters.yml
@@ -1135,7 +1140,6 @@ test_files:
 - spec/fixtures/vcr_cassettes/upload/destroy.yml
 - spec/fixtures/vcr_cassettes/upload/find.yml
 - spec/fixtures/vcr_cassettes/upload/find_not_found.yml
-- spec/fixtures/vcr_cassettes/usage_period/all.yml
 - spec/fixtures/vcr_cassettes/user/find.yml
 - spec/fixtures/vcr_cassettes/webhook/all.yml
 - spec/fixtures/vcr_cassettes/webhook/create.yml
@@ -1154,7 +1158,6 @@ test_files:
 - spec/fixtures/vcr_cassettes/webhook_call/find_not_found.yml
 - spec/fixtures/vcr_cassettes/webhook_health/find.yml
 - spec/lib/contentful/management/api_key_spec.rb
-- spec/lib/contentful/management/api_usage_spec.rb
 - spec/lib/contentful/management/array_spec.rb
 - spec/lib/contentful/management/asset_spec.rb
 - spec/lib/contentful/management/client_spec.rb
@@ -1164,15 +1167,16 @@ test_files:
 - spec/lib/contentful/management/environment_spec.rb
 - spec/lib/contentful/management/error_class_spec.rb
 - spec/lib/contentful/management/locale_spec.rb
+- spec/lib/contentful/management/organization_periodic_usage_spec.rb
 - spec/lib/contentful/management/organization_spec.rb
 - spec/lib/contentful/management/personal_access_token_spec.rb
 - spec/lib/contentful/management/role_spec.rb
 - spec/lib/contentful/management/snapshot_spec.rb
 - spec/lib/contentful/management/space_membership_spec.rb
+- spec/lib/contentful/management/space_periodic_usage_spec.rb
 - spec/lib/contentful/management/space_spec.rb
 - spec/lib/contentful/management/ui_extension_spec.rb
 - spec/lib/contentful/management/upload_spec.rb
-- spec/lib/contentful/management/usage_period_spec.rb
 - spec/lib/contentful/management/user_spec.rb
 - spec/lib/contentful/management/webhook_calls_spec.rb
 - spec/lib/contentful/management/webhook_health_spec.rb

data/spec/fixtures/vcr_cassettes/api_usage/all.yml

@@ -1,155 +0,0 @@
----
-http_interactions:
-- request:
-    method: get
-    uri: https://api.contentful.com/organizations/org_id/usages/organization?filters%5Bmetric%5D=cda&filters%5BusagePeriod%5D=1
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      X-Contentful-User-Agent:
-      - sdk contentful-management.rb/2.5.0; platform ruby/2.4.1; os macOS/16;
-      Authorization:
-      - Bearer <ACCESS_TOKEN>
-      Content-Type:
-      - application/vnd.contentful.management.v1+json
-      X-Contentful-Enable-Alpha-Feature:
-      - usage-insights
-      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
-      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
-      Content-Type:
-      - application/vnd.contentful.management.v1+json
-      Contentful-Api:
-      - cma
-      Date:
-      - Sat, 10 Nov 2018 10:47:53 GMT
-      Etag:
-      - W/"efdf341b30e8c442ecb1bfe1b7f21817"
-      Referrer-Policy:
-      - strict-origin-when-cross-origin
-      Server:
-      - Contentful
-      Strict-Transport-Security:
-      - max-age=15768000
-      X-Content-Type-Options:
-      - nosniff
-      X-Contentful-Request-Id:
-      - 26c4437bd5b8c12ee6b71ad955dd7339
-      X-Download-Options:
-      - noopen
-      X-Frame-Options:
-      - ALLOWALL
-      X-Permitted-Cross-Domain-Policies:
-      - none
-      X-Xss-Protection:
-      - 1; mode=block
-      Content-Length:
-      - '959'
-      Connection:
-      - Close
-      Set-Cookie:
-      - incap_ses_728_673446=17XUL5vN1wivb82OzmAaCli35lsAAAAAbBLg2M0OjfGoassR05osmA==;
-        path=/; Domain=.contentful.com
-      - nlbi_673446=r1SmH3jioiwG5xWr6lKYhQAAAAB3pI+2F+Uz7kJVuxNgDetk; path=/; Domain=.contentful.com
-      - visid_incap_673446=BbPQYzUTTGyyIO44A0XYili35lsAAAAAQUIPAAAAAABSSTQWr6HEWN7pTaZKxfmU;
-        expires=Sat, 09 Nov 2019 14:12:09 GMT; path=/; Domain=.contentful.com
-      X-Iinfo:
-      - 3-12615349-12615354 NNNN CT(0 0 0) RT(1541846872399 65) q(0 0 0 -1) r(1 1)
-        U5
-      X-Cdn:
-      - Incapsula
-    body:
-      encoding: ASCII-8BIT
-      string: |+
-        {
-          "total":1,
-          "limit":25,
-          "skip":0,
-          "sys":{
-            "type":"Array"
-          },
-          "items":[
-            {
-              "unitOfMeasure":"apiRequests",
-              "interval":"daily",
-              "usage":[
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                9423,
-                49300,
-                12546,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0
-              ],
-              "sys":{
-                "type":"ApiUsage",
-                "id":"1_org_id",
-                "organization":{
-                  "sys":{
-                    "type":"Link",
-                    "linkType":"Organization",
-                    "id":"org_id"
-                  }
-                },
-                "usagePeriod":{
-                  "sys":{
-                    "type":"Link",
-                    "linkType":"UsagePeriod",
-                    "id":"1"
-                  }
-                }
-              }
-            }
-          ]
-        }
-
-    http_version: 
-  recorded_at: Sat, 10 Nov 2018 10:47:53 GMT
-recorded_with: VCR 4.0.0

data/spec/fixtures/vcr_cassettes/usage_period/all.yml

@@ -1,114 +0,0 @@
----
-http_interactions:
-- request:
-    method: get
-    uri: https://api.contentful.com/organizations/org_id/usage_periods
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      X-Contentful-User-Agent:
-      - sdk contentful-management.rb/2.5.0; platform ruby/2.4.1; os macOS/16;
-      Authorization:
-      - Bearer <ACCESS_TOKEN>
-      Content-Type:
-      - application/vnd.contentful.management.v1+json
-      X-Contentful-Enable-Alpha-Feature:
-      - usage-insights
-      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
-      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
-      Content-Type:
-      - application/vnd.contentful.management.v1+json
-      Contentful-Api:
-      - cma
-      Date:
-      - Sat, 10 Nov 2018 10:59:12 GMT
-      Etag:
-      - W/"0e32a37f3690af7bd68571521823b4c3"
-      Referrer-Policy:
-      - strict-origin-when-cross-origin
-      Server:
-      - Contentful
-      Strict-Transport-Security:
-      - max-age=15768000
-      X-Content-Type-Options:
-      - nosniff
-      X-Contentful-Request-Id:
-      - 9e2af1c902719cf6251824eb8bad9a5b
-      X-Download-Options:
-      - noopen
-      X-Frame-Options:
-      - ALLOWALL
-      X-Permitted-Cross-Domain-Policies:
-      - none
-      X-Xss-Protection:
-      - 1; mode=block
-      Content-Length:
-      - '347'
-      Connection:
-      - Close
-      Set-Cookie:
-      - incap_ses_728_673446=emwoQG4P7gsAZ9COzmAaCv+55lsAAAAA12p7HXlIfXdD2z8IqJzDPw==;
-        path=/; Domain=.contentful.com
-      - nlbi_673446=JuK/CqPU8mAD0NE+6lKYhQAAAAAeh+9STttZdZDE0eCH49c3; path=/; Domain=.contentful.com
-      - visid_incap_673446=3rYhv3e6Tf2l54SFmGsgOP+55lsAAAAAQUIPAAAAAAA6Tug0qWXjQ5TjaPxx4YJR;
-        expires=Sat, 09 Nov 2019 14:12:09 GMT; path=/; Domain=.contentful.com
-      X-Iinfo:
-      - 6-10352937-10352945 NNNN CT(90 182 0) RT(1541847550884 85) q(0 0 3 -1) r(5
-        5) U5
-      X-Cdn:
-      - Incapsula
-    body:
-      encoding: ASCII-8BIT
-      string: |+
-        {
-          "total":2,
-          "sys":{
-            "type":"Array"
-          },
-          "items":[
-            {
-              "startDate":"2018-11-01",
-              "endDate":null,
-              "sys":{
-                "type":"UsagePeriod",
-                "id":"2"
-              }
-            },
-            {
-              "startDate":"2018-10-01",
-              "endDate":"2018-10-31",
-              "sys":{
-                "type":"UsagePeriod",
-                "id":"1"
-              }
-            }
-          ]
-        }
-
-    http_version: 
-  recorded_at: Sat, 10 Nov 2018 10:59:12 GMT
-recorded_with: VCR 4.0.0