carrierwave-aws 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a27752d4e7581b2b8d8f9a71b23c0c671c5a85e
-  data.tar.gz: 1e96f03161449d7d14f7d3272afb3a272ed8612b
+  metadata.gz: eabbf546103220f4d72ac4cb88312212acbd0708
+  data.tar.gz: 94f36bbc4a81f108336a9628f9cb714bb3bb08a6
 SHA512:
-  metadata.gz: 1d4dd67d51ef4a163107144b48336ffa0921facd5b969748d8d3d66fe7a15405b924c8b6b51624c6d22e53344b34e645bf2d9087d56a5621162b33a602f07a95
-  data.tar.gz: b73a9988c9b4f4b57ba4dc2e43bbc423b3e0a938caee3083e1d1d2a2771ba669fffcd5871f3939c1fe1ee6047b830517f3410afb48468b709a1e9264a4c3d093
+  metadata.gz: 657e1f08cf52b24282a10e9d4dd46850a22a4944fb0408c33cb5b42e4e36ff1a3b834f9ecac67fb91183ac6ab06f425058d4aaea22219b85c563880cbaa97455
+  data.tar.gz: 785e58e18a6810a419729dc2486b8e9e652f7765cb962402f2bdd76c0163ba60d15d4f3cbb9b7c892b5ab9b84fe8126e2f9cab9396cef4f3d3a21db4b05a4e78

data/{HISTORY.md → CHANGELOG.md}

@@ -1,4 +1,9 @@
-## Version 0.4.0 2013-03-20
+## Version 0.4.1 2014-03-28
+
+* Fix regression in `aws_read_options` defaulting to `nil` rather than an empty
+  hash. [Johannes Würbach]
+
+## Version 0.4.0 2014-03-20
 
 * Allow custom options for authenticated urls [Filipe Giusti]
 * Loosen aws-sdk constraints

data/lib/carrierwave/aws/version.rb

@@ -1,5 +1,5 @@
 module Carrierwave
   module AWS
-    VERSION = '0.4.0'
+    VERSION = '0.4.1'
   end
 end

data/lib/carrierwave/storage/aws.rb

@@ -103,7 +103,7 @@ module CarrierWave
         end
 
         def uploader_read_options
-          uploader.aws_read_options
+          uploader.aws_read_options || {}
         end
 
         def uploader_write_options(new_file)

data/spec/carrierwave/storage/aws_spec.rb

@@ -74,6 +74,11 @@ describe CarrierWave::Storage::AWS::File do
     it 'includes aws_read_options' do
       aws_file.uploader_read_options.should == { encryption_key: 'abc' }
     end
+
+    it 'ensures that read options are a hash' do
+      uploader.stub(:aws_read_options) { nil }
+      aws_file.uploader_read_options.should == {}
+    end
   end
 
   describe '#to_file' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-aws
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Parker Selbert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-20 00:00:00.000000000 Z
+date: 2014-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -63,8 +63,8 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
-- HISTORY.md
 - LICENSE.txt
 - README.md
 - Rakefile