paperclip 2.4.1 → 2.4.2

data/README.md

@@ -60,6 +60,12 @@ Or, if you don't use Bundler (though you probably should, even in Rails 2), with
       config.gem "paperclip", :version => "~> 2.4"
       ...
     end
+For Non-Rails usage:
+
+    class ModuleName < ActiveRecord::Base
+        include Paperclip::Glue
+        ...
+    end
 
 Quick Start
 -----------
@@ -203,7 +209,7 @@ styles, no processors will be run if there are no styles defined._
 If you're interested in caching your thumbnail's width, height and size in the
 database, take a look at the [paperclip-meta](https://github.com/y8/paperclip-meta) gem.
 
-Also, if you're interesting to generate the thumbnail on-the-fly, you might want
+Also, if you're interested in generating the thumbnail on-the-fly, you might want
 to look into the [attachment_on_the_fly](https://github.com/drpentode/Attachment-on-the-Fly) gem.
 
 Events
@@ -227,7 +233,9 @@ called with valid attachments._
 URI Obfuscation
 ---------------
 
-Paperclip has an interpolation called `:hash` for obfuscating filenames of publicly-available files. For more on this feature read author's own explanation.
+Paperclip has an interpolation called `:hash` for obfuscating filenames of
+publicly-available files. For more on this feature read the author's own
+explanation.
 
 [https://github.com/thoughtbot/paperclip/pull/416](https://github.com/thoughtbot/paperclip/pull/416)
 
@@ -269,7 +277,7 @@ a few utility examples would be compression and encryption processors.
 Dynamic Configuration
 ---------------------
 
-Callable objects (labdas, Procs) can be used in a number of places for dynamic
+Callable objects (lambdas, Procs) can be used in a number of places for dynamic
 configuration throughout Paperclip.  This strategy exists in a number of
 components of the library but is most significant in the possibilities for
 allowing custom styles and processors to be applied for specific model
@@ -322,7 +330,7 @@ Here is an example for Capistrano:
         run "cd #{release_path}; RAILS_ENV=production bundle exec rake paperclip:refresh:missing_styles"
       end
     end
-    
+
     after("deploy:update_code", "deploy:build_missing_paperclip_styles")
 
 Now you don't have to remember to refresh thumbnails in production everytime you add new style.
@@ -334,7 +342,7 @@ Paperclip about existing styles. Simply create paperclip_attachments.yml file by
     class User < ActiveRecord::Base
       has_attached_file :avatar, :styles => {:thumb => 'x100', :croppable => '600x600>', :big => '1000x1000>'}
     end
-  
+
     class Book < ActiveRecord::Base
       has_attached_file :cover, :styles => {:small => 'x100', :large => '1000x1000>'}
       has_attached_file :sample, :styles => {:thumb => 'x100'}
@@ -342,17 +350,17 @@ Paperclip about existing styles. Simply create paperclip_attachments.yml file by
 
 Then in `RAILS_ROOT/public/system/paperclip_attachments.yml`:
 
-    --- 
-    :User: 
-      :avatar: 
+    ---
+    :User:
+      :avatar:
       - :thumb
       - :croppable
       - :big
-    :Book: 
-      :cover: 
+    :Book:
+      :cover:
       - :small
       - :large
-      :sample: 
+      :sample:
       - :thumb
 
 Testing

data/lib/paperclip.rb

@@ -97,7 +97,8 @@ module Paperclip
       if options[:image_magick_path]
         Paperclip.log("[DEPRECATION] :image_magick_path is deprecated and will be removed. Use :command_path instead")
       end
-      Cocaine::CommandLine.path = options[:command_path] || options[:image_magick_path]
+      command_path = options[:command_path] || options[:image_magick_path]
+      Cocaine::CommandLine.path = ( Cocaine::CommandLine.path ? [Cocaine::CommandLine.path, command_path ].flatten : command_path )
       Cocaine::CommandLine.new(cmd, *params).run
     end
 
@@ -184,6 +185,19 @@ module Paperclip
         raise e
       end
     end
+
+    def check_for_url_clash(name,url,klass)
+      @names_url ||= {}
+      default_url = url || Attachment.default_options[:url]
+      if @names_url[name] && @names_url[name][:url] == default_url && @names_url[name][:class] != klass
+        log("Duplicate URL for #{name} with #{default_url}. This will clash with attachment defined in #{@names_url[name][:class]} class")
+      end
+      @names_url[name] = {:url => default_url, :class => klass}
+    end
+
+    def reset_duplicate_clash_check!
+      @names_url = nil
+    end
   end
 
   class PaperclipError < StandardError #:nodoc:
@@ -277,6 +291,20 @@ module Paperclip
     #   choices are :filesystem and :s3. The default is :filesystem. Make sure you read the
     #   documentation for Paperclip::Storage::Filesystem and Paperclip::Storage::S3
     #   for backend-specific options.
+    #
+    # It's also possible for you to dynamicly define your interpolation string for :url,
+    # :default_url, and :path in your model by passing a method name as a symbol as a argument
+    # for your has_attached_file definition:
+    #
+    #   class Person
+    #     has_attached_file :avatar, :default_url => :default_url_by_gender
+    #
+    #     private
+    #
+    #     def default_url_by_gender
+    #       "/assets/avatars/default_#{gender}.png"
+    #     end
+    #   end
     def has_attached_file name, options = {}
       include InstanceMethods
 
@@ -289,7 +317,8 @@ module Paperclip
       end
 
       attachment_definitions[name] = {:validations => []}.merge(options)
-      Paperclip.classes_with_attachments << self
+      Paperclip.classes_with_attachments << self unless Paperclip.classes_with_attachments.include?(self)
+      Paperclip.check_for_url_clash(name,attachment_definitions[name][:url],self.name)
 
       after_save :save_attached_files
       before_destroy :prepare_for_destroy

data/lib/paperclip/attachment.rb

@@ -1,4 +1,6 @@
 # encoding: utf-8
+require 'uri'
+
 module Paperclip
   # The Attachment class manages the files for a given attachment. It saves
   # when the model saves, deletes when the model is destroyed, and processes
@@ -115,6 +117,7 @@ module Paperclip
       ensure_required_accessors!
 
       if uploaded_file.is_a?(Paperclip::Attachment)
+        uploaded_filename = uploaded_file.original_filename
         uploaded_file = uploaded_file.to_file(:original)
         close_uploaded_file = uploaded_file.respond_to?(:close)
       end
@@ -126,8 +129,9 @@ module Paperclip
 
       return nil if uploaded_file.nil?
 
+      uploaded_filename ||= uploaded_file.original_filename
       @queued_for_write[:original]   = to_tempfile(uploaded_file)
-      instance_write(:file_name,       uploaded_file.original_filename.strip)
+      instance_write(:file_name,       uploaded_filename.strip)
       instance_write(:content_type,    uploaded_file.content_type.to_s.strip)
       instance_write(:file_size,       uploaded_file.size.to_i)
       instance_write(:fingerprint,     generate_fingerprint(uploaded_file))
@@ -153,7 +157,7 @@ module Paperclip
     def url(style_name = default_style, use_timestamp = @use_timestamp)
       default_url = @default_url.is_a?(Proc) ? @default_url.call(self) : @default_url
       url = original_filename.nil? ? interpolate(default_url, style_name) : interpolate(@url, style_name)
-      use_timestamp && updated_at ? [url, updated_at].compact.join(url.include?("?") ? "&" : "?") : url
+      URI.escape(use_timestamp && updated_at ? [url, updated_at].compact.join(url.include?("?") ? "&" : "?") : url)
     end
 
     # Returns the path of the attachment as defined by the :path option. If the
@@ -291,6 +295,7 @@ module Paperclip
         post_process(*style_args)
 
         old_original.close if old_original.respond_to?(:close)
+        old_original.unlink if old_original.respond_to?(:unlink)
 
         save
       else

data/lib/paperclip/interpolations.rb

@@ -25,7 +25,10 @@ module Paperclip
 
     # Perform the actual interpolation. Takes the pattern to interpolate
     # and the arguments to pass, which are the attachment and style name.
+    # You can pass a method name on your record as a symbol, which should turn
+    # an interpolation pattern for Paperclip to use.
     def self.interpolate pattern, *args
+      pattern = args.first.instance.send(pattern) if pattern.kind_of? Symbol
       all.reverse.inject( pattern.dup ) do |result, tag|
         result.gsub(/:#{tag}/) do |match|
           send( tag, *args )
@@ -136,8 +139,12 @@ module Paperclip
 
     # Returns a the attachment hash.  See Paperclip::Attachment#hash for
     # more details.
-    def hash attachment, style_name
-      attachment.hash(style_name)
+    def hash attachment=nil, style_name=nil
+      if attachment && style_name
+        attachment.hash(style_name)
+      else
+        super()
+      end
     end
 
     # Returns the id of the instance in a split path form. e.g. returns

data/lib/paperclip/storage/s3.rb

@@ -95,6 +95,12 @@ module Paperclip
             @url          = ":s3_path_url"
           end
           @url            = ":asset_host" if @options[:url].to_s == ":asset_host"
+
+          @http_proxy = @options[:http_proxy] || nil
+          if @http_proxy
+            @s3_options.merge!({:proxy => @http_proxy})
+          end
+
           AWS::S3::Base.establish_connection!( @s3_options.merge(
             :access_key_id => @s3_credentials[:access_key_id],
             :secret_access_key => @s3_credentials[:secret_access_key]
@@ -122,6 +128,26 @@ module Paperclip
         @bucket
       end
 
+      def using_http_proxy?
+        !!@http_proxy
+      end
+
+      def http_proxy_host
+        using_http_proxy? ? @http_proxy[:host] : nil
+      end
+
+      def http_proxy_port
+        using_http_proxy? ? @http_proxy[:port] : nil
+      end
+
+      def http_proxy_user
+        using_http_proxy? ? @http_proxy[:user] : nil
+      end
+
+      def http_proxy_password
+        using_http_proxy? ? @http_proxy[:password] : nil
+      end
+
       def s3_host_name
         @s3_host_name || "s3.amazonaws.com"
       end

data/lib/paperclip/version.rb

@@ -1,3 +1,3 @@
 module Paperclip
-  VERSION = "2.4.1" unless defined? Paperclip::VERSION
+  VERSION = "2.4.2" unless defined? Paperclip::VERSION
 end

data/test/attachment_test.rb

@@ -36,6 +36,13 @@ class AttachmentTest < Test::Unit::TestCase
     assert_equal "fake_models/blegga.png", @attachment.url
   end
 
+  should "return the url by executing and interpolating the default_url when assigned with symbol as method in attachment model" do
+    @attachment = attachment :default_url => :some_method_to_determine_default_url
+    @model = @attachment.instance
+    @model.stubs(:some_method_to_determine_default_url).returns(":class/female_:style_blegga.png")
+    assert_equal "fake_models/female_foostyle_blegga.png", @attachment.url(:foostyle)
+  end
+
   context "Attachment default_options" do
     setup do
       rebuild_model
@@ -911,7 +918,22 @@ class AttachmentTest < Test::Unit::TestCase
           end
         end
       end
+    end
+
+    context "with a file that has space in file name" do
+      setup do
+        @attachment.stubs(:instance_read).with(:file_name).returns("spaced file.png")
+        @attachment.stubs(:instance_read).with(:content_type).returns("image/png")
+        @attachment.stubs(:instance_read).with(:file_size).returns(12345)
+        dtnow = DateTime.now
+        @now = Time.now
+        Time.stubs(:now).returns(@now)
+        @attachment.stubs(:instance_read).with(:updated_at).returns(dtnow)
+      end
 
+      should "returns an escaped version of the URL" do
+        assert_match /\/spaced%20file\.png/, @attachment.url
+      end
     end
 
     context "when trying a nonexistant storage type" do

data/test/fog_test.rb

@@ -53,7 +53,6 @@ class FogTest < Test::Unit::TestCase
         @dummy.avatar = File.new(File.join(File.dirname(__FILE__), 'fixtures', '5k.png'), 'rb')
       end
       should "be able to interpolate the path without blowing up" do
-        puts @dummy.avatar.instance_variable_get("@path")
         assert_equal File.expand_path(File.join(File.dirname(__FILE__), "../public/avatars/5k.png")),
                      @dummy.avatar.path
       end

data/test/helper.rb

@@ -84,6 +84,7 @@ def rebuild_class options = {}
   ActiveRecord::Base.send(:include, Paperclip::Glue)
   Object.send(:remove_const, "Dummy") rescue nil
   Object.const_set("Dummy", Class.new(ActiveRecord::Base))
+  Paperclip.reset_duplicate_clash_check!
   Dummy.class_eval do
     include Paperclip::Glue
     has_attached_file :avatar, options

data/test/integration_test.rb

@@ -71,6 +71,22 @@ class IntegrationTest < Test::Unit::TestCase
       should "change the timestamp" do
         assert_not_equal @original_timestamp, @d2.avatar_updated_at
       end
+
+      should "clean up the old original if it is a tempfile" do
+        original = @d2.avatar.to_file(:original)
+        tf = Paperclip::Tempfile.new('original')
+        tf.binmode
+        original.binmode
+        tf.write(original.read)
+        original.close
+        tf.rewind
+
+        File.expects(:unlink).with(tf.instance_variable_get(:@tmpname))
+
+        @d2.avatar.expects(:to_file).with(:original).returns(tf)
+
+        @d2.avatar.reprocess!
+      end
     end
   end
 

data/test/interpolations_test.rb

@@ -171,13 +171,20 @@ class InterpolationsTest < Test::Unit::TestCase
     assert_equal seconds_since_epoch, Paperclip::Interpolations.updated_at(attachment, :style)
   end
 
-  should "return hash" do
+  should "return attachment's hash when passing both arguments" do
     attachment = mock
     fake_hash = "a_wicked_secure_hash"
     attachment.expects(:hash).returns(fake_hash)
     assert_equal fake_hash, Paperclip::Interpolations.hash(attachment, :style)
   end
 
+  should "return Object#hash when passing no argument" do
+    attachment = mock
+    fake_hash = "a_wicked_secure_hash"
+    attachment.expects(:hash).never.returns(fake_hash)
+    assert_not_equal fake_hash, Paperclip::Interpolations.hash
+  end
+
   should "call all expected interpolations with the given arguments" do
     Paperclip::Interpolations.expects(:id).with(:attachment, :style).returns(1234)
     Paperclip::Interpolations.expects(:attachment).with(:attachment, :style).returns("attachments")

data/test/paperclip_test.rb

@@ -2,9 +2,23 @@ require './test/helper'
 
 class PaperclipTest < Test::Unit::TestCase
   context "Calling Paperclip.run" do
-    should "run the command with Cocaine" do
+    setup do
       Cocaine::CommandLine.expects(:new).with("convert", "stuff").returns(stub(:run))
+      @original_command_line_path = Cocaine::CommandLine.path
+    end
+
+    teardown do
+      Cocaine::CommandLine.path = @original_command_line_path
+    end
+
+    should "run the command with Cocaine" do
+      Paperclip.run("convert", "stuff")
+    end
+
+    should "save Cocaine::CommandLine.path that set before" do
+      Cocaine::CommandLine.path = "/opt/my_app/bin"
       Paperclip.run("convert", "stuff")
+      assert_equal [Cocaine::CommandLine.path].flatten.include?("/opt/my_app/bin"), true
     end
   end
 
@@ -46,6 +60,24 @@ class PaperclipTest < Test::Unit::TestCase
     end
   end
 
+  context "Attachments with clashing URLs should raise error" do
+    setup do
+      class Dummy2 < ActiveRecord::Base
+        include Paperclip::Glue
+      end
+    end
+
+    should "generate warning if attachment is redefined with the same url string" do
+      Paperclip.expects(:log).with("Duplicate URL for blah with /system/:attachment/:id/:style/:filename. This will clash with attachment defined in Dummy class")
+      Dummy.class_eval do
+        has_attached_file :blah
+      end
+      Dummy2.class_eval do
+        has_attached_file :blah
+      end
+    end
+  end
+
   context "An ActiveRecord model with an 'avatar' attachment" do
     setup do
       rebuild_model :path => "tmp/:class/omg/:style.:extension"

data/test/storage/filesystem_test.rb

@@ -0,0 +1,52 @@
+require './test/helper'
+
+class FileSystemTest < 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
+
+    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
+
+    context "with file that has space in file name" do
+      setup do
+        rebuild_model :styles => { :thumbnail => "25x25#" }
+        @dummy = Dummy.create!
+
+        @dummy.avatar = File.open(File.join(File.dirname(__FILE__), "..", "fixtures", "spaced file.png"))
+        @dummy.save
+      end
+
+      should "store the file" do
+        assert File.exists?(@dummy.avatar.path)
+      end
+
+      should "return an escaped version of URL" do
+        assert_match /\/spaced%20file\.png/, @dummy.avatar.url
+      end
+    end
+  end
+end

data/test/storage/s3_live_test.rb

@@ -0,0 +1,51 @@
+require './test/helper'
+require 'aws/s3'
+
+unless ENV["S3_TEST_BUCKET"].blank?
+  class S3LiveTest < Test::Unit::TestCase
+    context "Using S3 for real, an attachment with S3 storage" do
+      setup do
+        rebuild_model :styles => { :thumb => "100x100", :square => "32x32#" },
+                      :storage => :s3,
+                      :bucket => ENV["S3_TEST_BUCKET"],
+                      :path => ":class/:attachment/:id/:style.:extension",
+                      :s3_credentials => File.new(File.join(File.dirname(__FILE__), "..", "s3.yml"))
+
+        Dummy.delete_all
+        @dummy = Dummy.new
+      end
+
+      should "be extended by the S3 module" do
+        assert Dummy.new.avatar.is_a?(Paperclip::Storage::S3)
+      end
+
+      context "when assigned" do
+        setup do
+          @file = File.new(File.join(File.dirname(__FILE__), '..', 'fixtures', '5k.png'), 'rb')
+          @dummy.avatar = @file
+        end
+
+        teardown { @file.close }
+
+        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
+          end
+
+          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

data/test/{storage_test.rb → storage/s3_test.rb}

@@ -1,49 +1,20 @@
 require './test/helper'
 require 'aws/s3'
 
-class StorageTest < Test::Unit::TestCase
+class S3Test < Test::Unit::TestCase
   def rails_env(env)
     silence_warnings do
       Object.const_set(:Rails, stub('Rails', :env => env))
     end
   end
 
-  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
-
-    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
-
   context "Parsing S3 credentials" do
     setup do
+      @proxy_settings = {:host => "127.0.0.1", :port => 8888, :user => "foo", :password => "bar"}
       AWS::S3::Base.stubs(:establish_connection!)
       rebuild_model :storage => :s3,
                     :bucket => "testing",
+                    :http_proxy => @proxy_settings,
                     :s3_credentials => {:not => :important}
 
       @dummy = Dummy.new
@@ -68,6 +39,16 @@ class StorageTest < Test::Unit::TestCase
       rails_env("not really an env")
       assert_equal({:test => "12345"}, @avatar.parse_credentials(:test => "12345"))
     end
+
+    should "support HTTP proxy settings" do
+      rails_env("development")
+      assert_equal(true, @avatar.using_http_proxy?)
+      assert_equal(@proxy_settings[:host], @avatar.http_proxy_host)
+      assert_equal(@proxy_settings[:port], @avatar.http_proxy_port)
+      assert_equal(@proxy_settings[:user], @avatar.http_proxy_user)
+      assert_equal(@proxy_settings[:password], @avatar.http_proxy_password)
+    end
+
   end
 
   context "" do
@@ -117,7 +98,7 @@ class StorageTest < Test::Unit::TestCase
                     }
 
       @dummy = Dummy.new
-      @dummy.avatar = File.new(File.join(File.dirname(__FILE__), 'fixtures', '5k.png'), 'rb')
+      @dummy.avatar = File.new(File.join(File.dirname(__FILE__), '..', 'fixtures', '5k.png'), 'rb')
     end
 
     should "return a url containing the correct original file mime type" do
@@ -129,6 +110,27 @@ class StorageTest < Test::Unit::TestCase
     end
   end
 
+  context "An attachment that uses S3 for storage and has spaces in file name" do
+    setup do
+      AWS::S3::Base.stubs(:establish_connection!)
+      rebuild_model :styles  => { :large => ['500x500#', :jpg] },
+                    :storage => :s3,
+                    :bucket  => "bucket",
+                    :path => ":attachment/:basename.:extension",
+                    :s3_credentials => {
+                      'access_key_id' => "12345",
+                      'secret_access_key' => "54321"
+                    }
+
+      @dummy = Dummy.new
+      @dummy.avatar = File.new(File.join(File.dirname(__FILE__), '..', 'fixtures', 'spaced file.png'), 'rb')
+    end
+
+    should "return an escaped version of url" do
+      assert_match /.+\/spaced%20file\.png/, @dummy.avatar.url
+    end
+  end
+
   context "" do
     setup do
       AWS::S3::Base.stubs(:establish_connection!)
@@ -333,7 +335,7 @@ class StorageTest < Test::Unit::TestCase
 
     context "when assigned" do
       setup do
-        @file = File.new(File.join(File.dirname(__FILE__), 'fixtures', '5k.png'), 'rb')
+        @file = File.new(File.join(File.dirname(__FILE__), '..', 'fixtures', '5k.png'), 'rb')
         @dummy = Dummy.new
         @dummy.avatar = @file
       end
@@ -362,7 +364,7 @@ class StorageTest < Test::Unit::TestCase
         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
 
@@ -424,7 +426,7 @@ class StorageTest < Test::Unit::TestCase
 
     context "when assigned" do
       setup do
-        @file = File.new(File.join(File.dirname(__FILE__), 'fixtures', '5k.png'), 'rb')
+        @file = File.new(File.join(File.dirname(__FILE__), '..', 'fixtures', '5k.png'), 'rb')
         @dummy = Dummy.new
         @dummy.avatar = @file
       end
@@ -459,7 +461,7 @@ class StorageTest < Test::Unit::TestCase
        rails_env('test')
 
        rebuild_model :storage        => :s3,
-                     :s3_credentials => Pathname.new(File.join(File.dirname(__FILE__))).join("fixtures/s3.yml")
+                     :s3_credentials => Pathname.new(File.join(File.dirname(__FILE__))).join("../fixtures/s3.yml")
 
        Dummy.delete_all
        @dummy = Dummy.new
@@ -481,7 +483,7 @@ class StorageTest < Test::Unit::TestCase
       rails_env('test')
 
       rebuild_model :storage        => :s3,
-                    :s3_credentials => File.new(File.join(File.dirname(__FILE__), "fixtures/s3.yml"))
+                    :s3_credentials => File.new(File.join(File.dirname(__FILE__), "../fixtures/s3.yml"))
 
       Dummy.delete_all
 
@@ -494,7 +496,7 @@ class StorageTest < Test::Unit::TestCase
       assert_equal 'env_secret', AWS::S3::Base.connection.options[:secret_access_key]
     end
   end
-  
+
   context "S3 Permissions" do
     context "defaults to public-read" do
       setup do
@@ -509,7 +511,7 @@ class StorageTest < Test::Unit::TestCase
 
       context "when assigned" do
         setup do
-          @file = File.new(File.join(File.dirname(__FILE__), 'fixtures', '5k.png'), 'rb')
+          @file = File.new(File.join(File.dirname(__FILE__), '..', 'fixtures', '5k.png'), 'rb')
           @dummy = Dummy.new
           @dummy.avatar = @file
         end
@@ -545,16 +547,16 @@ class StorageTest < Test::Unit::TestCase
                       },
                       :s3_permissions => 'private'
       end
-    
+
       context "when assigned" do
         setup do
-          @file = File.new(File.join(File.dirname(__FILE__), 'fixtures', '5k.png'), 'rb')
+          @file = File.new(File.join(File.dirname(__FILE__), '..', 'fixtures', '5k.png'), 'rb')
           @dummy = Dummy.new
           @dummy.avatar = @file
         end
-    
+
         teardown { @file.close }
-    
+
         context "and saved" do
           setup do
             AWS::S3::Base.stubs(:establish_connection!)
@@ -565,14 +567,14 @@ class StorageTest < Test::Unit::TestCase
                                                    :access => 'private')
             @dummy.save
           end
-    
+
           should "succeed" do
             assert true
           end
         end
       end
     end
-    
+
     context "hash permissions set" do
       setup do
         rebuild_model :storage => :s3,
@@ -590,16 +592,16 @@ class StorageTest < Test::Unit::TestCase
                         :thumb => 'public-read'
                       }
       end
-    
+
       context "when assigned" do
         setup do
-          @file = File.new(File.join(File.dirname(__FILE__), 'fixtures', '5k.png'), 'rb')
+          @file = File.new(File.join(File.dirname(__FILE__), '..', 'fixtures', '5k.png'), 'rb')
           @dummy = Dummy.new
           @dummy.avatar = @file
         end
-    
+
         teardown { @file.close }
-    
+
         context "and saved" do
           setup do
             AWS::S3::Base.stubs(:establish_connection!)
@@ -612,57 +614,10 @@ class StorageTest < Test::Unit::TestCase
             end
             @dummy.save
           end
-    
-          should "succeed" do
-            assert true
-          end
-        end
-      end
-    end
-  end
-
-  unless ENV["S3_TEST_BUCKET"].blank?
-    context "Using S3 for real, an attachment with S3 storage" do
-      setup do
-        rebuild_model :styles => { :thumb => "100x100", :square => "32x32#" },
-                      :storage => :s3,
-                      :bucket => ENV["S3_TEST_BUCKET"],
-                      :path => ":class/:attachment/:id/:style.:extension",
-                      :s3_credentials => File.new(File.join(File.dirname(__FILE__), "s3.yml"))
-
-        Dummy.delete_all
-        @dummy = Dummy.new
-      end
-
-      should "be extended by the S3 module" do
-        assert Dummy.new.avatar.is_a?(Paperclip::Storage::S3)
-      end
-
-      context "when assigned" do
-        setup do
-          @file = File.new(File.join(File.dirname(__FILE__), 'fixtures', '5k.png'), 'rb')
-          @dummy.avatar = @file
-        end
-
-        teardown { @file.close }
-
-        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
-          end
 
-          should "be on S3" do
+          should "succeed" 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

metadata

@@ -1,144 +1,191 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: paperclip
-version: !ruby/object:Gem::Version
-  version: 2.4.1
+version: !ruby/object:Gem::Version 
+  hash: 27
   prerelease: 
+  segments: 
+  - 2
+  - 4
+  - 2
+  version: 2.4.2
 platform: ruby
-authors:
+authors: 
 - Jon Yurek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-07 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: &70313204575540 !ruby/object:Gem::Requirement
+
+date: 2011-09-23 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 3
+        - 0
         version: 2.3.0
+  version_requirements: *id001
+  name: activerecord
+- !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
-  version_requirements: *70313204575540
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: &70313204575020 !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        - 3
+        - 2
         version: 2.3.2
+  version_requirements: *id002
+  name: activesupport
+- !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
-  version_requirements: *70313204575020
-- !ruby/object:Gem::Dependency
-  name: cocaine
-  requirement: &70313204574560 !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 0
+        - 2
         version: 0.0.2
+  version_requirements: *id003
+  name: cocaine
+- !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
-  version_requirements: *70313204574560
-- !ruby/object:Gem::Dependency
-  name: mime-types
-  requirement: &70313204574180 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70313204574180
-- !ruby/object:Gem::Dependency
-  name: shoulda
-  requirement: &70313204573700 !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id004
+  name: mime-types
+- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
-  version_requirements: *70313204573700
-- !ruby/object:Gem::Dependency
-  name: appraisal
-  requirement: &70313204573280 !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id005
+  name: shoulda
+- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
-  version_requirements: *70313204573280
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: &70313204572860 !ruby/object:Gem::Requirement
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id006
+  name: appraisal
+- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
-  version_requirements: *70313204572860
-- !ruby/object:Gem::Dependency
-  name: aws-s3
-  requirement: &70313204572440 !ruby/object:Gem::Requirement
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id007
+  name: mocha
+- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
-  version_requirements: *70313204572440
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: &70313204572020 !ruby/object:Gem::Requirement
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id008
+  name: aws-s3
+- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
-  version_requirements: *70313204572020
-- !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: &70313204571600 !ruby/object:Gem::Requirement
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id009
+  name: sqlite3
+- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
-  version_requirements: *70313204571600
-- !ruby/object:Gem::Dependency
-  name: capybara
-  requirement: &70313204571180 !ruby/object:Gem::Requirement
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id010
+  name: cucumber
+- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
-  version_requirements: *70313204571180
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id011
+  name: capybara
 description: Easy upload management for ActiveRecord
 email: jyurek@thoughtbot.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.md
-files:
+files: 
 - README.md
 - LICENSE
 - Rakefile
@@ -178,6 +225,7 @@ files:
 - test/fixtures/bad.png
 - test/fixtures/fog.yml
 - test/fixtures/s3.yml
+- test/fixtures/spaced file.png
 - test/fixtures/text.txt
 - test/fixtures/twopage.pdf
 - test/fixtures/uppercase.PNG
@@ -194,7 +242,9 @@ files:
 - test/paperclip_missing_attachment_styles_test.rb
 - test/paperclip_test.rb
 - test/processor_test.rb
-- test/storage_test.rb
+- test/storage/filesystem_test.rb
+- test/storage/s3_live_test.rb
+- test/storage/s3_test.rb
 - test/style_test.rb
 - test/thumbnail_test.rb
 - test/upfile_test.rb
@@ -205,32 +255,37 @@ files:
 - shoulda_macros/paperclip.rb
 homepage: https://github.com/thoughtbot/paperclip
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --line-numbers
 - --inline-source
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: -1991530113411237677
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-requirements:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+requirements: 
 - ImageMagick
 rubyforge_project: paperclip
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: File attachments as attributes for ActiveRecord
 test_files: []
+