kt-paperclip 5.4.0 → 7.1.1

data/lib/paperclip/validators/attachment_size_validator.rb

@@ -1,9 +1,9 @@
-require 'active_model/validations/numericality'
+require "active_model/validations/numericality"
 
 module Paperclip
   module Validators
     class AttachmentSizeValidator < ActiveModel::Validations::NumericalityValidator
-      AVAILABLE_CHECKS = [:less_than, :less_than_or_equal_to, :greater_than, :greater_than_or_equal_to]
+      AVAILABLE_CHECKS = [:less_than, :less_than_or_equal_to, :greater_than, :greater_than_or_equal_to].freeze
 
       def initialize(options)
         extract_options(options)
@@ -17,21 +17,34 @@ 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?
           options.slice(*AVAILABLE_CHECKS).each do |option, option_value|
             option_value = option_value.call(record) if option_value.is_a?(Proc)
             option_value = extract_option_value(option, option_value)
-
-            unless value.send(CHECKS[option], option_value)
+            operator = Rails::VERSION::MAJOR >= 7 ? COMPARE_CHECKS[option] : CHECKS[option]
+              
+            unless value.send(operator, 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(
-                  :min => min_value_in_human_size(record),
-                  :max => max_value_in_human_size(record),
-                  :count => human_size(option_value)
-                ))
+              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)
+                                                                      ))
               end
             end
           end
@@ -39,7 +52,7 @@ module Paperclip
       end
 
       def check_validity!
-        unless (AVAILABLE_CHECKS + [:in]).any? { |argument| options.has_key?(argument) }
+        unless (AVAILABLE_CHECKS + [:in]).any? { |argument| options.key?(argument) }
           raise ArgumentError, "You must pass either :less_than, :greater_than, or :in to the validator"
         end
       end
@@ -56,6 +69,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/media_type_spoof_detection_validator.rb

@@ -1,4 +1,4 @@
-require 'active_model/validations/presence'
+require "active_model/validations/presence"
 
 module Paperclip
   module Validators
@@ -8,6 +8,8 @@ module Paperclip
         if Paperclip::MediaTypeSpoofDetector.using(adapter, value.original_filename, value.content_type).spoofed?
           record.errors.add(attribute, :spoofed_media_type)
         end
+
+        adapter.tempfile.close(true) if adapter.tempfile
       end
     end
 

data/lib/paperclip/validators.rb

@@ -1,12 +1,12 @@
-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
@@ -17,13 +17,13 @@ module Paperclip
       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
-      # 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:
@@ -39,7 +39,7 @@ module Paperclip
           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)
@@ -64,11 +64,10 @@ module Paperclip
       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

data/lib/paperclip/version.rb

@@ -1,5 +1,3 @@
 module Paperclip
-  unless defined?(Paperclip::VERSION)
-    VERSION = "5.4.0".freeze
-  end
+  VERSION = "7.1.1" unless defined?(Paperclip::VERSION)
 end

data/lib/paperclip.rb

@@ -25,37 +25,37 @@
 #
 # See the +has_attached_file+ documentation for more details.
 
-require 'erb'
-require 'digest'
-require 'tempfile'
-require 'paperclip/version'
-require 'paperclip/geometry_parser_factory'
-require 'paperclip/geometry_detector_factory'
-require 'paperclip/geometry'
-require 'paperclip/processor'
-require 'paperclip/processor_helpers'
-require 'paperclip/tempfile'
-require 'paperclip/thumbnail'
-require 'paperclip/interpolations/plural_cache'
-require 'paperclip/interpolations'
-require 'paperclip/tempfile_factory'
-require 'paperclip/style'
-require 'paperclip/attachment'
-require 'paperclip/storage'
-require 'paperclip/callbacks'
-require 'paperclip/file_command_content_type_detector'
-require 'paperclip/media_type_spoof_detector'
-require 'paperclip/content_type_detector'
-require 'paperclip/glue'
-require 'paperclip/errors'
-require 'paperclip/missing_attachment_styles'
-require 'paperclip/validators'
-require 'paperclip/logger'
-require 'paperclip/helpers'
-require 'paperclip/has_attached_file'
-require 'paperclip/attachment_registry'
-require 'paperclip/filename_cleaner'
-require 'paperclip/rails_environment'
+require "erb"
+require "digest"
+require "tempfile"
+require "paperclip/version"
+require "paperclip/geometry_parser_factory"
+require "paperclip/geometry_detector_factory"
+require "paperclip/geometry"
+require "paperclip/processor"
+require "paperclip/processor_helpers"
+require "paperclip/tempfile"
+require "paperclip/thumbnail"
+require "paperclip/interpolations/plural_cache"
+require "paperclip/interpolations"
+require "paperclip/tempfile_factory"
+require "paperclip/style"
+require "paperclip/attachment"
+require "paperclip/storage"
+require "paperclip/callbacks"
+require "paperclip/file_command_content_type_detector"
+require "paperclip/media_type_spoof_detector"
+require "paperclip/content_type_detector"
+require "paperclip/glue"
+require "paperclip/errors"
+require "paperclip/missing_attachment_styles"
+require "paperclip/validators"
+require "paperclip/logger"
+require "paperclip/helpers"
+require "paperclip/has_attached_file"
+require "paperclip/attachment_registry"
+require "paperclip/filename_cleaner"
+require "paperclip/rails_environment"
 
 begin
   # Use mime/types/columnar if available, for reduced memory usage
@@ -64,12 +64,11 @@ rescue LoadError
   require "mime/types"
 end
 
-require 'mimemagic'
-require 'mimemagic/overlay'
-require 'logger'
-require 'terrapin'
+require "marcel"
+require "logger"
+require "terrapin"
 
-require 'paperclip/railtie' if defined?(Rails::Railtie)
+require "paperclip/railtie" if defined?(Rails::Railtie)
 
 # The base module that gets included in ActiveRecord::Base. See the
 # documentation for Paperclip::ClassMethods for more useful information.
@@ -98,6 +97,8 @@ module Paperclip
       swallow_stderr: true,
       use_exif_orientation: true,
       whiny: true,
+      is_windows: Gem.win_platform?,
+      add_validation_errors_to: :both
     }
   end
 
@@ -200,15 +201,15 @@ module Paperclip
 end
 
 # This stuff needs to be run after Paperclip is defined.
-require 'paperclip/io_adapters/registry'
-require 'paperclip/io_adapters/abstract_adapter'
-require 'paperclip/io_adapters/empty_string_adapter'
-require 'paperclip/io_adapters/identity_adapter'
-require 'paperclip/io_adapters/file_adapter'
-require 'paperclip/io_adapters/stringio_adapter'
-require 'paperclip/io_adapters/data_uri_adapter'
-require 'paperclip/io_adapters/nil_adapter'
-require 'paperclip/io_adapters/attachment_adapter'
-require 'paperclip/io_adapters/uploaded_file_adapter'
-require 'paperclip/io_adapters/uri_adapter'
-require 'paperclip/io_adapters/http_url_proxy_adapter'
+require "paperclip/io_adapters/registry"
+require "paperclip/io_adapters/abstract_adapter"
+require "paperclip/io_adapters/empty_string_adapter"
+require "paperclip/io_adapters/identity_adapter"
+require "paperclip/io_adapters/file_adapter"
+require "paperclip/io_adapters/stringio_adapter"
+require "paperclip/io_adapters/data_uri_adapter"
+require "paperclip/io_adapters/nil_adapter"
+require "paperclip/io_adapters/attachment_adapter"
+require "paperclip/io_adapters/uploaded_file_adapter"
+require "paperclip/io_adapters/uri_adapter"
+require "paperclip/io_adapters/http_url_proxy_adapter"

data/lib/tasks/paperclip.rake

@@ -1,25 +1,24 @@
-require 'paperclip/attachment_registry'
+require "paperclip/attachment_registry"
 
 module Paperclip
   module Task
     def self.obtain_class
-      class_name = ENV['CLASS'] || ENV['class']
+      class_name = ENV["CLASS"] || ENV["class"]
       raise "Must specify CLASS" unless class_name
+
       class_name
     end
 
     def self.obtain_attachments(klass)
       klass = Paperclip.class_for(klass.to_s)
-      name = ENV['ATTACHMENT'] || ENV['attachment']
+      name = ENV["ATTACHMENT"] || ENV["attachment"]
 
       attachment_names = Paperclip::AttachmentRegistry.names_for(klass)
 
-      if attachment_names.empty?
-        raise "Class #{klass.name} has no attachments specified"
-      end
+      raise "Class #{klass.name} has no attachments specified" if attachment_names.empty?
 
       if name.present? && attachment_names.map(&:to_s).include?(name.to_s)
-        [ name ]
+        [name]
       else
         attachment_names
       end
@@ -33,14 +32,14 @@ end
 
 namespace :paperclip do
   desc "Refreshes both metadata and thumbnails."
-  task :refresh => ["paperclip:refresh:metadata", "paperclip:refresh:thumbnails"]
+  task refresh: ["paperclip:refresh:metadata", "paperclip:refresh:thumbnails"]
 
   namespace :refresh do
     desc "Regenerates thumbnails for a given CLASS (and optional ATTACHMENT and STYLES splitted by comma)."
-    task :thumbnails => :environment do
+    task thumbnails: :environment do
       klass = Paperclip::Task.obtain_class
       names = Paperclip::Task.obtain_attachments(klass)
-      styles = (ENV['STYLES'] || ENV['styles'] || '').split(',').map(&:to_sym)
+      styles = (ENV["STYLES"] || ENV["styles"] || "").split(",").map(&:to_sym)
       names.each do |name|
         Paperclip.each_instance_with_attachment(klass, name) do |instance|
           attachment = instance.send(name)
@@ -59,7 +58,7 @@ namespace :paperclip do
     end
 
     desc "Regenerates content_type/size metadata for a given CLASS (and optional ATTACHMENT)."
-    task :metadata => :environment do
+    task metadata: :environment do
       klass = Paperclip::Task.obtain_class
       names = Paperclip::Task.obtain_attachments(klass)
       names.each do |name|
@@ -69,7 +68,7 @@ namespace :paperclip do
             instance.send("#{name}_file_name=", instance.send("#{name}_file_name").strip)
             instance.send("#{name}_content_type=", file.content_type.to_s.strip)
             instance.send("#{name}_file_size=", file.size) if instance.respond_to?("#{name}_file_size")
-            instance.save(:validate => false)
+            instance.save(validate: false)
           else
             true
           end
@@ -78,45 +77,45 @@ namespace :paperclip do
     end
 
     desc "Regenerates missing thumbnail styles for all classes using Paperclip."
-    task :missing_styles => :environment do
+    task missing_styles: :environment do
       Rails.application.eager_load!
       Paperclip.missing_attachments_styles.each do |klass, attachment_definitions|
         attachment_definitions.each do |attachment_name, missing_styles|
           puts "Regenerating #{klass} -> #{attachment_name} -> #{missing_styles.inspect}"
-          ENV['CLASS'] = klass.to_s
-          ENV['ATTACHMENT'] = attachment_name.to_s
-          ENV['STYLES'] = missing_styles.join(',')
-          Rake::Task['paperclip:refresh:thumbnails'].execute
+          ENV["CLASS"] = klass.to_s
+          ENV["ATTACHMENT"] = attachment_name.to_s
+          ENV["STYLES"] = missing_styles.join(",")
+          Rake::Task["paperclip:refresh:thumbnails"].execute
         end
       end
       Paperclip.save_current_attachments_styles!
     end
 
     desc "Regenerates fingerprints for a given CLASS (and optional ATTACHMENT). Useful when changing digest."
-    task :fingerprints => :environment do
+    task fingerprints: :environment do
       klass = Paperclip::Task.obtain_class
       names = Paperclip::Task.obtain_attachments(klass)
       names.each do |name|
         Paperclip.each_instance_with_attachment(klass, name) do |instance|
           attachment = instance.send(name)
           attachment.assign(attachment)
-          instance.save(:validate => false)
+          instance.save(validate: false)
         end
       end
     end
   end
 
   desc "Cleans out invalid attachments. Useful after you've added new validations."
-  task :clean => :environment do
+  task clean: :environment do
     klass = Paperclip::Task.obtain_class
     names = Paperclip::Task.obtain_attachments(klass)
     names.each do |name|
       Paperclip.each_instance_with_attachment(klass, name) do |instance|
         unless instance.valid?
-          attributes = %w(file_size file_name content_type).map{ |suffix| "#{name}_#{suffix}".to_sym }
-          if attributes.any?{ |attribute| instance.errors[attribute].present? }
+          attributes = %w(file_size file_name content_type).map { |suffix| "#{name}_#{suffix}".to_sym }
+          if attributes.any? { |attribute| instance.errors[attribute].present? }
             instance.send("#{name}=", nil)
-            instance.save(:validate => false)
+            instance.save(validate: false)
           end
         end
       end
@@ -124,7 +123,7 @@ namespace :paperclip do
   end
 
   desc "find missing attachments. Useful to know which attachments are broken"
-  task :find_broken_attachments => :environment do
+  task find_broken_attachments: :environment do
     klass = Paperclip::Task.obtain_class
     names = Paperclip::Task.obtain_attachments(klass)
     names.each do |name|

data/paperclip.gemspec

@@ -1,5 +1,5 @@
-$LOAD_PATH.push File.expand_path("../lib", __FILE__)
-require 'paperclip/version'
+$LOAD_PATH.push File.expand_path("lib", __dir__)
+require "paperclip/version"
 
 Gem::Specification.new do |s|
   s.name              = "kt-paperclip"
@@ -14,41 +14,37 @@ Gem::Specification.new do |s|
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  if File.exist?('UPGRADING')
-    s.post_install_message = File.read("UPGRADING")
-  end
+  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.3.0"
 
-  s.add_dependency('activemodel', '>= 4.2.0', '< 6.0')
-  s.add_dependency('activesupport', '>= 4.2.0', '< 6.0')
-  s.add_dependency('terrapin', '~> 0.6.0')
-  s.add_dependency('mime-types')
-  s.add_dependency('mimemagic', '~> 0.3.8')
+  s.add_dependency("activemodel", ">= 4.2.0")
+  s.add_dependency("activesupport", ">= 4.2.0")
+  s.add_dependency("mime-types")
+  s.add_dependency("marcel", "~> 1.0.1")
+  s.add_dependency("terrapin", "~> 0.6.0")
 
-  s.add_development_dependency('activerecord', '>= 4.2.0', '< 6.0')
-  s.add_development_dependency('shoulda')
-  s.add_development_dependency('rspec', '~> 3.0')
-  s.add_development_dependency('appraisal')
-  s.add_development_dependency('mocha')
-  s.add_development_dependency('aws-sdk', '>= 2.3.0', '< 3.0')
-  s.add_development_dependency('bourne', '< 1.6')
-  s.add_development_dependency('cucumber-rails')
-  s.add_development_dependency('cucumber-expressions', '4.0.3') # TODO: investigate failures on 4.0.4
-  s.add_development_dependency('aruba', '~> 0.9.0')
-  s.add_development_dependency('nokogiri')
-  s.add_development_dependency('capybara')
-  s.add_development_dependency('bundler')
-  s.add_development_dependency('fog-aws')
-  s.add_development_dependency('fog-local')
-  s.add_development_dependency('launchy')
-  s.add_development_dependency('rake')
-  s.add_development_dependency('fakeweb')
-  s.add_development_dependency('railties', '>= 4.2.0', '< 6.0')
-  s.add_development_dependency('generator_spec')
-  s.add_development_dependency('timecop')
+  s.add_development_dependency("activerecord", ">= 4.2.0")
+  s.add_development_dependency("appraisal")
+  s.add_development_dependency("aruba", "~> 0.9.0")
+  s.add_development_dependency("aws-sdk-s3")
+  s.add_development_dependency("bundler")
+  s.add_development_dependency("capybara")
+  s.add_development_dependency("cucumber-expressions")
+  s.add_development_dependency("cucumber-rails")
+  s.add_development_dependency("fakeweb")
+  s.add_development_dependency("fog-aws")
+  s.add_development_dependency("fog-local")
+  s.add_development_dependency("generator_spec")
+  s.add_development_dependency("launchy")
+  s.add_development_dependency("nokogiri")
+  s.add_development_dependency("railties")
+  s.add_development_dependency("rake")
+  s.add_development_dependency("rspec", "~> 3.0")
+  s.add_development_dependency("shoulda")
+  s.add_development_dependency("timecop")
 end

data/shoulda_macros/paperclip.rb

@@ -1,4 +1,4 @@
-require 'paperclip/matchers'
+require "paperclip/matchers"
 
 module Paperclip
   # =Paperclip Shoulda Macros
@@ -13,8 +13,8 @@ module Paperclip
     # This will test whether you have defined your attachment correctly by
     # checking for all the required fields exist after the definition of the
     # attachment.
-    def should_have_attached_file name
-      klass   = self.name.gsub(/Test$/, '').constantize
+    def should_have_attached_file(name)
+      klass   = self.name.gsub(/Test$/, "").constantize
       matcher = have_attached_file name
       should matcher.description do
         assert_accepts(matcher, klass)
@@ -22,8 +22,8 @@ module Paperclip
     end
 
     # Tests for validations on the presence of the attachment.
-    def should_validate_attachment_presence name
-      klass   = self.name.gsub(/Test$/, '').constantize
+    def should_validate_attachment_presence(name)
+      klass   = self.name.gsub(/Test$/, "").constantize
       matcher = validate_attachment_presence name
       should matcher.description do
         assert_accepts(matcher, klass)
@@ -34,8 +34,8 @@ module Paperclip
     # options, :valid and :invalid. Both accept an array of strings. The
     # strings should be a list of content types which will pass and fail
     # validation, respectively.
-    def should_validate_attachment_content_type name, options = {}
-      klass   = self.name.gsub(/Test$/, '').constantize
+    def should_validate_attachment_content_type(name, options = {})
+      klass   = self.name.gsub(/Test$/, "").constantize
       valid   = [options[:valid]].flatten
       invalid = [options[:invalid]].flatten
       matcher = validate_attachment_content_type(name).allowing(valid).rejecting(invalid)
@@ -50,10 +50,10 @@ module Paperclip
     # :less_than checks that a file is less than a certain size, :greater_than
     # checks that a file is more than a certain size, and :in takes a Range or
     # Array which specifies the lower and upper limits of the file size.
-    def should_validate_attachment_size name, options = {}
-      klass   = self.name.gsub(/Test$/, '').constantize
+    def should_validate_attachment_size(name, options = {})
+      klass   = self.name.gsub(/Test$/, "").constantize
       min     = options[:greater_than] || (options[:in] && options[:in].first) || 0
-      max     = options[:less_than]    || (options[:in] && options[:in].last)  || (1.0/0)
+      max     = options[:less_than]    || (options[:in] && options[:in].last)  || (1.0 / 0)
       range   = (min..max)
       matcher = validate_attachment_size(name).in(range)
       should matcher.description do
@@ -65,17 +65,17 @@ module Paperclip
     #
     # @example
     #   stub_paperclip_s3('user', 'avatar', 'png')
-    def stub_paperclip_s3(model, attachment, extension)
+    def stub_paperclip_s3(model, attachment, _extension)
       definition = model.gsub(" ", "_").classify.constantize.
-                         attachment_definitions[attachment.to_sym]
+                   attachment_definitions[attachment.to_sym]
 
       path = "http://s3.amazonaws.com/:id/#{definition[:path]}"
-      path.gsub!(/:([^\/\.]+)/) do |match|
+      path.gsub!(/:([^\/\.]+)/) do |_match|
         "([^\/\.]+)"
       end
 
       begin
-        FakeWeb.register_uri(:put, Regexp.new(path), :body => "OK")
+        FakeWeb.register_uri(:put, Regexp.new(path), body: "OK")
       rescue NameError
         raise NameError, "the stub_paperclip_s3 shoulda macro requires the fakeweb gem."
       end
@@ -104,11 +104,11 @@ module Paperclip
 end
 
 if defined?(ActionDispatch::Integration::Session)
-  class ActionDispatch::IntegrationTest::Session  #:nodoc:
+  class ActionDispatch::IntegrationTest::Session #:nodoc:
     include Paperclip::Shoulda
   end
 elsif defined?(ActionController::Integration::Session)
-  class ActionController::Integration::Session  #:nodoc:
+  class ActionController::Integration::Session #:nodoc:
     include Paperclip::Shoulda
   end
 end

data/spec/paperclip/attachment_definitions_spec.rb

@@ -1,12 +1,12 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe "Attachment Definitions" do
-  it 'returns all of the attachments on the class' do
+  it "returns all of the attachments on the class" do
     reset_class "Dummy"
-    Dummy.has_attached_file :avatar, {path: "abc"}
-    Dummy.has_attached_file :other_attachment, {url: "123"}
+    Dummy.has_attached_file :avatar, path: "abc"
+    Dummy.has_attached_file :other_attachment, url: "123"
     Dummy.do_not_validate_attachment_file_type :avatar
-    expected = {avatar: {path: "abc"}, other_attachment: {url: "123"}}
+    expected = { avatar: { path: "abc" }, other_attachment: { url: "123" } }
 
     expect(Dummy.attachment_definitions).to eq expected
   end