kt-paperclip 6.2.0 → 6.4.1

data/spec/paperclip/io_adapters/http_url_proxy_adapter_spec.rb

@@ -16,54 +16,59 @@ describe Paperclip::HttpUrlProxyAdapter do
   context "a new instance" do
     before do
       @url = "http://thoughtbot.com/images/thoughtbot-logo.png"
-      @subject = Paperclip.io_adapters.for(@url, hash_digest: Digest::MD5)
     end
 
+    subject { Paperclip.io_adapters.for(@url, hash_digest: Digest::MD5) }
+
     after do
-      @subject.close
+      subject.close
     end
 
     it "returns a file name" do
-      assert_equal "thoughtbot-logo.png", @subject.original_filename
+      expect(subject.original_filename).to(eq("thoughtbot-logo.png"))
     end
 
     it "closes open handle after reading" do
-      assert_equal true, @open_return.closed?
+      expect { subject }.to(change { @open_return.closed? }.from(false).to(true))
     end
 
     it "returns a content type" do
-      assert_equal "image/png", @subject.content_type
+      expect(subject.content_type).to(eq("image/png"))
     end
 
     it "returns the size of the data" do
-      assert_equal @open_return.size, @subject.size
+      expect(subject.size).to(eq(@open_return.size))
     end
 
     it "generates an MD5 hash of the contents" do
-      assert_equal Digest::MD5.hexdigest("xxx"), @subject.fingerprint
+      expect(subject.fingerprint).to(eq(Digest::MD5.hexdigest("xxx")))
     end
 
     it "generates correct fingerprint after read" do
-      fingerprint = Digest::MD5.hexdigest(@subject.read)
-      assert_equal fingerprint, @subject.fingerprint
+      fingerprint = Digest::MD5.hexdigest(subject.read)
+      expect(subject.fingerprint).to(eq(fingerprint))
     end
 
     it "generates same fingerprint" do
-      assert_equal @subject.fingerprint, @subject.fingerprint
+      expect(subject.fingerprint).to(eq(subject.fingerprint))
     end
 
     it "returns the data contained in the StringIO" do
-      assert_equal "xxx", @subject.read
+      expect(subject.read).to(eq("xxx"))
     end
 
     it "accepts a content_type" do
-      @subject.content_type = "image/png"
-      assert_equal "image/png", @subject.content_type
+      subject.content_type = "image/png"
+      expect(subject.content_type).to(eq("image/png"))
     end
 
     it "accepts an original_filename" do
-      @subject.original_filename = "image.png"
-      assert_equal "image.png", @subject.original_filename
+      subject.original_filename = "image.png"
+      expect(subject.original_filename).to(eq("image.png"))
+    end
+
+    it "doesn't emit deprecation warnings" do
+      expect { subject }.to_not(output(/URI\.(un)?escape is obsolete/).to_stderr)
     end
   end
 

data/spec/paperclip/io_adapters/uri_adapter_spec.rb

@@ -193,9 +193,18 @@ describe Paperclip::UriAdapter do
 
   describe "#download_content" do
     before do
-      allow_any_instance_of(Paperclip::UriAdapter).to receive(:open).and_return(@open_return)
+      allowed_mock =
+        if RUBY_VERSION < '2.5'
+          allow_any_instance_of(Paperclip::UriAdapter)
+        else
+          allow(URI)
+        end
+
+      allowed_mock.to receive(:open).and_return(@open_return)
+
       @uri = URI.parse("https://github.com/thoughtbot/paper:clip.jpg")
       @subject = Paperclip.io_adapters.for(@uri)
+      @uri_opener = RUBY_VERSION < '2.5' ? @subject : URI
     end
 
     after do
@@ -204,7 +213,7 @@ describe Paperclip::UriAdapter do
 
     context "with default read_timeout" do
       it "calls open without options" do
-        expect(@subject).to receive(:open).with(@uri, {}).at_least(1).times
+        expect(@uri_opener).to receive(:open).with(@uri, {}).at_least(1).times
       end
     end
 
@@ -214,7 +223,8 @@ describe Paperclip::UriAdapter do
       end
 
       it "calls open with read_timeout option" do
-        expect(@subject).to receive(:open).with(@uri, read_timeout: 120).at_least(1).times
+        expect(@uri_opener)
+          .to receive(:open).with(@uri, read_timeout: 120).at_least(1).times
       end
     end
   end

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)