cloudfuji_paperclip 2.4.6 → 3.0.3

data/test/stringio_adapter_test.rb

@@ -0,0 +1,42 @@
+require './test/helper'
+
+class StringioFileProxyTest < Test::Unit::TestCase
+  context "a new instance" do
+    setup do
+      @contents = "abc123"
+      @stringio = StringIO.new(@contents)
+      @subject = Paperclip.io_adapters.for(@stringio)
+    end
+
+    should "return a file name" do
+      assert_equal "stringio.txt", @subject.original_filename
+    end
+
+    should "allow us to set a name" do
+      @subject.original_filename = "data.txt"
+      assert_equal "data.txt", @subject.original_filename
+    end
+
+    should "return a content type" do
+      assert_equal "text/plain", @subject.content_type
+    end
+
+    should "allow us to set a content type" do
+      @subject.content_type = "image/jpg"
+      assert_equal "image/jpg", @subject.content_type
+    end
+
+    should "return the size of the data" do
+      assert_equal 6, @subject.size
+    end
+
+    should "generate an MD5 hash of the contents" do
+      assert_equal Digest::MD5.hexdigest(@contents), @subject.fingerprint
+    end
+
+    should "return the data contained in the StringIO" do
+      assert_equal "abc123", @subject.read
+    end
+
+  end
+end

data/test/thumbnail_test.rb

@@ -7,6 +7,8 @@ class ThumbnailTest < Test::Unit::TestCase
       @tempfile = Paperclip::Tempfile.new(["file", ".jpg"])
     end
 
+    teardown { @tempfile.close }
+
     should "have its path contain a real extension" do
       assert_equal ".jpg", File.extname(@tempfile.path)
     end
@@ -21,6 +23,8 @@ class ThumbnailTest < Test::Unit::TestCase
       @tempfile = Paperclip::Tempfile.new("file")
     end
 
+    teardown { @tempfile.close }
+
     should "not have an extension if not given one" do
       assert_equal "", File.extname(@tempfile.path)
     end
@@ -77,8 +81,10 @@ class ThumbnailTest < Test::Unit::TestCase
         old_path = ENV['PATH']
         begin
           ENV['PATH'] = ''
-          assert_raises(Paperclip::CommandNotFoundError) do
-            @thumb.make
+          assert_raises(Paperclip::Errors::CommandNotFoundError) do
+            silence_stream(STDERR) do
+              @thumb.make
+            end
           end
         ensure
           ENV['PATH'] = old_path
@@ -154,8 +160,10 @@ class ThumbnailTest < Test::Unit::TestCase
         end
 
         should "error when trying to create the thumbnail" do
-          assert_raises(Paperclip::PaperclipError) do
-            @thumb.make
+          assert_raises(Paperclip::Error) do
+            silence_stream(STDERR) do
+              @thumb.make
+            end
           end
         end
       end
@@ -194,8 +202,10 @@ class ThumbnailTest < Test::Unit::TestCase
         end
 
         should "error when trying to create the thumbnail" do
-          assert_raises(Paperclip::PaperclipError) do
-            @thumb.make
+          assert_raises(Paperclip::Error) do
+            silence_stream(STDERR) do
+              @thumb.make
+            end
           end
         end
 
@@ -203,8 +213,10 @@ class ThumbnailTest < Test::Unit::TestCase
           old_path = ENV['PATH']
           begin
             ENV['PATH'] = ''
-            assert_raises(Paperclip::CommandNotFoundError) do
-              @thumb.make
+            assert_raises(Paperclip::Errors::CommandNotFoundError) do
+              silence_stream(STDERR) do
+                @thumb.make
+              end
             end
           ensure
             ENV['PATH'] = old_path
@@ -226,11 +238,16 @@ class ThumbnailTest < Test::Unit::TestCase
     end
 
     context "passing a custom file geometry parser" do
+      teardown do
+        self.class.send(:remove_const, :GeoParser)
+      end
+
       should "produce the appropriate transformation_command" do
         GeoParser = Class.new do
           def self.from_file(file)
             new
           end
+
           def transformation_to(target, should_crop)
             ["SCALE", "CROP"]
           end
@@ -252,6 +269,10 @@ class ThumbnailTest < Test::Unit::TestCase
     end
 
     context "passing a custom geometry string parser" do
+      teardown do
+        self.class.send(:remove_const, :GeoParser)
+      end
+
       should "produce the appropriate transformation_command" do
         GeoParser = Class.new do
           def self.parse(s)

data/test/uploaded_file_adapter_test.rb

@@ -0,0 +1,98 @@
+require './test/helper'
+
+class UploadedFileAdapterTest < Test::Unit::TestCase
+  context "a new instance" do
+    context "with UploadedFile responding to #tempfile" do
+      setup do
+        class UploadedFile < OpenStruct; end
+        tempfile = File.new(fixture_file("5k.png"))
+        tempfile.binmode
+
+        @file = UploadedFile.new(
+          :original_filename => "5k.png",
+          :content_type => "image/png",
+          :head => "",
+          :tempfile => tempfile
+        )
+        @subject = Paperclip.io_adapters.for(@file)
+      end
+
+      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 "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.tempfile.path).to_s
+        assert_equal expected, @subject.fingerprint
+      end
+
+      should "read the contents of the file" do
+        expected = @file.tempfile.read
+        assert expected.length > 0
+        assert_equal expected, @subject.read
+      end
+    end
+
+    context "with UploadFile responding to #path" do
+      setup do
+        class UploadedFile < OpenStruct; end
+        @file = UploadedFile.new(
+          :original_filename => "5k.png",
+          :content_type => "image/png",
+          :head => "",
+          :path => fixture_file("5k.png")
+        )
+        @subject = Paperclip.io_adapters.for(@file)
+      end
+
+      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 "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 = File.new(@file.path)
+        expected_file.binmode
+        expected = expected_file.read
+        assert expected.length > 0
+        assert_equal expected, @subject.read
+      end
+    end
+  end
+end

data/test/url_generator_test.rb

@@ -77,7 +77,7 @@ class UrlGeneratorTest < Test::Unit::TestCase
     end.new
     mock_attachment = MockAttachment.new
     mock_interpolator = MockInterpolator.new(:result => expected)
-    options = { :interpolator => mock_interpolator}
+    options = { :interpolator => mock_interpolator }
     url_generator = Paperclip::UrlGenerator.new(mock_attachment, options)
 
     result = url_generator.for(:style_name, {:escape => true})
@@ -89,7 +89,7 @@ class UrlGeneratorTest < Test::Unit::TestCase
     expected = "the expected result"
     mock_attachment = MockAttachment.new
     mock_interpolator = MockInterpolator.new(:result => expected)
-    options = { :interpolator => mock_interpolator}
+    options = { :interpolator => mock_interpolator }
     url_generator = Paperclip::UrlGenerator.new(mock_attachment, options)
 
     result = url_generator.for(:style_name, {:escape => false})
@@ -101,7 +101,7 @@ class UrlGeneratorTest < Test::Unit::TestCase
     expected = "the expected result"
     mock_attachment = MockAttachment.new
     mock_interpolator = MockInterpolator.new(:result => expected)
-    options = { :interpolator => mock_interpolator}
+    options = { :interpolator => mock_interpolator }
     url_generator = Paperclip::UrlGenerator.new(mock_attachment, options)
 
     result = url_generator.for(:style_name, {})
@@ -113,7 +113,7 @@ class UrlGeneratorTest < Test::Unit::TestCase
     expected = "the expected result"
     mock_interpolator = MockInterpolator.new(:result => expected)
     mock_attachment = MockAttachment.new(:responds_to_updated_at => false)
-    options = { :interpolator => mock_interpolator}
+    options = { :interpolator => mock_interpolator }
     url_generator = Paperclip::UrlGenerator.new(mock_attachment, options)
 
     result = url_generator.for(:style_name, {:timestamp => true})
@@ -125,7 +125,7 @@ class UrlGeneratorTest < Test::Unit::TestCase
     expected = "the expected result"
     mock_interpolator = MockInterpolator.new(:result => expected)
     mock_attachment = MockAttachment.new(:responds_to_updated_at => true, :updated_at => nil)
-    options = { :interpolator => mock_interpolator}
+    options = { :interpolator => mock_interpolator }
     url_generator = Paperclip::UrlGenerator.new(mock_attachment, options)
 
     result = url_generator.for(:style_name, {:timestamp => true})
@@ -138,7 +138,7 @@ class UrlGeneratorTest < Test::Unit::TestCase
     updated_at = 1231231234
     mock_interpolator = MockInterpolator.new(:result => expected)
     mock_attachment = MockAttachment.new(:updated_at => updated_at)
-    options = { :interpolator => mock_interpolator}
+    options = { :interpolator => mock_interpolator }
     url_generator = Paperclip::UrlGenerator.new(mock_attachment, options)
 
     result = url_generator.for(:style_name, {:timestamp => true})
@@ -151,7 +151,7 @@ class UrlGeneratorTest < Test::Unit::TestCase
     updated_at = 1231231234
     mock_interpolator = MockInterpolator.new(:result => expected)
     mock_attachment = MockAttachment.new(:updated_at => updated_at)
-    options = { :interpolator => mock_interpolator}
+    options = { :interpolator => mock_interpolator }
     url_generator = Paperclip::UrlGenerator.new(mock_attachment, options)
 
     result = url_generator.for(:style_name, {:timestamp => true})
@@ -164,7 +164,7 @@ class UrlGeneratorTest < Test::Unit::TestCase
     updated_at = 1231231234
     mock_interpolator = MockInterpolator.new(:result => expected)
     mock_attachment = MockAttachment.new(:updated_at => updated_at)
-    options = { :interpolator => mock_interpolator}
+    options = { :interpolator => mock_interpolator }
     url_generator = Paperclip::UrlGenerator.new(mock_attachment, options)
 
     result = url_generator.for(:style_name, {:timestamp => false})

data/test/validators/attachment_content_type_validator_test.rb

@@ -0,0 +1,192 @@
+require './test/helper'
+
+class AttachmentContentTypeValidatorTest < Test::Unit::TestCase
+  def setup
+    rebuild_model
+    @dummy = Dummy.new
+  end
+
+  def build_validator(options)
+    @validator = Paperclip::Validators::AttachmentContentTypeValidator.new(options.merge(
+      :attributes => :avatar
+    ))
+  end
+
+  context "with a nil content type" do
+    setup do
+      build_validator :content_type => "image/jpg"
+      @dummy.stubs(:avatar_content_type => nil)
+      @validator.validate(@dummy)
+    end
+
+    should "not set an error message" do
+      assert @dummy.errors[:avatar_content_type].blank?
+    end
+  end
+
+  context "with :allow_nil option" do
+    context "as true" do
+      setup do
+        build_validator :content_type => "image/png", :allow_nil => true
+        @dummy.stubs(:avatar_content_type => nil)
+        @validator.validate(@dummy)
+      end
+
+      should "allow avatar_content_type as nil" do
+        assert @dummy.errors[:avatar_content_type].blank?
+      end
+    end
+
+    context "as false" do
+      setup do
+        build_validator :content_type => "image/png", :allow_nil => false
+        @dummy.stubs(:avatar_content_type => nil)
+        @validator.validate(@dummy)
+      end
+
+      should "not allow avatar_content_type as nil" do
+        assert @dummy.errors[:avatar_content_type].present?
+      end
+    end
+  end
+
+  context "with :allow_blank option" do
+    context "as true" do
+      setup do
+        build_validator :content_type => "image/png", :allow_blank => true
+        @dummy.stubs(:avatar_content_type => "")
+        @validator.validate(@dummy)
+      end
+
+      should "allow avatar_content_type as blank" do
+        assert @dummy.errors[:avatar_content_type].blank?
+      end
+    end
+
+    context "as false" do
+      setup do
+        build_validator :content_type => "image/png", :allow_blank => false
+        @dummy.stubs(:avatar_content_type => "")
+        @validator.validate(@dummy)
+      end
+
+      should "not allow avatar_content_type as blank" do
+        assert @dummy.errors[:avatar_content_type].present?
+      end
+    end
+  end
+
+  context "with an allowed type" do
+    context "as a string" do
+      setup do
+        build_validator :content_type => "image/jpg"
+        @dummy.stubs(:avatar_content_type => "image/jpg")
+        @validator.validate(@dummy)
+      end
+
+      should "not set an error message" do
+        assert @dummy.errors[:avatar_content_type].blank?
+      end
+    end
+
+    context "as an regexp" do
+      setup do
+        build_validator :content_type => /^image\/.*/
+        @dummy.stubs(:avatar_content_type => "image/jpg")
+        @validator.validate(@dummy)
+      end
+
+      should "not set an error message" do
+        assert @dummy.errors[:avatar_content_type].blank?
+      end
+    end
+
+    context "as a list" do
+      setup do
+        build_validator :content_type => ["image/png", "image/jpg", "image/jpeg"]
+        @dummy.stubs(:avatar_content_type => "image/jpg")
+        @validator.validate(@dummy)
+      end
+
+      should "not set an error message" do
+        assert @dummy.errors[:avatar_content_type].blank?
+      end
+    end
+  end
+
+  context "with a disallowed type" do
+    context "as a string" do
+      setup do
+        build_validator :content_type => "image/png"
+        @dummy.stubs(:avatar_content_type => "image/jpg")
+        @validator.validate(@dummy)
+      end
+
+      should "set a correct default error message" do
+        assert @dummy.errors[:avatar_content_type].present?
+        assert_includes @dummy.errors[:avatar_content_type], "is invalid"
+      end
+    end
+
+    context "as a regexp" do
+      setup do
+        build_validator :content_type => /^text\/.*/
+        @dummy.stubs(:avatar_content_type => "image/jpg")
+        @validator.validate(@dummy)
+      end
+
+      should "set a correct default error message" do
+        assert @dummy.errors[:avatar_content_type].present?
+        assert_includes @dummy.errors[:avatar_content_type], "is invalid"
+      end
+    end
+
+    context "with :message option" do
+      context "without interpolation" do
+        setup do
+          build_validator :content_type => "image/png", :message => "should be a PNG image"
+          @dummy.stubs(:avatar_content_type => "image/jpg")
+          @validator.validate(@dummy)
+        end
+
+        should "set a correct error message" do
+          assert_includes @dummy.errors[:avatar_content_type], "should be a PNG image"
+        end
+      end
+
+      context "with interpolation" do
+        setup do
+          build_validator :content_type => "image/png", :message => "should have content type %{types}"
+          @dummy.stubs(:avatar_content_type => "image/jpg")
+          @validator.validate(@dummy)
+        end
+
+        should "set a correct error message" do
+          assert_includes @dummy.errors[:avatar_content_type], "should have content type image/png"
+        end
+      end
+    end
+  end
+
+  context "using the helper" do
+    setup do
+      Dummy.validates_attachment_content_type :avatar, :content_type => "image/jpg"
+    end
+
+    should "add the validator to the class" do
+      assert Dummy.validators_on(:avatar).any?{ |validator| validator.kind == :attachment_content_type }
+    end
+  end
+
+  context "given options" do
+    should "raise argument error if no required argument was given" do
+      assert_raises(ArgumentError) do
+        build_validator :message => "Some message"
+      end
+    end
+
+    should "not raise arguemnt error if :content_type was given" do
+      build_validator :content_type => "image/jpg"
+    end
+  end
+end