joshpuetz-paperclip 2.3.0.1 → 2.3.0.2

data/lib/paperclip.rb

@@ -44,7 +44,7 @@ end
 # documentation for Paperclip::ClassMethods for more useful information.
 module Paperclip
 
-  VERSION = "2.2.9.2"
+  VERSION = "2.3.0"
 
   class << self
     # Provides configurability to Paperclip. There are a number of options available, such as:
@@ -93,7 +93,7 @@ module Paperclip
     # Paperclip.options[:log_command] is set to true (defaults to false). This
     # will only log if logging in general is set to true as well.
     def run cmd, params = "", expected_outcodes = 0
-      command = %Q<#{%Q[#{path_for_command(cmd)} #{params}].gsub(/\s+/, " ")}>
+      command = %Q[#{path_for_command(cmd)} #{params}].gsub(/\s+/, " ")
       command = "#{command} 2>#{bit_bucket}" if Paperclip.options[:swallow_stderr]
       Paperclip.log(command) if Paperclip.options[:log_command]
       output = `#{command}`
@@ -189,6 +189,9 @@ module Paperclip
     #   to a command line error. This will override the global setting for this attachment. 
     #   Defaults to true. This option used to be called :whiny_thumbanils, but this is
     #   deprecated.
+    # * +keep_old_files+: Keep the existing attachment files (original + resized) from
+    #   being automatically deleted when an attachment is cleared or updated.
+    #   Defaults to +false+.
     # * +convert_options+: When creating thumbnails, use this free-form options
     #   field to pass in various convert command options.  Typical options are "-strip" to
     #   remove all Exif data from the image (save space for thumbnails and avatars) or

data/lib/paperclip/attachment.rb

@@ -14,7 +14,8 @@ module Paperclip
         :default_style => :original,
         :validations   => [],
         :storage       => :filesystem,
-        :whiny         => Paperclip.options[:whiny] || Paperclip.options[:whiny_thumbnails]
+        :whiny         => Paperclip.options[:whiny] || Paperclip.options[:whiny_thumbnails],
+        :keep_old_files=> false
       }
     end
 
@@ -40,6 +41,7 @@ module Paperclip
       @default_style     = options[:default_style]
       @storage           = options[:storage]
       @whiny             = options[:whiny_thumbnails] || options[:whiny]
+      @keep_old_files    = options[:keep_old_files]
       @convert_options   = options[:convert_options] || {}
       @processors        = options[:processors] || [:thumbnail]
       @options           = options
@@ -394,9 +396,11 @@ module Paperclip
 
     def queue_existing_for_delete #:nodoc:
       return unless file?
-      @queued_for_delete += [:original, *@styles.keys].uniq.map do |style|
-        path(style) if exists?(style)
-      end.compact
+      unless @keep_old_files
+        @queued_for_delete += [:original, *@styles.keys].uniq.map do |style|
+          path(style) if exists?(style)
+        end.compact
+      end
       instance_write(:file_name, nil)
       instance_write(:content_type, nil)
       instance_write(:file_size, nil)

data/lib/paperclip/storage.rb

@@ -33,7 +33,6 @@ module Paperclip
       def to_file style = default_style
         @queued_for_write[style] || (File.new(path(style), 'rb') if exists?(style))
       end
-      alias_method :to_io, :to_file
 
       def flush_writes #:nodoc:
         @queued_for_write.each do |style, file|
@@ -128,17 +127,21 @@ module Paperclip
     #   separate parts of your file name.
     module S3
       def self.extended base
-        require 'right_aws'
+        require 'aws/s3'
         base.instance_eval do
           @s3_credentials = parse_credentials(@options[:s3_credentials])
           @bucket         = @options[:bucket]         || @s3_credentials[:bucket]
           @bucket         = @bucket.call(self) if @bucket.is_a?(Proc)
           @s3_options     = @options[:s3_options]     || {}
-          @s3_permissions = @options[:s3_permissions] || 'public-read'
-          @s3_protocol    = @options[:s3_protocol]    || (@s3_permissions == 'public-read' ? 'http' : 'https')
+          @s3_permissions = @options[:s3_permissions] || :public_read
+          @s3_protocol    = @options[:s3_protocol]    || (@s3_permissions == :public_read ? 'http' : 'https')
           @s3_headers     = @options[:s3_headers]     || {}
           @s3_host_alias  = @options[:s3_host_alias]
           @url            = ":s3_path_url" unless @url.to_s.match(/^:s3.*url$/)
+          AWS::S3::Base.establish_connection!( @s3_options.merge(
+            :access_key_id => @s3_credentials[:access_key_id],
+            :secret_access_key => @s3_credentials[:secret_access_key]
+          ))
         end
         Paperclip.interpolates(:s3_alias_url) do |attachment, style|
           "#{attachment.s3_protocol}://#{attachment.s3_host_alias}/#{attachment.path(style).gsub(%r{^/}, "")}"
@@ -151,16 +154,6 @@ module Paperclip
         end
       end
 
-      def s3
-        @s3 ||= RightAws::S3.new(@s3_credentials[:access_key_id],
-                                 @s3_credentials[:secret_access_key],
-                                 @s3_options)
-      end
-
-      def s3_bucket
-        @s3_bucket ||= s3.bucket(@bucket, true, @s3_permissions)
-      end
-
       def bucket_name
         @bucket
       end
@@ -175,7 +168,11 @@ module Paperclip
       end
       
       def exists?(style = default_style)
-        s3_bucket.key(path(style)) ? true : false
+        if original_filename
+          AWS::S3::S3Object.exists?(path(style), bucket_name)
+        else
+          false
+        end
       end
 
       def s3_protocol
@@ -185,18 +182,24 @@ module Paperclip
       # Returns representation of the data of the file assigned to the given
       # style, in the format most representative of the current storage.
       def to_file style = default_style
-        @queued_for_write[style] || s3_bucket.key(path(style))
+        return @queued_for_write[style] if @queued_for_write[style]
+        file = Tempfile.new(path(style))
+        file.write(AWS::S3::S3Object.value(path(style), bucket_name))
+        file.rewind
+        return file
       end
-      alias_method :to_io, :to_file
 
       def flush_writes #:nodoc:
         @queued_for_write.each do |style, file|
           begin
             log("saving #{path(style)}")
-            key = s3_bucket.key(path(style))
-            key.data = file
-            key.put(nil, @s3_permissions, {'Content-type' => instance_read(:content_type)}.merge(@s3_headers))
-          rescue RightAws::AwsError => e
+            AWS::S3::S3Object.store(path(style),
+                                    file,
+                                    bucket_name,
+                                    {:content_type => instance_read(:content_type),
+                                     :access => @s3_permissions,
+                                    }.merge(@s3_headers))
+          rescue AWS::S3::ResponseError => e
             raise
           end
         end
@@ -207,10 +210,8 @@ module Paperclip
         @queued_for_delete.each do |path|
           begin
             log("deleting #{path}")
-            if file = s3_bucket.key(path)
-              file.delete
-            end
-          rescue RightAws::AwsError
+            AWS::S3::S3Object.delete(path, bucket_name)
+          rescue AWS::S3::ResponseError
             # Ignore this.
           end
         end

data/lib/paperclip/thumbnail.rb

@@ -2,7 +2,7 @@ module Paperclip
   # Handles thumbnailing images that are uploaded.
   class Thumbnail < Processor
 
-    attr_accessor :current_geometry, :target_geometry, :format, :whiny, :convert_options
+    attr_accessor :current_geometry, :target_geometry, :format, :whiny, :convert_options, :source_file_options
 
     # Creates a Thumbnail object set to work on the +file+ given. It
     # will attempt to transform the image into one defined by +target_geometry+
@@ -12,17 +12,18 @@ module Paperclip
     # set, the options will be appended to the convert command upon image conversion 
     def initialize file, options = {}, attachment = nil
       super
-      geometry          = options[:geometry]
-      @file             = file
-      @crop             = geometry[-1,1] == '#'
-      @target_geometry  = Geometry.parse geometry
-      @current_geometry = Geometry.from_file @file
-      @convert_options  = options[:convert_options]
-      @whiny            = options[:whiny].nil? ? true : options[:whiny]
-      @format           = options[:format]
+      geometry             = options[:geometry]
+      @file                = file
+      @crop                = geometry[-1,1] == '#'
+      @target_geometry     = Geometry.parse geometry
+      @current_geometry    = Geometry.from_file @file
+      @source_file_options = options[:source_file_options]
+      @convert_options     = options[:convert_options]
+      @whiny               = options[:whiny].nil? ? true : options[:whiny]
+      @format              = options[:format]
 
-      @current_format   = File.extname(@file.path)
-      @basename         = File.basename(@file.path, @current_format)
+      @current_format      = File.extname(@file.path)
+      @basename            = File.basename(@file.path, @current_format)
     end
 
     # Returns true if the +target_geometry+ is meant to crop.
@@ -43,6 +44,7 @@ module Paperclip
       dst.binmode
 
       command = <<-end_command
+        #{ source_file_options }
         "#{ File.expand_path(src.path) }[0]"
         #{ transformation_command }
         "#{ File.expand_path(dst.path) }"
@@ -61,7 +63,8 @@ module Paperclip
     # into the thumbnail.
     def transformation_command
       scale, crop = @current_geometry.transformation_to(@target_geometry, crop?)
-      trans = "-resize \"#{scale}\""
+      trans = ""
+      trans << " -resize \"#{scale}\"" unless scale.blank?
       trans << " -crop \"#{crop}\" +repage" if crop
       trans << " #{convert_options}" if convert_options?
       trans

data/test/attachment_test.rb

@@ -14,14 +14,27 @@ class AttachmentTest < Test::Unit::TestCase
     assert_equal "#{RAILS_ROOT}/public/fake_models/1234/fake", @attachment.path
   end
 
+  should "call a proc sent to check_guard" do
+    @dummy = Dummy.new
+    @dummy.expects(:one).returns(:one)
+    assert_equal :one, @dummy.avatar.send(:check_guard, lambda{|x| x.one })
+  end
+
+  should "call a method name sent to check_guard" do
+    @dummy = Dummy.new
+    @dummy.expects(:one).returns(:one)
+    assert_equal :one, @dummy.avatar.send(:check_guard, :one)
+  end
+
   context "Attachment default_options" do
     setup do
       rebuild_model
       @old_default_options = Paperclip::Attachment.default_options.dup
       @new_default_options = @old_default_options.merge({
-        :path => "argle/bargle",
-        :url => "fooferon",
-        :default_url => "not here.png"
+        :path           => "argle/bargle",
+        :url            => "fooferon",
+        :default_url    => "not here.png",
+        :keep_old_files => false
       })
     end
 
@@ -592,7 +605,7 @@ class AttachmentTest < Test::Unit::TestCase
 
             should "commit the files to disk" do
               [:large, :medium, :small].each do |style|
-                io = @attachment.to_io(style)
+                io = @attachment.to_file(style)
                 assert File.exists?(io)
                 assert ! io.is_a?(::Tempfile)
                 io.close
@@ -764,4 +777,94 @@ class AttachmentTest < Test::Unit::TestCase
       end
     end
   end
+
+
+######################
+# test :keep_old_files
+######################
+
+  context "An attachment with :keep_old_files => true" do
+
+    setup do
+      @old_defaults = Paperclip::Attachment.default_options.dup
+      Paperclip::Attachment.default_options.merge!( {
+          :path  => ":rails_root/tmp/:attachment/:class/:style/:id/:basename.:extension"
+      })
+      FileUtils.rm_rf("tmp")
+
+      @file       = File.new(File.join(File.dirname(__FILE__), "fixtures", "5k.png"   ), 'rb')
+      @file_2     = File.new(File.join(File.dirname(__FILE__), "fixtures", "50x50.png"), 'rb')
+
+      rebuild_model
+      @instance   = Dummy.new
+
+      @attachment = Paperclip::Attachment.new(:avatar, @instance, {
+            :keep_old_files => true,
+            :styles         => {:small => "32x32#"}
+          })
+      @attachment.assign(@file)
+      @attachment.save
+    end
+
+    teardown do
+      @file.close
+      @file_2.close
+      Paperclip::Attachment.default_options.merge!(@old_defaults)
+    end
+
+    should "return the real urls" do
+      assert_match %r{^/system/avatars/#{@instance.id}/original/5k\.png}, @attachment.url
+      assert_match %r{^/system/avatars/#{@instance.id}/small/5k\.png}   , @attachment.url(:small)
+    end
+
+    should "commit the files to disk" do
+      assert File.exists?(@attachment.path(:original))
+      assert File.exists?(@attachment.path(:small   ))
+    end
+
+
+    context "after assigning a new file" do
+      setup do
+        @previous_files_path = @attachment.styles.keys.collect do |style|
+          @attachment.path(style)
+        end
+        @attachment.assign @file_2
+        @attachment.save
+      end
+
+      should "NOT delete the previous files after assigning nil and saving" do
+        @previous_files_path.each{|f| assert File.exists?(f), "#{f} should NOT have been deleted" }
+      end
+    end
+
+
+    context "" do
+      setup do
+        @old_files_path = @attachment.styles.keys.collect do |style|
+          @attachment.path(style)
+        end
+      end
+
+      should "NOT delete the files after assigning nil and saving" do
+        @attachment.expects_instance_write_with_nil___in_the_4_paperclip_columns
+        @attachment.assign nil
+        @attachment.save
+        @old_files_path.each{|f| assert File.exists?(f), "#{f} should NOT have been deleted" }
+      end
+
+      should "NOT delete the files when you call #clear and #save" do
+        @attachment.expects_instance_write_with_nil___in_the_4_paperclip_columns
+        @attachment.clear
+        @attachment.save
+        @old_files_path.each{|f| assert File.exists?(f), "#{f} should NOT have been deleted" }
+      end
+
+      should "NOT delete the files when you call #delete" do
+        @attachment.expects_instance_write_with_nil___in_the_4_paperclip_columns
+        @attachment.destroy
+        @old_files_path.each{|f| assert File.exists?(f), "#{f} should NOT have been deleted" }
+      end
+    end
+
+  end
 end

data/test/helper.rb

@@ -97,3 +97,14 @@ end
 def attachment options
   Paperclip::Attachment.new(:avatar, FakeModel.new, options)
 end
+
+module Paperclip
+  class Attachment
+    def expects_instance_write_with_nil___in_the_4_paperclip_columns
+      expects(:instance_write).with(:file_name    , nil)
+      expects(:instance_write).with(:content_type , nil)
+      expects(:instance_write).with(:file_size    , nil)
+      expects(:instance_write).with(:updated_at   , nil)
+    end
+  end
+end

data/test/integration_test.rb

@@ -379,6 +379,11 @@ class IntegrationTest < Test::Unit::TestCase
         @files_on_s3 = s3_files_for @dummy.avatar
       end
 
+      should "have the same contents as the original" do
+        @file.rewind
+        assert_equal @file.read, @files_on_s3[:original].read
+      end
+
       should "write and delete its files" do
         [["434x66", :original],
          ["300x46", :large],
@@ -403,10 +408,8 @@ class IntegrationTest < Test::Unit::TestCase
         assert @dummy.valid?
         assert @dummy.save
 
-        saved_keys = [:thumb, :medium, :large, :original].collect{|s| @dummy.avatar.to_file(s) }
-
-        saved_keys.each do |key|
-          assert key.exists?
+        [:thumb, :medium, :large, :original].each do |style|
+          assert @dummy.avatar.exists?(style)
         end
 
         @dummy.avatar.clear
@@ -414,8 +417,8 @@ class IntegrationTest < Test::Unit::TestCase
         assert @dummy.valid?
         assert @dummy.save
 
-        saved_keys.each do |key|
-          assert ! key.exists?
+        [:thumb, :medium, :large, :original].each do |style|
+          assert ! @dummy.avatar.exists?(style)
         end
 
         @d2 = Dummy.find(@dummy.id)
@@ -427,7 +430,7 @@ 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).to_s, @d2.avatar.to_file(style).to_s
+          assert_equal @dummy.avatar.to_file(style).read, @d2.avatar.to_file(style).read
         end
 
         saved_keys = [:thumb, :medium, :large, :original].collect{|s| @dummy.avatar.to_file(s) }
@@ -435,8 +438,8 @@ class IntegrationTest < Test::Unit::TestCase
         @d2.avatar.clear
         assert @d2.save
 
-        saved_keys.each do |key|
-          assert ! key.exists?
+        [:thumb, :medium, :large, :original].each do |style|
+          assert ! @dummy.avatar.exists?(style)
         end
       end
 
@@ -444,7 +447,7 @@ class IntegrationTest < Test::Unit::TestCase
         expected = @dummy.avatar.to_file
         @dummy.avatar = "not a file"
         assert @dummy.valid?
-        assert_equal expected.full_name, @dummy.avatar.to_file.full_name
+        assert_equal expected.read, @dummy.avatar.to_file.read
 
         @dummy.avatar = @bad_file
         assert ! @dummy.valid?
@@ -472,7 +475,6 @@ class IntegrationTest < Test::Unit::TestCase
 
       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

data/test/paperclip_test.rb

@@ -1,14 +1,18 @@
 require 'test/helper'
 
 class PaperclipTest < Test::Unit::TestCase
-  [:image_magick_path, :convert_path].each do |path|
-    context "Calling Paperclip.run with an #{path} specified" do
+  [:image_magick_path, :command_path].each do |path|
+    context "Calling Paperclip.run with #{path} specified" do
       setup do
         Paperclip.options[:image_magick_path] = nil
-        Paperclip.options[:convert_path]      = nil
+        Paperclip.options[:command_path]      = nil
         Paperclip.options[path]               = "/usr/bin"
       end
 
+      should "return the expected path for path_for_command" do
+        assert_equal "/usr/bin/convert", Paperclip.path_for_command("convert")
+      end
+
       should "execute the right command" do
         Paperclip.expects(:path_for_command).with("convert").returns("/usr/bin/convert")
         Paperclip.expects(:bit_bucket).returns("/dev/null")
@@ -21,7 +25,11 @@ class PaperclipTest < Test::Unit::TestCase
   context "Calling Paperclip.run with no path specified" do
     setup do
       Paperclip.options[:image_magick_path] = nil
-      Paperclip.options[:convert_path]      = nil
+      Paperclip.options[:command_path]      = nil
+    end
+
+    should "return the expected path fro path_for_command" do
+      assert_equal "convert", Paperclip.path_for_command("convert")
     end
 
     should "execute the right command" do
@@ -30,38 +38,38 @@ class PaperclipTest < Test::Unit::TestCase
       Paperclip.expects(:"`").with("convert one.jpg two.jpg 2>/dev/null")
       Paperclip.run("convert", "one.jpg two.jpg")
     end
+  end
 
-    should "log the command when :log_command is set" do
+  context "Calling Paperclip.run and logging" do
+    setup do
+      Paperclip.options[:image_magick_path] = nil
+      Paperclip.options[:command_path]      = nil
+      Paperclip.stubs(:bit_bucket).returns("/dev/null")
+      Paperclip.stubs(:log)
+      Paperclip.stubs(:"`").with("this is the command 2>/dev/null")
+    end
+
+    should "log the command when :log_command is true" do
       Paperclip.options[:log_command] = true
-      Paperclip.expects(:bit_bucket).returns("/dev/null")
-      Paperclip.expects(:log).with("this is the command 2>/dev/null")
-      Paperclip.expects(:"`").with("this is the command 2>/dev/null")
       Paperclip.run("this","is the command")
+      assert_received(Paperclip, :log) do |p|
+        p.with("this is the command 2>/dev/null")
+      end
+      assert_received(Paperclip, :`) do |p|
+        p.with("this is the command 2>/dev/null")
+      end
     end
-  end
-
-  should "raise when sent #processor and the name of a class that exists but isn't a subclass of Processor" do
-    assert_raises(Paperclip::PaperclipError){ Paperclip.processor(:attachment) }
-  end
 
-  should "raise when sent #processor and the name of a class that doesn't exist" do
-    assert_raises(NameError){ Paperclip.processor(:boogey_man) }
-  end
-
-  should "return a class when sent #processor and the name of a class under Paperclip" do
-    assert_equal ::Paperclip::Thumbnail, Paperclip.processor(:thumbnail)
-  end
-
-  should "call a proc sent to check_guard" do
-    @dummy = Dummy.new
-    @dummy.expects(:one).returns(:one)
-    assert_equal :one, @dummy.avatar.send(:check_guard, lambda{|x| x.one })
-  end
-
-  should "call a method name sent to check_guard" do
-    @dummy = Dummy.new
-    @dummy.expects(:one).returns(:one)
-    assert_equal :one, @dummy.avatar.send(:check_guard, :one)
+    should "not log the command when :log_command is false" do
+      Paperclip.options[:log_command] = false
+      Paperclip.run("this","is the command")
+      assert_received(Paperclip, :log) do |p|
+        p.with("this is the command 2>/dev/null").never
+      end
+      assert_received(Paperclip, :`) do |p|
+        p.with("this is the command 2>/dev/null")
+      end
+    end
   end
 
   context "Paperclip.bit_bucket" do
@@ -86,6 +94,18 @@ class PaperclipTest < Test::Unit::TestCase
     end
   end
 
+  should "raise when sent #processor and the name of a class that exists but isn't a subclass of Processor" do
+    assert_raises(Paperclip::PaperclipError){ Paperclip.processor(:attachment) }
+  end
+
+  should "raise when sent #processor and the name of a class that doesn't exist" do
+    assert_raises(NameError){ Paperclip.processor(:boogey_man) }
+  end
+
+  should "return a class when sent #processor and the name of a class under Paperclip" do
+    assert_equal ::Paperclip::Thumbnail, Paperclip.processor(:thumbnail)
+  end
+
   context "An ActiveRecord model with an 'avatar' attachment" do
     setup do
       rebuild_model :path => "tmp/:class/omg/:style.:extension"
@@ -139,7 +159,8 @@ class PaperclipTest < Test::Unit::TestCase
       end
 
       should "be able to see the attachment definition from the subclass's class" do
-        assert_equal "tmp/:class/omg/:style.:extension", SubDummy.attachment_definitions[:avatar][:path]
+        assert_equal "tmp/:class/omg/:style.:extension",
+                     SubDummy.attachment_definitions[:avatar][:path]
       end
 
       teardown do

data/test/storage_test.rb

@@ -3,6 +3,7 @@ require 'test/helper'
 class StorageTest < Test::Unit::TestCase
   context "Parsing S3 credentials" do
     setup do
+      AWS::S3::Base.stubs(:establish_connection!)
       rebuild_model :storage => :s3,
                     :bucket => "testing",
                     :s3_credentials => {:not => :important}
@@ -39,6 +40,7 @@ class StorageTest < Test::Unit::TestCase
 
   context "" do
     setup do
+      AWS::S3::Base.stubs(:establish_connection!)
       rebuild_model :storage => :s3,
                     :s3_credentials => {},
                     :bucket => "bucket",
@@ -54,6 +56,7 @@ class StorageTest < Test::Unit::TestCase
   end
   context "" do
     setup do
+      AWS::S3::Base.stubs(:establish_connection!)
       rebuild_model :storage => :s3,
                     :s3_credentials => {},
                     :bucket => "bucket",
@@ -69,6 +72,7 @@ class StorageTest < Test::Unit::TestCase
   end
   context "" do
     setup do
+      AWS::S3::Base.stubs(:establish_connection!)
       rebuild_model :storage => :s3,
                     :s3_credentials => {
                       :production   => { :bucket => "prod_bucket" },
@@ -88,6 +92,7 @@ class StorageTest < Test::Unit::TestCase
 
   context "Parsing S3 credentials with a bucket in them" do
     setup do
+      AWS::S3::Base.stubs(:establish_connection!)
       rebuild_model :storage => :s3,
                     :s3_credentials => {
                       :production   => { :bucket => "prod_bucket" },
@@ -146,14 +151,7 @@ class StorageTest < Test::Unit::TestCase
 
       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=)
-          @key_mock.expects(:put).with(nil, 'public-read', 'Content-type' => 'image/png')
+          AWS::S3::S3Object.stubs(:store).with(@dummy.avatar.path, anything, 'testing', :content_type => 'image/png', :access => :public_read)
           @dummy.save
         end
 
@@ -164,13 +162,8 @@ class StorageTest < Test::Unit::TestCase
       
       context "and remove" 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).at_least(2).returns(@key_mock)
-          @key_mock.expects(:delete)
+          AWS::S3::S3Object.stubs(:exists?).returns(true)
+          AWS::S3::S3Object.stubs(:delete)
           @dummy.destroy_attached_files
         end
 
@@ -183,6 +176,7 @@ class StorageTest < Test::Unit::TestCase
   
   context "An attachment with S3 storage and bucket defined as a Proc" do
     setup do
+      AWS::S3::Base.stubs(:establish_connection!)
       rebuild_model :storage => :s3,
                     :bucket => lambda { |attachment| "bucket_#{attachment.instance.other}" },
                     :s3_credentials => {:not => :important}
@@ -196,6 +190,7 @@ class StorageTest < Test::Unit::TestCase
 
   context "An attachment with S3 storage and specific s3 headers set" do
     setup do
+      AWS::S3::Base.stubs(:establish_connection!)
       rebuild_model :storage => :s3,
                     :bucket => "testing",
                     :path => ":attachment/:style/:basename.:extension",
@@ -217,17 +212,13 @@ class StorageTest < Test::Unit::TestCase
 
       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=)
-          @key_mock.expects(:put).with(nil,
-                                       'public-read',
-                                       'Content-type' => 'image/png',
-                                       'Cache-Control' => 'max-age=31557600')
+          AWS::S3::Base.stubs(:establish_connection!)
+          AWS::S3::S3Object.stubs(:store).with(@dummy.avatar.path,
+                                               anything,
+                                               'testing',
+                                               :content_type => 'image/png',
+                                               :access => :public_read,
+                                               'Cache-Control' => 'max-age=31557600')
           @dummy.save
         end
 
@@ -263,8 +254,8 @@ class StorageTest < Test::Unit::TestCase
 
         teardown { @file.close }
 
-        should "still return a Tempfile when sent #to_io" do
-          assert_equal Tempfile, @dummy.avatar.to_io.class
+        should "still return a Tempfile when sent #to_file" do
+          assert_equal Tempfile, @dummy.avatar.to_file.class
         end
 
         context "and saved" do

data/test/thumbnail_test.rb

@@ -103,6 +103,44 @@ class ThumbnailTest < Test::Unit::TestCase
       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.expects(:"`").with do |arg|
+          arg.match %r{convert\s+-strip\s+"#{File.expand_path(@thumb.file.path)}\[0\]"\s+-resize\s+"x50"\s+-crop\s+"100x50\+114\+0"\s+\+repage\s+".*?"}
+        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,
@@ -140,6 +178,18 @@ 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_no_match(/-resize/, @thumb.transformation_command)
+      end
+    end
   end
 
   context "A multipage PDF" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: joshpuetz-paperclip
 version: !ruby/object:Gem::Version 
-  version: 2.3.0.1
+  version: 2.3.0.2
 platform: ruby
 authors: 
 - Jon Yurek
@@ -95,7 +95,6 @@ files:
 - shoulda_macros/paperclip.rb
 has_rdoc: true
 homepage: http://www.thoughtbot.com/projects/paperclip
-licenses: 
 post_install_message: 
 rdoc_options: 
 - --line-numbers
@@ -117,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - ImageMagick
 rubyforge_project: paperclip
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: File attachments as attributes for ActiveRecord