carrierwave-aws 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ae750711da052d59eef528b9ae939763fcaf09d
-  data.tar.gz: cd0697fdf6214142081cb3e019880437742ed056
+  metadata.gz: bf33ae82322f4fdbd580886f60268ea23a2a9ce5
+  data.tar.gz: b68f5c6a83e0415855eaae454838a7ff540c95e6
 SHA512:
-  metadata.gz: de81a897ac5e7a64053dfdcce11053feeddad8026ff06ee6ecec5236fc7df17830aa6b27820193b7d5d217bf454ef87c4155ff7392014bd57a20925060b2bbd4
-  data.tar.gz: 2ccc6e881ce7cc47050005c9f84ccd5197d29aca4c036565be5c8f3f85cd30b2a2eb3c3030475125962bd639476339460b8c0c61ace9cfafa79b44f9cf949f72
+  metadata.gz: 4b3dff18c3ca97ae2474dabbafd68da584fdf26b12bdbc285fc002d835b6abb39f170a7f42078334e869f5eb8f7d17ccb710bb24c047a5069f5664ebc56d6fbe
+  data.tar.gz: cd089a2aae0ed73a80db7dc9d1b164145e9460b10020a0f348ce6b60f12a59a9148c745f8b3bf4e702e56b97788ce7942281f4feaa5c521ac0263d46f7cfac2c

data/lib/carrierwave/aws/version.rb

@@ -2,6 +2,6 @@
 
 module Carrierwave
   module AWS
-    VERSION = '1.0.2'
+    VERSION = '1.1.0'
   end
 end

data/lib/carrierwave/storage/aws.rb

@@ -25,6 +25,24 @@ module CarrierWave
         AWSFile.new(uploader, connection, uploader.store_path(identifier))
       end
 
+      def cache!(file)
+        AWSFile.new(uploader, connection, uploader.cache_path).tap do |aws_file|
+          aws_file.store(file)
+        end
+      end
+
+      def retrieve_from_cache!(identifier)
+        AWSFile.new(uploader, connection, uploader.cache_path(identifier))
+      end
+
+      def delete_dir!(path)
+        # NOTE: noop, because there are no directories on S3
+      end
+
+      def clean_cache!(_seconds)
+        raise 'use Object Lifecycle Management to clean the cache'
+      end
+
       def connection
         @connection ||= begin
           conn_cache = self.class.connection_cache

data/lib/carrierwave/storage/aws_file.rb

@@ -37,11 +37,21 @@ module CarrierWave
       end
 
       def read
-        file.get(aws_options.read_options).body.read
+        read_options = aws_options.read_options
+        if block_given?
+          file.get(read_options) { |chunk| yield chunk }
+          nil
+        else
+          file.get(read_options).body.read
+        end
       end
 
       def store(new_file)
-        file.put(aws_options.write_options(new_file))
+        if new_file.is_a?(self.class)
+          new_file.move_to(path)
+        else
+          file.put(aws_options.write_options(new_file))
+        end
       end
 
       def copy_to(new_path)
@@ -51,8 +61,15 @@ module CarrierWave
         )
       end
 
+      def move_to(new_path)
+        file.move_to(
+          "#{bucket.name}/#{new_path}",
+          acl: uploader.aws_acl
+        )
+      end
+
       def signed_url(options = {})
-        signer.call(public_url, options)
+        signer.call(public_url.dup, options)
       end
 
       def authenticated_url(options = {})

data/spec/carrierwave-aws_spec.rb

@@ -81,15 +81,15 @@ describe CarrierWave::Uploader::Base do
   end
 
   describe '#aws_signer' do
-    let(:signer_proc) { -> (_unsigned, _options) {} }
-    let(:other_signer) { -> (_unsigned, _options) {} }
+    let(:signer_proc) { ->(_unsigned, _options) {} }
+    let(:other_signer) { ->(_unsigned, _options) {} }
 
     it 'allows proper signer object' do
       expect { uploader.aws_signer = signer_proc }.not_to raise_exception
     end
 
     it 'does not allow signer with unknown api' do
-      signer_proc = -> (_unsigned) {}
+      signer_proc = ->(_unsigned) {}
 
       expect { uploader.aws_signer = signer_proc }
         .to raise_exception(CarrierWave::Uploader::Base::ConfigurationError)

data/spec/carrierwave/storage/aws_file_spec.rb

@@ -44,6 +44,25 @@ describe CarrierWave::Storage::AWSFile do
     end
   end
 
+  describe '#read' do
+    let(:s3_object) { instance_double('Aws::S3::Object') }
+
+    it 'reads the retrieved body if called without block' do
+      aws_file.file = s3_object
+
+      expect(s3_object).to receive_message_chain('get.body.read')
+      aws_file.read
+    end
+
+    it 'does not retrieve body if block given' do
+      aws_file.file = s3_object
+      block = proc {}
+
+      expect(s3_object).to receive('get')
+      expect(aws_file.read(&block)).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' }

data/spec/features/moving_files_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe 'Moving 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
+    original.store!(image)
+    original.retrieve_from_store!('image.png')
+
+    original_attributes = original.file.attributes
+    original_acl_grants = original.file.file.acl.grants
+
+    original.file.move_to('uploads/image2.png')
+
+    move = FeatureUploader.new
+    move.retrieve_from_store!('image2.png')
+
+    copy_attributes = move.file.attributes
+    copy_acl_grants = move.file.file.acl.grants
+
+    expect(copy_attributes).to eq(original_attributes)
+    expect(copy_acl_grants).to eq(original_acl_grants)
+    expect(original.file).not_to exist
+
+    image.close
+    move.file.delete
+  end
+end

data/spec/features/storing_files_spec.rb

@@ -63,4 +63,32 @@ describe 'Storing Files', type: :feature do
     image.close
     instance.file.delete
   end
+
+  it 'uploads the cache file to the configured bucket' do
+    instance.cache!(image)
+    instance.retrieve_from_cache!(instance.cache_name)
+
+    expect(instance.file.size).to be_nonzero
+    expect(image.size).to eq(instance.file.size)
+
+    image.close
+    instance.file.delete
+  end
+
+  it 'moves cached files to final location when storing' do
+    instance.cache!(image)
+    cache_name = instance.cache_name
+    instance.store!
+
+    instance.retrieve_from_cache!(cache_name)
+    expect(instance.file).not_to exist
+
+    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
 end

data/spec/spec_helper.rb

@@ -36,9 +36,10 @@ RSpec.configure do |config|
 
   config.before(:all, type: :feature) do
     CarrierWave.configure do |cw_config|
-      cw_config.storage    = :aws
-      cw_config.aws_bucket = ENV['S3_BUCKET_NAME']
-      cw_config.aws_acl    = :'public-read'
+      cw_config.storage       = :aws
+      cw_config.cache_storage = :aws
+      cw_config.aws_bucket    = ENV['S3_BUCKET_NAME']
+      cw_config.aws_acl       = :'public-read'
 
       cw_config.aws_credentials = {
         access_key_id:     ENV['S3_ACCESS_KEY'],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-aws
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Parker Selbert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-26 00:00:00.000000000 Z
+date: 2017-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -91,7 +91,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/moving_files_spec.rb
 - spec/features/storing_files_spec.rb
 - spec/fixtures/image.png
 - spec/spec_helper.rb
@@ -125,7 +125,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/moving_files_spec.rb
 - spec/features/storing_files_spec.rb
 - spec/fixtures/image.png
 - spec/spec_helper.rb

data/spec/features/deleting_files_spec.rb

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