kt-paperclip 6.2.0 → 6.4.2

data/spec/paperclip/storage/s3_spec.rb

@@ -805,9 +805,7 @@ describe Paperclip::Storage::S3 do
                         s3_region: "ap-northeast-1",
                         s3_host_name: "s3-ap-northeast-1.amazonaws.com"
                       },
-                      test: {
-                        s3_region: ""
-                      }
+                      test: {}
                     }
       @dummy = Dummy.new
     end
@@ -1439,6 +1437,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 +1490,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/paperclip/url_generator_spec.rb

@@ -194,6 +194,16 @@ describe Paperclip::UrlGenerator do
            "expected the interpolator to be passed #{expected.inspect} but it wasn't"
   end
 
+  it "doesn't emit deprecation warnings" do
+    expected = "the expected result"
+    mock_interpolator = MockInterpolator.new(result: expected)
+    options = { interpolator: mock_interpolator }
+    mock_attachment = MockAttachment.new(options)
+    url_generator = Paperclip::UrlGenerator.new(mock_attachment)
+
+    expect { url_generator.for(:style_name, escape: true) }.to_not(output(/URI\.(un)?escape is obsolete/).to_stderr)
+  end
+
   describe "should be able to escape (, ), [, and ]." do
     def generate(expected, updated_at = nil)
       mock_interpolator = MockInterpolator.new(result: expected)

data/spec/paperclip/validators/attachment_content_type_validator_spec.rb

@@ -67,6 +67,94 @@ describe Paperclip::Validators::AttachmentContentTypeValidator do
     end
   end
 
+  context "with add_validation_errors_to not set (implicitly :both)" do
+    it "adds error to both attribute and base" do
+      build_validator content_type: "image/png", allow_nil: false
+      allow(@dummy).to receive_messages(avatar_content_type: nil)
+      @validator.validate(@dummy)
+
+      assert @dummy.errors[:avatar_content_type].present?,
+             "Error not added to attribute"
+
+      assert @dummy.errors[:avatar].present?,
+             "Error not added to base attribute"
+    end
+  end
+
+  context "with add_validation_errors_to set to :attribute globally" do
+    before do
+      Paperclip.options[:add_validation_errors_to] = :attribute
+    end
+
+    after do
+      Paperclip.options[:add_validation_errors_to] = :both
+    end
+
+    it "only adds error to attribute not base" do
+      build_validator content_type: "image/png", allow_nil: false
+      allow(@dummy).to receive_messages(avatar_content_type: nil)
+      @validator.validate(@dummy)
+
+      assert @dummy.errors[:avatar_content_type].present?,
+             "Error not added to attribute"
+
+      assert @dummy.errors[:avatar].blank?,
+             "Error added to base attribute"
+    end
+  end
+
+  context "with add_validation_errors_to set to :base globally" do
+    before do
+      Paperclip.options[:add_validation_errors_to] = :base
+    end
+
+    after do
+      Paperclip.options[:add_validation_errors_to] = :both
+    end
+
+    it "only adds error to base not attribute" do
+      build_validator content_type: "image/png", allow_nil: false
+      allow(@dummy).to receive_messages(avatar_content_type: nil)
+      @validator.validate(@dummy)
+
+      assert @dummy.errors[:avatar].present?,
+             "Error not added to base attribute"
+
+      assert @dummy.errors[:avatar_content_type].blank?,
+             "Error added to attribute"
+    end
+  end
+
+  context "with add_validation_errors_to set to :attribute" do
+    it "only adds error to attribute not base" do
+      build_validator content_type: "image/png", allow_nil: false,
+        add_validation_errors_to: :attribute
+      allow(@dummy).to receive_messages(avatar_content_type: nil)
+      @validator.validate(@dummy)
+
+      assert @dummy.errors[:avatar_content_type].present?,
+             "Error not added to attribute"
+
+      assert @dummy.errors[:avatar].blank?,
+             "Error added to base attribute"
+    end
+  end
+
+  context "with add_validation_errors_to set to :base" do
+    it "only adds error to base not attribute" do
+      build_validator content_type: "image/png", allow_nil: false,
+        add_validation_errors_to: :base
+      allow(@dummy).to receive_messages(avatar_content_type: nil)
+      @validator.validate(@dummy)
+
+      assert @dummy.errors[:avatar].present?,
+             "Error not added to base attribute"
+
+      assert @dummy.errors[:avatar_content_type].blank?,
+             "Error added to attribute"
+    end
+  end
+
   context "with a successful validation" do
     before do
       build_validator content_type: "image/png", allow_nil: false

data/spec/paperclip/validators/attachment_file_name_validator_spec.rb

@@ -29,6 +29,96 @@ describe Paperclip::Validators::AttachmentFileNameValidator do
     end
   end
 
+  context "with add_validation_errors_to not set (implicitly :both)" do
+    it "adds error to both attribute and base" do
+      build_validator matches: /.*\.png$/, allow_nil: false
+      allow(@dummy).to receive_messages(avatar_file_name: "data.txt")
+      @validator.validate(@dummy)
+
+      assert @dummy.errors[:avatar_file_name].present?,
+             "Error not added to attribute"
+
+      assert @dummy.errors[:avatar].present?,
+             "Error not added to base attribute"
+    end
+  end
+
+  context "with add_validation_errors_to set to :attribute globally" do
+    before do
+      Paperclip.options[:add_validation_errors_to] = :attribute
+    end
+
+    after do
+      Paperclip.options[:add_validation_errors_to] = :both
+    end
+
+    it "only adds error to attribute not base" do
+      build_validator matches: /.*\.png$/, allow_nil: false
+      allow(@dummy).to receive_messages(avatar_file_name: "data.txt")
+      @validator.validate(@dummy)
+
+      assert @dummy.errors[:avatar_file_name].present?,
+             "Error not added to attribute"
+
+      assert @dummy.errors[:avatar].blank?,
+             "Error added to base attribute"
+    end
+  end
+
+  context "with add_validation_errors_to set to :base globally" do
+    before do
+      Paperclip.options[:add_validation_errors_to] = :base
+    end
+
+    after do
+      Paperclip.options[:add_validation_errors_to] = :both
+    end
+
+    it "only adds error to base not attribute" do
+      build_validator matches: /.*\.png$/, allow_nil: false
+      allow(@dummy).to receive_messages(avatar_file_name: "data.txt")
+      @validator.validate(@dummy)
+
+      assert @dummy.errors[:avatar].present?,
+             "Error not added to base attribute"
+
+      assert @dummy.errors[:avatar_file_name].blank?,
+             "Error added to attribute"
+    end
+  end
+
+  context "with add_validation_errors_to set to :attribute" do
+    it "only adds error to attribute not base" do
+      build_validator matches: /.*\.png$/, allow_nil: false,
+                      add_validation_errors_to: :attribute
+
+      allow(@dummy).to receive_messages(avatar_file_name: "data.txt")
+      @validator.validate(@dummy)
+
+      assert @dummy.errors[:avatar_file_name].present?,
+             "Error not added to attribute"
+
+      assert @dummy.errors[:avatar].blank?,
+             "Error added to base attribute"
+    end
+  end
+
+  context "with add_validation_errors_to set to :base" do
+    it "only adds error to base not attribute" do
+      build_validator matches: /.*\.png$/, allow_nil: false,
+                      add_validation_errors_to: :base
+
+      allow(@dummy).to receive_messages(avatar_file_name: "data.txt")
+      @validator.validate(@dummy)
+
+      assert @dummy.errors[:avatar].present?,
+             "Error not added to base attribute"
+
+      assert @dummy.errors[:avatar_file_name].blank?,
+             "Error added to attribute"
+    end
+  end
+
   it "does not add error to the base object with a successful validation" do
     build_validator matches: /.*\.png$/, allow_nil: false
     allow(@dummy).to receive_messages(avatar_file_name: "image.png")

data/spec/paperclip/validators/attachment_size_validator_spec.rb

@@ -205,6 +205,96 @@ describe Paperclip::Validators::AttachmentSizeValidator do
     end
   end
 
+  context "with add_validation_errors_to not set (implicitly :both)" do
+    it "adds error to both attribute and base" do
+      build_validator in: (5.kilobytes..10.kilobytes)
+      allow(@dummy).to receive(:avatar_file_size).and_return(11.kilobytes)
+      @validator.validate(@dummy)
+
+      assert @dummy.errors[:avatar_file_size].present?,
+             "Error not added to attribute"
+
+      assert @dummy.errors[:avatar].present?,
+             "Error not added to base attribute"
+    end
+  end
+
+  context "with add_validation_errors_to set to :attribute globally" do
+    before do
+      Paperclip.options[:add_validation_errors_to] = :attribute
+    end
+
+    after do
+      Paperclip.options[:add_validation_errors_to] = :both
+    end
+
+    it "only adds error to attribute not base" do
+      build_validator in: (5.kilobytes..10.kilobytes)
+      allow(@dummy).to receive(:avatar_file_size).and_return(11.kilobytes)
+      @validator.validate(@dummy)
+
+      assert @dummy.errors[:avatar_file_size].present?,
+             "Error not added to attribute"
+
+      assert @dummy.errors[:avatar].blank?,
+             "Error added to base attribute"
+    end
+  end
+
+  context "with add_validation_errors_to set to :base globally" do
+    before do
+      Paperclip.options[:add_validation_errors_to] = :base
+    end
+
+    after do
+      Paperclip.options[:add_validation_errors_to] = :both
+    end
+
+    it "only adds error to base not attribute" do
+      build_validator in: (5.kilobytes..10.kilobytes)
+      allow(@dummy).to receive(:avatar_file_size).and_return(11.kilobytes)
+      @validator.validate(@dummy)
+
+      assert @dummy.errors[:avatar].present?,
+             "Error not added to base attribute"
+
+      assert @dummy.errors[:avatar_file_size].blank?,
+             "Error added to attribute"
+    end
+  end
+
+  context "with add_validation_errors_to set to :attribute" do
+    it "only adds error to attribute not base" do
+      build_validator in: (5.kilobytes..10.kilobytes),
+                      add_validation_errors_to: :attribute
+
+      allow(@dummy).to receive(:avatar_file_size).and_return(11.kilobytes)
+      @validator.validate(@dummy)
+
+      assert @dummy.errors[:avatar_file_size].present?,
+             "Error not added to attribute"
+
+      assert @dummy.errors[:avatar].blank?,
+             "Error added to base attribute"
+    end
+  end
+
+  context "with add_validation_errors_to set to :base" do
+    it "only adds error to base not attribute" do
+      build_validator in: (5.kilobytes..10.kilobytes),
+                      add_validation_errors_to: :base
+
+      allow(@dummy).to receive(:avatar_file_size).and_return(11.kilobytes)
+      @validator.validate(@dummy)
+
+      assert @dummy.errors[:avatar].present?,
+             "Error not added to base attribute"
+
+      assert @dummy.errors[:avatar_file_size].blank?,
+             "Error added to attribute"
+    end
+  end
+
   context "using the helper" do
     before do
       Dummy.validates_attachment_size :avatar, in: (5.kilobytes..10.kilobytes)

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'] %>

data/spec/support/model_reconstruction.rb

@@ -28,7 +28,7 @@ module ModelReconstruction
 
   def reset_table(_table_name, &block)
     block ||= lambda { |_table| true }
-    ActiveRecord::Base.connection.create_table :dummies, { force: true }, &block
+    ActiveRecord::Base.connection.create_table :dummies, **{ force: true }, &block
   end
 
   def modify_table(&block)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kt-paperclip
 version: !ruby/object:Gem::Version
-  version: 6.2.0
+  version: 6.4.2
 platform: ruby
 authors:
 - Surendra Singhi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-22 00:00:00.000000000 Z
+date: 2022-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -168,16 +168,16 @@ dependencies:
   name: cucumber-expressions
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber-rails
   requirement: !ruby/object:Gem::Requirement
@@ -354,7 +354,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
-- ".github/issue_template.md"
+- ".github/FUNDING.yml"
+- ".github/ISSUE_TEMPLATE/bug_report.md"
+- ".github/ISSUE_TEMPLATE/custom.md"
+- ".github/ISSUE_TEMPLATE/feature_request.md"
 - ".gitignore"
 - ".hound.yml"
 - ".rubocop.yml"
@@ -393,6 +396,7 @@ files:
 - lib/generators/paperclip/USAGE
 - lib/generators/paperclip/paperclip_generator.rb
 - lib/generators/paperclip/templates/paperclip_migration.rb.erb
+- lib/kt-paperclip.rb
 - lib/paperclip.rb
 - lib/paperclip/attachment.rb
 - lib/paperclip/attachment_registry.rb
@@ -521,6 +525,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
@@ -542,7 +547,7 @@ files:
 - spec/support/reporting.rb
 - spec/support/test_data.rb
 - spec/support/version_helper.rb
-homepage: https://github.com/kreeti/paperclip
+homepage: https://github.com/kreeti/kt-paperclip
 licenses:
 - MIT
 metadata: {}
@@ -571,7 +576,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -579,7 +584,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - ImageMagick
-rubygems_version: 3.0.1
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: File attachments as attributes for ActiveRecord

data/.github/issue_template.md

@@ -1,3 +0,0 @@
-## Deprecation notice
-
-Paperclip is currently undergoing [deprecation in favor of ActiveStorage](https://github.com/thoughtbot/paperclip/blob/master/MIGRATING.md). Maintainers of this repository will no longer be tending to new issues. We're leaving the issues page open so Paperclip users can still see & search through old issues, and continue existing discussions if they wish.