paperclip 2.5.2 → 2.6.0

data/.gitignore

@@ -20,3 +20,4 @@ capybara*.html
 
 *SPIKE*
 *emfile.lock
+tags

data/.travis.yml

@@ -3,6 +3,7 @@ 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"

data/ChangeLog

@@ -1,12 +1,62 @@
+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>
 
-* Introducing `:restricted_characters` in Paperclip::Attachment.default_options
-  so people can override their blacklist characters by override that setting.
+	* 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>
 
-* 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`
+	* lib/paperclip/version.rb: Bump to 2.5.1.
 
 2012-01-20	Jon Yurek <jyurek@thoughtbot.com>
 

data/NEWS

@@ -1,3 +1,15 @@
+New in 2.6.0:
+
+* Bug fix: Files are re-wound after reading.
+* Feature: Remove Rails dependency from specs that need Paperclip.
+* Feature: Validation matchers support conditionals.
+
+New in 2.5.2:
+
+* Bug fix: Can be installed on Windows.
+* Feature: The Fog bucket name, authentication, and host can be determined at runtime via Proc.
+* Feature: Special characters are replaced with underscores in #url and #path.
+
 New in 2.5.1:
 
 * Feature: After we've computed the content type, pass it to Fog.

data/lib/paperclip.rb

@@ -37,6 +37,7 @@ require 'paperclip/thumbnail'
 require 'paperclip/interpolations'
 require 'paperclip/style'
 require 'paperclip/attachment'
+require 'paperclip/attachment_options'
 require 'paperclip/storage'
 require 'paperclip/callback_compatibility'
 require 'paperclip/missing_attachment_styles'
@@ -325,7 +326,7 @@ module Paperclip
         self.attachment_definitions = self.attachment_definitions.dup
       end
 
-      attachment_definitions[name] = {:validations => []}.merge(options)
+      attachment_definitions[name] = Paperclip::AttachmentOptions.new(options)
       Paperclip.classes_with_attachments << self.name
       Paperclip.check_for_url_clash(name,attachment_definitions[name][:url],self.name)
 

data/lib/paperclip/attachment_options.rb

@@ -0,0 +1,10 @@
+module Paperclip
+  class AttachmentOptions < Hash
+    def initialize(options)
+      options = {:validations => []}.merge(options)
+      options.each do |k, v|
+        self.[]=(k, v)
+      end
+    end
+  end
+end

data/lib/paperclip/matchers/validate_attachment_content_type_matcher.rb

@@ -33,7 +33,7 @@ module Paperclip
 
         def matches? subject
           @subject = subject
-          @subject = @subject.class unless Class === @subject
+          @subject = @subject.new if @subject.class == Class
           @allowed_types && @rejected_types &&
           allowed_types_allowed? && rejected_types_rejected?
         end
@@ -63,9 +63,9 @@ module Paperclip
         def type_allowed?(type)
           file = StringIO.new(".")
           file.content_type = type
-          (subject = @subject.new).attachment_for(@attachment_name).assign(file)
-          subject.valid?
-          subject.errors[:"#{@attachment_name}_content_type"].blank?
+          @subject.attachment_for(@attachment_name).assign(file)
+          @subject.valid?
+          @subject.errors[:"#{@attachment_name}_content_type"].blank?
         end
 
         def allowed_types_allowed?

data/lib/paperclip/matchers/validate_attachment_presence_matcher.rb

@@ -18,7 +18,7 @@ module Paperclip
 
         def matches? subject
           @subject = subject
-          @subject = @subject.class unless Class === @subject
+          @subject = subject.new if subject.class == Class
           error_when_not_valid? && no_error_when_valid?
         end
 
@@ -37,16 +37,16 @@ module Paperclip
         protected
 
         def error_when_not_valid?
-          (subject = @subject.new).send(@attachment_name).assign(nil)
-          subject.valid?
-          not subject.errors[:"#{@attachment_name}_file_name"].blank?
+          @subject.send(@attachment_name).assign(nil)
+          @subject.valid?
+          not @subject.errors[:"#{@attachment_name}_file_name"].blank?
         end
 
         def no_error_when_valid?
           @file = StringIO.new(".")
-          (subject = @subject.new).send(@attachment_name).assign(@file)
-          subject.valid?
-          subject.errors[:"#{@attachment_name}_file_name"].blank?
+          @subject.send(@attachment_name).assign(@file)
+          @subject.valid?
+          @subject.errors[:"#{@attachment_name}_file_name"].blank?
         end
       end
     end

data/lib/paperclip/matchers/validate_attachment_size_matcher.rb

@@ -38,7 +38,7 @@ module Paperclip
 
         def matches? subject
           @subject = subject
-          @subject = @subject.class unless Class === @subject
+          @subject = @subject.new if @subject.class == Class
           lower_than_low? && higher_than_low? && lower_than_high? && higher_than_high?
         end
 
@@ -67,9 +67,9 @@ module Paperclip
           override_method(file, :size){ new_size }
           override_method(file, :to_tempfile){ file }
 
-          (subject = @subject.new).send(@attachment_name).assign(file)
-          subject.valid?
-          subject.errors[:"#{@attachment_name}_file_size"].blank?
+          @subject.send(@attachment_name).assign(file)
+          @subject.valid?
+          @subject.errors[:"#{@attachment_name}_file_size"].blank?
         end
 
         def lower_than_low?

data/lib/paperclip/railtie.rb

@@ -18,8 +18,8 @@ module Paperclip
 
   class Railtie
     def self.insert
-      Paperclip.options[:logger] = Rails.logger
-
+      Paperclip.options[:logger] = Rails.logger if defined?(Rails)
+      
       if defined?(ActiveRecord)
         ActiveRecord::Base.send(:include, Paperclip::Glue)
         Paperclip.options[:logger] = ActiveRecord::Base.logger

data/lib/paperclip/storage/filesystem.rb

@@ -30,7 +30,12 @@ module Paperclip
       # Returns representation of the data of the file assigned to the given
       # style, in the format most representative of the current storage.
       def to_file style_name = default_style
-        @queued_for_write[style_name] || (File.new(path(style_name), 'rb') if exists?(style_name))
+        if @queued_for_write[style_name]
+          @queued_for_write[style_name].rewind
+          @queued_for_write[style_name]
+        elsif exists?(style_name)
+          File.new(path(style_name), 'rb')
+        end
       end
 
       def flush_writes #:nodoc:
@@ -38,12 +43,7 @@ module Paperclip
           file.close
           FileUtils.mkdir_p(File.dirname(path(style_name)))
           log("saving #{path(style_name)}")
-          begin
-            FileUtils.mv(file.path, path(style_name))
-          rescue SystemCallError
-            FileUtils.cp(file.path, path(style_name))
-            FileUtils.rm(file.path)
-          end
+          FileUtils.cp(file.path, path(style_name))
           FileUtils.chmod(0666&~File.umask, path(style_name))
         end
 

data/lib/paperclip/storage/fog.rb

@@ -110,6 +110,7 @@ module Paperclip
       # style, in the format most representative of the current storage.
       def to_file(style = default_style)
         if @queued_for_write[style]
+          @queued_for_write[style].rewind
           @queued_for_write[style]
         else
           body      = directory.files.get(path(style)).body

data/lib/paperclip/storage/s3.rb

@@ -257,7 +257,10 @@ module Paperclip
       # Returns representation of the data of the file assigned to the given
       # style, in the format most representative of the current storage.
       def to_file style = default_style
-        return @queued_for_write[style] if @queued_for_write[style]
+        if @queued_for_write[style]
+          @queued_for_write[style].rewind
+          return @queued_for_write[style]
+        end
         filename = path(style)
         extname  = File.extname(filename)
         basename = File.basename(filename, extname)

data/lib/paperclip/version.rb

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

data/test/attachment_options_test.rb

@@ -0,0 +1,40 @@
+require './test/helper'
+
+class AttachmentOptionsTest < Test::Unit::TestCase
+  should "be a Hash" do
+    assert_kind_of Hash, Paperclip::AttachmentOptions.new({})
+  end
+
+  should "add a default empty validations" do
+    options = {:arbi => :trary}
+    expected = {:validations => []}.merge(options)
+    actual = Paperclip::AttachmentOptions.new(options).to_hash
+    assert_equal expected, actual
+  end
+
+  should "not override validations if passed to initializer" do
+    options = {:validations => "something"}
+    attachment_options = Paperclip::AttachmentOptions.new(options)
+    assert_equal "something", attachment_options[:validations]
+  end
+
+  should "respond to []" do
+    assert Paperclip::AttachmentOptions.new({}).respond_to?(:[])
+  end
+
+  should "deliver the specified options through []" do
+    intended_options = {:specific_key => "specific value"}
+    attachment_options = Paperclip::AttachmentOptions.new(intended_options)
+    assert_equal "specific value", attachment_options[:specific_key]
+  end
+
+  should "respond to []=" do
+    assert Paperclip::AttachmentOptions.new({}).respond_to?(:[]=)
+  end
+
+  should "remember options set with []=" do
+    attachment_options = Paperclip::AttachmentOptions.new({})
+    attachment_options[:foo] = "bar"
+    assert_equal "bar", attachment_options[:foo]
+  end
+end

data/test/helper.rb

@@ -54,10 +54,14 @@ ActiveRecord::Base.logger = ActiveSupport::BufferedLogger.new(File.dirname(__FIL
 ActiveRecord::Base.establish_connection(config['test'])
 Paperclip.options[:logger] = ActiveRecord::Base.logger
 
-Dir[File.join(File.dirname(__FILE__), 'support','*')].each do |f|
-  require f
+def require_everything_in_directory(directory_name)
+  Dir[File.join(File.dirname(__FILE__), directory_name, '*')].each do |f|
+    require f
+  end
 end
 
+require_everything_in_directory('support')
+
 def reset_class class_name
   ActiveRecord::Base.send(:include, Paperclip::Glue)
   Object.send(:remove_const, class_name) rescue nil

data/test/integration_test.rb

@@ -81,8 +81,6 @@ class IntegrationTest < Test::Unit::TestCase
         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!

data/test/matchers/validate_attachment_content_type_matcher_test.rb

@@ -83,5 +83,28 @@ class ValidateAttachmentContentTypeMatcherTest < Test::Unit::TestCase
 
       should_reject_dummy_class
     end
+
+    context "using an :if to control the validation" do
+      setup do
+        @dummy_class.class_eval do
+          validates_attachment_content_type :avatar, :content_type => %r{image/*} , :if => :go
+          attr_accessor :go
+        end
+        @matcher = self.class.validate_attachment_content_type(:avatar).
+                        allowing(%w(image/png image/jpeg)).
+                        rejecting(%w(audio/mp3 application/octet-stream))
+        @dummy = @dummy_class.new
+      end
+
+      should "run the validation if the control is true" do
+        @dummy.go = true
+        assert_accepts @matcher, @dummy
+      end
+
+      should "not run the validation if the control is false" do
+        @dummy.go = false
+        assert_rejects @matcher, @dummy
+      end
+    end
   end
 end

data/test/matchers/validate_attachment_presence_matcher_test.rb

@@ -22,5 +22,26 @@ class ValidateAttachmentPresenceMatcherTest < Test::Unit::TestCase
 
       should_accept_dummy_class
     end
+
+    context "using an :if to control the validation" do
+      setup do
+        @dummy_class.class_eval do
+          validates_attachment_presence :avatar, :if => :go
+          attr_accessor :go
+        end
+        @dummy = @dummy_class.new
+        @dummy.avatar = nil
+      end
+
+      should "run the validation if the control is true" do
+        @dummy.go = true
+        assert_accepts @matcher, @dummy
+      end
+
+      should "not run the validation if the control is false" do
+        @dummy.go = false
+        assert_rejects @matcher, @dummy
+      end
+    end
   end
 end

data/test/matchers/validate_attachment_size_matcher_test.rb

@@ -47,5 +47,26 @@ class ValidateAttachmentSizeMatcherTest < Test::Unit::TestCase
         should_accept_dummy_class
       end
     end
+
+    context "using an :if to control the validation" do
+      setup do
+        @dummy_class.class_eval do
+          validates_attachment_size :avatar, :greater_than => 1024, :if => :go
+          attr_accessor :go
+        end
+        @dummy = @dummy_class.new
+        @matcher = self.class.validate_attachment_size(:avatar).greater_than(1024)
+      end
+
+      should "run the validation if the control is true" do
+        @dummy.go = true
+        assert_accepts @matcher, @dummy
+      end
+
+      should "not run the validation if the control is false" do
+        @dummy.go = false
+        assert_rejects @matcher, @dummy
+      end
+    end
   end
 end

data/test/storage/filesystem_test.rb

@@ -31,6 +31,12 @@ class FileSystemTest < Test::Unit::TestCase
       @dummy.save!
     end
 
+    should "always be rewound when returning from #to_file" do
+      assert_equal 0, @dummy.avatar.to_file.pos
+      @dummy.avatar.to_file.seek(10)
+      assert_equal 0, @dummy.avatar.to_file.pos
+    end
+        
     context "with file that has space in file name" do
       setup do
         rebuild_model :styles => { :thumbnail => "25x25#" }

data/test/storage/fog_test.rb

@@ -110,6 +110,12 @@ class FogTest < Test::Unit::TestCase
         directory.destroy
       end
 
+      should "always be rewound when returning from #to_file" do
+        assert_equal 0, @dummy.avatar.to_file.pos
+        @dummy.avatar.to_file.seek(10)
+        assert_equal 0, @dummy.avatar.to_file.pos
+      end
+            
       should "pass the content type to the Fog::Storage::AWS::Files instance" do
         Fog::Storage::AWS::Files.any_instance.expects(:create).with do |hash|
           hash[:content_type]

data/test/storage/s3_test.rb

@@ -335,7 +335,13 @@ class S3Test < Test::Unit::TestCase
     should "return a relative URL for Rails to calculate assets host" do
       assert_match %r{^avatars/stringio\.txt}, @dummy.avatar.url
     end
-  end
+
+    should "always be rewound when returning from #to_file" do
+        assert_equal 0, @dummy.avatar.to_file.pos
+        @dummy.avatar.to_file.seek(10)
+        assert_equal 0, @dummy.avatar.to_file.pos
+      end
+    end
 
   context "Generating a secure url with an expiration" do
     setup do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: paperclip
 version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
   - 2
-  - 5
-  - 2
-  version: 2.5.2
+  - 6
+  - 0
+  version: 2.6.0
 platform: ruby
 authors: 
 - Jon Yurek
@@ -15,12 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-27 00:00:00 -05:00
-default_executable: 
+date: 2012-02-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activerecord
-  prerelease: false
+  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -32,11 +30,11 @@ dependencies:
         - 3
         - 0
         version: 2.3.0
-  type: :runtime
+  prerelease: false
+  name: activerecord
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: activesupport
-  prerelease: false
+  type: :runtime
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -48,11 +46,11 @@ dependencies:
         - 3
         - 2
         version: 2.3.2
-  type: :runtime
+  prerelease: false
+  name: activesupport
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: cocaine
-  prerelease: false
+  type: :runtime
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -64,11 +62,11 @@ dependencies:
         - 0
         - 2
         version: 0.0.2
-  type: :runtime
+  prerelease: false
+  name: cocaine
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: mime-types
-  prerelease: false
+  type: :runtime
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -78,11 +76,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  prerelease: false
+  name: mime-types
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: shoulda
-  prerelease: false
+  type: :development
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -92,11 +90,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  prerelease: false
+  name: shoulda
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: appraisal
-  prerelease: false
+  type: :development
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -108,11 +106,11 @@ dependencies:
         - 4
         - 0
         version: 0.4.0
-  type: :development
+  prerelease: false
+  name: appraisal
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: mocha
-  prerelease: false
+  type: :development
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -122,11 +120,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  prerelease: false
+  name: mocha
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: aws-sdk
-  prerelease: false
+  type: :development
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -136,11 +134,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  prerelease: false
+  name: aws-sdk
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: sqlite3
-  prerelease: false
+  type: :development
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -152,11 +150,11 @@ dependencies:
         - 3
         - 4
         version: 1.3.4
-  type: :development
+  prerelease: false
+  name: sqlite3
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: cucumber
-  prerelease: false
+  type: :development
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -168,11 +166,11 @@ dependencies:
         - 1
         - 0
         version: 1.1.0
-  type: :development
+  prerelease: false
+  name: cucumber
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: aruba
-  prerelease: false
+  type: :development
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -182,11 +180,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  prerelease: false
+  name: aruba
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  name: capybara
-  prerelease: false
+  type: :development
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -196,11 +194,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  prerelease: false
+  name: capybara
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
-  name: bundler
-  prerelease: false
+  type: :development
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -210,11 +208,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  prerelease: false
+  name: bundler
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
-  name: cocaine
-  prerelease: false
+  type: :development
   requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -225,11 +223,11 @@ dependencies:
         - 0
         - 2
         version: "0.2"
-  type: :development
+  prerelease: false
+  name: cocaine
   version_requirements: *id014
 - !ruby/object:Gem::Dependency 
-  name: fog
-  prerelease: false
+  type: :development
   requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -239,11 +237,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  prerelease: false
+  name: fog
   version_requirements: *id015
 - !ruby/object:Gem::Dependency 
-  name: rake
-  prerelease: false
+  type: :development
   requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -253,11 +251,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  prerelease: false
+  name: rake
   version_requirements: *id016
 - !ruby/object:Gem::Dependency 
-  name: fakeweb
-  prerelease: false
+  type: :development
   requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -267,7 +265,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  prerelease: false
+  name: fakeweb
   version_requirements: *id017
 description: Easy upload management for ActiveRecord
 email: 
@@ -319,6 +318,7 @@ files:
 - lib/generators/paperclip/templates/paperclip_migration.rb.erb
 - lib/paperclip.rb
 - lib/paperclip/attachment.rb
+- lib/paperclip/attachment_options.rb
 - lib/paperclip/callback_compatibility.rb
 - lib/paperclip/geometry.rb
 - lib/paperclip/interpolations.rb
@@ -345,6 +345,7 @@ files:
 - paperclip.gemspec
 - rails/init.rb
 - shoulda_macros/paperclip.rb
+- test/attachment_options_test.rb
 - test/attachment_test.rb
 - test/database.yml
 - test/fixtures/12k.png
@@ -383,7 +384,6 @@ files:
 - test/thumbnail_test.rb
 - test/upfile_test.rb
 - test/url_generator_test.rb
-has_rdoc: true
 homepage: https://github.com/thoughtbot/paperclip
 licenses: []
 
@@ -413,62 +413,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - ImageMagick
 rubyforge_project: paperclip
-rubygems_version: 1.3.7
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: File attachments as attributes for ActiveRecord
-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
+test_files: []
+