contentful_model 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 124ae1820078574b614c6cd41c9ba657222d75209637d1d0090ebd05aa367864
-  data.tar.gz: f309c31e27596c7d90954cf0d5d18112ed09c355eb8ed475591274174eaa8b7b
+  metadata.gz: 95936de4fccef8852abcdd2d2e1053f73210d3026add835f392287681eb570cf
+  data.tar.gz: ad3a0a352825eeea13e7a3661a63dc2c4c251ad61d8a8c58953c425a67f90f34
 SHA512:
-  metadata.gz: 1cd57a8ee48783aa9f5e1f91f779ac399446e563f9f6babf90e11c0c7801ee0b5cd9338ecd9b4b1d8e1fb838f9b48a641531137105ce906dd97400c75c9883ef
-  data.tar.gz: 527a17a0771d104b41c22d45db937f442f605acff40714dce57725b0ce728ea9af23de82e9896a7c22845ff0dd8d86b1e4cd92c31591b2286ec4885b6a2d6c55
+  metadata.gz: 98eef95a34aa622730863c966a4631669ff24ada5d0f7aa9e325a000c7d2ff3e91e19d67aa4f37fab9d00d4978865c6b69b6e4449a73ceca2824624315d4873a
+  data.tar.gz: 81c0e9a361ee70ffc23007f86fe5555ea1aaba2a0cd622813766fb20d8fa9548fb09065cd235cf8933a64f0b4453f226e6da79aa1ab7869fd02091417fcafc27

data/lib/contentful_model/client.rb

@@ -14,13 +14,21 @@ module ContentfulModel
         configuration[:api_url] = PREVIEW_API_URL
         configuration[:access_token] = configuration[:preview_access_token]
       end
-      super({
+
+      configuration = {
         raise_errors: true,
         dynamic_entries: :auto,
         integration_name: 'contentful_model',
         integration_version: ::ContentfulModel::VERSION,
         raise_for_empty_fields: false
-      }.merge(configuration))
+      }.merge(configuration)
+
+      # Apply delivery specific options (if any)
+      if configuration[:delivery_api]
+        configuration.merge!(configuration[:delivery_api])
+      end
+
+      super(configuration)
     end
   end
 end

data/lib/contentful_model/manageable.rb

@@ -79,9 +79,7 @@ module ContentfulModel
     private
 
     def management_proxy
-      @management_proxy ||= self.class.management(
-        default_locale: locale
-      ).entries(
+      @management_proxy ||= self.class.management.entries(
         space.id,
         ContentfulModel.configuration.environment
       )
@@ -133,12 +131,7 @@ module ContentfulModel
     module ClassMethods
       def management(options = {})
         @management ||= ContentfulModel::Management.new(
-          options.merge(
-            default_locale: ContentfulModel.configuration.default_locale,
-            raise_errors: true,
-            integration_name: 'contentful_model',
-            integration_version: ::ContentfulModel::VERSION
-          )
+          options.merge(raise_errors: true)
         )
       end
 

data/lib/contentful_model/management.rb

@@ -2,6 +2,12 @@ module ContentfulModel
   # Wrapper for the CMA Client
   class Management < Contentful::Management::Client
     def initialize(options = {})
+      # Apply management specific options (if any)
+      options = ContentfulModel.configuration.to_hash.merge(options)
+      if options[:management_api]
+        options = options.merge(options[:management_api])
+      end
+
       super(ContentfulModel.configuration.management_token, options)
     end
   end

data/lib/contentful_model/migrations/content_type.rb

@@ -29,7 +29,7 @@ module ContentfulModel
           )
         else
           @management_content_type.fields = @fields
-          @management_content_type.displayField = display_field if display_field
+          @management_content_type.display_field = display_field if display_field
           @management_content_type.save
         end
 
@@ -62,6 +62,7 @@ module ContentfulModel
 
       def remove_field(field_id)
         @management_content_type.fields.destroy(field_id)
+        @fields = fields_from_management_type
       end
 
       def new?
@@ -103,10 +104,16 @@ module ContentfulModel
       end
 
       def management_items(type)
-        if %i[entry_array asset_array].include?(type.to_sym)
+        if %i[entry_array asset_array symbol_array].include?(type.to_sym)
+          array_type = type.split('_').first.capitalize
+
           items = Contentful::Management::Field.new
-          items.type = 'Link'
-          items.link_type = type.split('_').first.capitalize
+          if %i[entry_array asset_array].include?(type.to_sym)
+            items.type = 'Link'
+            items.link_type = array_type
+          else
+            items.type = array_type
+          end
 
           items
         else

data/lib/contentful_model/version.rb

@@ -1,3 +1,3 @@
 module ContentfulModel
-  VERSION = '1.1.0'.freeze
+  VERSION = '1.2.0'.freeze
 end

data/lib/contentful_model.rb

@@ -35,6 +35,8 @@ module ContentfulModel
     def initialize
       @entry_mapping ||= {}
       @environment = 'master'
+      @integration_name = 'contentful_model'
+      @integration_version = ::ContentfulModel::VERSION
     end
 
     # Rather than listing out all the possible attributes as setters, we have a catchall

data/spec/client_spec.rb

@@ -1,11 +1,32 @@
 require 'spec_helper'
 
 describe ContentfulModel::Client do
-  subject { described_class.new({space: 'cfexampleapi', access_token: 'b4c0n73n7fu1'}) }
+  subject do
+    described_class.new({
+      space: 'cfexampleapi',
+      access_token: 'b4c0n73n7fu1',
+      management_api: {
+        timeout_connect: 3,
+        timeout_read: 6,
+        timeout_write: 20
+      },
+      delivery_api: {
+        timeout_connect: 4,
+        timeout_read: 7,
+        timeout_write: 21
+      }
+    })
+  end
 
   it 'is a Contentful::Client' do
     vcr('client') {
       expect(subject).to be_a(Contentful::Client)
     }
   end
+
+  it 'gets initialized with the configured delivery specific timeout_connect' do
+    vcr('client') {
+      expect(subject.configuration[:timeout_connect]).to eq(4)
+    }
+  end
 end

data/spec/management_spec.rb

@@ -4,6 +4,22 @@ describe ContentfulModel::Management do
   before do
     ContentfulModel.configure do |c|
       c.management_token = 'foobar'
+      c.options = {
+        timeout_connect: 2,
+        timeout_read: 5,
+        timeout_write: 19,
+
+        management_api: {
+          timeout_connect: 3,
+          timeout_read: 6,
+          timeout_write: 20
+        },
+        delivery_api: {
+          timeout_connect: 4,
+          timeout_read: 7,
+          timeout_write: 21
+        }
+      }
     end
   end
 
@@ -14,4 +30,8 @@ describe ContentfulModel::Management do
   it 'gets initialized with the configured management token' do
     expect(subject.access_token).to eq('foobar')
   end
+
+  it 'gets initialized with the configured management specific timeout_read' do
+    expect(subject.configuration[:timeout_read]).to eq(6)
+  end
 end

data/spec/migrations/content_type_spec.rb

@@ -61,7 +61,7 @@ describe ContentfulModel::Migrations::ContentType do
 
         it 'updates it' do
           expect(mock_ct).to receive(:fields=)
-          expect(mock_ct).not_to receive(:displayField=)
+          expect(mock_ct).not_to receive(:display_field=)
           expect(mock_ct).to receive(:save)
 
           described_class.new(nil, mock_ct).save
@@ -69,7 +69,7 @@ describe ContentfulModel::Migrations::ContentType do
 
         it 'updates display field' do
           expect(mock_ct).to receive(:fields=)
-          expect(mock_ct).to receive(:displayField=)
+          expect(mock_ct).to receive(:display_field=)
           expect(mock_ct).to receive(:save)
 
           ct = described_class.new(nil, mock_ct)
@@ -79,14 +79,25 @@ describe ContentfulModel::Migrations::ContentType do
       end
     end
 
-    it '#remove_field' do
+    it '#remove_field and update fields' do
       mock_ct = Object.new
-      mock_fields = Object.new
-
-      expect(mock_ct).to receive(:fields) { mock_fields }
-      expect(mock_fields).to receive(:destroy).with('foo')
-
-      described_class.new(nil, mock_ct).remove_field('foo')
+      fields = [
+        Contentful::Management::Field.new.tap { |f| f.id = 'foo' },
+        Contentful::Management::Field.new.tap { |f| f.id = 'bar' },
+      ]
+      fields_from_management_type = [
+        Contentful::Management::Field.new.tap { |f| f.id = 'foo' }
+      ]
+      allow(mock_ct).to receive(:fields) { fields }
+      allow(mock_ct).to receive(:id) { 'foo' }
+
+      expect(fields).to receive(:destroy).with('foo')
+
+      subject = described_class.new(nil, mock_ct)
+      allow(subject).to receive(:fields_from_management_type) { fields_from_management_type }
+      subject.remove_field('foo')
+
+      expect(subject.fields).to eql fields_from_management_type
     end
 
     describe '#id' do
@@ -158,6 +169,21 @@ describe ContentfulModel::Migrations::ContentType do
         expect(items.link_type).to eq('Asset')
       end
 
+      it 'symbol array field' do
+        field = subject.field('foo', :symbol_array)
+
+        expect(field.id).to eq('foo')
+        expect(field.name).to eq('foo')
+        expect(field.type).to eq('Array')
+        expect(field.link_type).to eq(nil)
+
+        items = field.items
+
+        expect(items).to be_a(Contentful::Management::Field)
+        expect(items.type).to eq('Symbol')
+        expect(items.link_type).to eq(nil)
+      end
+
       it 'rich_text field' do
         field = subject.field('foo', :rich_text)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contentful_model
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Contentful GmbH (David Litvak Bruno)
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-09 00:00:00.000000000 Z
+date: 2019-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: contentful
@@ -183,22 +183,16 @@ dependencies:
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.17.3
+        version: 3.7.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.17.3
+        version: 3.7.6
 - !ruby/object:Gem::Dependency
   name: tins
   requirement: !ruby/object:Gem::Requirement
@@ -241,6 +235,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.49.0
+- !ruby/object:Gem::Dependency
+  name: listen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
 description: An ActiveModel-like wrapper for the Contentful SDKs
 email:
 - david.litvak@contentful.com