contentful-management 2.10.0 → 2.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8e47f9397c8d3c6481770f27abc03ad28789d7c4a60f504a9ce9ebd862fa634
-  data.tar.gz: 71e9d37e046d4c5027bbe2b596f2ddf94d6000d36bfad0c088dd6f7fbff63846
+  metadata.gz: 7ab386d5bdca593af2a33e0c20aa4497e3e8e19a72060e8481c11370e5007121
+  data.tar.gz: ec6a5beca729d2eba0ee273112ebb45ab0ca9a8ce8f969023a2382ace4583385
 SHA512:
-  metadata.gz: 232a59d47e991f9f01acbadc31136b877729f6c51efd198280fbb29311aea0bfb4b85f8ae3ac866d8a90b9aad68c3c2004fd04ebeded9dec1ab5f24c902bf865
-  data.tar.gz: 5915e699b6f16935b5266ab0964b105d60728b8ecf1d6796e5c2e9d685475f32ae5e81b6c50220b9828f7403f30a5db2b5caadd8d63568480cf2c2e225721f79
+  metadata.gz: e379b2a6ff1c47622460bf7d1e06b00dc65aab3f086971a2eacc294a3a10ce943c0474e682be980ad0c9649f95e0981c89122a1fec2f4f5fcef2233ffc639c5d
+  data.tar.gz: 7a05c37cb9471cc1405a82ec14bb9b92eced0494b184645f3b0be42ee8f0c68995fef40ea64c20c89ba195f402c0c4f7c2451497e747e1f22fdf7fc9d45eadc8

data/CHANGELOG.md

@@ -2,6 +2,40 @@
 
 ## Master
 
+## 2.13.1
+### Fixed
+* Fixed an issue when loading entries or assets that included tags. [#219](https://github.com/contentful/contentful-management.rb/issues/219)
+
+## 2.13.0
+### Fixed
+* Fixed a possible validation error when submitting a content type. [#218](https://github.com/contentful/contentful-management.rb/pull/218)
+
+### Added
+* Added support for Users API. [#217](https://github.com/contentful/contentful-management.rb/pull/217)
+
+## 2.12.1
+
+### Fixed
+* Fixed an issue where JSON fields with top-level arrays were not properly parsed. [#215](https://github.com/contentful/contentful-management.rb/issues/215)
+
+## 2.12.0
+
+*Note*: Only a minor change because the removed feature was *Alpha*.
+
+### Added
+* Add `OrganizationPeriodicUsage`, `Client#organization_periodic_usages` and `Organization#periodic_usages`.
+* Add `SpacePeriodicUsage`, `Client#space_periodic_usages` and `Organization#space_periodic_usages`.
+
+### Removed
+* Removed now deprecated Alpha Usage APIs, which have been superseeded by the new APIs added.
+
+## 2.11.0
+### Added
+* Added support for Rich Text specific validations. [#200](https://github.com/contentful/contentful-management.rb/pull/200)
+
+### Changed
+* Updated maximum allowed version of the `http` gem. [#205](https://github.com/contentful/contentful-management.rb/issues/205)
+
 ## 2.10.0
 ### Added
 * Added support for query parameters on the Space endpoints. [#197](https://github.com/contentful/contentful-management.rb/pull/197)

data/README.md

@@ -827,40 +827,46 @@ Retrieving all organization details:
 organizations = client.organizations.all
 ```
 
-### Usage Periods (ALPHA)
+### Usage
 
 *Note*: This feature is available only to Commited v2 customers.
 
-Retrieving all Usage Periods for an Organizations you belong to:
+#### Organization Periodic Usage
+
+Retrieving all API Usage statistics for an Organization during a given usage period, broken down by organization for all APIs:
 
 ```ruby
-usage_periods = client.usage_periods('organization_id').all
+# Optionally, you can pass the metric, start and end date filters
+usage = client.organization_periodic_usages('organization_id').all
+
+# For example only CDA and CMA metrics from yesterday onwards
+usage = client.organization_periodic_usages('organization_id').all('metric[in]': ['cda', 'cma'], startDate: (Date.today - 1).iso8601)
 ```
 
 Alternatively, if you have an already fetched organization:
 
 ```ruby
-usage_periods = organization.usage_periods().all()
+# Breaking down CMA usage by space, for a given period.
+usage = organization.periodic_usages.all
 ```
 
-### API Usage (ALPHA)
+#### Space Periodic Usage
 
-*Note*: This feature is available only to Commited v2 customers.
-
-Retrieving all API Usage statistics for an Organizations during a given usage period, broken down by organization for all APIs:
+Retrieving all API Usage statistics for an Organization during a given usage period, broken down by space for all APIs:
 
 ```ruby
-# Valid usage types are by 'organization' and by 'space'.
-# Usage period IDs are numerical and can be fetched from the Usage Periods API.
-# Valid API breakdowns are: 'cda', 'cpa', 'cma' or 'all_apis'.
-usage = client.api_usage('organization_id').all('organization', usage_period_id, 'all_apis')
+# Optionally, you can pass the metric, start and end date filters
+usage = client.space_periodic_usages('organization_id').all
+
+# For example only CDA and CMA metrics from yesterday onwards
+usage = client.space_periodic_usages('organization_id').all('metric[in]': ['cda', 'cma'], startDate: (Date.today - 1).iso8601)
 ```
 
 Alternatively, if you have an already fetched organization:
 
 ```ruby
 # Breaking down CMA usage by space, for a given period.
-usage = organization.api_usage().all('space', usage_period_id, 'cma')
+usage = organization.space_periodic_usages.all
 ```
 
 ### Users
@@ -871,6 +877,17 @@ Retrieving current user details:
 user = client.users.me
 ```
 
+Retrieving one user by ID from the space:
+
+```ruby
+user = blog_space.users.find(user_id)
+```
+
+Retrieving one user by ID from an organization:
+
+```ruby
+user = organization.users.find('user_id')
+```
 ### UI Extensions
 
 Retrieving all UI extensions from the environment:

data/contentful-management.gemspec

@@ -17,12 +17,12 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'http', '> 1.0', '< 3.0'
+  spec.add_dependency 'http', '> 1.0', '< 5.0'
   spec.add_dependency 'multi_json', '~> 1'
   spec.add_dependency 'json', '>= 1.8', '< 3.0'
 
   spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'rake', '< 11.0'
+  spec.add_development_dependency 'rake', '>= 12.3.3'
   spec.add_development_dependency 'public_suffix', '< 1.5'
   spec.add_development_dependency 'rspec', '~> 3'
   spec.add_development_dependency 'rspec-its'
@@ -33,6 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop', '~> 0.49.1'
   spec.add_development_dependency 'listen', '~> 3.0'
   spec.add_development_dependency 'vcr', '~> 4.0'
-  spec.add_development_dependency 'webmock', '~> 1', '>= 1.17.3'
+  spec.add_development_dependency 'webmock'
+  spec.add_development_dependency 'tins', '~> 1.6.0'
   spec.add_development_dependency 'simplecov'
 end

data/lib/contentful/management/asset.rb

@@ -1,6 +1,7 @@
 require_relative 'resource'
 require_relative 'resource/fields'
 require_relative 'resource/archiver'
+require_relative 'resource/metadata'
 require_relative 'resource/publisher'
 require_relative 'resource/asset_fields'
 require_relative 'resource/environment_aware'
@@ -15,6 +16,7 @@ module Contentful
       include Contentful::Management::Resource
       include Contentful::Management::Resource::Fields
       include Contentful::Management::Resource::Archiver
+      include Contentful::Management::Resource::Metadata
       include Contentful::Management::Resource::Refresher
       include Contentful::Management::Resource::Publisher
       include Contentful::Management::Resource::SystemProperties

data/lib/contentful/management/client.rb

@@ -20,9 +20,7 @@ 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_api_usage_methods_factory'
 require 'contentful/management/client_environment_methods_factory'
-require 'contentful/management/client_usage_period_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'
@@ -31,7 +29,9 @@ require 'contentful/management/client_webhook_health_methods_factory'
 require 'contentful/management/client_preview_api_key_methods_factory'
 require 'contentful/management/client_space_membership_methods_factory'
 require 'contentful/management/client_editor_interface_methods_factory'
+require 'contentful/management/client_space_periodic_usage_methods_factory'
 require 'contentful/management/client_personal_access_tokens_methods_factory'
+require 'contentful/management/client_organization_periodic_usage_methods_factory'
 
 module Contentful
   module Management
@@ -133,22 +133,20 @@ module Contentful
         ClientOrganizationMethodsFactory.new(self)
       end
 
-      # Allows viewing of usage periods in context of the current client
-      # Allows listing all usage periods for client.
+      # Allows listing all usage periods for organization grouped by organization.
       # @see _ README for details.
       #
-      # @return [Contentful::Management::ClientUsagePeriodMethodsFactory]
-      def usage_periods(organization_id)
-        ClientUsagePeriodMethodsFactory.new(self, organization_id)
+      # @return [Contentful::Management::ClientOrganizationPeriodicUsageMethodsFactory]
+      def organization_periodic_usages(organization_id)
+        ClientOrganizationPeriodicUsageMethodsFactory.new(self, organization_id)
       end
 
-      # Allows viewing of api usage in context of the current client
-      # Allows listing all api usage for client.
+      # Allows listing all usage periods for organization grouped by space.
       # @see _ README for details.
       #
-      # @return [Contentful::Management::ClientApiUsageMethodsFactory]
-      def api_usage(organization_id)
-        ClientApiUsageMethodsFactory.new(self, organization_id)
+      # @return [Contentful::Management::ClientSpacePeriodicUsageMethodsFactory]
+      def space_periodic_usages(organization_id)
+        ClientSpacePeriodicUsageMethodsFactory.new(self, organization_id)
       end
 
       # Allows viewing of users in context of the current client

data/lib/contentful/management/{client_usage_period_methods_factory.rb → client_organization_periodic_usage_methods_factory.rb}

@@ -2,9 +2,9 @@ require_relative 'client_association_methods_factory'
 
 module Contentful
   module Management
-    # Wrapper for Usage Period for usage from within Client
+    # Wrapper for Organization Periodic Usages for usage from within Client
     # @private
-    class ClientUsagePeriodMethodsFactory
+    class ClientOrganizationPeriodicUsageMethodsFactory
       include Contentful::Management::ClientAssociationMethodsFactory
 
       def initialize(client, organization_id)
@@ -17,8 +17,7 @@ module Contentful
           {
             organization_id: @organization_id
           },
-          params,
-          'x-contentful-enable-alpha-feature' => 'usage-insights'
+          params
         )
       end
 

data/lib/contentful/management/{client_api_usage_methods_factory.rb → client_space_periodic_usage_methods_factory.rb}

@@ -2,9 +2,9 @@ require_relative 'client_association_methods_factory'
 
 module Contentful
   module Management
-    # Wrapper for API Usage for usage from within Client
+    # Wrapper for Space Periodic Usages for usage from within Client
     # @private
-    class ClientApiUsageMethodsFactory
+    class ClientSpacePeriodicUsageMethodsFactory
       include Contentful::Management::ClientAssociationMethodsFactory
 
       def initialize(client, organization_id)
@@ -12,19 +12,12 @@ module Contentful
         @organization_id = organization_id
       end
 
-      def all(usage_type, usage_period_id, api, params = {})
-        mandatory_params = {
-          'filters[usagePeriod]' => usage_period_id,
-          'filters[metric]' => api
-        }
-
+      def all(params = {})
         @resource_requester.all(
           {
-            usage_type: usage_type,
             organization_id: @organization_id
           },
-          mandatory_params.merge(params),
-          'x-contentful-enable-alpha-feature' => 'usage-insights'
+          params
         )
       end
 

data/lib/contentful/management/entry.rb

@@ -1,6 +1,7 @@
 require_relative 'resource'
 require_relative 'resource/fields'
 require_relative 'resource/archiver'
+require_relative 'resource/metadata'
 require_relative 'resource/publisher'
 require_relative 'resource_requester'
 require_relative 'resource/field_aware'
@@ -15,6 +16,7 @@ module Contentful
     # @see _ https://www.contentful.com/developers/documentation/content-management-api/#resources-entries
     class Entry
       include Contentful::Management::Resource
+      include Contentful::Management::Resource::Metadata
       extend Contentful::Management::Resource::EntryFields
       include Contentful::Management::Resource::SystemProperties
 
@@ -95,18 +97,20 @@ module Contentful
 
       # @private
       def self.parse_objects_array(attributes)
-        attributes.each_with_object([]) do |attr, arr|
-          if attr.is_a? Entry
-            arr << hash_with_link_object('Entry', attr)
-          elsif attr.is_a? Asset
-            arr << hash_with_link_object('Asset', attr)
-          elsif attr.is_a? Hash
-            arr << attr
-          elsif attr.class.ancestors.map(&:to_s).include?('Contentful::Entry')
-            arr << hash_with_link_object('Entry', attr)
-          elsif attr.class.ancestors.map(&:to_s).include?('Contentful::Asset')
-            arr << hash_with_link_object('Asset', attr)
-          end
+        attributes.each_with_object([]) do |attribute, result|
+          result << if attribute.is_a? Entry
+                      hash_with_link_object('Entry', attribute)
+                    elsif attribute.is_a? Asset
+                      hash_with_link_object('Asset', attribute)
+                    elsif attribute.is_a? Hash
+                      attribute
+                    elsif attribute.class.ancestors.map(&:to_s).include?('Contentful::Entry')
+                      hash_with_link_object('Entry', attribute)
+                    elsif attribute.class.ancestors.map(&:to_s).include?('Contentful::Asset')
+                      hash_with_link_object('Asset', attribute)
+                    else
+                      attribute
+                    end
         end
       end
 

data/lib/contentful/management/field.rb

@@ -87,7 +87,9 @@ module Contentful
 
       def validations_to_hash(validations)
         validations.each_with_object([]) do |validation, results|
-          results << validation.properties_to_hash
+          validation_hash = validation.properties_to_hash
+
+          results << validation.properties_to_hash if Field.value_exists?(validation_hash)
         end
       end
     end

data/lib/contentful/management/organization.rb

@@ -1,4 +1,5 @@
 require_relative 'resource'
+require 'contentful/management/organization_user_methods_factory'
 
 module Contentful
   module Management
@@ -16,20 +17,29 @@ module Contentful
         'organizations'
       end
 
-      # Allows listing all usage periods for organization.
+      # Allows listing all usage periods for organization grouped by organization or space.
       # @see _ README for details.
       #
-      # @return [Contentful::Management::ClientApiUsageMethodsFactory]
-      def usage_periods
-        ClientApiUsageMethodsFactory.new(client, id)
+      # @return [Contentful::Management::ClientOrganizationPeriodicUsageMethodsFactory]
+      def periodic_usages
+        ClientOrganizationPeriodicUsageMethodsFactory.new(client, id)
       end
 
-      # Allows listing all api usage for organization.
+      # Allows listing all usage periods for organization grouped by organization or space.
       # @see _ README for details.
       #
-      # @return [Contentful::Management::ClientApiUsageMethodsFactory]
-      def api_usage
-        ClientApiUsageMethodsFactory.new(client, id)
+      # @return [Contentful::Management::ClientSpacePeriodicUsageMethodsFactory]
+      def space_periodic_usages
+        ClientSpacePeriodicUsageMethodsFactory.new(client, id)
+      end
+
+      # Allows viewing of users in context of an organization
+      # Allows listing all users for an organization, and finding one by ID.
+      # @see _ README for details.
+      #
+      # @return [Contentful::Management::OrganizationUserMethodsFactory]
+      def users
+        OrganizationUserMethodsFactory.new(client, id)
       end
     end
   end

data/lib/contentful/management/{api_usage.rb → organization_periodic_usage.rb}

@@ -2,40 +2,35 @@ require_relative 'resource'
 
 module Contentful
   module Management
-    # Resource class for ApiUsage.
-    # @see _ https://www.contentful.com/developers/docs/references/content-management-api/#/reference/api-usages
-    class ApiUsage
+    # Resource class for OrganizationPeriodicUsage.
+    # @see _ https://www.contentful.com/developers/docs/references/content-management-api/#/reference/usage/organization-usage/get-organization-usage/console/curl
+    class OrganizationPeriodicUsage
       include Contentful::Management::Resource
       include Contentful::Management::Resource::Refresher
       include Contentful::Management::Resource::SystemProperties
 
-      property :unitOfMeasure
-      property :interval
-      property :usage
-      property :startDate, :date
-      property :endDate, :date
+      property :metric, :string
+      property :usage, :integer
+      property :usagePerDay, :object
+      property :unitOfMeasure, :string
+      property :dateRange, :object
 
       # @private
       def self.build_endpoint(endpoint_options)
         organization_id = endpoint_options[:organization_id]
-        usage_type = endpoint_options[:usage_type]
 
-        "organizations/#{organization_id}/usages/#{usage_type}"
+        "organizations/#{organization_id}/organization_periodic_usages"
       end
 
-      # Gets all api usage statistics for a given organization and usage type, filtered by usage period and api.
+      # Gets all organization periodic usages for a given organization.
       #
       # @param [Contentful::Management::Client] client
       # @param [String] organization_id
-      # @param [String] usage_type
-      # @param [Integer] usage_period_id
-      # @param [String] api
       # @param [Hash] params
       #
-      # @return [Contentful::Management::Array<Contentful::Management::ApiUsage>]
-      # rubocop:disable Metrics/ParameterLists
-      def self.all(client, organization_id, usage_type, usage_period_id, api, params = {})
-        ClientApiUsageMethodsFactory.new(client, organization_id).all(usage_type, usage_period_id, api, params)
+      # @return [Contentful::Management::Array<Contentful::Management::OrganizationPeriodicUsage>]
+      def self.all(client, organization_id, params = {})
+        ClientOrganizationPeriodicUsageMethodsFactory.new(client, organization_id).all(params)
       end
 
       # Not supported

data/lib/contentful/management/organization_user_methods_factory.rb

@@ -0,0 +1,18 @@
+module Contentful
+  module Management
+    # Wrapper for Users API for usage from within Organization
+    # @private
+    class OrganizationUserMethodsFactory
+      attr_reader :client
+
+      def initialize(client, organization_id)
+        @client = client
+        @organization_id = organization_id
+      end
+
+      def find(id)
+        User.find(client, nil, nil, id, @organization_id)
+      end
+    end
+  end
+end