paperclip 2.2.0 → 2.2.1

data/lib/paperclip.rb

@@ -43,12 +43,14 @@ end
 # documentation for Paperclip::ClassMethods for more useful information.
 module Paperclip
 
-  VERSION = "2.2.0"
+  VERSION = "2.2.1"
 
   class << self
     # Provides configurability to Paperclip. There are a number of options available, such as:
     # * whiny_thumbnails: Will raise an error if Paperclip cannot process thumbnails of 
     #   an uploaded image. Defaults to true.
+    # * log: Logs progress to the Rails log. Uses ActiveRecord's logger, so honors
+    #   log levels, etc. Defaults to true.
     # * command_path: Defines the path at which to find the command line
     #   programs if they are not visible to Rails the system's search path. Defaults to 
     #   nil, which uses the first executable found in the user's search path.
@@ -57,7 +59,8 @@ module Paperclip
       @options ||= {
         :whiny_thumbnails  => true,
         :image_magick_path => nil,
-        :command_path      => nil
+        :command_path      => nil,
+        :log               => true
       }
     end
 

data/lib/paperclip/attachment.rb

@@ -67,6 +67,7 @@ module Paperclip
 
       if uploaded_file.is_a?(Paperclip::Attachment)
         uploaded_file = uploaded_file.to_file(:original)
+        close_uploaded_file = uploaded_file.respond_to?(:close)
       end
 
       return nil unless valid_assignment?(uploaded_file)
@@ -91,8 +92,9 @@ module Paperclip
       post_process if valid?
  
       # Reset the file size if the original file was reprocessed.
-      instance_write(:file_size, uploaded_file.size.to_i)
+      instance_write(:file_size, @queued_for_write[:original].size.to_i)
     ensure
+      uploaded_file.close if close_uploaded_file
       validate
     end
 
@@ -212,6 +214,7 @@ module Paperclip
     # the post-process again.
     def reprocess!
       new_original = Tempfile.new("paperclip-reprocess")
+      new_original.binmode
       if old_original = to_file(:original)
         new_original.write( old_original.read )
         new_original.rewind
@@ -256,7 +259,11 @@ module Paperclip
     end
 
     def log message
-      logger.info("[paperclip] #{message}")
+      logger.info("[paperclip] #{message}") if logging?
+    end
+
+    def logging?
+      Paperclip.options[:log]
     end
 
     def valid_assignment? file #:nodoc:
@@ -304,7 +311,12 @@ module Paperclip
     end
 
     def extra_options_for(style) #:nodoc:
-      [ convert_options[style], convert_options[:all] ].compact.join(" ")
+      all_options   = convert_options[:all]
+      all_options   = all_options.call(instance)   if all_options.respond_to?(:call)
+      style_options = convert_options[style]
+      style_options = style_options.call(instance) if style_options.respond_to?(:call)
+
+      [ style_options, all_options ].compact.join(" ")
     end
 
     def post_process #:nodoc:

data/lib/paperclip/storage.rb

@@ -38,11 +38,11 @@ module Paperclip
       def flush_writes #:nodoc:
         logger.info("[paperclip] Writing files for #{name}")
         @queued_for_write.each do |style, file|
+          file.close
           FileUtils.mkdir_p(File.dirname(path(style)))
           logger.info("[paperclip] -> #{path(style)}")
           FileUtils.mv(file.path, path(style))
           FileUtils.chmod(0644, path(style))
-          file.close
         end
         @queued_for_write = {}
       end

data/test/attachment_test.rb

@@ -138,6 +138,38 @@ class AttachmentTest < Test::Unit::TestCase
     end
   end
 
+  context "An attachment with :convert_options that is a proc" do
+    setup do
+      rebuild_model :styles => {
+                      :thumb => "100x100",
+                      :large => "400x400"
+                    },
+                    :convert_options => {
+                      :all => lambda{|i| i.all },
+                      :thumb => lambda{|i| i.thumb }
+                    }
+      Dummy.class_eval do
+        def all;   "-all";   end
+        def thumb; "-thumb"; end
+      end
+      @dummy = Dummy.new
+      @dummy.avatar
+    end
+
+    should "report the correct options when sent #extra_options_for(:thumb)" do
+      assert_equal "-thumb -all", @dummy.avatar.send(:extra_options_for, :thumb), @dummy.avatar.convert_options.inspect
+    end
+
+    should "report the correct options when sent #extra_options_for(:large)" do
+      assert_equal "-all", @dummy.avatar.send(:extra_options_for, :large)
+    end
+
+    before_should "call extra_options_for(:thumb/:large)" do
+      Paperclip::Attachment.any_instance.expects(:extra_options_for).with(:thumb)
+      Paperclip::Attachment.any_instance.expects(:extra_options_for).with(:large)
+    end
+  end
+
   context "An attachment with both 'normal' and hash-style styles" do
     setup do
       rebuild_model :styles => {
@@ -266,11 +298,13 @@ class AttachmentTest < Test::Unit::TestCase
       rebuild_model
       
       @not_file = mock
+      @tempfile = mock
       @not_file.stubs(:nil?).returns(false)
-      @not_file.expects(:to_tempfile).returns(self)
+      @not_file.expects(:size).returns(10)
+      @tempfile.expects(:size).returns(10)
+      @not_file.expects(:to_tempfile).returns(@tempfile)
       @not_file.expects(:original_filename).returns("sheep_say_bæ.png\r\n")
       @not_file.expects(:content_type).returns("image/png\r\n")
-      @not_file.expects(:size).returns(10).times(2)
       
       @dummy = Dummy.new
       @attachment = @dummy.avatar

data/test/integration_test.rb

@@ -51,6 +51,23 @@ class IntegrationTest < Test::Unit::TestCase
     end
   end
 
+  context "A model that modifies its original" do
+    setup do
+      rebuild_model :styles => { :original => "2x2#" }
+      @dummy = Dummy.new
+      @file = File.new(File.join(File.dirname(__FILE__),
+                                 "fixtures",
+                                 "5k.png"), 'rb')
+      @dummy.avatar = @file
+    end
+
+    should "report the file size of the processed file and not the original" do
+      assert_not_equal @file.size, @dummy.avatar.size
+    end
+
+    teardown { @file.close }
+  end
+
   context "A model with attachments scoped under an id" do
     setup do
       rebuild_model :styles => { :large => "100x100",

data/test/iostream_test.rb

@@ -20,7 +20,8 @@ class IOStreamTest < Test::Unit::TestCase
 
       context "and given a String" do
         setup do
-          assert @result = @file.stream_to("/tmp/iostream.string.test")
+          FileUtils.mkdir_p(File.join(ROOT, 'tmp'))
+          assert @result = @file.stream_to(File.join(ROOT, 'tmp', 'iostream.string.test'))
         end
 
         should "return a File" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: paperclip
 version: !ruby/object:Gem::Version 
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors: 
 - Jon Yurek
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-29 00:00:00 -05:00
+date: 2008-12-30 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency