kt-paperclip 6.2.0 → 6.4.2

data/.rubocop.yml

@@ -1 +1,3 @@
+require:
+  - rubocop-rails
 inherit_from: .hound.yml

data/.travis.yml

@@ -1,12 +1,12 @@
 language: ruby
 
 rvm:
-  - 2.1
   - 2.2
   - 2.3
   - 2.4
   - 2.5
   - 2.6
+  - 2.7
 
 script: "bundle exec rake clean spec cucumber"
 
@@ -29,19 +29,17 @@ gemfile:
 matrix:
   fast_finish: true
   exclude:
-    - gemfile: gemfiles/5.0.gemfile
-      rvm: 2.1
-    - gemfile: gemfiles/5.1.gemfile
-      rvm: 2.1
-    - gemfile: gemfiles/5.2.gemfile
-      rvm: 2.1
     - gemfile: gemfiles/5.2.gemfile
       rvm: 2.2
-    - gemfile: gemfiles/6.0.gemfile
-      rvm: 2.1
     - gemfile: gemfiles/6.0.gemfile
       rvm: 2.2
     - gemfile: gemfiles/6.0.gemfile
       rvm: 2.3
     - gemfile: gemfiles/6.0.gemfile
       rvm: 2.4
+    - gemfile: gemfiles/4.2.gemfile
+      rvm: 2.7
+    - gemfile: gemfiles/5.0.gemfile
+      rvm: 2.7
+    - gemfile: gemfiles/5.1.gemfile
+      rvm: 2.7

data/Gemfile

@@ -8,11 +8,12 @@ gem "pry"
 # Prevents bundler from taking a long-time to resolve
 group :development, :test do
   gem "activerecord-import"
-  gem 'bootsnap', require: false
+  gem "bootsnap", require: false
   gem "builder"
-  gem 'listen', '~> 3.0.8'
+  gem "listen", "~> 3.0.8"
   gem "mime-types"
   gem "rspec"
   gem "rubocop", require: false
+  gem "rubocop-rails"
   gem "sprockets", "3.7.2"
 end

data/README.md

@@ -10,12 +10,11 @@ Please feel free to contribute Issues and pull requests.
 ## Documentation valid for `master` branch
 
 Please check the documentation for the paperclip version you are using:
-https://github.com/kreeti/paperclip/releases
+https://github.com/kreeti/kt-paperclip/releases
 
 ---
 
-[![Build Status](https://secure.travis-ci.org/kreeti/paperclip.svg?branch=master)](http://travis-ci.org/kreeti/paperclip)
-[![Dependency Status](https://gemnasium.com/kreeti/paperclip.svg?travis)](https://gemnasium.com/kreeti/paperclip)
+[![Build Status](https://travis-ci.com/kreeti/kt-paperclip.svg?branch=master)](https://travis-ci.com/kreeti/kt-paperclip)
 [![Code Climate](https://codeclimate.com/github/kreeti/paperclip.svg)](https://codeclimate.com/github/kreeti/paperclip)
 [![Inline docs](http://inch-ci.org/github/kreeti/paperclip.svg)](http://inch-ci.org/github/kreeti/paperclip)
 [![Security](https://hakiri.io/github/kreeti/paperclip/master.svg)](https://hakiri.io/github/kreeti/paperclip/master)
@@ -79,10 +78,10 @@ packages). Attached files are saved to the filesystem and referenced in the
 browser by an easily understandable specification, which has sensible and
 useful defaults.
 
-See the documentation for `has_attached_file` in [`Paperclip::ClassMethods`](http://www.rubydoc.info/gems/paperclip/Paperclip/ClassMethods) for
+See the documentation for `has_attached_file` in [`Paperclip::ClassMethods`](http://www.rubydoc.info/gems/kt-paperclip/Paperclip/ClassMethods) for
 more detailed options.
 
-The complete [RDoc](http://www.rubydoc.info/gems/paperclip) is online.
+The complete [RDoc](http://www.rubydoc.info/gems/kt-paperclip) is online.
 
 ---
 
@@ -91,7 +90,7 @@ Requirements
 
 ### Ruby and Rails
 
-Paperclip now requires Ruby version **>= 2.1** and Rails version **>= 4.2**
+Paperclip now requires Ruby version **>= 2.2** and Rails version **>= 4.2**
 (only if you're going to use Paperclip with Ruby on Rails).
 
 ### Image Processor
@@ -172,13 +171,13 @@ Paperclip is distributed as a gem, which is how it should be used in your app.
 Include the gem in your Gemfile:
 
 ```ruby
-gem "kt-paperclip", "~> 6.0.0"
+gem "kt-paperclip", "~> 6.3"
 ```
 
 Or, if you want to get the latest, you can get master from the main paperclip repository:
 
 ```ruby
-gem "paperclip", git: "git://github.com/kreeti/paperclip.git"
+gem "kt-paperclip", git: "git://github.com/kreeti/kt-paperclip.git"
 ```
 
 If you're trying to use features that don't seem to be in the latest released gem, but are
@@ -310,7 +309,7 @@ You'll need to add `<attachment>_content_type` in case you want to use content t
 validation.
 
 More information about the options passed to `has_attached_file` is available in the
-documentation of [`Paperclip::ClassMethods`](http://www.rubydoc.info/gems/paperclip/Paperclip/ClassMethods).
+documentation of [`Paperclip::ClassMethods`](http://www.rubydoc.info/gems/kt-paperclip/Paperclip/ClassMethods).
 
 Validations
 -----------
@@ -342,7 +341,7 @@ Example Usage:
 validates_attachment_presence :avatar
 ```
 
-Lastly, you can also define multiple validations on a single attachment using `validates_attachment`:
+You can also define multiple validations on a single attachment using `validates_attachment`:
 
 ```ruby
 validates_attachment :avatar, presence: true,
@@ -411,6 +410,28 @@ validates_attachment :avatar,
 `Paperclip::ContentTypeDetector` will attempt to match a file's extension to an
 inferred content_type, regardless of the actual contents of the file.
 
+### Duplicate error messages
+
+By default Paperclip will copy validation errors from the attribute to the base
+of your model. Depending on how you display your validation errors, this can lead
+to confusing duplicate errors (one on the attribute and another referring to the
+base model).
+
+You can override this behaviour with the `add_validation_errors_to` option. By
+default this is set to `:both` but can be set to either `:attribute` or `:base`.
+
+* `:both` creates errors on both the attribute and base model.
+* `:attribute` only creates an error on the attribute of the model.
+* `:base` only creates an error on the base model.
+
+You can set this option globally:
+
+`Paperclip.options[:add_validation_errors_to] = :attribute`
+
+or pass it in to an individual validation declaration:
+
+`validates_attachment :document, content_type: { content_type: "application/pdf" }, add_validation_errors_to: :attribute`
+
 ---
 
 Internationalization (I18n)
@@ -606,7 +627,7 @@ gem 'aws-sdk-s3'
 
 And then you can specify using S3 from `has_attached_file`.
 You can find more information about configuring and using S3 storage in
-[the `Paperclip::Storage::S3` documentation](http://www.rubydoc.info/gems/paperclip/Paperclip/Storage/S3).
+[the `Paperclip::Storage::S3` documentation](http://www.rubydoc.info/gems/kt-paperclip/Paperclip/Storage/S3).
 
 Files on the local filesystem (and in the Rails app's public directory) will be
 available to the internet at large. If you require access control, it's
@@ -689,7 +710,7 @@ Custom Attachment Processors
 You can write your own custom attachment processors to carry out tasks like
 adding watermarks, compressing images, or encrypting files. Custom processors
 must be defined within the `Paperclip` module, inherit from
-`Paperclip::Processor` (see [`lib/paperclip/processor.rb`](https://github.com/kreeti/paperclip/blob/master/lib/paperclip/processor.rb)),
+`Paperclip::Processor` (see [`lib/paperclip/processor.rb`](https://github.com/kreeti/kt-paperclip/blob/master/lib/paperclip/processor.rb)),
 and implement a `make` method that returns a `File`. All files in your Rails
 app's `lib/paperclip` and `lib/paperclip_processors` directories will be
 automatically loaded by Paperclip. Processors are specified using the
@@ -892,7 +913,7 @@ Your::Application.configure do
 end
 ```
 
-More information in the [rdocs](http://www.rubydoc.info/github/thoughtbot/paperclip/Paperclip.options)
+More information in the [rdocs](https://www.rubydoc.info/gems/kt-paperclip/Paperclip.options)
 
 ---
 
@@ -976,7 +997,7 @@ Testing
 -------
 
 Paperclip provides rspec-compatible matchers for testing attachments. See the
-documentation on [Paperclip::Shoulda::Matchers](http://www.rubydoc.info/gems/paperclip/Paperclip/Shoulda/Matchers)
+documentation on [Paperclip::Shoulda::Matchers](http://www.rubydoc.info/gems/kt-paperclip/Paperclip/Shoulda/Matchers)
 for more information.
 
 **Parallel Tests**
@@ -1036,15 +1057,15 @@ If you'd like to contribute a feature or bugfix: Thanks! To make sure your
 fix/feature has a high chance of being included, please read the following
 guidelines:
 
-1. Post a [pull request](https://github.com/kreeti/paperclip/compare/).
+1. Post a [pull request](https://github.com/kreeti/kt-paperclip/compare/).
 2. Make sure there are tests! We will not accept any patch that is not tested.
    It's a rare time when explicit tests aren't needed. If you have questions
    about writing tests for paperclip, please open a
-   [GitHub issue](https://github.com/kreeti/paperclip/issues/new).
+   [GitHub issue](https://github.com/kreeti/kt-paperclip/issues/new).
 
 Please see [`CONTRIBUTING.md`](./CONTRIBUTING.md) for more details on contributing and running test.
 
-Thank you to all [the contributors](https://github.com/kreeti/paperclip/graphs/contributors)!
+Thank you to all [the contributors](https://github.com/kreeti/kt-paperclip/graphs/contributors)!
 
 License
 -------

data/lib/kt-paperclip.rb

@@ -0,0 +1 @@
+require "paperclip"

data/lib/paperclip/io_adapters/http_url_proxy_adapter.rb

@@ -9,8 +9,8 @@ module Paperclip
     REGEXP = /\Ahttps?:\/\//.freeze
 
     def initialize(target, options = {})
-      escaped = URI.escape(target)
-      super(URI(target == URI.unescape(target) ? escaped : target), options)
+      escaped = Paperclip::UrlGenerator.escape(target)
+      super(URI(target == Paperclip::UrlGenerator.unescape(target) ? escaped : target), options)
     end
   end
 end

data/lib/paperclip/io_adapters/uri_adapter.rb

@@ -50,10 +50,20 @@ module Paperclip
       "index.html"
     end
 
-    def download_content
-      options = { read_timeout: Paperclip.options[:read_timeout] }.compact
+    if RUBY_VERSION < '2.5'
+      def download_content
+        options = { read_timeout: Paperclip.options[:read_timeout] }.compact
 
-      open(@target, **options)
+        # rubocop:disable Security/Open
+        open(@target, options)
+        # rubocop:enable Security/Open
+      end
+    else
+      def download_content
+        options = { read_timeout: Paperclip.options[:read_timeout] }.compact
+
+        URI.open(@target, options)
+      end
     end
 
     def copy_to_tempfile(src)

data/lib/paperclip/schema.rb

@@ -26,7 +26,7 @@ module Paperclip
         attachment_names.each do |attachment_name|
           COLUMNS.each_pair do |column_name, column_type|
             column_options = options.merge(options[column_name.to_sym] || {})
-            add_column(table_name, "#{attachment_name}_#{column_name}", column_type, column_options)
+            add_column(table_name, "#{attachment_name}_#{column_name}", column_type, **column_options)
           end
         end
       end
@@ -55,7 +55,7 @@ module Paperclip
         attachment_names.each do |attachment_name|
           COLUMNS.each_pair do |column_name, column_type|
             column_options = options.merge(options[column_name.to_sym] || {})
-            column("#{attachment_name}_#{column_name}", column_type, column_options)
+            column("#{attachment_name}_#{column_name}", column_type, **column_options)
           end
         end
       end

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/url_generator.rb

@@ -3,6 +3,13 @@ require "active_support/core_ext/module/delegation"
 
 module Paperclip
   class UrlGenerator
+    class << self
+      def encoder
+        @encoder ||= URI::RFC2396_Parser.new
+      end
+      delegate :escape, :unescape, to: :encoder
+    end
+
     def initialize(attachment)
       @attachment = attachment
     end
@@ -65,7 +72,7 @@ module Paperclip
       if url.respond_to?(:escape)
         url.escape
       else
-        URI.escape(url).gsub(escape_regex) { |m| "%#{m.ord.to_s(16).upcase}" }
+        self.class.escape(url).gsub(escape_regex) { |m| "%#{m.ord.to_s(16).upcase}" }
       end
     end
 

data/lib/paperclip/validators/attachment_content_type_validator.rb

@@ -3,6 +3,9 @@ module Paperclip
     class AttachmentContentTypeValidator < ActiveModel::EachValidator
       def initialize(options)
         options[:allow_nil] = true unless options.key?(:allow_nil)
+        unless options.key?(:add_validation_errors_to)
+          options[:add_validation_errors_to] = Paperclip.options[:add_validation_errors_to]
+        end
         super
       end
 
@@ -20,10 +23,14 @@ module Paperclip
         validate_whitelist(record, attribute, value)
         validate_blacklist(record, attribute, value)
 
-        if record.errors.include? attribute
+        if record.errors.include?(attribute) &&
+            [:both, :base].include?(options[:add_validation_errors_to])
+
           record.errors[attribute].each do |error|
             record.errors.add base_attribute, error
           end
+
+          record.errors.delete(attribute) if options[:add_validation_errors_to] == :base
         end
       end
 
@@ -40,7 +47,7 @@ module Paperclip
       end
 
       def mark_invalid(record, attribute, types)
-        record.errors.add attribute, :invalid, options.merge(types: types.join(", "))
+        record.errors.add attribute, :invalid, **options.merge(types: types.join(", "))
       end
 
       def allowed_types

data/lib/paperclip/validators/attachment_file_name_validator.rb

@@ -3,6 +3,9 @@ module Paperclip
     class AttachmentFileNameValidator < ActiveModel::EachValidator
       def initialize(options)
         options[:allow_nil] = true unless options.key?(:allow_nil)
+        unless options.key?(:add_validation_errors_to)
+          options[:add_validation_errors_to] = Paperclip.options[:add_validation_errors_to]
+        end
         super
       end
 
@@ -20,10 +23,14 @@ module Paperclip
         validate_whitelist(record, attribute, value)
         validate_blacklist(record, attribute, value)
 
-        if record.errors.include? attribute
+        if record.errors.include?(attribute) &&
+            [:both, :base].include?(options[:add_validation_errors_to])
+
           record.errors[attribute].each do |error|
             record.errors.add base_attribute, error
           end
+
+          record.errors.delete(attribute) if options[:add_validation_errors_to] == :base
         end
       end
 
@@ -36,7 +43,7 @@ module Paperclip
       end
 
       def mark_invalid(record, attribute, patterns)
-        record.errors.add attribute, :invalid, options.merge(names: patterns.join(", "))
+        record.errors.add attribute, :invalid, **options.merge(names: patterns.join(", "))
       end
 
       def allowed

data/lib/paperclip/validators/attachment_presence_validator.rb

@@ -4,7 +4,7 @@ module Paperclip
   module Validators
     class AttachmentPresenceValidator < ActiveModel::EachValidator
       def validate_each(record, attribute, _value)
-        record.errors.add(attribute, :blank, options) if record.send("#{attribute}_file_name").blank?
+        record.errors.add(attribute, :blank, **options) if record.send("#{attribute}_file_name").blank?
       end
 
       def self.helper_method_name

data/lib/paperclip/validators/attachment_size_validator.rb

@@ -17,6 +17,18 @@ module Paperclip
       def validate_each(record, attr_name, value)
         base_attr_name = attr_name
         attr_name = "#{attr_name}_file_size".to_sym
+
+        error_attrs = []
+        case options[:add_validation_errors_to]
+        when :base
+          error_attrs << base_attr_name
+        when :attribute
+          error_attrs << attr_name
+        else
+          error_attrs << base_attr_name
+          error_attrs << attr_name
+        end
+
         value = record.send(:read_attribute_for_validation, attr_name)
 
         unless value.blank?
@@ -26,8 +38,8 @@ module Paperclip
 
             unless value.send(CHECKS[option], option_value)
               error_message_key = options[:in] ? :in_between : option
-              [attr_name, base_attr_name].each do |error_attr_name|
-                record.errors.add(error_attr_name, error_message_key, filtered_options(value).merge(
+              error_attrs.each do |error_attr_name|
+                record.errors.add(error_attr_name, error_message_key, **filtered_options(value).merge(
                                                                         min: min_value_in_human_size(record),
                                                                         max: max_value_in_human_size(record),
                                                                         count: human_size(option_value)
@@ -56,6 +68,10 @@ module Paperclip
             options[:greater_than_or_equal_to] = range
           end
         end
+
+        unless options.key?(:add_validation_errors_to)
+          options[:add_validation_errors_to] = Paperclip.options[:add_validation_errors_to]
+        end
       end
 
       def extract_option_value(option, option_value)

data/lib/paperclip/validators.rb

@@ -20,10 +20,10 @@ module Paperclip
     ::Paperclip::REQUIRED_VALIDATORS = [AttachmentFileNameValidator, AttachmentContentTypeValidator, AttachmentFileTypeIgnoranceValidator].freeze
 
     module ClassMethods
-      # This method is a shortcut to validator classes that is in
-      # "Attachment...Validator" format. It is almost the same thing as the
-      # +validates+ method that shipped with Rails, but this is customized to
-      # be using with attachment validators. This is helpful when you're using
+      # This method is a shortcut to the validator classes that are in
+      # "Attachment...Validator" format. It is almost the same as the
+      # +validates+ method that ships with Rails, but is customized for
+      # use with attachment validators. This is helpful when you're using
       # multiple attachment validators on a single attachment.
       #
       # Example of using the validator:

data/lib/paperclip/version.rb

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

data/lib/paperclip.rb

@@ -98,7 +98,8 @@ module Paperclip
       swallow_stderr: true,
       use_exif_orientation: true,
       whiny: true,
-      is_windows: Gem.win_platform?
+      is_windows: Gem.win_platform?,
+      add_validation_errors_to: :both
     }
   end
 

data/paperclip.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.platform          = Gem::Platform::RUBY
   s.author            = "Surendra Singhi"
   s.email             = ["ssinghi@kreeti.com"]
-  s.homepage          = "https://github.com/kreeti/paperclip"
+  s.homepage          = "https://github.com/kreeti/kt-paperclip"
   s.summary           = "File attachments as attributes for ActiveRecord"
   s.description       = "Easy upload management for ActiveRecord"
   s.license           = "MIT"
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.post_install_message = File.read("UPGRADING") if File.exist?("UPGRADING")
 
   s.requirements << "ImageMagick"
-  s.required_ruby_version = ">= 2.1.0"
+  s.required_ruby_version = ">= 2.2.0"
 
   s.add_dependency("activemodel", ">= 4.2.0")
   s.add_dependency("activesupport", ">= 4.2.0")
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency("aws-sdk-s3")
   s.add_development_dependency("bundler")
   s.add_development_dependency("capybara")
-  s.add_development_dependency("cucumber-expressions", "4.0.3") # TODO: investigate failures on 4.0.4
+  s.add_development_dependency("cucumber-expressions")
   s.add_development_dependency("cucumber-rails")
   s.add_development_dependency("fakeweb")
   s.add_development_dependency("fog-aws")

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