paperclip 3.0.4 → 3.1.0

data/lib/paperclip/attachment.rb

@@ -440,6 +440,10 @@ module Paperclip
 
     # called by storage after the writes are flushed and before @queued_for_writes is cleared
     def after_flush_writes
+       @queued_for_write.each do |style, file|
+         file.close unless file.closed?
+         file.unlink if file.respond_to?(:unlink) && file.path.present? && File.exist?(file.path)
+       end
     end
 
     def cleanup_filename(filename)

data/lib/paperclip/geometry.rb

@@ -101,6 +101,33 @@ module Paperclip
       [ scale_geometry, crop_geometry ]
     end
 
+    # resize to a new geometry
+    # @param geometry [String] the Paperclip geometry definition to resize to
+    # @example
+    #   Paperclip::Geometry.new(150, 150).resize_to('50x50!')
+    #   #=> Paperclip::Geometry(50, 50)
+    def resize_to(geometry)
+      new_geometry = Paperclip::Geometry.parse geometry
+      case new_geometry.modifier
+      when '!', '#'
+        new_geometry
+      when '>'
+        if new_geometry.width >= self.width && new_geometry.height >= self.height
+          self
+        else
+          scale_to new_geometry
+        end
+      when '<'
+        if new_geometry.width <= self.width || new_geometry.height <= self.height
+          self
+        else
+          scale_to new_geometry
+        end
+      else
+        scale_to new_geometry
+      end
+    end
+
     private
 
     def scaling dst, ratio
@@ -118,5 +145,11 @@ module Paperclip
         "%dx%d+%d+%d" % [ dst.width, dst.height, (self.width * scale - dst.width) / 2, 0 ]
       end
     end
+
+    # scale to the requested geometry and preserve the aspect ratio
+    def scale_to(new_geometry)
+      scale = [new_geometry.width.to_f / self.width.to_f , new_geometry.height.to_f / self.height.to_f].min
+      Paperclip::Geometry.new (self.width * scale).round, (self.height * scale).round
+    end
   end
 end

data/lib/paperclip/glue.rb

@@ -4,10 +4,11 @@ require 'paperclip/schema'
 
 module Paperclip
   module Glue
-    def self.included base #:nodoc:
+    def self.included(base)
       base.extend ClassMethods
       base.send :include, Callbacks
       base.send :include, Validators
+      base.send :include, Schema
       base.class_attribute :attachment_definitions
 
       if defined?(ActiveRecord)

data/lib/paperclip/io_adapters/abstract_adapter.rb

@@ -0,0 +1,45 @@
+require 'active_support/core_ext/module/delegation'
+
+module Paperclip
+  class AbstractAdapter
+    attr_reader :content_type, :original_filename, :size
+    delegate :close, :closed?, :eof?, :path, :rewind, :unlink, :to => :@tempfile
+
+    def fingerprint
+      @fingerprint ||= Digest::MD5.file(path).to_s
+    end
+
+    def read(length = nil, buffer = nil)
+      @tempfile.read(length, buffer)
+    end
+
+    private
+
+    def destination
+      @destination ||= TempfileFactory.new.generate(original_filename)
+    end
+
+    def copy_to_tempfile(src)
+      FileUtils.cp(src.path, destination.path)
+      destination
+    end
+
+    def best_content_type_option(types)
+      best = types.reject {|type| type.content_type.match(/\/x-/) }
+      if best.size == 0
+        types.first.content_type
+      else
+        best.first.content_type
+      end
+    end
+
+    def type_from_file_command
+      # On BSDs, `file` doesn't give a result code of 1 if the file doesn't exist.
+      type = (File.extname(self.path.to_s)).downcase
+      type = "octet-stream" if type.empty?
+      mime_type = Paperclip.run("file", "-b --mime :file", :file => self.path).split(/[:;\s]+/)[0]
+      mime_type = "application/x-#{type}" if mime_type.match(/\(.*?\)/)
+      mime_type
+    end
+  end
+end

data/lib/paperclip/io_adapters/attachment_adapter.rb

@@ -1,71 +1,36 @@
 module Paperclip
-  class AttachmentAdapter
+  class AttachmentAdapter < AbstractAdapter
     def initialize(target)
-      @target = target
-      cache_current_values
-    end
-
-    def original_filename
-      @original_filename
-    end
-
-    def content_type
-      @content_type
-    end
-
-    def size
-      @size
-    end
-
-    def nil?
-      false
-    end
-
-    def fingerprint
-      @fingerprint ||= Digest::MD5.file(path).to_s
-    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
+      @target, @style = case target
+      when Paperclip::Attachment
+        [target, :original]
+      when Paperclip::Style
+        [target.attachment, target.name]
+      end
 
-    def path
-      @tempfile.path
+      cache_current_values
     end
 
     private
 
     def cache_current_values
-      @tempfile = copy_to_tempfile(@target)
       @original_filename = @target.original_filename
       @content_type = @target.content_type
+      @tempfile = copy_to_tempfile(@target)
       @size = @tempfile.size || @target.size
     end
 
     def copy_to_tempfile(src)
-      extension = File.extname(src.original_filename)
-      basename = File.basename(src.original_filename, extension)
-      dest = Tempfile.new([basename, extension])
-      dest.binmode
       if src.respond_to? :copy_to_local_file
-        src.copy_to_local_file(:original, dest.path)
+        src.copy_to_local_file(@style, destination.path)
       else
-        FileUtils.cp(src.path(:original), dest.path)
+        FileUtils.cp(src.path(@style), destination.path)
       end
-      dest
+      destination
     end
   end
 end
 
 Paperclip.io_adapters.register Paperclip::AttachmentAdapter do |target|
-  Paperclip::Attachment === target
+  Paperclip::Attachment === target || Paperclip::Style === target
 end

data/lib/paperclip/io_adapters/file_adapter.rb

@@ -1,19 +1,21 @@
 module Paperclip
-  class FileAdapter
+  class FileAdapter < AbstractAdapter
     def initialize(target)
       @target = target
-      @tempfile = copy_to_tempfile(@target)
+      cache_current_values
     end
 
-    def original_filename
-      if @target.respond_to?(:original_filename)
-        @target.original_filename
-      else
-        File.basename(@target.path)
-      end
+    private
+
+    def cache_current_values
+      @original_filename = @target.original_filename if @target.respond_to?(:original_filename)
+      @original_filename ||= File.basename(@target.path)
+      @tempfile = copy_to_tempfile(@target)
+      @content_type = calculate_content_type
+      @size = File.size(@target)
     end
 
-    def content_type
+    def calculate_content_type
       types = MIME::Types.type_for(original_filename)
       if types.length == 0
         type_from_file_command
@@ -23,58 +25,6 @@ module Paperclip
         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)
-      extension = File.extname(original_filename)
-      basename = File.basename(original_filename, extension)
-      dest = Tempfile.new([basename, extension])
-      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.content_type
-    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
 

data/lib/paperclip/io_adapters/identity_adapter.rb

@@ -1,5 +1,5 @@
 module Paperclip
-  class IdentityAdapter
+  class IdentityAdapter < AbstractAdapter
     def new(adapter)
       adapter
     end

data/lib/paperclip/io_adapters/nil_adapter.rb

@@ -1,5 +1,5 @@
 module Paperclip
-  class NilAdapter
+  class NilAdapter < AbstractAdapter
     def initialize(target)
     end
 

data/lib/paperclip/io_adapters/stringio_adapter.rb

@@ -1,61 +1,30 @@
 module Paperclip
-  class StringioAdapter
+  class StringioAdapter < AbstractAdapter
     def initialize(target)
       @target = target
+      cache_current_values
       @tempfile = copy_to_tempfile(@target)
     end
 
-    attr_writer :original_filename, :content_type
+    private
 
-    def original_filename
-      @original_filename ||= @target.original_filename if @target.respond_to?(:original_filename)
+    def cache_current_values
+      @original_filename = @target.original_filename if @target.respond_to?(:original_filename)
       @original_filename ||= "stringio.txt"
-      @original_filename.strip
-    end
+      @original_filename = @original_filename.strip
 
-    def content_type
-      @content_type ||= @target.content_type if @target.respond_to?(:content_type)
+      @content_type = @target.content_type if @target.respond_to?(:content_type)
       @content_type ||= "text/plain"
-      @content_type
-    end
-
-    def size
-      @target.size
-    end
-
-    def fingerprint
-      Digest::MD5.hexdigest(read)
-    end
 
-    def read(length = nil, buffer = nil)
-      @tempfile.read(length, buffer)
+      @size = @target.size
     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)
-      extension = File.extname(original_filename)
-      basename = File.basename(original_filename, extension)
-      dest = Tempfile.new([basename, extension])
-      dest.binmode
       while data = src.read(16*1024)
-        dest.write(data)
+        destination.write(data)
       end
-      dest.rewind
-      dest
+      destination.rewind
+      destination
     end
 
   end

data/lib/paperclip/io_adapters/uploaded_file_adapter.rb

@@ -1,7 +1,8 @@
 module Paperclip
-  class UploadedFileAdapter
+  class UploadedFileAdapter < AbstractAdapter
     def initialize(target)
       @target = target
+      cache_current_values
 
       if @target.respond_to?(:tempfile)
         @tempfile = copy_to_tempfile(@target.tempfile)
@@ -10,52 +11,12 @@ module Paperclip
       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)
-      extension = File.extname(original_filename)
-      basename = File.basename(original_filename, extension)
-      dest = Tempfile.new([basename, extension])
-      dest.binmode
-      FileUtils.cp(src.path, dest.path)
-      dest
+    def cache_current_values
+      @original_filename = @target.original_filename
+      @content_type = @target.content_type
+      @size = File.size(@target.path)
     end
   end
 end