contentful 2.15.0 → 2.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09f8c373dc24453c4566564a0ac34244df2af9bb9eaf123daa91b514f6a0bf14'
-  data.tar.gz: a99d41fd2698f8dec1536822198fc661a248bc6eacd04c2f7dde555a22dd647d
+  metadata.gz: c8c85b0c13bf08766561d80cf44766dc7c3d52d6cd230bbd33df53bee3347293
+  data.tar.gz: 3a652af950c5af6dc28c2c7d1962d64e067bc46b927aec8817ed9feb0561d187
 SHA512:
-  metadata.gz: bfe5899e858df982b9d1eeb475729503513d1b18e7315c3f93d35167c19512c301047f3bba4d0cabc37223bc1b06c64c34c70e7720a64ad4283e19616759cfcf
-  data.tar.gz: f06391fb774add42ea406736f5115d1e0ebf1a08b3ed1c4454640f5b4b240c9a919132170448d0449058b3d11f3d8ab161338d3801385b7e408c30d3e702e1ba
+  metadata.gz: 2680b3032848974c5e186f11a413ccd67c3bf84cad1d6905ab23128f2d1df3f21baa0fcf8b9600b37412a92f7b0f20b67e797f6a0bc5135dd31761e292afef8e
+  data.tar.gz: 03304dfea1de0c7467e465cf71b87fd091bd2556ad3d0b11cd1766f04925726e19fbc33288a26e9c8bbbc2dca083e11ba958a3222bfd29f9b57ae9748f969271

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 2.15.1
+### Fixed
+* Fixed how `entry_mapping` is cached in order to avoid errors when deserializing resources that have been serialized with previously deleted mapping classes. [#212](https://github.com/contentful/contentful.rb/issues/212)
+
 ## 2.15.0
 ### Added
 * Added the capability for `Array#next_page` to support carry-over of query parameters.

data/lib/contentful/asset.rb

@@ -10,10 +10,7 @@ module Contentful
 
     # @private
     def marshal_dump
-      {
-        configuration: @configuration,
-        raw: raw
-      }
+      super.merge(raw: raw)
     end
 
     # @private
@@ -23,6 +20,11 @@ module Contentful
       define_asset_methods!
     end
 
+    # @private
+    def known_link?(*)
+      false
+    end
+
     # @private
     def inspect
       "<#{repr_name} id='#{sys[:id]}' url='#{url}'>"

data/lib/contentful/base_resource.rb

@@ -31,14 +31,27 @@ module Contentful
 
     # @private
     def marshal_dump
+      entry_mapping = @configuration[:entry_mapping].each_with_object({}) do |(k, v), res|
+        res[k] = v.to_s
+      end
+
       {
-        configuration: @configuration,
+        configuration: @configuration.merge(entry_mapping: entry_mapping),
         raw: raw
       }
     end
 
     # @private
     def marshal_load(raw_object)
+      raw_object[:configuration][:entry_mapping] = raw_object[:configuration].fetch(:entry_mapping, {}).each_with_object({}) do |(k, v), res|
+        begin
+          v = v.to_s unless v.is_a?(::String)
+          res[k] = v.split('::').inject(Object) { |o, c| o.const_get c }
+        rescue
+          next
+        end
+      end
+
       @raw = raw_object[:raw]
       @configuration = raw_object[:configuration]
       @default_locale = @configuration[:default_locale]

data/lib/contentful/fields_resource.rb

@@ -48,11 +48,7 @@ module Contentful
 
     # @private
     def marshal_dump
-      {
-        configuration: @configuration,
-        raw: raw_with_links,
-        localized: localized
-      }
+      super.merge(raw: raw_with_links, localized: localized)
     end
 
     # @private

data/lib/contentful/version.rb

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

data/spec/entry_spec.rb

@@ -160,6 +160,7 @@ describe Contentful::Entry do
   describe 'can be marshalled' do
     def test_dump(nyancat)
       dump = Marshal.dump(nyancat)
+      yield if block_given?
       new_cat = Marshal.load(dump)
 
       # Attributes
@@ -184,6 +185,14 @@ describe Contentful::Entry do
       expect(new_cat.image.file.url).to eq "//images.contentful.com/cfexampleapi/4gp6taAwW4CmSgumq2ekUm/9da0cd1936871b8d72343e895a00d611/Nyan_cat_250px_frame.png"
     end
 
+    it 'marshals properly when entry_mapping changed' do
+      vcr('entry/marshall') {
+        class TestEntryMapping; end
+        nyancat = create_client(gzip_encoded: false, max_include_resolution_depth: 2, entry_mapping: { 'irrelevant_model' => TestEntryMapping }).entries(include: 2, 'sys.id' => 'nyancat').first
+        test_dump(nyancat) { Object.send(:remove_const, :TestEntryMapping) }
+      }
+    end
+
     it 'marshals properly' do
       vcr('entry/marshall') {
         nyancat = create_client(gzip_encoded: false, max_include_resolution_depth: 2).entries(include: 2, 'sys.id' => 'nyancat').first

metadata

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