paperclip 2.6.0 → 2.7.0

data/.travis.yml

@@ -3,7 +3,6 @@ rvm:
   - 1.9.2
   - ree
   - rbx-18mode
-  - rbx-19mode
 
 before_script: "sudo ntpdate -ub ntp.ubuntu.com pool.ntp.org; true"
 script: "bundle exec rake clean test cucumber"
@@ -12,3 +11,4 @@ gemfile:
   - gemfiles/rails2.gemfile
   - gemfiles/rails3.gemfile
   - gemfiles/rails3_1.gemfile
+  - gemfiles/rails3_2.gemfile

data/Appraisals

@@ -12,3 +12,9 @@ appraise "rails3_1" do
   gem "rails", "~> 3.1.0"
   gem "paperclip", :path => "../"
 end
+
+appraise "rails3_2" do
+  gem "rails", "~> 3.2.0"
+  gem "paperclip", :path => "../"
+end
+

data/NEWS

@@ -1,3 +1,12 @@
+New in 2.7.0:
+
+* Bug fix: Checking the existence of a file on S3 handles all AWS errors.
+* Bug fix: Clear the fingerprint when removing an attachment.
+* Bug fix: Attachment size validation message reads more nicely now.
+* Feature: Style names can be either symbols or strings.
+* Compatibility: Support for ActiveSupport < 2.3.12.
+* Compatibility: Support for Rails 3.2.
+
 New in 2.6.0:
 
 * Bug fix: Files are re-wound after reading.

data/README.md

@@ -60,7 +60,7 @@ Include the gem in your Gemfile:
 Or, if you want to get the latest, you can get master from the main paperclip repository:
 
     gem "paperclip", :git => "git://github.com/thoughtbot/paperclip.git"
-    
+
 If you're trying to use features that don't seem to be in the latest released gem, but are
 mentioned in this README, then you probably need to specify the master branch if you want to
 use them. This README is probably ahead of the latest released version, if you're reading it
@@ -75,7 +75,7 @@ Anyway, if you don't use Bundler (though you probably should, even in Rails 2),
       config.gem "paperclip", :version => "~> 2.4"
       ...
     end
-    
+
 For Non-Rails usage:
 
     class ModuleName < ActiveRecord::Base
@@ -176,9 +176,9 @@ safer choice for the default file store._
 You may also choose to store your files using Amazon's S3 service. To do so, include
 the `aws-sdk` gem in your Gemfile:
 
-    gem 'aws-sdk'
+    gem 'aws-sdk', '~> 1.3.4'
 
-And then you can specify using S3 from `has_attached_file`. 
+And then you can specify using S3 from `has_attached_file`.
 You can find more information about configuring and using S3 storage in
 [the `Paperclip::Storage::S3` documentation](http://rubydoc.info/gems/paperclip/Paperclip/Storage/S3).
 

data/gemfiles/rails3_2.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "jruby-openssl", :platform=>:jruby
+gem "rails", "~> 3.2.0"
+gem "paperclip", :path=>"../"
+
+gemspec :path=>"../"

data/lib/paperclip.rb

@@ -323,7 +323,11 @@ module Paperclip
           write_inheritable_attribute(:attachment_definitions, {})
         end
       else
-        self.attachment_definitions = self.attachment_definitions.dup
+        if respond_to?(:class_attribute)
+          self.attachment_definitions = self.attachment_definitions.dup
+        else
+          write_inheritable_attribute(:attachment_definitions, self.attachment_definitions.dup)
+        end
       end
 
       attachment_definitions[name] = Paperclip::AttachmentOptions.new(options)
@@ -368,7 +372,7 @@ module Paperclip
       min     = options[:greater_than] || (options[:in] && options[:in].first) || 0
       max     = options[:less_than]    || (options[:in] && options[:in].last)  || (1.0/0)
       range   = (min..max)
-      message = options[:message] || "file size must be between :min and :max bytes"
+      message = options[:message] || "must be between :min and :max bytes"
       message = message.call if message.respond_to?(:call)
       message = message.gsub(/:min/, min.to_s).gsub(/:max/, max.to_s)
 

data/lib/paperclip/attachment.rb

@@ -462,6 +462,7 @@ module Paperclip
       instance_write(:file_name, nil)
       instance_write(:content_type, nil)
       instance_write(:file_size, nil)
+      instance_write(:fingerprint, nil)
       instance_write(:updated_at, nil)
     end
 

data/lib/paperclip/interpolations.rb

@@ -93,7 +93,7 @@ module Paperclip
     # If the style has a format defined, it will return the format instead
     # of the actual extension.
     def extension attachment, style_name
-      ((style = attachment.styles[style_name]) && style[:format]) ||
+      ((style = attachment.styles[style_name.to_sym]) && style[:format]) ||
         File.extname(attachment.original_filename).gsub(/^\.+/, "")
     end
 

data/lib/paperclip/storage/s3.rb

@@ -238,6 +238,8 @@ module Paperclip
         else
           false
         end
+      rescue AWS::Errors::Base => e
+        false
       end
 
       def s3_permissions(style = default_style)

data/lib/paperclip/version.rb

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

data/test/attachment_test.rb

@@ -925,6 +925,7 @@ class AttachmentTest < Test::Unit::TestCase
                 @attachment.expects(:instance_write).with(:file_name, nil)
                 @attachment.expects(:instance_write).with(:content_type, nil)
                 @attachment.expects(:instance_write).with(:file_size, nil)
+                @attachment.expects(:instance_write).with(:fingerprint, nil)
                 @attachment.expects(:instance_write).with(:updated_at, nil)
                 @attachment.assign nil
                 @attachment.save
@@ -935,6 +936,7 @@ class AttachmentTest < Test::Unit::TestCase
                 @attachment.expects(:instance_write).with(:file_name, nil)
                 @attachment.expects(:instance_write).with(:content_type, nil)
                 @attachment.expects(:instance_write).with(:file_size, nil)
+                @attachment.expects(:instance_write).with(:fingerprint, nil)
                 @attachment.expects(:instance_write).with(:updated_at, nil)
                 @attachment.clear
                 @attachment.save
@@ -945,6 +947,7 @@ class AttachmentTest < Test::Unit::TestCase
                 @attachment.expects(:instance_write).with(:file_name, nil)
                 @attachment.expects(:instance_write).with(:content_type, nil)
                 @attachment.expects(:instance_write).with(:file_size, nil)
+                @attachment.expects(:instance_write).with(:fingerprint, nil)
                 @attachment.expects(:instance_write).with(:updated_at, nil)
                 @attachment.destroy
                 @existing_names.each{|f| assert ! File.exists?(f) }
@@ -959,6 +962,7 @@ class AttachmentTest < Test::Unit::TestCase
                   @attachment.expects(:instance_write).with(:file_name, nil)
                   @attachment.expects(:instance_write).with(:content_type, nil)
                   @attachment.expects(:instance_write).with(:file_size, nil)
+                  @attachment.expects(:instance_write).with(:fingerprint, nil)
                   @attachment.expects(:instance_write).with(:updated_at, nil)
                   @attachment.assign nil
                   @attachment.save
@@ -969,6 +973,7 @@ class AttachmentTest < Test::Unit::TestCase
                   @attachment.expects(:instance_write).with(:file_name, nil)
                   @attachment.expects(:instance_write).with(:content_type, nil)
                   @attachment.expects(:instance_write).with(:file_size, nil)
+                  @attachment.expects(:instance_write).with(:fingerprint, nil)
                   @attachment.expects(:instance_write).with(:updated_at, nil)
                   @attachment.clear
                   @attachment.save
@@ -979,6 +984,7 @@ class AttachmentTest < Test::Unit::TestCase
                   @attachment.expects(:instance_write).with(:file_name, nil)
                   @attachment.expects(:instance_write).with(:content_type, nil)
                   @attachment.expects(:instance_write).with(:file_size, nil)
+                  @attachment.expects(:instance_write).with(:fingerprint, nil)
                   @attachment.expects(:instance_write).with(:updated_at, nil)
                   @attachment.destroy
                   @existing_names.each{|f| assert File.exists?(f) }

data/test/interpolations_test.rb

@@ -46,8 +46,11 @@ class InterpolationsTest < Test::Unit::TestCase
   should "return the extension of the file as the format if defined in the style" do
     attachment = mock
     attachment.expects(:original_filename).never
-    attachment.expects(:styles).returns({:style => {:format => "png"}})
-    assert_equal "png", Paperclip::Interpolations.extension(attachment, :style)
+    attachment.expects(:styles).twice.returns({:style => {:format => "png"}})
+
+    [:style, 'style'].each do |style|
+      assert_equal "png", Paperclip::Interpolations.extension(attachment, style)
+    end
   end
 
   should "return the extension of the file based on the content type" do

data/test/storage/s3_test.rb

@@ -542,6 +542,16 @@ class S3Test < Test::Unit::TestCase
           assert true
         end
       end
+
+      context 'that the file were missing' do
+        setup do
+          AWS::S3::S3Object.any_instance.stubs(:exists?).raises(AWS::Errors::Base)
+        end
+
+        should 'return false on exists?' do
+          assert !@dummy.avatar.exists?
+        end
+      end
     end
   end
 

data/test/thumbnail_test.rb

@@ -226,11 +226,16 @@ class ThumbnailTest < Test::Unit::TestCase
     end
 
     context "passing a custom file geometry parser" do
+      teardown do
+        self.class.send(:remove_const, :GeoParser)
+      end
+
       should "produce the appropriate transformation_command" do
         GeoParser = Class.new do
           def self.from_file(file)
             new
           end
+
           def transformation_to(target, should_crop)
             ["SCALE", "CROP"]
           end
@@ -252,6 +257,10 @@ class ThumbnailTest < Test::Unit::TestCase
     end
 
     context "passing a custom geometry string parser" do
+      teardown do
+        self.class.send(:remove_const, :GeoParser)
+      end
+
       should "produce the appropriate transformation_command" do
         GeoParser = Class.new do
           def self.parse(s)

data/test/url_generator_test.rb

@@ -77,7 +77,7 @@ class UrlGeneratorTest < Test::Unit::TestCase
     end.new
     mock_attachment = MockAttachment.new
     mock_interpolator = MockInterpolator.new(:result => expected)
-    options = { :interpolator => mock_interpolator}
+    options = { :interpolator => mock_interpolator }
     url_generator = Paperclip::UrlGenerator.new(mock_attachment, options)
 
     result = url_generator.for(:style_name, {:escape => true})
@@ -89,7 +89,7 @@ class UrlGeneratorTest < Test::Unit::TestCase
     expected = "the expected result"
     mock_attachment = MockAttachment.new
     mock_interpolator = MockInterpolator.new(:result => expected)
-    options = { :interpolator => mock_interpolator}
+    options = { :interpolator => mock_interpolator }
     url_generator = Paperclip::UrlGenerator.new(mock_attachment, options)
 
     result = url_generator.for(:style_name, {:escape => false})
@@ -101,7 +101,7 @@ class UrlGeneratorTest < Test::Unit::TestCase
     expected = "the expected result"
     mock_attachment = MockAttachment.new
     mock_interpolator = MockInterpolator.new(:result => expected)
-    options = { :interpolator => mock_interpolator}
+    options = { :interpolator => mock_interpolator }
     url_generator = Paperclip::UrlGenerator.new(mock_attachment, options)
 
     result = url_generator.for(:style_name, {})
@@ -113,7 +113,7 @@ class UrlGeneratorTest < Test::Unit::TestCase
     expected = "the expected result"
     mock_interpolator = MockInterpolator.new(:result => expected)
     mock_attachment = MockAttachment.new(:responds_to_updated_at => false)
-    options = { :interpolator => mock_interpolator}
+    options = { :interpolator => mock_interpolator }
     url_generator = Paperclip::UrlGenerator.new(mock_attachment, options)
 
     result = url_generator.for(:style_name, {:timestamp => true})
@@ -125,7 +125,7 @@ class UrlGeneratorTest < Test::Unit::TestCase
     expected = "the expected result"
     mock_interpolator = MockInterpolator.new(:result => expected)
     mock_attachment = MockAttachment.new(:responds_to_updated_at => true, :updated_at => nil)
-    options = { :interpolator => mock_interpolator}
+    options = { :interpolator => mock_interpolator }
     url_generator = Paperclip::UrlGenerator.new(mock_attachment, options)
 
     result = url_generator.for(:style_name, {:timestamp => true})
@@ -138,7 +138,7 @@ class UrlGeneratorTest < Test::Unit::TestCase
     updated_at = 1231231234
     mock_interpolator = MockInterpolator.new(:result => expected)
     mock_attachment = MockAttachment.new(:updated_at => updated_at)
-    options = { :interpolator => mock_interpolator}
+    options = { :interpolator => mock_interpolator }
     url_generator = Paperclip::UrlGenerator.new(mock_attachment, options)
 
     result = url_generator.for(:style_name, {:timestamp => true})
@@ -151,7 +151,7 @@ class UrlGeneratorTest < Test::Unit::TestCase
     updated_at = 1231231234
     mock_interpolator = MockInterpolator.new(:result => expected)
     mock_attachment = MockAttachment.new(:updated_at => updated_at)
-    options = { :interpolator => mock_interpolator}
+    options = { :interpolator => mock_interpolator }
     url_generator = Paperclip::UrlGenerator.new(mock_attachment, options)
 
     result = url_generator.for(:style_name, {:timestamp => true})
@@ -164,7 +164,7 @@ class UrlGeneratorTest < Test::Unit::TestCase
     updated_at = 1231231234
     mock_interpolator = MockInterpolator.new(:result => expected)
     mock_attachment = MockAttachment.new(:updated_at => updated_at)
-    options = { :interpolator => mock_interpolator}
+    options = { :interpolator => mock_interpolator }
     url_generator = Paperclip::UrlGenerator.new(mock_attachment, options)
 
     result = url_generator.for(:style_name, {:timestamp => false})

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: paperclip
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 2
-  - 6
+  - 7
   - 0
-  version: 2.6.0
+  version: 2.7.0
 platform: ruby
 authors: 
 - Jon Yurek
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-10 00:00:00 Z
+date: 2012-02-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -30,9 +30,9 @@ dependencies:
         - 3
         - 0
         version: 2.3.0
-  prerelease: false
   name: activerecord
   version_requirements: *id001
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
   requirement: &id002 !ruby/object:Gem::Requirement 
@@ -46,9 +46,9 @@ dependencies:
         - 3
         - 2
         version: 2.3.2
-  prerelease: false
   name: activesupport
   version_requirements: *id002
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
   requirement: &id003 !ruby/object:Gem::Requirement 
@@ -62,9 +62,9 @@ dependencies:
         - 0
         - 2
         version: 0.0.2
-  prerelease: false
   name: cocaine
   version_requirements: *id003
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
   requirement: &id004 !ruby/object:Gem::Requirement 
@@ -76,9 +76,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
   name: mime-types
   version_requirements: *id004
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
   requirement: &id005 !ruby/object:Gem::Requirement 
@@ -90,9 +90,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
   name: shoulda
   version_requirements: *id005
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
   requirement: &id006 !ruby/object:Gem::Requirement 
@@ -106,9 +106,9 @@ dependencies:
         - 4
         - 0
         version: 0.4.0
-  prerelease: false
   name: appraisal
   version_requirements: *id006
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
   requirement: &id007 !ruby/object:Gem::Requirement 
@@ -120,9 +120,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
   name: mocha
   version_requirements: *id007
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
   requirement: &id008 !ruby/object:Gem::Requirement 
@@ -134,9 +134,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
   name: aws-sdk
   version_requirements: *id008
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
   requirement: &id009 !ruby/object:Gem::Requirement 
@@ -150,9 +150,9 @@ dependencies:
         - 3
         - 4
         version: 1.3.4
-  prerelease: false
   name: sqlite3
   version_requirements: *id009
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
   requirement: &id010 !ruby/object:Gem::Requirement 
@@ -166,9 +166,9 @@ dependencies:
         - 1
         - 0
         version: 1.1.0
-  prerelease: false
   name: cucumber
   version_requirements: *id010
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
   requirement: &id011 !ruby/object:Gem::Requirement 
@@ -180,9 +180,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
   name: aruba
   version_requirements: *id011
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
   requirement: &id012 !ruby/object:Gem::Requirement 
@@ -194,9 +194,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
   name: capybara
   version_requirements: *id012
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
   requirement: &id013 !ruby/object:Gem::Requirement 
@@ -208,9 +208,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
   name: bundler
   version_requirements: *id013
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
   requirement: &id014 !ruby/object:Gem::Requirement 
@@ -223,9 +223,9 @@ dependencies:
         - 0
         - 2
         version: "0.2"
-  prerelease: false
   name: cocaine
   version_requirements: *id014
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
   requirement: &id015 !ruby/object:Gem::Requirement 
@@ -237,9 +237,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
   name: fog
   version_requirements: *id015
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
   requirement: &id016 !ruby/object:Gem::Requirement 
@@ -251,9 +251,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
   name: rake
   version_requirements: *id016
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
   requirement: &id017 !ruby/object:Gem::Requirement 
@@ -265,9 +265,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
   name: fakeweb
   version_requirements: *id017
+  prerelease: false
 description: Easy upload management for ActiveRecord
 email: 
 - jyurek@thoughtbot.com
@@ -282,7 +282,6 @@ files:
 - .travis.yml
 - Appraisals
 - CONTRIBUTING.md
-- ChangeLog
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -309,6 +308,7 @@ files:
 - gemfiles/rails2.gemfile
 - gemfiles/rails3.gemfile
 - gemfiles/rails3_1.gemfile
+- gemfiles/rails3_2.gemfile
 - generators/paperclip/USAGE
 - generators/paperclip/paperclip_generator.rb
 - generators/paperclip/templates/paperclip_migration.rb.erb
@@ -413,7 +413,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - ImageMagick
 rubyforge_project: paperclip
-rubygems_version: 1.8.11
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: File attachments as attributes for ActiveRecord

data/ChangeLog

@@ -1,74 +0,0 @@
-2012-02-10  Mike Burns <mburns@thoughtbot.com>
-
-	* lib/paperclip/version.rb, ChangeLog, NEWS: Bump to 2.6.0.
-
-2012-02-06  Kelley Reynolds <kelley@insidesystems.net>
-
-	* filesystem.rb (to_file), fog.rb (to_file), s3.rb (to_file): Rewind after
-	reading from the file.
-	* filesystem.rb (flush_writes): Replace mv and unlink complication with a
-	cp, since the unlink already happens elsewhere.
-
-2012-02-03  Luke Griffiths <wlgriffiths@gmail.com>
-
-	* lib/paperclip.rb (has_attached_file), lib/paperclip/attachment_options.rb,
-	attachment_options_test.rb, test/helper.rb, paperclip_test.rb:
-	Introduce Paperclip::AttachmentOptions, a hash-like object that knows about
-	Paperclip-specific options, defaults, and deprecations.
-
-2012-02-03  Jon Yurek <jyurek@thoughtbot.com>
-
-	* lib/paperclip/matchers/validate_attachment_content_type_matcher.rb
-	(matches?, type_allowed?),
-	lib/paperclip/matches/validate_attachment_presence_matcher.rb (matches?,
-	error_when_not_valid?, no_error_when_valid?),
-	lib/paperclip/matches/validate_attachment_size_matcher.rb (matches?,
-	passes_validation_with_size),
-	validate_attachment_content_type_matcher_test.rb,
-	validate_attachment_presence_matcher_test.rb,
-	validate_attachment_size_matcher_test.rb:
-	Validation matchers respect conditionals.
-
-2012-02-01  Justin Ko <justin@kospecinc.com>
-
-	* lib/paperclip/railtie.rb (insert): Guard against the Rails constant not
-	existing.
-
-2012-01-27  Prem Sichanugrist <psichanugrist@thoughtbot.com>
-
-	* lib/paperclip/attachment.rb (assign), attachment_test.rb,
-	filesystem_test.rb, s3_test.rb:
-	Introduce :restricted_characters in Paperclip::Attachment.default_options as
-	an overrideable blacklist of characters that will be replaced with an
-	underscore.
-
-	* lib/paperclip/version.rb: Bump to 2.5.2.
-
-2012-01-27  Prem Sichanugrist <s@sikachu.com>
-
-	* test/storage/s3_live_test.rb, test/storage/s3_test.rb:
-	Remove the questionmark filename test, for Windows compatibility.
-
-2012-01-19  Benjamin Hüttinger <huettinger@kupferwerk.com>
-
-	* lib/paperclip/storage/fog.rb: fog_host, fog_credentials, and fog_directory
-	can be Proc objects.
-
-2012-01-27  Mike Burns <mburns@thoughtbot.com>
-
-	* lib/paperclip/version.rb: Bump to 2.5.1.
-
-2012-01-20	Jon Yurek <jyurek@thoughtbot.com>
-
-	* lib/paperclip/railtie.rb (insert): Hide ActiveRecord-specific stuff in
-	the Railtie
-
-2012-01-18	Luke Griffiths <wlgriffiths@gmail.com>
-
-	* lib/paperclip/storage/s3.rb (self.extended),
-	test/storage/s3_live_test.rb, test/storage/s3_test.rb: Add S3 encryption
-
-2012-01-16	Jeremy McNevin <jeremy.mcnevin@thedolancompany.com> and ralph <ralph@rvdh.de>
-
-	* lib/paperclip/storage/fog.rb (flush_writes), fog_test.rb: Pass the
-	content type to Fog.