Merge branch 'master' of github.com:thoughtbot/paperclip

lib/paperclip/attachment.rb

@@ -324,4 +324,3 @@ module Paperclip
 
   end
 end
-

lib/paperclip/matchers/validate_attachment_content_type_matcher.rb

@@ -72,4 +72,3 @@ module Paperclip
     end
   end
 end
-

lib/paperclip/matchers/validate_attachment_presence_matcher.rb

@@ -52,4 +52,3 @@ module Paperclip
     end
   end
 end
-

lib/paperclip/matchers/validate_attachment_size_matcher.rb

@@ -93,4 +93,3 @@ module Paperclip
     end
   end
 end
-

lib/paperclip/upfile.rb

@@ -50,4 +50,3 @@ end
 class File #:nodoc:
   include Paperclip::Upfile
 end
-

paperclip.gemspec

@@ -32,4 +32,3 @@ spec = Gem::Specification.new do |s|
   s.add_development_dependency 'aws-s3'
   s.add_development_dependency 'sqlite3-ruby'
 end
-

test/helper.rb

@@ -25,7 +25,7 @@ require 'active_record/version'
 require 'active_support'
 require 'action_pack'
 
-puts "Testing againt version #{ActiveRecord::VERSION::STRING}"
+puts "Testing against version #{ActiveRecord::VERSION::STRING}"
 
 begin
   require 'ruby-debug'

test/paperclip_test.rb

@@ -308,7 +308,7 @@ class PaperclipTest < Test::Unit::TestCase
         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] =~ %r/between 0 and 10240 bytes/
         end
       end
     end