paperclip 2.3.1.1 → 2.3.2

data/lib/paperclip/thumbnail.rb

@@ -9,9 +9,10 @@ module Paperclip
     # which is a "WxH"-style string. +format+ will be inferred from the +file+
     # unless specified. Thumbnail creation will raise no errors unless
     # +whiny+ is true (which it is, by default. If +convert_options+ is
-    # set, the options will be appended to the convert command upon image conversion 
+    # set, the options will be appended to the convert command upon image conversion
     def initialize file, options = {}, attachment = nil
       super
+
       geometry             = options[:geometry]
       @file                = file
       @crop                = geometry[-1,1] == '#'
@@ -22,15 +23,19 @@ module Paperclip
       @whiny               = options[:whiny].nil? ? true : options[:whiny]
       @format              = options[:format]
 
+      @source_file_options = @source_file_options.split(/\s+/) if @source_file_options.respond_to?(:split)
+      @convert_options     = @convert_options.split(/\s+/)     if @convert_options.respond_to?(:split)
+
       @current_format      = File.extname(@file.path)
       @basename            = File.basename(@file.path, @current_format)
+
     end
 
     # Returns true if the +target_geometry+ is meant to crop.
     def crop?
       @crop
     end
-    
+
     # Returns true if the image is meant to make use of additional convert options.
     def convert_options?
       !@convert_options.nil? && !@convert_options.empty?
@@ -43,16 +48,17 @@ module Paperclip
       dst = Tempfile.new([@basename, @format].compact.join("."))
       dst.binmode
 
-      command = <<-end_command
-        #{ source_file_options }
-        "#{ File.expand_path(src.path) }[0]"
-        #{ transformation_command }
-        "#{ File.expand_path(dst.path) }"
-      end_command
-
       begin
-        success = Paperclip.run("convert", command.gsub(/\s+/, " "))
-      rescue PaperclipCommandLineError
+        options = [
+          source_file_options,
+          "#{ File.expand_path(src.path) }[0]",
+          transformation_command,
+          convert_options,
+          "#{ File.expand_path(dst.path) }"
+        ].flatten.compact
+
+        success = Paperclip.run("convert", *options)
+      rescue PaperclipCommandLineError => e
         raise PaperclipError, "There was an error processing the thumbnail for #{@basename}" if @whiny
       end
 
@@ -63,10 +69,9 @@ module Paperclip
     # into the thumbnail.
     def transformation_command
       scale, crop = @current_geometry.transformation_to(@target_geometry, crop?)
-      trans = ""
-      trans << " -resize \"#{scale}\"" unless scale.nil? || scale.empty?
-      trans << " -crop \"#{crop}\" +repage" if crop
-      trans << " #{convert_options}" if convert_options?
+      trans = []
+      trans << "-resize" << scale unless scale.nil? || scale.empty?
+      trans << "-crop" << crop << "+repage" if crop
       trans
     end
   end

data/lib/paperclip/upfile.rb

@@ -15,7 +15,11 @@ module Paperclip
       when %r"html?"                 then "text/html"
       when "js"                      then "application/js"
       when "csv", "xml", "css"       then "text/#{type}"
-      else "application/x-#{type}"
+      else
+        # On BSDs, `file` doesn't give a result code of 1 if the file doesn't exist.
+        content_type = (Paperclip.run("file", "--mime-type", self.path).split(':').last.strip rescue "application/x-#{type}")
+        content_type = "application/x-#{type}" if content_type.match(/\(.*?\)/)
+        content_type
       end
     end
 
@@ -46,4 +50,3 @@ end
 class File #:nodoc:
   include Paperclip::Upfile
 end
-

data/lib/paperclip/version.rb

@@ -0,0 +1,3 @@
+module Paperclip
+  VERSION = "2.3.2" unless defined? Paperclip::VERSION
+end

data/rails/init.rb

@@ -0,0 +1,2 @@
+require 'paperclip/railtie'
+Paperclip::Railtie.insert

data/shoulda_macros/paperclip.rb

@@ -46,7 +46,7 @@ module Paperclip
     end
 
     # Tests to ensure that you have file size validations turned on. You
-    # can pass the same options to this that you can to 
+    # can pass the same options to this that you can to
     # validate_attachment_file_size - :less_than, :greater_than, and :in.
     # :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
@@ -104,8 +104,10 @@ module Paperclip
   end
 end
 
-class ActionController::Integration::Session  #:nodoc:
-  include Paperclip::Shoulda
+if defined?(ActionController::Integration::Session)
+  class ActionController::Integration::Session  #:nodoc:
+    include Paperclip::Shoulda
+  end
 end
 
 class Factory

data/test/attachment_test.rb

@@ -11,19 +11,7 @@ class AttachmentTest < Test::Unit::TestCase
     @model = @attachment.instance
     @model.id = 1234
     @model.avatar_file_name = "fake.jpg"
-    assert_equal "#{RAILS_ROOT}/public/fake_models/1234/fake", @attachment.path
-  end
-
-  should "call a proc sent to check_guard" do
-    @dummy = Dummy.new
-    @dummy.expects(:one).returns(:one)
-    assert_equal :one, @dummy.avatar.send(:check_guard, lambda{|x| x.one })
-  end
-
-  should "call a method name sent to check_guard" do
-    @dummy = Dummy.new
-    @dummy.expects(:one).returns(:one)
-    assert_equal :one, @dummy.avatar.send(:check_guard, :one)
+    assert_equal "#{Rails.root}/public/fake_models/1234/fake", @attachment.path
   end
 
   context "Attachment default_options" do
@@ -53,7 +41,7 @@ class AttachmentTest < Test::Unit::TestCase
       setup do
         @dummy = Dummy.new
       end
-      
+
       should "return false when asked exists?" do
         assert !@dummy.avatar.exists?
       end
@@ -67,7 +55,7 @@ class AttachmentTest < Test::Unit::TestCase
 
       Paperclip::Attachment.default_options.keys.each do |key|
         should "be the default_options for #{key}" do
-          assert_equal @old_default_options[key], 
+          assert_equal @old_default_options[key],
                        @attachment.instance_variable_get("@#{key}"),
                        key
         end
@@ -118,12 +106,11 @@ class AttachmentTest < Test::Unit::TestCase
       @dummy.stubs(:id).returns(@id)
       @file = StringIO.new(".")
       @dummy.avatar = @file
+      Rails.stubs(:env).returns(@rails_env)
     end
 
     should "return the proper path" do
-      temporary_rails_env(@rails_env) {
-        assert_equal "#{@rails_env}/#{@id}.png", @dummy.avatar.path
-      }
+      assert_equal "#{@rails_env}/#{@id}.png", @dummy.avatar.path
     end
   end
 
@@ -133,7 +120,7 @@ class AttachmentTest < Test::Unit::TestCase
                                :styles => { :default => ["100x100", :png] },
                                :default_style => :default
       @file = StringIO.new("...")
-      @file.expects(:original_filename).returns("file.jpg")
+      @file.stubs(:original_filename).returns("file.jpg")
     end
     should "return the right extension for the path" do
       @attachment.assign(@file)
@@ -162,11 +149,6 @@ class AttachmentTest < Test::Unit::TestCase
     should "report the correct options when sent #extra_options_for(:large)" do
       assert_equal "-do_stuff", @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 :convert_options that is a proc" do
@@ -194,17 +176,12 @@ class AttachmentTest < Test::Unit::TestCase
     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 :path that is a proc" do
     setup do
       rebuild_model :path => lambda{ |attachment| "path/#{attachment.instance.other}.:extension" }
-      
+
       @file = File.new(File.join(File.dirname(__FILE__),
                                  "fixtures",
                                  "5k.png"), 'rb')
@@ -213,31 +190,31 @@ class AttachmentTest < Test::Unit::TestCase
       @dummyB = Dummy.new(:other => 'b')
       @dummyB.avatar = @file
     end
-    
+
     teardown { @file.close }
-    
+
     should "return correct path" do
       assert_equal "path/a.png", @dummyA.avatar.path
       assert_equal "path/b.png", @dummyB.avatar.path
     end
   end
-  
+
   context "An attachment with :styles that is a proc" do
     setup do
       rebuild_model :styles => lambda{ |attachment| {:thumb => "50x50#", :large => "400x400"} }
-      
+
       @attachment = Dummy.new.avatar
     end
-    
+
     should "have the correct geometry" do
       assert_equal "50x50#", @attachment.styles[:thumb][:geometry]
     end
   end
-  
+
   context "An attachment with :url that is a proc" do
     setup do
       rebuild_model :url => lambda{ |attachment| "path/#{attachment.instance.other}.:extension" }
-      
+
       @file = File.new(File.join(File.dirname(__FILE__),
                                  "fixtures",
                                  "5k.png"), 'rb')
@@ -246,16 +223,16 @@ class AttachmentTest < Test::Unit::TestCase
       @dummyB = Dummy.new(:other => 'b')
       @dummyB.avatar = @file
     end
-    
+
     teardown { @file.close }
-    
+
     should "return correct url" do
       assert_equal "path/a.png", @dummyA.avatar.url(:original, false)
       assert_equal "path/b.png", @dummyB.avatar.url(:original, false)
     end
   end
 
-  geometry_specs = [ 
+  geometry_specs = [
     [ lambda{|z| "50x50#" }, :png ],
     lambda{|z| "50x50#" },
     { :geometry => lambda{|z| "50x50#" } }
@@ -267,10 +244,6 @@ class AttachmentTest < Test::Unit::TestCase
         @attachment = Dummy.new.avatar
       end
 
-      should "not run the procs immediately" do
-        assert_kind_of Proc, @attachment.styles[:normal][:geometry]
-      end
-
       context "when assigned" do
         setup do
           @file = StringIO.new(".")
@@ -307,10 +280,6 @@ class AttachmentTest < Test::Unit::TestCase
       @attachment = Dummy.new.avatar
     end
 
-    should "not run the proc immediately" do
-      assert_kind_of Proc, @attachment.styles[:normal][:processors]
-    end
-
     context "when assigned" do
       setup do
         @attachment.assign(StringIO.new("."))
@@ -354,19 +323,22 @@ class AttachmentTest < Test::Unit::TestCase
       setup { @dummy.avatar = @file }
 
       before_should "call #make on all specified processors" do
+        Paperclip::Thumbnail.expects(:make).with(any_parameters).returns(@file)
+        Paperclip::Test.expects(:make).with(any_parameters).returns(@file)
+      end
+
+      before_should "call #make with the right parameters passed as second argument" do
         expected_params = @style_params[:once].merge({:processors => [:thumbnail, :test], :whiny => true, :convert_options => ""})
-        Paperclip::Thumbnail.expects(:make).with(@file, expected_params, @dummy.avatar).returns(@file)
-        Paperclip::Test.expects(:make).with(@file, expected_params, @dummy.avatar).returns(@file)
+        Paperclip::Thumbnail.expects(:make).with(anything, expected_params, anything).returns(@file)
       end
-      
+
       before_should "call #make with attachment passed as third argument" do
-        expected_params = @style_params[:once].merge({:processors => [:thumbnail, :test], :whiny => true, :convert_options => ""})
-        Paperclip::Test.expects(:make).with(@file, expected_params, @dummy.avatar).returns(@file)
+        Paperclip::Test.expects(:make).with(anything, anything, @dummy.avatar).returns(@file)
       end
     end
   end
 
-  context "An attachment with no processors defined" do
+  context "An attachment with styles but no processors defined" do
     setup do
       rebuild_model :processors => [], :styles => {:something => 1}
       @dummy = Dummy.new
@@ -377,9 +349,20 @@ class AttachmentTest < Test::Unit::TestCase
     end
   end
 
+  context "An attachment without styles and with no processors defined" do
+    setup do
+      rebuild_model :processors => [], :styles => {}
+      @dummy = Dummy.new
+      @file = StringIO.new("...")
+    end
+    should "not raise when assigned to" do
+      @dummy.avatar = @file
+    end
+  end
+
   context "Assigning an attachment with post_process hooks" do
     setup do
-      rebuild_model :styles => { :something => "100x100#" }
+      rebuild_class :styles => { :something => "100x100#" }
       Dummy.class_eval do
         before_avatar_post_process :do_before_avatar
         after_avatar_post_process :do_after_avatar
@@ -419,16 +402,16 @@ class AttachmentTest < Test::Unit::TestCase
       @dummy.expects(:do_before_avatar).never
       @dummy.expects(:do_after_avatar).never
       @dummy.expects(:do_before_all).with().returns(false)
-      @dummy.expects(:do_after_all).never
+      @dummy.expects(:do_after_all)
       Paperclip::Thumbnail.expects(:make).never
       @dummy.avatar = @file
     end
 
     should "cancel the processing if a before_avatar_post_process returns false" do
       @dummy.expects(:do_before_avatar).with().returns(false)
-      @dummy.expects(:do_after_avatar).never
+      @dummy.expects(:do_after_avatar)
       @dummy.expects(:do_before_all).with().returns(true)
-      @dummy.expects(:do_after_all).never
+      @dummy.expects(:do_after_all)
       Paperclip::Thumbnail.expects(:make).never
       @dummy.avatar = @file
     end
@@ -438,15 +421,11 @@ class AttachmentTest < Test::Unit::TestCase
     setup do
       rebuild_model :styles => { :something => "100x100#" }
       @file  = StringIO.new(".")
-      @file.expects(:original_filename).returns("5k.png\n\n")
-      @file.expects(:content_type).returns("image/png\n\n")
+      @file.stubs(:original_filename).returns("5k.png\n\n")
+      @file.stubs(:content_type).returns("image/png\n\n")
       @file.stubs(:to_tempfile).returns(@file)
       @dummy = Dummy.new
       Paperclip::Thumbnail.expects(:make).returns(@file)
-      @dummy.expects(:run_callbacks).with(:before_avatar_post_process, {:original => @file})
-      @dummy.expects(:run_callbacks).with(:before_post_process, {:original => @file})
-      @dummy.expects(:run_callbacks).with(:after_avatar_post_process, {:original => @file, :something => @file})
-      @dummy.expects(:run_callbacks).with(:after_post_process, {:original => @file, :something => @file})
       @attachment = @dummy.avatar
       @dummy.avatar = @file
     end
@@ -463,7 +442,7 @@ class AttachmentTest < Test::Unit::TestCase
   context "Attachment with strange letters" do
     setup do
       rebuild_model
-      
+
       @not_file = mock
       @tempfile = mock
       @not_file.stubs(:nil?).returns(false)
@@ -472,21 +451,18 @@ class AttachmentTest < Test::Unit::TestCase
       @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")
-      
+
       @dummy = Dummy.new
       @attachment = @dummy.avatar
       @attachment.expects(:valid_assignment?).with(@not_file).returns(true)
       @attachment.expects(:queue_existing_for_delete)
       @attachment.expects(:post_process)
-      @attachment.expects(:valid?).returns(true)
-      @attachment.expects(:validate)
       @dummy.avatar = @not_file
     end
-    
-    should "remove strange letters and replace with underscore (_)" do
-      assert_equal "sheep_say_b_.png", @dummy.avatar.original_filename
+
+    should "not remove strange letters" do
+      assert_equal "sheep_say_bæ.png", @dummy.avatar.original_filename
     end
-    
   end
 
   context "An attachment" do
@@ -498,6 +474,7 @@ class AttachmentTest < Test::Unit::TestCase
       FileUtils.rm_rf("tmp")
       rebuild_model
       @instance = Dummy.new
+      @instance.stubs(:id).returns 123
       @attachment = Paperclip::Attachment.new(:avatar, @instance)
       @file = File.new(File.join(File.dirname(__FILE__), "fixtures", "5k.png"), 'rb')
     end
@@ -606,6 +583,7 @@ class AttachmentTest < Test::Unit::TestCase
             should "commit the files to disk" do
               [:large, :medium, :small].each do |style|
                 io = @attachment.to_file(style)
+                # p "in commit to disk test, io is #{io.inspect} and @instance.id is #{@instance.id}"
                 assert File.exists?(io)
                 assert ! io.is_a?(::Tempfile)
                 io.close
@@ -619,7 +597,7 @@ class AttachmentTest < Test::Unit::TestCase
                 cmd = %Q[identify -format "%w %h %b %m" "#{@attachment.path(style.first)}"]
                 out = `#{cmd}`
                 width, height, size, format = out.split(" ")
-                assert_equal style[1].to_s, width.to_s 
+                assert_equal style[1].to_s, width.to_s
                 assert_equal style[2].to_s, height.to_s
                 assert_equal style[3].to_s, format.to_s
               end

data/test/geometry_test.rb

@@ -65,7 +65,7 @@ class GeometryTest < Test::Unit::TestCase
         assert_equal "123x456#{mod}", @geo.to_s
       end
     end
-    
+
     ['>', '<', '#', '@', '%', '^', '!', nil].each do |mod|
       should "ensure the modifier #{mod.inspect} is preserved with no height" do
         assert @geo = Paperclip::Geometry.parse("123x#{mod}")

data/test/helper.rb

@@ -1,24 +1,54 @@
 require 'rubygems'
-require 'test/unit'
-require 'shoulda'
 require 'tempfile'
+require 'test/unit'
 
-gem 'jferris-mocha', '0.9.5.0.1241126838'
+require 'shoulda'
 require 'mocha'
 
-gem 'sqlite3-ruby'
+case ENV['RAILS_VERSION']
+when '2.1' then
+  gem 'activerecord',  '~>2.1.0'
+  gem 'activesupport', '~>2.1.0'
+  gem 'actionpack',    '~>2.1.0'
+when '3.0' then
+  gem 'activerecord',  '~>3.0.0'
+  gem 'activesupport', '~>3.0.0'
+  gem 'actionpack',    '~>3.0.0'
+else
+  gem 'activerecord',  '~>2.3.0'
+  gem 'activesupport', '~>2.3.0'
+  gem 'actionpack',    '~>2.3.0'
+end
 
 require 'active_record'
+require 'active_record/version'
 require 'active_support'
+require 'action_pack'
+
+puts "Testing against version #{ActiveRecord::VERSION::STRING}"
+
 begin
   require 'ruby-debug'
-rescue LoadError
-  puts "ruby-debug not loaded"
+rescue LoadError => e
+  puts "debugger disabled"
 end
 
-ROOT       = File.join(File.dirname(__FILE__), '..')
-RAILS_ROOT = ROOT
-RAILS_ENV  = "test"
+ROOT = File.join(File.dirname(__FILE__), '..')
+
+def silence_warnings
+  old_verbose, $VERBOSE = $VERBOSE, nil
+  yield
+ensure
+  $VERBOSE = old_verbose
+end
+
+class Test::Unit::TestCase
+  def setup
+    silence_warnings do
+      Object.const_set(:Rails, stub('Rails', :root => ROOT, :env => 'test'))
+    end
+  end
+end
 
 $LOAD_PATH << File.join(ROOT, 'lib')
 $LOAD_PATH << File.join(ROOT, 'lib', 'paperclip')
@@ -27,7 +57,7 @@ require File.join(ROOT, 'lib', 'paperclip.rb')
 
 require 'shoulda_macros/paperclip'
 
-FIXTURES_DIR = File.join(File.dirname(__FILE__), "fixtures") 
+FIXTURES_DIR = File.join(File.dirname(__FILE__), "fixtures")
 config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
 ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
 ActiveRecord::Base.establish_connection(config['test'])
@@ -70,17 +100,6 @@ def rebuild_class options = {}
   end
 end
 
-def temporary_rails_env(new_env)
-  old_env = Object.const_defined?("RAILS_ENV") ? RAILS_ENV : nil
-  silence_warnings do
-    Object.const_set("RAILS_ENV", new_env)
-  end
-  yield
-  silence_warnings do
-    Object.const_set("RAILS_ENV", old_env)
-  end
-end
-
 class FakeModel
   attr_accessor :avatar_file_name,
                 :avatar_file_size,
@@ -92,8 +111,9 @@ class FakeModel
     @errors ||= []
   end
 
-  def run_callbacks name, *args
+  def run_paperclip_callbacks name, *args
   end
+
 end
 
 def attachment options
@@ -106,3 +126,23 @@ def silence_warnings
 ensure
   $VERBOSE = old_verbose
 end
+
+def should_accept_dummy_class
+  should "accept the class" do
+    assert_accepts @matcher, @dummy_class
+  end
+
+  should "accept an instance of that class" do
+    assert_accepts @matcher, @dummy_class.new
+  end
+end
+
+def should_reject_dummy_class
+  should "reject the class" do
+    assert_rejects @matcher, @dummy_class
+  end
+
+  should "reject an instance of that class" do
+    assert_rejects @matcher, @dummy_class.new
+  end
+end