carrierwave-aws 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbc243216be54ab5f7e5ab0adeda6c6d61beea1e
-  data.tar.gz: ce824a3dbf900b615bfc58c1bb0ebbc6b92d9b6e
+  metadata.gz: 9cfb613038a1d6671516ddc5f04d4c6a78024a7d
+  data.tar.gz: 85ed3134b7b2ffb7b2e5b6fab8a825a26b0258c9
 SHA512:
-  metadata.gz: 0bc524f441434927eeed0303ddc4001afbe9d347c25e92fb319ad67545810b62d6e5c4efd4a6782d55253f97c3bfaf85ac43a5e7e7cf30f0382e54357b8dc1da
-  data.tar.gz: d23855a85418360efe6cfcfd837c0cd1668c2bd7299ba65b68885f7099c873fd6c2e11054b5f303f9f5fa602aa09f45302953c6776b838a9369b4fb68865daed
+  metadata.gz: 58cf39368f66fafde4dfcde883d2a19314012a4b3604ca3160caf067dbb42905a727eb8d985c4d9e3f85251c1cd6961caa9aadd4d06c60431a314b5b710d50c8
+  data.tar.gz: 7efb7a4b9c857749c55b420946bfa8eafc2d7bd4ee9217046ee610ada3e098f6447c5820b79f68c6ee5a52377a41b4f8cf2d453a605b3655d1db3be57f948757

data/.travis.yml

@@ -1,8 +1,7 @@
----
 language: ruby
 rvm:
-- 2.0.0
-- 2.1.0
+- 2.1.5
+- 2.2.2
 script: bundle exec rspec spec
 env:
   global:
@@ -18,3 +17,4 @@ env:
       B75vnSCFTnQgCP4dmz78VN/WWj88Tpnh4cjUCU0cQjQ5M7oQ0KTbM0d7WDyf
       rf0F+B9OihBtLNQWqjocRvNH0dU5OzBLCC9DVolUgNwOdNTHW2I7CwlxJ5t7
       ljQTxzPP+tFASwzBHjywbo7n0EX3efT5UOZhbD9LZL93X4SOlyU=
+  - secure: Uv276ljIrpfYNE34zKnawA6rxchmMymTzMs3LRcmsCDawDhNmtEuoqeHLiZctFU0k40YDylwcDXDWJayVDSW97+ytMqFfQ6e7HkL06iNZPcAW8V0LJt4SrVzRGIm6ER9Xib57lXhOnfS0jcVxT/UuD0pegvYdZb0VhUedmqInP0=

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## Version 0.6.0 2015-06-26
+
+* Breaking Change: Updated to use AWS-SDK v2 [Mark Oleson]
+  * You must specify a region in your `aws_credentials` configuration
+  * You must use hyphens in ACLs instead of underscores (`:public_read` becomes
+    `:'public-read'` or `'public-read'`)
+  * Authenticated URL's are now longer than 255 characters. If you are caching
+    url values you'll need to ensure columns allow 255+ characters.
+  * Authenticated URL expiration has been limited to 7 days.
+
 ## Version 0.5.0 2015-01-31
 
 * Change: Nudge the expected AWS-SDK version.

data/README.md

@@ -38,45 +38,37 @@ 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'
-  config.aws_authenticated_url_expiration = 60 * 60 * 24 * 365
+
+  # The maximum period for authenticated_urls is only 7 days.
+  config.aws_authenticated_url_expiration = 60 * 60 * 24 * 7
 
   config.aws_credentials = {
     access_key_id:     ENV.fetch('AWS_ACCESS_KEY_ID'),
-    secret_access_key: ENV.fetch('AWS_SECRET_ACCESS_KEY')
+    secret_access_key: ENV.fetch('AWS_SECRET_ACCESS_KEY'),
+    region:            ENV.fetch('AWS_REGION') # Required
   }
 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](http://docs.aws.amazon.com/AWSRubySDK/latest/AWS/Core/Configuration.html)
-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:
 
 ```ruby
-  class MyUploader < Carrierwave::Uploader::Base
-    # You can find full list of custom headers in AWS SDK documentation on
-    # AWS::S3::S3Object
-    def download_url(filename)
-      url(response_content_disposition: %Q{attachment; filename="#{filename}"})
-    end
+class MyUploader < Carrierwave::Uploader::Base
+  # Storage configuration within the uploader supercedes the global CarrierWave
+  # config, so be sure that your uploader does not contain `storage :file`, or
+  # AWS will not be used.
+  storage :aws
+
+  # You can find full list of custom headers in AWS SDK documentation on
+  # AWS::S3::S3Object
+  def download_url(filename)
+    url(response_content_disposition: %Q{attachment; filename="#{filename}"})
   end
+end
 ```
 
 If you migrate from `fog` you probably have something like `url(query: {'my-header': 'my-value'})`.

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',     '~> 1.58'
+  gem.add_dependency 'aws-sdk',     '~> 2.0.47'
 
   gem.add_development_dependency 'rspec', '~> 3'
 end

data/lib/carrierwave-aws.rb

@@ -2,6 +2,8 @@ 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.5.0'
+    VERSION = '0.6.0'
   end
 end

data/lib/carrierwave/storage/aws.rb

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

data/lib/carrierwave/storage/aws_file.rb

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

data/lib/carrierwave/storage/aws_options.rb

@@ -0,0 +1,42 @@
+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

@@ -0,0 +1,11 @@
+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_file_spec.rb

@@ -1,16 +1,15 @@
 require 'spec_helper'
 
 describe CarrierWave::Storage::AWSFile do
-  let(:objects)    { { 'files/1/file.txt' => file } }
   let(:path)       { 'files/1/file.txt' }
-  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(:file)       { double(:file, content_type: 'content/type', path: '/file/path') }
+  let(:bucket)     { double(:bucket, object: file) }
+  let(:connection) { double(:connection, bucket: bucket) }
 
   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' },
@@ -22,86 +21,32 @@ 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 '#authenticated_url' do
-    it 'requests a url for reading with the configured expiration' do
-      allow(uploader).to receive(:aws_authenticated_url_expiration) { 60 }
+  describe '#extension' do
+    it 'extracts the file extension from the path' do
+      aws_file.path = 'file.txt'
 
-      expect(file).to receive(:url_for).with(:read, expires: 60)
-
-      aws_file.authenticated_url
+      expect(aws_file.extension).to eq('txt')
     end
 
-    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'))
+    it 'is nil if the file has no extension' do
+      aws_file.path = 'filetxt'
 
-      aws_file.authenticated_url(response_content_disposition: 'attachment')
+      expect(aws_file.extension).to be_nil
     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)
 
@@ -112,24 +57,16 @@ 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(:url_for)
+      expect(file).to receive(:presigned_url).with(:get, { expires_in: 60 })
 
       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_options_spec.rb

@@ -0,0 +1,79 @@
+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/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' } }
+  let(:credentials) { { access_key_id: 'abc', secret_access_key: '123', region: 'us-east-1' } }
   let(:uploader)    { double(:uploader, aws_credentials: credentials) }
 
   subject(:storage) do
@@ -14,17 +14,11 @@ describe CarrierWave::Storage::AWS do
 
   describe '#connection' do
     it 'instantiates a new connection with credentials' do
-      expect(AWS::S3).to receive(:new).with(credentials)
+      expect(Aws::S3::Resource).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/carrierwave/support/uri_filename_spec.rb

@@ -0,0 +1,18 @@
+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

data/spec/features/copying_files_spec.rb

@@ -1,20 +1,16 @@
 require 'spec_helper'
 
 describe 'Copying Files', type: :feature do
-  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
+  let(:image)    { File.open('spec/fixtures/image.png', 'r') }
+  let(:original) { FeatureUploader.new }
 
+  it 'copies an existing file to the specified path' do
     original.store!(image)
     original.retrieve_from_store!('image.png')
 
     original.file.copy_to('uploads/image2.png')
 
-    copy = uploader.new
+    copy = FeatureUploader.new
     copy.retrieve_from_store!('image2.png')
 
     original_attributes = original.file.attributes

data/spec/features/storing_files_spec.rb

@@ -1,19 +1,59 @@
 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
-    uploader = Class.new(CarrierWave::Uploader::Base) do
-      def filename; 'image.png'; end
-    end
+    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')
 
-    image    = File.open('spec/fixtures/image.png', 'r')
-    instance = uploader.new
+    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
 
+  it 'gets a url for remote files' do
     instance.store!(image)
     instance.retrieve_from_store!('image.png')
 
-    expect(instance.file.size).to be_nonzero
-    expect(image.size).to eq(instance.file.size)
+    expect(instance.url).to eq("https://#{ENV['S3_BUCKET_NAME']}.s3.amazonaws.com/#{instance.path}")
 
     image.close
     instance.file.delete

data/spec/spec_helper.rb

@@ -10,6 +10,10 @@ 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!
 
@@ -32,12 +36,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['S3_REGION']
+        region:            ENV['AWS_REGION']
       }
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-aws
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Parker Selbert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-31 00:00:00.000000000 Z
+date: 2015-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.58'
+        version: 2.0.47
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.58'
+        version: 2.0.47
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -73,11 +73,14 @@ 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
@@ -107,9 +110,10 @@ 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/spec/features/querying_files_spec.rb

@@ -1,48 +0,0 @@
-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