paperclip 2.4.3 → 2.4.4

data/README.md

@@ -96,7 +96,7 @@ In your migrations:
 
 In your edit and new views:
 
-    <% form_for :user, @user, :url => user_path, :html => { :multipart => true } do |form| %>
+    <%= form_for :user, @user, :url => user_path, :html => { :multipart => true } do |form| %>
       <%= form.file_field :avatar %>
     <% end %>
 
@@ -234,10 +234,22 @@ URI Obfuscation
 ---------------
 
 Paperclip has an interpolation called `:hash` for obfuscating filenames of
-publicly-available files. For more on this feature read the author's own
-explanation.
+publicly-available files.
 
-[https://github.com/thoughtbot/paperclip/pull/416](https://github.com/thoughtbot/paperclip/pull/416)
+Example Usage:
+
+    has_attached_file :avatar, {
+        :url => "/system/:hash.:extension",
+        :hash_secret => "longSecretString"
+    }
+
+
+The `:hash` interpolation will be replaced with a unique hash made up of whatever
+is specified in `:hash_data`. The default value for `:hash_data` is `":class/:attachment/:id/:style/:updated_at"`.
+
+`:hash_secret` is required, an exception will be raised if `:hash` is used without `:hash_secret` present.
+
+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)
 
 MD5 Checksum / Fingerprint
 -------

data/lib/paperclip.rb

@@ -78,29 +78,28 @@ module Paperclip
       Paperclip::Interpolations[key] = block
     end
 
-    # The run method takes a command to execute and an array of parameters
-    # that get passed to it. The command is prefixed with the :command_path
-    # option from Paperclip.options. If you have many commands to run and
-    # they are in different paths, the suggested course of action is to
-    # symlink them so they are all in the same directory.
+    # The run method takes the name of a binary to run, the arguments to that binary
+    # and some options:
     #
-    # If the command returns with a result code that is not one of the
-    # expected_outcodes, a Cocaine::CommandLineError will be raised. Generally
-    # a code of 0 is expected, but a list of codes may be passed if necessary.
-    # These codes should be passed as a hash as the last argument, like so:
+    #   :command_path -> A $PATH-like variable that defines where to look for the binary
+    #                    on the filesystem. Colon-separated, just like $PATH.
     #
-    #   Paperclip.run("echo", "something", :expected_outcodes => [0,1,2,3])
+    #   :expected_outcodes -> An array of integers that defines the expected exit codes
+    #                         of the binary. Defaults to [0].
     #
-    # This method can log the command being run when
-    # 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)
+    #   :log_command -> Log the command being run when set to true (defaults to false).
+    #                   This will only log if logging in general is set to true as well.
+    #
+    #   :swallow_stderr -> Set to true if you don't care what happens on STDERR.
+    #
+    def run(cmd, arguments = "", local_options = {})
       if options[:image_magick_path]
         Paperclip.log("[DEPRECATION] :image_magick_path is deprecated and will be removed. Use :command_path instead")
       end
       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
+      local_options = local_options.merge(:logger => logger) if logging? && (options[:log_command] || local_options[:log_command])
+      Cocaine::CommandLine.new(cmd, arguments, local_options).run
     end
 
     def processor(name) #:nodoc:

data/lib/paperclip/attachment.rb

@@ -131,7 +131,9 @@ module Paperclip
     def url(style_name = default_style, use_timestamp = @options.use_timestamp)
       default_url = @options.default_url.is_a?(Proc) ? @options.default_url.call(self) : @options.default_url
       url = original_filename.nil? ? interpolate(default_url, style_name) : interpolate(@options.url, style_name)
-      URI.escape(use_timestamp && updated_at ? [url, updated_at].compact.join(url.include?("?") ? "&" : "?") : url)
+
+      url << (url.include?("?") ? "&" : "?") + updated_at.to_s if use_timestamp && updated_at
+      url.respond_to?(:escape) ? url.escape : URI.escape(url)
     end
 
     # Returns the path of the attachment as defined by the :path option. If the
@@ -139,7 +141,8 @@ module Paperclip
     # on disk. If the file is stored in S3, the path is the "key" part of the
     # URL, and the :bucket option refers to the S3 bucket.
     def path(style_name = default_style)
-      original_filename.nil? ? nil : interpolate(@options.path, style_name)
+      path = original_filename.nil? ? nil : interpolate(@options.path, style_name)
+      path.respond_to?(:unescape) ? path.unescape : path
     end
 
     # Alias to +url+

data/lib/paperclip/interpolated_string.rb

@@ -0,0 +1,33 @@
+require 'uri'
+
+module Paperclip
+  class InterpolatedString < String
+    def escaped?
+      !!@escaped
+    end
+
+    def escape
+      if !escaped?
+        escaped_string = self.class.new(URI.escape(self))
+        escaped_string.instance_variable_set(:@escaped, true)
+        escaped_string
+      else
+        self
+      end
+    end
+
+    def unescape
+      if escaped?
+        escaped_string = self.class.new(URI.unescape(self))
+        escaped_string.instance_variable_set(:@escaped, false)
+        escaped_string
+      else
+        self
+      end
+    end
+
+    def force_escape
+      @escaped = true
+    end
+  end
+end

data/lib/paperclip/interpolations.rb

@@ -1,3 +1,5 @@
+require 'paperclip/interpolated_string'
+
 module Paperclip
   # This module contains all the methods that are available for interpolation
   # in paths and urls. To add your own (or override an existing one), you
@@ -29,11 +31,13 @@ module Paperclip
     # 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|
+      interpolated_string = all.reverse.inject(InterpolatedString.new(pattern)) do |result, tag|
         result.gsub(/:#{tag}/) do |match|
           send( tag, *args )
         end
       end
+      interpolated_string.force_escape if pattern =~ /:url/
+      interpolated_string
     end
 
     # Returns the filename, the same way as ":basename.:extension" would.
@@ -86,7 +90,7 @@ module Paperclip
 
     # Returns the basename of the file. e.g. "file" for "file.jpg"
     def basename attachment, style_name
-      attachment.original_filename.gsub(/#{File.extname(attachment.original_filename)}$/, "")
+      attachment.original_filename.gsub(/#{Regexp.escape(File.extname(attachment.original_filename))}$/, "")
     end
 
     # Returns the extension of the file. e.g. "jpg" for "file.jpg"

data/lib/paperclip/options.rb

@@ -54,7 +54,7 @@ module Paperclip
     end
 
     def method_missing(method, *args, &blk)
-      if method.to_s[-1] == "="
+      if method.to_s[-1,1] == "="
         instance_variable_set("@#{method[0..-2]}", args[0])
       else
         instance_variable_get("@#{method}")

data/lib/paperclip/storage/s3.rb

@@ -86,7 +86,7 @@ module Paperclip
           @s3_headers     = @options.s3_headers     || {}
 
           unless @options.url.to_s.match(/^:s3.*url$/) || @options.url == ":asset_host"
-            @options.path         = @options.path.gsub(/:url/, @options.url)
+            @options.path         = @options.path.gsub(/:url/, @options.url).gsub(/^:rails_root\/public\/system/, '')
             @options.url          = ":s3_path_url"
           end
           @options.url = @options.url.inspect if @options.url.is_a?(Symbol)

data/lib/paperclip/version.rb

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

data/lib/tasks/paperclip.rake

@@ -73,7 +73,7 @@ namespace :paperclip do
           ENV['STYLES'] = missing_styles.join(',')
           Rake::Task['paperclip:refresh:thumbnails'].execute
         end
-      end  
+      end
       Paperclip.save_current_attachments_styles!
     end
   end
@@ -84,12 +84,16 @@ namespace :paperclip do
     names = Paperclip::Task.obtain_attachments(klass)
     names.each do |name|
       Paperclip.each_instance_with_attachment(klass, name) do |instance|
-        instance.send(name).send(:validate)
-        if instance.send(name).valid?
-          true
-        else
-          instance.send("#{name}=", nil)
-          instance.save
+        unless instance.valid?
+          attributes = %w(file_size file_name content_type).map{ |suffix| "#{name}_#{suffix}".to_sym }
+          if attributes.any?{ |attribute| instance.errors[attribute].present? }
+            instance.send("#{name}=", nil)
+            if Rails.version >= "3.0.0"
+              instance.save(:validate => false)
+            else
+              instance.save(false)
+            end
+          end
         end
       end
     end

data/test/interpolated_string_test.rb

@@ -0,0 +1,62 @@
+require './test/helper'
+
+class InterpolatedStringTest < Test::Unit::TestCase
+  context "inheritance" do
+    should "inherited from String" do
+      assert Paperclip::InterpolatedString.new("paperclip").is_a? String
+    end
+  end
+
+  context "#escape" do
+    subject { Paperclip::InterpolatedString.new("paperclip foo").escape }
+
+    should "returns an InterpolatedString object" do
+      assert subject.is_a? Paperclip::InterpolatedString
+    end
+
+    should "escape the output string" do
+      assert_equal "paperclip%20foo", subject
+    end
+
+    should "not double escape output string" do
+      assert_equal "paperclip%20foo", subject.escape
+    end
+  end
+
+  context "#unescape" do
+    subject { Paperclip::InterpolatedString.new("paperclip%20foo").escape.unescape }
+
+    should "returns an InterpolatedString object" do
+      assert subject.is_a? Paperclip::InterpolatedString
+    end
+
+    should "unescape the output string" do
+      assert_equal "paperclip%20foo", subject
+    end
+
+    should "not double unescape output string" do
+      assert_equal "paperclip%20foo", subject.unescape
+    end
+  end
+
+  context "#escaped?" do
+    subject { Paperclip::InterpolatedString.new("paperclip") }
+
+    should "returns true if string was escaped" do
+      assert subject.escape.escaped?
+    end
+
+    should "returns false if string wasn't escaped" do
+      assert !subject.escaped?
+    end
+  end
+
+  context "#force_escape" do
+    subject { Paperclip::InterpolatedString.new("paperclip") }
+    setup { subject.force_escape }
+
+    should "sets escaped flag to true" do
+      assert subject.escaped?
+    end
+  end
+end

data/test/interpolations_test.rb

@@ -154,6 +154,13 @@ class InterpolationsTest < Test::Unit::TestCase
     attachment.stubs(:original_filename).returns("one")
     assert_equal "one", Paperclip::Interpolations.filename(attachment, :style)
   end
+  
+  should "return the basename when the extension contains regexp special characters" do
+    attachment = mock
+    attachment.stubs(:styles).returns({})
+    attachment.stubs(:original_filename).returns("one.ab)")
+    assert_equal "one", Paperclip::Interpolations.basename(attachment, :style)
+  end
 
   should "return the timestamp" do
     now = Time.now

data/test/options_test.rb

@@ -8,6 +8,13 @@ class MockAttachment < Struct.new(:one, :two)
 end
 
 class OptionsTest < Test::Unit::TestCase
+  should "be able to set a value" do
+    @options = Paperclip::Options.new(nil, {})
+    assert_nil @options.path
+    @options.path = "this/is/a/path"
+    assert_equal "this/is/a/path", @options.path
+  end
+
   context "#styles with a plain hash" do
     setup do
       @attachment = MockAttachment.new(nil, nil)

data/test/paperclip_test.rb

@@ -3,11 +3,13 @@ require './test/helper'
 class PaperclipTest < Test::Unit::TestCase
   context "Calling Paperclip.run" do
     setup do
-      Cocaine::CommandLine.expects(:new).with("convert", "stuff").returns(stub(:run))
+      Paperclip.options[:log_command] = false
+      Cocaine::CommandLine.expects(:new).with("convert", "stuff", {}).returns(stub(:run))
       @original_command_line_path = Cocaine::CommandLine.path
     end
 
     teardown do
+      Paperclip.options[:log_command] = true
       Cocaine::CommandLine.path = @original_command_line_path
     end
 
@@ -22,6 +24,14 @@ class PaperclipTest < Test::Unit::TestCase
     end
   end
 
+  context "Calling Paperclip.run with a logger" do
+    should "pass the defined logger if :log_command is set" do
+      Paperclip.options[:log_command] = true
+      Cocaine::CommandLine.expects(:new).with("convert", "stuff", :logger => Paperclip.logger).returns(stub(:run))
+      Paperclip.run("convert", "stuff")
+    end
+  end
+
   context "Paperclip.each_instance_with_attachment" do
     setup do
       @file = File.new(File.join(FIXTURES_DIR, "5k.png"), 'rb')

data/test/storage/filesystem_test.rb

@@ -44,6 +44,10 @@ 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
+      end
+
       should "return an escaped version of URL" do
         assert_match /\/spaced%20file\.png/, @dummy.avatar.url
       end

data/test/storage/s3_live_test.rb

@@ -25,7 +25,10 @@ unless ENV["S3_TEST_BUCKET"].blank?
           @dummy.avatar = @file
         end
 
-        teardown { @file.close }
+        teardown do
+          @file.close
+          @dummy.destroy
+        end
 
         should "still return a Tempfile when sent #to_file" do
           assert_equal Paperclip::Tempfile, @dummy.avatar.to_file.class
@@ -47,5 +50,39 @@ unless ENV["S3_TEST_BUCKET"].blank?
         end
       end
     end
+
+    context "An attachment that uses S3 for storage and has spaces in file name" do
+      setup do
+        rebuild_model :styles => { :thumb => "100x100", :square => "32x32#" },
+                      :storage => :s3,
+                      :bucket => ENV["S3_TEST_BUCKET"],
+                      :s3_credentials => File.new(File.join(File.dirname(__FILE__), "..", "s3.yml"))
+
+        Dummy.delete_all
+        @dummy = Dummy.new
+        @dummy.avatar = File.new(File.join(File.dirname(__FILE__), '..', 'fixtures', 'spaced file.png'), 'rb')
+        @dummy.save
+      end
+
+      teardown { @dummy.destroy }
+
+      should "return an unescaped 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
+      end
+
+      should "be accessible" do
+        assert_match /200 OK/, `curl -I #{@dummy.avatar.url}`
+      end
+
+      should "be destoryable" do
+        url = @dummy.avatar.url
+        @dummy.destroy
+        assert_match /404 Not Found/, `curl -I #{url}`
+      end
+    end
   end
 end

data/test/storage/s3_test.rb

@@ -116,7 +116,6 @@ class S3Test < Test::Unit::TestCase
       rebuild_model :styles  => { :large => ['500x500#', :jpg] },
                     :storage => :s3,
                     :bucket  => "bucket",
-                    :path => ":attachment/:basename.:extension",
                     :s3_credentials => {
                       'access_key_id' => "12345",
                       'secret_access_key' => "54321"
@@ -126,7 +125,11 @@ class S3Test < Test::Unit::TestCase
       @dummy.avatar = File.new(File.join(File.dirname(__FILE__), '..', 'fixtures', 'spaced file.png'), 'rb')
     end
 
-    should "return an escaped version of url" do
+    should "return an unescaped 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
     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.3
+version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: 
+  segments: 
+  - 2
+  - 4
+  - 4
+  version: 2.4.4
 platform: ruby
-authors:
+authors: 
 - Jon Yurek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-05 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-10-14 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: activerecord
-  requirement: &70187246781180 !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: *70187246781180
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: activesupport
-  requirement: &70187246780680 !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: *70187246780680
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: cocaine
-  requirement: &70187246780220 !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: *70187246780220
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: mime-types
-  requirement: &70187246779840 !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: *70187246779840
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: shoulda
-  requirement: &70187246779380 !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: *70187246779380
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: appraisal
-  requirement: &70187246778960 !ruby/object:Gem::Requirement
+  prerelease: false
+  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"
   type: :development
-  prerelease: false
-  version_requirements: *70187246778960
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: mocha
-  requirement: &70187246778540 !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: *70187246778540
-- !ruby/object:Gem::Dependency
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: aws-s3
-  requirement: &70187246778120 !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: *70187246778120
-- !ruby/object:Gem::Dependency
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
   name: sqlite3
-  requirement: &70187246777700 !ruby/object:Gem::Requirement
+  prerelease: false
+  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"
   type: :development
-  prerelease: false
-  version_requirements: *70187246777700
-- !ruby/object:Gem::Dependency
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
   name: cucumber
-  requirement: &70187246797740 !ruby/object:Gem::Requirement
+  prerelease: false
+  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"
   type: :development
-  prerelease: false
-  version_requirements: *70187246797740
-- !ruby/object:Gem::Dependency
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
   name: capybara
-  requirement: &70187246797320 !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: *70187246797320
+  version_requirements: *id011
 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
@@ -149,6 +196,7 @@ files:
 - lib/paperclip/attachment.rb
 - lib/paperclip/callback_compatibility.rb
 - lib/paperclip/geometry.rb
+- lib/paperclip/interpolated_string.rb
 - lib/paperclip/interpolations.rb
 - lib/paperclip/iostream.rb
 - lib/paperclip/matchers/have_attached_file_matcher.rb
@@ -187,6 +235,7 @@ files:
 - test/geometry_test.rb
 - test/helper.rb
 - test/integration_test.rb
+- test/interpolated_string_test.rb
 - test/interpolations_test.rb
 - test/iostream_test.rb
 - test/matchers/have_attached_file_matcher_test.rb
@@ -210,25 +259,32 @@ 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'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      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.10
@@ -236,3 +292,4 @@ signing_key:
 specification_version: 3
 summary: File attachments as attributes for ActiveRecord
 test_files: []
+