paperclip 3.0.2 → 3.0.3

data/test/validators/attachment_content_type_validator_test.rb

@@ -24,6 +24,58 @@ class AttachmentContentTypeValidatorTest < Test::Unit::TestCase
     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
@@ -48,7 +100,7 @@ class AttachmentContentTypeValidatorTest < Test::Unit::TestCase
         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"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paperclip
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-12 00:00:00.000000000 Z
+date: 2012-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -112,17 +112,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -144,17 +144,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.8
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.8
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bourne
   requirement: !ruby/object:Gem::Requirement
@@ -224,17 +224,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.4.7
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.4.7
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -379,6 +379,7 @@ files:
 - LICENSE
 - NEWS
 - README.md
+- RUNNING_TESTS.md
 - Rakefile
 - UPGRADING
 - cucumber/paperclip_steps.rb
@@ -452,12 +453,9 @@ files:
 - lib/tasks/paperclip.rake
 - paperclip.gemspec
 - shoulda_macros/paperclip.rb
-- test/adapter_registry_test.rb
-- test/attachment_adapter_test.rb
 - test/attachment_options_test.rb
 - test/attachment_test.rb
 - test/database.yml
-- test/file_adapter_test.rb
 - test/fixtures/12k.png
 - test/fixtures/50x50.png
 - test/fixtures/5k.png
@@ -472,14 +470,19 @@ files:
 - test/generator_test.rb
 - test/geometry_test.rb
 - test/helper.rb
-- test/identity_adapter_test.rb
 - test/integration_test.rb
 - test/interpolations_test.rb
+- test/io_adapters/attachment_adapter_test.rb
+- test/io_adapters/file_adapter_test.rb
+- test/io_adapters/identity_adapter_test.rb
+- test/io_adapters/nil_adapter_test.rb
+- test/io_adapters/registry_test.rb
+- test/io_adapters/stringio_adapter_test.rb
+- test/io_adapters/uploaded_file_adapter_test.rb
 - test/matchers/have_attached_file_matcher_test.rb
 - test/matchers/validate_attachment_content_type_matcher_test.rb
 - test/matchers/validate_attachment_presence_matcher_test.rb
 - test/matchers/validate_attachment_size_matcher_test.rb
-- test/nil_adapter_test.rb
 - test/paperclip_missing_attachment_styles_test.rb
 - test/paperclip_test.rb
 - test/processor_test.rb
@@ -488,14 +491,12 @@ files:
 - test/storage/fog_test.rb
 - test/storage/s3_live_test.rb
 - test/storage/s3_test.rb
-- test/stringio_adapter_test.rb
 - test/style_test.rb
 - test/support/mock_attachment.rb
 - test/support/mock_interpolator.rb
 - test/support/mock_model.rb
 - test/support/mock_url_generator_builder.rb
 - test/thumbnail_test.rb
-- test/uploaded_file_adapter_test.rb
 - test/url_generator_test.rb
 - test/validators/attachment_content_type_validator_test.rb
 - test/validators/attachment_presence_validator_test.rb
@@ -551,12 +552,9 @@ test_files:
 - features/support/paths.rb
 - features/support/rails.rb
 - features/support/selectors.rb
-- test/adapter_registry_test.rb
-- test/attachment_adapter_test.rb
 - test/attachment_options_test.rb
 - test/attachment_test.rb
 - test/database.yml
-- test/file_adapter_test.rb
 - test/fixtures/12k.png
 - test/fixtures/50x50.png
 - test/fixtures/5k.png
@@ -571,14 +569,19 @@ test_files:
 - test/generator_test.rb
 - test/geometry_test.rb
 - test/helper.rb
-- test/identity_adapter_test.rb
 - test/integration_test.rb
 - test/interpolations_test.rb
+- test/io_adapters/attachment_adapter_test.rb
+- test/io_adapters/file_adapter_test.rb
+- test/io_adapters/identity_adapter_test.rb
+- test/io_adapters/nil_adapter_test.rb
+- test/io_adapters/registry_test.rb
+- test/io_adapters/stringio_adapter_test.rb
+- test/io_adapters/uploaded_file_adapter_test.rb
 - test/matchers/have_attached_file_matcher_test.rb
 - test/matchers/validate_attachment_content_type_matcher_test.rb
 - test/matchers/validate_attachment_presence_matcher_test.rb
 - test/matchers/validate_attachment_size_matcher_test.rb
-- test/nil_adapter_test.rb
 - test/paperclip_missing_attachment_styles_test.rb
 - test/paperclip_test.rb
 - test/processor_test.rb
@@ -587,16 +590,15 @@ test_files:
 - test/storage/fog_test.rb
 - test/storage/s3_live_test.rb
 - test/storage/s3_test.rb
-- test/stringio_adapter_test.rb
 - test/style_test.rb
 - test/support/mock_attachment.rb
 - test/support/mock_interpolator.rb
 - test/support/mock_model.rb
 - test/support/mock_url_generator_builder.rb
 - test/thumbnail_test.rb
-- test/uploaded_file_adapter_test.rb
 - test/url_generator_test.rb
 - test/validators/attachment_content_type_validator_test.rb
 - test/validators/attachment_presence_validator_test.rb
 - test/validators/attachment_size_validator_test.rb
 - test/validators_test.rb
+has_rdoc: 

data/test/file_adapter_test.rb

@@ -1,43 +0,0 @@
-require './test/helper'
-
-class FileAdapterTest < Test::Unit::TestCase
-  context "a new instance" do
-    setup do
-      @file = File.new(fixture_file("5k.png"))
-      @file.binmode
-      @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.read
-      assert expected.length > 0
-      assert_equal expected, @subject.read
-    end
-
-  end
-end