contentful_model 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb068dfa34793542d2494fdb81949a5bbc91a655fe9766bd7cc557574c81fd87
-  data.tar.gz: 2656cb0fa65053912a96d75ac39850cb2df0a0cea4cc6abbeb69a2dae90d90d4
+  metadata.gz: 124ae1820078574b614c6cd41c9ba657222d75209637d1d0090ebd05aa367864
+  data.tar.gz: f309c31e27596c7d90954cf0d5d18112ed09c355eb8ed475591274174eaa8b7b
 SHA512:
-  metadata.gz: 34f7dbb45f0a8bb0e7318dba146582ac767c2268a6963fb67fe7a1bce0feaabc98653f8abb1753654e15ca0862c74b7cb77add86854b49373cecf91c545aa133
-  data.tar.gz: 346c64b379119d12e8f58c2d61c59543c7b4315cb21ea64cf07c5caf7538e6586fa024c94bdb89e6fc559057ff6ccb85f7ed32fd77bd81047b4e751c1df597f9
+  metadata.gz: 1cd57a8ee48783aa9f5e1f91f779ac399446e563f9f6babf90e11c0c7801ee0b5cd9338ecd9b4b1d8e1fb838f9b48a641531137105ce906dd97400c75c9883ef
+  data.tar.gz: 527a17a0771d104b41c22d45db937f442f605acff40714dce57725b0ce728ea9af23de82e9896a7c22845ff0dd8d86b1e4cd92c31591b2286ec4885b6a2d6c55

data/lib/contentful_model/associations/has_many_nested.rb

@@ -25,8 +25,8 @@ module ContentfulModel
         # to write your own recursion for this, because it's probably an implementation-specific problem.
         # rubocop:disable Style/PredicateName
         def has_many_nested(association_name, options = {})
-          has_many association_name, class_name: to_s, inverse_of: :"parent_#{to_s.underscore}"
-          belongs_to_many :"parent_#{to_s.underscore.pluralize}", class_name: to_s
+          has_many association_name, class_name: to_s, inverse_of: :"parent_#{has_many_nested_name}"
+          belongs_to_many :"parent_#{has_many_nested_name.pluralize}", class_name: to_s
           root_method = options[:root] if options[:root].is_a?(Proc)
 
           # If there's a root method defined, set up a class method called root_[class name]. In our example this would be
@@ -34,14 +34,14 @@ module ContentfulModel
           # @return [Object] the root entity returned from the proc defined in has_many_nested
           if defined?(root_method) && root_method.is_a?(Proc)
             # @return [Object] the root entity
-            define_method :"root_#{to_s.underscore}" do
+            define_method :"root_#{has_many_nested_name}" do
               root_method.call
             end
           end
 
           # A utility method which returns the parent object; saves passing around interpolated strings
           define_method :parent do
-            parents = send(:"parent_#{self.class.to_s.underscore.pluralize}")
+            parents = send(:"parent_#{self.class.has_many_nested_name.pluralize}")
             parents.first unless parents.nil?
           end
 
@@ -131,6 +131,10 @@ module ContentfulModel
           end
           send(:private, :flatten_hash)
         end
+
+        def has_many_nested_name
+          to_s.demodulize.underscore
+        end
         # rubocop:enable Style/PredicateName
       end
     end

data/lib/contentful_model/client.rb

@@ -18,7 +18,8 @@ module ContentfulModel
         raise_errors: true,
         dynamic_entries: :auto,
         integration_name: 'contentful_model',
-        integration_version: ::ContentfulModel::VERSION
+        integration_version: ::ContentfulModel::VERSION,
+        raise_for_empty_fields: false
       }.merge(configuration))
     end
   end

data/lib/contentful_model/migrations/content_type.rb

@@ -4,7 +4,12 @@ module ContentfulModel
   module Migrations
     # Class for defining Content Type transformations
     class ContentType
-      attr_accessor :id, :name
+      attr_accessor :id, :name, :display_field
+
+      MANAGEMENT_TYPE_MAPPING = {
+        'string' => 'Symbol',
+        'rich_text' => 'RichText'
+      }.freeze
 
       def initialize(name = nil, management_content_type = nil)
         @name = name
@@ -19,10 +24,12 @@ module ContentfulModel
           ).create(
             id: id || camel_case(@name),
             name: @name,
+            displayField: display_field,
             fields: fields
           )
         else
           @management_content_type.fields = @fields
+          @management_content_type.displayField = display_field if display_field
           @management_content_type.save
         end
 
@@ -78,12 +85,12 @@ module ContentfulModel
       def management_type(type)
         if %i[text symbol integer number date boolean location object].include?(type.to_sym)
           type.capitalize
-        elsif type == 'string'
-          'Symbol'
         elsif link?(type)
           'Link'
         elsif array?(type)
           'Array'
+        elsif MANAGEMENT_TYPE_MAPPING.key?(type.to_s)
+          MANAGEMENT_TYPE_MAPPING[type.to_s]
         else
           raise_field_type_error(type)
         end

data/lib/contentful_model/version.rb

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

data/spec/base_spec.rb

@@ -100,6 +100,7 @@ describe ContentfulModel::Base do
         nyancat = CoercedCat.find('nyancat')
         expect(nyancat.name).to eq 'Fat Cat'
         expect(nyancat.created_at).to eq '2013-06-27T22:46:19+00:00'
+        expect(nyancat.updated_at).to be_instance_of(DateTime)
       }
     end
   end

data/spec/migrations/content_type_spec.rb

@@ -30,22 +30,52 @@ describe ContentfulModel::Migrations::ContentType do
         end
       end
 
-      it 'creates a new content type on contentful' do
-        mock_client = Object.new
-        expect(mock_client).to receive(:create).with(id: 'foo', name: 'foo', fields: [])
-        allow_any_instance_of(ContentfulModel::Management).to receive(:content_types) { mock_client }
+      context 'with a new content type' do
+        let(:mock_client) { Object.new }
 
-        described_class.new('foo').save
+        before do
+          allow_any_instance_of(ContentfulModel::Management).to receive(:content_types) { mock_client }
+        end
+
+        it 'creates it on contentful' do
+          expect(mock_client).to receive(:create).with(id: 'foo', name: 'foo', displayField: nil, fields: [])
+
+          described_class.new('foo').save
+        end
+
+        it 'allows to specify display field' do
+          expect(mock_client).to receive(:create).with(id: 'foo', name: 'foo', displayField: 'field_id', fields: [])
+
+          ct = described_class.new('foo')
+          ct.display_field = 'field_id'
+          ct.save
+        end
       end
 
-      it 'updates an existing content type' do
-        mock_ct = Object.new
-        allow(mock_ct).to receive(:id) { 'foo' }
+      context 'with an existing content type' do
+        let(:mock_ct) { Object.new }
 
-        expect(mock_ct).to receive(:fields=)
-        expect(mock_ct).to receive(:save)
+        before do
+          allow(mock_ct).to receive(:id) { 'foo' }
+        end
+
+        it 'updates it' do
+          expect(mock_ct).to receive(:fields=)
+          expect(mock_ct).not_to receive(:displayField=)
+          expect(mock_ct).to receive(:save)
+
+          described_class.new(nil, mock_ct).save
+        end
 
-        described_class.new(nil, mock_ct).save
+        it 'updates display field' do
+          expect(mock_ct).to receive(:fields=)
+          expect(mock_ct).to receive(:displayField=)
+          expect(mock_ct).to receive(:save)
+
+          ct = described_class.new(nil, mock_ct)
+          ct.display_field = 'field_id'
+          ct.save
+        end
       end
     end
 
@@ -71,6 +101,7 @@ describe ContentfulModel::Migrations::ContentType do
         expect_any_instance_of(::Contentful::Management::ClientContentTypeMethodsFactory).to receive(:create).with(
           id: 'foo_ct',
           name: subject.name,
+          displayField: nil,
           fields: subject.fields
         )
 
@@ -127,6 +158,12 @@ describe ContentfulModel::Migrations::ContentType do
         expect(items.link_type).to eq('Asset')
       end
 
+      it 'rich_text field' do
+        field = subject.field('foo', :rich_text)
+
+        expect(field.type).to eq('RichText')
+      end
+
       it 'fails on unknown type' do
         expect { subject.field('foo', :bar) }.to raise_error ContentfulModel::Migrations::InvalidFieldTypeError
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contentful_model
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Contentful GmbH (David Litvak Bruno)
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-01 00:00:00.000000000 Z
+date: 2019-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: contentful
@@ -353,66 +353,65 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: An ActiveModel-like wrapper for the Contentful SDKs
 test_files:
-- spec/asset_spec.rb
-- spec/associations/belongs_to_many_spec.rb
-- spec/associations/belongs_to_spec.rb
+- spec/spec_helper.rb
+- spec/management_spec.rb
+- spec/migrations/content_type_spec.rb
+- spec/migrations/migration_spec.rb
+- spec/migrations/content_type_factory_spec.rb
 - spec/associations/has_many_nested_spec.rb
-- spec/associations/has_many_spec.rb
 - spec/associations/has_one_spec.rb
-- spec/base_spec.rb
-- spec/chainable_queries_spec.rb
+- spec/associations/belongs_to_many_spec.rb
+- spec/associations/has_many_spec.rb
+- spec/associations/belongs_to_spec.rb
 - spec/client_spec.rb
+- spec/validations/validations_spec.rb
+- spec/chainable_queries_spec.rb
+- spec/manageable_spec.rb
 - spec/contentful_model_spec.rb
-- spec/fixtures/vcr_cassettes/asset/all.yml
-- spec/fixtures/vcr_cassettes/asset/find.yml
+- spec/fixtures/vcr_cassettes/associations/nested_without_root_middle_higher_include.yml
+- spec/fixtures/vcr_cassettes/associations/nested_without_root_middle.yml
 - spec/fixtures/vcr_cassettes/association/belongs_to_many.yml
+- spec/fixtures/vcr_cassettes/association/nested_without_root_middle_higher_include.yml
+- spec/fixtures/vcr_cassettes/association/nested_without_root_child_parent.yml
 - spec/fixtures/vcr_cassettes/association/has_many.yml
 - spec/fixtures/vcr_cassettes/association/has_one.yml
-- spec/fixtures/vcr_cassettes/association/nested_with_root_root.yml
-- spec/fixtures/vcr_cassettes/association/nested_without_root_child_higher_include.yml
-- spec/fixtures/vcr_cassettes/association/nested_without_root_child_parent.yml
 - spec/fixtures/vcr_cassettes/association/nested_without_root_childless.yml
-- spec/fixtures/vcr_cassettes/association/nested_without_root_middle.yml
-- spec/fixtures/vcr_cassettes/association/nested_without_root_middle_higher_include.yml
+- spec/fixtures/vcr_cassettes/association/nested_without_root_parentless_higher_include.yml
 - spec/fixtures/vcr_cassettes/association/nested_without_root_middle_parent.yml
 - spec/fixtures/vcr_cassettes/association/nested_without_root_parentless.yml
-- spec/fixtures/vcr_cassettes/association/nested_without_root_parentless_higher_include.yml
-- spec/fixtures/vcr_cassettes/associations/nested_without_root_middle.yml
-- spec/fixtures/vcr_cassettes/associations/nested_without_root_middle_higher_include.yml
-- spec/fixtures/vcr_cassettes/base/content_type.yml
-- spec/fixtures/vcr_cassettes/base/return_nil_for_empty.yml
-- spec/fixtures/vcr_cassettes/base/return_nil_for_empty_with_value.yml
+- spec/fixtures/vcr_cassettes/association/nested_without_root_middle.yml
+- spec/fixtures/vcr_cassettes/association/nested_without_root_child_higher_include.yml
+- spec/fixtures/vcr_cassettes/association/nested_with_root_root.yml
+- spec/fixtures/vcr_cassettes/asset/find.yml
+- spec/fixtures/vcr_cassettes/asset/all.yml
+- spec/fixtures/vcr_cassettes/playground/nyancat.yml
 - spec/fixtures/vcr_cassettes/client.yml
-- spec/fixtures/vcr_cassettes/dog.yml
-- spec/fixtures/vcr_cassettes/human.yml
+- spec/fixtures/vcr_cassettes/management/nyancat_publish.yml
 - spec/fixtures/vcr_cassettes/management/client.yml
-- spec/fixtures/vcr_cassettes/management/nyancat.yml
 - spec/fixtures/vcr_cassettes/management/nyancat_2.yml
-- spec/fixtures/vcr_cassettes/management/nyancat_publish.yml
+- spec/fixtures/vcr_cassettes/management/nyancat.yml
+- spec/fixtures/vcr_cassettes/management/nyancat_save.yml
 - spec/fixtures/vcr_cassettes/management/nyancat_refetch_and_fail.yml
 - spec/fixtures/vcr_cassettes/management/nyancat_refetch_and_save.yml
-- spec/fixtures/vcr_cassettes/management/nyancat_save.yml
 - spec/fixtures/vcr_cassettes/management/nyancat_save_2.yml
 - spec/fixtures/vcr_cassettes/nyancat.yml
-- spec/fixtures/vcr_cassettes/playground/nyancat.yml
-- spec/fixtures/vcr_cassettes/query/each_entry.yml
-- spec/fixtures/vcr_cassettes/query/each_page.yml
+- spec/fixtures/vcr_cassettes/human.yml
+- spec/fixtures/vcr_cassettes/dog.yml
 - spec/fixtures/vcr_cassettes/query/empty.yml
-- spec/fixtures/vcr_cassettes/query/load.yml
+- spec/fixtures/vcr_cassettes/query/each_page.yml
+- spec/fixtures/vcr_cassettes/query/each_entry.yml
 - spec/fixtures/vcr_cassettes/query/manual_pagination.yml
+- spec/fixtures/vcr_cassettes/query/load.yml
 - spec/fixtures/vcr_cassettes/query/nyancat_invalid_elements.yml
-- spec/manageable_spec.rb
-- spec/management_spec.rb
-- spec/migrations/content_type_factory_spec.rb
-- spec/migrations/content_type_spec.rb
-- spec/migrations/migration_spec.rb
+- spec/fixtures/vcr_cassettes/base/return_nil_for_empty.yml
+- spec/fixtures/vcr_cassettes/base/return_nil_for_empty_with_value.yml
+- spec/fixtures/vcr_cassettes/base/content_type.yml
 - spec/queries_spec.rb
+- spec/asset_spec.rb
 - spec/query_spec.rb
-- spec/spec_helper.rb
-- spec/validations/validations_spec.rb
+- spec/base_spec.rb