paperclip 3.0.2 → 3.0.3

data/test/paperclip_missing_attachment_styles_test.rb

@@ -5,34 +5,34 @@ class PaperclipMissingAttachmentStylesTest < Test::Unit::TestCase
   context "Paperclip" do
     setup do
       Paperclip.classes_with_attachments = Set.new
-    end 
-    
+    end
+
     teardown do
       File.unlink(Paperclip.registered_attachments_styles_path) rescue nil
     end
 
     should "be able to keep list of models using it" do
-      assert_kind_of Set, Paperclip.classes_with_attachments 
+      assert_kind_of Set, Paperclip.classes_with_attachments
       assert Paperclip.classes_with_attachments.empty?, 'list should be empty'
       rebuild_model
       assert_equal ['Dummy'].to_set, Paperclip.classes_with_attachments
     end
 
     should "enable to get and set path to registered styles file" do
-      assert_equal ROOT.join('public/system/paperclip_attachments.yml').to_s, Paperclip.registered_attachments_styles_path
+      assert_equal ROOT.join('tmp/public/system/paperclip_attachments.yml').to_s, Paperclip.registered_attachments_styles_path
       Paperclip.registered_attachments_styles_path = '/tmp/config/paperclip_attachments.yml'
       assert_equal '/tmp/config/paperclip_attachments.yml', Paperclip.registered_attachments_styles_path
       Paperclip.registered_attachments_styles_path = nil
-      assert_equal ROOT.join('public/system/paperclip_attachments.yml').to_s, Paperclip.registered_attachments_styles_path
+      assert_equal ROOT.join('tmp/public/system/paperclip_attachments.yml').to_s, Paperclip.registered_attachments_styles_path
     end
-    
+
     should "be able to get current attachment styles" do
       assert_equal Hash.new, Paperclip.send(:current_attachments_styles)
       rebuild_model :styles => {:croppable => '600x600>', :big => '1000x1000>'}
       expected_hash = { :Dummy => {:avatar => [:big, :croppable]}}
       assert_equal expected_hash, Paperclip.send(:current_attachments_styles)
     end
-    
+
     should "be able to save current attachment styles for further comparison" do
       rebuild_model :styles => {:croppable => '600x600>', :big => '1000x1000>'}
       Paperclip.save_current_attachments_styles!
@@ -68,15 +68,15 @@ class PaperclipMissingAttachmentStylesTest < Test::Unit::TestCase
       Paperclip.save_current_attachments_styles!
       assert_equal Hash.new, Paperclip.missing_attachments_styles
     end
-    
+
     should "be able to calculate differences when a new attachment is added to a model" do
       rebuild_model :styles => {:croppable => '600x600>', :big => '1000x1000>'}
       Paperclip.save_current_attachments_styles!
-      
+
       class ::Dummy
         has_attached_file :photo, :styles => {:small => 'x100', :large => '1000x1000>'}
       end
-      
+
       expected_hash = {
         :Dummy => {:photo => [:large, :small]}
       }
@@ -90,7 +90,5 @@ class PaperclipMissingAttachmentStylesTest < Test::Unit::TestCase
       rebuild_model :styles => lambda{ |attachment| attachment.instance.other == 'a' ? {:thumb => "50x50#"} : {:large => "400x400"} }
       assert_equal Hash.new, Paperclip.send(:current_attachments_styles)
     end
-    
   end
-
 end

data/test/paperclip_test.rb

@@ -60,13 +60,15 @@ class PaperclipTest < Test::Unit::TestCase
 
   context "Paperclip.each_instance_with_attachment" do
     setup do
-      @file = File.new(File.join(FIXTURES_DIR, "5k.png"), 'rb')
+      @file = File.new(fixture_file("5k.png"), 'rb')
       d1 = Dummy.create(:avatar => @file)
       d2 = Dummy.create
       d3 = Dummy.create(:avatar => @file)
       @expected = [d1, d3]
     end
 
+    teardown { @file.close }
+
     should "yield every instance of a model that has an attachment" do
       actual = []
       Paperclip.each_instance_with_attachment("Dummy", "avatar") do |instance|
@@ -129,7 +131,7 @@ class PaperclipTest < Test::Unit::TestCase
   context "An ActiveRecord model with an 'avatar' attachment" do
     setup do
       rebuild_model :path => "tmp/:class/omg/:style.:extension"
-      @file = File.new(File.join(FIXTURES_DIR, "5k.png"), 'rb')
+      @file = File.new(fixture_file("5k.png"), 'rb')
     end
 
     teardown { @file.close }

data/test/storage/filesystem_test.rb

@@ -2,25 +2,30 @@ require './test/helper'
 
 class FileSystemTest < Test::Unit::TestCase
   context "Filesystem" do
-    setup do
-      rebuild_model :styles => { :thumbnail => "25x25#" }
-      @dummy = Dummy.create!
+    context "normal file" do
+      setup do
+        rebuild_model :styles => { :thumbnail => "25x25#" }
+        @dummy = Dummy.create!
 
-      @dummy.avatar = File.open(fixture_file('5k.png'))
-    end
+        @file = File.open(fixture_file('5k.png'))
+        @dummy.avatar = @file
+      end
 
-    should "allow file assignment" do
-      assert @dummy.save
-    end
+      teardown { @file.close }
 
-    should "store the original" do
-      @dummy.save
-      assert File.exists?(@dummy.avatar.path)
-    end
+      should "allow file assignment" do
+        assert @dummy.save
+      end
 
-    should "store the thumbnail" do
-      @dummy.save
-      assert File.exists?(@dummy.avatar.path(:thumbnail))
+      should "store the original" do
+        @dummy.save
+        assert File.exists?(@dummy.avatar.path)
+      end
+
+      should "store the thumbnail" do
+        @dummy.save
+        assert File.exists?(@dummy.avatar.path(:thumbnail))
+      end
     end
 
     context "with file that has space in file name" do
@@ -28,10 +33,13 @@ class FileSystemTest < Test::Unit::TestCase
         rebuild_model :styles => { :thumbnail => "25x25#" }
         @dummy = Dummy.create!
 
-        @dummy.avatar = File.open(fixture_file('spaced file.png'))
+        @file = File.open(fixture_file('spaced file.png'))
+        @dummy.avatar = @file
         @dummy.save
       end
 
+      teardown { @file.close }
+
       should "store the file" do
         assert File.exists?(@dummy.avatar.path)
       end

data/test/storage/fog_test.rb

@@ -5,7 +5,6 @@ Fog.mock!
 
 class FogTest < Test::Unit::TestCase
   context "" do
-
     context "with credentials provided in a path string" do
       setup do
         rebuild_model :styles => { :medium => "300x300>", :thumb => "100x100>" },
@@ -13,10 +12,13 @@ class FogTest < Test::Unit::TestCase
                       :url => '/:attachment/:filename',
                       :fog_directory => "paperclip",
                       :fog_credentials => fixture_file('fog.yml')
+        @file = File.new(fixture_file('5k.png'), 'rb')
         @dummy = Dummy.new
-        @dummy.avatar = File.new(fixture_file('5k.png'), 'rb')
+        @dummy.avatar = @file
       end
 
+      teardown { @file.close }
+
       should "have the proper information loading credentials from a file" do
         assert_equal @dummy.avatar.fog_credentials[:provider], 'AWS'
       end
@@ -29,10 +31,13 @@ class FogTest < Test::Unit::TestCase
                       :url => '/:attachment/:filename',
                       :fog_directory => "paperclip",
                       :fog_credentials => File.open(fixture_file('fog.yml'))
+        @file = File.new(fixture_file('5k.png'), 'rb')
         @dummy = Dummy.new
-        @dummy.avatar = File.new(fixture_file('5k.png'), 'rb')
+        @dummy.avatar = @file
       end
 
+      teardown { @file.close }
+
       should "have the proper information loading credentials from a file" do
         assert_equal @dummy.avatar.fog_credentials[:provider], 'AWS'
       end
@@ -49,11 +54,15 @@ class FogTest < Test::Unit::TestCase
                         :aws_access_key_id => 'AWS_ID',
                         :aws_secret_access_key => 'AWS_SECRET'
                       }
+        @file = File.new(fixture_file('5k.png'), 'rb')
         @dummy = Dummy.new
-        @dummy.avatar = File.new(fixture_file('5k.png'), 'rb')
+        @dummy.avatar = @file
       end
+
+      teardown { @file.close }
+
       should "be able to interpolate the path without blowing up" do
-        assert_equal File.expand_path(File.join(File.dirname(__FILE__), "../../public/avatars/5k.png")),
+        assert_equal File.expand_path(File.join(File.dirname(__FILE__), "../../tmp/public/avatars/5k.png")),
                      @dummy.avatar.path
       end
     end

data/test/storage/s3_live_test.rb

@@ -1,21 +1,22 @@
 require './test/helper'
 require 'aws'
 
-
 unless ENV["S3_BUCKET"].blank?
   class S3LiveTest < Test::Unit::TestCase
-
     context "when assigning an S3 attachment directly to another model" do
       setup do
+        @s3_credentials = File.new(fixture_file("s3.yml"))
         rebuild_model :styles => { :thumb => "100x100", :square => "32x32#" },
                       :storage => :s3,
                       :bucket => ENV["S3_BUCKET"],
                       :path => ":class/:attachment/:id/:style.:extension",
-                      :s3_credentials => File.new(File.join(File.dirname(__FILE__), "..", "fixtures", "s3.yml"))
+                      :s3_credentials => @s3_credentials
 
-        @dummy = Dummy.new
-        @attachment = Dummy.new.avatar
         @file = File.new(fixture_file("5k.png"))
+      end
+
+      should "not raise any error" do
+        @attachment = Dummy.new.avatar
         @attachment.assign(@file)
         @attachment.save
 
@@ -23,19 +24,32 @@ unless ENV["S3_BUCKET"].blank?
         @attachment2.assign(@file)
         @attachment2.save
       end
-    end
 
+      should "allow assignment from another S3 object" do
+        @attachment = Dummy.new.avatar
+        @attachment.assign(@file)
+        @attachment.save
+
+        @attachment2 = Dummy.new.avatar
+        @attachment2.assign(@attachment)
+        @attachment2.save
+      end
+
+      teardown { [@s3_credentials, @file].each(&:close) }
+    end
 
     context "Generating an expiring url on a nonexistant attachment" do
       setup do
+        @s3_credentials = File.new(fixture_file("s3.yml"))
         rebuild_model :styles => { :thumb => "100x100", :square => "32x32#" },
                       :storage => :s3,
                       :bucket => ENV["S3_BUCKET"],
                       :path => ":class/:attachment/:id/:style.:extension",
-                      :s3_credentials => File.new(File.join(File.dirname(__FILE__), "..", "fixtures", "s3.yml"))
+                      :s3_credentials => @s3_credentials
 
         @dummy = Dummy.new
       end
+
       should "return nil" do
         assert_nil @dummy.avatar.expiring_url
       end
@@ -43,16 +57,19 @@ unless ENV["S3_BUCKET"].blank?
 
     context "Using S3 for real, an attachment with S3 storage" do
       setup do
+        @s3_credentials = File.new(fixture_file("s3.yml"))
         rebuild_model :styles => { :thumb => "100x100", :square => "32x32#" },
                       :storage => :s3,
                       :bucket => ENV["S3_BUCKET"],
                       :path => ":class/:attachment/:id/:style.:extension",
-                      :s3_credentials => File.new(File.join(File.dirname(__FILE__), "..", "fixtures", "s3.yml"))
+                      :s3_credentials => @s3_credentials
 
         Dummy.delete_all
         @dummy = Dummy.new
       end
 
+      teardown { @s3_credentials.close }
+
       should "be extended by the S3 module" do
         assert Dummy.new.avatar.is_a?(Paperclip::Storage::S3)
       end
@@ -82,17 +99,21 @@ unless ENV["S3_BUCKET"].blank?
 
     context "An attachment that uses S3 for storage and has spaces in file name" do
       setup do
+        @s3_credentials = File.new(fixture_file("s3.yml"))
         rebuild_model :styles => { :thumb => "100x100", :square => "32x32#" },
           :storage => :s3,
           :bucket => ENV["S3_BUCKET"],
-          :s3_credentials => File.new(File.join(File.dirname(__FILE__), "..", "fixtures", "s3.yml"))
+          :s3_credentials => @s3_credentials
 
         Dummy.delete_all
+        @file = File.new(fixture_file('spaced file.png'), 'rb')
         @dummy = Dummy.new
-        @dummy.avatar = File.new(fixture_file('spaced file.png'), 'rb')
+        @dummy.avatar = @file
         @dummy.save
       end
 
+      teardown { @s3_credentials.close }
+
       should "return a replaced version for path" do
         assert_match /.+\/spaced_file\.png/, @dummy.avatar.path
       end
@@ -105,7 +126,11 @@ unless ENV["S3_BUCKET"].blank?
         assert_success_response @dummy.avatar.url
       end
 
-      should "be destoryable" do
+      should "be reprocessable" do
+        assert @dummy.avatar.reprocess!
+      end
+
+      should "be destroyable" do
         url = @dummy.avatar.url
         @dummy.destroy
         assert_not_found_response url
@@ -114,17 +139,20 @@ unless ENV["S3_BUCKET"].blank?
 
     context "An attachment that uses S3 for storage and uses AES256 encryption" do
       setup do
+        @s3_credentials = File.new(fixture_file("s3.yml"))
         rebuild_model :styles => { :thumb => "100x100", :square => "32x32#" },
                       :storage => :s3,
                       :bucket => ENV["S3_BUCKET"],
                       :path => ":class/:attachment/:id/:style.:extension",
-                      :s3_credentials => File.new(File.join(File.dirname(__FILE__), "..", "fixtures", "s3.yml")),
+                      :s3_credentials => @s3_credentials,
                       :s3_server_side_encryption => :aes256
 
         Dummy.delete_all
         @dummy = Dummy.new
       end
 
+      teardown { @s3_credentials.close }
+
       context "when assigned" do
         setup do
           @file = File.new(fixture_file('5k.png'), 'rb')

data/test/storage/s3_test.rb

@@ -186,8 +186,10 @@ class S3Test < Test::Unit::TestCase
                       'secret_access_key' => "54321"
                     }
 
-      @dummy = Dummy.new
-      @dummy.avatar = File.new(fixture_file('5k.png'), 'rb')
+      File.open(fixture_file('5k.png'), 'rb') do |file|
+        @dummy = Dummy.new
+        @dummy.avatar = file
+      end
     end
 
     should "return a url containing the correct original file mime type" do
@@ -217,8 +219,10 @@ class S3Test < Test::Unit::TestCase
                       'secret_access_key' => "54321"
                     }
 
-      @dummy = Dummy.new
-      @dummy.avatar = File.new(fixture_file('spaced file.png'), 'rb')
+      File.open(fixture_file('spaced file.png'), 'rb') do |file|
+        @dummy = Dummy.new
+        @dummy.avatar = file
+      end
     end
 
     should "return a replaced version for path" do
@@ -666,7 +670,7 @@ class S3Test < Test::Unit::TestCase
 
     context "when assigned" do
       setup do
-        @file = File.new(File.join(File.dirname(__FILE__), '..', 'fixtures', '5k.png'), 'rb')
+        @file = File.new(fixture_file('5k.png'), 'rb')
         @dummy = Dummy.new
         @dummy.avatar = @file
       end
@@ -705,7 +709,7 @@ class S3Test < Test::Unit::TestCase
 
     context "when assigned" do
       setup do
-        @file = File.new(File.join(File.dirname(__FILE__), '..', 'fixtures', '5k.png'), 'rb')
+        @file = File.new(fixture_file('5k.png'), 'rb')
         @dummy = Dummy.new
         @dummy.avatar = @file
       end
@@ -744,7 +748,7 @@ class S3Test < Test::Unit::TestCase
 
     context "when assigned" do
       setup do
-        @file = File.new(File.join(File.dirname(__FILE__), '..', 'fixtures', '5k.png'), 'rb')
+        @file = File.new(fixture_file('5k.png'), 'rb')
         @dummy = Dummy.new
         @dummy.avatar = @file
       end
@@ -783,7 +787,7 @@ class S3Test < Test::Unit::TestCase
 
     context "when assigned" do
       setup do
-        @file = File.new(File.join(File.dirname(__FILE__), '..', 'fixtures', '5k.png'), 'rb')
+        @file = File.new(fixture_file('5k.png'), 'rb')
         @dummy = Dummy.new
         @dummy.avatar = @file
       end
@@ -822,7 +826,7 @@ class S3Test < Test::Unit::TestCase
 
     context "when assigned" do
       setup do
-        @file = File.new(File.join(File.dirname(__FILE__), '..', 'fixtures', '5k.png'), 'rb')
+        @file = File.new(fixture_file('5k.png'), 'rb')
         @dummy = Dummy.new
         @dummy.avatar = @file
       end

data/test/style_test.rb

@@ -60,7 +60,7 @@ class StyleTest < Test::Unit::TestCase
 
   context "An attachment with style rules in various forms" do
     setup do
-      styles = ActiveSupport::OrderedHash.new
+      styles = {}
       styles[:aslist] = ["100x100", :png]
       styles[:ashash] = {:geometry => "100x100", :format => :png}
       styles[:asstring] = "100x100"

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
@@ -32,7 +36,7 @@ class ThumbnailTest < Test::Unit::TestCase
 
   context "An image" do
     setup do
-      @file = File.new(File.join(File.dirname(__FILE__), "fixtures", "5k.png"), 'rb')
+      @file = File.new(fixture_file("5k.png"), 'rb')
     end
 
     teardown { @file.close }
@@ -292,7 +296,7 @@ class ThumbnailTest < Test::Unit::TestCase
 
   context "A multipage PDF" do
     setup do
-      @file = File.new(File.join(File.dirname(__FILE__), "fixtures", "twopage.pdf"), 'rb')
+      @file = File.new(fixture_file("twopage.pdf"), 'rb')
     end
 
     teardown { @file.close }
@@ -325,7 +329,7 @@ class ThumbnailTest < Test::Unit::TestCase
 
   context "An animated gif" do
     setup do
-      @file = File.new(File.join(File.dirname(__FILE__), "fixtures", "animated.gif"), 'rb')
+      @file = File.new(fixture_file("animated.gif"), 'rb')
     end
 
     teardown { @file.close }