carrierwave-aws 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0daf2d106b4a0d27f423cfbaa8745fa019d5f840
-  data.tar.gz: 2213c9acca949bd4d1608a0fd08cbd96ed12b64b
+  metadata.gz: 875d0be2d2390acf2e6a8c01a0df45b726079fe6
+  data.tar.gz: 3ed7510ef62090d5ba7b1974d313df1e327571f4
 SHA512:
-  metadata.gz: fa5b275f21820fb4fed97d1cd183a3f1ae909de304e1dd6616d64d4a047fa9d285b340a66fea9ad4a720df9ee6bf8e2ee3eb485277d58974fb22cde1b185ec7b
-  data.tar.gz: abffdcdca5ee8d72c7daf90f4e6fc9ee18df1b3c30cc4e0a4e692214ea02b851254449364155b1b020f4a205e3f1f6ea20cb20bef6f264cb92318ffa803ff9f2
+  metadata.gz: aa2de20c43f2f6498533debf5027e55059383aaa273e210fb1f555c58d905e7353e507bf674459617235e86e0391c52492f6d48a5d92b168e25220249ad3f56a
+  data.tar.gz: dab3d28107e951dbfa5ab61e705aa49cdb6105619925ffe27acfb8aa79bbce945399bd28674d601bc85af9ceeb16697f9d3ffb99ed166b30c1a8bee261337f7c

data/.env.sample

@@ -1,4 +1,4 @@
 S3_BUCKET_NAME=BUCKET_NAME
 S3_ACCESS_KEY=YOUR_KEY
 S3_SECRET_ACCESS_KEY=YOUR_KEY
-S3_REGION=BUCKET_REGION
+AWS_REGION=BUCKET_REGION

data/.travis.yml

@@ -1,5 +1,6 @@
 sudo: false
 language: ruby
+cache: bundler
 rvm:
   - 2.1.5
   - 2.2.2
@@ -7,19 +8,18 @@ rvm:
 matrix:
   allow_failures:
     - rvm: ruby-head
-script: bundle exec rspec
 env:
   global:
-  - secure: |-
-      A6i5I0Y+ifiJr2yotcjMBOZxRnhaPbuDTuMW3PMMUaqHsCc2A5Tqemenb7WG
-      awCHOE6i9fuO/qAOPR3iKVdkR7Qv//CDtFZ9pZ7uiqVxfz1kYbv4aoPm1IvJ
-      Kd6Nons/AjkD+yhobP8WgiIZI/QcSylDZYNCasTwQlfOCdYLnag=
-  - secure: |-
-      IE4oVY30L0OH10J/poiEZ1PyFZgPY7dH1FneJI5OeYJJ8GfEHoLuMJXgBmyX
-      mC2v2PGK0pQTKGKFVV1mLhKdCzeLRCSMFqNvVo6blSoMLZoM1kj3sbU0kiIW
-      qAgafLka3iyxQnPsvfmjLVei3h+HOUIUV6QmagjcMfZREHfTDZk=
-  - secure: |-
-      B75vnSCFTnQgCP4dmz78VN/WWj88Tpnh4cjUCU0cQjQ5M7oQ0KTbM0d7WDyf
-      rf0F+B9OihBtLNQWqjocRvNH0dU5OzBLCC9DVolUgNwOdNTHW2I7CwlxJ5t7
-      ljQTxzPP+tFASwzBHjywbo7n0EX3efT5UOZhbD9LZL93X4SOlyU=
-  - secure: Uv276ljIrpfYNE34zKnawA6rxchmMymTzMs3LRcmsCDawDhNmtEuoqeHLiZctFU0k40YDylwcDXDWJayVDSW97+ytMqFfQ6e7HkL06iNZPcAW8V0LJt4SrVzRGIm6ER9Xib57lXhOnfS0jcVxT/UuD0pegvYdZb0VhUedmqInP0=
+    - secure: |-
+        A6i5I0Y+ifiJr2yotcjMBOZxRnhaPbuDTuMW3PMMUaqHsCc2A5Tqemenb7WG
+        awCHOE6i9fuO/qAOPR3iKVdkR7Qv//CDtFZ9pZ7uiqVxfz1kYbv4aoPm1IvJ
+        Kd6Nons/AjkD+yhobP8WgiIZI/QcSylDZYNCasTwQlfOCdYLnag=
+    - secure: |-
+        IE4oVY30L0OH10J/poiEZ1PyFZgPY7dH1FneJI5OeYJJ8GfEHoLuMJXgBmyX
+        mC2v2PGK0pQTKGKFVV1mLhKdCzeLRCSMFqNvVo6blSoMLZoM1kj3sbU0kiIW
+        qAgafLka3iyxQnPsvfmjLVei3h+HOUIUV6QmagjcMfZREHfTDZk=
+    - secure: |-
+        B75vnSCFTnQgCP4dmz78VN/WWj88Tpnh4cjUCU0cQjQ5M7oQ0KTbM0d7WDyf
+        rf0F+B9OihBtLNQWqjocRvNH0dU5OzBLCC9DVolUgNwOdNTHW2I7CwlxJ5t7
+        ljQTxzPP+tFASwzBHjywbo7n0EX3efT5UOZhbD9LZL93X4SOlyU=
+    - AWS_REGION=us-east-1

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## Version 1.0.1 2016-05-13
+
+* Fixed: The `copy_to` method of `AWS::File` now uses the same `aws_acl`
+  configuration used on original uploads so ACL on copied files matches original
+  files. [Olivier Lacan]
+
 ## Version 1.0.0 2015-09-18
 
 * Added: ACL options are verified when they are set, and coerced into usable

data/README.md

@@ -1,9 +1,9 @@
 # Carrierwave AWS Storage
 
-[![Build Status](https://travis-ci.org/sorentwo/carrierwave-aws.png?branch=master)](https://travis-ci.org/sorentwo/carrierwave-aws)
-[![Code Climate](https://codeclimate.com/github/sorentwo/carrierwave-aws.png)](https://codeclimate.com/github/sorentwo/carrierwave-aws)
-[![Gem Version](https://badge.fury.io/rb/carrierwave-aws.png)](http://badge.fury.io/rb/carrierwave-aws)
-[![Dependency Status](https://gemnasium.com/sorentwo/carrierwave-aws.png)](https://gemnasium.com/sorentwo/carrierwave-aws)
+[![Build Status](https://travis-ci.org/sorentwo/carrierwave-aws.svg?branch=master)](https://travis-ci.org/sorentwo/carrierwave-aws)
+[![Code Climate](https://codeclimate.com/github/sorentwo/carrierwave-aws.svg)](https://codeclimate.com/github/sorentwo/carrierwave-aws)
+[![Gem Version](https://badge.fury.io/rb/carrierwave-aws.svg)](http://badge.fury.io/rb/carrierwave-aws)
+[![Dependency Status](https://gemnasium.com/sorentwo/carrierwave-aws.svg)](https://gemnasium.com/sorentwo/carrierwave-aws)
 
 Use the officially supported AWS-SDK library for S3 storage rather than relying
 on fog. There are several things going for it:
@@ -28,6 +28,11 @@ Add this line to your application's Gemfile:
 gem 'carrierwave-aws'
 ```
 
+Run the bundle command from your shell to install it:
+```bash
+bundle install
+```
+
 ## Usage
 
 Configure and use it just like you would Fog. The only notable difference is
@@ -59,8 +64,7 @@ CarrierWave.configure do |config|
     region:            ENV.fetch('AWS_REGION') # Required
   }
 
-  # Optional: Signing of download urls, e.g. for serving private
-  # content through CloudFront.
+  # Optional: Signing of download urls, e.g. for serving private content through CloudFront.
   config.aws_signer = -> (unsigned_url, options) { Aws::CF::Signer.sign_url unsigned_url, options }
 end
 ```
@@ -72,11 +76,11 @@ If you have a custom uploader that specifies additional headers for each URL, pl
 ```ruby
 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
+  # config, so either comment out `storage :file`, or remove that line, otherwise
   # AWS will not be used.
   storage :aws
 
-  # You can find full list of custom headers in AWS SDK documentation on
+  # You can find a 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}"})
@@ -84,8 +88,29 @@ class MyUploader < Carrierwave::Uploader::Base
 end
 ```
 
-If you migrate from `fog` you probably have something like `url(query: {'my-header': 'my-value'})`.
+
+## Migrating From Fog
+
+If you migrate from `fog` your uploader may be configured as `storage :fog`, simply comment out that line, as in the following example, or remove that specific line. 
+
+```ruby
+class MyUploader < Carrierwave::Uploader::Base
+  # Storage configuration within the uploader supercedes the global CarrierWave
+  # config, so adjust accordingly...
+
+  # Choose what kind of storage to use for this uploader:
+  # storage :file
+  # storage :fog
+  storage :aws
+
+
+  # More comments below in your file....
+end
+```
+
+Another item particular to fog, you may have `url(query: {'my-header': 'my-value'})`.
 With `carrierwave-aws` the `query` part becomes obsolete, just use a hash of headers.
+If you skipped the section regarding Usage, you'll want to be sure everything is configured as it's explained in that section as well.
 
 ## Contributing
 

data/carrierwave-aws.gemspec

@@ -19,5 +19,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'carrierwave', '~> 0.7'
   gem.add_dependency 'aws-sdk',     '~> 2.0'
 
-  gem.add_development_dependency 'rspec', '~> 3'
+  gem.add_development_dependency 'rake', '~> 10.0'
+  gem.add_development_dependency 'rspec', '~> 3.0'
 end

data/lib/carrierwave/aws/version.rb

@@ -1,5 +1,5 @@
 module Carrierwave
   module AWS
-    VERSION = '1.0.0'
+    VERSION = '1.0.1'
   end
 end

data/lib/carrierwave/storage/aws_file.rb

@@ -4,6 +4,8 @@ module CarrierWave
       attr_writer :file
       attr_accessor :uploader, :connection, :path, :aws_options
 
+      delegate :content_type, :delete, :exists?, :size, to: :file
+
       def initialize(uploader, connection, path)
         @uploader    = uploader
         @connection  = connection
@@ -21,18 +23,6 @@ module CarrierWave
         file.data.to_h
       end
 
-      def content_type
-        file.content_type
-      end
-
-      def delete
-        file.delete
-      end
-
-      def exists?
-        file.exists?
-      end
-
       def extension
         elements = path.split('.')
         elements.last if elements.size > 1
@@ -48,16 +38,15 @@ module CarrierWave
         file.get(aws_options.read_options).body.read
       end
 
-      def size
-        file.content_length
-      end
-
       def store(new_file)
         !!file.put(aws_options.write_options(new_file))
       end
 
       def copy_to(new_path)
-        bucket.object(new_path).copy_from(copy_source: "#{bucket.name}/#{file.key}")
+        bucket.object(new_path).copy_from(
+          copy_source: "#{bucket.name}/#{file.key}",
+          acl: uploader.aws_acl
+        )
       end
 
       def signed_url(options = {})

data/spec/features/copying_files_spec.rb

@@ -19,7 +19,11 @@ describe 'Copying Files', type: :feature do
     copy_attributes = copy.file.attributes
     copy_attributes.reject! { |k,v| k == :last_modified }
 
+    copy_acl_grants = copy.file.file.acl.grants
+    original_acl_grants = original.file.file.acl.grants
+
     expect(copy_attributes).to eq(original_attributes)
+    expect(copy_acl_grants).to eq(original_acl_grants)
 
     image.close
     original.file.delete

data/spec/features/deleting_files_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe 'Deleting Files', type: :feature do
+  let(:image)    { File.open('spec/fixtures/image.png', 'r') }
+  let(:instance) { FeatureUploader.new }
+
+  before do
+    instance.aws_acl = 'public-read'
+    instance.store!(image)
+  end
+
+  it 'deletes the image when assigned a `nil` value' do
+  end
+end

data/spec/features/storing_files_spec.rb

@@ -57,7 +57,8 @@ describe 'Storing Files', type: :feature 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.url).to include(ENV['S3_BUCKET_NAME'])
+    expect(instance.url).to include(instance.path)
 
     image.close
     instance.file.delete

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-aws
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Parker Selbert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-18 00:00:00.000000000 Z
+date: 2016-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -38,20 +38,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.0'
 description: Use aws-sdk for S3 support in CarrierWave
 email:
 - parker@sorentwo.com
@@ -81,6 +95,7 @@ files:
 - spec/carrierwave/storage/aws_spec.rb
 - spec/carrierwave/support/uri_filename_spec.rb
 - spec/features/copying_files_spec.rb
+- spec/features/deleting_files_spec.rb
 - spec/features/storing_files_spec.rb
 - spec/fixtures/image.png
 - spec/spec_helper.rb
@@ -103,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A slimmer alternative to using Fog for S3 support in CarrierWave
@@ -114,6 +129,7 @@ test_files:
 - spec/carrierwave/storage/aws_spec.rb
 - spec/carrierwave/support/uri_filename_spec.rb
 - spec/features/copying_files_spec.rb
+- spec/features/deleting_files_spec.rb
 - spec/features/storing_files_spec.rb
 - spec/fixtures/image.png
 - spec/spec_helper.rb