dm-paperclip 2.4.1 → 2.5.0

data/test/processor_test.rb

@@ -0,0 +1,10 @@
+require './test/helper'
+
+class ProcessorTest < Test::Unit::TestCase
+  should "instantiate and call #make when sent #make to the class" do
+    processor = mock
+    processor.expects(:make).with()
+    Paperclip::Processor.expects(:new).with(:one, :two, :three).returns(processor)
+    Paperclip::Processor.make(:one, :two, :three)
+  end
+end

data/test/storage_test.rb

@@ -1,7 +1,32 @@
-require 'test/helper'
+require File.expand_path("./helper", File.dirname(__FILE__))
+
 require 'aws/s3'
 
 class StorageTest < Test::Unit::TestCase
+
+  context "filesystem" do
+    setup do
+      rebuild_model :styles => { :thumbnail => "25x25#" }
+      @dummy = Dummy.create!
+
+      @dummy.avatar = File.open(File.join(File.dirname(__FILE__), "fixtures", "5k.png"))
+    end
+    
+    should "allow file assignment" do
+      assert @dummy.save
+    end
+    
+    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 "Parsing S3 credentials" do
     setup do
       AWS::S3::Base.stubs(:establish_connection!)
@@ -12,29 +37,29 @@ class StorageTest < Test::Unit::TestCase
       @dummy = Dummy.new
       @avatar = @dummy.avatar
 
-      @current_env = Merb.env
+      @old_env = Paperclip.config.env
     end
 
     teardown do
-      Merb.env(@current_env)
+      Paperclip.config.env = @old_env
     end
 
     should "get the correct credentials when environment is production" do
-      Merb.env("production")
+      Paperclip.config.env = "production"
       assert_equal({:key => "12345"},
                    @avatar.parse_credentials('production' => {:key => '12345'},
                                              :development => {:key => "54321"}))
     end
 
     should "get the correct credentials when environment is development" do
-      Merb.env("development")
+      Paperclip.config.env = "development"
       assert_equal({:key => "54321"},
                    @avatar.parse_credentials('production' => {:key => '12345'},
                                              :development => {:key => "54321"}))
     end
 
     should "return the argument if the key does not exist" do
-      Merb.env("not really an env")
+      Paperclip.config.env = "not really an env"
       assert_equal({:test => "12345"}, @avatar.parse_credentials(:test => "12345"))
     end
   end
@@ -90,7 +115,7 @@ class StorageTest < Test::Unit::TestCase
       assert_match %r{^http://something.something.com/avatars/stringio.txt}, @dummy.avatar.url
     end
   end
-  
+
   context "Generating a url with an expiration" do
     setup do
       AWS::S3::Base.stubs(:establish_connection!)
@@ -102,17 +127,22 @@ class StorageTest < Test::Unit::TestCase
                     :s3_host_alias => "something.something.com",
                     :path => ":attachment/:basename.:extension",
                     :url => ":s3_alias_url"
-                    
-      Merb.env("production")
-      
+
+      @old_env = Paperclip.config.env
+      Paperclip.config.env = "production"
+
       @dummy = Dummy.new
       @dummy.avatar = StringIO.new(".")
-      
+
       AWS::S3::S3Object.expects(:url_for).with("avatars/stringio.txt", "prod_bucket", { :expires_in => 3600 })
-      
+
       @dummy.avatar.expiring_url
     end
-    
+
+    teardown do
+      Paperclip.config.env = @old_env
+    end
+
     should "should succeed" do
       assert true
     end
@@ -127,18 +157,20 @@ class StorageTest < Test::Unit::TestCase
                       :development  => { :bucket => "dev_bucket" }
                     }
       @dummy = Dummy.new
-      @old_env = Merb.env
+      @old_env = Paperclip.config.env
     end
 
-    teardown{ Merb.env(@old_env) }
+    teardown do
+      Paperclip.config.env = @old_env
+    end
 
     should "get the right bucket in production" do
-      Merb.env("production")
+      Paperclip.config.env = "production"
       assert_equal "prod_bucket", @dummy.avatar.bucket_name
     end
 
     should "get the right bucket in development" do
-      Merb.env("development")
+      Paperclip.config.env = "development"
       assert_equal "dev_bucket", @dummy.avatar.bucket_name
     end
   end
@@ -187,7 +219,22 @@ class StorageTest < Test::Unit::TestCase
           assert true
         end
       end
-      
+
+      context "and saved without a bucket" do
+        setup do
+          class AWS::S3::NoSuchBucket < AWS::S3::ResponseError
+            # Force the class to be created as a proper subclass of ResponseError thanks to AWS::S3's autocreation of exceptions
+          end
+          AWS::S3::Bucket.expects(:create).with("testing")
+          AWS::S3::S3Object.stubs(:store).raises(AWS::S3::NoSuchBucket.new(:message, :response)).then.returns(true)
+          @dummy.save
+        end
+
+        should "succeed" do
+          assert true
+        end
+      end
+
       context "and remove" do
         setup do
           AWS::S3::S3Object.stubs(:exists?).returns(true)
@@ -201,7 +248,7 @@ class StorageTest < Test::Unit::TestCase
       end
     end
   end
-  
+
   context "An attachment with S3 storage and bucket defined as a Proc" do
     setup do
       AWS::S3::Base.stubs(:establish_connection!)
@@ -209,7 +256,7 @@ class StorageTest < Test::Unit::TestCase
                     :bucket => lambda { |attachment| "bucket_#{attachment.instance.other}" },
                     :s3_credentials => {:not => :important}
     end
-    
+
     should "get the right bucket name" do
       assert "bucket_a", Dummy.new(:other => 'a').avatar.bucket_name
       assert "bucket_b", Dummy.new(:other => 'b').avatar.bucket_name
@@ -257,6 +304,33 @@ class StorageTest < Test::Unit::TestCase
     end
   end
 
+  context "with S3 credentials supplied as Pathname" do
+     setup do
+       ENV['S3_KEY']    = 'pathname_key'
+       ENV['S3_BUCKET'] = 'pathname_bucket'
+       ENV['S3_SECRET'] = 'pathname_secret'
+
+       @old_env = Paperclip.config.env
+       Paperclip.config.env = 'test'
+
+       rebuild_model :storage        => :s3,
+                     :s3_credentials => Pathname.new(File.join(File.dirname(__FILE__))).join("fixtures/s3.yml")
+
+       Dummy.auto_migrate!
+       @dummy = Dummy.new
+     end
+
+    teardown do
+      Paperclip.config.env = @old_env
+    end
+
+     should "parse the credentials" do
+       assert_equal 'pathname_bucket', @dummy.avatar.bucket_name
+       assert_equal 'pathname_key', AWS::S3::Base.connection.options[:access_key_id]
+       assert_equal 'pathname_secret', AWS::S3::Base.connection.options[:secret_access_key]
+     end
+  end
+
   context "with S3 credentials in a YAML file" do
     setup do
       ENV['S3_KEY']    = 'env_key'
@@ -280,7 +354,7 @@ class StorageTest < Test::Unit::TestCase
     end
   end
 
-  unless ENV["S3_TEST_BUCKET"].blank?
+  unless Paperclip::Ext.blank?(ENV["S3_TEST_BUCKET"])
     context "Using S3 for real, an attachment with S3 storage" do
       setup do
         rebuild_model :styles => { :thumb => "100x100", :square => "32x32#" },
@@ -306,7 +380,7 @@ class StorageTest < Test::Unit::TestCase
         teardown { @file.close }
 
         should "still return a Tempfile when sent #to_file" do
-          assert_equal Tempfile, @dummy.avatar.to_file.class
+          assert_equal Paperclip::Tempfile, @dummy.avatar.to_file.class
         end
 
         context "and saved" do
@@ -317,8 +391,13 @@ class StorageTest < Test::Unit::TestCase
           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
   end
-end
+end

data/test/style_test.rb

@@ -0,0 +1,141 @@
+# encoding: utf-8
+require './test/helper'
+
+class StyleTest < Test::Unit::TestCase
+
+  context "A style rule" do
+    setup do
+      @attachment = attachment :path => ":basename.:extension",
+                               :styles => { :foo => {:geometry => "100x100#", :format => :png} }
+      @style = @attachment.styles[:foo]
+    end
+
+    should "be held as a Style object" do
+      assert_kind_of Paperclip::Style, @style
+    end
+
+    should "get processors from the attachment definition" do
+      assert_equal [:thumbnail], @style.processors
+    end
+
+    should "have the right geometry" do
+      assert_equal "100x100#", @style.geometry
+    end
+
+    should "be whiny if the attachment is" do
+      @attachment.expects(:whiny).returns(true)
+      assert @style.whiny?
+    end
+
+    should "respond to hash notation" do
+      assert_equal [:thumbnail], @style[:processors]
+      assert_equal "100x100#", @style[:geometry]
+    end
+  end
+
+  context "A style rule with properties supplied as procs" do
+    setup do
+      @attachment = attachment :path => ":basename.:extension",
+                               :whiny_thumbnails => true,
+                               :processors => lambda {|a| [:test]},
+                               :styles => {
+                                 :foo => lambda{|a| "300x300#"},
+                                 :bar => {
+                                   :geometry => lambda{|a| "300x300#"}
+                                 }
+                               }
+    end
+
+    should "defer processing of procs until they are needed" do
+      assert_kind_of Proc, @attachment.styles[:foo].instance_variable_get("@geometry")
+      assert_kind_of Proc, @attachment.styles[:bar].instance_variable_get("@geometry")
+      assert_kind_of Proc, @attachment.instance_variable_get("@processors")
+    end
+
+    should "call procs when they are needed" do
+      assert_equal "300x300#", @attachment.styles[:foo].geometry
+      assert_equal "300x300#", @attachment.styles[:bar].geometry
+      assert_equal [:test], @attachment.styles[:foo].processors
+      assert_equal [:test], @attachment.styles[:bar].processors
+    end
+  end
+
+  context "An attachment with style rules in various forms" do
+    setup do
+      @attachment = attachment :path => ":basename.:extension",
+                               :styles => {
+                                 :aslist => ["100x100", :png],
+                                 :ashash => {:geometry => "100x100", :format => :png},
+                                 :asstring => "100x100"
+                                }
+    end
+    should "have the right number of styles" do
+      assert_kind_of Hash, @attachment.styles
+      assert_equal 3, @attachment.styles.size
+    end
+
+    should "have styles as Style objects" do
+      [:aslist, :ashash, :aslist].each do |s|
+        assert_kind_of Paperclip::Style, @attachment.styles[s]
+      end
+    end
+
+    should "have the right geometries" do
+      [:aslist, :ashash, :aslist].each do |s|
+        assert_equal @attachment.styles[s].geometry, "100x100"
+      end
+    end
+
+    should "have the right formats" do
+      assert_equal @attachment.styles[:aslist].format, :png
+      assert_equal @attachment.styles[:ashash].format, :png
+      assert_nil @attachment.styles[:asstring].format
+    end
+
+  end
+
+  context "An attachment with :convert_options" do
+    setup 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")
+    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.expects(:extra_options_for).with(:thumb)
+      @attachment.styles[:thumb].convert_options
+    end
+  end
+
+  context "A style rule with its own :processors" do
+    setup do
+      @attachment = attachment :path => ":basename.:extension",
+                               :styles => {
+                                 :foo => {
+                                   :geometry => "100x100#",
+                                   :format => :png,
+                                   :processors => [:test]
+                                  }
+                                },
+                               :processors => [:thumbnail]
+      @style = @attachment.styles[:foo]
+    end
+
+    should "not get processors from the attachment" do
+      @attachment.expects(:processors).never
+      assert_not_equal [:thumbnail], @style.processors
+    end
+
+    should "report its own processors" do
+      assert_equal [:test], @style.processors
+    end
+
+  end
+end

data/test/thumbnail_test.rb

@@ -4,14 +4,15 @@ require 'shoulda'
 require 'mocha'
 require 'tempfile'
 
-require File.join(File.dirname(__FILE__), '..', 'lib', 'dm-paperclip', 'geometry.rb')
-require File.join(File.dirname(__FILE__), '..', 'lib', 'dm-paperclip', 'thumbnail.rb')
+require 'dm-paperclip/geometry'
+require 'dm-paperclip/processor'
+require 'dm-paperclip/thumbnail'
 
 class ThumbnailTest < Test::Unit::TestCase
 
   context "A Paperclip Tempfile" do
     setup do
-      @tempfile = Paperclip::Tempfile.new("file.jpg")
+      @tempfile = Paperclip::Tempfile.new(["file", ".jpg"])
     end
 
     should "have its path contain a real extension" do
@@ -39,9 +40,11 @@ class ThumbnailTest < Test::Unit::TestCase
 
   context "An image" do
     setup do
-      @file = File.new(File.join(File.dirname(__FILE__), "fixtures", "5k.png"))
+      @file = File.new(File.join(File.dirname(__FILE__), "fixtures", "5k.png"), 'rb')
     end
 
+    teardown { @file.close }
+
     [["600x600>", "434x66"],
      ["400x400>", "400x61"],
      ["32x32<", "434x66"]
@@ -52,7 +55,7 @@ class ThumbnailTest < Test::Unit::TestCase
         end
 
         should "start with dimensions of 434x66" do
-          cmd = %Q[identify -format "%wx%h" #{@file.path}]
+          cmd = %Q[identify -format "%wx%h" "#{@file.path}"]
           assert_equal "434x66", `#{cmd}`.chomp
         end
 
@@ -66,7 +69,7 @@ class ThumbnailTest < Test::Unit::TestCase
           end
 
           should "be the size we expect it to be" do
-            cmd = %Q[identify -format "%wx%h" #{@thumb_result.path}]
+            cmd = %Q[identify -format "%wx%h" "#{@thumb_result.path}"]
             assert_equal args[1], `#{cmd}`.chomp
           end
         end
@@ -87,7 +90,7 @@ class ThumbnailTest < Test::Unit::TestCase
         assert_nil @thumb.format
       end
 
-      should "have whiny_thumbnails turned on by default" do
+      should "have whiny turned on by default" do
         assert @thumb.whiny
       end
 
@@ -96,44 +99,84 @@ class ThumbnailTest < Test::Unit::TestCase
       end
 
       should "send the right command to convert when sent #make" do
-        Paperclip.expects(:run).with do |cmd, arg|
-          cmd.match 'convert'
-          arg.match %r{"#{File.expand_path(@thumb.file.path)}\[0\]"\s+-resize\s+\"x50\"\s+-crop\s+\"100x50\+114\+0\"\s+\+repage\s+".*?"}
+        Paperclip::CommandLine.expects(:"`").with do |arg|
+          arg.match %r{convert ["']#{File.expand_path(@thumb.file.path)}\[0\]["'] -resize ["']x50["'] -crop ["']100x50\+114\+0["'] \+repage ["'].*?["']}
         end
         @thumb.make
       end
 
       should "create the thumbnail when sent #make" do
         dst = @thumb.make
-        assert_match /100x50/, `identify #{dst.path}`
+        assert_match /100x50/, `identify "#{dst.path}"`
+      end
+    end
+
+    context "being thumbnailed with source file options set" do
+      setup do
+        @thumb = Paperclip::Thumbnail.new(@file,
+                                          :geometry            => "100x50#",
+                                          :source_file_options => "-strip")
+      end
+
+      should "have source_file_options value set" do
+        assert_equal ["-strip"], @thumb.source_file_options
+      end
+
+      should "send the right command to convert when sent #make" do
+        Paperclip::CommandLine.expects(:"`").with do |arg|
+          arg.match %r{convert -strip ["']#{File.expand_path(@thumb.file.path)}\[0\]["'] -resize ["']x50["'] -crop ["']100x50\+114\+0["'] \+repage ["'].*?["']}
+        end
+        @thumb.make
+      end
+
+      should "create the thumbnail when sent #make" do
+        dst = @thumb.make
+        assert_match /100x50/, `identify "#{dst.path}"`
+      end
+
+      context "redefined to have bad source_file_options setting" do
+        setup do
+          @thumb = Paperclip::Thumbnail.new(@file,
+                                            :geometry => "100x50#",
+                                            :source_file_options => "-this-aint-no-option")
+        end
+
+        should "error when trying to create the thumbnail" do
+          assert_raises(Paperclip::PaperclipError) do
+            @thumb.make
+          end
+        end
       end
     end
 
     context "being thumbnailed with convert options set" do
       setup do
-        @thumb = Paperclip::Thumbnail.new(@file, :geometry => "100x50#", :format => (format = nil), :convert_options => (convert_options="-strip -depth 8"), :whiny => (whiny_thumbnails=true))
+        @thumb = Paperclip::Thumbnail.new(@file,
+                                          :geometry        => "100x50#",
+                                          :convert_options => "-strip -depth 8")
       end
 
       should "have convert_options value set" do
-        assert_equal "-strip -depth 8", @thumb.convert_options
+        assert_equal %w"-strip -depth 8", @thumb.convert_options
       end
 
       should "send the right command to convert when sent #make" do
-        Paperclip.expects(:run).with do |cmd, arg|
-          cmd.match 'convert'
-          arg.match %r{"#{File.expand_path(@thumb.file.path)}\[0\]"\s+-resize\s+"x50"\s+-crop\s+"100x50\+114\+0"\s+\+repage\s+-strip\s+-depth\s+8\s+".*?"}
+        Paperclip::CommandLine.expects(:"`").with do |arg|
+          arg.match %r{convert ["']#{File.expand_path(@thumb.file.path)}\[0\]["'] -resize ["']x50["'] -crop ["']100x50\+114\+0["'] \+repage -strip -depth 8 ["'].*?["']}
         end
         @thumb.make
       end
 
       should "create the thumbnail when sent #make" do
         dst = @thumb.make
-        assert_match /100x50/, `identify #{dst.path}`
+        assert_match /100x50/, `identify "#{dst.path}"`
       end
 
       context "redefined to have bad convert_options setting" do
         setup do
-          @thumb = Paperclip::Thumbnail.new(@file, :geometry => "100x50#", :format => nil, :convert_options => "-this-aint-no-option", :whiny => true)
+          @thumb = Paperclip::Thumbnail.new(@file,
+                                            :geometry => "100x50#",
+                                            :convert_options => "-this-aint-no-option")
         end
 
         should "error when trying to create the thumbnail" do
@@ -143,5 +186,50 @@ class ThumbnailTest < Test::Unit::TestCase
         end
       end
     end
+
+    context "being thumbnailed with a blank geometry string" do
+      setup do
+        @thumb = Paperclip::Thumbnail.new(@file,
+                                          :geometry        => "",
+                                          :convert_options => "-gravity center -crop \"300x300+0-0\"")
+      end
+
+      should "not get resized by default" do
+        assert !@thumb.transformation_command.include?("-resize")
+      end
+    end
+  end
+
+  context "A multipage PDF" do
+    setup do
+      @file = File.new(File.join(File.dirname(__FILE__), "fixtures", "twopage.pdf"), 'rb')
+    end
+
+    teardown { @file.close }
+
+    should "start with two pages with dimensions 612x792" do
+      cmd = %Q[identify -format "%wx%h" "#{@file.path}"]
+      assert_equal "612x792"*2, `#{cmd}`.chomp
+    end
+
+    context "being thumbnailed at 100x100 with cropping" do
+      setup do
+        @thumb = Paperclip::Thumbnail.new(@file, :geometry => "100x100#", :format => :png)
+      end
+
+      should "report its correct current and target geometries" do
+        assert_equal "100x100#", @thumb.target_geometry.to_s
+        assert_equal "612x792", @thumb.current_geometry.to_s
+      end
+
+      should "report its correct format" do
+        assert_equal :png, @thumb.format
+      end
+
+      should "create the thumbnail when sent #make" do
+        dst = @thumb.make
+        assert_match /100x100/, `identify "#{dst.path}"`
+      end
+    end
   end
 end