carrierwave-aws 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df1b2dd13c2fe5d10191144d8a709b4669783478e51cd099d516b9df8fa70fa1
-  data.tar.gz: 272ee0bea417ba78fae9ea98b4ec87a89483d8c7308630c6489cccf722442385
+  metadata.gz: b420ef988503bad151d75b1794b45ef1d3c2906077df034ddbdf067369f003aa
+  data.tar.gz: 167626ab412b4b49d26927c7044445974120a273c7fda2398faea3f3d549ff0c
 SHA512:
-  metadata.gz: ed978e69ba5751cb793fa2c63afd075c6c8e4a608de7d36999a0b9c5a8b06e4aaf42391ec211d98d21186e402cb147bf39629de28e328bf51e64c156b88fffa9
-  data.tar.gz: '09961c9485558f613c1ce426812375b2f30d87e91042675dc3021a8dfa98c5be2a24959fa234276c55ac1612c5b4515a2674b57717cb7314b96b8e54cea552c4'
+  metadata.gz: 0f1c69cf12347fa87723f671de01166a1b6373e3863b36acca438f6cc253d1e50cd76f6835c55d860078003d08d9d9692b596d40736f7eade764a458de5cb826
+  data.tar.gz: c153eaa6992b88e00c34d3eeca7e8666b6f5f9a665a137b365214f3dc2be9520ef8701cbd3a4b6451d854d160466b4a4e16b3469171a0eac2540553f28d3fc5f

data/lib/carrierwave-aws.rb

@@ -86,7 +86,11 @@ module CarrierWave
       end
 
       def asset_host_public
-        @asset_host_public || false
+        if instance_variable_defined?('@asset_host_public')
+          @asset_host_public
+        else
+          self.class.asset_host_public
+        end || false
       end
     end
   end

data/lib/carrierwave/aws/version.rb

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

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

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-aws
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Parker Selbert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-04 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.1'
+        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.1'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Native aws-sdk support for S3 in CarrierWave