contentful-management 1.10.1 → 2.0.0

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

@@ -11,7 +11,7 @@ module Contentful
       let(:pixel_path) { ::File.join('spec', 'fixtures', 'pixel.jpg') }
       let!(:client) { Client.new(token) }
 
-      subject { client.uploads }
+      subject { client.uploads(space_id) }
 
       describe '.find' do
         it 'class method also works' do
@@ -23,21 +23,21 @@ module Contentful
         end
         it 'returns a Contentful::Management::Upload' do
           vcr('upload/find') {
-            upload = subject.find(space_id, upload_id)
+            upload = subject.find(upload_id)
             expect(upload).to be_kind_of Contentful::Management::Upload
             expect(upload.id).to eq upload_id
           }
         end
         it 'returns upload for a given key' do
           vcr('upload/find') do
-            upload = subject.find(space_id, upload_id)
+            upload = subject.find(upload_id)
             expect(upload).to be_kind_of Contentful::Management::Upload
             expect(upload.id).to eq upload_id
           end
         end
         it 'returns an error when upload does not exist' do
           vcr('upload/find_not_found') do
-            result = subject.find(space_id, 'not_exist')
+            result = subject.find('not_exist')
             expect(result).to be_kind_of Contentful::Management::NotFound
           end
         end
@@ -47,7 +47,7 @@ module Contentful
         it 'creates an upload from a ::File' do
           vcr('upload/create_file') do
             ::File.open(pixel_path, 'rb') do |f|
-              upload = subject.create(space_id, f)
+              upload = subject.create(f)
               expect(upload).to be_kind_of Contentful::Management::Upload
             end
           end
@@ -55,21 +55,21 @@ module Contentful
 
         it 'creates an upload from a /path/to/file' do
           vcr('upload/create_path') do
-            upload = subject.create(space_id, pixel_path)
+            upload = subject.create(pixel_path)
             expect(upload).to be_kind_of Contentful::Management::Upload
           end
         end
 
         it 'an upload can be associated to an asset' do
           vcr('upload/associate_with_asset') do
-            upload = subject.create(space_id, pixel_path)
+            upload = subject.create(pixel_path)
 
             file = Contentful::Management::File.new
             file.properties[:contentType] = 'image/jpeg'
             file.properties[:fileName] = 'pixel'
             file.properties[:uploadFrom] = upload.to_link_json
 
-            asset = client.assets.create(space_id, title: 'pixel', file: file)
+            asset = client.assets(space_id, 'master').create(title: 'pixel', file: file)
             asset.process_file
             asset.reload
 
@@ -81,7 +81,7 @@ module Contentful
       describe '#destroy' do
         it 'returns true' do
           vcr('upload/destroy') do
-            upload = subject.find(space_id, upload_id)
+            upload = subject.find(upload_id)
             result = upload.destroy
             expect(result).to eq true
           end

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

@@ -11,18 +11,18 @@ module Contentful
       let(:webhook_call_id) { '6r2EQ0iVBmYyyq0UMWKoge' }
       let!(:client) { Client.new(token) }
 
-      subject { client.webhook_calls }
+      subject { client.webhook_calls(space_id, webhook_id) }
 
       describe '.all' do
         it 'class method also works' do
           vcr('webhook_call/all') { expect(Contentful::Management::WebhookCall.all(client, space_id, webhook_id)).to be_kind_of Contentful::Management::Array }
         end
         it 'returns a Contentful::Array' do
-          vcr('webhook_call/all') { expect(subject.all(space_id, webhook_id)).to be_kind_of Contentful::Management::Array }
+          vcr('webhook_call/all') { expect(subject.all).to be_kind_of Contentful::Management::Array }
         end
         it 'builds a Contentful::Management::WebhookCall object' do
           vcr('webhook_call/all') {
-            webhook_call = subject.all(space_id, webhook_id).first
+            webhook_call = subject.all.first
 
             expect(webhook_call).to be_kind_of Contentful::Management::WebhookCall
             expect(webhook_call.id).to be_truthy
@@ -41,11 +41,11 @@ module Contentful
           vcr('webhook_call/find') { expect(Contentful::Management::WebhookCall.find(client, space_id, webhook_id, webhook_call_id)).to be_kind_of Contentful::Management::WebhookCall }
         end
         it 'returns a Contentful::Management::WebhookCall' do
-          vcr('webhook_call/find') { expect(subject.find(space_id, webhook_id, webhook_call_id)).to be_kind_of Contentful::Management::WebhookCall }
+          vcr('webhook_call/find') { expect(subject.find(webhook_call_id)).to be_kind_of Contentful::Management::WebhookCall }
         end
         it 'returns webhook for a given id' do
           vcr('webhook_call/find') do
-            webhook_call = subject.find(space_id, webhook_id, webhook_call_id)
+            webhook_call = subject.find(webhook_call_id)
             expect(webhook_call.id).to eq webhook_call_id
             expect(webhook_call.status_code).to eq 201
             expect(webhook_call.event_type).to eq "publish"
@@ -59,7 +59,7 @@ module Contentful
         end
         it 'returns an error when call does not exists' do
           vcr('webhook_call/find_not_found') do
-            result = subject.find(space_id, webhook_id, 'not_exist')
+            result = subject.find('not_exist')
             expect(result).to be_kind_of Contentful::Management::NotFound
           end
         end

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

@@ -10,7 +10,7 @@ module Contentful
       let(:webhook_id) { '16ypL3XjNK6oreLPPoVBxI' }
       let!(:client) { Client.new(token) }
 
-      subject { client.webhook_health }
+      subject { client.webhook_health(space_id) }
 
       describe '.all' do
         it 'is not supported' do
@@ -29,11 +29,11 @@ module Contentful
           }
         end
         it 'returns a Contentful::Management::WebhookHealth' do
-          vcr('webhook_health/find') { expect(subject.find(space_id, webhook_id)).to be_kind_of Contentful::Management::WebhookHealth }
+          vcr('webhook_health/find') { expect(subject.find(webhook_id)).to be_kind_of Contentful::Management::WebhookHealth }
         end
         it 'returns webhook for a given id' do
           vcr('webhook_health/find') do
-            webhook_health = subject.find(space_id, webhook_id)
+            webhook_health = subject.find(webhook_id)
             expect(webhook_health.calls).to be_a ::Hash
 
             expect(webhook_health.calls['total']).to eq 2

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

@@ -10,17 +10,17 @@ module Contentful
       let(:webhook_id) { '0rK8ZNEOWLgYnO5gaah2pp' }
       let!(:client) { Client.new(token) }
 
-      subject { client.webhooks }
+      subject { client.webhooks(space_id) }
 
       describe '.all' do
         it 'class method also works' do
           vcr('webhook/all') { expect(Contentful::Management::Webhook.all(client, space_id)).to be_kind_of Contentful::Management::Array }
         end
         it 'returns a Contentful::Array' do
-          vcr('webhook/all') { expect(subject.all(space_id)).to be_kind_of Contentful::Management::Array }
+          vcr('webhook/all') { expect(subject.all).to be_kind_of Contentful::Management::Array }
         end
         it 'builds a Contentful::Management::Webhook object' do
-          vcr('webhook/all') { expect(subject.all(space_id).first).to be_kind_of Contentful::Management::Webhook }
+          vcr('webhook/all') { expect(subject.all.first).to be_kind_of Contentful::Management::Webhook }
         end
       end
 
@@ -29,17 +29,17 @@ module Contentful
           vcr('webhook/find') { expect(Contentful::Management::Webhook.find(client, space_id, webhook_id)).to be_kind_of Contentful::Management::Webhook }
         end
         it 'returns a Contentful::Management::Webhook' do
-          vcr('webhook/find') { expect(subject.find(space_id, webhook_id)).to be_kind_of Contentful::Management::Webhook }
+          vcr('webhook/find') { expect(subject.find(webhook_id)).to be_kind_of Contentful::Management::Webhook }
         end
         it 'returns webhook for a given key' do
           vcr('webhook/find') do
-            webhook = subject.find(space_id, webhook_id)
+            webhook = subject.find(webhook_id)
             expect(webhook.id).to eql webhook_id
           end
         end
         it 'returns an error when content_type does not exists' do
           vcr('webhook/find_not_found') do
-            result = subject.find(space_id, 'not_exist')
+            result = subject.find('not_exist')
             expect(result).to be_kind_of Contentful::Management::NotFound
           end
         end
@@ -48,20 +48,21 @@ module Contentful
       describe '.create' do
         it 'builds Contentful::Management::Webhook object' do
           vcr('webhook/create') do
-            webhook = subject.create(space_id, id: 'test_webhook', url: 'https://www.example3.com')
+            webhook = subject.create(id: 'test_webhook', url: 'https://www.example3.com')
             expect(webhook).to be_kind_of Contentful::Management::Webhook
             expect(webhook.url).to eq 'https://www.example3.com'
           end
         end
         it 'return error if url is already taken' do
           vcr('webhook/create_with_taken_url') do
-            webhook = subject.create(space_id, id: 'taken_webhook', url: 'https://www.example3.com')
+            webhook = subject.create(id: 'taken_webhook', url: 'https://www.example3.com')
             expect(webhook).to be_kind_of Contentful::Management::Error
           end
         end
         it 'can create webhooks with name and custom headers' do
           vcr('webhook/create_with_name_and_headers') do
-            webhook = subject.create(
+            webhook = described_class.create(
+              client,
               'zjvxmotjud5s',
               name: 'some_webhook',
               id: 'some_id',
@@ -81,7 +82,8 @@ module Contentful
         end
         it 'can create webhooks with specific topics' do
           vcr('webhook/topics') do
-            webhook = subject.create(
+            webhook = described_class.create(
+              client,
               'zjvxmotjud5s',
               name: 'test_topics',
               url: 'https://www.example3.com',
@@ -101,7 +103,7 @@ module Contentful
       describe '#update' do
         it 'all parameters' do
           vcr('webhook/update') do
-            webhook = subject.find(space_id, 'test_webhook')
+            webhook = subject.find('test_webhook')
             updated_webhook = webhook.update(url: 'https://www.example5.com',
                                              httpBasicUsername: 'test_username',
                                              httpBasicPassword: 'test_password')
@@ -115,7 +117,7 @@ module Contentful
       describe '#destroy' do
         it 'returns true' do
           vcr('webhook/destroy') do
-            webhook = subject.find(space_id, 'test_webhook')
+            webhook = subject.find('test_webhook')
             result = webhook.destroy
             expect(result).to eq true
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contentful-management
 version: !ruby/object:Gem::Version
-  version: 1.10.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Piotr Protas
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-16 00:00:00.000000000 Z
+date: 2018-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -303,6 +303,7 @@ files:
 - lib/contentful/management/client_content_type_methods_factory.rb
 - lib/contentful/management/client_editor_interface_methods_factory.rb
 - lib/contentful/management/client_entry_methods_factory.rb
+- 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_personal_access_tokens_methods_factory.rb
@@ -325,6 +326,14 @@ files:
 - lib/contentful/management/entry.rb
 - lib/contentful/management/entry_association_methods_factory.rb
 - lib/contentful/management/entry_snapshot_methods_factory.rb
+- lib/contentful/management/environment.rb
+- lib/contentful/management/environment_asset_methods_factory.rb
+- lib/contentful/management/environment_association_methods_factory.rb
+- lib/contentful/management/environment_content_type_methods_factory.rb
+- lib/contentful/management/environment_editor_interface_methods_factory.rb
+- lib/contentful/management/environment_entry_methods_factory.rb
+- lib/contentful/management/environment_locale_methods_factory.rb
+- lib/contentful/management/environment_ui_extension_methods_factory.rb
 - lib/contentful/management/error.rb
 - lib/contentful/management/field.rb
 - lib/contentful/management/file.rb
@@ -340,6 +349,7 @@ files:
 - lib/contentful/management/resource/array_like.rb
 - lib/contentful/management/resource/asset_fields.rb
 - lib/contentful/management/resource/entry_fields.rb
+- lib/contentful/management/resource/environment_aware.rb
 - lib/contentful/management/resource/field_aware.rb
 - lib/contentful/management/resource/fields.rb
 - lib/contentful/management/resource/publisher.rb
@@ -352,17 +362,11 @@ files:
 - lib/contentful/management/snapshot.rb
 - lib/contentful/management/space.rb
 - lib/contentful/management/space_api_key_methods_factory.rb
-- lib/contentful/management/space_asset_methods_factory.rb
-- lib/contentful/management/space_association_all_published_method_factory.rb
 - lib/contentful/management/space_association_methods_factory.rb
-- lib/contentful/management/space_content_type_methods_factory.rb
-- lib/contentful/management/space_editor_interface_methods_factory.rb
-- lib/contentful/management/space_entry_methods_factory.rb
-- lib/contentful/management/space_locale_methods_factory.rb
+- lib/contentful/management/space_environment_methods_factory.rb
 - lib/contentful/management/space_membership.rb
 - lib/contentful/management/space_role_methods_factory.rb
 - lib/contentful/management/space_space_membership_methods_factory.rb
-- lib/contentful/management/space_ui_extension_methods_factory.rb
 - lib/contentful/management/space_webhook_methods_factory.rb
 - lib/contentful/management/support.rb
 - lib/contentful/management/ui_extension.rb
@@ -408,7 +412,6 @@ files:
 - spec/fixtures/vcr_cassettes/array_page_1.yml
 - spec/fixtures/vcr_cassettes/asset/143_assets_next_page.yml
 - spec/fixtures/vcr_cassettes/asset/all.yml
-- spec/fixtures/vcr_cassettes/asset/all_public.yml
 - spec/fixtures/vcr_cassettes/asset/archive.yml
 - spec/fixtures/vcr_cassettes/asset/archive_published.yml
 - spec/fixtures/vcr_cassettes/asset/archived_false.yml
@@ -512,7 +515,6 @@ files:
 - spec/fixtures/vcr_cassettes/editor_interfaces/default_for_space.yml
 - spec/fixtures/vcr_cassettes/editor_interfaces/update.yml
 - spec/fixtures/vcr_cassettes/entry/all.yml
-- spec/fixtures/vcr_cassettes/entry/all_public.yml
 - spec/fixtures/vcr_cassettes/entry/archive.yml
 - spec/fixtures/vcr_cassettes/entry/archive_published.yml
 - spec/fixtures/vcr_cassettes/entry/archived_false.yml
@@ -584,6 +586,12 @@ files:
 - spec/fixtures/vcr_cassettes/entry/update_bool_field.yml
 - spec/fixtures/vcr_cassettes/entry/update_unlocalized_field.yml
 - spec/fixtures/vcr_cassettes/entry/update_with_custom_locale.yml
+- spec/fixtures/vcr_cassettes/environment/all.yml
+- spec/fixtures/vcr_cassettes/environment/create.yml
+- spec/fixtures/vcr_cassettes/environment/destroy.yml
+- spec/fixtures/vcr_cassettes/environment/find.yml
+- spec/fixtures/vcr_cassettes/environment/find_2.yml
+- spec/fixtures/vcr_cassettes/environment/not_found.yml
 - spec/fixtures/vcr_cassettes/get_request.yml
 - spec/fixtures/vcr_cassettes/locale/all_for_space.yml
 - spec/fixtures/vcr_cassettes/locale/create_for_space.yml
@@ -703,6 +711,7 @@ files:
 - spec/lib/contentful/management/content_type_spec.rb
 - spec/lib/contentful/management/editor_interface_spec.rb
 - spec/lib/contentful/management/entry_spec.rb
+- 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_spec.rb
@@ -740,7 +749,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: contentful management api
@@ -778,7 +787,6 @@ test_files:
 - spec/fixtures/vcr_cassettes/array_page_1.yml
 - spec/fixtures/vcr_cassettes/asset/143_assets_next_page.yml
 - spec/fixtures/vcr_cassettes/asset/all.yml
-- spec/fixtures/vcr_cassettes/asset/all_public.yml
 - spec/fixtures/vcr_cassettes/asset/archive.yml
 - spec/fixtures/vcr_cassettes/asset/archive_published.yml
 - spec/fixtures/vcr_cassettes/asset/archived_false.yml
@@ -882,7 +890,6 @@ test_files:
 - spec/fixtures/vcr_cassettes/editor_interfaces/default_for_space.yml
 - spec/fixtures/vcr_cassettes/editor_interfaces/update.yml
 - spec/fixtures/vcr_cassettes/entry/all.yml
-- spec/fixtures/vcr_cassettes/entry/all_public.yml
 - spec/fixtures/vcr_cassettes/entry/archive.yml
 - spec/fixtures/vcr_cassettes/entry/archive_published.yml
 - spec/fixtures/vcr_cassettes/entry/archived_false.yml
@@ -954,6 +961,12 @@ test_files:
 - spec/fixtures/vcr_cassettes/entry/update_bool_field.yml
 - spec/fixtures/vcr_cassettes/entry/update_unlocalized_field.yml
 - spec/fixtures/vcr_cassettes/entry/update_with_custom_locale.yml
+- spec/fixtures/vcr_cassettes/environment/all.yml
+- spec/fixtures/vcr_cassettes/environment/create.yml
+- spec/fixtures/vcr_cassettes/environment/destroy.yml
+- spec/fixtures/vcr_cassettes/environment/find.yml
+- spec/fixtures/vcr_cassettes/environment/find_2.yml
+- spec/fixtures/vcr_cassettes/environment/not_found.yml
 - spec/fixtures/vcr_cassettes/get_request.yml
 - spec/fixtures/vcr_cassettes/locale/all_for_space.yml
 - spec/fixtures/vcr_cassettes/locale/create_for_space.yml
@@ -1073,6 +1086,7 @@ test_files:
 - spec/lib/contentful/management/content_type_spec.rb
 - spec/lib/contentful/management/editor_interface_spec.rb
 - spec/lib/contentful/management/entry_spec.rb
+- 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_spec.rb

data/lib/contentful/management/space_asset_methods_factory.rb

@@ -1,13 +0,0 @@
-require_relative 'space_association_methods_factory'
-require_relative 'space_association_all_published_method_factory'
-
-module Contentful
-  module Management
-    # Wrapper for Asset API for usage from within Space
-    # @private
-    class SpaceAssetMethodsFactory
-      include Contentful::Management::SpaceAssociationMethodsFactory
-      include Contentful::Management::SpaceAssociationAllPublishedMethodsFactory
-    end
-  end
-end

data/lib/contentful/management/space_association_all_published_method_factory.rb

@@ -1,12 +0,0 @@
-module Contentful
-  module Management
-    # Wrapper for /public API for usage from within Space Wrapper Classes
-    # @private
-    # @deprecated This call will be soon removed from the API except for Content Types
-    module SpaceAssociationAllPublishedMethodsFactory
-      def all_published(params = {})
-        associated_class.all_published(space.client, space.id, params)
-      end
-    end
-  end
-end

data/lib/contentful/management/space_content_type_methods_factory.rb

@@ -1,13 +0,0 @@
-require_relative 'space_association_methods_factory'
-require_relative 'space_association_all_published_method_factory'
-
-module Contentful
-  module Management
-    # Wrapper for ContentType API for usage from within Space
-    # @private
-    class SpaceContentTypeMethodsFactory
-      include Contentful::Management::SpaceAssociationMethodsFactory
-      include Contentful::Management::SpaceAssociationAllPublishedMethodsFactory
-    end
-  end
-end

data/lib/contentful/management/space_editor_interface_methods_factory.rb

@@ -1,21 +0,0 @@
-require_relative 'client_editor_interface_methods_factory'
-require_relative 'editor_interface'
-
-module Contentful
-  module Management
-    # Wrapper for EditorInterface API for usage from within Space
-    # @private
-    class SpaceEditorInterfaceMethodsFactory
-      attr_reader :space, :editor_interfaces_client
-
-      def initialize(space)
-        @space = space
-        @editor_interfaces_client = ClientEditorInterfaceMethodsFactory.new(space.client)
-      end
-
-      def default(content_type_id)
-        editor_interfaces_client.default(space.id, content_type_id)
-      end
-    end
-  end
-end

data/lib/contentful/management/space_entry_methods_factory.rb

@@ -1,21 +0,0 @@
-require_relative 'space_association_methods_factory'
-require_relative 'space_association_all_published_method_factory'
-
-module Contentful
-  module Management
-    # Wrapper for Entry API for usage from within Space
-    # @private
-    class SpaceEntryMethodsFactory
-      include Contentful::Management::SpaceAssociationMethodsFactory
-      include Contentful::Management::SpaceAssociationAllPublishedMethodsFactory
-
-      def create(_attributes)
-        fail 'Not supported'
-      end
-
-      def new
-        fail 'Not supported'
-      end
-    end
-  end
-end