contentful-management 1.10.1 → 2.0.0

data/lib/contentful/management/asset.rb

@@ -1,23 +1,24 @@
 require_relative 'resource'
-require_relative 'resource/asset_fields'
-require_relative 'resource/all_published'
 require_relative 'resource/fields'
 require_relative 'resource/archiver'
 require_relative 'resource/publisher'
+require_relative 'resource/asset_fields'
+require_relative 'resource/environment_aware'
 
 module Contentful
   module Management
     # Resource class for Asset.
     # @see _ https://www.contentful.com/developers/documentation/content-management-api/#resources-assets
     class Asset
-      include Contentful::Management::Resource
       extend Contentful::Management::Resource::AssetFields
-      extend Contentful::Management::Resource::AllPublished
+
+      include Contentful::Management::Resource
       include Contentful::Management::Resource::Fields
-      include Contentful::Management::Resource::SystemProperties
-      include Contentful::Management::Resource::Refresher
       include Contentful::Management::Resource::Archiver
+      include Contentful::Management::Resource::Refresher
       include Contentful::Management::Resource::Publisher
+      include Contentful::Management::Resource::SystemProperties
+      include Contentful::Management::Resource::EnvironmentAware
 
       # @private
       def self.client_association_class
@@ -53,7 +54,7 @@ module Contentful
         instance_variable_get(:@fields).keys.each do |locale|
           request = Request.new(
             client,
-            "spaces/#{space.id}/assets/#{id}/files/#{locale}/process",
+            process_url(locale),
             {},
             nil,
             version: sys[:version]
@@ -77,7 +78,7 @@ module Contentful
         end
       end
 
-      # Returns currently supported local or default locale.
+      # Returns currently supported locale or default locale.
       # @return [String] current_locale
       def locale
         sys && sys[:locale] ? sys[:locale] : default_locale
@@ -124,6 +125,10 @@ module Contentful
 
       protected
 
+      def process_url(locale_code)
+        "spaces/#{space.id}/environments/#{environment_id}/assets/#{id}/files/#{locale_code}/process"
+      end
+
       def query_attributes(attributes)
         self.title = attributes[:title] if attributes[:title]
         self.description = attributes[:description] if attributes[:description]

data/lib/contentful/management/client.rb

@@ -1,33 +1,34 @@
+require 'http'
+require 'json'
+require 'logger'
+require 'rbconfig'
+
+require_relative 'request'
+
 require 'contentful/management'
+require 'contentful/management/version'
 require 'contentful/management/response'
 require 'contentful/management/resource_builder'
 
-require 'contentful/management/version'
-
-require 'contentful/management/client_space_methods_factory'
-require 'contentful/management/client_space_membership_methods_factory'
-require 'contentful/management/client_organization_methods_factory'
+require 'contentful/management/client_role_methods_factory'
 require 'contentful/management/client_user_methods_factory'
-require 'contentful/management/client_api_key_methods_factory'
-require 'contentful/management/client_personal_access_tokens_methods_factory'
+require 'contentful/management/client_space_methods_factory'
 require 'contentful/management/client_asset_methods_factory'
-require 'contentful/management/client_content_type_methods_factory'
 require 'contentful/management/client_entry_methods_factory'
 require 'contentful/management/client_locale_methods_factory'
-require 'contentful/management/client_role_methods_factory'
-require 'contentful/management/client_ui_extension_methods_factory'
-require 'contentful/management/client_editor_interface_methods_factory'
+require 'contentful/management/client_upload_methods_factory'
+require 'contentful/management/client_api_key_methods_factory'
 require 'contentful/management/client_webhook_methods_factory'
+require 'contentful/management/client_snapshot_methods_factory'
+require 'contentful/management/client_environment_methods_factory'
+require 'contentful/management/client_organization_methods_factory'
+require 'contentful/management/client_content_type_methods_factory'
+require 'contentful/management/client_ui_extension_methods_factory'
 require 'contentful/management/client_webhook_call_methods_factory'
 require 'contentful/management/client_webhook_health_methods_factory'
-require 'contentful/management/client_upload_methods_factory'
-require 'contentful/management/client_snapshot_methods_factory'
-
-require_relative 'request'
-require 'http'
-require 'json'
-require 'logger'
-require 'rbconfig'
+require 'contentful/management/client_space_membership_methods_factory'
+require 'contentful/management/client_editor_interface_methods_factory'
+require 'contentful/management/client_personal_access_tokens_methods_factory'
 
 module Contentful
   module Management
@@ -48,7 +49,7 @@ module Contentful
         logger: false,
         log_level: Logger::INFO,
         raise_errors: false,
-        dynamic_entries: [],
+        dynamic_entries: {},
         disable_content_type_caching: false,
         proxy_host: nil,
         proxy_port: nil,
@@ -94,7 +95,7 @@ module Contentful
       end
 
       # Allows manipulation of spaces in context of the current client
-      # Allows listing all spaces for client and finding one by ID.
+      # Allows listing all spaces for client, creating new and finding one by ID.
       # @see _ README for details.
       #
       # @return [Contentful::Management::ClientSpaceMethodsFactory]
@@ -102,13 +103,22 @@ module Contentful
         ClientSpaceMethodsFactory.new(self)
       end
 
+      # Allows manipulation of environments in context of the current client
+      # Allows listing all environments for client, creating new and finding one by ID.
+      # @see _ README for details.
+      #
+      # @return [Contentful::Management::ClientEnvironmentMethodsFactory]
+      def environments(space_id)
+        ClientEnvironmentMethodsFactory.new(self, space_id)
+      end
+
       # Allows manipulation of space memberships in context of the current client
       # Allows listing all space memberships for client, creating new and finding one by ID.
       # @see _ README for details.
       #
       # @return [Contentful::Management::ClientSpaceMembershipMethodsFactory]
-      def space_memberships
-        ClientSpaceMembershipMethodsFactory.new(self)
+      def space_memberships(space_id)
+        ClientSpaceMembershipMethodsFactory.new(self, space_id)
       end
 
       # Allows viewing of organizations in context of the current client
@@ -134,8 +144,8 @@ module Contentful
       # @see _ README for details.
       #
       # @return [Contentful::Management::ClientApiKeyMethodsFactory]
-      def api_keys
-        ClientApiKeyMethodsFactory.new(self)
+      def api_keys(space_id)
+        ClientApiKeyMethodsFactory.new(self, space_id)
       end
 
       # Allows manipulation of personal access tokens in context of the current client
@@ -152,8 +162,8 @@ module Contentful
       # @see _ README for details.
       #
       # @return [Contentful::Management::ClientAssetMethodsFactory]
-      def assets
-        ClientAssetMethodsFactory.new(self)
+      def assets(space_id, environment_id)
+        ClientAssetMethodsFactory.new(self, space_id, environment_id)
       end
 
       # Allows manipulation of content types in context of the current client
@@ -161,8 +171,8 @@ module Contentful
       # @see _ README for details.
       #
       # @return [Contentful::Management::ClientContentTypeMethodsFactory]
-      def content_types
-        ClientContentTypeMethodsFactory.new(self)
+      def content_types(space_id, environment_id)
+        ClientContentTypeMethodsFactory.new(self, space_id, environment_id)
       end
 
       # Allows manipulation of entries in context of the current client
@@ -170,8 +180,8 @@ module Contentful
       # @see _ README for details.
       #
       # @return [Contentful::Management::ClientEntryMethodsFactory]
-      def entries
-        ClientEntryMethodsFactory.new(self)
+      def entries(space_id, environment_id)
+        ClientEntryMethodsFactory.new(self, space_id, environment_id)
       end
 
       # Allows manipulation of locales in context of the current client
@@ -179,8 +189,8 @@ module Contentful
       # @see _ README for details.
       #
       # @return [Contentful::Management::ClientLocaleMethodsFactory]
-      def locales
-        ClientLocaleMethodsFactory.new(self)
+      def locales(space_id, environment_id)
+        ClientLocaleMethodsFactory.new(self, space_id, environment_id)
       end
 
       # Allows manipulation of roles in context of the current client
@@ -188,8 +198,8 @@ module Contentful
       # @see _ README for details.
       #
       # @return [Contentful::Management::ClientRoleMethodsFactory]
-      def roles
-        ClientRoleMethodsFactory.new(self)
+      def roles(space_id)
+        ClientRoleMethodsFactory.new(self, space_id)
       end
 
       # Allows manipulation of UI extensions in context of the current client
@@ -197,8 +207,8 @@ module Contentful
       # @see _ README for details.
       #
       # @return [Contentful::Management::ClientUIExtensionMethodsFactory]
-      def ui_extensions
-        ClientUIExtensionMethodsFactory.new(self)
+      def ui_extensions(space_id, environment_id)
+        ClientUIExtensionMethodsFactory.new(self, space_id, environment_id)
       end
 
       # Allows manipulation of editor interfaces in context of the current client
@@ -206,8 +216,8 @@ module Contentful
       # @see _ README for details.
       #
       # @return [Contentful::Management::ClientEditorInterfaceMethodsFactory]
-      def editor_interfaces
-        ClientEditorInterfaceMethodsFactory.new(self)
+      def editor_interfaces(space_id, environment_id, content_type_id)
+        ClientEditorInterfaceMethodsFactory.new(self, space_id, environment_id, content_type_id)
       end
 
       # Allows manipulation of webhooks in context of the current client
@@ -215,8 +225,8 @@ module Contentful
       # @see _ README for details.
       #
       # @return [Contentful::Management::ClientWebhookMethodsFactory]
-      def webhooks
-        ClientWebhookMethodsFactory.new(self)
+      def webhooks(space_id)
+        ClientWebhookMethodsFactory.new(self, space_id)
       end
 
       # Allows manipulation of webhook calls in context of the current client
@@ -224,8 +234,8 @@ module Contentful
       # @see _ README for details.
       #
       # @return [Contentful::Management::ClientWebhookCallMethodsFactory]
-      def webhook_calls
-        ClientWebhookCallMethodsFactory.new(self)
+      def webhook_calls(space_id, webhook_id)
+        ClientWebhookCallMethodsFactory.new(self, space_id, webhook_id)
       end
 
       # Allows manipulation of webhook health in context of the current client
@@ -233,8 +243,8 @@ module Contentful
       # @see _ README for details.
       #
       # @return [Contentful::Management::ClientWebhookHealthMethodsFactory]
-      def webhook_health
-        ClientWebhookHealthMethodsFactory.new(self)
+      def webhook_health(space_id)
+        ClientWebhookHealthMethodsFactory.new(self, space_id)
       end
 
       # Allows manipulation of uploads in context of the current client
@@ -242,8 +252,8 @@ module Contentful
       # @see _ README for details.
       #
       # @return [Contentful::Management::ClientUploadMethodsFactory]
-      def uploads
-        ClientUploadMethodsFactory.new(self)
+      def uploads(space_id)
+        ClientUploadMethodsFactory.new(self, space_id)
       end
 
       # Allows manipulation of snapshots in context of the current client
@@ -251,8 +261,8 @@ module Contentful
       # @see _ README for details.
       #
       # @return [Contentful::Management::ClientSnapshotMethodsFactory]
-      def snapshots(resource_type = 'entries')
-        ClientSnapshotMethodsFactory.new(self, resource_type)
+      def snapshots(space_id, environment_id, resource_type = 'entries')
+        ClientSnapshotMethodsFactory.new(self, space_id, environment_id, resource_type)
       end
 
       # Allows manipulation of entry snapshots in context of the current client
@@ -260,8 +270,8 @@ module Contentful
       # @see _ README for details.
       #
       # @return [Contentful::Management::ClientSnapshotMethodsFactory]
-      def entry_snapshots
-        ClientSnapshotMethodsFactory.new(self, 'entries')
+      def entry_snapshots(space_id, environment_id)
+        ClientSnapshotMethodsFactory.new(self, space_id, environment_id, 'entries')
       end
 
       # Allows manipulation of content type snapshots in context of the current client
@@ -269,8 +279,8 @@ module Contentful
       # @see _ README for details.
       #
       # @return [Contentful::Management::ClientSnapshotMethodsFactory]
-      def content_type_snapshots
-        ClientSnapshotMethodsFactory.new(self, 'content_types')
+      def content_type_snapshots(space_id, environment_id)
+        ClientSnapshotMethodsFactory.new(self, space_id, environment_id, 'content_types')
       end
 
       # @private
@@ -283,26 +293,29 @@ module Contentful
       def update_all_dynamic_entry_cache!
         return if configuration[:dynamic_entries].empty? || configuration[:disable_content_type_caching]
 
-        spaces = configuration[:dynamic_entries].map { |space_id| ::Contentful::Management::Space.find(self, space_id) }
-        update_dynamic_entry_cache_for_spaces!(spaces)
+        environments = configuration[:dynamic_entries].map do |space_id, environment_id|
+          ::Contentful::Management::Environment.find(self, space_id, environment_id)
+        end
+
+        update_dynamic_entry_cache_for_environments!(environments)
       end
 
       # @private
-      def update_dynamic_entry_cache_for_spaces!(spaces)
+      def update_dynamic_entry_cache_for_environments!(environments)
         return if configuration[:disable_content_type_caching]
 
-        spaces.each do |space|
-          update_dynamic_entry_cache_for_space!(space)
+        environments.each do |environment|
+          update_dynamic_entry_cache_for_environment!(environment)
         end
       end
 
       # Use this method together with the client's :dynamic_entries configuration.
       # See README for details.
       # @private
-      def update_dynamic_entry_cache_for_space!(space)
+      def update_dynamic_entry_cache_for_environment!(environment)
         return if configuration[:disable_content_type_caching]
 
-        update_dynamic_entry_cache!(space.content_types.all)
+        update_dynamic_entry_cache!(environment.content_types.all)
       end
 
       # @private

data/lib/contentful/management/client_api_key_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_asset_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,7 +6,6 @@ module Contentful
     # @private
     class ClientAssetMethodsFactory
       include Contentful::Management::ClientAssociationMethodsFactory
-      include Contentful::Management::ClientAssociationAllPublishedMethodsFactory
     end
   end
 end

data/lib/contentful/management/client_association_all_published_method_factory.rb

@@ -5,18 +5,17 @@ module Contentful
     module ClientAssociationAllPublishedMethodsFactory
       # Gets a collection of published resources.
       #
-      # @param [String] space_id
       # @param [Hash] params
       # @see _ For complete option list: https://www.contentful.com/developers/docs/references/content-delivery-api/#/reference/search-parameters
       # @deprecated This call will be soon removed from the API except for Content Types
       #
       # @return [Contentful::Management::Array<Contentful::Management::Resource>]
-      def all_published(space_id, params = {})
+      def all_published(params = {})
         warn('This call will soon be removed from the API except for Content Types') unless params.key?(:suppress_warning)
         params.delete(:suppress_warning) if params.key?(:suppress_warning)
 
         @resource_requester.all(
-          { space_id: space_id, public: true },
+          { space_id: @space_id, environment_id: @environment_id, public: true },
           params
         )
       end

data/lib/contentful/management/client_association_methods_factory.rb

@@ -7,34 +7,34 @@ module Contentful
     module ClientAssociationMethodsFactory
       attr_reader :client
 
-      def initialize(client)
+      def initialize(client, space_id = nil, environment_id = nil)
         @client = client
         @resource_requester = ResourceRequester.new(client, associated_class)
+        @space_id = space_id
+        @environment_id = environment_id
       end
 
       # Gets a collection of resources.
       #
-      # @param [String] space_id
       # @param [Hash] params
       # @see _ For complete option list: https://www.contentful.com/developers/docs/references/content-delivery-api/#/reference/search-parameters
       #
       # @return [Contentful::Management::Array<Contentful::Management::Resource>]
-      def all(space_id, params = {})
-        associated_class.all(client, space_id, params)
+      def all(params = {})
+        associated_class.all(client, @space_id, @environment_id, params)
       end
 
       # Gets a specific resource.
       #
-      # @param [String] space_id
       # @param [String] resource_id
       #
       # @return [Contentful::Management::Resource]
-      def find(space_id, resource_id)
-        associated_class.find(client, space_id, resource_id)
+      def find(resource_id)
+        associated_class.find(client, @space_id, @environment_id, resource_id)
       end
 
-      def create(space_id, attributes)
-        associated_class.create(client, space_id, attributes)
+      def create(attributes)
+        associated_class.create(client, @space_id, @environment_id, attributes)
       end
 
       def new

data/lib/contentful/management/client_content_type_methods_factory.rb

@@ -9,8 +9,14 @@ module Contentful
       include Contentful::Management::ClientAssociationMethodsFactory
       include Contentful::Management::ClientAssociationAllPublishedMethodsFactory
 
-      def all_published(space_id, params = {})
-        super(space_id, { suppress_warning: true }.merge(params))
+      def all(query = {})
+        content_types = super(query)
+        client.update_dynamic_entry_cache!(content_types)
+        content_types
+      end
+
+      def all_published(params = {})
+        super({ suppress_warning: true }.merge(params))
       end
     end
   end