contentful 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf533a202661dbb21a1407db9ce750ce065e4b65
-  data.tar.gz: ab9be792f8c764a9a3d193b2b48a4023e5d67f7a
+  metadata.gz: 58f25fa3b3309c03b128ee16d9703f4b462c9921
+  data.tar.gz: 87ee174d7e0a063e1f93818063b993805b878690
 SHA512:
-  metadata.gz: 20c2571a350ee58c2b3bb9022067f286b11e853c140d4469ca12b501d0659f1188c9efcf6754d261b334ce387f776b2c8db389261ad909a78fcdcf2eaf8d2c13
-  data.tar.gz: 63b528128d85440107f71f696d0e9278aa94b0e0cae82e6e19a3d007269a04f9468e9ad05e298939df78020c864e263cd0b35c19ca7e68a4228ce09debf86577
+  metadata.gz: b60a5aea8f56ca5cd84e1739cf044abe6f175ccadbba288d9bf89bf0af4ce256d135533e0b552ed102a975b5e4b836cbe001b013f1e952fddc60f394271e3104
+  data.tar.gz: db7212eb5ce1eafa4ea0fd32f4ad63b5dbf9a697d6913f63963b822f84685c6f8260ee520fa3214301f98e502a9a9964406c65c835b11caa58586b32e93e3fd5

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 1.1.1
+### Fixed
+* Fix Re-Marshalling of already Un-Marshalled objects
+
 ## 1.1.0
 ### Added
 * Add support for `select` operator in `#entries` and `#assets` call

data/lib/contentful/asset.rb

@@ -19,6 +19,7 @@ module Contentful
       @properties = extract_from_object(raw_object, :property, self.class.property_coercions.keys)
       @sys = raw_object.key?('sys') ? extract_from_object(raw_object['sys'], :sys) : {}
       initialize_fields_for_localized_resource(raw_object)
+      @raw = raw_object
     end
 
     # Generates a URL for the Contentful Image API

data/lib/contentful/entry.rb

@@ -19,12 +19,13 @@ module Contentful
       @properties = extract_from_object(raw_object, :property, self.class.property_coercions.keys)
       @sys = raw_object.key?('sys') ? extract_from_object(raw_object['sys'], :sys) : {}
       extract_fields_from_object!(raw_object)
+      @raw = raw_object
     end
 
     # @private
     def raw_with_links
       links = properties.keys.select { |property| known_link?(property) }
-      processed_raw = Marshal.load(Marshal.dump(raw)) # Deep Copy
+      processed_raw = raw.clone
       raw['fields'].each do |k, v|
         processed_raw['fields'][k] = links.include?(k.to_sym) ? send(snakify(k)) : v
       end

data/lib/contentful/version.rb

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

data/spec/entry_spec.rb

@@ -176,6 +176,7 @@ describe Contentful::Entry do
         property :lives
         property :bestFriend, Cat
         property :catPack
+        property :image, Contentful::Asset
       end
 
       def test_dump(nyancat)
@@ -209,6 +210,8 @@ describe Contentful::Entry do
         expect(new_cat.cat_pack.first.name).to eq "Happy Cat"
         expect(new_cat.cat_pack.first.cat_pack[0].name).to eq "Nyan Cat"
         expect(new_cat.cat_pack.first.cat_pack[1].name).to eq "Worried Cat"
+
+        expect(new_cat.image.file.url).to eq "//images.contentful.com/cfexampleapi/4gp6taAwW4CmSgumq2ekUm/9da0cd1936871b8d72343e895a00d611/Nyan_cat_250px_frame.png"
       end
 
       it 'using entry_mapping' do
@@ -230,6 +233,20 @@ describe Contentful::Entry do
         }
       end
 
+      it 'can remarshall an unmarshalled object' do
+        vcr('entry/marshall') {
+          nyancat = create_client(resource_mapping: {
+            'Entry' => ->(_json_object) do
+              return Cat if _json_object.fetch('sys', {}).fetch('contentType', {}).fetch('sys', {}).fetch('id', nil) == 'cat'
+              Contentful::Entry
+            end
+          }).entries(include: 2, 'sys.id' => 'nyancat').first
+
+          # The double load/dump is on purpose
+          test_dump(Marshal.load(Marshal.dump(nyancat)))
+        }
+      end
+
       it 'newly created custom resources have property mappings' do
         entry = Cat.new
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contentful
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Contentful GmbH (Jan Lelis)
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-18 00:00:00.000000000 Z
+date: 2016-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http