paperclip 2.1.2 → 2.1.5

data/test/{test_geometry.rb → geometry_test.rb}

@@ -1,8 +1,4 @@
-require 'rubygems'
-require 'test/unit'
-require 'shoulda'
-
-require File.join(File.dirname(__FILE__), '..', 'lib', 'paperclip', 'geometry.rb')
+require 'test/helper'
 
 class GeometryTest < Test::Unit::TestCase
   context "Paperclip::Geometry" do
@@ -12,15 +8,15 @@ class GeometryTest < Test::Unit::TestCase
       assert_equal 768, @geo.height
     end
 
-    should "correctly create a square if the height dimension is missing" do
+    should "set height to 0 if height dimension is missing" do
       assert @geo = Paperclip::Geometry.new(1024)
       assert_equal 1024, @geo.width
-      assert_equal 1024, @geo.height
+      assert_equal 0, @geo.height
     end
 
-    should "correctly create a square if the width dimension is missing" do
+    should "set width to 0 if width dimension is missing" do
       assert @geo = Paperclip::Geometry.new(nil, 768)
-      assert_equal 768, @geo.width
+      assert_equal 0, @geo.width
       assert_equal 768, @geo.height
     end
 
@@ -32,19 +28,20 @@ class GeometryTest < Test::Unit::TestCase
 
     should "be generated from a xH-formatted string" do
       assert @geo = Paperclip::Geometry.parse("x600")
-      assert_equal 600, @geo.width
+      assert_equal 0, @geo.width
       assert_equal 600, @geo.height
     end
-      
+
     should "be generated from a Wx-formatted string" do
       assert @geo = Paperclip::Geometry.parse("800x")
       assert_equal 800, @geo.width
-      assert_equal 800, @geo.height
+      assert_equal 0, @geo.height
     end
 
-    should "ensure the modifier is nil if only one dimension present" do
-      assert @geo = Paperclip::Geometry.parse("123x")
-      assert_nil @geo.modifier
+    should "be generated from a W-formatted string" do
+      assert @geo = Paperclip::Geometry.parse("800")
+      assert_equal 800, @geo.width
+      assert_equal 0, @geo.height
     end
 
     should "ensure the modifier is nil if not present" do
@@ -52,10 +49,19 @@ class GeometryTest < Test::Unit::TestCase
       assert_nil @geo.modifier
     end
 
-    ['>', '<', '#', '@', '%', '^', '!'].each do |mod|
-      should "ensure the modifier #{mod} is preserved" do
+    ['>', '<', '#', '@', '%', '^', '!', nil].each do |mod|
+      should "ensure the modifier #{mod.inspect} is preserved" do
         assert @geo = Paperclip::Geometry.parse("123x456#{mod}")
         assert_equal mod, @geo.modifier
+        assert_equal "123x456#{mod}", @geo.to_s
+      end
+    end
+    
+    ['>', '<', '#', '@', '%', '^', '!', nil].each do |mod|
+      should "ensure the modifier #{mod.inspect} is preserved with no height" do
+        assert @geo = Paperclip::Geometry.parse("123x#{mod}")
+        assert_equal mod, @geo.modifier
+        assert_equal "123#{mod}", @geo.to_s
       end
     end
 
@@ -65,9 +71,29 @@ class GeometryTest < Test::Unit::TestCase
       assert_equal "123x456>", @src.transformation_to(@dst).to_s
     end
 
+    should "generate correct ImageMagick formatting string for W-formatted string" do
+      assert @geo = Paperclip::Geometry.parse("800")
+      assert_equal "800", @geo.to_s
+    end
+
+    should "generate correct ImageMagick formatting string for Wx-formatted string" do
+      assert @geo = Paperclip::Geometry.parse("800x")
+      assert_equal "800", @geo.to_s
+    end
+
+    should "generate correct ImageMagick formatting string for xH-formatted string" do
+      assert @geo = Paperclip::Geometry.parse("x600")
+      assert_equal "x600", @geo.to_s
+    end
+
+    should "generate correct ImageMagick formatting string for WxH-formatted string" do
+      assert @geo = Paperclip::Geometry.parse("800x600")
+      assert_equal "800x600", @geo.to_s
+    end
+
     should "be generated from a file" do
       file = File.join(File.dirname(__FILE__), "fixtures", "5k.png")
-      file = File.new(file)
+      file = File.new(file, 'rb')
       assert_nothing_raised{ @geo = Paperclip::Geometry.from_file(file) }
       assert @geo.height > 0
       assert @geo.width > 0

data/test/helper.rb

@@ -5,6 +5,7 @@ require 'mocha'
 require 'tempfile'
 
 require 'active_record'
+require 'active_support'
 begin
   require 'ruby-debug'
 rescue LoadError
@@ -32,8 +33,12 @@ def rebuild_model options = {}
     table.column :avatar_file_name, :string
     table.column :avatar_content_type, :string
     table.column :avatar_file_size, :integer
+    table.column :avatar_updated_at, :datetime
   end
+  rebuild_class options
+end
 
+def rebuild_class options = {}
   ActiveRecord::Base.send(:include, Paperclip)
   Object.send(:remove_const, "Dummy") rescue nil
   Object.const_set("Dummy", Class.new(ActiveRecord::Base))
@@ -42,3 +47,14 @@ def rebuild_model options = {}
     has_attached_file :avatar, options
   end
 end
+
+def temporary_rails_env(new_env)
+  old_env = defined?(RAILS_ENV) ? RAILS_ENV : nil
+  silence_warnings do
+    Object.const_set("RAILS_ENV", new_env)
+  end
+  yield
+  silence_warnings do
+    Object.const_set("RAILS_ENV", old_env)
+  end
+end

data/test/{test_integration.rb → integration_test.rb}

@@ -1,10 +1,10 @@
-require 'test/helper.rb'
+require 'test/helper'
 
 class IntegrationTest < Test::Unit::TestCase
   context "Many models at once" do
     setup do
       rebuild_model
-      @file      = File.new(File.join(FIXTURES_DIR, "5k.png"))
+      @file      = File.new(File.join(FIXTURES_DIR, "5k.png"), 'rb')
       300.times do |i|
         Dummy.create! :avatar => @file
       end
@@ -24,13 +24,13 @@ class IntegrationTest < Test::Unit::TestCase
       @dummy = Dummy.new
       @file = File.new(File.join(File.dirname(__FILE__),
                                  "fixtures",
-                                 "5k.png"))
+                                 "5k.png"), 'rb')
       @dummy.avatar = @file
       assert @dummy.save
     end
 
     should "create its thumbnails properly" do
-      assert_match /\b50x50\b/, `identify '#{@dummy.avatar.path(:thumb)}'`
+      assert_match /\b50x50\b/, `identify "#{@dummy.avatar.path(:thumb)}"`
     end
 
     context "redefining its attachment styles" do
@@ -44,7 +44,7 @@ class IntegrationTest < Test::Unit::TestCase
       end
 
       should "create its thumbnails properly" do
-        assert_match /\b150x25\b/, `identify '#{@dummy.avatar.path(:thumb)}'`
+        assert_match /\b150x25\b/, `identify "#{@dummy.avatar.path(:thumb)}"`
       end
     end
   end
@@ -91,6 +91,38 @@ class IntegrationTest < Test::Unit::TestCase
     end
   end
   
+  context "A model with no convert_options setting" do
+    setup do
+      rebuild_model :styles => { :large => "300x300>",
+                                 :medium => "100x100",
+                                 :thumb => ["32x32#", :gif] },
+                    :default_style => :medium,
+                    :url => "/:attachment/:class/:style/:id/:basename.:extension",
+                    :path => ":rails_root/tmp/:attachment/:class/:style/:id/:basename.:extension"
+      @dummy     = Dummy.new
+    end
+    
+    should "have its definition return nil when asked about convert_options" do
+      assert ! Dummy.attachment_definitions[:avatar][:convert_options]
+    end
+
+    context "redefined to have convert_options setting" do
+      setup do
+        rebuild_model :styles => { :large => "300x300>",
+                                   :medium => "100x100",
+                                   :thumb => ["32x32#", :gif] },
+                      :convert_options => "-strip -depth 8",
+                      :default_style => :medium,
+                      :url => "/:attachment/:class/:style/:id/:basename.:extension",
+                      :path => ":rails_root/tmp/:attachment/:class/:style/:id/:basename.:extension"
+      end
+
+      should "have its definition return convert_options value when asked about convert_options" do
+        assert_equal "-strip -depth 8", Dummy.attachment_definitions[:avatar][:convert_options]
+      end
+    end
+  end
+  
   context "A model with a filesystem attachment" do
     setup do
       rebuild_model :styles => { :large => "300x300>",
@@ -101,8 +133,8 @@ 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"))
-      @bad_file  = File.new(File.join(FIXTURES_DIR, "bad.png"))
+      @file      = File.new(File.join(FIXTURES_DIR, "5k.png"), 'rb')
+      @bad_file  = File.new(File.join(FIXTURES_DIR, "bad.png"), 'rb')
 
       assert @dummy.avatar = @file
       assert @dummy.valid?
@@ -114,18 +146,18 @@ class IntegrationTest < Test::Unit::TestCase
        ["300x46", :large],
        ["100x15", :medium],
        ["32x32", :thumb]].each do |geo, style|
-        cmd = %Q[identify -format "%wx%h" #{@dummy.avatar.to_file(style).path}]
+        cmd = %Q[identify -format "%wx%h" "#{@dummy.avatar.path(style)}"]
         assert_equal geo, `#{cmd}`.chomp, cmd
       end
 
-      saved_paths = [:thumb, :medium, :large, :original].collect{|s| @dummy.avatar.to_file(s).path }
+      saved_paths = [:thumb, :medium, :large, :original].collect{|s| @dummy.avatar.path(s) }
 
       @d2 = Dummy.find(@dummy.id)
-      assert_equal "100x15", `identify -format "%wx%h" #{@d2.avatar.to_file.path}`.chomp
-      assert_equal "434x66", `identify -format "%wx%h" #{@d2.avatar.to_file(:original).path}`.chomp
-      assert_equal "300x46", `identify -format "%wx%h" #{@d2.avatar.to_file(:large).path}`.chomp
-      assert_equal "100x15", `identify -format "%wx%h" #{@d2.avatar.to_file(:medium).path}`.chomp
-      assert_equal "32x32",  `identify -format "%wx%h" #{@d2.avatar.to_file(:thumb).path}`.chomp
+      assert_equal "100x15", `identify -format "%wx%h" "#{@d2.avatar.path}"`.chomp
+      assert_equal "434x66", `identify -format "%wx%h" "#{@d2.avatar.path(:original)}"`.chomp
+      assert_equal "300x46", `identify -format "%wx%h" "#{@d2.avatar.path(:large)}"`.chomp
+      assert_equal "100x15", `identify -format "%wx%h" "#{@d2.avatar.path(:medium)}"`.chomp
+      assert_equal "32x32",  `identify -format "%wx%h" "#{@d2.avatar.path(:thumb)}"`.chomp
 
       @dummy.avatar = "not a valid file but not nil"
       assert_equal File.basename(@file.path), @dummy.avatar_file_name
@@ -154,10 +186,10 @@ class IntegrationTest < Test::Unit::TestCase
 
       assert_equal @dummy.avatar_file_name, @d2.avatar_file_name
       [:thumb, :medium, :large, :original].each do |style|
-        assert_equal @dummy.avatar.to_file(style).path, @d2.avatar.to_file(style).path
+        assert_equal @dummy.avatar.path(style), @d2.avatar.path(style)
       end
 
-      saved_paths = [:thumb, :medium, :large, :original].collect{|s| @dummy.avatar.to_file(s).path }
+      saved_paths = [:thumb, :medium, :large, :original].collect{|s| @dummy.avatar.path(s) }
 
       @d2.avatar = nil
       assert @d2.save
@@ -171,7 +203,8 @@ class IntegrationTest < Test::Unit::TestCase
       expected = @dummy.avatar.to_file
       @dummy.avatar = "not a file"
       assert @dummy.valid?
-      assert_equal expected.path, @dummy.avatar.to_file.path
+      assert_equal expected.path, @dummy.avatar.path
+      expected.close
 
       @dummy.avatar = @bad_file
       assert ! @dummy.valid?
@@ -183,14 +216,14 @@ class IntegrationTest < Test::Unit::TestCase
       Dummy.validates_attachment_presence :avatar
       @d2 = Dummy.find(@dummy.id)
       @d2.avatar = @file
-      assert   @d2.valid?
+      assert   @d2.valid?, @d2.errors.full_messages.inspect 
       @d2.avatar = @bad_file
       assert ! @d2.valid?
       @d2.avatar = nil
       assert ! @d2.valid?
     end
 
-    should "be able to reload without saving an not have the file disappear" do
+    should "be able to reload without saving and not have the file disappear" do
       @dummy.avatar = @file
       assert @dummy.save
       @dummy.avatar = nil
@@ -198,13 +231,44 @@ class IntegrationTest < Test::Unit::TestCase
       @dummy.reload
       assert_equal "5k.png", @dummy.avatar_file_name
     end
+    
+    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')
+        assert  @dummy2.avatar = @file2
+        @dummy2.save
+      end
+      
+      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)}"`
+
+        assert @dummy.avatar = @dummy2.avatar
+        @dummy.save
+        assert_equal `identify -format "%wx%h" "#{@dummy.avatar.path(:original)}"`,
+                     `identify -format "%wx%h" "#{@dummy2.avatar.path(:original)}"`
+      end
+      
+      should "work when assigned a nil file" do
+        @dummy2.avatar = nil
+        @dummy2.save
+
+        @dummy.avatar = @dummy2.avatar
+        @dummy.save
+        
+        assert !@dummy.avatar?
+      end
+    end    
+
   end
 
   if ENV['S3_TEST_BUCKET']
     def s3_files_for attachment
       [:thumb, :medium, :large, :original].inject({}) do |files, style|
-        data = `curl '#{attachment.url(style)}' 2>/dev/null`.chomp
+        data = `curl "#{attachment.url(style)}" 2>/dev/null`.chomp
         t = Tempfile.new("paperclip-test")
+        t.binmode
         t.write(data)
         t.rewind
         files[style] = t
@@ -212,6 +276,14 @@ class IntegrationTest < Test::Unit::TestCase
       end
     end
 
+    def s3_headers_for attachment, style
+      `curl --head "#{attachment.url(style)}" 2>/dev/null`.split("\n").inject({}) do |h,head|
+        split_head = head.chomp.split(/\s*:\s*/, 2)
+        h[split_head.first.downcase] = split_head.last unless split_head.empty?
+        h
+      end
+    end
+
     context "A model with an S3 attachment" do
       setup do
         rebuild_model :styles => { :large => "300x300>",
@@ -225,8 +297,8 @@ class IntegrationTest < Test::Unit::TestCase
                       :bucket => ENV['S3_TEST_BUCKET'],
                       :path => ":class/:attachment/:id/:style/:basename.:extension"
         @dummy     = Dummy.new
-        @file      = File.new(File.join(FIXTURES_DIR, "5k.png"))
-        @bad_file  = File.new(File.join(FIXTURES_DIR, "bad.png"))
+        @file      = File.new(File.join(FIXTURES_DIR, "5k.png"), 'rb')
+        @bad_file  = File.new(File.join(FIXTURES_DIR, "bad.png"), 'rb')
 
         assert @dummy.avatar = @file
         assert @dummy.valid?
@@ -240,7 +312,7 @@ class IntegrationTest < Test::Unit::TestCase
          ["300x46", :large],
          ["100x15", :medium],
          ["32x32", :thumb]].each do |geo, style|
-          cmd = %Q[identify -format "%wx%h" #{@files_on_s3[style].path}]
+          cmd = %Q[identify -format "%wx%h" "#{@files_on_s3[style].path}"]
           assert_equal geo, `#{cmd}`.chomp, cmd
         end
 
@@ -250,7 +322,7 @@ class IntegrationTest < Test::Unit::TestCase
          ["300x46", :large],
          ["100x15", :medium],
          ["32x32", :thumb]].each do |geo, style|
-          cmd = %Q[identify -format "%wx%h" #{@d2_files[style].path}]
+          cmd = %Q[identify -format "%wx%h" "#{@d2_files[style].path}"]
           assert_equal geo, `#{cmd}`.chomp, cmd
         end
 
@@ -317,7 +389,7 @@ class IntegrationTest < Test::Unit::TestCase
         assert ! @d2.valid?
       end
 
-      should "be able to reload without saving an not have the file disappear" do
+      should "be able to reload without saving and not have the file disappear" do
         @dummy.avatar = @file
         assert @dummy.save
         @dummy.avatar = nil
@@ -325,6 +397,12 @@ class IntegrationTest < Test::Unit::TestCase
         @dummy.reload
         assert_equal "5k.png", @dummy.avatar_file_name
       end
+
+      should "have the right content type" do
+        headers = s3_headers_for(@dummy.avatar, :original)
+        p headers
+        assert_equal 'image/png', headers['content-type']
+      end
     end
   end
 end

data/test/iostream_test.rb

@@ -0,0 +1,68 @@
+require 'test/helper'
+
+class IOStreamTest < Test::Unit::TestCase
+  context "IOStream" do
+    should "be included in IO, File, Tempfile, and StringIO" do
+      [IO, File, Tempfile, StringIO].each do |klass|
+        assert klass.included_modules.include?(IOStream), "Not in #{klass}"
+      end
+    end
+  end
+
+  context "A file" do
+    setup do
+      @file = File.new(File.join(File.dirname(__FILE__), "fixtures", "5k.png"), 'rb')
+    end
+
+    context "that is sent #stream_to" do
+
+      context "and given a String" do
+        setup do
+          assert @result = @file.stream_to("/tmp/iostream.string.test")
+        end
+
+        should "return a File" do
+          assert @result.is_a?(File)
+        end
+
+        should "contain the same data as the original file" do
+          @file.rewind; @result.rewind
+          assert_equal @file.read, @result.read
+        end
+      end
+
+      context "and given a Tempfile" do
+        setup do
+          tempfile = Tempfile.new('iostream.test')
+          tempfile.binmode
+          assert @result = @file.stream_to(tempfile)
+        end
+
+        should "return a Tempfile" do
+          assert @result.is_a?(Tempfile)
+        end
+
+        should "contain the same data as the original file" do
+          @file.rewind; @result.rewind
+          assert_equal @file.read, @result.read
+        end
+      end
+
+    end
+
+    context "that is sent #to_tempfile" do
+      setup do
+        assert @tempfile = @file.to_tempfile
+      end
+
+      should "convert it to a Tempfile" do
+        assert @tempfile.is_a?(Tempfile)
+      end
+
+      should "have the Tempfile contain the same data as the file" do
+        @file.rewind; @tempfile.rewind
+        assert_equal @file.read, @tempfile.read
+      end
+    end
+  end
+end