contentful 2.13.3 → 2.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 769988762e5d05e6732adafc3a34e25ddb05bb400f8095ac22e58214ffb1d87b
-  data.tar.gz: 2a0d52533d6d0fb85b3565aef3eaf17300cce71aab610fb822e2bb6bd3a167d1
+  metadata.gz: a1930a37ca31d693b4cb4ff55f065b85cc3271696ae3dd96b063093a2f9c24be
+  data.tar.gz: 5299cd8d71d9200873fcbc527d41bedd717ed216a323b0a537d9148d1b0a664d
 SHA512:
-  metadata.gz: 9b9c166d8697fe28733f0224f2af8e0fa7d00471a2c8ce385aa8d762427d5405a91ced44173f5bacf3226bf4eb6f94d68be99c11172bb6f7f3cfd52ab330cb60
-  data.tar.gz: b7d577d79b2c7ee318a88aa63592fa1b0e15670b3fe159108a4919e501bd15c8e54ad9753463c560934288f4ee448bbf688be11c4ae5761f87b0b9cbd20d62d0
+  metadata.gz: 1b3f75e991ce3eecde93a3109acafb20f400e349df4f369463d2adfea36c863772cdc84d1353b7e24018342fbc4eb0cbf6ee9d884b445877817f4821ef26b3ef
+  data.tar.gz: 2bf465ba3e6a9e8129fe7648212d75454332866a478f2aebfb2effb8679a56338cf2890bcd0718a4815f20ca42292f496427aedda571f9b7ab4b5ac5470c0523

data/.travis.yml

@@ -1,8 +1,9 @@
 language: ruby
 rvm:
-  - 2.4.0
+  - 2.6.1
+  - 2.5.1
+  - 2.4.1
   - 2.3.1
-  - 2.2.1
 notifications:
   slack:
     secure: Zr3mKCiTb0vaTD4MPtTG8BbyYyErFuoxioM25QyrqePKVkDFeZC1MtGmg5klQQrJiWTKZPa/zB8NAHYkoUxg9I+z15JK0hYfz9KRubEpCrXCaqTC9Vzq88kJ3LN8YsTyBF66izaBH2KLsOfaJRxwplFzZqgpg4GG2DUBPtrGtes=

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 2.14.0
+### Added
+* Allow user defined methods to override properties created by the SDK, if you want to access overriden fields or sys properties use `#fields[]` or `#sys[]` as accessors. [#210](https://github.com/contentful/contentful.rb/pull/210)
+
 ## 2.13.3
 ### Fixed
 * Fixed unfiltered unresolvable entries and assets from re-marshalled entries. [#207](https://github.com/contentful/contentful.rb/pull/207)

data/lib/contentful/base_resource.rb

@@ -59,9 +59,7 @@ module Contentful
 
     def define_sys_methods!
       @sys.each do |k, v|
-        define_singleton_method k do
-          v
-        end
+        define_singleton_method(k) { v } unless self.class.method_defined?(k)
       end
     end
 

data/lib/contentful/fields_resource.rb

@@ -83,9 +83,7 @@ module Contentful
 
     def define_fields_methods!
       fields.each do |k, v|
-        define_singleton_method k do
-          v
-        end
+        define_singleton_method(k) { v } unless self.class.method_defined?(k)
       end
     end
 

data/lib/contentful/resource_builder.rb

@@ -29,6 +29,7 @@ module Contentful
     # Default Entry Mapping
     # @see _ README for more information on Entry Mapping
     DEFAULT_ENTRY_MAPPING = {}.freeze
+    # Buildable Resources
     BUILDABLES = %w[Entry Asset ContentType Space DeletedEntry DeletedAsset Locale].freeze
 
     attr_reader :json, :default_locale, :endpoint, :depth, :localized, :resource_mapping, :entry_mapping, :resource

data/lib/contentful/version.rb

@@ -1,5 +1,5 @@
 # Contentful Namespace
 module Contentful
   # Gem Version
-  VERSION = '2.13.3'
+  VERSION = '2.14.0'
 end

data/spec/entry_spec.rb

@@ -3,6 +3,19 @@ require 'spec_helper'
 describe Contentful::Entry do
   let(:entry) { vcr('entry') { create_client.entry 'nyancat' } }
 
+  let(:subclass) do
+    Class.new(described_class) do
+      # An overridden sys method:
+      def created_at; 'yesterday'; end
+
+      # An overridden field method:
+      def best_friend; 'octocat'; end
+    end
+  end
+
+  let(:raw) { entry.raw }
+  let(:subclassed_entry) { subclass.new(raw, create_client.configuration) }
+
   describe 'SystemProperties' do
     it 'has a #sys getter returning a hash with symbol keys' do
       expect(entry.sys).to be_a Hash
@@ -36,6 +49,12 @@ describe Contentful::Entry do
     it 'has #revision' do
       expect(entry.revision).to eq 5
     end
+
+    context 'when subclassed' do
+      it 'does not redefine existing methods' do
+        expect(subclassed_entry.created_at).to eq 'yesterday'
+      end
+    end
   end
 
   describe 'Fields' do
@@ -48,6 +67,12 @@ describe Contentful::Entry do
       expect(entry.fields[:color]).to eq 'rainbow'
       expect(entry.fields[:best_friend]).to be_a Contentful::Entry
     end
+
+    context 'when subclassed' do
+      it 'does not redefine existing methods' do
+        expect(subclassed_entry.best_friend).to eq 'octocat'
+      end
+    end
   end
 
   describe 'multiple locales' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contentful
 version: !ruby/object:Gem::Version
-  version: 2.13.3
+  version: 2.14.0
 platform: ruby
 authors:
 - Contentful GmbH (Jan Lelis)
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-13 00:00:00.000000000 Z
+date: 2019-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http