cloudfuji_paperclip 2.4.6 → 3.0.3

data/test/interpolations_test.rb

@@ -46,8 +46,11 @@ class InterpolationsTest < Test::Unit::TestCase
   should "return the extension of the file as the format if defined in the style" do
     attachment = mock
     attachment.expects(:original_filename).never
-    attachment.expects(:styles).returns({:style => {:format => "png"}})
-    assert_equal "png", Paperclip::Interpolations.extension(attachment, :style)
+    attachment.expects(:styles).twice.returns({:style => {:format => "png"}})
+
+    [:style, 'style'].each do |style|
+      assert_equal "png", Paperclip::Interpolations.extension(attachment, style)
+    end
   end
 
   should "return the extension of the file based on the content type" do
@@ -74,6 +77,13 @@ class InterpolationsTest < Test::Unit::TestCase
     assert_equal "found", interpolations.content_type_extension(attachment, :style)
   end
 
+  should "be able to handle numeric style names" do
+    attachment = mock(
+      :styles => {:"4" => {:format => :expected_extension}}
+    )
+    assert_equal :expected_extension, Paperclip::Interpolations.extension(attachment, 4)
+  end
+
   should "return the #to_param of the attachment" do
     attachment = mock
     attachment.expects(:to_param).returns("23-awesome")
@@ -145,7 +155,7 @@ class InterpolationsTest < Test::Unit::TestCase
         Paperclip::Interpolations.url(self, :style)
       end
     end
-    assert_raises(Paperclip::InfiniteInterpolationError){ Paperclip::Interpolations.url(attachment, :style) }
+    assert_raises(Paperclip::Errors::InfiniteInterpolationError){ Paperclip::Interpolations.url(attachment, :style) }
   end
 
   should "return the filename as basename.extension" do
@@ -195,14 +205,14 @@ class InterpolationsTest < Test::Unit::TestCase
   should "return attachment's hash when passing both arguments" do
     attachment = mock
     fake_hash = "a_wicked_secure_hash"
-    attachment.expects(:hash).returns(fake_hash)
+    attachment.expects(:hash_key).returns(fake_hash)
     assert_equal fake_hash, Paperclip::Interpolations.hash(attachment, :style)
   end
 
   should "return Object#hash when passing no argument" do
     attachment = mock
     fake_hash = "a_wicked_secure_hash"
-    attachment.expects(:hash).never.returns(fake_hash)
+    attachment.expects(:hash_key).never.returns(fake_hash)
     assert_not_equal fake_hash, Paperclip::Interpolations.hash
   end
 

data/test/matchers/validate_attachment_content_type_matcher_test.rb

@@ -83,5 +83,28 @@ class ValidateAttachmentContentTypeMatcherTest < Test::Unit::TestCase
 
       should_reject_dummy_class
     end
+
+    context "using an :if to control the validation" do
+      setup do
+        @dummy_class.class_eval do
+          validates_attachment_content_type :avatar, :content_type => %r{image/*} , :if => :go
+          attr_accessor :go
+        end
+        @matcher = self.class.validate_attachment_content_type(:avatar).
+                        allowing(%w(image/png image/jpeg)).
+                        rejecting(%w(audio/mp3 application/octet-stream))
+        @dummy = @dummy_class.new
+      end
+
+      should "run the validation if the control is true" do
+        @dummy.go = true
+        assert_accepts @matcher, @dummy
+      end
+
+      should "not run the validation if the control is false" do
+        @dummy.go = false
+        assert_rejects @matcher, @dummy
+      end
+    end
   end
 end

data/test/matchers/validate_attachment_presence_matcher_test.rb

@@ -22,5 +22,26 @@ class ValidateAttachmentPresenceMatcherTest < Test::Unit::TestCase
 
       should_accept_dummy_class
     end
+
+    context "using an :if to control the validation" do
+      setup do
+        @dummy_class.class_eval do
+          validates_attachment_presence :avatar, :if => :go
+          attr_accessor :go
+        end
+        @dummy = @dummy_class.new
+        @dummy.avatar = nil
+      end
+
+      should "run the validation if the control is true" do
+        @dummy.go = true
+        assert_accepts @matcher, @dummy
+      end
+
+      should "not run the validation if the control is false" do
+        @dummy.go = false
+        assert_rejects @matcher, @dummy
+      end
+    end
   end
 end

data/test/matchers/validate_attachment_size_matcher_test.rb

@@ -34,7 +34,7 @@ class ValidateAttachmentSizeMatcherTest < Test::Unit::TestCase
       end
     end
 
-    context "validates_attachment_size with infinite range" do
+    context "allowing anything" do
       setup{ @matcher = self.class.validate_attachment_size(:avatar) }
 
       context "given a class with an upper limit" do
@@ -42,10 +42,45 @@ class ValidateAttachmentSizeMatcherTest < Test::Unit::TestCase
         should_accept_dummy_class
       end
 
-      context "given a class with no upper limit" do
+      context "given a class with a lower limit" do
         setup { @dummy_class.validates_attachment_size :avatar, :greater_than => 1 }
         should_accept_dummy_class
       end
     end
+
+    context "using an :if to control the validation" do
+      setup do
+        @dummy_class.class_eval do
+          validates_attachment_size :avatar, :greater_than => 1024, :if => :go
+          attr_accessor :go
+        end
+        @dummy = @dummy_class.new
+        @matcher = self.class.validate_attachment_size(:avatar).greater_than(1024)
+      end
+
+      should "run the validation if the control is true" do
+        @dummy.go = true
+        assert_accepts @matcher, @dummy
+      end
+
+      should "not run the validation if the control is false" do
+        @dummy.go = false
+        assert_rejects @matcher, @dummy
+      end
+    end
+
+    context "post processing" do
+      setup do
+        @dummy_class.validates_attachment_size :avatar, :greater_than => 1024
+
+        @dummy = @dummy_class.new
+        @matcher = self.class.validate_attachment_size(:avatar).greater_than(1024)
+      end
+
+      should "be skipped" do
+        @dummy.avatar.expects(:post_process).never
+        assert_accepts @matcher, @dummy
+      end
+    end
   end
 end

data/test/nil_adapter_test.rb

@@ -0,0 +1,25 @@
+require './test/helper'
+
+class NilAdapterTest < Test::Unit::TestCase
+  context 'a new instance' do
+    setup do
+      @subject = Paperclip.io_adapters.for(nil)
+    end
+
+    should "get the right filename" do
+      assert_equal "", @subject.original_filename
+    end
+
+    should "get the content type" do
+      assert_equal "", @subject.content_type
+    end
+
+    should "get the file's size" do
+      assert_equal 0, @subject.size
+    end
+
+    should "return true for a call to nil?" do
+      assert @subject.nil?
+    end
+  end
+end

data/test/paperclip_missing_attachment_styles_test.rb

@@ -68,6 +68,22 @@ class PaperclipMissingAttachmentStylesTest < Test::Unit::TestCase
       Paperclip.save_current_attachments_styles!
       assert_equal Hash.new, Paperclip.missing_attachments_styles
     end
+    
+    should "be able to calculate differences when a new attachment is added to a model" do
+      rebuild_model :styles => {:croppable => '600x600>', :big => '1000x1000>'}
+      Paperclip.save_current_attachments_styles!
+      
+      class ::Dummy
+        has_attached_file :photo, :styles => {:small => 'x100', :large => '1000x1000>'}
+      end
+      
+      expected_hash = {
+        :Dummy => {:photo => [:large, :small]}
+      }
+      assert_equal expected_hash, Paperclip.missing_attachments_styles
+      Paperclip.save_current_attachments_styles!
+      assert_equal Hash.new, Paperclip.missing_attachments_styles
+    end
 
     # It's impossible to build styles hash without loading from database whole bunch of records
     should "skip lambda-styles" do

data/test/paperclip_test.rb

@@ -22,8 +22,34 @@ class PaperclipTest < Test::Unit::TestCase
       Paperclip.run("convert", "stuff")
       assert_equal [Cocaine::CommandLine.path].flatten.include?("/opt/my_app/bin"), true
     end
+
+    should "not duplicate Cocaine::CommandLine.path on multiple runs" do
+      Cocaine::CommandLine.expects(:new).with("convert", "more_stuff", {}).returns(stub(:run))
+      Cocaine::CommandLine.path = nil
+      Paperclip.options[:command_path] = "/opt/my_app/bin"
+      Paperclip.run("convert", "stuff")
+      Paperclip.run("convert", "more_stuff")
+      assert_equal 1, [Cocaine::CommandLine.path].flatten.size
+    end
   end
 
+  context "Calling Paperclip.log without options[:logger] set" do
+    setup do
+      Paperclip.logger = nil
+      Paperclip.options[:logger] = nil
+    end
+
+    teardown do
+      Paperclip.options[:logger] = ActiveRecord::Base.logger
+      Paperclip.logger = ActiveRecord::Base.logger
+    end
+
+    should "not raise an error when log is called" do
+      silence_stream(STDOUT) do
+        Paperclip.log('something')
+      end
+    end
+  end
   context "Calling Paperclip.run with a logger" do
     should "pass the defined logger if :log_command is set" do
       Paperclip.options[:log_command] = true
@@ -40,6 +66,9 @@ class PaperclipTest < Test::Unit::TestCase
       d3 = Dummy.create(:avatar => @file)
       @expected = [d1, d3]
     end
+
+    teardown { @file.close }
+
     should "yield every instance of a model that has an attachment" do
       actual = []
       Paperclip.each_instance_with_attachment("Dummy", "avatar") do |instance|
@@ -78,12 +107,13 @@ class PaperclipTest < Test::Unit::TestCase
     end
 
     should "generate warning if attachment is redefined with the same url string" do
-      Paperclip.expects(:log).with("Duplicate URL for blah with /system/:attachment/:id/:style/:filename. This will clash with attachment defined in Dummy class")
+      expected_log_msg = "Duplicate URL for blah with /system/:id/:style/:filename. This will clash with attachment defined in Dummy class"
+      Paperclip.expects(:log).with(expected_log_msg)
       Dummy.class_eval do
-        has_attached_file :blah
+        has_attached_file :blah, :url => '/system/:id/:style/:filename'
       end
       Dummy2.class_eval do
-        has_attached_file :blah
+        has_attached_file :blah, :url => '/system/:id/:style/:filename'
       end
     end
 
@@ -156,6 +186,7 @@ class PaperclipTest < Test::Unit::TestCase
       end
 
       teardown do
+        SubDummy.delete_all
         Object.send(:remove_const, "SubDummy") rescue nil
       end
     end
@@ -179,191 +210,11 @@ class PaperclipTest < Test::Unit::TestCase
       end
     end
 
-    context "a validation with an if guard clause" do
-      context "as a lambda" 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)
-          assert ! @dummy.valid?
-        end
-
-        should "not attempt validation if the guard returns false" do
-          @dummy.expects(:foo).returns(false)
-          assert @dummy.valid?
-        end
-      end
-
-      context "as a method name" do
-        setup do
-          Dummy.send(:"validates_attachment_presence", :avatar, :if => :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)
-          assert ! @dummy.valid?
-        end
-
-        should "not attempt validation if the guard returns false" do
-          @dummy.expects(:foo).returns(false)
-          assert @dummy.valid?
-        end
-      end
-    end
-
-    context "a validation with an unless guard clause" do
-      context "as a lambda" do
-        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)
-          assert ! @dummy.valid?
-        end
-
-        should "not attempt validation if the guard returns false" do
-          @dummy.expects(:foo).returns(true)
-          assert @dummy.valid?
-        end
-      end
-
-      context "as a method name" do
-        setup do
-          Dummy.send(:"validates_attachment_presence", :avatar, :unless => :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)
-          assert ! @dummy.valid?
-        end
-
-        should "not attempt validation if the guard returns false" do
-          @dummy.expects(:foo).returns(true)
-          assert @dummy.valid?
-        end
-      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
-        context "and assigning nil" do
-          setup do
-            @dummy.avatar = nil
-            @dummy.valid?
-          end
-          if validation == :presence
-            should "have an error on the attachment" do
-              assert @dummy.errors[:avatar]
-              assert @dummy.errors[:avatar_file_name]
-            end
-          else
-            should "not have an error on the attachment" do
-              assert @dummy.errors.blank?, @dummy.errors.full_messages.join(", ")
-            end
-          end
-        end
-        context "and assigned a valid file" do
-          setup do
-            @dummy.avatar = valid_file
-            @dummy.valid?
-          end
-          should "not have an error" do
-            assert_equal 0, @dummy.errors.size, @dummy.errors.full_messages.join(", ")
-          end
-        end
-        context "and assigned an invalid file" do
-          setup do
-            @dummy.avatar = invalid_file
-            @dummy.valid?
-          end
-          should "have an error" do
-            assert @dummy.errors.size > 0
-          end
-        end
-      end
-    end
-
-    [[:presence,      {},                              "5k.png",   nil],
-     [: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"],
-     [:content_type,  {:content_type => "text/plain"}, "text.txt", "5k.png"],
-     [:content_type,  {:content_type => %r{image/.*}}, "5k.png",   "text.txt"]].each do |args|
-      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 content_type validation and lambda message" do
-      context "and assigned an invalid file" do
-        setup do
-          Dummy.send(:"validates_attachment_content_type", :avatar, :content_type => %r{image/.*}, :message => lambda {'lambda content type message'})
-          @dummy = Dummy.new
-          @dummy.avatar &&= File.open(File.join(FIXTURES_DIR, "text.txt"), "rb")
-          @dummy.valid?
-        end
-
-        should "have a content type error message" do
-          assert [@dummy.errors[:avatar_content_type]].flatten.any?{|error| error =~ %r/lambda content type message/ }
-        end
-      end
-    end
-
-    context "with size validation and less_than 10240 option" do
-      context "and assigned an invalid file" do
-        setup do
-          Dummy.send(:"validates_attachment_size", :avatar, :less_than => 10240)
-          @dummy = Dummy.new
-          @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]].flatten.any?{|error| error =~ %r/between 0 and 10240 bytes/ }
-        end
-      end
-    end
-
-    context "with size validation and less_than 10240 option with lambda message" do
-      context "and assigned an invalid file" do
-        setup do
-          Dummy.send(:"validates_attachment_size", :avatar, :less_than => 10240, :message => lambda {'lambda between 0 and 10240 bytes'})
-          @dummy = Dummy.new
-          @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]].flatten.any?{|error| error =~ %r/lambda between 0 and 10240 bytes/ }
-        end
-      end
-    end
-
   end
 
   context "configuring a custom processor" do