opium 1.1.6 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 544c54e1dac7cf8a8adb4f02fc4335c33c9778b7
-  data.tar.gz: 81bab9d1dbd8139fd8c73d830b16476e1e6b42d2
+  metadata.gz: d5e7b88ef5afc4f4bb9899031776ef2947c8043c
+  data.tar.gz: 6d53e858f5ebfc9b448e7a9d98344ca4b2c30fc9
 SHA512:
-  metadata.gz: c6c906d84d6b3499c0c531fda9966e19e06b80c91e31a850b147bc6c11887120ece07ae9c54b931b6b05496adf0fcdbc8aacfa2d78b9284026c974b424cf4449
-  data.tar.gz: c9a2d427d4f7b961382eeed079fd1400ef2304ea2861577f2cf67354657cc462b673c7fe59c9cad4714d307d11296bdabd9b934091e9c9277b7712ce83878da4
+  metadata.gz: 85938d9d4858f607cc93c87b4f212cef1e5812f1bce17b6fc9a18b9f268dc50755ea3f24375ed07dc5e038a96bcb99c79198698a0e09b6da0fa21d6f074f6b14
+  data.tar.gz: 25eec023d9656b0a965da55b39c101a1b3fc551e419784cee75798bd07cb77809b0037dbbf262b3e418fa817415560951ce276fe2426e5fa4fee5660fd1c4ace

data/CHANGELOG.md

@@ -1,6 +1,10 @@
+## 1.1.7
+### Resolved Issues
+- #40: `Opium::File.to_ruby` now correctly handles JSON string representation of hashes.
+
 ## 1.1.6
 ### Resolved Issues
-- #39: `Opium::File#upload` now paramterizes the file name.
+- #39: `Opium::File.upload` now paramterizes the file name.
 - #38: Added Content-Length and Transfer-Encoding headers to file uploads.
 
 ## 1.1.5

data/lib/opium/file.rb

@@ -23,6 +23,7 @@ module Opium
       def to_ruby( object )
         return unless object
         return object if object.is_a?( self )
+        object = ::JSON.parse( object ) if object.is_a?( String )
         if object.is_a?( Hash ) && (has_key_of_value( object, :__type, 'File' ) || has_keys( object, :url, :name ))
           new( object )
         else
@@ -58,7 +59,7 @@ module Opium
       end
       
       def has_keys( object, *keys )
-        object.keys.all? {|key| keys.include? key}
+        object.keys.all? {|key| keys.include?( key.to_s ) || keys.include?( key.to_sym )}
       end
       
       def parameterize_name( name )

data/lib/opium/version.rb

@@ -1,3 +1,3 @@
 module Opium
-  VERSION = "1.1.6"
+  VERSION = "1.1.7"
 end

data/spec/opium/file_spec.rb

@@ -125,6 +125,13 @@ describe Opium::File do
       it { expect( result ).to be_nil }
     end
     
+    context 'when given a JSON string' do
+      let(:object) { { url: location, name: 'chunky_bacon.jpg' }.to_json }
+      
+      it { expect { result }.to_not raise_exception }
+      it { expect( result ).to be_a Opium::File }
+    end
+    
     context 'when not given a hash' do
       let(:object) { 42 }
       

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opium
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors:
 - Joshua Bowers