kt-paperclip 6.2.0 → 7.1.1

data/.travis.yml

@@ -1,12 +1,11 @@
 language: ruby
 
 rvm:
-  - 2.1
-  - 2.2
   - 2.3
   - 2.4
   - 2.5
   - 2.6
+  - 2.7
 
 script: "bundle exec rake clean spec cucumber"
 
@@ -25,23 +24,22 @@ gemfile:
   - gemfiles/5.1.gemfile
   - gemfiles/5.2.gemfile
   - gemfiles/6.0.gemfile
+  - gemfiles/6.1.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/6.1.gemfile
+      rvm: 2.3
+    - gemfile: gemfiles/6.1.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/Appraisals

@@ -22,3 +22,9 @@ appraise "6.0" do
   gem "sqlite3", "~> 1.4", platforms: :ruby
   gem "rails", "~> 6.0.0"
 end
+
+appraise "6.1" do
+  gem "sqlite3", "~> 1.4", platforms: :ruby
+  gem "aruba", "~> 1.0", ">= 1.0.4"
+  gem "rails", "~> 6.1", ">= 6.1.1"
+end

data/CONTRIBUTING.md

@@ -10,8 +10,7 @@ Here's a quick guide for contributing:
 
 1. Fork the repo.
 
-1. Make sure you have ImageMagick and Ghostscript installed. See [this section]
-(./README.md#image-processor) of the README.
+1. Make sure you have ImageMagick and Ghostscript installed. See [this section](./README.md#image-processor) of the README.
 
 1. Run the tests. We only take pull requests with passing tests, and it's great
 to know that you have a clean slate: `bundle && bundle exec rake`
@@ -78,9 +77,9 @@ Syntax
 
 * Two spaces, no tabs.
 * No trailing whitespace. Blank lines should not have any space.
-* Prefer &&/|| over and/or.
-* MyClass.my_method(my_arg) not my_method( my_arg ) or my_method my_arg.
-* a = b and not a=b.
+* Prefer `&&` instead of `and` ; prefer `||` instead of `or`.
+* Use `MyClass.my_method(my_arg)` instead of `MyClass.my_method( my_arg )` or `MyClass.my_method my_arg`.
+* `a = b` rather than `a=b` .
 * Follow the conventions you see used in the source already.
 
 And in case we didn't emphasize it enough: we love tests!

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 "mime-types"
+  gem "listen", "~> 3.0.8"
   gem "rspec"
-  gem "rubocop", require: false
+  # Hound only supports certain versions of Rubocop -- 1.22.1 is currently the most recent one supported.
+  gem "rubocop", "1.22.1", require: false
+  gem "rubocop-rails"
   gem "sprockets", "3.7.2"
 end

data/NEWS

@@ -1,3 +1,34 @@
+[UNRELEASED]
+Issue file delete only once per unique style when nullifying attachment or destroying an object. Avoids triggering a rate limit error on Google Cloud Storage.
+
+7.0.0 (2021-05-28)
+* Replace `mimemagic` gem with `marcel` due to licensing issues. See https://github.com/kreeti/kt-paperclip/pull/54 for details and limitations
+
+6.4.1 (2021-01-30)
+* Improvement: Use URI.open in ruby > 2.5 (PR #45)
+
+6.4.0 (2020-12-14)
+* Improvement: Fix Ruby 2.7 method & syntax deprecation warnings (#38)
+
+6.3.0 (2020-08-10)
+* Feature: Add validation_errors_to option - customize copying of errors (#26)
+* Stability: Dropped support for ruby 2.1
+
+6.2.2 (2020-02-18)
+* Bugfix: Add support for Aliases in S3 credentials YAML (accidentally removed during 6.2.0 upgrade).
+
+6.2.1 (2020-01-30)
+
+* Bugfix: Auto-loading of the gem code (necessitated due to change in gem name).
+
+6.2.0 (2020-01-23):
+
+* Bugfix: Don't do post-processing on invalid attachments (#16).
+* Improvement: Use AWS::S3 built in download_file method (#9).
+* Stability: Rubocop recommended syntax updates (#10, #11, #13, #14).
+* Stability: Testing - replace mocha and bourne with rspec mocks (#6).
+* Stability: Fix test suite to run with Rails 5 and Rails 6 (#19, #20, #7).
+
 6.1.0 (2018-07-27):
 
 * BUGFIX: Don't double-encode URLs (Roderick Monje).

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.3** 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.4", ">= 6.4.1"
 ```
 
 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,18 +1057,19 @@ 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
 -------
 
-Paperclip is Copyright &copy; 2008-2017 thoughtbot, inc. It is free software, and may be
-redistributed under the terms specified in the MIT-LICENSE file.
+Copyright &copy; 2020-2021 Kreeti Technologies Pvt. Ltd.
+Copyright &copy; 2008-2017 thoughtbot, inc.
+It is free software, and may be redistributed under the terms specified in the MIT-LICENSE file.

data/features/step_definitions/attachment_steps.rb

@@ -23,7 +23,7 @@ When /^I modify my attachment definition to:$/ do |definition|
 end
 
 When /^I upload the fixture "([^"]*)"$/ do |filename|
-  run_simple %(bundle exec rails runner "User.create!(:attachment => File.open('#{fixture_path(filename)}'))")
+  aruba_run_simple %(bundle exec rails runner "User.create!(:attachment => File.open('#{fixture_path(filename)}'))")
 end
 
 Then /^the attachment "([^"]*)" should have a dimension of (\d+x\d+)$/ do |filename, dimension|
@@ -108,3 +108,13 @@ Then /^I should not have attachment columns for "([^"]*)"$/ do |attachment_name|
     expect(columns).not_to include(*expect_columns)
   end
 end
+
+# we have to support different versions of aruba, and this method was renamed for 1.0
+# https://github.com/cucumber/aruba/pull/438
+def aruba_run_simple(*args)
+  if respond_to?(:run_simple)
+    run_simple(*args)
+  elsif respond_to?(:run_command_and_stop)
+    run_command_and_stop(*args)
+  end
+end

data/gemfiles/4.2.gemfile

@@ -11,9 +11,9 @@ group :development, :test do
   gem "bootsnap", require: false
   gem "builder"
   gem "listen", "~> 3.0.8"
-  gem "mime-types"
   gem "rspec"
   gem "rubocop", require: false
+  gem "rubocop-rails"
   gem "sprockets", "3.7.2"
 end
 

data/gemfiles/5.0.gemfile

@@ -11,9 +11,9 @@ group :development, :test do
   gem "bootsnap", require: false
   gem "builder"
   gem "listen", "~> 3.0.8"
-  gem "mime-types"
   gem "rspec"
   gem "rubocop", require: false
+  gem "rubocop-rails"
   gem "sprockets", "3.7.2"
 end
 

data/gemfiles/5.1.gemfile

@@ -11,9 +11,9 @@ group :development, :test do
   gem "bootsnap", require: false
   gem "builder"
   gem "listen", "~> 3.0.8"
-  gem "mime-types"
   gem "rspec"
   gem "rubocop", require: false
+  gem "rubocop-rails"
   gem "sprockets", "3.7.2"
 end
 

data/gemfiles/5.2.gemfile

@@ -11,9 +11,9 @@ group :development, :test do
   gem "bootsnap", require: false
   gem "builder"
   gem "listen", "~> 3.0.8"
-  gem "mime-types"
   gem "rspec"
   gem "rubocop", require: false
+  gem "rubocop-rails"
   gem "sprockets", "3.7.2"
 end
 

data/gemfiles/6.0.gemfile

@@ -11,9 +11,9 @@ group :development, :test do
   gem "bootsnap", require: false
   gem "builder"
   gem "listen", "~> 3.0.8"
-  gem "mime-types"
   gem "rspec"
   gem "rubocop", require: false
+  gem "rubocop-rails"
   gem "sprockets", "3.7.2"
 end
 

data/gemfiles/6.1.gemfile

@@ -0,0 +1,21 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "pry"
+gem "sqlite3", "~> 1.4", platforms: :ruby
+gem "aruba", "~> 1.0", ">= 1.0.4"
+gem "rails", "~> 6.1", ">= 6.1.1"
+
+group :development, :test do
+  gem "activerecord-import"
+  gem "bootsnap", require: false
+  gem "builder"
+  gem "listen", "~> 3.0.8"
+  gem "rspec"
+  gem "rubocop", require: false
+  gem "rubocop-rails"
+  gem "sprockets", "3.7.2"
+end
+
+gemspec path: "../"

data/gemfiles/7.0.gemfile

@@ -0,0 +1,21 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "pry"
+gem "sqlite3", "~> 1.4", platforms: :ruby
+gem "aruba", "~> 1.0", ">= 1.0.4"
+gem "rails", "~> 7.0.0"
+
+group :development, :test do
+  gem "activerecord-import"
+  gem "bootsnap", require: false
+  gem "builder"
+  gem "listen", "~> 3.0.8"
+  gem "rspec"
+  gem "rubocop", require: false
+  gem "rubocop-rails"
+  gem "sprockets", "3.7.2"
+end
+
+gemspec path: "../"

data/lib/kt-paperclip.rb

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

data/lib/paperclip/attachment.rb

@@ -38,7 +38,7 @@ module Paperclip
     end
 
     attr_reader :name, :instance, :default_style, :convert_options, :queued_for_write, :whiny,
-                :options, :interpolator, :source_file_options
+                :options, :interpolator, :source_file_options, :queued_for_delete
     attr_accessor :post_processing
 
     # Creates an Attachment object. +name+ is the name of the attachment,

data/lib/paperclip/content_type_detector.rb

@@ -60,16 +60,21 @@ module Paperclip
     end
 
     def type_from_file_contents
-      type_from_mime_magic || type_from_file_command
+      type_from_marcel || type_from_file_command
     rescue Errno::ENOENT => e
       Paperclip.log("Error while determining content type: #{e}")
       SENSIBLE_DEFAULT
     end
 
-    def type_from_mime_magic
-      @type_from_mime_magic ||= File.open(@filepath) do |file|
-        MimeMagic.by_magic(file).try(:type)
-      end
+    def type_from_marcel
+      return @type_from_marcel if defined? @type_from_marcel
+
+      @type_from_marcel = Marcel::MimeType.for Pathname.new(@filepath),
+                                               name: @filepath
+      # Marcel::MineType returns 'application/octet-stream' if it can't find
+      # a valid type.
+      @type_from_marcel = nil if @type_from_marcel == SENSIBLE_DEFAULT
+      @type_from_marcel
     end
 
     def type_from_file_command

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

@@ -57,7 +57,7 @@ module Paperclip
       end
 
       def flush_deletes #:nodoc:
-        @queued_for_delete.each do |path|
+        @queued_for_delete.uniq.each do |path|
           begin
             log("deleting #{path}")
             FileUtils.rm(path) if File.exist?(path)

data/lib/paperclip/storage/fog.rb

@@ -135,7 +135,7 @@ module Paperclip
       end
 
       def flush_deletes
-        @queued_for_delete.each do |path|
+        @queued_for_delete.uniq.each do |path|
           log("deleting #{path}")
           directory.files.new(key: path).destroy
         end

data/lib/paperclip/storage/s3.rb

@@ -403,7 +403,7 @@ module Paperclip
       end
 
       def flush_deletes #:nodoc:
-        @queued_for_delete.each do |path|
+        @queued_for_delete.uniq.each do |path|
           begin
             log("deleting #{path}")
             s3_bucket.object(path.sub(%r{\A/}, "")).delete
@@ -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
+            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