dm-paperclip 2.4.1 → 2.5.0

data/test/command_line_test.rb

@@ -0,0 +1,138 @@
+require './test/helper'
+
+class CommandLineTest < Test::Unit::TestCase
+  def setup
+    Paperclip::CommandLine.path = nil
+    File.stubs(:exist?).with("/dev/null").returns(true)
+  end
+
+  should "allow colons in parameters" do
+    cmd = Paperclip::CommandLine.new("convert", "'a.jpg' -resize 175x220> -size 175x220 xc:black +swap -gravity center -composite 'b.jpg'", :swallow_stderr => false)
+    assert_equal "convert 'a.jpg' -resize 175x220> -size 175x220 xc:black +swap -gravity center -composite 'b.jpg'", cmd.command 
+  end
+
+  should "take a command and parameters and produce a shell command for bash" do
+    cmd = Paperclip::CommandLine.new("convert", "a.jpg b.png", :swallow_stderr => false)
+    assert_equal "convert a.jpg b.png", cmd.command
+  end
+
+  should "be able to set a path and produce commands with that path" do
+    Paperclip::CommandLine.path = "/opt/bin"
+    cmd = Paperclip::CommandLine.new("convert", "a.jpg b.png", :swallow_stderr => false)
+    assert_equal "/opt/bin/convert a.jpg b.png", cmd.command
+  end
+
+  should "be able to interpolate quoted variables into the parameters" do
+    cmd = Paperclip::CommandLine.new("convert",
+                                     ":one :{two}",
+                                     :one => "a.jpg",
+                                     :two => "b.png",
+                                     :swallow_stderr => false)
+    assert_equal "convert 'a.jpg' 'b.png'", cmd.command
+  end
+
+  should "quote command line options differently if we're on windows" do
+    File.stubs(:exist?).with("/dev/null").returns(false)
+    cmd = Paperclip::CommandLine.new("convert",
+                                     ":one :{two}",
+                                     :one => "a.jpg",
+                                     :two => "b.png",
+                                     :swallow_stderr => false)
+    assert_equal 'convert "a.jpg" "b.png"', cmd.command
+  end
+
+  should "be able to quote and interpolate dangerous variables" do
+    cmd = Paperclip::CommandLine.new("convert",
+                                     ":one :two",
+                                     :one => "`rm -rf`.jpg",
+                                     :two => "ha'ha.png",
+                                     :swallow_stderr => false)
+    assert_equal "convert '`rm -rf`.jpg' 'ha'\\''ha.png'", cmd.command
+  end
+
+  should "be able to quote and interpolate dangerous variables even on windows" do
+    File.stubs(:exist?).with("/dev/null").returns(false)
+    cmd = Paperclip::CommandLine.new("convert",
+                                     ":one :two",
+                                     :one => "`rm -rf`.jpg",
+                                     :two => "ha'ha.png",
+                                     :swallow_stderr => false)
+    assert_equal %{convert "`rm -rf`.jpg" "ha'ha.png"}, cmd.command
+  end
+
+  should "add redirection to get rid of stderr in bash" do
+    File.stubs(:exist?).with("/dev/null").returns(true)
+    cmd = Paperclip::CommandLine.new("convert",
+                                     "a.jpg b.png",
+                                     :swallow_stderr => true)
+
+    assert_equal "convert a.jpg b.png 2>/dev/null", cmd.command
+  end
+
+  should "add redirection to get rid of stderr in cmd.exe" do
+    File.stubs(:exist?).with("/dev/null").returns(false)
+    cmd = Paperclip::CommandLine.new("convert",
+                                     "a.jpg b.png",
+                                     :swallow_stderr => true)
+
+    assert_equal "convert a.jpg b.png 2>NUL", cmd.command
+  end
+
+  should "raise if trying to interpolate :swallow_stderr or :expected_outcodes" do
+    cmd = Paperclip::CommandLine.new("convert",
+                                     ":swallow_stderr :expected_outcodes",
+                                     :swallow_stderr => false,
+                                     :expected_outcodes => [0, 1])
+    assert_raise(Paperclip::PaperclipCommandLineError) do
+      cmd.command
+    end
+  end
+
+  should "run the #command it's given and return the output" do
+    cmd = Paperclip::CommandLine.new("convert", "a.jpg b.png", :swallow_stderr => false)
+    cmd.class.stubs(:"`").with("convert a.jpg b.png").returns(:correct_value)
+    with_exitstatus_returning(0) do
+      assert_equal :correct_value, cmd.run
+    end
+  end
+
+  should "raise a PaperclipCommandLineError if the result code isn't expected" do
+    cmd = Paperclip::CommandLine.new("convert", "a.jpg b.png", :swallow_stderr => false)
+    cmd.class.stubs(:"`").with("convert a.jpg b.png").returns(:correct_value)
+    with_exitstatus_returning(1) do
+      assert_raises(Paperclip::PaperclipCommandLineError) do
+        cmd.run
+      end
+    end
+  end
+
+  should "not raise a PaperclipCommandLineError if the result code is expected" do
+    cmd = Paperclip::CommandLine.new("convert",
+                                     "a.jpg b.png",
+                                     :expected_outcodes => [0, 1],
+                                     :swallow_stderr => false)
+    cmd.class.stubs(:"`").with("convert a.jpg b.png").returns(:correct_value)
+    with_exitstatus_returning(1) do
+      assert_nothing_raised do
+        cmd.run
+      end
+    end
+  end
+
+  should "log the command" do
+    cmd = Paperclip::CommandLine.new("convert", "a.jpg b.png", :swallow_stderr => false)
+    cmd.class.stubs(:'`')
+    Paperclip.expects(:log).with("convert a.jpg b.png")
+    cmd.run
+  end
+
+  should "detect that the system is unix or windows based on presence of /dev/null" do
+    File.stubs(:exist?).returns(true)
+    assert Paperclip::CommandLine.unix?
+  end
+
+  should "detect that the system is not unix or windows based on absence of /dev/null" do
+    File.stubs(:exist?).returns(false)
+    assert ! Paperclip::CommandLine.unix?
+  end
+end

data/test/fixtures/s3.yml

@@ -0,0 +1,8 @@
+development:
+  key: 54321
+production:
+  key: 12345
+test:
+  bucket: <%= ENV['S3_BUCKET'] %>
+  access_key_id: <%= ENV['S3_KEY'] %>
+  secret_access_key: <%= ENV['S3_SECRET'] %>

data/test/geometry_test.rb

@@ -1,8 +1,4 @@
-require 'rubygems'
-require 'test/unit'
-require 'shoulda'
-
-require File.join(File.dirname(__FILE__), '..', 'lib', 'dm-paperclip', 'geometry.rb')
+require './test/helper'
 
 class GeometryTest < Test::Unit::TestCase
   context "Paperclip::Geometry" do
@@ -12,15 +8,15 @@ class GeometryTest < Test::Unit::TestCase
       assert_equal 768, @geo.height
     end
 
-    should "correctly create a square if the height dimension is missing" do
+    should "set height to 0 if height dimension is missing" do
       assert @geo = Paperclip::Geometry.new(1024)
       assert_equal 1024, @geo.width
-      assert_equal 1024, @geo.height
+      assert_equal 0, @geo.height
     end
 
-    should "correctly create a square if the width dimension is missing" do
+    should "set width to 0 if width dimension is missing" do
       assert @geo = Paperclip::Geometry.new(nil, 768)
-      assert_equal 768, @geo.width
+      assert_equal 0, @geo.width
       assert_equal 768, @geo.height
     end
 
@@ -32,19 +28,20 @@ class GeometryTest < Test::Unit::TestCase
 
     should "be generated from a xH-formatted string" do
       assert @geo = Paperclip::Geometry.parse("x600")
-      assert_equal 600, @geo.width
+      assert_equal 0, @geo.width
       assert_equal 600, @geo.height
     end
-      
+
     should "be generated from a Wx-formatted string" do
       assert @geo = Paperclip::Geometry.parse("800x")
       assert_equal 800, @geo.width
-      assert_equal 800, @geo.height
+      assert_equal 0, @geo.height
     end
 
-    should "ensure the modifier is nil if only one dimension present" do
-      assert @geo = Paperclip::Geometry.parse("123x")
-      assert_nil @geo.modifier
+    should "be generated from a W-formatted string" do
+      assert @geo = Paperclip::Geometry.parse("800")
+      assert_equal 800, @geo.width
+      assert_equal 0, @geo.height
     end
 
     should "ensure the modifier is nil if not present" do
@@ -52,22 +49,60 @@ class GeometryTest < Test::Unit::TestCase
       assert_nil @geo.modifier
     end
 
-    ['>', '<', '#', '@', '%', '^', '!'].each do |mod|
-      should "ensure the modifier #{mod} is preserved" do
+    should "treat x and X the same in geometries" do
+      @lower = Paperclip::Geometry.parse("123x456")
+      @upper = Paperclip::Geometry.parse("123X456")
+      assert_equal 123, @lower.width
+      assert_equal 123, @upper.width
+      assert_equal 456, @lower.height
+      assert_equal 456, @upper.height
+    end
+
+    ['>', '<', '#', '@', '%', '^', '!', nil].each do |mod|
+      should "ensure the modifier #{mod.inspect} is preserved" do
         assert @geo = Paperclip::Geometry.parse("123x456#{mod}")
         assert_equal mod, @geo.modifier
+        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}")
+        assert_equal mod, @geo.modifier
+        assert_equal "123#{mod}", @geo.to_s
       end
     end
 
     should "make sure the modifier gets passed during transformation_to" do
       assert @src = Paperclip::Geometry.parse("123x456")
       assert @dst = Paperclip::Geometry.parse("123x456>")
-      assert_equal "123x456>", @src.transformation_to(@dst).join
+      assert_equal ["123x456>", nil], @src.transformation_to(@dst)
+    end
+
+    should "generate correct ImageMagick formatting string for W-formatted string" do
+      assert @geo = Paperclip::Geometry.parse("800")
+      assert_equal "800", @geo.to_s
+    end
+
+    should "generate correct ImageMagick formatting string for Wx-formatted string" do
+      assert @geo = Paperclip::Geometry.parse("800x")
+      assert_equal "800", @geo.to_s
+    end
+
+    should "generate correct ImageMagick formatting string for xH-formatted string" do
+      assert @geo = Paperclip::Geometry.parse("x600")
+      assert_equal "x600", @geo.to_s
+    end
+
+    should "generate correct ImageMagick formatting string for WxH-formatted string" do
+      assert @geo = Paperclip::Geometry.parse("800x600")
+      assert_equal "800x600", @geo.to_s
     end
 
     should "be generated from a file" do
       file = File.join(File.dirname(__FILE__), "fixtures", "5k.png")
-      file = File.new(file)
+      file = File.new(file, 'rb')
       assert_nothing_raised{ @geo = Paperclip::Geometry.from_file(file) }
       assert @geo.height > 0
       assert @geo.width > 0

data/test/helper.rb

@@ -1,31 +1,39 @@
-require 'rubygems'
+require "rubygems"
+
+begin
+  require 'simplecov'
+  SimpleCov.start do
+    add_filter "/test/"
+  end
+rescue LoadError
+end
+
+require 'tempfile'
+require 'fileutils'
 require 'test/unit'
+
 require 'shoulda'
 require 'mocha'
-require 'tempfile'
 
-require 'extlib'
 require 'dm-core'
 require 'dm-validations'
 require 'dm-migrations'
+
+`ruby -e 'exit 0'` # Prime $? with a value.
+
 begin
   require 'ruby-debug'
-rescue LoadError
-  puts "ruby-debug not loaded"
+rescue LoadError => e
 end
 
-ROOT       = File.join(File.dirname(__FILE__), '..')
-RAILS_ROOT = ROOT
-RAILS_ENV  = ENV['RAILS_ENV']
+ROOT = File.join(File.dirname(__FILE__), '..')
 
-Object.const_set("Merb", Class.new())
-Merb.class_eval do
-  def self.root
-    "#{ROOT}"
-  end
-  def self.env(str=nil)
-    ENV['RAILS_ENV'] = str if str
-    ENV['RAILS_ENV']
+class Test::Unit::TestCase
+  def setup
+    silence_warnings do
+      Object.const_set(:Rails, stub('Rails', :root => ROOT, :env => 'test'))
+      Object.const_set(:Merb, stub('Merb', :root => ROOT, :env => 'test'))
+    end
   end
 end
 
@@ -36,7 +44,7 @@ require File.join(ROOT, 'lib', 'dm-paperclip.rb')
 
 ENV['RAILS_ENV'] ||= 'test'
 
-FIXTURES_DIR = File.join(File.dirname(__FILE__), "fixtures") 
+FIXTURES_DIR = File.join(File.dirname(__FILE__), "fixtures")
 DataMapper.setup(:default, 'sqlite3::memory:')
 
 unless defined?(Mash)
@@ -45,28 +53,83 @@ unless defined?(Mash)
 end
 
 Paperclip.configure do |config|
-  config.root               = Merb.root # the application root to anchor relative urls (defaults to Dir.pwd)
-  config.env                = Merb.env  # server env support, defaults to ENV['RACK_ENV'] or 'development'
-  config.use_dm_validations = true      # validate attachment sizes and such, defaults to false
+  config.root               = ROOT   # the application root to anchor relative urls (defaults to Dir.pwd)
+  config.env                = 'test' # server env support, defaults to ENV['RACK_ENV'] or 'development'
+  config.use_dm_validations = true   # validate attachment sizes and such, defaults to false
 end
 
 def rebuild_model options = {}
+  rebuild_class options
+  Dummy.auto_migrate!
+end
+
+def rebuild_class options = {}
   Object.send(:remove_const, "Dummy") rescue nil
-  Object.const_set("Dummy", Class.new())
+  Object.const_set("Dummy", Class.new)
   Dummy.class_eval do
     include DataMapper::Resource
     include DataMapper::Validate
     include Paperclip::Resource
-    property :id, ::DataMapper::Types::Serial
+    property :id, ::DataMapper::Property::Serial
     property :other, String
     has_attached_file :avatar, options
   end
-  Dummy.auto_migrate!
 end
 
-def temporary_env(new_env)
-  old_env = Merb.env
-  Merb.env(new_env)
+class FakeModel
+  attr_accessor :avatar_file_name,
+                :avatar_file_size,
+                :avatar_updated_at,
+                :avatar_content_type,
+                :avatar_fingerprint,
+                :id
+
+  def errors
+    @errors ||= []
+  end
+
+  def run_paperclip_callbacks name, *args
+  end
+
+end
+
+def attachment options
+  Paperclip::Attachment.new(:avatar, FakeModel.new, options)
+end
+
+def silence_warnings
+  old_verbose, $VERBOSE = $VERBOSE, nil
   yield
-  Merb.env(old_env)
-end
+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
+
+def with_exitstatus_returning(code)
+  saved_exitstatus = $?.nil? ? 0 : $?.exitstatus
+  begin
+    `ruby -e 'exit #{code.to_i}'`
+    yield
+  ensure
+    `ruby -e 'exit #{saved_exitstatus.to_i}'`
+  end
+end

data/test/integration_test.rb

@@ -1,15 +1,15 @@
-require 'test/helper.rb'
+require File.expand_path("./helper", File.dirname(__FILE__))
 
 class IntegrationTest < Test::Unit::TestCase
   context "Many models at once" do
     setup do
       rebuild_model
-      @file      = File.new(File.join(FIXTURES_DIR, "5k.png"))
+      @file      = File.new(File.join(FIXTURES_DIR, "5k.png"), 'rb')
       300.times do |i|
         Dummy.create! :avatar => @file
       end
     end
-    
+
     should "not exceed the open file limit" do
        assert_nothing_raised do
          dummies = Dummy.all
@@ -22,22 +22,40 @@ class IntegrationTest < Test::Unit::TestCase
     setup do
       rebuild_model :styles => { :thumb => "50x50#" }
       @dummy = Dummy.new
-      @dummy.id = 1
       @file = File.new(File.join(File.dirname(__FILE__),
                                  "fixtures",
-                                 "5k.png"))
+                                 "5k.png"), 'rb')
       @dummy.avatar = @file
       assert @dummy.save
     end
 
+    teardown { @file.close }
+
     should "create its thumbnails properly" do
-      assert_match /\b50x50\b/, `identify '#{@dummy.avatar.path(:thumb)}'`
+      assert_match /\b50x50\b/, `identify "#{@dummy.avatar.path(:thumb)}"`
+    end
+
+    context 'reprocessing with unreadable original' do
+      setup { File.chmod(0000, @dummy.avatar.path) }
+
+      should "not raise an error" do
+        assert_nothing_raised do
+          @dummy.avatar.reprocess!
+        end
+      end
+
+      should "return false" do
+        assert ! @dummy.avatar.reprocess!
+      end
+
+      teardown { File.chmod(0644, @dummy.avatar.path) }
     end
 
     context "redefining its attachment styles" do
       setup do
         Dummy.class_eval do
           has_attached_file :avatar, :styles => { :thumb => "150x25#" }
+          has_attached_file :avatar, :styles => { :thumb => "150x25#", :dynamic => lambda { |a| '50x50#' } }
         end
         @d2 = Dummy.get(@dummy.id)
         @d2.avatar.reprocess!
@@ -45,7 +63,143 @@ class IntegrationTest < Test::Unit::TestCase
       end
 
       should "create its thumbnails properly" do
-        assert_match /\b150x25\b/, `identify '#{@dummy.avatar.path(:thumb)}'`
+        assert_match /\b150x25\b/, `identify "#{@dummy.avatar.path(:thumb)}"`
+        assert_match /\b50x50\b/, `identify "#{@dummy.avatar.path(:dynamic)}"`
+      end
+    end
+  end
+
+  context "Attachment" do
+    setup do
+      @thumb_path = "./test/../public/system/avatars/1/thumb/5k.png"
+      File.delete(@thumb_path) if File.exists?(@thumb_path)
+      rebuild_model :styles => { :thumb => "50x50#" }
+      @dummy = Dummy.new
+      @file = File.new(File.join(File.dirname(__FILE__),
+                                 "fixtures",
+                                 "5k.png"), 'rb')
+
+    end
+
+    teardown { @file.close }
+
+    should "not create the thumbnails upon saving when post-processing is disabled" do
+      @dummy.avatar.post_processing = false
+      @dummy.avatar = @file
+      assert @dummy.save
+      assert !File.exists?(@thumb_path)
+    end
+
+    should "create the thumbnails upon saving when post_processing is enabled" do
+      @dummy.avatar.post_processing = true
+      @dummy.avatar = @file
+      assert @dummy.save
+      assert File.exists?(@thumb_path)
+    end
+  end
+
+  context "Attachment with no generated thumbnails" do
+    setup do
+      @thumb_small_path = "./test/../public/system/avatars/1/thumb_small/5k.png"
+      @thumb_large_path = "./test/../public/system/avatars/1/thumb_large/5k.png"
+      File.delete(@thumb_small_path) if File.exists?(@thumb_small_path)
+      File.delete(@thumb_large_path) if File.exists?(@thumb_large_path)
+      rebuild_model :styles => { :thumb_small => "50x50#", :thumb_large => "60x60#" }
+      @dummy = Dummy.new
+      @file = File.new(File.join(File.dirname(__FILE__),
+                                 "fixtures",
+                                 "5k.png"), 'rb')
+
+      @dummy.avatar.post_processing = false
+      @dummy.avatar = @file
+      assert @dummy.save
+      @dummy.avatar.post_processing = true
+    end
+
+    teardown { @file.close }
+
+    should "allow us to create all thumbnails in one go" do
+      assert !File.exists?(@thumb_small_path)
+      assert !File.exists?(@thumb_large_path)
+
+      @dummy.avatar.reprocess!
+
+      assert File.exists?(@thumb_small_path)
+      assert File.exists?(@thumb_large_path)
+    end
+
+    should "allow us to selectively create each thumbnail" do
+      assert !File.exists?(@thumb_small_path)
+      assert !File.exists?(@thumb_large_path)
+
+      @dummy.avatar.reprocess! :thumb_small
+      assert File.exists?(@thumb_small_path)
+      assert !File.exists?(@thumb_large_path)
+
+      @dummy.avatar.reprocess! :thumb_large
+      assert File.exists?(@thumb_large_path)
+    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",
+                                 :medium => "50x50" },
+                    :path => ":rails_root/tmp/:id/:attachments/:style.:extension"
+      @dummy = Dummy.new
+      @file = File.new(File.join(File.dirname(__FILE__),
+                                 "fixtures",
+                                 "5k.png"), 'rb')
+      @dummy.avatar = @file
+    end
+
+    teardown { @file.close }
+
+    context "when saved" do
+      setup do
+        @dummy.save
+        @saved_path = @dummy.avatar.path(:large)
+      end
+
+      should "have a large file in the right place" do
+        assert File.exists?(@dummy.avatar.path(:large))
+      end
+
+      context "and deleted" do
+        setup do
+          @dummy.avatar.clear
+          @dummy.save
+        end
+
+        should "not have a large file in the right place anymore" do
+          assert ! File.exists?(@saved_path)
+        end
+
+        should "not have its next two parent directories" do
+          assert ! File.exists?(File.dirname(@saved_path))
+          assert ! File.exists?(File.dirname(File.dirname(@saved_path)))
+        end
+
+        before_should "not die if an unexpected SystemCallError happens" do
+          FileUtils.stubs(:rmdir).raises(Errno::EPIPE)
+        end
       end
     end
   end
@@ -57,7 +211,7 @@ class IntegrationTest < Test::Unit::TestCase
                                  :thumb => ["32x32#", :gif] },
                     :default_style => :medium,
                     :url => "/:attachment/:class/:style/:id/:basename.:extension",
-                    :path => ":merb_root/tmp/:attachment/:class/:style/:id/:basename.:extension"
+                    :path => ":rails_root/tmp/:attachment/:class/:style/:id/:basename.:extension"
       @dummy     = Dummy.new
     end
 
@@ -83,7 +237,7 @@ class IntegrationTest < Test::Unit::TestCase
                       :whiny_thumbnails => true,
                       :default_style => :medium,
                       :url => "/:attachment/:class/:style/:id/:basename.:extension",
-                      :path => ":merb_root/tmp/:attachment/:class/:style/:id/:basename.:extension"
+                      :path => ":rails_root/tmp/:attachment/:class/:style/:id/:basename.:extension"
       end
 
       should "have its definition return true when asked about whiny_thumbnails" do
@@ -91,20 +245,20 @@ class IntegrationTest < Test::Unit::TestCase
       end
     end
   end
-  
-  context "A model with no thumbnail_convert_options setting" do
+
+  context "A model with no convert_options setting" do
     setup do
       rebuild_model :styles => { :large => "300x300>",
                                  :medium => "100x100",
                                  :thumb => ["32x32#", :gif] },
                     :default_style => :medium,
                     :url => "/:attachment/:class/:style/:id/:basename.:extension",
-                    :path => ":merb_root/tmp/:attachment/:class/:style/:id/:basename.:extension"
+                    :path => ":rails_root/tmp/:attachment/:class/:style/:id/:basename.:extension"
       @dummy     = Dummy.new
     end
-    
+
     should "have its definition return nil when asked about convert_options" do
-      assert ! Dummy.attachment_definitions[:avatar][:thumbnail_convert_options]
+      assert ! Dummy.attachment_definitions[:avatar][:convert_options]
     end
 
     context "redefined to have convert_options setting" do
@@ -112,18 +266,18 @@ class IntegrationTest < Test::Unit::TestCase
         rebuild_model :styles => { :large => "300x300>",
                                    :medium => "100x100",
                                    :thumb => ["32x32#", :gif] },
-                      :thumbnail_convert_options => "-strip -depth 8",
+                      :convert_options => "-strip -depth 8",
                       :default_style => :medium,
                       :url => "/:attachment/:class/:style/:id/:basename.:extension",
-                      :path => ":merb_root/tmp/:attachment/:class/:style/:id/:basename.:extension"
+                      :path => ":rails_root/tmp/:attachment/:class/:style/:id/:basename.:extension"
       end
 
       should "have its definition return convert_options value when asked about convert_options" do
-        assert_equal "-strip -depth 8", Dummy.attachment_definitions[:avatar][:thumbnail_convert_options]
+        assert_equal "-strip -depth 8", Dummy.attachment_definitions[:avatar][:convert_options]
       end
     end
   end
-  
+
   context "A model with a filesystem attachment" do
     setup do
       rebuild_model :styles => { :large => "300x300>",
@@ -132,14 +286,13 @@ class IntegrationTest < Test::Unit::TestCase
                     :whiny_thumbnails => true,
                     :default_style => :medium,
                     :url => "/:attachment/:class/:style/:id/:basename.:extension",
-                    :path => ":merb_root/tmp/:attachment/:class/:style/:id/:basename.:extension"
+                    :path => ":rails_root/tmp/:attachment/:class/:style/:id/:basename.:extension"
       @dummy     = Dummy.new
-      @file      = File.new(File.join(FIXTURES_DIR, "5k.png"))
-      @bad_file  = File.new(File.join(FIXTURES_DIR, "bad.png"))
+      @file      = File.new(File.join(FIXTURES_DIR, "5k.png"), 'rb')
+      @bad_file  = File.new(File.join(FIXTURES_DIR, "bad.png"), 'rb')
 
-      @dummy.id = 1
       assert @dummy.avatar = @file
-      assert @dummy.valid?
+      assert @dummy.valid?, @dummy.errors.full_messages.join(", ")
       assert @dummy.save
     end
 
@@ -148,18 +301,18 @@ class IntegrationTest < Test::Unit::TestCase
        ["300x46", :large],
        ["100x15", :medium],
        ["32x32", :thumb]].each do |geo, style|
-        cmd = %Q[identify -format "%wx%h" #{@dummy.avatar.to_file(style).path}]
+        cmd = %Q[identify -format "%wx%h" "#{@dummy.avatar.path(style)}"]
         assert_equal geo, `#{cmd}`.chomp, cmd
       end
 
-      saved_paths = [:thumb, :medium, :large, :original].collect{|s| @dummy.avatar.to_file(s).path }
+      saved_paths = [:thumb, :medium, :large, :original].collect{|s| @dummy.avatar.path(s) }
 
       @d2 = Dummy.get(@dummy.id)
-      assert_equal "100x15", `identify -format "%wx%h" #{@d2.avatar.to_file.path}`.chomp
-      assert_equal "434x66", `identify -format "%wx%h" #{@d2.avatar.to_file(:original).path}`.chomp
-      assert_equal "300x46", `identify -format "%wx%h" #{@d2.avatar.to_file(:large).path}`.chomp
-      assert_equal "100x15", `identify -format "%wx%h" #{@d2.avatar.to_file(:medium).path}`.chomp
-      assert_equal "32x32",  `identify -format "%wx%h" #{@d2.avatar.to_file(:thumb).path}`.chomp
+      assert_equal "100x15", `identify -format "%wx%h" "#{@d2.avatar.path}"`.chomp
+      assert_equal "434x66", `identify -format "%wx%h" "#{@d2.avatar.path(:original)}"`.chomp
+      assert_equal "300x46", `identify -format "%wx%h" "#{@d2.avatar.path(:large)}"`.chomp
+      assert_equal "100x15", `identify -format "%wx%h" "#{@d2.avatar.path(:medium)}"`.chomp
+      assert_equal "32x32",  `identify -format "%wx%h" "#{@d2.avatar.path(:thumb)}"`.chomp
 
       @dummy.avatar = "not a valid file but not nil"
       assert_equal File.basename(@file.path), @dummy.avatar_file_name
@@ -171,7 +324,7 @@ class IntegrationTest < Test::Unit::TestCase
         assert File.exists?(p)
       end
 
-      @dummy.avatar = nil
+      @dummy.avatar.clear
       assert_nil @dummy.avatar_file_name
       assert @dummy.valid?
       assert @dummy.save
@@ -189,12 +342,12 @@ class IntegrationTest < Test::Unit::TestCase
 
       assert_equal @dummy.avatar_file_name, @d2.avatar_file_name
       [:thumb, :medium, :large, :original].each do |style|
-        assert_equal @dummy.avatar.to_file(style).path, @d2.avatar.to_file(style).path
+        assert_equal @dummy.avatar.path(style), @d2.avatar.path(style)
       end
 
-      saved_paths = [:thumb, :medium, :large, :original].collect{|s| @dummy.avatar.to_file(s).path }
+      saved_paths = [:thumb, :medium, :large, :original].collect{|s| @dummy.avatar.path(s) }
 
-      @d2.avatar = nil
+      @d2.avatar.clear
       assert @d2.save
 
       saved_paths.each do |p|
@@ -202,74 +355,79 @@ class IntegrationTest < Test::Unit::TestCase
       end
     end
 
-    should "know the difference between good files, bad files, not files, and nil" do
+    should "know the difference between good files, bad files, and not files" do
       expected = @dummy.avatar.to_file
       @dummy.avatar = "not a file"
       assert @dummy.valid?
-      assert_equal expected.path, @dummy.avatar.to_file.path
+      assert_equal expected.path, @dummy.avatar.path
+      expected.close
 
       @dummy.avatar = @bad_file
       assert ! @dummy.valid?
-      @dummy.avatar = nil
-      assert @dummy.valid?
     end
 
-    should "know the difference between good files, bad files, not files, and nil when validating" do
+    should "know the difference between good files, bad files, and not files when validating" do
       Dummy.validates_attachment_presence :avatar
       @d2 = Dummy.get(@dummy.id)
       @d2.avatar = @file
-      assert   @d2.valid?
+      assert   @d2.valid?, @d2.errors.full_messages.inspect
       @d2.avatar = @bad_file
       assert ! @d2.valid?
-      @d2.avatar = nil
-      assert ! @d2.valid?
     end
 
-    should "be able to reload without saving an not have the file disappear" do
+    should "be able to reload without saving and not have the file disappear" do
       @dummy.avatar = @file
-      @dummy.save
-      @dummy.avatar = nil
+      assert @dummy.save
+      @dummy.avatar.clear
       assert_nil @dummy.avatar_file_name
       @dummy.reload
       assert_equal "5k.png", @dummy.avatar_file_name
     end
-    
+
     context "that is assigned its file from another Paperclip attachment" do
       setup do
         @dummy2 = Dummy.new
-        @file2  = File.new(File.join(FIXTURES_DIR, "12k.png"))
+        @file2  = File.new(File.join(FIXTURES_DIR, "12k.png"), 'rb')
         assert  @dummy2.avatar = @file2
         @dummy2.save
       end
-      
+
       should "work when assigned a file" do
-        assert_not_equal `identify -format "%wx%h" #{@dummy.avatar.to_file(:original).path}`,
-                         `identify -format "%wx%h" #{@dummy2.avatar.to_file(:original).path}`
+        assert_not_equal `identify -format "%wx%h" "#{@dummy.avatar.path(:original)}"`,
+                         `identify -format "%wx%h" "#{@dummy2.avatar.path(:original)}"`
 
         assert @dummy.avatar = @dummy2.avatar
         @dummy.save
-        assert_equal `identify -format "%wx%h" #{@dummy.avatar.to_file(:original).path}`,
-                     `identify -format "%wx%h" #{@dummy2.avatar.to_file(:original).path}`
+        assert_equal `identify -format "%wx%h" "#{@dummy.avatar.path(:original)}"`,
+                     `identify -format "%wx%h" "#{@dummy2.avatar.path(:original)}"`
       end
-      
-      should "work when assigned a nil file" do
-        @dummy2.avatar = nil
-        @dummy2.save
+    end
 
-        @dummy.avatar = @dummy2.avatar
-        @dummy.save
-        
-        assert !@dummy.avatar?
+  end
+
+  context "A model with an attachments association and a Paperclip attachment" do
+    setup do
+      Dummy.class_eval do
+        has n, :attachments, :model => 'Dummy'
       end
-    end    
 
+      @dummy = Dummy.new
+      @dummy.avatar = File.new(File.join(File.dirname(__FILE__),
+                               "fixtures",
+                               "5k.png"), 'rb')
+    end
+
+    should "should not error when saving" do
+      assert @dummy.save
+    end
   end
 
   if ENV['S3_TEST_BUCKET']
     def s3_files_for attachment
       [:thumb, :medium, :large, :original].inject({}) do |files, style|
-        data = `curl '#{attachment.url(style)}' 2>/dev/null`.chomp
+        data = `curl "#{attachment.url(style)}" 2>/dev/null`.chomp
         t = Tempfile.new("paperclip-test")
+        t.binmode
         t.write(data)
         t.rewind
         files[style] = t
@@ -277,6 +435,14 @@ class IntegrationTest < Test::Unit::TestCase
       end
     end
 
+    def s3_headers_for attachment, style
+      `curl --head "#{attachment.url(style)}" 2>/dev/null`.split("\n").inject({}) do |h,head|
+        split_head = head.chomp.split(/\s*:\s*/, 2)
+        h[split_head.first.downcase] = split_head.last unless split_head.empty?
+        h
+      end
+    end
+
     context "A model with an S3 attachment" do
       setup do
         rebuild_model :styles => { :large => "300x300>",
@@ -284,14 +450,13 @@ class IntegrationTest < Test::Unit::TestCase
                                    :thumb => ["32x32#", :gif] },
                       :storage => :s3,
                       :whiny_thumbnails => true,
-                      # :s3_options => {:logger => Logger.new(StringIO.new)},
                       :s3_credentials => File.new(File.join(File.dirname(__FILE__), "s3.yml")),
                       :default_style => :medium,
                       :bucket => ENV['S3_TEST_BUCKET'],
                       :path => ":class/:attachment/:id/:style/:basename.:extension"
         @dummy     = Dummy.new
-        @file      = File.new(File.join(FIXTURES_DIR, "5k.png"))
-        @bad_file  = File.new(File.join(FIXTURES_DIR, "bad.png"))
+        @file      = File.new(File.join(FIXTURES_DIR, "5k.png"), 'rb')
+        @bad_file  = File.new(File.join(FIXTURES_DIR, "bad.png"), 'rb')
 
         assert @dummy.avatar = @file
         assert @dummy.valid?
@@ -300,12 +465,17 @@ class IntegrationTest < Test::Unit::TestCase
         @files_on_s3 = s3_files_for @dummy.avatar
       end
 
+      should "have the same contents as the original" do
+        @file.rewind
+        assert_equal @file.read, @files_on_s3[:original].read
+      end
+
       should "write and delete its files" do
         [["434x66", :original],
          ["300x46", :large],
          ["100x15", :medium],
          ["32x32", :thumb]].each do |geo, style|
-          cmd = %Q[identify -format "%wx%h" #{@files_on_s3[style].path}]
+          cmd = %Q[identify -format "%wx%h" "#{@files_on_s3[style].path}"]
           assert_equal geo, `#{cmd}`.chomp, cmd
         end
 
@@ -315,7 +485,7 @@ class IntegrationTest < Test::Unit::TestCase
          ["300x46", :large],
          ["100x15", :medium],
          ["32x32", :thumb]].each do |geo, style|
-          cmd = %Q[identify -format "%wx%h" #{@d2_files[style].path}]
+          cmd = %Q[identify -format "%wx%h" "#{@d2_files[style].path}"]
           assert_equal geo, `#{cmd}`.chomp, cmd
         end
 
@@ -324,19 +494,17 @@ class IntegrationTest < Test::Unit::TestCase
         assert @dummy.valid?
         assert @dummy.save
 
-        saved_keys = [:thumb, :medium, :large, :original].collect{|s| @dummy.avatar.to_file(s) }
-
-        saved_keys.each do |key|
-          assert key.exists?
+        [:thumb, :medium, :large, :original].each do |style|
+          assert @dummy.avatar.exists?(style)
         end
 
-        @dummy.avatar = nil
+        @dummy.avatar.clear
         assert_nil @dummy.avatar_file_name
         assert @dummy.valid?
         assert @dummy.save
 
-        saved_keys.each do |key|
-          assert ! key.exists?
+        [:thumb, :medium, :large, :original].each do |style|
+          assert ! @dummy.avatar.exists?(style)
         end
 
         @d2 = Dummy.get(@dummy.id)
@@ -348,16 +516,16 @@ class IntegrationTest < Test::Unit::TestCase
 
         assert_equal @dummy.avatar_file_name, @d2.avatar_file_name
         [:thumb, :medium, :large, :original].each do |style|
-          assert_equal @dummy.avatar.to_file(style).to_s, @d2.avatar.to_file(style).to_s
+          assert_equal @dummy.avatar.to_file(style).read, @d2.avatar.to_file(style).read
         end
 
         saved_keys = [:thumb, :medium, :large, :original].collect{|s| @dummy.avatar.to_file(s) }
 
-        @d2.avatar = nil
+        @d2.avatar.clear
         assert @d2.save
 
-        saved_keys.each do |key|
-          assert ! key.exists?
+        [:thumb, :medium, :large, :original].each do |style|
+          assert ! @dummy.avatar.exists?(style)
         end
       end
 
@@ -365,7 +533,7 @@ class IntegrationTest < Test::Unit::TestCase
         expected = @dummy.avatar.to_file
         @dummy.avatar = "not a file"
         assert @dummy.valid?
-        assert_equal expected.full_name, @dummy.avatar.to_file.full_name
+        assert_equal expected.read, @dummy.avatar.to_file.read
 
         @dummy.avatar = @bad_file
         assert ! @dummy.valid?
@@ -390,6 +558,11 @@ class IntegrationTest < Test::Unit::TestCase
         @dummy.reload
         assert_equal "5k.png", @dummy.avatar_file_name
       end
+
+      should "have the right content type" do
+        headers = s3_headers_for(@dummy.avatar, :original)
+        assert_equal 'image/png', headers['content-type']
+      end
     end
   end
 end