validators.rb in kt-paperclip-6.2.0

- old
+ new

@@ -1,25 +1,25 @@
-require 'active_model'
-require 'active_support/concern'
-require 'active_support/core_ext/array/wrap'
-require 'paperclip/validators/attachment_content_type_validator'
-require 'paperclip/validators/attachment_file_name_validator'
-require 'paperclip/validators/attachment_presence_validator'
-require 'paperclip/validators/attachment_size_validator'
-require 'paperclip/validators/media_type_spoof_detection_validator'
-require 'paperclip/validators/attachment_file_type_ignorance_validator'
+require "active_model"
+require "active_support/concern"
+require "active_support/core_ext/array/wrap"
+require "paperclip/validators/attachment_content_type_validator"
+require "paperclip/validators/attachment_file_name_validator"
+require "paperclip/validators/attachment_presence_validator"
+require "paperclip/validators/attachment_size_validator"
+require "paperclip/validators/media_type_spoof_detection_validator"
+require "paperclip/validators/attachment_file_type_ignorance_validator"
 
 module Paperclip
   module Validators
     extend ActiveSupport::Concern
 
     included do
       extend  HelperMethods
       include HelperMethods
     end
 
-    ::Paperclip::REQUIRED_VALIDATORS = [AttachmentFileNameValidator, AttachmentContentTypeValidator, AttachmentFileTypeIgnoranceValidator]
+    ::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
@@ -37,11 +37,11 @@
 
         Paperclip::Validators.constants.each do |constant|
           if constant.to_s =~ /\AAttachment(.+)Validator\z/
             validator_kind = $1.underscore.to_sym
 
-            if options.has_key?(validator_kind)
+            if options.key?(validator_kind)
               validator_options = options.delete(validator_kind)
               validator_options = {} if validator_options == true
               conditional_options = options.slice(:if, :unless)
               Array.wrap(validator_options).each do |local_options|
                 method_name = Paperclip::Validators.const_get(constant.to_s).helper_method_name
@@ -62,13 +62,12 @@
       end
 
       def create_validating_before_filter(attribute, validator_class, options)
         if_clause = options.delete(:if)
         unless_clause = options.delete(:unless)
-        send(:"before_#{attribute}_post_process", :if => if_clause, :unless => unless_clause) do |*args|
+        send(:"before_#{attribute}_validate", if: if_clause, unless: unless_clause) do |*_args|
           validator_class.new(options.dup).validate(self)
         end
       end
-
     end
   end
 end