paperclip.rb in paperclip-3.4.0

- old
+ new

@@ -27,10 +27,12 @@
 
 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/tempfile'
 require 'paperclip/thumbnail'
 require 'paperclip/interpolations'
@@ -38,10 +40,11 @@
 require 'paperclip/style'
 require 'paperclip/attachment'
 require 'paperclip/attachment_options'
 require 'paperclip/storage'
 require 'paperclip/callbacks'
+require 'paperclip/file_command_content_type_detector'
 require 'paperclip/content_type_detector'
 require 'paperclip/glue'
 require 'paperclip/errors'
 require 'paperclip/missing_attachment_styles'
 require 'paperclip/validators'
@@ -177,10 +180,10 @@
         self.attachment_definitions = self.attachment_definitions.dup
       end
 
       attachment_definitions[name] = Paperclip::AttachmentOptions.new(options)
       Paperclip.classes_with_attachments << self.name
-      Paperclip.check_for_url_clash(name,attachment_definitions[name][:url],self.name)
+      Paperclip.check_for_path_clash(name,attachment_definitions[name][:path],self.name)
 
       after_save :save_attached_files
       before_destroy :prepare_for_destroy
       after_destroy :destroy_attached_files
 