paperclip 3.0.2 → 3.0.3

data/test/helper.rb

@@ -30,7 +30,10 @@ ROOT = Pathname(File.expand_path(File.join(File.dirname(__FILE__), '..')))
 class Test::Unit::TestCase
   def setup
     silence_warnings do
-      Object.const_set(:Rails, stub('Rails', :root => ROOT, :env => 'test'))
+      Object.const_set(:Rails, stub('Rails'))
+      Rails.stubs(:root).returns(Pathname.new(ROOT).join('tmp'))
+      Rails.stubs(:env).returns('test')
+      Rails.stubs(:const_defined?).with(:Railtie).returns(false)
     end
   end
 end
@@ -65,6 +68,9 @@ def reset_class class_name
     include Paperclip::Glue
   end
 
+  klass.reset_column_information
+  klass.connection_pool.clear_table_cache!(klass.table_name) if klass.connection_pool.respond_to?(:clear_table_cache!)
+  klass.connection.schema_cache.clear_table_cache!(klass.table_name) if klass.connection.respond_to?(:schema_cache)
   klass
 end
 
@@ -91,15 +97,10 @@ def rebuild_model options = {}
 end
 
 def rebuild_class options = {}
-  ActiveRecord::Base.send(:include, Paperclip::Glue)
-  Object.send(:remove_const, "Dummy") rescue nil
-  Object.const_set("Dummy", Class.new(ActiveRecord::Base))
-  Paperclip.reset_duplicate_clash_check!
-  Dummy.class_eval do
-    include Paperclip::Glue
-    has_attached_file :avatar, options
+  reset_class("Dummy").tap do |klass|
+    klass.has_attached_file :avatar, options
+    Paperclip.reset_duplicate_clash_check!
   end
-  Dummy.reset_column_information
 end
 
 class FakeModel
@@ -116,7 +117,6 @@ class FakeModel
 
   def run_paperclip_callbacks name, *args
   end
-
 end
 
 def attachment(options={})

data/test/integration_test.rb

@@ -1,15 +1,20 @@
+# encoding: utf-8
+
 require './test/helper'
+require 'open-uri'
 
 class IntegrationTest < Test::Unit::TestCase
   context "Many models at once" do
     setup do
       rebuild_model
-      @file      = File.new(File.join(FIXTURES_DIR, "5k.png"), 'rb')
+      @file      = File.new(fixture_file("5k.png"), 'rb')
       300.times do |i|
         Dummy.create! :avatar => @file
       end
     end
 
+    teardown { @file.close }
+
     should "not exceed the open file limit" do
        assert_nothing_raised do
          dummies = Dummy.find(:all)
@@ -22,9 +27,7 @@ class IntegrationTest < Test::Unit::TestCase
     setup do
       rebuild_model :styles => { :thumb => "50x50#" }
       @dummy = Dummy.new
-      @file = File.new(File.join(File.dirname(__FILE__),
-                                 "fixtures",
-                                 "5k.png"), 'rb')
+      @file = File.new(fixture_file("5k.png"), 'rb')
       @dummy.avatar = @file
       assert @dummy.save
     end
@@ -79,13 +82,11 @@ class IntegrationTest < Test::Unit::TestCase
 
   context "Attachment" do
     setup do
-      @thumb_path = "./test/../public/system/dummies/avatars/000/000/001/thumb/5k.png"
+      @thumb_path = "tmp/public/system/dummies/avatars/000/000/001/thumb/5k.png"
       File.delete(@thumb_path) if File.exists?(@thumb_path)
       rebuild_model :styles => { :thumb => "50x50#" }
       @dummy = Dummy.new
-      @file = File.new(File.join(File.dirname(__FILE__),
-                                 "fixtures",
-                                 "5k.png"), 'rb')
+      @file = File.new(fixture_file("5k.png"), 'rb')
 
     end
 
@@ -108,15 +109,13 @@ class IntegrationTest < Test::Unit::TestCase
 
   context "Attachment with no generated thumbnails" do
     setup do
-      @thumb_small_path = "./test/../public/system/dummies/avatars/000/000/001/thumb_small/5k.png"
-      @thumb_large_path = "./test/../public/system/dummies/avatars/000/000/001/thumb_large/5k.png"
+      @thumb_small_path = "tmp/public/system/dummies/avatars/000/000/001/thumb_small/5k.png"
+      @thumb_large_path = "tmp/public/system/dummies/avatars/000/000/001/thumb_large/5k.png"
       File.delete(@thumb_small_path) if File.exists?(@thumb_small_path)
       File.delete(@thumb_large_path) if File.exists?(@thumb_large_path)
       rebuild_model :styles => { :thumb_small => "50x50#", :thumb_large => "60x60#" }
       @dummy = Dummy.new
-      @file = File.new(File.join(File.dirname(__FILE__),
-                                 "fixtures",
-                                 "5k.png"), 'rb')
+      @file = File.new(fixture_file("5k.png"), 'rb')
 
       @dummy.avatar.post_processing = false
       @dummy.avatar = @file
@@ -153,9 +152,7 @@ class IntegrationTest < Test::Unit::TestCase
     setup do
       rebuild_model :styles => { :original => "2x2#" }
       @dummy = Dummy.new
-      @file = File.new(File.join(File.dirname(__FILE__),
-                                 "fixtures",
-                                 "5k.png"), 'rb')
+      @file = File.new(fixture_file("5k.png"), 'rb')
       @dummy.avatar = @file
     end
 
@@ -172,9 +169,7 @@ class IntegrationTest < Test::Unit::TestCase
                                  :medium => "50x50" },
                     :path => ":rails_root/tmp/:id/:attachments/:style.:extension"
       @dummy = Dummy.new
-      @file = File.new(File.join(File.dirname(__FILE__),
-                                 "fixtures",
-                                 "5k.png"), 'rb')
+      @file = File.new(fixture_file("5k.png"), 'rb')
       @dummy.avatar = @file
     end
 
@@ -281,12 +276,13 @@ class IntegrationTest < Test::Unit::TestCase
       setup do
         rebuild_model
         @dummy = Dummy.new
-        @file  = File.new(File.join(FIXTURES_DIR, "5k.png"), 'rb')
+        @file  = File.new(fixture_file("5k.png"), 'rb')
         @umask = File.umask(umask)
       end
 
       teardown do
         File.umask @umask
+        @file.close
       end
 
       should "respect the current umask" do
@@ -306,14 +302,16 @@ class IntegrationTest < Test::Unit::TestCase
                     :url => "/:attachment/:class/:style/:id/:basename.:extension",
                     :path => ":rails_root/tmp/:attachment/:class/:style/:id/:basename.:extension"
       @dummy     = Dummy.new
-      @file      = File.new(File.join(FIXTURES_DIR, "5k.png"), 'rb')
-      @bad_file  = File.new(File.join(FIXTURES_DIR, "bad.png"), 'rb')
+      @file      = File.new(fixture_file("5k.png"), 'rb')
+      @bad_file  = File.new(fixture_file("bad.png"), 'rb')
 
       assert @dummy.avatar = @file
       assert @dummy.valid?, @dummy.errors.full_messages.join(", ")
       assert @dummy.save
     end
 
+    teardown { [@file, @bad_file].each(&:close) }
+
     should "write and delete its files" do
       [["434x66", :original],
        ["300x46", :large],
@@ -402,11 +400,13 @@ class IntegrationTest < Test::Unit::TestCase
     context "that is assigned its file from another Paperclip attachment" do
       setup do
         @dummy2 = Dummy.new
-        @file2  = File.new(File.join(FIXTURES_DIR, "12k.png"), 'rb')
+        @file2  = File.new(fixture_file("12k.png"), 'rb')
         assert  @dummy2.avatar = @file2
         @dummy2.save
       end
 
+      teardown { @file2.close }
+
       should "work when assigned a file" do
         assert_not_equal `identify -format "%wx%h" "#{@dummy.avatar.path(:original)}"`,
                          `identify -format "%wx%h" "#{@dummy2.avatar.path(:original)}"`
@@ -427,20 +427,56 @@ class IntegrationTest < Test::Unit::TestCase
         has_many :attachments, :class_name => 'Dummy'
       end
 
+      @file = File.new(fixture_file("5k.png"), 'rb')
       @dummy = Dummy.new
-      @dummy.avatar = File.new(File.join(File.dirname(__FILE__),
-                               "fixtures",
-                               "5k.png"), 'rb')
+      @dummy.avatar = @file
     end
 
+    teardown { @file.close }
+
     should "should not error when saving" do
-      assert_nothing_raised do
-        @dummy.save!
+      @dummy.save!
+    end
+  end
+
+  context "A model with an attachment with hash in file name" do
+    setup do
+      @settings = { :styles => { :thumb => "50x50#" },
+        :path => ":rails_root/public/system/:attachment/:id_partition/:style/:hash.:extension",
+        :url => "/system/:attachment/:id_partition/:style/:hash.:extension",
+        :hash_secret => "somesecret" }
+
+      rebuild_model @settings
+
+      @file = File.new(fixture_file("5k.png"), 'rb')
+      @dummy = Dummy.create! :avatar => @file
+    end
+
+    teardown do
+      @file.close
+    end
+
+    should "be accessible" do
+      assert File.exists?(@dummy.avatar.path(:original))
+      assert File.exists?(@dummy.avatar.path(:thumb))
+    end
+
+    context "when new style is added" do
+      setup do
+        @dummy.avatar.options[:styles][:mini] = "25x25#"
+        @dummy.avatar.instance_variable_set :@normalized_styles, nil
+        @dummy.avatar.reprocess! 'mini'
+      end
+
+      should "make all the styles accessible" do
+        assert File.exists?(@dummy.avatar.path(:original))
+        assert File.exists?(@dummy.avatar.path(:thumb))
+        assert File.exists?(@dummy.avatar.path(:mini))
       end
     end
   end
 
-  if ENV['S3_TEST_BUCKET']
+  if ENV['S3_BUCKET']
     def s3_files_for attachment
       [:thumb, :medium, :large, :original].inject({}) do |files, style|
         data = `curl "#{attachment.url(style)}" 2>/dev/null`.chomp
@@ -467,19 +503,27 @@ class IntegrationTest < Test::Unit::TestCase
                                    :medium => "100x100",
                                    :thumb => ["32x32#", :gif] },
                       :storage => :s3,
-                      :s3_credentials => File.new(File.join(File.dirname(__FILE__), "s3.yml")),
+                      :s3_credentials => File.new(fixture_file('s3.yml')),
+                      :s3_options => { :logger => Paperclip.logger },
                       :default_style => :medium,
-                      :bucket => ENV['S3_TEST_BUCKET'],
+                      :bucket => ENV['S3_BUCKET'],
                       :path => ":class/:attachment/:id/:style/:basename.:extension"
+
         @dummy     = Dummy.new
-        @file      = File.new(File.join(FIXTURES_DIR, "5k.png"), 'rb')
-        @bad_file  = File.new(File.join(FIXTURES_DIR, "bad.png"), 'rb')
+        @file      = File.new(fixture_file('5k.png'), 'rb')
+        @bad_file  = File.new(fixture_file('bad.png'), 'rb')
 
-        assert @dummy.avatar = @file
-        assert @dummy.valid?
-        assert @dummy.save
+        @dummy.avatar = @file
+        @dummy.valid?
+        @dummy.save!
 
-        @files_on_s3 = s3_files_for @dummy.avatar
+        @files_on_s3 = s3_files_for(@dummy.avatar)
+      end
+
+      teardown do
+        @file.close
+        @bad_file.close
+        @files_on_s3.values.each(&:close) if @files_on_s3
       end
 
       context 'assigning itself to a new model' do
@@ -517,15 +561,6 @@ class IntegrationTest < Test::Unit::TestCase
           assert_equal geo, `#{cmd}`.chomp, cmd
         end
 
-        @dummy.avatar = "not a valid file but not nil"
-        assert_equal File.basename(@file.path), @dummy.avatar_file_name
-        assert @dummy.valid?
-        assert @dummy.save
-
-        [:thumb, :medium, :large, :original].each do |style|
-          assert @dummy.avatar.exists?(style)
-        end
-
         @dummy.avatar.clear
         assert_nil @dummy.avatar_file_name
         assert @dummy.valid?
@@ -543,12 +578,18 @@ class IntegrationTest < Test::Unit::TestCase
         @d2 = Dummy.find(@dummy.id)
 
         assert_equal @dummy.avatar_file_name, @d2.avatar_file_name
+
         [:thumb, :medium, :large, :original].each do |style|
-          assert_equal @dummy.avatar.to_file(style).read, @d2.avatar.to_file(style).read
+          begin
+            first_file = open(@dummy.avatar.url(style))
+            second_file = open(@dummy.avatar.url(style))
+            assert_equal first_file.read, second_file.read
+          ensure
+            first_file.close if first_file
+            second_file.close if second_file
+          end
         end
 
-        saved_keys = [:thumb, :medium, :large, :original].collect{|s| @dummy.avatar.to_file(s) }
-
         @d2.avatar.clear
         assert @d2.save
 
@@ -557,12 +598,7 @@ class IntegrationTest < Test::Unit::TestCase
         end
       end
 
-      should "know the difference between good files, bad files, not files, and nil" do
-        expected = @dummy.avatar.to_file
-        @dummy.avatar = "not a file"
-        assert @dummy.valid?
-        assert_equal expected.read, @dummy.avatar.to_file.read
-
+      should "know the difference between good files, bad files, and nil" do
         @dummy.avatar = @bad_file
         assert ! @dummy.valid?
         @dummy.avatar = nil
@@ -591,7 +627,18 @@ class IntegrationTest < Test::Unit::TestCase
         headers = s3_headers_for(@dummy.avatar, :original)
         assert_equal 'image/png', headers['content-type']
       end
+
+      context "with non-english character in the file name" do
+        setup do
+
+          @file.stubs(:original_filename).returns("クリップ.png")
+          @dummy.avatar = @file
+        end
+
+        should "not raise any error" do
+          @dummy.save!
+        end
+      end
     end
   end
 end
-

data/test/{attachment_adapter_test.rb → io_adapters/attachment_adapter_test.rb}

@@ -12,6 +12,10 @@ class AttachmentAdapterTest < Test::Unit::TestCase
     @subject = Paperclip.io_adapters.for(@attachment)
   end
 
+  def teardown
+    @file.close
+  end
+
   should "get the right filename" do
     assert_equal "5k.png", @subject.original_filename
   end
@@ -44,5 +48,4 @@ class AttachmentAdapterTest < Test::Unit::TestCase
     assert_equal expected.length, actual.length
     assert_equal expected, actual
   end
-
 end

data/test/io_adapters/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