kt-paperclip 6.2.1 → 6.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6981df212ba253f2970136208abac5c794af1a1a22853696856434a1b2c148e7
-  data.tar.gz: d148b7f289e7727aa2c90bde50d0ffe73c7ebe5ff08f65308c21ee0406790b25
+  metadata.gz: 26488f18c8227a22bd86858d286924d003b61eb71dbc2353c1228fb11c04086f
+  data.tar.gz: 4ce23288e0c3dd39d5b4456aa1d1b62333e07732f1bbbd44e744d03e34e35805
 SHA512:
-  metadata.gz: edd98c0ef9912be1929def4849458b7840aa7ce69cadf82550937edd8cf7d1f0ba3296ae1c171957925b7b070fe61e9477a454fb0d8df5aef3df90aeb425552c
-  data.tar.gz: 4e0636c9840daebc737c62eb555eabe30230d1ffe818a9d7b6a5a646ecf4881bd2b8425805cd2f9af49b1156d6fc5f74dabc88d53ff0381ab70f23b376d81b57
+  metadata.gz: e2163ee366029e841dadf6d99b2cc2bab5309181e9df67faf926f20ce6e4c6da7bf93062dfe581c9aa6d42873b0571549458505bc9be43fdffb9913e9eb718e0
+  data.tar.gz: 46c31da4a29581501380c61b516498bf278fbc9dc7eab61a08122d21274079fc14f1e7cd43ea938547d59b9190b46683074364cc7660cddbe541efd6665334f2

data/lib/paperclip/storage/s3.rb

@@ -427,9 +427,9 @@ module Paperclip
       def find_credentials(creds)
         case creds
         when File
-          YAML::safe_load(ERB.new(File.read(creds.path)).result)
+          YAML::safe_load(ERB.new(File.read(creds.path)).result, [], [], true)
         when String, Pathname
-          YAML::safe_load(ERB.new(File.read(creds)).result)
+          YAML::safe_load(ERB.new(File.read(creds)).result, [], [], true)
         when Hash
           creds
         when NilClass

data/lib/paperclip/version.rb

@@ -1,3 +1,3 @@
 module Paperclip
-  VERSION = "6.2.1" unless defined?(Paperclip::VERSION)
+  VERSION = "6.2.2" unless defined?(Paperclip::VERSION)
 end

data/spec/paperclip/storage/s3_spec.rb

@@ -1439,6 +1439,32 @@ describe Paperclip::Storage::S3 do
     end
   end
 
+  context "with S3 credentials supplied as Pathname and aliases being set" do
+    before do
+      ENV["S3_KEY"]    = "pathname_key"
+      ENV["S3_BUCKET"] = "pathname_bucket"
+      ENV["S3_SECRET"] = "pathname_secret"
+
+      rails_env("test") do
+        rebuild_model aws2_add_region.merge storage: :s3,
+                                            s3_credentials: Pathname.new(fixture_file("aws_s3.yml"))
+
+        Dummy.delete_all
+        @dummy = Dummy.new
+      end
+    end
+
+    it "parses the credentials" do
+      assert_equal "pathname_bucket", @dummy.avatar.bucket_name
+
+      assert_equal "pathname_key",
+                   @dummy.avatar.s3_bucket.client.config.access_key_id
+
+      assert_equal "pathname_secret",
+                   @dummy.avatar.s3_bucket.client.config.secret_access_key
+    end
+  end
+
   context "with S3 credentials in a YAML file" do
     before do
       ENV["S3_KEY"]    = "env_key"
@@ -1466,6 +1492,33 @@ describe Paperclip::Storage::S3 do
     end
   end
 
+  context "with S3 credentials in a YAML file and aliases being set" do
+    before do
+      ENV["S3_KEY"]    = "env_key"
+      ENV["S3_BUCKET"] = "env_bucket"
+      ENV["S3_SECRET"] = "env_secret"
+
+      rails_env("test") do
+        rebuild_model aws2_add_region.merge storage: :s3,
+                                            s3_credentials: File.new(fixture_file("aws_s3.yml"))
+
+        Dummy.delete_all
+
+        @dummy = Dummy.new
+      end
+    end
+
+    it "runs the file through ERB" do
+      assert_equal "env_bucket", @dummy.avatar.bucket_name
+
+      assert_equal "env_key",
+                   @dummy.avatar.s3_bucket.client.config.access_key_id
+
+      assert_equal "env_secret",
+                   @dummy.avatar.s3_bucket.client.config.secret_access_key
+    end
+  end
+
   context "S3 Permissions" do
     context "defaults to :public_read" do
       before do

data/spec/support/fixtures/aws_s3.yml

@@ -0,0 +1,13 @@
+default: &default
+  acl: public-read
+development:
+  <<: *default
+  key: 54321
+production:
+  <<: *default
+  key: 12345
+test:
+  <<: *default
+  bucket: <%= ENV['S3_BUCKET'] %>
+  access_key_id: <%= ENV['S3_KEY'] %>
+  secret_access_key: <%= ENV['S3_SECRET'] %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kt-paperclip
 version: !ruby/object:Gem::Version
-  version: 6.2.1
+  version: 6.2.2
 platform: ruby
 authors:
 - Surendra Singhi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-30 00:00:00.000000000 Z
+date: 2020-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -522,6 +522,7 @@ files:
 - spec/support/fixtures/animated
 - spec/support/fixtures/animated.gif
 - spec/support/fixtures/animated.unknown
+- spec/support/fixtures/aws_s3.yml
 - spec/support/fixtures/bad.png
 - spec/support/fixtures/empty.html
 - spec/support/fixtures/empty.xlsx