paperclip-cloudfiles 2.3.2 → 2.3.8

data/test/command_line_test.rb

@@ -0,0 +1,133 @@
+require './test/helper'
+
+class CommandLineTest < Test::Unit::TestCase
+  def setup
+    Paperclip::CommandLine.path = nil
+    File.stubs(:exist?).with("/dev/null").returns(true)
+  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/geometry_test.rb

@@ -1,4 +1,4 @@
-require 'test/helper'
+require './test/helper'
 
 class GeometryTest < Test::Unit::TestCase
   context "Paperclip::Geometry" do
@@ -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

@@ -8,27 +8,13 @@ require 'test/unit'
 require 'shoulda'
 require 'mocha'
 
-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 againt version #{ActiveRecord::VERSION::STRING}"
+puts "Testing against version #{ActiveRecord::VERSION::STRING}"
+
+`ruby -e 'exit 0'` # Prime $? with a value.
 
 begin
   require 'ruby-debug'
@@ -58,18 +44,18 @@ $LOAD_PATH << File.join(ROOT, 'lib', 'paperclip')
 
 require File.join(ROOT, 'lib', 'paperclip.rb')
 
-require 'shoulda_macros/paperclip'
+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.logger = ActiveSupport::BufferedLogger.new(File.dirname(__FILE__) + "/debug.log")
 ActiveRecord::Base.establish_connection(config['test'])
 
 def reset_class class_name
-  ActiveRecord::Base.send(:include, Paperclip)
+  ActiveRecord::Base.send(:include, Paperclip::Glue)
   Object.send(:remove_const, class_name) rescue nil
   klass = Object.const_set(class_name, Class.new(ActiveRecord::Base))
-  klass.class_eval{ include Paperclip }
+  klass.class_eval{ include Paperclip::Glue }
   klass
 end
 
@@ -89,16 +75,17 @@ def rebuild_model options = {}
     table.column :avatar_content_type, :string
     table.column :avatar_file_size, :integer
     table.column :avatar_updated_at, :datetime
+    table.column :avatar_fingerprint, :string
   end
   rebuild_class options
 end
 
 def rebuild_class options = {}
-  ActiveRecord::Base.send(:include, Paperclip)
+  ActiveRecord::Base.send(:include, Paperclip::Glue)
   Object.send(:remove_const, "Dummy") rescue nil
   Object.const_set("Dummy", Class.new(ActiveRecord::Base))
   Dummy.class_eval do
-    include Paperclip
+    include Paperclip::Glue
     has_attached_file :avatar, options
   end
 end
@@ -108,6 +95,7 @@ class FakeModel
                 :avatar_file_size,
                 :avatar_last_updated,
                 :avatar_content_type,
+                :avatar_fingerprint,
                 :id
 
   def errors
@@ -149,3 +137,13 @@ def should_reject_dummy_class
     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,4 +1,4 @@
-require 'test/helper'
+require './test/helper'
 
 class IntegrationTest < Test::Unit::TestCase
   context "Many models at once" do
@@ -9,7 +9,7 @@ class IntegrationTest < Test::Unit::TestCase
         Dummy.create! :avatar => @file
       end
     end
-    
+
     should "not exceed the open file limit" do
        assert_nothing_raised do
          dummies = Dummy.find(:all)
@@ -157,7 +157,7 @@ class IntegrationTest < Test::Unit::TestCase
       end
     end
   end
-  
+
   context "A model with no convert_options setting" do
     setup do
       rebuild_model :styles => { :large => "300x300>",
@@ -168,7 +168,7 @@ class IntegrationTest < Test::Unit::TestCase
                     :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][:convert_options]
     end
@@ -189,7 +189,7 @@ class IntegrationTest < Test::Unit::TestCase
       end
     end
   end
-  
+
   context "A model with a filesystem attachment" do
     setup do
       rebuild_model :styles => { :large => "300x300>",
@@ -204,7 +204,7 @@ class IntegrationTest < Test::Unit::TestCase
       @bad_file  = File.new(File.join(FIXTURES_DIR, "bad.png"), 'rb')
 
       assert @dummy.avatar = @file
-      assert @dummy.valid?
+      assert @dummy.valid?, @dummy.errors.full_messages.join(", ")
       assert @dummy.save
     end
 
@@ -281,7 +281,7 @@ class IntegrationTest < Test::Unit::TestCase
       Dummy.validates_attachment_presence :avatar
       @d2 = Dummy.find(@dummy.id)
       @d2.avatar = @file
-      assert   @d2.valid?, @d2.errors.full_messages.inspect 
+      assert   @d2.valid?, @d2.errors.full_messages.inspect
       @d2.avatar = @bad_file
       assert ! @d2.valid?
     end
@@ -294,7 +294,7 @@ class IntegrationTest < Test::Unit::TestCase
       @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
@@ -302,7 +302,7 @@ class IntegrationTest < Test::Unit::TestCase
         assert  @dummy2.avatar = @file2
         @dummy2.save
       end
-      
+
       should "work when assigned a file" do
         assert_not_equal `identify -format "%wx%h" "#{@dummy.avatar.path(:original)}"`,
                          `identify -format "%wx%h" "#{@dummy2.avatar.path(:original)}"`
@@ -312,7 +312,7 @@ class IntegrationTest < Test::Unit::TestCase
         assert_equal `identify -format "%wx%h" "#{@dummy.avatar.path(:original)}"`,
                      `identify -format "%wx%h" "#{@dummy2.avatar.path(:original)}"`
       end
-    end    
+    end
 
   end
 
@@ -363,7 +363,6 @@ 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'],

data/test/interpolations_test.rb

@@ -1,4 +1,4 @@
-require 'test/helper'
+require './test/helper'
 
 class InterpolationsTest < Test::Unit::TestCase
   should "return all methods but the infrastructure when sent #all" do
@@ -82,14 +82,17 @@ class InterpolationsTest < Test::Unit::TestCase
 
   should "reinterpolate :url" do
     attachment = mock
-    attachment.expects(:options).returns({:url => ":id"})
     attachment.expects(:url).with(:style, false).returns("1234")
     assert_equal "1234", Paperclip::Interpolations.url(attachment, :style)
   end
 
   should "raise if infinite loop detcted reinterpolating :url" do
-    attachment = mock
-    attachment.expects(:options).returns({:url => ":url"})
+    attachment = Object.new
+    class << attachment
+      def url(*args)
+        Paperclip::Interpolations.url(self, :style)
+      end
+    end
     assert_raises(Paperclip::InfiniteInterpolationError){ Paperclip::Interpolations.url(attachment, :style) }
   end
 

data/test/iostream_test.rb

@@ -1,14 +1,7 @@
-require 'test/helper'
+require './test/helper'
 
 class IOStreamTest < Test::Unit::TestCase
-  context "IOStream" do
-    should "be included in IO, File, Tempfile, and StringIO" do
-      [IO, File, Tempfile, StringIO].each do |klass|
-        assert klass.included_modules.include?(IOStream), "Not in #{klass}"
-      end
-    end
-  end
-
+  include IOStream
   context "A file" do
     setup do
       @file = File.new(File.join(File.dirname(__FILE__), "fixtures", "5k.png"), 'rb')
@@ -21,7 +14,7 @@ class IOStreamTest < Test::Unit::TestCase
       context "and given a String" do
         setup do
           FileUtils.mkdir_p(File.join(ROOT, 'tmp'))
-          assert @result = @file.stream_to(File.join(ROOT, 'tmp', 'iostream.string.test'))
+          assert @result = stream_to(@file, File.join(ROOT, 'tmp', 'iostream.string.test'))
         end
 
         should "return a File" do
@@ -38,7 +31,7 @@ class IOStreamTest < Test::Unit::TestCase
         setup do
           tempfile = Tempfile.new('iostream.test')
           tempfile.binmode
-          assert @result = @file.stream_to(tempfile)
+          assert @result = stream_to(@file, tempfile)
         end
 
         should "return a Tempfile" do
@@ -53,9 +46,9 @@ class IOStreamTest < Test::Unit::TestCase
 
     end
 
-    context "that is sent #to_tempfile" do
+    context "that is converted #to_tempfile" do
       setup do
-        assert @tempfile = @file.to_tempfile
+        assert @tempfile = to_tempfile(@file)
       end
 
       should "convert it to a Paperclip Tempfile" do

data/test/matchers/have_attached_file_matcher_test.rb

@@ -1,4 +1,4 @@
-require 'test/helper'
+require './test/helper'
 
 class HaveAttachedFileMatcherTest < Test::Unit::TestCase
   context "have_attached_file" do

data/test/matchers/validate_attachment_content_type_matcher_test.rb

@@ -1,9 +1,10 @@
-require 'test/helper'
+require './test/helper'
 
 class ValidateAttachmentContentTypeMatcherTest < Test::Unit::TestCase
   context "validate_attachment_content_type" do
     setup do
       reset_table("dummies") do |d|
+        d.string :title
         d.string :avatar_file_name
         d.string :avatar_content_type
       end
@@ -33,5 +34,14 @@ class ValidateAttachmentContentTypeMatcherTest < Test::Unit::TestCase
 
       should_accept_dummy_class
     end
+    
+    context "given a class with other validations but matching types" do
+      setup do
+        @dummy_class.validates_presence_of :title
+        @dummy_class.validates_attachment_content_type :avatar, :content_type => %r{image/.*}
+      end
+      
+      should_accept_dummy_class
+    end
   end
 end

data/test/matchers/validate_attachment_presence_matcher_test.rb

@@ -1,4 +1,4 @@
-require 'test/helper'
+require './test/helper'
 
 class ValidateAttachmentPresenceMatcherTest < Test::Unit::TestCase
   context "validate_attachment_presence" do

data/test/matchers/validate_attachment_size_matcher_test.rb

@@ -1,4 +1,4 @@
-require 'test/helper'
+require './test/helper'
 
 class ValidateAttachmentSizeMatcherTest < Test::Unit::TestCase
   context "validate_attachment_size" do

data/test/paperclip_test.rb

@@ -1,95 +1,62 @@
-require 'test/helper'
+require './test/helper'
 
 class PaperclipTest < Test::Unit::TestCase
-  [:image_magick_path, :command_path].each do |path|
-    context "Calling Paperclip.run with #{path} specified" do
-      setup do
-        Paperclip.options[:image_magick_path] = nil
-        Paperclip.options[:command_path]      = nil
-        Paperclip.options[path]               = "/usr/bin"
-      end
-
-      should "return the expected path for path_for_command" do
-        assert_equal "/usr/bin/convert", Paperclip.path_for_command("convert")
-      end
-
-      should "execute the right command" do
-        Paperclip.expects(:path_for_command).with("convert").returns("/usr/bin/convert")
-        Paperclip.expects(:bit_bucket).returns("/dev/null")
-        Paperclip.expects(:"`").with("/usr/bin/convert 'one.jpg' 'two.jpg' 2>/dev/null")
-        Paperclip.run("convert", "one.jpg", "two.jpg")
-      end
-    end
-  end
-
-  context "Calling Paperclip.run with no path specified" do
+  context "Calling Paperclip.run" do
     setup do
       Paperclip.options[:image_magick_path] = nil
       Paperclip.options[:command_path]      = nil
+      Paperclip::CommandLine.stubs(:'`')
     end
 
-    should "return the expected path fro path_for_command" do
-      assert_equal "convert", Paperclip.path_for_command("convert")
+    should "execute the right command with :image_magick_path" do
+      Paperclip.options[:image_magick_path] = "/usr/bin"
+      Paperclip.expects(:log).with(includes('[DEPRECATION]'))
+      Paperclip.expects(:log).with(regexp_matches(%r{/usr/bin/convert ['"]one.jpg['"] ['"]two.jpg['"]}))
+      Paperclip::CommandLine.expects(:"`").with(regexp_matches(%r{/usr/bin/convert ['"]one.jpg['"] ['"]two.jpg['"]}))
+      Paperclip.run("convert", ":one :two", :one => "one.jpg", :two => "two.jpg")
     end
 
-    should "execute the right command" do
-      Paperclip.expects(:path_for_command).with("convert").returns("convert")
-      Paperclip.expects(:bit_bucket).returns("/dev/null")
-      Paperclip.expects(:"`").with("convert 'one.jpg' 'two.jpg' 2>/dev/null")
-      Paperclip.run("convert", "one.jpg", "two.jpg")
+    should "execute the right command with :command_path" do
+      Paperclip.options[:command_path] = "/usr/bin"
+      Paperclip::CommandLine.expects(:"`").with(regexp_matches(%r{/usr/bin/convert ['"]one.jpg['"] ['"]two.jpg['"]}))
+      Paperclip.run("convert", ":one :two", :one => "one.jpg", :two => "two.jpg")
     end
-  end
 
-  context "Calling Paperclip.run and logging" do
-    should "log the command when :log_command is true" do
-      Paperclip.options[:image_magick_path] = nil
-      Paperclip.options[:command_path]      = nil
-      Paperclip.stubs(:bit_bucket).returns("/dev/null")
-      Paperclip.expects(:log).with("this 'is the command' 2>/dev/null")
-      Paperclip.expects(:"`").with("this 'is the command' 2>/dev/null")
-      Paperclip.options[:log_command] = true
-      Paperclip.run("this","is the command")
+    should "execute the right command with no path" do
+      Paperclip::CommandLine.expects(:"`").with(regexp_matches(%r{convert ['"]one.jpg['"] ['"]two.jpg['"]}))
+      Paperclip.run("convert", ":one :two", :one => "one.jpg", :two => "two.jpg")
     end
 
-    should "not log the command when :log_command is false" do
-      Paperclip.options[:image_magick_path] = nil
-      Paperclip.options[:command_path]      = nil
-      Paperclip.stubs(:bit_bucket).returns("/dev/null")
-      Paperclip.expects(:log).with("this 'is the command' 2>/dev/null").never
-      Paperclip.expects(:"`").with("this 'is the command' 2>/dev/null")
-      Paperclip.options[:log_command] = false
-      Paperclip.run("this","is the command")
+    should "tell you the command isn't there if the shell returns 127" do
+      with_exitstatus_returning(127) do
+        assert_raises(Paperclip::CommandNotFoundError) do
+          Paperclip.run("command")
+        end
+      end
     end
-  end
 
-  should "prevent dangerous characters in the command via quoting" do
-    Paperclip.options[:image_magick_path] = nil
-    Paperclip.options[:command_path]      = nil
-    Paperclip.options[:log_command]       = false
-    Paperclip.options[:swallow_stderr]    = false
-    Paperclip.expects(:"`").with(%q[this 'is' 'jack'\''s' '`command`' 'line!'])
-    Paperclip.run("this", "is", "jack's", "`command`", "line!")
-  end
-
-  context "Paperclip.bit_bucket" do
-    context "on systems without /dev/null" do
-      setup do
-        File.expects(:exists?).with("/dev/null").returns(false)
-      end
-      
-      should "return 'NUL'" do
-        assert_equal "NUL", Paperclip.bit_bucket
+    should "tell you the command isn't there if an ENOENT is raised" do
+      assert_raises(Paperclip::CommandNotFoundError) do
+        Paperclip::CommandLine.stubs(:"`").raises(Errno::ENOENT)
+        Paperclip.run("command")
       end
     end
+  end
 
-    context "on systems with /dev/null" do
-      setup do
-        File.expects(:exists?).with("/dev/null").returns(true)
-      end
-      
-      should "return '/dev/null'" do
-        assert_equal "/dev/null", Paperclip.bit_bucket
+  context "Paperclip.each_instance_with_attachment" do
+    setup do
+      @file = File.new(File.join(FIXTURES_DIR, "5k.png"), 'rb')
+      d1 = Dummy.create(:avatar => @file)
+      d2 = Dummy.create
+      d3 = Dummy.create(:avatar => @file)
+      @expected = [d1, d3]
+    end
+    should "yield every instance of a model that has an attachment" do
+      actual = []
+      Paperclip.each_instance_with_attachment("Dummy", "avatar") do |instance|
+        actual << instance
       end
+      assert_same_elements @expected, actual
     end
   end
 
@@ -132,7 +99,7 @@ class PaperclipTest < Test::Unit::TestCase
       should "not assign the avatar on mass-set" do
         @dummy.attributes = { :other => "I'm set!",
                               :avatar => @file }
-        
+
         assert_equal "I'm set!", @dummy.other
         assert ! @dummy.avatar?
       end
@@ -140,7 +107,7 @@ class PaperclipTest < Test::Unit::TestCase
       should "still allow assigment on normal set" do
         @dummy.other  = "I'm set!"
         @dummy.avatar = @file
-        
+
         assert_equal "I'm set!", @dummy.other
         assert @dummy.avatar?
       end
@@ -243,9 +210,16 @@ class PaperclipTest < Test::Unit::TestCase
       end
     end
 
+    should "not have Attachment in the ActiveRecord::Base namespace" do
+      assert_raises(NameError) do
+        ActiveRecord::Base::Attachment
+      end
+    end
+
     def self.should_validate validation, options, valid_file, invalid_file
       context "with #{validation} validation and #{options.inspect} options" do
         setup do
+          rebuild_class
           Dummy.send(:"validates_attachment_#{validation}", :avatar, options)
           @dummy = Dummy.new
         end
@@ -260,7 +234,7 @@ class PaperclipTest < Test::Unit::TestCase
             end
           else
             should "not have an error on the attachment" do
-              assert @dummy.errors[:avatar_file_name].blank?, @dummy.errors.full_messages.join(", ")
+              assert @dummy.errors.blank?, @dummy.errors.full_messages.join(", ")
             end
           end
         end
@@ -295,10 +269,10 @@ class PaperclipTest < Test::Unit::TestCase
       validation, options, valid_file, invalid_file = args
       valid_file   &&= File.open(File.join(FIXTURES_DIR, valid_file), "rb")
       invalid_file &&= File.open(File.join(FIXTURES_DIR, invalid_file), "rb")
-      
+
       should_validate validation, options, valid_file, invalid_file
     end
-    
+
     context "with size validation and less_than 10240 option" do
       context "and assigned an invalid file" do
         setup do
@@ -307,9 +281,9 @@ class PaperclipTest < Test::Unit::TestCase
           @dummy.avatar &&= File.open(File.join(FIXTURES_DIR, "12k.png"), "rb")
           @dummy.valid?
         end
-        
+
         should "have a file size min/max error message" do
-          assert @dummy.errors[:avatar_file_size].any?{|e| e.match %r/between 0 and 10240 bytes/ }
+          assert [@dummy.errors[:avatar_file_size]].flatten.any?{|error| error =~ %r/between 0 and 10240 bytes/ }
         end
       end
     end

data/test/processor_test.rb

@@ -1,4 +1,4 @@
-require 'test/helper'
+require './test/helper'
 
 class ProcessorTest < Test::Unit::TestCase
   should "instantiate and call #make when sent #make to the class" do