paperclip 2.8.0 → 3.0.2

data/lib/paperclip/io_adapters/file_adapter.rb

@@ -0,0 +1,81 @@
+module Paperclip
+  class FileAdapter
+    def initialize(target)
+      @target = target
+      @tempfile = copy_to_tempfile(@target)
+    end
+
+    def original_filename
+      if @target.respond_to?(:original_filename)
+        @target.original_filename
+      else
+        File.basename(@target.path)
+      end
+    end
+
+    def content_type
+      types = MIME::Types.type_for(original_filename)
+      if types.length == 0
+        type_from_file_command
+      elsif types.length == 1
+        types.first.content_type
+      else
+        best_content_type_option(types)
+      end
+    end
+
+    def fingerprint
+      @fingerprint ||= Digest::MD5.file(path).to_s
+    end
+
+    def size
+      File.size(@tempfile)
+    end
+
+    def nil?
+      @target.nil?
+    end
+
+    def read(length = nil, buffer = nil)
+      @tempfile.read(length, buffer)
+    end
+
+    # We don't use this directly, but aws/sdk does.
+    def rewind
+      @tempfile.rewind
+    end
+
+    def eof?
+      @tempfile.eof?
+    end
+
+    def path
+      @tempfile.path
+    end
+
+    private
+
+    def copy_to_tempfile(src)
+      dest = Tempfile.new(original_filename)
+      dest.binmode
+      FileUtils.cp(src.path, dest.path)
+      dest
+    end
+
+    def best_content_type_option(types)
+      types.reject {|type| type.content_type.match(/\/x-/) }.first
+    end
+
+    def type_from_file_command
+      # On BSDs, `file` doesn't give a result code of 1 if the file doesn't exist.
+      type = (self.original_filename.match(/\.(\w+)$/)[1] rescue "octet-stream").downcase
+      mime_type = (Paperclip.run("file", "-b --mime :file", :file => self.path).split(/[:;]\s+/)[0] rescue "application/x-#{type}")
+      mime_type = "application/x-#{type}" if mime_type.match(/\(.*?\)/)
+      mime_type
+    end
+  end
+end
+
+Paperclip.io_adapters.register Paperclip::FileAdapter do |target|
+  File === target || Tempfile === target
+end

data/lib/paperclip/io_adapters/identity_adapter.rb

@@ -0,0 +1,12 @@
+module Paperclip
+  class IdentityAdapter
+    def new(adapter)
+      adapter
+    end
+  end
+end
+
+Paperclip.io_adapters.register Paperclip::IdentityAdapter.new do |target|
+  Paperclip.io_adapters.registered?(target)
+end
+

data/lib/paperclip/io_adapters/nil_adapter.rb

@@ -0,0 +1,34 @@
+module Paperclip
+  class NilAdapter
+    def initialize(target)
+    end
+
+    def original_filename
+      ""
+    end
+
+    def content_type
+      ""
+    end
+
+    def size
+      0
+    end
+
+    def nil?
+      true
+    end
+
+    def read(*args)
+      nil
+    end
+
+    def eof?
+      true
+    end
+  end
+end
+
+Paperclip.io_adapters.register Paperclip::NilAdapter do |target|
+  target.nil?
+end

data/lib/paperclip/io_adapters/registry.rb

@@ -0,0 +1,32 @@
+module Paperclip
+  class AdapterRegistry
+    class NoHandlerError < Paperclip::Error; end
+
+    attr_reader :registered_handlers
+
+    def initialize
+      @registered_handlers = []
+    end
+
+    def register(handler_class, &block)
+      @registered_handlers << [block, handler_class]
+    end
+
+    def handler_for(target)
+      @registered_handlers.each do |tester, handler|
+        return handler if tester.call(target)
+      end
+      raise NoHandlerError.new("No handler found for #{target.inspect}")
+    end
+
+    def registered?(target)
+      @registered_handlers.any? do |tester, handler|
+        handler === target
+      end
+    end
+
+    def for(target)
+      handler_for(target).new(target)
+    end
+  end
+end

data/lib/paperclip/io_adapters/stringio_adapter.rb

@@ -0,0 +1,64 @@
+module Paperclip
+  class StringioAdapter
+    def initialize(target)
+      @target = target
+      @tempfile = copy_to_tempfile(@target)
+    end
+
+    attr_writer :original_filename, :content_type
+
+    def original_filename
+      @original_filename ||= @target.original_filename if @target.respond_to?(:original_filename)
+      @original_filename ||= "stringio.txt"
+      @original_filename.strip
+    end
+
+    def content_type
+      @content_type ||= @target.content_type if @target.respond_to?(:content_type)
+      @content_type ||= "text/plain"
+      @content_type.strip
+    end
+
+    def size
+      @target.size
+    end
+
+    def fingerprint
+      Digest::MD5.hexdigest(read)
+    end
+
+    def read(length = nil, buffer = nil)
+      @tempfile.read(length, buffer)
+    end
+
+    # We don't use this directly, but aws/sdk does.
+    def rewind
+      @tempfile.rewind
+    end
+
+    def eof?
+      @tempfile.eof?
+    end
+
+    def path
+      @tempfile.path
+    end
+
+    private
+
+    def copy_to_tempfile(src)
+      dest = Tempfile.new(original_filename)
+      dest.binmode
+      while data = src.read(16*1024)
+        dest.write(data)
+      end
+      dest.rewind
+      dest
+    end
+
+  end
+end
+
+Paperclip.io_adapters.register Paperclip::StringioAdapter do |target|
+  StringIO === target
+end

data/lib/paperclip/io_adapters/uploaded_file_adapter.rb

@@ -0,0 +1,63 @@
+module Paperclip
+  class UploadedFileAdapter
+    def initialize(target)
+      @target = target
+
+      if @target.respond_to?(:tempfile)
+        @tempfile = copy_to_tempfile(@target.tempfile)
+      else
+        @tempfile = copy_to_tempfile(@target)
+      end
+    end
+
+    def original_filename
+      @target.original_filename
+    end
+
+    def content_type
+      @target.content_type
+    end
+
+    def fingerprint
+      @fingerprint ||= Digest::MD5.file(path).to_s
+    end
+
+    def size
+      File.size(path)
+    end
+
+    def nil?
+      false
+    end
+
+    def read(length = nil, buffer = nil)
+      @tempfile.read(length, buffer)
+    end
+
+    # We don't use this directly, but aws/sdk does.
+    def rewind
+      @tempfile.rewind
+    end
+
+    def eof?
+      @tempfile.eof?
+    end
+
+    def path
+      @tempfile.path
+    end
+
+    private
+
+    def copy_to_tempfile(src)
+      dest = Tempfile.new(original_filename)
+      dest.binmode
+      FileUtils.cp(src.path, dest.path)
+      dest
+    end
+  end
+end
+
+Paperclip.io_adapters.register Paperclip::UploadedFileAdapter do |target|
+  target.class.name.include?("UploadedFile")
+end

data/lib/paperclip/locales/en.yml

@@ -0,0 +1,17 @@
+en:
+  errors:
+    messages:
+      in_between: "must be in between %{min} and %{max}"
+
+  number:
+    human:
+      storage_units:
+        format: "%n %u"
+        units:
+          byte:
+            one:   "Byte"
+            other: "Bytes"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"

data/lib/paperclip/logger.rb

@@ -0,0 +1,21 @@
+module Paperclip
+  module Logger
+    # Log a paperclip-specific line. This will log to STDOUT
+    # by default. Set Paperclip.options[:log] to false to turn off.
+    def log message
+      logger.info("[paperclip] #{message}") if logging?
+    end
+
+    def logger #:nodoc:
+      @logger ||= options[:logger] || ::Logger.new(STDOUT)
+    end
+
+    def logger=(logger)
+      @logger = logger
+    end
+
+    def logging? #:nodoc:
+      options[:log]
+    end
+  end
+end

data/lib/paperclip/matchers/validate_attachment_content_type_matcher.rb

@@ -61,7 +61,7 @@ module Paperclip
         protected
 
         def type_allowed?(type)
-          file = StringIO.new(".")
+          file = Paperclip.io_adapters.for(StringIO.new("."))
           file.content_type = type
           @subject.attachment_for(@attachment_name).assign(file)
           @subject.valid?

data/lib/paperclip/matchers/validate_attachment_presence_matcher.rb

@@ -39,14 +39,14 @@ module Paperclip
         def error_when_not_valid?
           @subject.send(@attachment_name).assign(nil)
           @subject.valid?
-          not @subject.errors[:"#{@attachment_name}_file_name"].blank?
+          @subject.errors[:"#{@attachment_name}"].present?
         end
 
         def no_error_when_valid?
           @file = StringIO.new(".")
           @subject.send(@attachment_name).assign(@file)
           @subject.valid?
-          @subject.errors[:"#{@attachment_name}_file_name"].blank?
+          @subject.errors[:"#{@attachment_name}"].blank?
         end
       end
     end

data/lib/paperclip/matchers/validate_attachment_size_matcher.rb

@@ -18,7 +18,6 @@ module Paperclip
       class ValidateAttachmentSizeMatcher
         def initialize attachment_name
           @attachment_name = attachment_name
-          @low, @high = 0, (1.0/0)
         end
 
         def less_than size
@@ -67,27 +66,28 @@ module Paperclip
           override_method(file, :size){ new_size }
           override_method(file, :to_tempfile){ file }
 
+          @subject.send(@attachment_name).post_processing = false
           @subject.send(@attachment_name).assign(file)
           @subject.valid?
           @subject.errors[:"#{@attachment_name}_file_size"].blank?
+        ensure
+          @subject.send(@attachment_name).post_processing = true
         end
 
         def lower_than_low?
-          not passes_validation_with_size(@low - 1)
+          @low.nil? || !passes_validation_with_size(@low - 1)
         end
 
         def higher_than_low?
-          passes_validation_with_size(@low + 1)
+          @low.nil? || passes_validation_with_size(@low + 1)
         end
 
         def lower_than_high?
-          return true if @high == (1.0/0)
-          passes_validation_with_size(@high - 1)
+          @high.nil? || @high == Float::INFINITY || passes_validation_with_size(@high - 1)
         end
 
         def higher_than_high?
-          return true if @high == (1.0/0)
-          not passes_validation_with_size(@high + 1)
+          @high.nil? || @high == Float::INFINITY || !passes_validation_with_size(@high + 1)
         end
       end
     end

data/lib/paperclip/processor.rb

@@ -34,25 +34,40 @@ module Paperclip
     end
   end
 
-  # Due to how ImageMagick handles its image format conversion and how Tempfile
-  # handles its naming scheme, it is necessary to override how Tempfile makes
-  # its names so as to allow for file extensions. Idea taken from the comments
-  # on this blog post:
-  # http://marsorange.com/archives/of-mogrify-ruby-tempfile-dynamic-class-definitions
-  class Tempfile < ::Tempfile
-    # This is Ruby 1.8.7's implementation.
-    if RUBY_VERSION <= "1.8.6" || RUBY_PLATFORM =~ /java/
-      def make_tmpname(basename, n)
-        case basename
-        when Array
-          prefix, suffix = *basename
-        else
-          prefix, suffix = basename, ''
-        end
+  module ProcessorHelpers
+    def processor(name) #:nodoc:
+      @known_processors ||= {}
+      if @known_processors[name.to_s]
+        @known_processors[name.to_s]
+      else
+        name = name.to_s.camelize
+        load_processor(name) unless Paperclip.const_defined?(name)
+        processor = Paperclip.const_get(name)
+        @known_processors[name.to_s] = processor
+      end
+    end
 
-        t = Time.now.strftime("%y%m%d")
-        path = "#{prefix}#{t}-#{$$}-#{rand(0x100000000).to_s(36)}-#{n}#{suffix}"
+    def load_processor(name)
+      if defined?(Rails.root) && Rails.root
+        require File.expand_path(Rails.root.join("lib", "paperclip_processors", "#{name.underscore}.rb"))
       end
     end
+
+    def clear_processors!
+      @known_processors.try(:clear)
+    end
+
+    # You can add your own processor via the Paperclip configuration. Normally
+    # Paperclip will load all processors from the
+    # Rails.root/lib/paperclip_processors directory, but here you can add any
+    # existing class using this mechanism.
+    #
+    #   Paperclip.configure do |c|
+    #     c.register_processor :watermarker, WatermarkingProcessor.new
+    #   end
+    def register_processor(name, processor)
+      @known_processors ||= {}
+      @known_processors[name.to_s] = processor
+    end
   end
 end