contentful-management 1.10.1 → 2.0.0

data/lib/contentful/management/client_editor_interface_methods_factory.rb

@@ -1,5 +1,5 @@
-require_relative 'client_association_methods_factory'
 require_relative 'editor_interface'
+require_relative 'client_association_methods_factory'
 
 module Contentful
   module Management
@@ -8,20 +8,26 @@ module Contentful
     class ClientEditorInterfaceMethodsFactory
       attr_reader :client
 
-      def initialize(client)
+      def initialize(client, space_id, environment_id, content_type_id)
         @client = client
         @resource_requester = ResourceRequester.new(client, associated_class)
+        @space_id = space_id
+        @environment_id = environment_id
+        @content_type_id = content_type_id
       end
 
       # Gets the Default Editor Interface
       #
-      # @param [String] space_id
-      # @param [String] content_type_id
       # @see _ For complete option list: https://www.contentful.com/developers/docs/references/content-delivery-api/#/reference/search-parameters
       #
       # @return [Contentful::Management::EditorInterface]
-      def default(space_id, content_type_id)
-        @resource_requester.all(space_id: space_id, content_type_id: content_type_id, editor_id: 'default')
+      def default
+        @resource_requester.all(
+          space_id: @space_id,
+          environment_id: @environment_id,
+          content_type_id: @content_type_id,
+          editor_id: 'default'
+        )
       end
 
       private

data/lib/contentful/management/client_entry_methods_factory.rb

@@ -1,5 +1,4 @@
 require_relative 'client_association_methods_factory'
-require_relative 'client_association_all_published_method_factory'
 
 module Contentful
   module Management
@@ -7,10 +6,9 @@ module Contentful
     # @private
     class ClientEntryMethodsFactory
       include Contentful::Management::ClientAssociationMethodsFactory
-      include Contentful::Management::ClientAssociationAllPublishedMethodsFactory
 
       def create(content_type, attributes)
-        associated_class.create(client, content_type.space.id, attributes.merge(content_type: content_type))
+        associated_class.create(client, @space_id, @environment_id, attributes.merge(content_type: content_type))
       end
 
       def new(*)

data/lib/contentful/management/client_environment_methods_factory.rb

@@ -0,0 +1,59 @@
+require_relative 'environment'
+require_relative 'resource_requester'
+
+module Contentful
+  module Management
+    # Wrapper for Environment API for usage from within Client
+    # @private
+    class ClientEnvironmentMethodsFactory
+      attr_reader :client
+
+      def initialize(client, space_id)
+        @client = client
+        @space_id = space_id
+        @resource_requester = ResourceRequester.new(client, associated_class)
+      end
+
+      # Gets a collection of environments.
+      #
+      # @return [Contentful::Management::Array<Contentful::Management::Environment>]
+      def all
+        @resource_requester.all(
+          space_id: @space_id
+        )
+      end
+
+      # Gets a specific environment.
+      #
+      # @param [String] environment_id
+      #
+      # @return [Contentful::Management::Environment]
+      def find(environment_id)
+        @resource_requester.find(
+          space_id: @space_id,
+          environment_id: environment_id
+        )
+      end
+
+      # Create an environment.
+      #
+      # @param [Hash] attributes
+      # @option attributes [String] :name
+      #
+      # @return [Contentful::Management::Environment]
+      def create(attributes)
+        associated_class.create(client, @space_id, attributes)
+      end
+
+      def new
+        object = associated_class.new
+        object.client = client
+        object
+      end
+
+      def associated_class
+        ::Contentful::Management::Environment
+      end
+    end
+  end
+end

data/lib/contentful/management/client_organization_methods_factory.rb

@@ -16,7 +16,7 @@ module Contentful
       end
 
       def all(*)
-        super(nil)
+        super
       end
     end
   end

data/lib/contentful/management/client_personal_access_tokens_methods_factory.rb

@@ -12,15 +12,15 @@ module Contentful
       end
 
       def all(params = {})
-        super(nil, params)
+        super(params)
       end
 
       def find(personal_access_token_id)
-        super(nil, personal_access_token_id)
+        super(personal_access_token_id)
       end
 
       def create(attributes)
-        super(nil, attributes)
+        super(attributes)
       end
     end
   end

data/lib/contentful/management/client_role_methods_factory.rb

@@ -10,6 +10,14 @@ module Contentful
       def new(*)
         fail 'Not supported'
       end
+
+      def find(resource_id)
+        associated_class.find(client, @space_id, resource_id)
+      end
+
+      def create(attributes)
+        associated_class.create(client, @space_id, attributes)
+      end
     end
   end
 end

data/lib/contentful/management/client_snapshot_methods_factory.rb

@@ -7,8 +7,8 @@ module Contentful
     class ClientSnapshotMethodsFactory
       include Contentful::Management::ClientAssociationMethodsFactory
 
-      def initialize(client, resource_type)
-        super(client)
+      def initialize(client, space_id, environment_id, resource_type)
+        super(client, space_id, environment_id)
         @resource_type = resource_type
       end
 
@@ -16,21 +16,23 @@ module Contentful
         fail 'Not supported'
       end
 
-      def all(space_id, resource_id, params = {})
+      def all(resource_id, params = {})
         @resource_requester.all(
           {
             resource_type: @resource_type,
-            space_id: space_id,
+            space_id: @space_id,
+            environment_id: @environment_id,
             resource_id: resource_id
           },
           params
         )
       end
 
-      def find(space_id, resource_id, snapshot_id)
+      def find(resource_id, snapshot_id)
         @resource_requester.find(
           resource_type: @resource_type,
-          space_id: space_id,
+          space_id: @space_id,
+          environment_id: @environment_id,
           resource_id: resource_id,
           snapshot_id: snapshot_id
         )

data/lib/contentful/management/client_space_methods_factory.rb

@@ -16,9 +16,7 @@ module Contentful
       #
       # @return [Contentful::Management::Array<Contentful::Management::Space>]
       def all
-        spaces = @resource_requester.all
-        client.update_dynamic_entry_cache_for_spaces!(spaces)
-        spaces
+        @resource_requester.all
       end
 
       # Gets a specific space.
@@ -27,9 +25,7 @@ module Contentful
       #
       # @return [Contentful::Management::Space]
       def find(space_id)
-        space = @resource_requester.find(space_id: space_id)
-        client.update_dynamic_entry_cache_for_space!(space) if space.is_a? Space
-        space
+        @resource_requester.find(space_id: space_id)
       end
 
       # Create a space.

data/lib/contentful/management/client_upload_methods_factory.rb

@@ -14,6 +14,14 @@ module Contentful
       def all(*)
         fail 'Not supported'
       end
+
+      def find(resource_id)
+        associated_class.find(client, @space_id, resource_id)
+      end
+
+      def create(attributes)
+        associated_class.create(client, @space_id, attributes)
+      end
     end
   end
 end

data/lib/contentful/management/client_user_methods_factory.rb

@@ -12,7 +12,7 @@ module Contentful
       end
 
       def find(user_id)
-        super(nil, user_id)
+        super(user_id)
       end
 
       def me

data/lib/contentful/management/client_webhook_call_methods_factory.rb

@@ -7,17 +7,22 @@ module Contentful
     class ClientWebhookCallMethodsFactory
       include Contentful::Management::ClientAssociationMethodsFactory
 
-      def all(space_id, webhook_id, _params = {})
+      def initialize(client, space_id, webhook_id)
+        super(client, space_id)
+        @webhook_id = webhook_id
+      end
+
+      def all(_params = {})
         @resource_requester.find(
-          space_id: space_id,
-          webhook_id: webhook_id
+          space_id: @space_id,
+          webhook_id: @webhook_id
         )
       end
 
-      def find(space_id, webhook_id, call_id)
+      def find(call_id)
         @resource_requester.find(
-          space_id: space_id,
-          webhook_id: webhook_id,
+          space_id: @space_id,
+          webhook_id: @webhook_id,
           call_id: call_id
         )
       end

data/lib/contentful/management/client_webhook_health_methods_factory.rb

@@ -12,9 +12,9 @@ module Contentful
         fail 'Not supported'
       end
 
-      def find(space_id, webhook_id)
+      def find(webhook_id)
         @resource_requester.find(
-          space_id: space_id,
+          space_id: @space_id,
           webhook_id: webhook_id
         )
       end

data/lib/contentful/management/client_webhook_methods_factory.rb

@@ -10,6 +10,14 @@ module Contentful
       def new(*)
         fail 'Not supported'
       end
+
+      def find(resource_id)
+        associated_class.find(client, @space_id, resource_id)
+      end
+
+      def create(attributes)
+        associated_class.create(client, @space_id, attributes)
+      end
     end
   end
 end

data/lib/contentful/management/content_type.rb

@@ -1,12 +1,13 @@
-require_relative 'resource'
 require_relative 'field'
+require_relative 'support'
+require_relative 'resource'
 require_relative 'validation'
+require_relative 'resource/publisher'
+require_relative 'resource/all_published'
+require_relative 'resource/environment_aware'
 require_relative 'content_type_entry_methods_factory'
-require_relative 'content_type_editor_interface_methods_factory'
 require_relative 'content_type_snapshot_methods_factory'
-require_relative 'support'
-require_relative 'resource/all_published'
-require_relative 'resource/publisher'
+require_relative 'content_type_editor_interface_methods_factory'
 
 module Contentful
   module Management
@@ -28,10 +29,11 @@ module Contentful
       ].freeze
 
       include Contentful::Management::Resource
-      include Contentful::Management::Resource::SystemProperties
       include Contentful::Management::Resource::Refresher
       include Contentful::Management::Resource::Publisher
       extend Contentful::Management::Resource::AllPublished
+      include Contentful::Management::Resource::EnvironmentAware
+      include Contentful::Management::Resource::SystemProperties
 
       property :name, :string
       property :description, :string
@@ -79,7 +81,7 @@ module Contentful
         if id
           update(@properties)
         else
-          new_instance = self.class.create(client, space.id, @properties)
+          new_instance = self.class.create(client, space.id, environment_id, @properties)
           refresh_data(new_instance)
         end
       end

data/lib/contentful/management/content_type_editor_interface_methods_factory.rb

@@ -10,12 +10,16 @@ module Contentful
 
       # @private
       def initialize(content_type)
-        @content_type = content_type
-        @editor_interfaces_client = ClientEditorInterfaceMethodsFactory.new(content_type.client)
+        @editor_interfaces_client = ClientEditorInterfaceMethodsFactory.new(
+          content_type.client,
+          content_type.space.id,
+          content_type.environment_id,
+          content_type.id
+        )
       end
 
       def default
-        editor_interfaces_client.default(content_type.space.id, content_type.id)
+        editor_interfaces_client.default
       end
     end
   end

data/lib/contentful/management/content_type_entry_methods_factory.rb

@@ -23,7 +23,7 @@ module Contentful
       #
       # @return [Contentful::Management::Array<Contentful::Management::Entry>]
       def all(params = {})
-        Entry.all(content_type.client, content_type.space.id, params.merge(content_type: content_type.id))
+        Entry.all(content_type.client, content_type.space.id, content_type.environment_id, params.merge(content_type: content_type.id))
       end
 
       # Creates an entry for a content type.
@@ -33,7 +33,7 @@ module Contentful
       # @return [Contentful::Management::Entry]
       def create(attributes)
         attributes[:content_type] = content_type
-        Entry.create(content_type.client, content_type.space.id, attributes)
+        Entry.create(content_type.client, content_type.space.id, content_type.environment_id, attributes)
       end
 
       # Instantiates an empty entry for a content type.

data/lib/contentful/management/content_type_snapshot_methods_factory.rb

@@ -18,7 +18,14 @@ module Contentful
       #
       # @return [Contentful::Management::Array<Contentful::Management::Snapshot>]
       def all(params = {})
-        Snapshot.all(content_type.client, content_type.space.id, content_type.id, 'content_types', params)
+        Snapshot.all(
+          content_type.client,
+          content_type.space.id,
+          content_type.environment_id,
+          content_type.id,
+          'content_types',
+          params
+        )
       end
 
       # Gets a snapshot by ID for a specific content type.
@@ -28,7 +35,14 @@ module Contentful
       #
       # @return [Contentful::Management::Array<Contentful::Management::Snapshot>]
       def find(snapshot_id)
-        Snapshot.find(content_type.client, content_type.space.id, content_type.id, snapshot_id, 'content_types')
+        Snapshot.find(
+          content_type.client,
+          content_type.space.id,
+          content_type.environment_id,
+          content_type.id,
+          snapshot_id,
+          'content_types'
+        )
       end
     end
   end

data/lib/contentful/management/dynamic_entry.rb

@@ -1,6 +1,6 @@
 require_relative 'resource'
-require_relative 'resource/fields'
 require_relative 'location'
+require_relative 'resource/fields'
 
 module Contentful
   module Management

data/lib/contentful/management/editor_interface.rb

@@ -1,12 +1,14 @@
 require_relative 'resource'
+require_relative 'resource/environment_aware'
 
 module Contentful
   module Management
     # Resource class for Editor Interface.
     class EditorInterface
       include Contentful::Management::Resource
-      include Contentful::Management::Resource::SystemProperties
       include Contentful::Management::Resource::Refresher
+      include Contentful::Management::Resource::SystemProperties
+      include Contentful::Management::Resource::EnvironmentAware
 
       property :controls, :array
 
@@ -17,8 +19,8 @@ module Contentful
       # @param [String] content_type_id
       #
       # @return [Contentful::Management::EditorInterface]
-      def self.default(client, space_id, content_type_id)
-        ClientEditorInterfaceMethodsFactory.new(client).default(space_id, content_type_id)
+      def self.default(client, space_id, environment_id, content_type_id)
+        ClientEditorInterfaceMethodsFactory.new(client, space_id, environment_id, content_type_id).default
       end
 
       # Finds an EditorInterface.
@@ -43,9 +45,10 @@ module Contentful
       # @private
       def self.build_endpoint(endpoint_options)
         space_id = endpoint_options.fetch(:space_id)
+        environment_id = endpoint_options.fetch(:environment_id)
         content_type_id = endpoint_options.fetch(:content_type_id)
 
-        "spaces/#{space_id}/content_types/#{content_type_id}/editor_interface"
+        "spaces/#{space_id}/environments/#{environment_id}/content_types/#{content_type_id}/editor_interface"
       end
 
       # Updates an Editor Interface
@@ -57,7 +60,12 @@ module Contentful
       def update(attributes)
         ResourceRequester.new(client, self.class).update(
           self,
-          { space_id: space.id, content_type_id: content_type.id, editor_id: id },
+          {
+            space_id: space.id,
+            environment_id: environment_id,
+            content_type_id: content_type.id,
+            editor_id: id
+          },
           { 'controls' => attributes.fetch(:controls) },
           version: sys[:version]
         )
@@ -73,7 +81,7 @@ module Contentful
       protected
 
       def refresh_find
-        self.class.default(client, space.id, content_type.id)
+        self.class.default(client, space.id, environment_id, content_type.id)
       end
 
       def query_attributes(attributes)