buttercms-ruby 1.6 → 1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33b36093743686ac542292da5bbf4c0c1c7ade36e9d09c57d72161f8094a722b
-  data.tar.gz: d75f6c5f94c7882c8aa105f10d267e78a31f98e660bdc6900827536da4891ce4
+  metadata.gz: 2c4b746f372b9a3255947360799f205470880bf4e0c07b45ffbf0bc9ce2ca107
+  data.tar.gz: 2ff93eef484952c2e236af4e28f69e922d58ddaf20d7dcfd76d1ef9f30a80685
 SHA512:
-  metadata.gz: da1631dd94328b6c62786002de75bb33de70d4e584bb2f1bd0fb5481847a587a4113cc85d3d19fd69e8ef8a00be25b016c205e4a656c822ffca12140ede8ac34
-  data.tar.gz: 8c900e9cc1cfef9eb187e2e5b6b0d1cee3e2dada2ef6c3ba3eff52fb429e07d77660cc29d2ea8a70fdecccc902abcf150b4177c1abf4dfe096a04c52f38840f0
+  metadata.gz: 277dd34304c21ab48b6e479d9c8a76bd6c504bac3059452da754728dd062ee3ab7c271c6bec91b6d295121452e08bc9dd51c7cdea09c699438aebd802ec3f0a8
+  data.tar.gz: f1e8800efbb85ecf77cfea176068b93b4d73e9f6d7fa3bc9784b41af4d862ef9d2bcca861bb5f5c61389bd6a36b6744ad45046c7ab3d65ed4bee332b0e447ccc

data/lib/buttercms/butter_resource.rb

@@ -7,12 +7,19 @@ module ButterCMS
       @data = HashToObject.convert(json["data"])
       @meta = HashToObject.convert(json["meta"]) if json["meta"]
 
-      if json["data"].is_a?(Hash)
-        json["data"].each do |key, value|
-          instance_variable_set("@#{key}", @data.send(key))
-          self.class.send(:attr_reader, key)
-        end
-      end
+      define_attribute_methods(@data)
+    end
+
+    def marshal_dump
+      { json: @json, data: @data, meta: @meta }
+    end
+
+    def marshal_load(dump)
+      @json = dump[:json]
+      @data = dump[:data]
+      @meta = dump[:meta]
+
+      define_attribute_methods(@data)
     end
 
     def inspect
@@ -25,7 +32,7 @@ module ButterCMS
       # API expects all endpoints to include trailing slashes
       resource_path + (id ? "#{id}/" : '')
     end
-    
+
     def self.patch_endpoint(id)
       # Append trailing slash when id is added to path because
       # API expects all endpoints to include trailing slashes
@@ -47,14 +54,14 @@ module ButterCMS
 
       self.create_object(response)
     end
-    
+
     def self.create(options = {})
       options[:method] = 'Post'
       response = ButterCMS.write_request(self.endpoint, options)
 
       self.create_object(response)
     end
-    
+
     def self.update(id, options = {})
       options[:method] = 'Patch'
       _endpoint = if resource_path.include?("/pages/")
@@ -76,5 +83,14 @@ module ButterCMS
     def self.create_object(response)
       self.new(response)
     end
+
+    def define_attribute_methods(methods)
+      return unless methods.respond_to?(:each_pair)
+
+      methods.each_pair do |key, value|
+        instance_variable_set("@#{key}", value)
+        self.class.send(:attr_reader, key)
+      end
+    end
   end
 end

data/lib/buttercms/version.rb

@@ -1,3 +1,3 @@
 module ButterCMS
-  VERSION = '1.6'
+  VERSION = '1.7'
 end

data/spec/lib/buttercms/butter_collection_spec.rb

@@ -21,4 +21,20 @@ describe ButterCMS::ButterCollection do
 
     expect(collection.count).to eq 1
   end
+
+  # Marshal.load (used by Rails for caching) was not restoring the ButterResource's dynamic methods
+  # See https://github.com/ButterCMS/buttercms-ruby/issues/13
+  describe 'marshal load' do
+    subject { described_class.new(ButterCMS::ButterResource, 'data' => [{ 'name' => 'Test Name', 'description' => 'Test Description' }]) }
+
+    it 'restores the ButterResource dynamic methods' do
+      collection = Marshal.load(Marshal.dump(subject))
+      resource = collection.first
+
+      aggregate_failures do
+        expect(resource.name).to eq('Test Name')
+        expect(resource.description).to eq('Test Description')
+      end
+    end
+  end
 end

data/spec/lib/buttercms/butter_resource_spec.rb

@@ -8,6 +8,17 @@ describe ButterCMS::ButterResource do
     allow(ButterCMS::ButterResource).to receive(:resource_path).and_return('')
   end
 
+  describe 'auto-generated methods' do
+    let(:resource) { described_class.new('data' => { 'name' => 'Test Name', 'description' => 'Test Description' }) }
+
+    it 'creates attribute reader methods for data pairs' do
+      aggregate_failures do
+        expect(resource.name).to eq('Test Name')
+        expect(resource.description).to eq('Test Description')
+      end
+    end
+  end
+
   describe '.all' do
 
     it 'should make a request with the correct endpoint' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: buttercms-ruby
 version: !ruby/object:Gem::Version
-  version: '1.6'
+  version: '1.7'
 platform: ruby
 authors:
 - ButterCMS
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-27 00:00:00.000000000 Z
+date: 2020-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec