carrierwave-aws 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a92faaa25331fa4e10ea844d8fe5b90519c4ae87
-  data.tar.gz: 68352ca1f0ee3f20985a3c0063b360698d56566c
+  metadata.gz: 7a27752d4e7581b2b8d8f9a71b23c0c671c5a85e
+  data.tar.gz: 1e96f03161449d7d14f7d3272afb3a272ed8612b
 SHA512:
-  metadata.gz: f9fddccad1b717d22910f426930192bbad53b65e1fc88d979d912893f68e1ee2e088e39c9c4e3209d3a6eafcc6a948fd53764e9f563c64f7ffd7d5adc826aadc
-  data.tar.gz: 07b0a3b8e7c45b095842d15238f660accd2893c75a6ced507809d5049a00668dcf0257b8ada8c6d580f627114862c018778a3f53364744001a2300857ebe01d8
+  metadata.gz: 1d4dd67d51ef4a163107144b48336ffa0921facd5b969748d8d3d66fe7a15405b924c8b6b51624c6d22e53344b34e645bf2d9087d56a5621162b33a602f07a95
+  data.tar.gz: b73a9988c9b4f4b57ba4dc2e43bbc423b3e0a938caee3083e1d1d2a2771ba669fffcd5871f3939c1fe1ee6047b830517f3410afb48468b709a1e9264a4c3d093

data/.travis.yml

@@ -1,8 +1,8 @@
 ---
 language: ruby
 rvm:
-- 1.9.3
 - 2.0.0
+- 2.1.0
 script: bundle exec rspec spec
 env:
   global:

data/HISTORY.md

@@ -1,3 +1,9 @@
+## Version 0.4.0 2013-03-20
+
+* Allow custom options for authenticated urls [Filipe Giusti]
+* Loosen aws-sdk constraints
+* Add `aws_read_options` and `aws_write_options` [Erik Hanson and Greg Woodward]
+
 ## Version 0.3.2 2013-08-06
 
 * And we're back to passing the path. An updated integration test confirms it

data/carrierwave-aws.gemspec

@@ -16,8 +16,8 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(spec)/})
   gem.require_paths = ['lib']
 
-  gem.add_dependency 'carrierwave', '>= 0.7.0'
-  gem.add_dependency 'aws-sdk',     '>= 1.8.0'
+  gem.add_dependency 'carrierwave', '>= 0.7'
+  gem.add_dependency 'aws-sdk',     '>= 1.29'
 
-  gem.add_development_dependency 'rspec', '~> 2.14.0'
+  gem.add_development_dependency 'rspec', '~> 2.14'
 end

data/lib/carrierwave-aws.rb

@@ -8,6 +8,8 @@ class CarrierWave::Uploader::Base
   add_config :aws_credentials
   add_config :aws_bucket
   add_config :aws_acl
+  add_config :aws_read_options
+  add_config :aws_write_options
 
   configure do |config|
     config.storage_engines[:aws] = 'CarrierWave::Storage::AWS'

data/lib/carrierwave/aws/version.rb

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

data/lib/carrierwave/storage/aws.rb

@@ -65,7 +65,7 @@ module CarrierWave
         end
 
         def read
-          file.read
+          file.read(uploader_read_options)
         end
 
         def size
@@ -73,11 +73,7 @@ module CarrierWave
         end
 
         def store(new_file)
-          @file = bucket.objects[path].write({
-            acl:          uploader.aws_acl,
-            content_type: new_file.content_type,
-            file:         new_file.path
-          }.merge(uploader.aws_attributes || {}))
+          @file = bucket.objects[path].write(uploader_write_options(new_file))
 
           true
         end
@@ -88,14 +84,14 @@ module CarrierWave
 
         def url(options = {})
           if uploader.aws_acl != :public_read
-            authenticated_url
+            authenticated_url(options)
           else
             public_url
           end
         end
 
-        def authenticated_url
-          file.url_for(:read, expires: uploader.aws_authenticated_url_expiration).to_s
+        def authenticated_url(options = {})
+          file.url_for(:read, { expires: uploader.aws_authenticated_url_expiration }.merge(options)).to_s
         end
 
         def public_url
@@ -106,6 +102,18 @@ module CarrierWave
           end
         end
 
+        def uploader_read_options
+          uploader.aws_read_options
+        end
+
+        def uploader_write_options(new_file)
+          {
+            acl:          uploader.aws_acl,
+            content_type: new_file.content_type,
+            file:         new_file.path
+          }.merge(uploader.aws_attributes || {}).merge(uploader.aws_write_options || {})
+        end
+
         private
 
         def bucket

data/spec/carrierwave/storage/aws_spec.rb

@@ -31,8 +31,8 @@ describe CarrierWave::Storage::AWS::File do
   let(:objects)    { { 'files/1/file.txt' => file } }
   let(:bucket)     { double(:bucket, objects: objects) }
   let(:connection) { double(:connection, buckets: { 'example-com' => bucket }) }
-  let(:file)       { double(:file, read: '0101010') }
-  let(:uploader)   { double(:uploader, aws_bucket: 'example-com', asset_host: nil) }
+  let(:file)       { double(:file, read: '0101010', content_type: 'content/type', path: '/file/path') }
+  let(:uploader)   { double(:uploader, aws_bucket: 'example-com', aws_acl: :public_read, aws_attributes: {}, asset_host: nil, aws_read_options: { encryption_key: 'abc' }, aws_write_options: { encryption_key: 'def' }) }
   let(:path)       { 'files/1/file.txt' }
 
   subject(:aws_file) do
@@ -45,6 +45,37 @@ describe CarrierWave::Storage::AWS::File do
     end
   end
 
+  describe '#uploader_write_options' do
+    it 'includes acl, content_type, file, aws_attributes, and aws_write_options' do
+      aws_file.uploader_write_options(file).should == {
+        acl: :public_read,
+        content_type: 'content/type',
+        file: '/file/path',
+        encryption_key: 'def'
+      }
+    end
+
+    it 'works if aws_attributes is nil' do
+      uploader.stub(:aws_attributes) { nil }
+      expect {
+        aws_file.uploader_write_options(file)
+      }.to_not raise_error
+    end
+
+    it 'works if aws_write_options is nil' do
+      uploader.stub(:aws_write_options) { nil }
+      expect {
+        aws_file.uploader_write_options(file)
+      }.to_not raise_error
+    end
+  end
+
+  describe '#uploader_read_options' do
+    it 'includes aws_read_options' do
+      aws_file.uploader_read_options.should == { encryption_key: 'abc' }
+    end
+  end
+
   describe '#to_file' do
     it 'returns the internal file instance' do
       aws_file.to_file.should be(file)
@@ -59,6 +90,14 @@ describe CarrierWave::Storage::AWS::File do
 
       aws_file.authenticated_url
     end
+
+    it 'requests a url for reading with custom options' do
+      uploader.stub(aws_authenticated_url_expiration: 60)
+
+      file.should_receive(:url_for).with(:read, hash_including(response_content_disposition: 'attachment'))
+
+      aws_file.authenticated_url(response_content_disposition: 'attachment')
+    end
   end
 
   describe '#url' do

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-aws
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Parker Selbert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-06 00:00:00.000000000 Z
+date: 2014-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '1.29'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '1.29'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '2.14'
 description: Use aws-sdk for S3 support in CarrierWave
 email:
 - parker@sorentwo.com
@@ -59,10 +59,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .env.sample
-- .gitignore
-- .rspec
-- .travis.yml
+- ".env.sample"
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - HISTORY.md
 - LICENSE.txt
@@ -86,17 +86,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: A slimmer alternative to using Fog for S3 support in CarrierWave