paperclip 2.5.1 → 2.5.2

data/.travis.yml

@@ -2,7 +2,7 @@ rvm:
   - 1.8.7
   - 1.9.2
   - ree
-  - rbx-2.0
+  - rbx-18mode
 
 before_script: "sudo ntpdate -ub ntp.ubuntu.com pool.ntp.org; true"
 script: "bundle exec rake clean test cucumber"

data/ChangeLog

@@ -1,3 +1,13 @@
+2012-01-27  Prem Sichanugrist <psichanugrist@thoughtbot.com>
+
+* Introducing `:restricted_characters` in Paperclip::Attachment.default_options
+  so people can override their blacklist characters by override that setting.
+
+* Paperclip will now replace all the special characters in the filename to an
+  underscore. This is a more desired behavior against having to deal with URL
+  escaping and unescaping later. You can see the list of blacklist characters
+  in `lib/paperclip/attachment.rb`
+
 2012-01-20	Jon Yurek <jyurek@thoughtbot.com>
 
 	* lib/paperclip/railtie.rb (insert): Hide ActiveRecord-specific stuff in

data/lib/paperclip/attachment.rb

@@ -11,29 +11,30 @@ module Paperclip
 
     def self.default_options
       @default_options ||= {
-        :url                   => "/system/:attachment/:id/:style/:filename",
-        :path                  => ":rails_root/public:url",
-        :styles                => {},
+        :convert_options       => {},
+        :default_style         => :original,
+        :default_url           => "/:attachment/:style/missing.png",
+        :restricted_characters => /[&$+,\/:;=?@<>\[\]\{\}\|\\\^~%# ]/,
+        :hash_data             => ":class/:attachment/:id/:style/:updated_at",
+        :hash_digest           => "SHA1",
+        :interpolator          => Paperclip::Interpolations,
         :only_process          => [],
+        :path                  => ":rails_root/public:url",
+        :preserve_files        => false,
         :processors            => [:thumbnail],
-        :convert_options       => {},
         :source_file_options   => {},
-        :default_url           => "/:attachment/:style/missing.png",
-        :default_style         => :original,
         :storage               => :filesystem,
-        :use_timestamp         => true,
-        :whiny                 => Paperclip.options[:whiny] || Paperclip.options[:whiny_thumbnails],
+        :styles                => {},
+        :url                   => "/system/:attachment/:id/:style/:filename",
+        :url_generator         => Paperclip::UrlGenerator,
         :use_default_time_zone => true,
-        :hash_digest           => "SHA1",
-        :hash_data             => ":class/:attachment/:id/:style/:updated_at",
-        :preserve_files        => false,
-        :interpolator          => Paperclip::Interpolations,
-        :url_generator         => Paperclip::UrlGenerator
+        :use_timestamp         => true,
+        :whiny                 => Paperclip.options[:whiny] || Paperclip.options[:whiny_thumbnails]
       }
     end
 
-    attr_reader :name, :instance, :default_style, :convert_options, :queued_for_write, :whiny, :options, :interpolator
-    attr_reader :source_file_options, :whiny
+    attr_reader :name, :instance, :default_style, :convert_options, :queued_for_write, :whiny,
+                :options, :interpolator, :source_file_options, :whiny
     attr_accessor :post_processing
 
     # Creates an Attachment object. +name+ is the name of the attachment,
@@ -108,7 +109,7 @@ module Paperclip
       uploaded_filename ||= uploaded_file.original_filename
       stores_fingerprint             = @instance.respond_to?("#{name}_fingerprint".to_sym)
       @queued_for_write[:original]   = to_tempfile(uploaded_file)
-      instance_write(:file_name,       uploaded_filename.strip)
+      instance_write(:file_name,       cleanup_filename(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)) if stores_fingerprint
@@ -478,5 +479,10 @@ module Paperclip
       end
     end
 
+    def cleanup_filename(filename)
+      if @options[:restricted_characters]
+        filename.gsub(@options[:restricted_characters], '_')
+      end
+    end
   end
 end

data/lib/paperclip/storage/fog.rb

@@ -126,7 +126,12 @@ module Paperclip
 
       def public_url(style = default_style)
         if @options[:fog_host]
-          host = (@options[:fog_host] =~ /%d/) ? @options[:fog_host] % (path(style).hash % 4) : @options[:fog_host]
+          host = if @options[:fog_host].respond_to?(:call)
+            @options[:fog_host].call(self)
+          else
+            (@options[:fog_host] =~ /%d/) ? @options[:fog_host] % (path(style).hash % 4) : @options[:fog_host]
+          end
+          
           "#{host}/#{path(style)}"
         else
           if fog_credentials[:provider] == 'AWS'
@@ -159,7 +164,11 @@ module Paperclip
         when Hash
           creds
         else
-          raise ArgumentError, "Credentials are not a path, file, or hash."
+          if creds.respond_to?(:call)
+            creds.call(self)
+          else
+            raise ArgumentError, "Credentials are not a path, file, hash or proc."
+          end
         end
       end
 
@@ -168,7 +177,13 @@ module Paperclip
       end
 
       def directory
-        @directory ||= connection.directories.new(:key => @options[:fog_directory])
+        dir = if @options[:fog_directory].respond_to?(:call)
+          @options[:fog_directory].call(self)
+        else
+          @options[:fog_directory]
+        end
+        
+        @directory ||= connection.directories.new(:key => dir)
       end
     end
   end

data/lib/paperclip/upfile.rb

@@ -5,7 +5,6 @@ module Paperclip
   # to the +File+ class. Useful for testing.
   #   user.avatar = File.new("test/test_avatar.jpg")
   module Upfile
-
     # Infer the MIME-type of the file from the extension.
     def content_type
       types = MIME::Types.type_for(self.original_filename)
@@ -23,7 +22,7 @@ module Paperclip
     end
 
     def type_from_file_command
-    #  On BSDs, `file` doesn't give a result code of 1 if the file doesn't exist.
+      #  On BSDs, `file` doesn't give a result code of 1 if the file doesn't exist.
       type = (self.original_filename.match(/\.(\w+)$/)[1] rescue "octet-stream").downcase
       mime_type = (Paperclip.run("file", "-b --mime :file", :file => self.path).split(/[:;]\s+/)[0] rescue "application/x-#{type}")
       mime_type = "application/x-#{type}" if mime_type.match(/\(.*?\)/)
@@ -45,12 +44,15 @@ end
 if defined? StringIO
   class StringIO
     attr_accessor :original_filename, :content_type, :fingerprint
+
     def original_filename
       @original_filename ||= "stringio.txt"
     end
+
     def content_type
       @content_type ||= "text/plain"
     end
+
     def fingerprint
       @fingerprint ||= Digest::MD5.hexdigest(self.string)
     end

data/lib/paperclip/version.rb

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

data/test/attachment_test.rb

@@ -666,7 +666,7 @@ class AttachmentTest < Test::Unit::TestCase
   context "Assigning an attachment" do
     setup do
       rebuild_model :styles => { :something => "100x100#" }
-      @file  = StringIO.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)
@@ -713,6 +713,48 @@ class AttachmentTest < Test::Unit::TestCase
     end
   end
 
+  context "Attachment with reserved filename" do
+    setup do
+      rebuild_model
+      @file = StringIO.new(".")
+    end
+
+    context "with default configuration" do
+      "&$+,/:;=?@<>[]{}|\^~%# ".split(//).each do |character|
+        context "with character #{character}" do
+          setup do
+            @file.stubs(:original_filename).returns("file#{character}name.png")
+            @dummy = Dummy.new
+            @dummy.avatar = @file
+          end
+
+          should "convert special character into underscore" do
+            assert_equal "file_name.png", @dummy.avatar.original_filename
+          end
+        end
+      end
+    end
+
+    context "with specified regexp replacement" do
+      setup do
+        @old_defaults = Paperclip::Attachment.default_options.dup
+        Paperclip::Attachment.default_options.merge! :restricted_characters => /o/
+
+        @file.stubs(:original_filename).returns("goood.png")
+        @dummy = Dummy.new
+        @dummy.avatar = @file
+      end
+
+      teardown do
+        Paperclip::Attachment.default_options.merge! @old_defaults
+      end
+
+      should "match and convert that character" do
+        assert_equal "g___d.png", @dummy.avatar.original_filename
+      end
+    end
+  end
+
   context "Attachment with uppercase extension and a default style" do
     setup do
       @old_defaults = Paperclip::Attachment.default_options.dup

data/test/storage/filesystem_test.rb

@@ -44,12 +44,12 @@ class FileSystemTest < Test::Unit::TestCase
         assert File.exists?(@dummy.avatar.path)
       end
 
-      should "store the path unescaped" do
-        assert_match /\/spaced file\.png/, @dummy.avatar.path
+      should "return a replaced version for path" do
+        assert_match /.+\/spaced_file\.png/, @dummy.avatar.path
       end
 
-      should "return an escaped version of URL" do
-        assert_match /\/spaced%20file\.png/, @dummy.avatar.url
+      should "return a replaced version for url" do
+        assert_match /.+\/spaced_file\.png/, @dummy.avatar.url
       end
     end
   end

data/test/storage/fog_test.rb

@@ -220,6 +220,54 @@ class FogTest < Test::Unit::TestCase
 
       end
 
+      context "with a proc for a bucket name evaluating a model method" do
+        setup do
+          @dynamic_fog_directory = 'dynamicpaperclip'
+          rebuild_model(@options.merge(:fog_directory => lambda { |attachment| attachment.instance.bucket_name }))
+          @dummy = Dummy.new
+          @dummy.stubs(:bucket_name).returns(@dynamic_fog_directory)
+          @dummy.avatar = @file
+          @dummy.save
+        end
+
+        should "have created the bucket" do
+          assert @connection.directories.get(@dynamic_fog_directory).inspect
+        end
+
+      end
+
+      context "with a proc for the fog_host evaluating a model method" do
+        setup do
+          rebuild_model(@options.merge(:fog_host => lambda { |attachment| attachment.instance.fog_host }))
+          @dummy = Dummy.new
+          @dummy.stubs(:fog_host).returns('http://dynamicfoghost.com')
+          @dummy.avatar = @file
+          @dummy.save
+        end
+
+        should "provide a public url" do
+          assert_match /http:\/\/dynamicfoghost\.com/, @dummy.avatar.url
+        end
+      end
+
+      context "with a proc for the fog_credentials evaluating a model method" do
+        setup do
+          @dynamic_fog_credentials = {
+            :provider               => 'AWS',
+            :aws_access_key_id      => 'DYNAMIC_ID',
+            :aws_secret_access_key  => 'DYNAMIC_SECRET'
+          }
+          rebuild_model(@options.merge(:fog_credentials => lambda { |attachment| attachment.instance.fog_credentials }))
+          @dummy = Dummy.new
+          @dummy.stubs(:fog_credentials).returns(@dynamic_fog_credentials)
+          @dummy.avatar = @file
+          @dummy.save
+        end
+
+        should "provide a public url" do
+          assert_equal @dummy.avatar.fog_credentials, @dynamic_fog_credentials
+        end
+      end
     end
 
   end

data/test/storage/s3_live_test.rb

@@ -80,12 +80,12 @@ unless ENV["S3_BUCKET"].blank?
         @dummy.save
       end
 
-      should "return an unescaped version for path" do
-        assert_match /.+\/spaced file\.png/, @dummy.avatar.path
+      should "return a replaced version for path" do
+        assert_match /.+\/spaced_file\.png/, @dummy.avatar.path
       end
 
-      should "return an escaped version for url" do
-        assert_match /.+\/spaced%20file\.png/, @dummy.avatar.url
+      should "return a replaced version for url" do
+        assert_match /.+\/spaced_file\.png/, @dummy.avatar.url
       end
 
       should "be accessible" do
@@ -99,42 +99,6 @@ unless ENV["S3_BUCKET"].blank?
       end
     end
 
-    context "An attachment that uses S3 for storage and has a question mark in file name" do
-      setup do
-        rebuild_model :styles => { :thumb => "100x100", :square => "32x32#" },
-                      :storage => :s3,
-                      :bucket => ENV["S3_BUCKET"],
-                      :s3_credentials => File.new(File.join(File.dirname(__FILE__), "..", "fixtures", "s3.yml"))
-
-        Dummy.delete_all
-        @dummy = Dummy.new
-        @dummy.avatar = File.new(File.join(File.dirname(__FILE__), '..', 'fixtures', 'question?mark.png'), 'rb')
-        @dummy.save
-      end
-
-      should "return an unescaped version for path" do
-        assert_match /.+\/question\?mark\.png/, @dummy.avatar.path
-      end
-
-      should "return an escaped version for url" do
-        assert_match /.+\/question%3Fmark\.png/, @dummy.avatar.url
-      end
-
-      should "be accessible" do
-        assert_success_response @dummy.avatar.url
-      end
-
-      should "be accessible with an expiring url" do
-        assert_success_response @dummy.avatar.expiring_url
-      end
-
-      should "be destroyable" do
-        url = @dummy.avatar.url
-        @dummy.destroy
-        assert_not_found_response url
-      end
-    end
-
     context "An attachment that uses S3 for storage and uses AES256 encryption" do
       setup do
         rebuild_model :styles => { :thumb => "100x100", :square => "32x32#" },

data/test/storage/s3_test.rb

@@ -222,12 +222,38 @@ class S3Test < Test::Unit::TestCase
       @dummy.avatar = File.new(fixture_file('spaced file.png'), 'rb')
     end
 
-    should "return an unescaped version for path" do
-      assert_match /.+\/spaced file\.png/, @dummy.avatar.path
+    should "return a replaced version for path" do
+      assert_match /.+\/spaced_file\.png/, @dummy.avatar.path
     end
 
-    should "return an escaped version for url" do
-      assert_match /.+\/spaced%20file\.png/, @dummy.avatar.url
+    should "return a replaced version for url" do
+      assert_match /.+\/spaced_file\.png/, @dummy.avatar.url
+    end
+  end
+
+  context "An attachment that uses S3 for storage and has a question mark in file name" do
+    setup do
+      rebuild_model :styles  => { :large => ['500x500#', :jpg] },
+                    :storage => :s3,
+                    :bucket  => "bucket",
+                    :s3_credentials => {
+                      'access_key_id' => "12345",
+                      'secret_access_key' => "54321"
+                    }
+
+      file = StringIO.new(".")
+      file.original_filename = "question?mark.png"
+      @dummy = Dummy.new
+      @dummy.avatar = file
+      @dummy.save
+    end
+
+    should "return a replaced version for path" do
+      assert_match /.+\/question_mark\.png/, @dummy.avatar.path
+    end
+
+    should "return a replaced version for url" do
+      assert_match /.+\/question_mark\.png/, @dummy.avatar.url
     end
   end
 

metadata

@@ -1,210 +1,284 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: paperclip
-version: !ruby/object:Gem::Version
-  version: 2.5.1
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  hash: 31
+  prerelease: false
+  segments: 
+  - 2
+  - 5
+  - 2
+  version: 2.5.2
 platform: ruby
-authors:
+authors: 
 - Jon Yurek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-27 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-01-27 00:00:00 -05:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: activerecord
-  requirement: &14283600 !ruby/object:Gem::Requirement
+  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
   type: :runtime
-  prerelease: false
-  version_requirements: *14283600
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: activesupport
-  requirement: &14282500 !ruby/object:Gem::Requirement
+  prerelease: false
+  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
   type: :runtime
-  prerelease: false
-  version_requirements: *14282500
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: cocaine
-  requirement: &14280720 !ruby/object:Gem::Requirement
+  prerelease: false
+  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
   type: :runtime
-  prerelease: false
-  version_requirements: *14280720
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: mime-types
-  requirement: &14279580 !ruby/object:Gem::Requirement
+  prerelease: false
+  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"
   type: :runtime
-  prerelease: false
-  version_requirements: *14279580
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: shoulda
-  requirement: &14276160 !ruby/object:Gem::Requirement
+  prerelease: false
+  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"
   type: :development
-  prerelease: false
-  version_requirements: *14276160
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: appraisal
-  requirement: &14274240 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 0
+        - 4
+        - 0
         version: 0.4.0
   type: :development
-  prerelease: false
-  version_requirements: *14274240
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: mocha
-  requirement: &14273340 !ruby/object:Gem::Requirement
+  prerelease: false
+  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"
   type: :development
-  prerelease: false
-  version_requirements: *14273340
-- !ruby/object:Gem::Dependency
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: aws-sdk
-  requirement: &14272400 !ruby/object:Gem::Requirement
+  prerelease: false
+  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"
   type: :development
-  prerelease: false
-  version_requirements: *14272400
-- !ruby/object:Gem::Dependency
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
   name: sqlite3
-  requirement: &14271240 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 3
+        - 4
         version: 1.3.4
   type: :development
-  prerelease: false
-  version_requirements: *14271240
-- !ruby/object:Gem::Dependency
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
   name: cucumber
-  requirement: &14270340 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 1
+        - 0
         version: 1.1.0
   type: :development
-  prerelease: false
-  version_requirements: *14270340
-- !ruby/object:Gem::Dependency
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
   name: aruba
-  requirement: &14269680 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *14269680
-- !ruby/object:Gem::Dependency
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
   name: capybara
-  requirement: &14268260 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *14268260
-- !ruby/object:Gem::Dependency
+  version_requirements: *id012
+- !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &14264560 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *14264560
-- !ruby/object:Gem::Dependency
+  version_requirements: *id013
+- !ruby/object:Gem::Dependency 
   name: cocaine
-  requirement: &14262640 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.2'
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 0
+        - 2
+        version: "0.2"
   type: :development
-  prerelease: false
-  version_requirements: *14262640
-- !ruby/object:Gem::Dependency
+  version_requirements: *id014
+- !ruby/object:Gem::Dependency 
   name: fog
-  requirement: &14253520 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *14253520
-- !ruby/object:Gem::Dependency
+  version_requirements: *id015
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &14249900 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *14249900
-- !ruby/object:Gem::Dependency
+  version_requirements: *id016
+- !ruby/object:Gem::Dependency 
   name: fakeweb
-  requirement: &14244620 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *14244620
+  version_requirements: *id017
 description: Easy upload management for ActiveRecord
-email:
+email: 
 - jyurek@thoughtbot.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .travis.yml
 - Appraisals
@@ -271,7 +345,6 @@ files:
 - paperclip.gemspec
 - rails/init.rb
 - shoulda_macros/paperclip.rb
-- test/.gitignore
 - test/attachment_test.rb
 - test/database.yml
 - test/fixtures/12k.png
@@ -280,7 +353,6 @@ files:
 - test/fixtures/animated.gif
 - test/fixtures/bad.png
 - test/fixtures/fog.yml
-- test/fixtures/question?mark.png
 - test/fixtures/s3.yml
 - test/fixtures/spaced file.png
 - test/fixtures/text.txt
@@ -311,35 +383,92 @@ files:
 - test/thumbnail_test.rb
 - test/upfile_test.rb
 - test/url_generator_test.rb
+has_rdoc: true
 homepage: https://github.com/thoughtbot/paperclip
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-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: -125325840175155071
-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'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: -125325840175155071
-requirements:
+      version: "0"
+requirements: 
 - ImageMagick
 rubyforge_project: paperclip
-rubygems_version: 1.8.11
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: File attachments as attributes for ActiveRecord
-test_files: []
+test_files: 
+- features/basic_integration.feature
+- features/rake_tasks.feature
+- features/step_definitions/attachment_steps.rb
+- features/step_definitions/html_steps.rb
+- features/step_definitions/rails_steps.rb
+- features/step_definitions/s3_steps.rb
+- features/step_definitions/web_steps.rb
+- features/support/env.rb
+- features/support/fakeweb.rb
+- features/support/fixtures/.boot_config.rb.swo
+- features/support/fixtures/boot_config.txt
+- features/support/fixtures/gemfile.txt
+- features/support/fixtures/preinitializer.txt
+- features/support/paths.rb
+- features/support/rails.rb
+- features/support/selectors.rb
+- test/attachment_test.rb
+- test/database.yml
+- test/fixtures/12k.png
+- test/fixtures/50x50.png
+- test/fixtures/5k.png
+- test/fixtures/animated.gif
+- 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
+- test/geometry_test.rb
+- test/helper.rb
+- test/integration_test.rb
+- test/interpolations_test.rb
+- test/iostream_test.rb
+- test/matchers/have_attached_file_matcher_test.rb
+- test/matchers/validate_attachment_content_type_matcher_test.rb
+- test/matchers/validate_attachment_presence_matcher_test.rb
+- test/matchers/validate_attachment_size_matcher_test.rb
+- test/paperclip_missing_attachment_styles_test.rb
+- test/paperclip_test.rb
+- test/processor_test.rb
+- test/schema_test.rb
+- test/storage/filesystem_test.rb
+- test/storage/fog_test.rb
+- test/storage/s3_live_test.rb
+- test/storage/s3_test.rb
+- test/style_test.rb
+- test/support/mock_attachment.rb
+- test/support/mock_interpolator.rb
+- test/support/mock_model.rb
+- test/support/mock_url_generator_builder.rb
+- test/thumbnail_test.rb
+- test/upfile_test.rb
+- test/url_generator_test.rb

data/test/.gitignore

@@ -1 +0,0 @@
-debug.log