carrierwave-aws 1.3.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b08e5e5ca8483cb1079391083b6da62061a0552d
-  data.tar.gz: 1044c413b9168267762ba1a3b862bb3eaa32e6c9
+SHA256:
+  metadata.gz: b420ef988503bad151d75b1794b45ef1d3c2906077df034ddbdf067369f003aa
+  data.tar.gz: 167626ab412b4b49d26927c7044445974120a273c7fda2398faea3f3d549ff0c
 SHA512:
-  metadata.gz: 3d62d9d5fd5ecdb09df295da2eac7b6d6398ccf76384c1b0eb94405fb003136e351c16d83233f92d51a88d61944aee83e9672f01e197137bf512dbbdc3f17547
-  data.tar.gz: e0ebf6479be16ee6d41082cbcd0034b33c54c1fbc95403fb7494a72f0fcdf4166116ce83632ef9f1e5c3a04936839aa77582773c1eecc00af458284b86a92abd
+  metadata.gz: 0f1c69cf12347fa87723f671de01166a1b6373e3863b36acca438f6cc253d1e50cd76f6835c55d860078003d08d9d9692b596d40736f7eade764a458de5cb826
+  data.tar.gz: c153eaa6992b88e00c34d3eeca7e8666b6f5f9a665a137b365214f3dc2be9520ef8701cbd3a4b6451d854d160466b4a4e16b3469171a0eac2540553f28d3fc5f

data/lib/carrierwave-aws.rb

@@ -29,6 +29,7 @@ module CarrierWave
       add_config :aws_write_options
       add_config :aws_acl
       add_config :aws_signer
+      add_config :asset_host_public
 
       configure do |config|
         config.storage_engines[:aws] = 'CarrierWave::Storage::AWS'
@@ -83,6 +84,14 @@ module CarrierWave
           self.class.aws_signer
         end
       end
+
+      def asset_host_public
+        if instance_variable_defined?('@asset_host_public')
+          @asset_host_public
+        else
+          self.class.asset_host_public
+        end || false
+      end
     end
   end
 end

data/lib/carrierwave/aws/version.rb

@@ -2,6 +2,6 @@
 
 module Carrierwave
   module AWS
-    VERSION = '1.3.0'
+    VERSION = '1.5.0'
   end
 end

data/lib/carrierwave/storage/aws_file.rb

@@ -62,15 +62,15 @@ module CarrierWave
 
       def copy_to(new_path)
         bucket.object(new_path).copy_from(
-          copy_source: "#{bucket.name}/#{file.key}",
-          acl: uploader.aws_acl
+          "#{bucket.name}/#{file.key}",
+          aws_options.copy_options(self)
         )
       end
 
       def move_to(new_path)
         file.move_to(
           "#{bucket.name}/#{new_path}",
-          acl: uploader.aws_acl
+          aws_options.move_options(self)
         )
       end
 
@@ -84,7 +84,7 @@ module CarrierWave
 
       def public_url
         if uploader.asset_host
-          "#{uploader.asset_host}/#{path}"
+          "#{uploader.asset_host}/#{uri_path}"
         else
           file.public_url.to_s
         end
@@ -93,10 +93,10 @@ module CarrierWave
       def url(options = {})
         if signer
           signed_url(options)
-        elsif uploader.aws_acl.to_s != 'public-read'
-          authenticated_url(options)
-        else
+        elsif public?
           public_url
+        else
+          authenticated_url(options)
         end
       end
 
@@ -109,6 +109,14 @@ module CarrierWave
       def signer
         uploader.aws_signer
       end
+
+      def uri_path
+        path.gsub(%r{[^/]+}) { |segment| Seahorse::Util.uri_escape(segment) }
+      end
+
+      def public?
+        uploader.aws_acl.to_s == 'public-read' || uploader.asset_host_public
+      end
     end
   end
 end

data/lib/carrierwave/storage/aws_options.rb

@@ -3,6 +3,8 @@
 module CarrierWave
   module Storage
     class AWSOptions
+      MULTIPART_TRESHOLD = 15 * 1024 * 1024
+
       attr_reader :uploader
 
       def initialize(uploader)
@@ -21,6 +23,14 @@ module CarrierWave
         }.merge(aws_attributes).merge(aws_write_options)
       end
 
+      def move_options(file)
+        {
+          acl: uploader.aws_acl,
+          multipart_copy: file.size >= MULTIPART_TRESHOLD
+        }.merge(aws_attributes).merge(aws_write_options)
+      end
+      alias copy_options move_options
+
       def expiration_options(options = {})
         uploader_expiration = uploader.aws_authenticated_url_expiration
 
@@ -30,7 +40,9 @@ module CarrierWave
       private
 
       def aws_attributes
-        uploader.aws_attributes || {}
+        attributes = uploader.aws_attributes
+        return {} if attributes.nil?
+        attributes.respond_to?(:call) ? attributes.call : attributes
       end
 
       def aws_read_options

data/lib/carrierwave/support/uri_filename.rb

@@ -6,7 +6,7 @@ module CarrierWave
       def self.filename(url)
         path = url.split('?').first
 
-        URI.decode(path).gsub(%r{.*/(.*?$)}, '\1')
+        CGI.unescape(path).gsub(%r{.*/(.*?$)}, '\1')
       end
     end
   end

data/spec/carrierwave-aws_spec.rb

@@ -138,4 +138,43 @@ describe CarrierWave::Uploader::Base do
       expect(uploader.aws_signer).to eql(signer_proc)
     end
   end
+
+  describe '#asset_host_public' do
+    it 'can be overridden on an instance level' do
+      instance = uploader.new
+
+      uploader.asset_host_public = true
+      instance.asset_host_public = false
+
+      expect(uploader.asset_host_public).to eq(true)
+      expect(instance.asset_host_public).to eq(false)
+    end
+
+    it 'can be looked up from superclass' do
+      uploader.asset_host_public = true
+      instance = derived_uploader.new
+
+      expect(derived_uploader.asset_host_public).to eq(true)
+      expect(instance.asset_host_public).to eq(true)
+    end
+
+    it 'can be overridden on a class level' do
+      uploader.asset_host_public = true
+      derived_uploader.asset_host_public = false
+
+      base = uploader.new
+      expect(base.asset_host_public).to eq(true)
+
+      instance = derived_uploader.new
+      expect(instance.asset_host_public).to eq(false)
+    end
+
+    it 'can be set with the configure block' do
+      uploader.configure do |config|
+        config.asset_host_public = true
+      end
+
+      expect(uploader.asset_host_public).to eq(true)
+    end
+  end
 end

data/spec/carrierwave/storage/aws_file_spec.rb

@@ -72,9 +72,19 @@ describe CarrierWave::Storage::AWSFile do
       aws_file.url
     end
 
+    it 'requests a public url if asset_host_public' do
+      allow(uploader).to receive(:aws_acl) { :'authenticated-read' }
+      allow(uploader).to receive(:asset_host_public) { true }
+
+      expect(file).to receive(:public_url)
+
+      aws_file.url
+    end
+
     it 'requests an authenticated url if acl is not public readable' do
       allow(uploader).to receive(:aws_acl) { :private }
       allow(uploader).to receive(:aws_authenticated_url_expiration) { 60 }
+      allow(uploader).to receive(:asset_host_public) { false }
 
       expect(file).to receive(:presigned_url).with(:get, expires_in: 60)
 
@@ -126,4 +136,12 @@ describe CarrierWave::Storage::AWSFile do
       end
     end
   end
+
+  describe '#public_url' do
+    it 'uri-encodes the path' do
+      allow(uploader).to receive(:asset_host) { 'http://example.com' }
+      aws_file.path = 'uploads/images/jekyll+and+hyde.txt'
+      expect(aws_file.public_url).to eq 'http://example.com/uploads/images/jekyll%2Band%2Bhyde.txt'
+    end
+  end
 end

data/spec/carrierwave/storage/aws_options_spec.rb

@@ -52,6 +52,14 @@ describe CarrierWave::Storage::AWSOptions do
       expect { options.write_options(file) }.to_not raise_error
     end
 
+    it 'works if aws_attributes is a Proc' do
+      expect(uploader).to receive(:aws_attributes).and_return(
+        -> { { expires: 1.week.from_now.httpdate } }
+      )
+
+      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 }
 

metadata

@@ -1,33 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-aws
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Parker Selbert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-27 00:00:00.000000000 Z
+date: 2020-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.7'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.7'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
@@ -114,8 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Native aws-sdk support for S3 in CarrierWave