cloudfuji_paperclip 2.4.6 → 3.0.3

data/test/attachment_options_test.rb

@@ -0,0 +1,27 @@
+require './test/helper'
+
+class AttachmentOptionsTest < Test::Unit::TestCase
+  should "be a Hash" do
+    assert_kind_of Hash, Paperclip::AttachmentOptions.new({})
+  end
+
+  should "respond to []" do
+    assert Paperclip::AttachmentOptions.new({}).respond_to?(:[])
+  end
+
+  should "deliver the specified options through []" do
+    intended_options = {:specific_key => "specific value"}
+    attachment_options = Paperclip::AttachmentOptions.new(intended_options)
+    assert_equal "specific value", attachment_options[:specific_key]
+  end
+
+  should "respond to []=" do
+    assert Paperclip::AttachmentOptions.new({}).respond_to?(:[]=)
+  end
+
+  should "remember options set with []=" do
+    attachment_options = Paperclip::AttachmentOptions.new({})
+    attachment_options[:foo] = "bar"
+    assert_equal "bar", attachment_options[:foo]
+  end
+end

data/test/attachment_test.rb

@@ -5,6 +5,40 @@ require 'paperclip/attachment'
 class Dummy; end
 
 class AttachmentTest < Test::Unit::TestCase
+
+  should "process :original style first" do
+    file = File.new(File.join(File.dirname(__FILE__), "fixtures", "50x50.png"), 'rb')
+    rebuild_class :styles => { :small => '100x>', :original => '42x42#' }
+    dummy = Dummy.new
+    dummy.avatar = file
+    dummy.save
+
+    # :small avatar should be 42px wide (processed original), not 50px (preprocessed original)
+    assert_equal `identify -format "%w" "#{dummy.avatar.path(:small)}"`.strip, "42"
+
+    file.close
+  end
+
+  should "not delete styles that don't get reprocessed" do
+    file = File.new(File.join(File.dirname(__FILE__), "fixtures", "50x50.png"), 'rb')
+    rebuild_class :styles => { :small => '100x>',
+                               :large => '500x>',
+                               :original => '42x42#' }
+    dummy = Dummy.new
+    dummy.avatar = file
+    dummy.save
+
+    assert File.exists?(dummy.avatar.path(:small))
+    assert File.exists?(dummy.avatar.path(:large))
+    assert File.exists?(dummy.avatar.path(:original))
+
+    dummy.avatar.reprocess!(:small)
+
+    assert File.exists?(dummy.avatar.path(:small))
+    assert File.exists?(dummy.avatar.path(:large))
+    assert File.exists?(dummy.avatar.path(:original))
+  end
+
   should "handle a boolean second argument to #url" do
     mock_url_generator_builder = MockUrlGeneratorBuilder.new
     attachment = Paperclip::Attachment.new(:name, :instance, :url_generator => mock_url_generator_builder)
@@ -89,6 +123,15 @@ class AttachmentTest < Test::Unit::TestCase
     assert_equal "#{Rails.root}/public/fake_models/1234/fake", @attachment.path
   end
 
+  should "default to a path that scales" do
+    avatar_attachment = attachment
+    model = avatar_attachment.instance
+    model.id = 1234
+    model.avatar_file_name = "fake.jpg"
+    expected_path = "#{Rails.root}/public/system/fake_models/avatars/000/001/234/original/fake.jpg"
+    assert_equal expected_path, avatar_attachment.path
+  end
+
   context "Attachment default_options" do
     setup do
       rebuild_model
@@ -231,7 +274,7 @@ class AttachmentTest < Test::Unit::TestCase
 
       should "interpolate the hash data" do
         @attachment.expects(:interpolate).with(@attachment.options[:hash_data],anything).returns("interpolated_stuff")
-        @attachment.hash
+        @attachment.hash_key
       end
 
       should "result in the correct interpolation" do
@@ -489,7 +532,7 @@ class AttachmentTest < Test::Unit::TestCase
     setup do
       rebuild_model :processor => [:thumbnail], :styles => { :small => '' }, :whiny_thumbnails => true
       @dummy = Dummy.new
-      Paperclip::Thumbnail.expects(:make).raises(Paperclip::PaperclipError, "cannot be processed.")
+      Paperclip::Thumbnail.expects(:make).raises(Paperclip::Error, "cannot be processed.")
       @file = StringIO.new("...")
       @file.stubs(:to_tempfile).returns(@file)
       @dummy.avatar = @file
@@ -556,7 +599,7 @@ class AttachmentTest < Test::Unit::TestCase
   should "convert underscored storage name to camelcase" do
     rebuild_model :storage => :not_here
     @dummy = Dummy.new
-    exception = assert_raises(Paperclip::StorageMethodNotFound) do
+    exception = assert_raises(Paperclip::Errors::StorageMethodNotFound) do
       @dummy.avatar
     end
     assert exception.message.include?("NotHere")
@@ -565,7 +608,7 @@ class AttachmentTest < Test::Unit::TestCase
   should "raise an error if you try to include a storage module that doesn't exist" do
     rebuild_model :storage => :not_here
     @dummy = Dummy.new
-    assert_raises(Paperclip::StorageMethodNotFound) do
+    assert_raises(Paperclip::Errors::StorageMethodNotFound) do
       @dummy.avatar
     end
   end
@@ -652,13 +695,10 @@ class AttachmentTest < Test::Unit::TestCase
   context "Assigning an attachment" do
     setup do
       rebuild_model :styles => { :something => "100x100#" }
-      @file  = StringIO.new(".")
+      @file = StringIO.new(".")
       @file.stubs(:original_filename).returns("5k.png\n\n")
       @file.stubs(:content_type).returns("image/png\n\n")
-      @file.stubs(:to_tempfile).returns(@file)
       @dummy = Dummy.new
-      Paperclip::Thumbnail.expects(:make).returns(@file)
-      @attachment = @dummy.avatar
       @dummy.avatar = @file
     end
 
@@ -671,27 +711,31 @@ class AttachmentTest < Test::Unit::TestCase
     end
   end
 
+  context "Assigning an attachment" do
+    setup do
+      rebuild_model :styles => { :something => "100x100#" }
+      @file = StringIO.new(".")
+      @file.stubs(:original_filename).returns("5k.png\n\n")
+      @file.stubs(:content_type).returns(MIME::Type.new("image/png"))
+      @dummy = Dummy.new
+      @dummy.avatar = @file
+    end
+
+    should "make sure the content_type is a string" do
+      assert_equal "image/png", @dummy.avatar.instance.avatar_content_type
+    end
+  end
+
   context "Attachment with strange letters" do
     setup do
       rebuild_model
 
-      @not_file = mock("not_file")
-      @tempfile = mock("tempfile")
-      @not_file.stubs(:nil?).returns(false)
-      @not_file.expects(:size).returns(10)
-      @tempfile.expects(:size).returns(10)
-      @not_file.expects(:original_filename).returns("sheep_say_bæ.png\r\n")
-      @not_file.expects(:content_type).returns("image/png\r\n")
+      @file  = StringIO.new(".")
+      @file.stubs(:original_filename).returns("sheep_say_bæ.png\r\n")
+      @file.stubs(:content_type).returns("image/png\r\n")
 
       @dummy = Dummy.new
-      @attachment = @dummy.avatar
-      @attachment.expects(:valid_assignment?).with(@not_file).returns(true)
-      @attachment.expects(:queue_existing_for_delete)
-      @attachment.expects(:post_process)
-      @attachment.expects(:to_tempfile).returns(@tempfile)
-      @attachment.expects(:generate_fingerprint).with(@tempfile).returns("12345")
-      @attachment.expects(:generate_fingerprint).with(@not_file).returns("12345")
-      @dummy.avatar = @not_file
+      @dummy.avatar = @file
     end
 
     should "not remove strange letters" do
@@ -699,6 +743,48 @@ class AttachmentTest < Test::Unit::TestCase
     end
   end
 
+  context "Attachment with reserved filename" do
+    setup do
+      rebuild_model
+      @file = Paperclip.io_adapters.for(StringIO.new("."))
+    end
+
+    context "with default configuration" do
+      "&$+,/:;=?@<>[]{}|\^~%# ".split(//).each do |character|
+        context "with character #{character}" do
+          setup do
+            @file.original_filename = "file#{character}name.png"
+            @dummy = Dummy.new
+            @dummy.avatar = @file
+          end
+
+          should "convert special character into underscore" do
+            assert_equal "file_name.png", @dummy.avatar.original_filename
+          end
+        end
+      end
+    end
+
+    context "with specified regexp replacement" do
+      setup do
+        @old_defaults = Paperclip::Attachment.default_options.dup
+        Paperclip::Attachment.default_options.merge! :restricted_characters => /o/
+
+        @file.stubs(:original_filename).returns("goood.png")
+        @dummy = Dummy.new
+        @dummy.avatar = @file
+      end
+
+      teardown do
+        Paperclip::Attachment.default_options.merge! @old_defaults
+      end
+
+      should "match and convert that character" do
+        assert_equal "g___d.png", @dummy.avatar.original_filename
+      end
+    end
+  end
+
   context "Attachment with uppercase extension and a default style" do
     setup do
       @old_defaults = Paperclip::Attachment.default_options.dup
@@ -731,11 +817,8 @@ class AttachmentTest < Test::Unit::TestCase
     end
 
     should "should have matching to_s and url methods" do
-      file = @attachment.to_file
-      assert file
       assert_match @attachment.to_s, @attachment.url
       assert_match @attachment.to_s(:small), @attachment.url(:small)
-      file.close
     end
   end
 
@@ -760,13 +843,12 @@ class AttachmentTest < Test::Unit::TestCase
 
     should "raise if there are not the correct columns when you try to assign" do
       @other_attachment = Paperclip::Attachment.new(:not_here, @instance)
-      assert_raises(Paperclip::PaperclipError) do
+      assert_raises(Paperclip::Error) do
         @other_attachment.assign(@file)
       end
     end
 
     should "return nil as path when no file assigned" do
-      assert @attachment.to_file.nil?
       assert_equal nil, @attachment.path
       assert_equal nil, @attachment.path(:blah)
     end
@@ -821,10 +903,6 @@ class AttachmentTest < Test::Unit::TestCase
             assert @attachment.dirty?
           end
 
-          should "set uploaded_file for access beyond the paperclip lifecycle" do
-            assert_equal @file, @attachment.uploaded_file
-          end
-
           context "and saved" do
             setup do
               @attachment.save
@@ -832,11 +910,7 @@ class AttachmentTest < Test::Unit::TestCase
 
             should "commit the files to disk" do
               [:large, :medium, :small].each do |style|
-                io = @attachment.to_file(style)
-                # p "in commit to disk test, io is #{io.inspect} and @instance.id is #{@instance.id}"
-                assert File.exists?(io.path)
-                assert ! io.is_a?(::Tempfile)
-                io.close
+                assert File.exists?(@attachment.path(style))
               end
             end
 
@@ -853,11 +927,6 @@ class AttachmentTest < Test::Unit::TestCase
               end
             end
 
-            should "still have its #file attribute not be nil" do
-              assert ! (file = @attachment.to_file).nil?
-              file.close
-            end
-
             context "and trying to delete" do
               setup do
                 @existing_names = @attachment.styles.keys.collect do |style|
@@ -869,6 +938,7 @@ class AttachmentTest < Test::Unit::TestCase
                 @attachment.expects(:instance_write).with(:file_name, nil)
                 @attachment.expects(:instance_write).with(:content_type, nil)
                 @attachment.expects(:instance_write).with(:file_size, nil)
+                @attachment.expects(:instance_write).with(:fingerprint, nil)
                 @attachment.expects(:instance_write).with(:updated_at, nil)
                 @attachment.assign nil
                 @attachment.save
@@ -879,6 +949,7 @@ class AttachmentTest < Test::Unit::TestCase
                 @attachment.expects(:instance_write).with(:file_name, nil)
                 @attachment.expects(:instance_write).with(:content_type, nil)
                 @attachment.expects(:instance_write).with(:file_size, nil)
+                @attachment.expects(:instance_write).with(:fingerprint, nil)
                 @attachment.expects(:instance_write).with(:updated_at, nil)
                 @attachment.clear
                 @attachment.save
@@ -889,6 +960,7 @@ class AttachmentTest < Test::Unit::TestCase
                 @attachment.expects(:instance_write).with(:file_name, nil)
                 @attachment.expects(:instance_write).with(:content_type, nil)
                 @attachment.expects(:instance_write).with(:file_size, nil)
+                @attachment.expects(:instance_write).with(:fingerprint, nil)
                 @attachment.expects(:instance_write).with(:updated_at, nil)
                 @attachment.destroy
                 @existing_names.each{|f| assert ! File.exists?(f) }
@@ -903,6 +975,7 @@ class AttachmentTest < Test::Unit::TestCase
                   @attachment.expects(:instance_write).with(:file_name, nil)
                   @attachment.expects(:instance_write).with(:content_type, nil)
                   @attachment.expects(:instance_write).with(:file_size, nil)
+                  @attachment.expects(:instance_write).with(:fingerprint, nil)
                   @attachment.expects(:instance_write).with(:updated_at, nil)
                   @attachment.assign nil
                   @attachment.save
@@ -913,6 +986,7 @@ class AttachmentTest < Test::Unit::TestCase
                   @attachment.expects(:instance_write).with(:file_name, nil)
                   @attachment.expects(:instance_write).with(:content_type, nil)
                   @attachment.expects(:instance_write).with(:file_size, nil)
+                  @attachment.expects(:instance_write).with(:fingerprint, nil)
                   @attachment.expects(:instance_write).with(:updated_at, nil)
                   @attachment.clear
                   @attachment.save
@@ -923,6 +997,7 @@ class AttachmentTest < Test::Unit::TestCase
                   @attachment.expects(:instance_write).with(:file_name, nil)
                   @attachment.expects(:instance_write).with(:content_type, nil)
                   @attachment.expects(:instance_write).with(:file_size, nil)
+                  @attachment.expects(:instance_write).with(:fingerprint, nil)
                   @attachment.expects(:instance_write).with(:updated_at, nil)
                   @attachment.destroy
                   @existing_names.each{|f| assert File.exists?(f) }
@@ -940,7 +1015,7 @@ class AttachmentTest < Test::Unit::TestCase
       end
 
       should "not be able to find the module" do
-        assert_raise(Paperclip::StorageMethodNotFound){ Dummy.new.avatar }
+        assert_raise(Paperclip::Errors::StorageMethodNotFound){ Dummy.new.avatar }
       end
     end
   end
@@ -976,7 +1051,7 @@ class AttachmentTest < Test::Unit::TestCase
 
     should "return the right value when sent #avatar_file_size" do
       @dummy.avatar = @file
-      assert_equal @file.size, @dummy.avatar.size
+      assert_equal File.size(@file), @dummy.avatar.size
     end
 
     context "and avatar_updated_at column" do
@@ -998,6 +1073,11 @@ class AttachmentTest < Test::Unit::TestCase
       end
     end
 
+    should "not calculate fingerprint" do
+      @dummy.avatar = @file
+      assert_nil @dummy.avatar.fingerprint
+    end
+
     context "and avatar_content_type column" do
       setup do
         ActiveRecord::Base.connection.add_column :dummies, :avatar_content_type, :string
@@ -1028,14 +1108,14 @@ class AttachmentTest < Test::Unit::TestCase
 
       should "return the right value when sent #avatar_file_size" do
         @dummy.avatar = @file
-        assert_equal @file.size, @dummy.avatar.size
+        assert_equal File.size(@file), @dummy.avatar.size
       end
 
       should "return the right value when saved, reloaded, and sent #avatar_file_size" do
         @dummy.avatar = @file
         @dummy.save
         @dummy = Dummy.find(@dummy.id)
-        assert_equal @file.size, @dummy.avatar.size
+        assert_equal File.size(@file), @dummy.avatar.size
       end
     end
 
@@ -1075,6 +1155,8 @@ class AttachmentTest < Test::Unit::TestCase
       @path = @attachment.path
     end
 
+    teardown { @file.close }
+
     should "not delete the files from storage when attachment is destroyed" do
       @attachment.destroy
       assert File.exists?(@path)
@@ -1097,6 +1179,8 @@ class AttachmentTest < Test::Unit::TestCase
       @path = @attachment.path
     end
 
+    teardown { @file.close }
+
     should "not be deleted when the model fails to destroy" do
       @dummy.stubs(:destroy).raises(Exception)
 

data/test/file_adapter_test.rb

@@ -0,0 +1,88 @@
+require './test/helper'
+
+class FileAdapterTest < Test::Unit::TestCase
+  context "a new instance" do
+    context "with normal file" do
+      setup do
+        @file = File.new(fixture_file("5k.png"))
+        @file.binmode
+        @subject = Paperclip.io_adapters.for(@file)
+      end
+
+      teardown { @file.close }
+
+      should "get the right filename" do
+        assert_equal "5k.png", @subject.original_filename
+      end
+
+      should "force binmode on tempfile" do
+        assert @subject.instance_variable_get("@tempfile").binmode?
+      end
+
+      should "get the content type" do
+        assert_equal "image/png", @subject.content_type
+      end
+
+      should "return content type as a string" do
+        assert_kind_of String, @subject.content_type
+      end
+
+      should "get the file's size" do
+        assert_equal 4456, @subject.size
+      end
+
+      should "return false for a call to nil?" do
+        assert ! @subject.nil?
+      end
+
+      should "generate a MD5 hash of the contents" do
+        expected = Digest::MD5.file(@file.path).to_s
+        assert_equal expected, @subject.fingerprint
+      end
+
+      should "read the contents of the file" do
+        expected = @file.read
+        assert expected.length > 0
+        assert_equal expected, @subject.read
+      end
+
+      context "file with multiple possible content type" do
+        setup do
+          MIME::Types.stubs(:type_for).returns([MIME::Type.new('image/x-png'), MIME::Type.new('image/png')])
+        end
+
+        should "prefer officially registered mime type" do
+          assert_equal "image/png", @subject.content_type
+        end
+
+        should "return content type as a string" do
+          assert_kind_of String, @subject.content_type
+        end
+      end
+
+      context "file with content type derived from file command on *nix" do
+        setup do
+          MIME::Types.stubs(:type_for).returns([])
+          Paperclip.stubs(:run).returns("application/vnd.ms-office\n")
+        end
+
+        should "return content type without newline character" do
+          assert_equal "application/vnd.ms-office", @subject.content_type
+        end
+      end
+    end
+
+    context "empty file" do
+      setup do
+        @file = Tempfile.new("file_adapter_test")
+        @subject = Paperclip.io_adapters.for(@file)
+      end
+
+      teardown { @file.close }
+
+      should "provide correct mime-type" do
+        assert_equal "application/x-empty", @subject.content_type
+      end
+    end
+  end
+end