paperclip 3.0.4 → 3.1.0

data/test/io_adapters/attachment_adapter_test.rb

@@ -1,51 +1,113 @@
 require './test/helper'
 
 class AttachmentAdapterTest < Test::Unit::TestCase
+  
   def setup
-    rebuild_model :path => "tmp/:class/:attachment/:style/:filename"
+    rebuild_model :path => "tmp/:class/:attachment/:style/:filename", :styles => {:thumb => '50x50'}
     @attachment = Dummy.new.avatar
-    @file = File.new(fixture_file("5k.png"))
-    @file.binmode
-
-    @attachment.assign(@file)
-    @attachment.save
-    @subject = Paperclip.io_adapters.for(@attachment)
   end
+  
+  context "for an attachment" do
+    setup do
+      @file = File.new(fixture_file("5k.png"))
+      @file.binmode
 
-  def teardown
-    @file.close
-  end
+      @attachment.assign(@file)
+      @attachment.save
+      @subject = Paperclip.io_adapters.for(@attachment)
+    end
 
-  should "get the right filename" do
-    assert_equal "5k.png", @subject.original_filename
-  end
+    teardown do
+      @file.close
+    end
 
-  should "force binmode on tempfile" do
-    assert @subject.instance_variable_get("@tempfile").binmode?
-  end
+    should "get the right filename" do
+      assert_equal "5k.png", @subject.original_filename
+    end
 
-  should "get the content type" do
-    assert_equal "image/png", @subject.content_type
-  end
+    should "force binmode on tempfile" do
+      assert @subject.instance_variable_get("@tempfile").binmode?
+    end
 
-  should "get the file's size" do
-    assert_equal 4456, @subject.size
-  end
+    should "get the content type" do
+      assert_equal "image/png", @subject.content_type
+    end
 
-  should "return false for a call to nil?" do
-    assert ! @subject.nil?
-  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 "generate a MD5 hash of the contents" do
-    expected = Digest::MD5.file(@file.path).to_s
-    assert_equal expected, @subject.fingerprint
+    should "read the contents of the file" do
+      expected = @file.read
+      actual = @subject.read
+      assert expected.length > 0
+      assert_equal expected.length, actual.length
+      assert_equal expected, actual
+    end
+    
   end
+  
+  context "for a style" do
+    setup do
+      @file = File.new(fixture_file("5k.png"))
+      @file.binmode
+
+      @attachment.assign(@file)
+    
+      @thumb = Tempfile.new("thumbnail").tap(&:binmode)
+      FileUtils.cp @attachment.queued_for_write[:thumb].path, @thumb.path
+    
+      @attachment.save
+      @subject = Paperclip.io_adapters.for(@attachment.styles[:thumb])
+    end
+
+    teardown do
+      @file.close
+      @thumb.close
+    end
+
+    should "get the original 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 thumbnail's file size" do
+      assert_equal @thumb.size, @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(@thumb.path).to_s
+      assert_equal expected, @subject.fingerprint
+    end
 
-  should "read the contents of the file" do
-    expected = @file.read
-    actual = @subject.read
-    assert expected.length > 0
-    assert_equal expected.length, actual.length
-    assert_equal expected, actual
+    should "read the contents of the thumbnail" do
+      @thumb.rewind
+      expected = @thumb.read
+      actual = @subject.read
+      assert expected.length > 0
+      assert_equal expected.length, actual.length
+      assert_equal expected, actual
+    end
+    
   end
 end

data/test/io_adapters/file_adapter_test.rb

@@ -60,10 +60,22 @@ class FileAdapterTest < Test::Unit::TestCase
         end
       end
 
+      context "file with multiple possible x-types but no official type" do
+        setup do
+          MIME::Types.stubs(:type_for).returns([MIME::Type.new('image/x-mp4'), MIME::Type.new('image/x-video')])
+          @subject = Paperclip.io_adapters.for(@file)
+        end
+
+        should "return the first" do
+          assert_equal "image/x-mp4", @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")
+          @subject = Paperclip.io_adapters.for(@file)
         end
 
         should "return content type without newline character" do
@@ -81,7 +93,7 @@ class FileAdapterTest < Test::Unit::TestCase
       teardown { @file.close }
 
       should "provide correct mime-type" do
-        assert_equal "application/x-empty", @subject.content_type
+        assert_match %r{.*/x-empty}, @subject.content_type
       end
     end
   end

data/test/io_adapters/stringio_adapter_test.rb

@@ -12,20 +12,10 @@ class StringioFileProxyTest < Test::Unit::TestCase
       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
@@ -34,6 +24,15 @@ class StringioFileProxyTest < Test::Unit::TestCase
       assert_equal Digest::MD5.hexdigest(@contents), @subject.fingerprint
     end
 
+    should "generate correct fingerprint after read" do
+      fingerprint = Digest::MD5.hexdigest(@subject.read)
+      assert_equal fingerprint, @subject.fingerprint
+    end
+
+    should "generate same fingerprint" do
+      assert_equal @subject.fingerprint, @subject.fingerprint
+    end
+
     should "return the data contained in the StringIO" do
       assert_equal "abc123", @subject.read
     end

data/test/io_adapters/uploaded_file_adapter_test.rb

@@ -12,7 +12,8 @@ class UploadedFileAdapterTest < Test::Unit::TestCase
           :original_filename => "5k.png",
           :content_type => "image/png",
           :head => "",
-          :tempfile => tempfile
+          :tempfile => tempfile,
+          :path => tempfile.path
         )
         @subject = Paperclip.io_adapters.for(@file)
       end

data/test/schema_test.rb

@@ -1,98 +1,200 @@
 require './test/helper'
 require 'paperclip/schema'
+require 'active_support/testing/deprecation'
 
-class MockSchema
-  include Paperclip::Schema
-
-  def initialize(table_name = nil)
-    @table_name = table_name
-    @columns = {}
-    @deleted_columns = []
-  end
-
-  def column(name, type)
-    @columns[name] = type
-  end
-
-  def remove_column(table_name, column_name)
-    return if @table_name && @table_name != table_name
-    @columns.delete(column_name)
-    @deleted_columns.push(column_name)
-  end
-
-  def has_column?(column_name)
-    @columns.key?(column_name)
-  end
+class SchemaTest < Test::Unit::TestCase
+  include ActiveSupport::Testing::Deprecation
 
-  def deleted_column?(column_name)
-    @deleted_columns.include?(column_name)
+  def setup
+    rebuild_class
   end
 
-  def type_of(column_name)
-    @columns[column_name]
+  def teardown
+    Dummy.connection.drop_table :dummies rescue nil
   end
-end
-
-class SchemaTest < Test::Unit::TestCase
-  context "Migrating up" do
-    setup do
-      @schema = MockSchema.new
-      @schema.has_attached_file :avatar
-    end
-
-    should "create the file_name column" do
-      assert @schema.has_column?(:avatar_file_name)
-    end
-
-    should "create the content_type column" do
-      assert @schema.has_column?(:avatar_content_type)
-    end
-
-    should "create the file_size column" do
-      assert @schema.has_column?(:avatar_file_size)
-    end
-
-    should "create the updated_at column" do
-      assert @schema.has_column?(:avatar_updated_at)
-    end
 
-    should "make the file_name column a string" do
-      assert_equal :string, @schema.type_of(:avatar_file_name)
+  context "within table definition" do
+    context "using #has_attached_file" do
+      should "create attachment columns" do
+        Dummy.connection.create_table :dummies, :force => true do |t|
+          ActiveSupport::Deprecation.silence do
+            t.has_attached_file :avatar
+          end
+        end
+        rebuild_class
+
+        columns = Dummy.columns.map{ |column| [column.name, column.type] }
+
+        assert_includes columns, ['avatar_file_name', :string]
+        assert_includes columns, ['avatar_content_type', :string]
+        assert_includes columns, ['avatar_file_size', :integer]
+        assert_includes columns, ['avatar_updated_at', :datetime]
+      end
+
+      should "display deprecation warning" do
+        Dummy.connection.create_table :dummies, :force => true do |t|
+          assert_deprecated do
+            t.has_attached_file :avatar
+          end
+        end
+      end
     end
 
-    should "make the content_type column a string" do
-      assert_equal :string, @schema.type_of(:avatar_content_type)
-    end
-
-    should "make the file_size column an integer" do
-      assert_equal :integer, @schema.type_of(:avatar_file_size)
-    end
-
-    should "make the updated_at column a datetime" do
-      assert_equal :datetime, @schema.type_of(:avatar_updated_at)
+    context "using #attachment" do
+      setup do
+        Dummy.connection.create_table :dummies, :force => true do |t|
+          t.attachment :avatar
+        end
+        rebuild_class
+      end
+
+      should "create attachment columns" do
+        columns = Dummy.columns.map{ |column| [column.name, column.type] }
+
+        assert_includes columns, ['avatar_file_name', :string]
+        assert_includes columns, ['avatar_content_type', :string]
+        assert_includes columns, ['avatar_file_size', :integer]
+        assert_includes columns, ['avatar_updated_at', :datetime]
+      end
     end
   end
 
-  context "Migrating down" do
+  context "within schema statement" do
     setup do
-      @schema = MockSchema.new(:users)
-      @schema.drop_attached_file :users, :avatar
-    end
-
-    should "remove the file_name column" do
-      assert @schema.deleted_column?(:avatar_file_name)
-    end
-
-    should "remove the content_type column" do
-      assert @schema.deleted_column?(:avatar_content_type)
+      Dummy.connection.create_table :dummies, :force => true
     end
 
-    should "remove the file_size column" do
-      assert @schema.deleted_column?(:avatar_file_size)
+    context "migrating up" do
+      context "with single attachment" do
+        setup do
+          Dummy.connection.add_attachment :dummies, :avatar
+          rebuild_class
+        end
+
+        should "create attachment columns" do
+          columns = Dummy.columns.map{ |column| [column.name, column.type] }
+
+          assert_includes columns, ['avatar_file_name', :string]
+          assert_includes columns, ['avatar_content_type', :string]
+          assert_includes columns, ['avatar_file_size', :integer]
+          assert_includes columns, ['avatar_updated_at', :datetime]
+        end
+      end
+
+      context "with multiple attachments" do
+        setup do
+          Dummy.connection.add_attachment :dummies, :avatar, :photo
+          rebuild_class
+        end
+
+        should "create attachment columns" do
+          columns = Dummy.columns.map{ |column| [column.name, column.type] }
+
+          assert_includes columns, ['avatar_file_name', :string]
+          assert_includes columns, ['avatar_content_type', :string]
+          assert_includes columns, ['avatar_file_size', :integer]
+          assert_includes columns, ['avatar_updated_at', :datetime]
+          assert_includes columns, ['photo_file_name', :string]
+          assert_includes columns, ['photo_content_type', :string]
+          assert_includes columns, ['photo_file_size', :integer]
+          assert_includes columns, ['photo_updated_at', :datetime]
+        end
+      end
+
+      context "with no attachment" do
+        should "raise an error" do
+          assert_raise ArgumentError do
+            Dummy.connection.add_attachment :dummies
+          rebuild_class
+          end
+        end
+      end
     end
 
-    should "remove the updated_at column" do
-      assert @schema.deleted_column?(:avatar_updated_at)
+    context "migrating down" do
+      setup do
+        Dummy.connection.change_table :dummies do |t|
+          t.column :avatar_file_name, :string
+          t.column :avatar_content_type, :string
+          t.column :avatar_file_size, :integer
+          t.column :avatar_updated_at, :datetime
+        end
+      end
+
+      context "using #drop_attached_file" do
+        should "remove the attachment columns" do
+          ActiveSupport::Deprecation.silence do
+            Dummy.connection.drop_attached_file :dummies, :avatar
+          end
+          rebuild_class
+
+          columns = Dummy.columns.map{ |column| [column.name, column.type] }
+
+          assert_not_includes columns, ['avatar_file_name', :string]
+          assert_not_includes columns, ['avatar_content_type', :string]
+          assert_not_includes columns, ['avatar_file_size', :integer]
+          assert_not_includes columns, ['avatar_updated_at', :datetime]
+        end
+
+        should "display a deprecation warning" do
+          assert_deprecated do
+            Dummy.connection.drop_attached_file :dummies, :avatar
+          end
+        end
+      end
+
+      context "using #remove_attachment" do
+        context "with single attachment" do
+          setup do
+            Dummy.connection.remove_attachment :dummies, :avatar
+            rebuild_class
+          end
+
+          should "remove the attachment columns" do
+            columns = Dummy.columns.map{ |column| [column.name, column.type] }
+
+            assert_not_includes columns, ['avatar_file_name', :string]
+            assert_not_includes columns, ['avatar_content_type', :string]
+            assert_not_includes columns, ['avatar_file_size', :integer]
+            assert_not_includes columns, ['avatar_updated_at', :datetime]
+          end
+        end
+
+        context "with multiple attachments" do
+          setup do
+            Dummy.connection.change_table :dummies do |t|
+              t.column :photo_file_name, :string
+              t.column :photo_content_type, :string
+              t.column :photo_file_size, :integer
+              t.column :photo_updated_at, :datetime
+            end
+
+            Dummy.connection.remove_attachment :dummies, :avatar, :photo
+            rebuild_class
+          end
+
+          should "remove the attachment columns" do
+            columns = Dummy.columns.map{ |column| [column.name, column.type] }
+
+            assert_not_includes columns, ['avatar_file_name', :string]
+            assert_not_includes columns, ['avatar_content_type', :string]
+            assert_not_includes columns, ['avatar_file_size', :integer]
+            assert_not_includes columns, ['avatar_updated_at', :datetime]
+            assert_not_includes columns, ['photo_file_name', :string]
+            assert_not_includes columns, ['photo_content_type', :string]
+            assert_not_includes columns, ['photo_file_size', :integer]
+            assert_not_includes columns, ['photo_updated_at', :datetime]
+          end
+        end
+
+        context "with no attachment" do
+          should "raise an error" do
+            assert_raise ArgumentError do
+              Dummy.connection.remove_attachment :dummies
+            end
+          end
+        end
+      end
     end
   end
 end