carrierwave-aws 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf33ae82322f4fdbd580886f60268ea23a2a9ce5
-  data.tar.gz: b68f5c6a83e0415855eaae454838a7ff540c95e6
+  metadata.gz: 99322449ca09f847fad0897f683096b13fa37395
+  data.tar.gz: 3a4941fbb9ae7d78d359dee569c91a2741c67e59
 SHA512:
-  metadata.gz: 4b3dff18c3ca97ae2474dabbafd68da584fdf26b12bdbc285fc002d835b6abb39f170a7f42078334e869f5eb8f7d17ccb710bb24c047a5069f5664ebc56d6fbe
-  data.tar.gz: cd089a2aae0ed73a80db7dc9d1b164145e9460b10020a0f348ce6b60f12a59a9148c745f8b3bf4e702e56b97788ce7942281f4feaa5c521ac0263d46f7cfac2c
+  metadata.gz: 65b1e88465b0da6b185a97461c26db51dd41b761e4ca4733914bd8214dac6108d3e93fbf032d469e52bff7d10d587e0d22f278ce216675efbf73962c402545fd
+  data.tar.gz: 6d6e3f753a69a58e8f5f9b826c41b6e0dd052bb34ef27230d4d4e4727a1124775a780da4f23754e5b4c443d76880a8f7b28091ad9ee55c8e6450202d4f842532

data/lib/carrierwave/aws/version.rb

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

data/lib/carrierwave/storage/aws_file.rb

@@ -6,7 +6,7 @@ module CarrierWave
       attr_writer :file
       attr_accessor :uploader, :connection, :path, :aws_options
 
-      delegate :content_type, :delete, :exists?, :size, to: :file
+      delegate :content_type, :delete, :exists?, to: :file
 
       def initialize(uploader, connection, path)
         @uploader    = uploader
@@ -19,6 +19,12 @@ module CarrierWave
         @file ||= bucket.object(path)
       end
 
+      def size
+        file.size
+      rescue Aws::S3::Errors::NotFound
+        nil
+      end
+
       alias to_file file
 
       def attributes
@@ -50,7 +56,7 @@ module CarrierWave
         if new_file.is_a?(self.class)
           new_file.move_to(path)
         else
-          file.put(aws_options.write_options(new_file))
+          file.upload_file(new_file.path, aws_options.write_options(new_file))
         end
       end
 

data/spec/carrierwave/storage/aws_file_spec.rb

@@ -101,4 +101,29 @@ describe CarrierWave::Storage::AWSFile do
       expect(aws_file.url).to eq('http://example.com/files/1/file.txt')
     end
   end
+
+  describe '#store' do
+    context 'when new_file is an AWSFile' do
+      let(:new_file) do
+        CarrierWave::Storage::AWSFile.new(uploader, connection, path)
+      end
+
+      it 'moves the object' do
+        expect(new_file).to receive(:move_to).with(path)
+        aws_file.store(new_file)
+      end
+    end
+
+    context 'when new file if a SanitizedFile' do
+      let(:new_file) do
+        CarrierWave::SanitizedFile.new('spec/fixtures/image.png')
+      end
+
+      it 'uploads the file using with multipart support' do
+        expect(file).to(receive(:upload_file)
+                              .with(new_file.path, an_instance_of(Hash)))
+        aws_file.store(new_file)
+      end
+    end
+  end
 end

data/spec/carrierwave/storage/aws_spec.rb

@@ -23,7 +23,9 @@ describe CarrierWave::Storage::AWS do
     end
 
     it 'caches connections by credentials' do
-      expect(storage.connection).to eq(storage.connection)
+      new_storage = CarrierWave::Storage::AWS.new(uploader)
+
+      expect(storage.connection).to be(new_storage.connection)
     end
   end
 end

data/spec/features/copying_files_spec.rb

@@ -8,16 +8,15 @@ describe 'Copying Files', type: :feature do
     original.store!(image)
     original.retrieve_from_store!('image.png')
 
-    original.file.copy_to('uploads/image2.png')
+    without_timestamp = ->(key, _) { key == :last_modified }
+
+    original.file.copy_to("#{original.store_dir}/image2.png")
 
     copy = FeatureUploader.new
     copy.retrieve_from_store!('image2.png')
 
-    original_attributes = original.file.attributes
-    original_attributes.reject! { |key, _| key == :last_modified }
-
-    copy_attributes = copy.file.attributes
-    copy_attributes.reject! { |key, _| key == :last_modified }
+    original_attributes = original.file.attributes.reject(&without_timestamp)
+    copy_attributes = copy.file.attributes.reject(&without_timestamp)
 
     copy_acl_grants = copy.file.file.acl.grants
     original_acl_grants = original.file.file.acl.grants

data/spec/features/moving_files_spec.rb

@@ -8,15 +8,17 @@ describe 'Moving Files', type: :feature do
     original.store!(image)
     original.retrieve_from_store!('image.png')
 
-    original_attributes = original.file.attributes
+    without_timestamp = ->(key, _) { key == :last_modified }
+
+    original_attributes = original.file.attributes.reject(&without_timestamp)
     original_acl_grants = original.file.file.acl.grants
 
-    original.file.move_to('uploads/image2.png')
+    original.file.move_to("#{original.store_dir}/image2.png")
 
     move = FeatureUploader.new
     move.retrieve_from_store!('image2.png')
 
-    copy_attributes = move.file.attributes
+    copy_attributes = move.file.attributes.reject(&without_timestamp)
     copy_acl_grants = move.file.file.acl.grants
 
     expect(copy_attributes).to eq(original_attributes)

data/spec/features/storing_files_spec.rb

@@ -20,6 +20,26 @@ describe 'Storing Files', type: :feature do
     instance.file.delete
   end
 
+  it 'uploads a StringIO to the configured bucket' do
+    # https://github.com/carrierwaveuploader/carrierwave/wiki/How-to:-Upload-from-a-string-in-Rails-3-or-later
+    io = StringIO.new(image.read)
+
+    def io.original_filename
+      'image.png'
+    end
+    image.rewind
+
+    instance.store!(io)
+    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')

data/spec/spec_helper.rb

@@ -1,5 +1,8 @@
 require 'carrierwave'
 require 'carrierwave-aws'
+require 'securerandom'
+
+STORE_DIR = ENV['TRAVIS_JOB_NUMBER'] || SecureRandom.hex(5)
 
 def source_environment_file!
   return unless File.exist?('.env')
@@ -11,6 +14,10 @@ def source_environment_file!
 end
 
 FeatureUploader = Class.new(CarrierWave::Uploader::Base) do
+  def store_dir
+    STORE_DIR
+  end
+
   def filename
     'image.png'
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-aws
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Parker Selbert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-24 00:00:00.000000000 Z
+date: 2017-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement