paperclip 2.8.0 → 3.0.2

data/test/storage/filesystem_test.rb

@@ -23,20 +23,6 @@ class FileSystemTest < Test::Unit::TestCase
       assert File.exists?(@dummy.avatar.path(:thumbnail))
     end
 
-    should "clean up file objects" do
-      File.stubs(:exist?).returns(true)
-      Paperclip::Tempfile.any_instance.expects(:close).at_least_once()
-      Paperclip::Tempfile.any_instance.expects(:unlink).at_least_once()
-
-      @dummy.save!
-    end
-
-    should "always be rewound when returning from #to_file" do
-      assert_equal 0, @dummy.avatar.to_file.pos
-      @dummy.avatar.to_file.seek(10)
-      assert_equal 0, @dummy.avatar.to_file.pos
-    end
-        
     context "with file that has space in file name" do
       setup do
         rebuild_model :styles => { :thumbnail => "25x25#" }

data/test/storage/fog_test.rb

@@ -56,14 +56,6 @@ class FogTest < Test::Unit::TestCase
         assert_equal File.expand_path(File.join(File.dirname(__FILE__), "../../public/avatars/5k.png")),
                      @dummy.avatar.path
       end
-
-      should "clean up file objects" do
-        File.stubs(:exist?).returns(true)
-        Paperclip::Tempfile.any_instance.expects(:close).at_least_once()
-        Paperclip::Tempfile.any_instance.expects(:unlink).at_least_once()
-
-        @dummy.save!
-      end
     end
 
     setup do
@@ -110,12 +102,6 @@ class FogTest < Test::Unit::TestCase
         directory.destroy
       end
 
-      should "always be rewound when returning from #to_file" do
-        assert_equal 0, @dummy.avatar.to_file.pos
-        @dummy.avatar.to_file.seek(10)
-        assert_equal 0, @dummy.avatar.to_file.pos
-      end
-            
       should "pass the content type to the Fog::Storage::AWS::Files instance" do
         Fog::Storage::AWS::Files.any_instance.expects(:create).with do |hash|
           hash[:content_type]

data/test/storage/s3_live_test.rb

@@ -1,9 +1,31 @@
 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
+        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"))
+
+        @dummy = Dummy.new
+        @attachment = Dummy.new.avatar
+        @file = File.new(fixture_file("5k.png"))
+        @attachment.assign(@file)
+        @attachment.save
+
+        @attachment2 = Dummy.new.avatar
+        @attachment2.assign(@file)
+        @attachment2.save
+      end
+    end
+
+
     context "Generating an expiring url on a nonexistant attachment" do
       setup do
         rebuild_model :styles => { :thumb => "100x100", :square => "32x32#" },
@@ -46,10 +68,6 @@ unless ENV["S3_BUCKET"].blank?
           @dummy.destroy
         end
 
-        should "still return a Tempfile when sent #to_file" do
-          assert_equal Paperclip::Tempfile, @dummy.avatar.to_file.class
-        end
-
         context "and saved" do
           setup do
             @dummy.save
@@ -58,11 +76,6 @@ unless ENV["S3_BUCKET"].blank?
           should "be on S3" do
             assert true
           end
-
-          should "generate a tempfile with the right name" do
-            file = @dummy.avatar.to_file
-            assert_match /^original.*\.png$/, File.basename(file.path)
-          end
         end
       end
     end

data/test/storage/s3_test.rb

@@ -88,7 +88,6 @@ class S3Test < Test::Unit::TestCase
 
     setup do
       rebuild_model :storage => :s3,
-                    #:bucket => "testing", # intentionally left out
                     :http_proxy => @proxy_settings,
                     :s3_credentials => {:not => :important}
 
@@ -241,7 +240,7 @@ class S3Test < Test::Unit::TestCase
                       'secret_access_key' => "54321"
                     }
 
-      file = StringIO.new(".")
+      file = Paperclip.io_adapters.for(StringIO.new("."))
       file.original_filename = "question?mark.png"
       @dummy = Dummy.new
       @dummy.avatar = file
@@ -336,24 +335,29 @@ class S3Test < Test::Unit::TestCase
       assert_match %r{^avatars/stringio\.txt}, @dummy.avatar.url
     end
 
-    should "always be rewound when returning from #to_file" do
-        assert_equal 0, @dummy.avatar.to_file.pos
-        @dummy.avatar.to_file.seek(10)
-        assert_equal 0, @dummy.avatar.to_file.pos
-      end
-    end
+  end
 
   context "Generating a secure url with an expiration" do
     setup do
-      rebuild_model :storage => :s3,
-                    :s3_credentials => {
-                      :production   => { :bucket => "prod_bucket" },
-                      :development  => { :bucket => "dev_bucket" }
-                    },
-                    :s3_host_alias => "something.something.com",
-                    :s3_permissions => "private",
-                    :path => ":attachment/:basename.:extension",
-                    :url => ":s3_alias_url"
+      @build_model_with_options = lambda {|options|
+        base_options = {
+          :storage => :s3,
+          :s3_credentials => {
+            :production   => { :bucket => "prod_bucket" },
+            :development  => { :bucket => "dev_bucket" }
+          },
+          :s3_host_alias => "something.something.com",
+          :s3_permissions => "private",
+          :path => ":attachment/:basename.:extension",
+          :url => ":s3_alias_url"
+        }
+
+        rebuild_model base_options.merge(options)
+      }
+    end
+
+    should "use default options" do
+      @build_model_with_options[{}]
 
       rails_env("production")
 
@@ -367,8 +371,40 @@ class S3Test < Test::Unit::TestCase
       @dummy.avatar.expiring_url
     end
 
-    should "should succeed" do
-      assert true
+    should "allow overriding s3_url_options" do
+      @build_model_with_options[:s3_url_options => { :response_content_disposition => "inline" }]
+
+      rails_env("production")
+
+      @dummy = Dummy.new
+      @dummy.avatar = StringIO.new(".")
+
+      object = stub
+      @dummy.avatar.stubs(:s3_object).returns(object)
+      object.expects(:url_for).with(:read, :expires => 3600, :secure => true, :response_content_disposition => "inline")
+
+      @dummy.avatar.expiring_url
+    end
+
+    should "allow overriding s3_object options with a proc" do
+      @build_model_with_options[:s3_url_options => lambda {|attachment| { :response_content_type => attachment.avatar_content_type } }]
+
+      rails_env("production")
+
+      @dummy = Dummy.new
+
+      @file = StringIO.new(".")
+      @file.stubs(:original_filename).returns("5k.png\n\n")
+      @file.stubs(:content_type).returns("image/png\n\n")
+      @file.stubs(:to_tempfile).returns(@file)
+
+      @dummy.avatar = @file
+
+      object = stub
+      @dummy.avatar.stubs(:s3_object).returns(object)
+      object.expects(:url_for).with(:read, :expires => 3600, :secure => true, :response_content_type => "image/png")
+
+      @dummy.avatar.expiring_url
     end
   end
 
@@ -507,14 +543,6 @@ class S3Test < Test::Unit::TestCase
         end
       end
 
-      should "delete tempfiles" do
-        File.stubs(:exist?).returns(true)
-        Paperclip::Tempfile.any_instance.expects(:close).at_least_once()
-        Paperclip::Tempfile.any_instance.expects(:unlink).at_least_once()
-
-        @dummy.save!
-      end
-
       context "and saved without a bucket" do
         setup do
           AWS::S3::BucketCollection.any_instance.expects(:create).with("testing")
@@ -570,6 +598,21 @@ class S3Test < Test::Unit::TestCase
     end
   end
 
+  context "An attachment with S3 storage and S3 credentials defined as a Proc" do
+    setup do
+      rebuild_model :storage => :s3,
+                    :bucket => {:not => :important},
+                    :s3_credentials => lambda { |attachment|
+                      Hash['access_key_id' => "access#{attachment.instance.other}", 'secret_access_key' => "secret#{attachment.instance.other}"]
+                    }
+    end
+
+    should "get the right credentials" do
+      assert "access1234", Dummy.new(:other => '1234').avatar.s3_credentials[:access_key_id]
+      assert "secret1234", Dummy.new(:other => '1234').avatar.s3_credentials[:secret_access_key]
+    end
+  end
+
   context "An attachment with S3 storage and specific s3 headers set" do
     setup do
       rebuild_model :storage => :s3,
@@ -1002,13 +1045,6 @@ class S3Test < Test::Unit::TestCase
 
         context "and saved" do
           setup do
-            [:thumb, :original].each do |style|
-              object = stub
-              @dummy.avatar.stubs(:s3_object).with(style).returns(object)
-              object.expects(:write).with(anything,
-                                          :content_type => "image/png",
-                                          :acl => style == :thumb ? :public_read : :private)
-            end
             @dummy.save
           end
 

data/test/stringio_adapter_test.rb

@@ -0,0 +1,42 @@
+require './test/helper'
+
+class StringioFileProxyTest < Test::Unit::TestCase
+  context "a new instance" do
+    setup do
+      @contents = "abc123"
+      @stringio = StringIO.new(@contents)
+      @subject = Paperclip.io_adapters.for(@stringio)
+    end
+
+    should "return a file name" do
+      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
+
+    should "generate an MD5 hash of the contents" do
+      assert_equal Digest::MD5.hexdigest(@contents), @subject.fingerprint
+    end
+
+    should "return the data contained in the StringIO" do
+      assert_equal "abc123", @subject.read
+    end
+
+  end
+end

data/test/style_test.rb

@@ -96,46 +96,40 @@ class StyleTest < Test::Unit::TestCase
   end
 
   context "An attachment with :convert_options" do
-    should "not have called extra_options_for(:thumb/:large) on initialization" do
+    setup do
       @attachment = attachment :path => ":basename.:extension",
                                :styles => {:thumb => "100x100", :large => "400x400"},
                                :convert_options => {:all => "-do_stuff", :thumb => "-thumbnailize"}
-      @attachment.expects(:extra_options_for).never
       @style = @attachment.styles[:thumb]
       @file = StringIO.new("...")
       @file.stubs(:original_filename).returns("file.jpg")
     end
 
+    before_should "not have called extra_options_for(:thumb/:large) on initialization" do
+      @attachment.expects(:extra_options_for).never
+    end
+
     should "call extra_options_for(:thumb/:large) when convert options are requested" do
-      @attachment = attachment :path => ":basename.:extension",
-                               :styles => {:thumb => "100x100", :large => "400x400"},
-                               :convert_options => {:all => "-do_stuff", :thumb => "-thumbnailize"}
-      @style = @attachment.styles[:thumb]
-      @file = StringIO.new("...")
-      @file.stubs(:original_filename).returns("file.jpg")
       @attachment.expects(:extra_options_for).with(:thumb)
       @attachment.styles[:thumb].convert_options
     end
   end
 
   context "An attachment with :source_file_options" do
-    should "not have called extra_source_file_options_for(:thumb/:large) on initialization" do
+    setup do
       @attachment = attachment :path => ":basename.:extension",
                                :styles => {:thumb => "100x100", :large => "400x400"},
                                :source_file_options => {:all => "-density 400", :thumb => "-depth 8"}
-      @attachment.expects(:extra_source_file_options_for).never
       @style = @attachment.styles[:thumb]
       @file = StringIO.new("...")
       @file.stubs(:original_filename).returns("file.jpg")
     end
 
+    before_should "not have called extra_source_file_options_for(:thumb/:large) on initialization" do
+      @attachment.expects(:extra_source_file_options_for).never
+    end
+
     should "call extra_options_for(:thumb/:large) when convert options are requested" do
-      @attachment = attachment :path => ":basename.:extension",
-                               :styles => {:thumb => "100x100", :large => "400x400"},
-                               :source_file_options => {:all => "-density 400", :thumb => "-depth 8"}
-      @style = @attachment.styles[:thumb]
-      @file = StringIO.new("...")
-      @file.stubs(:original_filename).returns("file.jpg")
       @attachment.expects(:extra_source_file_options_for).with(:thumb)
       @attachment.styles[:thumb].source_file_options
     end

data/test/thumbnail_test.rb

@@ -77,10 +77,10 @@ class ThumbnailTest < Test::Unit::TestCase
         old_path = ENV['PATH']
         begin
           ENV['PATH'] = ''
-          Cocaine::CommandLine.path = ''
-          Paperclip.options[:command_path] = ''
-          assert_raises(Paperclip::CommandNotFoundError) do
-            @thumb.make
+          assert_raises(Paperclip::Errors::CommandNotFoundError) do
+            silence_stream(STDERR) do
+              @thumb.make
+            end
           end
         ensure
           ENV['PATH'] = old_path
@@ -156,8 +156,10 @@ class ThumbnailTest < Test::Unit::TestCase
         end
 
         should "error when trying to create the thumbnail" do
-          assert_raises(Paperclip::PaperclipError) do
-            @thumb.make
+          assert_raises(Paperclip::Error) do
+            silence_stream(STDERR) do
+              @thumb.make
+            end
           end
         end
       end
@@ -196,8 +198,10 @@ class ThumbnailTest < Test::Unit::TestCase
         end
 
         should "error when trying to create the thumbnail" do
-          assert_raises(Paperclip::PaperclipError) do
-            @thumb.make
+          assert_raises(Paperclip::Error) do
+            silence_stream(STDERR) do
+              @thumb.make
+            end
           end
         end
 
@@ -205,8 +209,10 @@ class ThumbnailTest < Test::Unit::TestCase
           old_path = ENV['PATH']
           begin
             ENV['PATH'] = ''
-            assert_raises(Paperclip::CommandNotFoundError) do
-              @thumb.make
+            assert_raises(Paperclip::Errors::CommandNotFoundError) do
+              silence_stream(STDERR) do
+                @thumb.make
+              end
             end
           ensure
             ENV['PATH'] = old_path

data/test/uploaded_file_adapter_test.rb

@@ -0,0 +1,98 @@
+require './test/helper'
+
+class UploadedFileAdapterTest < Test::Unit::TestCase
+  context "a new instance" do
+    context "with UploadedFile responding to #tempfile" do
+      setup do
+        class UploadedFile < OpenStruct; end
+        tempfile = File.new(fixture_file("5k.png"))
+        tempfile.binmode
+
+        @file = UploadedFile.new(
+          :original_filename => "5k.png",
+          :content_type => "image/png",
+          :head => "",
+          :tempfile => tempfile
+        )
+        @subject = Paperclip.io_adapters.for(@file)
+      end
+
+      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 "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.tempfile.path).to_s
+        assert_equal expected, @subject.fingerprint
+      end
+
+      should "read the contents of the file" do
+        expected = @file.tempfile.read
+        assert expected.length > 0
+        assert_equal expected, @subject.read
+      end
+    end
+
+    context "with UploadFile responding to #path" do
+      setup do
+        class UploadedFile < OpenStruct; end
+        @file = UploadedFile.new(
+          :original_filename => "5k.png",
+          :content_type => "image/png",
+          :head => "",
+          :path => fixture_file("5k.png")
+        )
+        @subject = Paperclip.io_adapters.for(@file)
+      end
+
+      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 "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 = File.new(@file.path)
+        expected_file.binmode
+        expected = expected_file.read
+        assert expected.length > 0
+        assert_equal expected, @subject.read
+      end
+    end
+  end
+end