paperclip 2.3.1.1 → 2.3.2

data/test/integration_test.rb

@@ -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>",
@@ -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
 

data/test/interpolations_test.rb

@@ -11,12 +11,12 @@ class InterpolationsTest < Test::Unit::TestCase
     end
   end
 
-  should "return the RAILS_ROOT" do
-    assert_equal RAILS_ROOT, Paperclip::Interpolations.rails_root(:attachment, :style)
+  should "return the Rails.root" do
+    assert_equal Rails.root, Paperclip::Interpolations.rails_root(:attachment, :style)
   end
 
-  should "return the RAILS_ENV" do
-    assert_equal RAILS_ENV, Paperclip::Interpolations.rails_env(:attachment, :style)
+  should "return the Rails.env" do
+    assert_equal Rails.env, Paperclip::Interpolations.rails_env(:attachment, :style)
   end
 
   should "return the class of the Interpolations module when called with no params" do

data/test/iostream_test.rb

@@ -58,8 +58,15 @@ class IOStreamTest < Test::Unit::TestCase
         assert @tempfile = @file.to_tempfile
       end
 
-      should "convert it to a Tempfile" do
-        assert @tempfile.is_a?(Tempfile)
+      should "convert it to a Paperclip Tempfile" do
+        assert @tempfile.is_a?(Paperclip::Tempfile)
+      end
+
+      should "have the name be based on the original_filename" do
+        name = File.basename(@file.path)
+        extension = File.extname(name)
+        basename = File.basename(name, extension)
+        assert_match %r[^stream.*?#{Regexp.quote(extension)}], File.basename(@tempfile.path)
       end
 
       should "have the Tempfile contain the same data as the file" do

data/test/matchers/have_attached_file_matcher_test.rb

@@ -8,14 +8,17 @@ class HaveAttachedFileMatcherTest < Test::Unit::TestCase
       @matcher     = self.class.have_attached_file(:avatar)
     end
 
-    should "reject a class with no attachment" do
-      assert_rejects @matcher, @dummy_class
+    context "given a class with no attachment" do
+      should_reject_dummy_class
     end
 
-    should "accept a class with an attachment" do
-      modify_table("dummies"){|d| d.string :avatar_file_name }
-      @dummy_class.has_attached_file :avatar
-      assert_accepts @matcher, @dummy_class
+    context "given a class with an attachment" do
+      setup do
+        modify_table("dummies"){|d| d.string :avatar_file_name }
+        @dummy_class.has_attached_file :avatar
+      end
+
+      should_accept_dummy_class
     end
   end
 end

data/test/matchers/validate_attachment_content_type_matcher_test.rb

@@ -5,6 +5,7 @@ class ValidateAttachmentContentTypeMatcherTest < Test::Unit::TestCase
     setup do
       reset_table("dummies") do |d|
         d.string :avatar_file_name
+        d.string :avatar_content_type
       end
       @dummy_class = reset_class "Dummy"
       @dummy_class.has_attached_file :avatar
@@ -13,18 +14,24 @@ class ValidateAttachmentContentTypeMatcherTest < Test::Unit::TestCase
                        rejecting(%w(audio/mp3 application/octet-stream))
     end
 
-    should "reject a class with no validation" do
-      assert_rejects @matcher, @dummy_class
+    context "given a class with no validation" do
+      should_reject_dummy_class
     end
 
-    should "reject a class with a validation that doesn't match" do
-      @dummy_class.validates_attachment_content_type :avatar, :content_type => %r{audio/.*}
-      assert_rejects @matcher, @dummy_class
+    context "given a class with a validation that doesn't match" do
+      setup do
+        @dummy_class.validates_attachment_content_type :avatar, :content_type => %r{audio/.*}
+      end
+
+      should_reject_dummy_class
     end
 
-    should "accept a class with a validation" do
-      @dummy_class.validates_attachment_content_type :avatar, :content_type => %r{image/.*}
-      assert_accepts @matcher, @dummy_class
+    context "given a class with a matching validation" do
+      setup do
+        @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

@@ -3,19 +3,24 @@ require 'test/helper'
 class ValidateAttachmentPresenceMatcherTest < Test::Unit::TestCase
   context "validate_attachment_presence" do
     setup do
-      reset_table("dummies"){|d| d.string :avatar_file_name }
+      reset_table("dummies") do |d|
+        d.string :avatar_file_name
+      end
       @dummy_class = reset_class "Dummy"
       @dummy_class.has_attached_file :avatar
       @matcher     = self.class.validate_attachment_presence(:avatar)
     end
 
-    should "reject a class with no validation" do
-      assert_rejects @matcher, @dummy_class
+    context "given a class with no validation" do
+      should_reject_dummy_class
     end
 
-    should "accept a class with a validation" do
-      @dummy_class.validates_attachment_presence :avatar
-      assert_accepts @matcher, @dummy_class
+    context "given a class with a matching validation" do
+      setup do
+        @dummy_class.validates_attachment_presence :avatar
+      end
+
+      should_accept_dummy_class
     end
   end
 end

data/test/matchers/validate_attachment_size_matcher_test.rb

@@ -5,6 +5,7 @@ class ValidateAttachmentSizeMatcherTest < Test::Unit::TestCase
     setup do
       reset_table("dummies") do |d|
         d.string :avatar_file_name
+        d.integer :avatar_file_size
       end
       @dummy_class = reset_class "Dummy"
       @dummy_class.has_attached_file :avatar
@@ -13,37 +14,37 @@ class ValidateAttachmentSizeMatcherTest < Test::Unit::TestCase
     context "of limited size" do
       setup{ @matcher = self.class.validate_attachment_size(:avatar).in(256..1024) }
 
-      should "reject a class with no validation" do
-        assert_rejects @matcher, @dummy_class
+      context "given a class with no validation" do
+        should_reject_dummy_class
       end
 
-      should "reject a class with a validation that's too high" do
-        @dummy_class.validates_attachment_size :avatar, :in => 256..2048
-        assert_rejects @matcher, @dummy_class
+      context "given a class with a validation that's too high" do
+        setup { @dummy_class.validates_attachment_size :avatar, :in => 256..2048 }
+        should_reject_dummy_class
       end
 
-      should "reject a class with a validation that's too low" do
-        @dummy_class.validates_attachment_size :avatar, :in => 0..1024
-        assert_rejects @matcher, @dummy_class
+      context "given a class with a validation that's too low" do
+        setup { @dummy_class.validates_attachment_size :avatar, :in => 0..1024 }
+        should_reject_dummy_class
       end
 
-      should "accept a class with a validation that matches" do
-        @dummy_class.validates_attachment_size :avatar, :in => 256..1024
-        assert_accepts @matcher, @dummy_class
+      context "given a class with a validation that matches" do
+        setup { @dummy_class.validates_attachment_size :avatar, :in => 256..1024 }
+        should_accept_dummy_class
       end
     end
 
     context "validates_attachment_size with infinite range" do
       setup{ @matcher = self.class.validate_attachment_size(:avatar) }
 
-      should "accept a class with an upper limit" do
-        @dummy_class.validates_attachment_size :avatar, :less_than => 1
-        assert_accepts @matcher, @dummy_class
+      context "given a class with an upper limit" do
+        setup { @dummy_class.validates_attachment_size :avatar, :less_than => 1 }
+        should_accept_dummy_class
       end
 
-      should "accept a class with no upper limit" do
-        @dummy_class.validates_attachment_size :avatar, :greater_than => 1
-        assert_accepts @matcher, @dummy_class
+      context "given a class with no upper limit" do
+        setup { @dummy_class.validates_attachment_size :avatar, :greater_than => 1 }
+        should_accept_dummy_class
       end
     end
   end

data/test/paperclip_test.rb

@@ -16,8 +16,8 @@ class PaperclipTest < Test::Unit::TestCase
       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")
+        Paperclip.expects(:"`").with("/usr/bin/convert 'one.jpg' 'two.jpg' 2>/dev/null")
+        Paperclip.run("convert", "one.jpg", "two.jpg")
       end
     end
   end
@@ -35,49 +35,68 @@ class PaperclipTest < Test::Unit::TestCase
     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")
+      Paperclip.expects(:"`").with("convert 'one.jpg' 'two.jpg' 2>/dev/null")
+      Paperclip.run("convert", "one.jpg", "two.jpg")
     end
   end
 
   context "Calling Paperclip.run and logging" do
-    setup 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.stubs(:log)
-      Paperclip.stubs(:"`").with("this is the command 2>/dev/null")
-    end
-
-    should "log the command when :log_command is true" do
+      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")
-      assert_received(Paperclip, :log) do |p|
-        p.with("this is the command 2>/dev/null")
-      end
-      assert_received(Paperclip, :`) do |p|
-        p.with("this is the command 2>/dev/null")
-      end
     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")
-      assert_received(Paperclip, :log) do |p|
-        p.with("this is the command 2>/dev/null").never
+    end
+  end
+
+  context "Calling Paperclip.run when the command is not found" do
+    should "tell you the command isn't there if the shell returns 127" do
+      begin
+        assert_raises(Paperclip::CommandNotFoundError) do
+          `ruby -e 'exit 127'` # Stub $?.exitstatus to be 127, i.e. Command Not Found.
+          Paperclip.stubs(:"`").returns("")
+          Paperclip.run("command")
+        end
+      ensure
+        `ruby -e 'exit 0'` # Unstub $?.exitstatus
       end
-      assert_received(Paperclip, :`) do |p|
-        p.with("this is the command 2>/dev/null")
+    end
+    should "tell you the command isn't there if an ENOENT is raised" do
+      assert_raises(Paperclip::CommandNotFoundError) do
+        Paperclip.stubs(:"`").raises(Errno::ENOENT)
+        Paperclip.run("command")
       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
       end
@@ -87,7 +106,7 @@ class PaperclipTest < Test::Unit::TestCase
       setup do
         File.expects(:exists?).with("/dev/null").returns(true)
       end
-      
+
       should "return '/dev/null'" do
         assert_equal "/dev/null", Paperclip.bit_bucket
       end
@@ -133,7 +152,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
@@ -141,7 +160,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
@@ -185,45 +204,23 @@ class PaperclipTest < Test::Unit::TestCase
       should "be valid" do
         assert @dummy.valid?
       end
-
-      context "then has a validation added that makes it invalid" do
-        setup do
-          assert @dummy.save
-          Dummy.class_eval do
-            validates_attachment_content_type :avatar, :content_type => ["text/plain"]
-          end
-          @dummy2 = Dummy.find(@dummy.id)
-        end
-
-        should "be invalid when reloaded" do
-          assert ! @dummy2.valid?, @dummy2.errors.inspect
-        end
-
-        should "be able to call #valid? twice without having duplicate errors" do
-          @dummy2.avatar.valid?
-          first_errors = @dummy2.avatar.errors
-          @dummy2.avatar.valid?
-          assert_equal first_errors, @dummy2.avatar.errors
-        end
-      end
     end
 
     context "a validation with an if guard clause" do
       setup do
         Dummy.send(:"validates_attachment_presence", :avatar, :if => lambda{|i| i.foo })
         @dummy = Dummy.new
+        @dummy.stubs(:avatar_file_name).returns(nil)
       end
 
       should "attempt validation if the guard returns true" do
         @dummy.expects(:foo).returns(true)
-        @dummy.avatar.expects(:validate_presence).returns(nil)
-        @dummy.valid?
+        assert ! @dummy.valid?
       end
 
       should "not attempt validation if the guard returns false" do
         @dummy.expects(:foo).returns(false)
-        @dummy.avatar.expects(:validate_presence).never
-        @dummy.valid?
+        assert @dummy.valid?
       end
     end
 
@@ -231,18 +228,17 @@ class PaperclipTest < Test::Unit::TestCase
       setup do
         Dummy.send(:"validates_attachment_presence", :avatar, :unless => lambda{|i| i.foo })
         @dummy = Dummy.new
+        @dummy.stubs(:avatar_file_name).returns(nil)
       end
 
       should "attempt validation if the guard returns true" do
         @dummy.expects(:foo).returns(false)
-        @dummy.avatar.expects(:validate_presence).returns(nil)
-        @dummy.valid?
+        assert ! @dummy.valid?
       end
 
       should "not attempt validation if the guard returns false" do
         @dummy.expects(:foo).returns(true)
-        @dummy.avatar.expects(:validate_presence).never
-        @dummy.valid?
+        assert @dummy.valid?
       end
     end
 
@@ -259,11 +255,11 @@ class PaperclipTest < Test::Unit::TestCase
           end
           if validation == :presence
             should "have an error on the attachment" do
-              assert @dummy.errors.on(:avatar)
+              assert @dummy.errors[:avatar_file_name]
             end
           else
             should "not have an error on the attachment" do
-              assert_nil @dummy.errors.on(:avatar)
+              assert @dummy.errors[:avatar_file_name].blank?, @dummy.errors.full_messages.join(", ")
             end
           end
         end
@@ -273,10 +269,7 @@ class PaperclipTest < Test::Unit::TestCase
             @dummy.valid?
           end
           should "not have an error when assigned a valid file" do
-            assert ! @dummy.avatar.errors.key?(validation)
-          end
-          should "not have an error on the attachment" do
-            assert_nil @dummy.errors.on(:avatar)
+            assert_equal 0, @dummy.errors.length, @dummy.errors.full_messages.join(", ")
           end
         end
         context "and assigned an invalid file" do
@@ -285,17 +278,14 @@ class PaperclipTest < Test::Unit::TestCase
             @dummy.valid?
           end
           should "have an error when assigned a valid file" do
-            assert_not_nil @dummy.avatar.errors[validation]
-          end
-          should "have an error on the attachment" do
-            assert @dummy.errors.on(:avatar)
+            assert @dummy.errors.length > 0
           end
         end
       end
     end
 
     [[:presence,      {},                              "5k.png",   nil],
-     [:size,          {:in => 1..10240},               nil,        "12k.png"],
+     [:size,          {:in => 1..10240},               "5k.png",   "12k.png"],
      [:size,          {:less_than => 10240},           "5k.png",   "12k.png"],
      [:size,          {:greater_than => 8096},         "12k.png",  "5k.png"],
      [:content_type,  {:content_type => "image/png"},  "5k.png",   "text.txt"],
@@ -304,10 +294,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
@@ -316,9 +306,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_match /between 0 and 10240 bytes/, @dummy.errors.on(:avatar)
+          assert @dummy.errors[:avatar_file_size] =~ %r/between 0 and 10240 bytes/
         end
       end
     end