carrierwave-aws 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9cfb613038a1d6671516ddc5f04d4c6a78024a7d
-  data.tar.gz: 85ed3134b7b2ffb7b2e5b6fab8a825a26b0258c9
+  metadata.gz: c1e20392785ccfd2e605fc9767c0dc197ad37a68
+  data.tar.gz: 50b782478484e7943ebd65a92a0e5d85941b1160
 SHA512:
-  metadata.gz: 58cf39368f66fafde4dfcde883d2a19314012a4b3604ca3160caf067dbb42905a727eb8d985c4d9e3f85251c1cd6961caa9aadd4d06c60431a314b5b710d50c8
-  data.tar.gz: 7efb7a4b9c857749c55b420946bfa8eafc2d7bd4ee9217046ee610ada3e098f6447c5820b79f68c6ee5a52377a41b4f8cf2d453a605b3655d1db3be57f948757
+  metadata.gz: ead96dc851927e50fac612af14175c5c2d24a05ec05a345fea5e67cb0656f040595f8548d45705f300a7305a887702ebb68fc3f4df9a9d2cbe2d7c35fd5265db
+  data.tar.gz: cca3f59e0331a5dcbfdc72323105eaa30b798142853eb7ef42798e57dd55e2d143551c96a616d2ae41f89f7c0971fcf5c0f3c2a8106b75b8aa61b640d2c67597

data/.travis.yml

@@ -1,3 +1,4 @@
+---
 language: ruby
 rvm:
 - 2.1.5
@@ -17,4 +18,3 @@ env:
       B75vnSCFTnQgCP4dmz78VN/WWj88Tpnh4cjUCU0cQjQ5M7oQ0KTbM0d7WDyf
       rf0F+B9OihBtLNQWqjocRvNH0dU5OzBLCC9DVolUgNwOdNTHW2I7CwlxJ5t7
       ljQTxzPP+tFASwzBHjywbo7n0EX3efT5UOZhbD9LZL93X4SOlyU=
-  - secure: Uv276ljIrpfYNE34zKnawA6rxchmMymTzMs3LRcmsCDawDhNmtEuoqeHLiZctFU0k40YDylwcDXDWJayVDSW97+ytMqFfQ6e7HkL06iNZPcAW8V0LJt4SrVzRGIm6ER9Xib57lXhOnfS0jcVxT/UuD0pegvYdZb0VhUedmqInP0=

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## Version 0.7.0 2015-07-02
+
+* Revert to AWS-SDK v1. There are too many breaking changes between v1 and v2 to
+  be wrapped in a minor version change. This effectively reverts all changes
+  betwen `0.5.0` and `0.6.0`, restoring the old `0.5.0` behavior.
+
 ## Version 0.6.0 2015-06-26
 
 * Breaking Change: Updated to use AWS-SDK v2 [Mark Oleson]

data/README.md

@@ -38,20 +38,33 @@ the use of `aws_bucket` instead of `fog_directory`, and `aws_acl` instead of
 CarrierWave.configure do |config|
   config.storage    = :aws
   config.aws_bucket = ENV.fetch('S3_BUCKET_NAME')
-  config.aws_acl    = 'public-read'
+  config.aws_acl    = :public_read
   config.asset_host = 'http://example.com'
-
-  # The maximum period for authenticated_urls is only 7 days.
-  config.aws_authenticated_url_expiration = 60 * 60 * 24 * 7
+  config.aws_authenticated_url_expiration = 60 * 60 * 24 * 365
 
   config.aws_credentials = {
     access_key_id:     ENV.fetch('AWS_ACCESS_KEY_ID'),
-    secret_access_key: ENV.fetch('AWS_SECRET_ACCESS_KEY'),
-    region:            ENV.fetch('AWS_REGION') # Required
+    secret_access_key: ENV.fetch('AWS_SECRET_ACCESS_KEY')
   }
 end
 ```
 
+If you want to supply your own AWS configuration, put it inside
+`config.aws_credentials` like this:
+
+```ruby
+config.aws_credentials = {
+  access_key_id:     ENV['AWS_ACCESS_KEY_ID'],
+  secret_access_key: ENV['AWS_SECRET_ACCESS_KEY'],
+  config: AWS.config(my_aws_options)
+}
+```
+
+`AWS.config` will return `AWS::Core::Configuration` object which is used through
+`aws-sdk` gem. Browse [Amazon Docs][amazon-docs] for additional info. For
+example, if you want to turn off SSL for your asset URLs, you could simply set
+`AWS.config(use_ssl: false)`.
+
 ### Custom options for AWS URLs
 
 If you have a custom uploader that specifies additional headers for each URL, please try the following example:
@@ -89,3 +102,5 @@ cp .env.sample .env
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+[amazon-docs]: http://docs.aws.amazon.com/AWSRubySDK/latest/AWS/Core/Configuration.html

data/carrierwave-aws.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
 
   gem.add_dependency 'carrierwave', '~> 0.7'
-  gem.add_dependency 'aws-sdk',     '~> 2.0.47'
+  gem.add_dependency 'aws-sdk',     '~> 1.58'
 
   gem.add_development_dependency 'rspec', '~> 3'
 end

data/lib/carrierwave-aws.rb

@@ -2,8 +2,6 @@ require 'carrierwave'
 require 'carrierwave/aws/version'
 require 'carrierwave/storage/aws'
 require 'carrierwave/storage/aws_file'
-require 'carrierwave/storage/aws_options'
-require 'carrierwave/support/uri_filename'
 
 class CarrierWave::Uploader::Base
   add_config :aws_attributes

data/lib/carrierwave/aws/version.rb

@@ -1,5 +1,5 @@
 module Carrierwave
   module AWS
-    VERSION = '0.6.0'
+    VERSION = '0.7.0'
   end
 end

data/lib/carrierwave/storage/aws.rb

@@ -1,4 +1,4 @@
-require 'aws-sdk-resources'
+require 'aws/s3'
 
 module CarrierWave
   module Storage
@@ -23,7 +23,7 @@ module CarrierWave
 
       def connection
         @connection ||= begin
-          self.class.connection_cache[credentials] ||= ::Aws::S3::Resource.new(*credentials)
+          self.class.connection_cache[credentials] ||= ::AWS::S3.new(*credentials)
         end
       end
 

data/lib/carrierwave/storage/aws_file.rb

@@ -1,51 +1,43 @@
 module CarrierWave
   module Storage
     class AWSFile
-      attr_writer :file
-      attr_accessor :uploader, :connection, :path, :aws_options
+      attr_writer :content_type
+      attr_reader :uploader, :connection, :path
 
       def initialize(uploader, connection, path)
-        @uploader    = uploader
-        @connection  = connection
-        @path        = path
-        @aws_options = AWSOptions.new(uploader)
+        @uploader   = uploader
+        @connection = connection
+        @path       = path
       end
 
-      def file
-        @file ||= bucket.object(path)
-      end
-
-      alias_method :to_file, :file
-
       def attributes
-        file.data.to_h
+        file.head.data
       end
 
       def content_type
-        file.content_type
+        @content_type || file.content_type
       end
 
       def delete
         file.delete
       end
 
-      def exists?
-        file.exists?
+      def extension
+        path.split('.').last
       end
 
-      def extension
-        elements = path.split('.')
-        elements.last if elements.size > 1
+      def exists?
+        file.exists?
       end
 
       def filename(options = {})
         if file_url = url(options)
-          CarrierWave::Support::UriFilename.filename(file_url)
+          URI.decode(file_url.split('?').first).gsub(/.*\/(.*?$)/, '\1')
         end
       end
 
       def read
-        file.get(aws_options.read_options).body.read
+        file.read(uploader_read_options)
       end
 
       def size
@@ -53,15 +45,25 @@ module CarrierWave
       end
 
       def store(new_file)
-        !!file.put(aws_options.write_options(new_file))
+        @file = bucket.objects[path].write(uploader_write_options(new_file))
+
+        true
       end
 
-      def copy_to(new_path)
-        bucket.object(new_path).copy_from(copy_source: "#{bucket.name}/#{file.key}")
+      def to_file
+        file
+      end
+
+      def url(options = {})
+        if uploader.aws_acl != :public_read
+          authenticated_url(options)
+        else
+          public_url
+        end
       end
 
       def authenticated_url(options = {})
-        file.presigned_url(:get, aws_options.expiration_options(options))
+        file.url_for(:read, { expires: uploader.aws_authenticated_url_expiration }.merge(options)).to_s
       end
 
       def public_url
@@ -72,18 +74,42 @@ module CarrierWave
         end
       end
 
-      def url(options = {})
-        if uploader.aws_acl.to_s != 'public-read'
-          authenticated_url(options)
-        else
-          public_url
+      def copy_to(new_path)
+        file.copy_to(bucket.objects[new_path], uploader_copy_options)
+      end
+
+      def uploader_read_options
+        uploader.aws_read_options || {}
+      end
+
+      def uploader_write_options(new_file)
+        aws_attributes    = uploader.aws_attributes    || {}
+        aws_write_options = uploader.aws_write_options || {}
+
+        { acl:          uploader.aws_acl,
+          content_type: new_file.content_type,
+          file:         new_file.path
+        }.merge(aws_attributes).merge(aws_write_options)
+      end
+
+      def uploader_copy_options
+        aws_write_options = uploader.aws_write_options || {}
+
+        storage_options = aws_write_options.select do |key,_|
+          [:reduced_redundancy, :storage_class, :server_side_encryption].include?(key)
         end
+
+        { acl: uploader.aws_acl }.merge(storage_options)
       end
 
       private
 
       def bucket
-        @bucket ||= connection.bucket(uploader.aws_bucket)
+        @bucket ||= connection.buckets[uploader.aws_bucket]
+      end
+
+      def file
+        @file ||= bucket.objects[path]
       end
     end
   end

data/spec/carrierwave/storage/aws_file_spec.rb

@@ -1,15 +1,16 @@
 require 'spec_helper'
 
 describe CarrierWave::Storage::AWSFile do
+  let(:objects)    { { 'files/1/file.txt' => file } }
   let(:path)       { 'files/1/file.txt' }
-  let(:file)       { double(:file, content_type: 'content/type', path: '/file/path') }
-  let(:bucket)     { double(:bucket, object: file) }
-  let(:connection) { double(:connection, bucket: bucket) }
+  let(:bucket)     { double(:bucket, objects: objects) }
+  let(:connection) { double(:connection, buckets: { 'example-com' => bucket }) }
+  let(:file)       { double(:file, read: '0101010', content_type: 'content/type', path: '/file/path') }
 
   let(:uploader) do
     double(:uploader,
       aws_bucket: 'example-com',
-      aws_acl: :'public-read',
+      aws_acl: :public_read,
       aws_attributes: {},
       asset_host: nil,
       aws_read_options: { encryption_key: 'abc' },
@@ -21,32 +22,86 @@ describe CarrierWave::Storage::AWSFile do
     CarrierWave::Storage::AWSFile.new(uploader, connection, path)
   end
 
+  describe '#exists?' do
+    it 'checks if the remote file object exists' do
+      expect(file).to receive(:exists?).and_return(true)
+
+      aws_file.exists?
+    end
+  end
+
+  describe '#read' do
+    it 'reads from the remote file object' do
+      expect(aws_file.read).to eq('0101010')
+    end
+  end
+
+  describe '#uploader_write_options' do
+    it 'includes acl, content_type, file, aws_attributes, and aws_write_options' do
+      expect(aws_file.uploader_write_options(file)).to eq(
+        acl:            :public_read,
+        content_type:   'content/type',
+        file:           '/file/path',
+        encryption_key: 'def'
+      )
+    end
+
+    it 'works if aws_attributes is nil' do
+      allow(uploader).to receive(:aws_attributes) { nil }
+
+      expect {
+        aws_file.uploader_write_options(file)
+      }.to_not raise_error
+    end
+
+    it 'works if aws_write_options is nil' do
+      allow(uploader).to receive(: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
+      expect(aws_file.uploader_read_options).to eq(encryption_key: 'abc')
+    end
+
+    it 'ensures that read options are a hash' do
+      allow(uploader).to receive(:aws_read_options) { nil }
+
+      expect(aws_file.uploader_read_options).to eq({})
+    end
+  end
+
   describe '#to_file' do
     it 'returns the internal file instance' do
-      file = Object.new
-      aws_file.file = file
-
       expect(aws_file.to_file).to be(file)
     end
   end
 
-  describe '#extension' do
-    it 'extracts the file extension from the path' do
-      aws_file.path = 'file.txt'
+  describe '#authenticated_url' do
+    it 'requests a url for reading with the configured expiration' do
+      allow(uploader).to receive(:aws_authenticated_url_expiration) { 60 }
 
-      expect(aws_file.extension).to eq('txt')
+      expect(file).to receive(:url_for).with(:read, expires: 60)
+
+      aws_file.authenticated_url
     end
 
-    it 'is nil if the file has no extension' do
-      aws_file.path = 'filetxt'
+    it 'requests a url for reading with custom options' do
+      allow(uploader).to receive(:aws_authenticated_url_expiration) { 60 }
+
+      expect(file).to receive(:url_for).with(:read, hash_including(response_content_disposition: 'attachment'))
 
-      expect(aws_file.extension).to be_nil
+      aws_file.authenticated_url(response_content_disposition: 'attachment')
     end
   end
 
   describe '#url' do
     it 'requests a public url if acl is public readable' do
-      allow(uploader).to receive(:aws_acl) { :'public-read' }
+      allow(uploader).to receive(:aws_acl) { :public_read }
 
       expect(file).to receive(:public_url)
 
@@ -57,16 +112,24 @@ describe CarrierWave::Storage::AWSFile do
       allow(uploader).to receive(:aws_acl) { :private }
       allow(uploader).to receive(:aws_authenticated_url_expiration) { 60 }
 
-      expect(file).to receive(:presigned_url).with(:get, { expires_in: 60 })
+      expect(file).to receive(:url_for)
 
       aws_file.url
     end
 
     it 'uses the asset_host and file path if asset_host is set' do
-      allow(uploader).to receive(:aws_acl) { :'public-read' }
+      allow(uploader).to receive(:aws_acl) { :public_read }
       allow(uploader).to receive(:asset_host) { 'http://example.com' }
 
       expect(aws_file.url).to eq('http://example.com/files/1/file.txt')
     end
   end
+
+  describe '#filename' do
+    it 'returns the filename from the url' do
+      expect(aws_file).to receive(:url).and_return('http://example.com/files/1/file%201.txt?foo=bar/baz.txt')
+
+      expect(aws_file.filename).to eq('file 1.txt')
+    end
+  end
 end

data/spec/carrierwave/storage/aws_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe CarrierWave::Storage::AWS do
-  let(:credentials) { { access_key_id: 'abc', secret_access_key: '123', region: 'us-east-1' } }
+  let(:credentials) { { access_key_id: 'abc', secret_access_key: '123' } }
   let(:uploader)    { double(:uploader, aws_credentials: credentials) }
 
   subject(:storage) do
@@ -14,11 +14,17 @@ describe CarrierWave::Storage::AWS do
 
   describe '#connection' do
     it 'instantiates a new connection with credentials' do
-      expect(Aws::S3::Resource).to receive(:new).with(credentials)
+      expect(AWS::S3).to receive(:new).with(credentials)
 
       storage.connection
     end
 
+    it 'instantiates a new connection without any credentials' do
+      allow(uploader).to receive(:aws_credentials) { nil }
+
+      expect { storage.connection }.not_to raise_exception
+    end
+
     it 'caches connections by credentials' do
       expect(storage.connection).to eq(storage.connection)
     end

data/spec/features/copying_files_spec.rb

@@ -1,16 +1,20 @@
 require 'spec_helper'
 
 describe 'Copying Files', type: :feature do
-  let(:image)    { File.open('spec/fixtures/image.png', 'r') }
-  let(:original) { FeatureUploader.new }
-
   it 'copies an existing file to the specified path' do
+    uploader = Class.new(CarrierWave::Uploader::Base) do
+      def filename; 'image.png'; end
+    end
+
+    image    = File.open('spec/fixtures/image.png', 'r')
+    original = uploader.new
+
     original.store!(image)
     original.retrieve_from_store!('image.png')
 
     original.file.copy_to('uploads/image2.png')
 
-    copy = FeatureUploader.new
+    copy = uploader.new
     copy.retrieve_from_store!('image2.png')
 
     original_attributes = original.file.attributes

data/spec/features/querying_files_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+describe 'Querying Files', type: :feature do
+  it 'retrieves the attributes for a stored file' do
+    uploader = Class.new(CarrierWave::Uploader::Base) do
+      def filename; 'image.png'; end
+    end
+
+    image    = File.open('spec/fixtures/image.png', 'r')
+    instance = uploader.new
+
+    instance.store!(image)
+    instance.retrieve_from_store!('image.png')
+
+    expect(instance.file.attributes).to include(
+      :meta,
+      :restore_in_progress,
+      :content_type,
+      :etag,
+      :accept_ranges,
+      :last_modified,
+      :content_length
+    )
+
+    image.close
+    instance.file.delete
+  end
+
+  it 'checks if a remote file exists' do
+    uploader = Class.new(CarrierWave::Uploader::Base) do
+      def filename; 'image.png'; end
+    end
+
+    image    = File.open('spec/fixtures/image.png', 'r')
+    instance = uploader.new
+
+    instance.store!(image)
+    instance.retrieve_from_store!('image.png')
+
+    expect(instance.file.exists?).to be true
+
+    instance.file.delete
+
+    expect(instance.file.exists?).to be false
+
+    image.close
+  end
+end

data/spec/features/storing_files_spec.rb

@@ -1,59 +1,19 @@
 require 'spec_helper'
 
 describe 'Storing Files', type: :feature do
-  let(:image)    { File.open('spec/fixtures/image.png', 'r') }
-  let(:instance) { FeatureUploader.new }
-
   it 'uploads the file to the configured bucket' do
-    instance.store!(image)
-    instance.retrieve_from_store!('image.png')
-
-    expect(instance.file.size).to eq(image.size)
-    expect(instance.file.read).to eq(image.read)
-    expect(instance.file.read).to eq(instance.file.read)
-
-    image.close
-    instance.file.delete
-  end
-
-  it 'retrieves the attributes for a stored file' do
-    instance.store!(image)
-    instance.retrieve_from_store!('image.png')
-
-    expect(instance.file.attributes).to include(
-      :metadata,
-      :content_type,
-      :etag,
-      :accept_ranges,
-      :last_modified,
-      :content_length
-    )
-
-    expect(instance.file.content_type).to eq('image/png')
-    expect(instance.file.filename).to eq('image.png')
+    uploader = Class.new(CarrierWave::Uploader::Base) do
+      def filename; 'image.png'; end
+    end
 
-    image.close
-    instance.file.delete
-  end
-
-  it 'checks if a remote file exists' do
-    instance.store!(image)
-    instance.retrieve_from_store!('image.png')
-
-    expect(instance.file.exists?).to be_truthy
-
-    instance.file.delete
-
-    expect(instance.file.exists?).to be_falsy
-
-    image.close
-  end
+    image    = File.open('spec/fixtures/image.png', 'r')
+    instance = uploader.new
 
-  it 'gets a url for remote files' do
     instance.store!(image)
     instance.retrieve_from_store!('image.png')
 
-    expect(instance.url).to eq("https://#{ENV['S3_BUCKET_NAME']}.s3.amazonaws.com/#{instance.path}")
+    expect(instance.file.size).to be_nonzero
+    expect(image.size).to eq(instance.file.size)
 
     image.close
     instance.file.delete

data/spec/spec_helper.rb

@@ -10,10 +10,6 @@ def source_environment_file!
   end
 end
 
-FeatureUploader = Class.new(CarrierWave::Uploader::Base) do
-  def filename; 'image.png'; end
-end
-
 RSpec.configure do |config|
   source_environment_file!
 
@@ -36,12 +32,12 @@ RSpec.configure do |config|
     CarrierWave.configure do |config|
       config.storage    = :aws
       config.aws_bucket = ENV['S3_BUCKET_NAME']
-      config.aws_acl    = :'public-read'
+      config.aws_acl    = :public_read
 
       config.aws_credentials = {
         access_key_id:     ENV['S3_ACCESS_KEY'],
         secret_access_key: ENV['S3_SECRET_ACCESS_KEY'],
-        region:            ENV['AWS_REGION']
+        region:            ENV['S3_REGION']
       }
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-aws
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Parker Selbert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-26 00:00:00.000000000 Z
+date: 2015-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.47
+        version: '1.58'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.47
+        version: '1.58'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -73,14 +73,11 @@ files:
 - lib/carrierwave/aws/version.rb
 - lib/carrierwave/storage/aws.rb
 - lib/carrierwave/storage/aws_file.rb
-- lib/carrierwave/storage/aws_options.rb
-- lib/carrierwave/support/uri_filename.rb
 - spec/carrierwave-aws_spec.rb
 - spec/carrierwave/storage/aws_file_spec.rb
-- spec/carrierwave/storage/aws_options_spec.rb
 - spec/carrierwave/storage/aws_spec.rb
-- spec/carrierwave/support/uri_filename_spec.rb
 - spec/features/copying_files_spec.rb
+- spec/features/querying_files_spec.rb
 - spec/features/storing_files_spec.rb
 - spec/fixtures/image.png
 - spec/spec_helper.rb
@@ -110,10 +107,9 @@ summary: A slimmer alternative to using Fog for S3 support in CarrierWave
 test_files:
 - spec/carrierwave-aws_spec.rb
 - spec/carrierwave/storage/aws_file_spec.rb
-- spec/carrierwave/storage/aws_options_spec.rb
 - spec/carrierwave/storage/aws_spec.rb
-- spec/carrierwave/support/uri_filename_spec.rb
 - spec/features/copying_files_spec.rb
+- spec/features/querying_files_spec.rb
 - spec/features/storing_files_spec.rb
 - spec/fixtures/image.png
 - spec/spec_helper.rb

data/lib/carrierwave/storage/aws_options.rb

@@ -1,42 +0,0 @@
-module CarrierWave
-  module Storage
-    class AWSOptions
-      attr_reader :uploader
-
-      def initialize(uploader)
-        @uploader = uploader
-      end
-
-      def read_options
-        aws_read_options
-      end
-
-      def write_options(new_file)
-        { acl:          uploader.aws_acl,
-          body:         new_file.to_file,
-          content_type: new_file.content_type,
-        }.merge(aws_attributes).merge(aws_write_options)
-      end
-
-      def expiration_options(options = {})
-        uploader_expiration = uploader.aws_authenticated_url_expiration
-
-        { expires_in: uploader_expiration }.merge(options)
-      end
-
-      private
-
-      def aws_attributes
-        uploader.aws_attributes || {}
-      end
-
-      def aws_read_options
-        uploader.aws_read_options || {}
-      end
-
-      def aws_write_options
-        uploader.aws_write_options || {}
-      end
-    end
-  end
-end

data/lib/carrierwave/support/uri_filename.rb

@@ -1,11 +0,0 @@
-module CarrierWave
-  module Support
-    module UriFilename
-      def self.filename(url)
-        path = url.split('?').first
-
-        URI.decode(path).gsub(/.*\/(.*?$)/, '\1')
-      end
-    end
-  end
-end

data/spec/carrierwave/storage/aws_options_spec.rb

@@ -1,79 +0,0 @@
-require 'spec_helper'
-
-describe CarrierWave::Storage::AWSOptions do
-  uploader_klass = Class.new do
-    attr_accessor :aws_attributes, :aws_read_options, :aws_write_options
-
-    def aws_acl
-      'public-read'
-    end
-
-    def aws_authenticated_url_expiration
-      '60'
-    end
-  end
-
-  let(:uploader) { uploader_klass.new }
-  let(:options)  { CarrierWave::Storage::AWSOptions.new(uploader) }
-
-  describe '#read_options' do
-    it 'uses the uploader aws_read_options' do
-      uploader.aws_read_options = { encryption_key: 'abc' }
-
-      expect(options.read_options).to eq(uploader.aws_read_options)
-    end
-
-    it 'ensures that read_options are a hash' do
-      uploader.aws_read_options = nil
-
-      expect(options.read_options).to eq({})
-    end
-  end
-
-  describe '#write_options' do
-    let(:file) { CarrierWave::SanitizedFile.new('spec/fixtures/image.png') }
-
-    it 'includes acl, content_type, body (file), aws_attributes, and aws_write_options' do
-      uploader.aws_write_options = { encryption_key: 'def' }
-
-      write_options = options.write_options(file)
-
-      expect(write_options).to include(
-        acl:            'public-read',
-        content_type:   'image/png',
-        encryption_key: 'def'
-      )
-      expect(write_options[:body].path).to eq(file.path)
-    end
-
-    it 'works if aws_attributes is nil' do
-      expect(uploader).to receive(:aws_attributes) { nil }
-
-      expect {
-        options.write_options(file)
-      }.to_not raise_error
-    end
-
-    it 'works if aws_write_options is nil' do
-      expect(uploader).to receive(:aws_write_options) { nil }
-
-      expect {
-        options.write_options(file)
-      }.to_not raise_error
-    end
-  end
-
-  describe '#expiration_options' do
-    it 'extracts the expiration value' do
-      expect(options.expiration_options).to eq(
-        expires_in: uploader.aws_authenticated_url_expiration
-      )
-    end
-
-    it 'allows expiration to be overridden' do
-      expect(options.expiration_options(expires_in: 10)).to eq(
-        expires_in: 10
-      )
-    end
-  end
-end

data/spec/carrierwave/support/uri_filename_spec.rb

@@ -1,18 +0,0 @@
-require 'spec_helper'
-
-describe CarrierWave::Support::UriFilename do
-  UriFilename = CarrierWave::Support::UriFilename
-
-  describe '.filename' do
-    it 'extracts a decoded filename from file uri' do
-      samples = {
-        'http://example.com/file.txt' => 'file.txt',
-        'http://example.com/files/1/file%201.txt?foo=bar/baz.txt' => 'file 1.txt',
-      }
-
-      samples.each do |uri, name|
-        expect(UriFilename.filename(uri)).to eq(name)
-      end
-    end
-  end
-end