paperclip 2.1.0 → 2.1.2

data/test/test_attachment.rb

@@ -28,6 +28,16 @@ class AttachmentTest < Test::Unit::TestCase
       end
     end
 
+    context "without an Attachment" do
+      setup do
+        @dummy = Dummy.new
+      end
+      
+      should "return false when asked exists?" do
+        assert !@dummy.avatar.exists?
+      end
+    end
+
     context "on an Attachment" do
       setup do
         @dummy = Dummy.new
@@ -72,7 +82,7 @@ class AttachmentTest < Test::Unit::TestCase
     end
 
     should "make sure that they are interpolated correctly" do
-      assert_equal "1024.omg/1024-bbq/:idwhat/000/001/024.wtf", @dummy.avatar.path
+      assert_equal "1024.omg/1024-bbq/1024what/000/001/024.wtf", @dummy.avatar.path
     end
   end
 
@@ -85,9 +95,9 @@ class AttachmentTest < Test::Unit::TestCase
       @instance = stub
       @instance.stubs(:id).returns(41)
       @instance.stubs(:class).returns(Dummy)
-      @instance.stubs(:[]).with(:test_file_name).returns("5k.png")
-      @instance.stubs(:[]).with(:test_content_type).returns("image/png")
-      @instance.stubs(:[]).with(:test_file_size).returns(12345)
+      @instance.stubs(:[]).with(:test_file_name).returns(nil)
+      @instance.stubs(:[]).with(:test_content_type).returns(nil)
+      @instance.stubs(:[]).with(:test_file_size).returns(nil)
       @attachment = Paperclip::Attachment.new(:test,
                                               @instance)
       @file = File.new(File.join(File.dirname(__FILE__),
@@ -96,102 +106,115 @@ class AttachmentTest < Test::Unit::TestCase
     end
 
     should "return its default_url when no file assigned" do
-      assert @attachment.file.nil?
+      assert @attachment.to_file.nil?
       assert_equal "/tests/original/missing.png", @attachment.url
       assert_equal "/tests/blah/missing.png", @attachment.url(:blah)
     end
-
-    context "when expecting three styles" do
+    
+    context "with a file assigned in the database" do
       setup do
-        styles = {:styles => { :large  => ["400x400", :png],
-                               :medium => ["100x100", :gif],
-                               :small => ["32x32#", :jpg]}}
-        @attachment = Paperclip::Attachment.new(:test,
-                                                @instance,
-                                                styles)
+        @instance.stubs(:[]).with(:test_file_name).returns("5k.png")
+        @instance.stubs(:[]).with(:test_content_type).returns("image/png")
+        @instance.stubs(:[]).with(:test_file_size).returns(12345)
       end
 
-      context "and assigned a file" do
-        setup do
-          @instance.expects(:[]=).with(:test_file_name,
-                                       File.basename(@file.path))
-          @instance.expects(:[]=).with(:test_content_type, "image/png")
-          @instance.expects(:[]=).with(:test_file_size, @file.size)
-          @instance.expects(:[]=).with(:test_file_name, nil)
-          @instance.expects(:[]=).with(:test_content_type, nil)
-          @instance.expects(:[]=).with(:test_file_size, nil)
-          @attachment.assign(@file)
-        end
+      should "return a correct url even if the file does not exist" do
+        assert_nil @attachment.to_file
+        assert_equal "/tests/41/blah/5k.png", @attachment.url(:blah)
+      end
 
-        should "return the real url" do
-          assert @attachment.file
-          assert_equal "/tests/41/original/5k.png", @attachment.url
-          assert_equal "/tests/41/blah/5k.png", @attachment.url(:blah)
-        end
+      should "return the proper path when filename has a single .'s" do
+        assert_equal "./test/../tmp/tests/dummies/original/41/5k.png", @attachment.path
+      end
 
-        should "be dirty" do
-          assert @attachment.dirty?
-        end
+      should "return the proper path when filename has multiple .'s" do
+        @instance.stubs(:[]).with(:test_file_name).returns("5k.old.png")      
+        assert_equal "./test/../tmp/tests/dummies/original/41/5k.old.png", @attachment.path
+      end
 
-        should "have its image and attachments as tempfiles" do
-          [nil, :large, :medium, :small].each do |style|
-            assert File.exists?(@attachment.to_io(style))
-          end
+      context "when expecting three styles" do
+        setup do
+          styles = {:styles => { :large  => ["400x400", :png],
+                                 :medium => ["100x100", :gif],
+                                 :small => ["32x32#", :jpg]}}
+          @attachment = Paperclip::Attachment.new(:test,
+                                                  @instance,
+                                                  styles)
         end
 
-        context "and saved" do
+        context "and assigned a file" do
           setup do
-            @attachment.save
+            @instance.expects(:[]=).with(:test_file_name,
+                                         File.basename(@file.path))
+            @instance.expects(:[]=).with(:test_content_type, "image/png")
+            @instance.expects(:[]=).with(:test_file_size, @file.size)
+            @instance.expects(:[]=).with(:test_file_name, nil)
+            @instance.expects(:[]=).with(:test_content_type, nil)
+            @instance.expects(:[]=).with(:test_file_size, nil)
+            @attachment.assign(@file)
           end
 
-          should "commit the files to disk" do
-            [nil, :large, :medium, :small].each do |style|
-              io = @attachment.to_io(style)
-              assert File.exists?(io)
-              assert ! io.is_a?(::Tempfile)
-            end
+          should "be dirty" do
+            assert @attachment.dirty?
           end
 
-          should "save the files as the right formats and sizes" do
-            [[:large, 400, 61, "PNG"],
-             [:medium, 100, 15, "GIF"],
-             [:small, 32, 32, "JPEG"]].each do |style|
-              cmd = "identify -format '%w %h %b %m' " + 
-                    "#{@attachment.to_io(style.first).path}"
-              out = `#{cmd}`
-              width, height, size, format = out.split(" ")
-              assert_equal style[1].to_s, width.to_s 
-              assert_equal style[2].to_s, height.to_s
-              assert_equal style[3].to_s, format.to_s
+          context "and saved" do
+            setup do
+              @attachment.save
             end
-          end
 
-          should "have #file be equal #to_io(:original)" do
-            assert_equal @attachment.file, @attachment.to_io(:original)
-          end
+            should "return the real url" do
+              assert @attachment.to_file
+              assert_equal "/tests/41/original/5k.png", @attachment.url
+              assert_equal "/tests/41/small/5k.jpg", @attachment.url(:small)
+            end
 
-          should "still have its #file attribute not be nil" do
-            assert ! @attachment.file.nil?
-          end
+            should "commit the files to disk" do
+              [:large, :medium, :small].each do |style|
+                io = @attachment.to_io(style)
+                assert File.exists?(io)
+                assert ! io.is_a?(::Tempfile)
+              end
+            end
 
-          context "and deleted" do
-            setup do
-              @existing_names = @attachment.styles.keys.collect do |style|
-                @attachment.path(style)
+            should "save the files as the right formats and sizes" do
+              [[:large, 400, 61, "PNG"],
+               [:medium, 100, 15, "GIF"],
+               [:small, 32, 32, "JPEG"]].each do |style|
+                cmd = "identify -format '%w %h %b %m' " + 
+                      "#{@attachment.to_io(style.first).path}"
+                out = `#{cmd}`
+                width, height, size, format = out.split(" ")
+                assert_equal style[1].to_s, width.to_s 
+                assert_equal style[2].to_s, height.to_s
+                assert_equal style[3].to_s, format.to_s
               end
-              @instance.expects(:[]=).with(:test_file_name, nil)
-              @instance.expects(:[]=).with(:test_content_type, nil)
-              @instance.expects(:[]=).with(:test_file_size, nil)
-              @attachment.assign nil
-              @attachment.save
             end
 
-            should "delete the files" do
-              @existing_names.each{|f| assert ! File.exists?(f) }
+            should "still have its #file attribute not be nil" do
+              assert ! @attachment.to_file.nil?
+            end
+
+            context "and deleted" do
+              setup do
+                @existing_names = @attachment.styles.keys.collect do |style|
+                  @attachment.path(style)
+                end
+                @instance.expects(:[]=).with(:test_file_name, nil)
+                @instance.expects(:[]=).with(:test_content_type, nil)
+                @instance.expects(:[]=).with(:test_file_size, nil)
+                @attachment.assign nil
+                @attachment.save
+              end
+
+              should "delete the files" do
+                @existing_names.each{|f| assert ! File.exists?(f) }
+              end
             end
           end
         end
       end
+
     end
 
     context "when trying a nonexistant storage type" do

data/test/test_geometry.rb

@@ -82,7 +82,7 @@ class GeometryTest < Test::Unit::TestCase
 
     should "not generate from a bad file" do
       file = "/home/This File Does Not Exist.omg"
-      assert_raise(Errno::ENOENT){ @geo = Paperclip::Geometry.from_file(file) }
+      assert_raise(Paperclip::NotIdentifiedByImageMagickError){ @geo = Paperclip::Geometry.from_file(file) }
     end
 
     [['vertical',   900,  1440, true,  false, false, 1440, 900, 0.625],

data/test/test_integration.rb

@@ -1,11 +1,102 @@
 require 'test/helper.rb'
 
 class IntegrationTest < Test::Unit::TestCase
+  context "Many models at once" do
+    setup do
+      rebuild_model
+      @file      = File.new(File.join(FIXTURES_DIR, "5k.png"))
+      300.times do |i|
+        Dummy.create! :avatar => @file
+      end
+    end
+    
+    should "not exceed the open file limit" do
+       assert_nothing_raised do
+         dummies = Dummy.find(:all)
+         dummies.each { |dummy| dummy.avatar }
+       end
+    end
+  end
+
+  context "An attachment" do
+    setup do
+      rebuild_model :styles => { :thumb => "50x50#" }
+      @dummy = Dummy.new
+      @file = File.new(File.join(File.dirname(__FILE__),
+                                 "fixtures",
+                                 "5k.png"))
+      @dummy.avatar = @file
+      assert @dummy.save
+    end
+
+    should "create its thumbnails properly" do
+      assert_match /\b50x50\b/, `identify '#{@dummy.avatar.path(:thumb)}'`
+    end
+
+    context "redefining its attachment styles" do
+      setup do
+        Dummy.class_eval do
+          has_attached_file :avatar, :styles => { :thumb => "150x25#" }
+        end
+        @d2 = Dummy.find(@dummy.id)
+        @d2.avatar.reprocess!
+        @d2.save
+      end
+
+      should "create its thumbnails properly" do
+        assert_match /\b150x25\b/, `identify '#{@dummy.avatar.path(:thumb)}'`
+      end
+    end
+  end
+
+  context "A model with no attachment validation" 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 false when asked about whiny_thumbnails" do
+      assert ! Dummy.attachment_definitions[:avatar][:whiny_thumbnails]
+    end
+
+    context "when validates_attachment_thumbnails is called" do
+      setup do
+        Dummy.validates_attachment_thumbnails :avatar
+      end
+
+      should "have its definition return true when asked about whiny_thumbnails" do
+        assert_equal true, Dummy.attachment_definitions[:avatar][:whiny_thumbnails]
+      end
+    end
+
+    context "redefined to have attachment validations" do
+      setup do
+        rebuild_model :styles => { :large => "300x300>",
+                                   :medium => "100x100",
+                                   :thumb => ["32x32#", :gif] },
+                      :whiny_thumbnails => true,
+                      :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 true when asked about whiny_thumbnails" do
+        assert_equal true, Dummy.attachment_definitions[:avatar][:whiny_thumbnails]
+      end
+    end
+  end
+  
   context "A model with a filesystem attachment" do
     setup do
       rebuild_model :styles => { :large => "300x300>",
                                  :medium => "100x100",
                                  :thumb => ["32x32#", :gif] },
+                    :whiny_thumbnails => true,
                     :default_style => :medium,
                     :url => "/:attachment/:class/:style/:id/:basename.:extension",
                     :path => ":rails_root/tmp/:attachment/:class/:style/:id/:basename.:extension"
@@ -19,8 +110,7 @@ class IntegrationTest < Test::Unit::TestCase
     end
 
     should "write and delete its files" do
-      [["100x15", nil],
-       ["434x66", :original],
+      [["434x66", :original],
        ["300x46", :large],
        ["100x15", :medium],
        ["32x32", :thumb]].each do |geo, style|
@@ -78,16 +168,18 @@ class IntegrationTest < Test::Unit::TestCase
     end
 
     should "know the difference between good files, bad files, not files, and nil" do
-      expected = @dummy.avatar.file
+      expected = @dummy.avatar.to_file
       @dummy.avatar = "not a file"
       assert @dummy.valid?
-      assert_equal expected.path, @dummy.avatar.file.path
+      assert_equal expected.path, @dummy.avatar.to_file.path
 
       @dummy.avatar = @bad_file
       assert ! @dummy.valid?
       @dummy.avatar = nil
       assert @dummy.valid?
+    end
 
+    should "know the difference between good files, bad files, not files, and nil when validating" do
       Dummy.validates_attachment_presence :avatar
       @d2 = Dummy.find(@dummy.id)
       @d2.avatar = @file
@@ -126,6 +218,7 @@ class IntegrationTest < Test::Unit::TestCase
                                    :medium => "100x100",
                                    :thumb => ["32x32#", :gif] },
                       :storage => :s3,
+                      :whiny_thumbnails => true,
                       # :s3_options => {:logger => Logger.new(StringIO.new)},
                       :s3_credentials => File.new(File.join(File.dirname(__FILE__), "s3.yml")),
                       :default_style => :medium,
@@ -204,10 +297,10 @@ class IntegrationTest < Test::Unit::TestCase
       end
 
       should "know the difference between good files, bad files, not files, and nil" do
-        expected = @dummy.avatar.file
+        expected = @dummy.avatar.to_file
         @dummy.avatar = "not a file"
         assert @dummy.valid?
-        assert_equal expected, @dummy.avatar.file
+        assert_equal expected.full_name, @dummy.avatar.to_file.full_name
 
         @dummy.avatar = @bad_file
         assert ! @dummy.valid?

data/test/test_paperclip.rb

@@ -64,12 +64,17 @@ class PaperclipTest < Test::Unit::TestCase
       assert Dummy.new.respond_to?(:avatar=)
     end
 
-    [[:presence,   nil,               "5k.png", nil],
-     [:size,       {:in => 1..10240}, "5k.png", "12k.png"]].each do |args|
+    [[:presence,      nil,                             "5k.png",   nil],
+     [:size,          {:in => 1..10240},               "5k.png",   "12k.png"],
+     [:size2,         {:in => 1..10240},               nil,        "12k.png"],
+     [:content_type1, {:content_type => "image/png"},  "5k.png",   "text.txt"],
+     [:content_type2, {:content_type => "text/plain"}, "text.txt", "5k.png"],
+     [:content_type3, {:content_type => %r{image/.*}}, "5k.png",   "text.txt"],
+     [:content_type4, {:content_type => "image/png"},  nil,        "text.txt"]].each do |args|
       context "with #{args[0]} validations" do
         setup do
           Dummy.class_eval do
-            send(*[:"validates_attachment_#{args[0]}", :avatar, args[1]].compact)
+            send(*[:"validates_attachment_#{args[0].to_s[/[a-z_]*/]}", :avatar, args[1]].compact)
           end
           @dummy = Dummy.new
         end
@@ -97,6 +102,21 @@ class PaperclipTest < Test::Unit::TestCase
             assert_equal 1, @dummy.avatar.errors.length
           end
         end
+        
+#        context "and an invalid file with :message" do
+#          setup do
+#            @file = args[3] && File.new(File.join(FIXTURES_DIR, args[3]))
+#          end
+#
+#          should "have errors" do
+#            if args[1] && args[1][:message] && args[4]
+#              @dummy.avatar = @file
+#              assert ! @dummy.avatar.valid?
+#              assert_equal 1, @dummy.avatar.errors.length
+#              assert_equal args[4], @dummy.avatar.errors[0]
+#            end
+#          end
+#        end
       end
     end
   end

data/test/test_storage.rb

@@ -5,17 +5,13 @@ require 'right_aws'
 
 require File.join(File.dirname(__FILE__), '..', 'lib', 'paperclip', 'geometry.rb')
 
-class S3Test < Test::Unit::TestCase
+class StorageTest < Test::Unit::TestCase
   context "Parsing S3 credentials" do
     setup do
       rebuild_model :storage => :s3,
                     :bucket => "testing",
                     :s3_credentials => {:not => :important}
 
-      @s3_stub = stub
-      @bucket_stub = stub
-      RightAws::S3.expects(:new).returns(@s3_stub)
-      @s3_stub.expects(:bucket).returns(@bucket_stub)
       @dummy = Dummy.new
       @avatar = @dummy.avatar
 
@@ -50,17 +46,11 @@ class S3Test < Test::Unit::TestCase
     setup do
       rebuild_model :storage => :s3,
                     :bucket => "testing",
+                    :path => ":attachment/:style/:basename.:extension",
                     :s3_credentials => {
                       'access_key_id' => "12345",
                       'secret_access_key' => "54321"
                     }
-
-      @s3_mock     = stub
-      @bucket_mock = stub
-      RightAws::S3.expects(:new).
-        with("12345", "54321", {}).
-        returns(@s3_mock)
-      @s3_mock.expects(:bucket).with("testing", true, "public-read").returns(@bucket_mock)
     end
 
     should "be extended by the S3 module" do
@@ -78,12 +68,18 @@ class S3Test < Test::Unit::TestCase
         @dummy.avatar = @file
       end
 
-      should "still return a Tempfile when sent #to_io" do
-        assert_equal Tempfile, @dummy.avatar.to_io.class
+      should "not get a bucket to get a URL" do
+        @dummy.avatar.expects(:s3).never
+        @dummy.avatar.expects(:s3_bucket).never
+        assert_equal "https://s3.amazonaws.com/testing/avatars/original/5k.png", @dummy.avatar.url
       end
 
       context "and saved" do
         setup do
+          @s3_mock     = stub
+          @bucket_mock = stub
+          RightAws::S3.expects(:new).with("12345", "54321", {}).returns(@s3_mock)
+          @s3_mock.expects(:bucket).with("testing", true, "public-read").returns(@bucket_mock)
           @key_mock = stub
           @bucket_mock.expects(:key).returns(@key_mock)
           @key_mock.expects(:data=)