cloudfuji_paperclip 2.4.6 → 3.0.3

data/.gitignore

@@ -3,6 +3,7 @@
 .rvmrc
 .bundle
 tmp
+.DS_Store
 
 test/s3.yml
 test/debug.log
@@ -20,3 +21,4 @@ capybara*.html
 
 *SPIKE*
 *emfile.lock
+tags

data/.travis.yml

@@ -1,13 +1,16 @@
 rvm:
-  - 1.8.7
   - 1.9.2
-  - ree
-  - rbx-2.0
+  - 1.9.3
+  - jruby-19mode
 
 before_script: "sudo ntpdate -ub ntp.ubuntu.com pool.ntp.org; true"
 script: "bundle exec rake clean test cucumber"
 
 gemfile:
-  - gemfiles/rails2.gemfile
-  - gemfiles/rails3.gemfile
-  - gemfiles/rails3_1.gemfile
+  - gemfiles/3.0.gemfile
+  - gemfiles/3.1.gemfile
+  - gemfiles/3.2.gemfile
+
+matrix:
+  allow_failures:
+    - rvm: jruby-19mode

data/Appraisals

@@ -1,14 +1,14 @@
-appraise "rails2" do
-  gem "rails", "~> 2.3.14"
+appraise "3.0" do
+  gem "rails", "~> 3.0.12"
   gem "paperclip", :path => "../"
 end
 
-appraise "rails3" do
-  gem "rails", "~> 3.0.10"
+appraise "3.1" do
+  gem "rails", "~> 3.1.4"
   gem "paperclip", :path => "../"
 end
 
-appraise "rails3_1" do
-  gem "rails", "~> 3.1.0"
+appraise "3.2" do
+  gem "rails", "~> 3.2.2"
   gem "paperclip", :path => "../"
 end

data/CONTRIBUTING.md

@@ -1,3 +1,6 @@
+Contributing
+============
+
 We love pull requests. Here's a quick guide:
 
 1. Fork the repo.
@@ -13,7 +16,6 @@ a test!
 
 5. Push to your fork and submit a pull request.
 
-
 At this point you're waiting on us. We like to at least comment on, if not
 accept, pull requests within three business days (and, typically, one business
 day). We may suggest some changes or improvements or alternatives.
@@ -26,7 +28,37 @@ taken straight from the Ruby on Rails guide:
 * Update the documentation, the surrounding one, examples elsewhere, guides,
   whatever is affected by your contribution
 
-Syntax:
+Running Tests
+-------------
+
+Paperclip uses [Appraisal](https://github.com/thoughtbot/appraisal) to aid
+testing against multiple version of Ruby on Rails. This helps us to make sure
+that Paperclip performs correctly with them.
+
+### Bootstrapping your test suite:
+
+    bundle install
+    bundle exec rake appraisal:install
+
+This will install all the required gems that requires to test against each
+version of Rails, which defined in `gemfiles/*.gemfile`.
+
+### To run a full test suite:
+
+    bundle exec rake
+
+This will run Test::Unit and Cucumber against all version of Rails
+
+### To run single Test::Unit or Cucumber test
+
+You need to specify a `BUNDLE_GEMFILE` pointing to the gemfile before running
+the normal test command:
+
+    BUNDLE_GEMFILE=gemfiles/3.2.gemfile ruby -Itest test/schema_test.rb
+    BUNDLE_GEMFILE=gemfiles/3.2.gemfile cucumber features/basic_integration.feature
+
+Syntax
+------
 
 * Two spaces, no tabs.
 * No trailing whitespace. Blank lines should not have any space.

data/Gemfile

@@ -3,3 +3,5 @@ source "http://rubygems.org"
 gemspec
 
 gem "jruby-openssl", :platform => :jruby
+gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
+gem "sqlite3", :platform => :ruby

data/NEWS

@@ -0,0 +1,90 @@
+Unreleased:
+
+* Bug fix: AttachmentContentTypeValidator now allow you to specify :allow_blank/:allow_nil
+* Bug fix: Make sure content type always a String.
+* Bug fix: Fix attachment.reprocess! when using storage providers fog and s3.
+* Bug fix: Fix a problem with incorrect content_type detected with 'file' command for an empty file on Mac.
+
+New in 3.0.2:
+
+* API CHANGE: Generated migration class name is now plural (AddAttachmentToUsers instead of AddAttachmentToUser)
+* API CHANGE: Remove Rails plugin initialization code.
+* API CHANGE: Explicitly require Ruby 1.9.2 in the Gemfile.
+* Bug fix: Fixes AWS::S3::Errors::RequestTimeout on Model#save.
+* Bug fix: Fix a problem when there's no logger specified.
+* Bug fix: Fix a problem when attaching Rack::Test::UploadedFile instance.
+
+New in 3.0.1:
+
+* Feature: Introduce Paperlip IO adapter.
+* Bug fix: Regression in AttachmentContentTypeValidator has been fixed.
+
+New in 3.0.0:
+
+* API CHANGE: Paperclip now requires at least Ruby on Rails version 3.0.0
+* API CHANGE: The default :url and :path have changed. The new scheme avoids
+  filesystem conflicts and scales to handle larger numbers of uploads.
+
+  The easiest way to upgrade is to add an explicit :url and :path to your
+  has_attached_file calls:
+
+      has_attached_file :avatar,
+        :path => ":rails_root/public/system/:attachment/:id/:style/:filename",
+        :url => "/system/:attachment/:id/:style/:filename"
+
+* Feature: Adding Rails 3 style validators, and adding `validates_attachment` method as a shorthand.
+* Bug fix: Paperclip's rake tasks now loading records in batch.
+* Bug fix: Attachment style name with leading number now not raising an error.
+* Bug fix: File given to S3 and Fog storage will now be rewinded after flush_write.
+* Feature: You can now pass addional parameter to S3 expiring URL, such as :content_type.
+
+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.
+* 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.
+* Feature: S3 encryption with the new :s3_server_side_encryption option.
+* Feature: Works without ActiveRecord, allowing for e.g. mongo backends.
+
+New in 2.5.0:
+
+* Performance: Only connect to S3 when absolutely needed.
+* Bug fix: STI with cached classes respect new options.
+* Bug fix: conditional validations broke, and now work again.
+* Feature: URL generation is now parameterized and can be changed with plugins or custom code.
+* Feature: :convert_options and :source_file_options to control the ImageMagick processing.
+* Performance: String geometry specifications now parse more quickly.
+* Bug fix: Handle files with question marks in the filename.
+* Bug fix: Don't raise an error when generating an expiring URL on an unassigned attachment.
+* Bug fix: The rake task runs over all instances of an ActiveRecord model, ignoring default scopes.
+* Feature: DB migration has_attached_file and drop_attached_file methods.
+* Bug fix: Switch from AWS::S3 to AWS::SDK for the S3 backend.
+* Bug fix: URL generator uses '?' in the URL unless it already appears and there is no prior '='.
+* Bug fix: Always convert the content type to a string before stripping blanks.
+* Feature: The :keep_old_files option preserves the files in storage even when the attachment is cleared or changed.
+* Performance: Optimize Fog's public_url access by avoiding it when possible.
+* Bug fix: Avoid a runtime error when generating the ID partition for an unsaved attachment.
+* Performance: Do not calculate the fingerprint if it is never persisted.
+* Bug fix: Process the :original style before all others, in case of a dependency.
+* Feature: S3 headers can be set at runtime by passing a proc object as the value.
+* Bug fix: Generating missing attachment styles for a model which has had its attachment changed should not raise.
+* Bug fix: Do not collide with the built-in Ruby hashing method.

data/README.md

@@ -24,7 +24,15 @@ The complete [RDoc](http://rdoc.info/gems/paperclip) is online.
 Requirements
 ------------
 
-ImageMagick must be installed and Paperclip must have access to it. To ensure
+### Ruby and Rails
+
+Paperclip now requires Ruby version **>= 1.9.2** and Rails version **>= 3.0** (Only if you're going to use Paperclip with Ruby on Rails.)
+
+If you're still on Ruby 1.8.7 or Ruby on Rails 2.3.x, you can still use Paperclip 2.7.x with your project. Also, everything in this README might not apply to your version of Paperclip, and you should read [the README for version 2.7](http://rubydoc.info/gems/paperclip/2.7.0) instead.
+
+### Image Processor
+
+[ImageMagick](http://www.imagemagick.org) must be installed and Paperclip must have access to it. To ensure
 that it does, on your command line, run `which convert` (one of the ImageMagick
 utilities). This will give you the path where that utility is installed. For
 example, it might return `/usr/local/bin/convert`.
@@ -49,33 +57,25 @@ GhostScript to be installed. On Mac OS X, you can also install that using Homebr
 Installation
 ------------
 
-Paperclip is distributed as a gem, which is how it should be used in your app. It's
-technically still installable as a plugin, but that's discouraged, as Rails plays
-well with gems.
+Paperclip is distributed as a gem, which is how it should be used in your app.
 
 Include the gem in your Gemfile:
 
-    gem "paperclip", "~> 2.0"
+    gem "paperclip", "~> 3.0"
+
+If you're still using Rails 2.3.x, you should do this instead:
+
+    gem "paperclip", "~> 2.7"
 
 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
 on GitHub.
 
-Anyway, if you don't use Bundler (though you probably should, even in Rails 2), with config.gem
-
-    # In config/environment.rb
-    ...
-    Rails::Initializer.run do |config|
-      ...
-      config.gem "paperclip", :version => "~> 2.4"
-      ...
-    end
-    
 For Non-Rails usage:
 
     class ModuleName < ActiveRecord::Base
@@ -106,6 +106,8 @@ In your migrations:
       end
     end
 
+(Or you can use migration generator: `rails generate paperclip user avatar`)
+
 In your edit and new views:
 
     <%= form_for :user, @user, :url => user_path, :html => { :multipart => true } do |form| %>
@@ -151,12 +153,33 @@ validation.
 More information about the options to `has_attached_file` is available in the
 documentation of [`Paperclip::ClassMethods`](http://rubydoc.info/gems/paperclip/Paperclip/ClassMethods).
 
-For validations, attachments can be validated with these Paperclip's validation methods:
+For validations, Paperclip introduces several validators to validate your attachment:
+
+* `AttachmentContentTypeValidator`
+* `AttachmentPresenceValidator`
+* `AttachmentSizeValidator`
+
+Example Usage:
+
+    validates :avatar, :attachment_presence => true
+    validates_with AttachmentPresenceValidator, :attributes => :avatar
+
+Validators can also be defined using the old helper style:
 
 * `validates_attachment_presence`
 * `validates_attachment_content_type`
 * `validates_attachment_size`
 
+Example Usage:
+
+    validates_attachment_presence :avatar
+
+Lastly, you can also define multiple validations on a single attachment using `validates_attachment`:
+
+    validates_attachment :avatar, :presence => true,
+      :content_type => { :content_type => "image/jpg" },
+      :size => { :in => 0..10.kilobytes }
+
 Storage
 -------
 
@@ -176,9 +199,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).
 
@@ -199,9 +222,9 @@ thumbnail images. By defining a subclass of Paperclip::Processor, you can
 perform any processing you want on the files that are attached. Any file in
 your Rails app's lib/paperclip\_processors directory is automatically loaded by
 paperclip, allowing you to easily define custom processors. You can specify a
-processor with the :processors option to has\_attached\_file:
+processor with the :processors option to `has_attached_file`:
 
-    has_attached\_file :scan, :styles => { :text => { :quality => :better } },
+    has_attached_file :scan, :styles => { :text => { :quality => :better } },
                              :processors => [:ocr]
 
 This would load the hypothetical class Paperclip::Ocr, which would have the
@@ -217,7 +240,7 @@ geometry and a format, which the file will be converted to, like so:
 This will convert the "thumb" style to a 32x32 square in png format, regardless
 of what was uploaded. If the format is not specified, it is kept the same (i.e.
 jpgs will remain jpgs). For more information on the accepted style formats, see
-[http://www.imagemagick.org/script/command-line-processing.php#geometry](here).
+[here](http://www.imagemagick.org/script/command-line-processing.php#geometry).
 
 Multiple processors can be specified, and they will be invoked in the order
 they are defined in the :processors array. Each successive processor will
@@ -251,14 +274,24 @@ are called before and after the processing of each attachment), and the
 attachment-specific `before_<attachment>_post_process` and
 `after_<attachment>_post_process`. The callbacks are intended to be as close to
 normal ActiveRecord callbacks as possible, so if you return false (specifically
-\- returning nil is not the same) in a before\_ filter, the post processing step
-will halt. Returning false in an after\_ filter will not halt anything, but you
+\- returning nil is not the same) in a `before_filter`, the post processing step
+will halt. Returning false in an `after_filter` will not halt anything, but you
 can access the model and the attachment if necessary.
 
 _NOTE: Post processing will not even *start* if the attachment is not valid
 according to the validations. Your callbacks and processors will *only* be
 called with valid attachments._
 
+    class Message < ActiveRecord::Base
+      has_attached_file :asset, styles: {thumb: "100x100#"}
+
+      before_post_process :skip_for_audio
+
+      def skip_for_audio
+        ! %w(audio/ogg application/ogg).include?(asset_content_type)
+      end
+    end
+
 URI Obfuscation
 ---------------
 
@@ -418,13 +451,13 @@ If you'd like to contribute a feature or bugfix: Thanks! To make sure your
 fix/feature has a high chance of being included, please read the following
 guidelines:
 
-1. Ask on the mailing list[http://groups.google.com/group/paperclip-plugin], or
-   post a new GitHub Issue[http://github.com/thoughtbot/paperclip/issues].
+1. Ask on the [mailing list](http://groups.google.com/group/paperclip-plugin), or
+   post a new [GitHub Issue](http://github.com/thoughtbot/paperclip/issues).
 2. Make sure there are tests! We will not accept any patch that is not tested.
    It's a rare time when explicit tests aren't needed. If you have questions
    about writing tests for paperclip, please ask the mailing list.
 
-Please see CONTRIBUTING.md for details.
+Please see `CONTRIBUTING.md` for more details on contributing and running test.
 
 Credits
 -------
@@ -440,5 +473,5 @@ The names and logos for thoughtbot are trademarks of thoughtbot, inc.
 License
 -------
 
-Paperclip is Copyright © 2008-2011 thoughtbot. It is free software, and may be redistributed under the terms specified in the MIT-LICENSE file.
-
+Paperclip is Copyright © 2008-2011 thoughtbot. It is free software, and may be
+redistributed under the terms specified in the MIT-LICENSE file.

data/RUNNING_TESTS.md

@@ -0,0 +1,4 @@
+Running Tests
+=============
+
+Please see `CONTRIBUTING.md` in "Running Tests" section for more information.

data/Rakefile

@@ -4,11 +4,16 @@ require 'rake/testtask'
 require 'cucumber/rake/task'
 
 desc 'Default: run unit tests.'
-task :default => [:clean, 'appraisal:install', :all]
+task :default => [:clean, :all]
 
 desc 'Test the paperclip plugin under all supported Rails versions.'
 task :all do |t|
-  exec('rake appraisal test cucumber')
+  if ENV['BUNDLE_GEMFILE']
+    exec('rake test cucumber')
+  else
+    Rake::Task["appraisal:install"].execute
+    exec('rake appraisal test cucumber')
+  end
 end
 
 desc 'Test the paperclip plugin.'

data/UPGRADING

@@ -0,0 +1,14 @@
+##################################################
+#  NOTE FOR UPGRADING FROM PRE-3.0 VERSION       #
+##################################################
+
+Paperclip 3.0 introduces a non-backward compatible change in your attachment
+path. This will help to prevent attachment name clashes when you have
+multiple attachments with the same name. If you didn't alter your
+attachment's path and are using Paperclip's default, you'll have to add
+`:path` and `:url` to your `has_attached_file` definition. For example:
+
+    has_attached_file :avatar,
+      :path => ":rails_root/public/system/:attachment/:id/:style/:filename",
+      :url => "/system/:attachment/:id/:style/:filename"
+

data/features/basic_integration.feature

@@ -11,7 +11,9 @@ Feature: Rails integration
   Scenario: Filesystem integration test
     Given I add this snippet to the User model:
       """
-      has_attached_file :attachment
+      attr_accessible :name, :attachment
+      has_attached_file :attachment, :url => "/system/:attachment/:style/:filename",
+                                     :styles => { :square => "100x100#" }
       """
     And I start the rails application
     When I go to the new user page
@@ -19,16 +21,18 @@ Feature: Rails integration
     And I attach the file "test/fixtures/5k.png" to "Attachment"
     And I press "Submit"
     Then I should see "Name: something"
-    And I should see an image with a path of "/system/attachments/1/original/5k.png"
-    And the file at "/system/attachments/1/original/5k.png" should be the same as "test/fixtures/5k.png"
+    And I should see an image with a path of "/system/attachments/original/5k.png"
+    And the file at "/system/attachments/original/5k.png" should be the same as "test/fixtures/5k.png"
 
   Scenario: S3 Integration test
     Given I add this snippet to the User model:
       """
+      attr_accessible :name, :attachment
       has_attached_file :attachment,
                         :storage => :s3,
-                        :path => "/:attachment/:id/:style/:filename",
-                        :s3_credentials => Rails.root.join("config/s3.yml")
+                        :path => "/:attachment/:style/:filename",
+                        :s3_credentials => Rails.root.join("config/s3.yml"),
+                        :styles => { :square => "100x100#" }
       """
     And I write to "config/s3.yml" with:
       """
@@ -42,5 +46,5 @@ Feature: Rails integration
     And I attach the file "test/fixtures/5k.png" to "Attachment" on S3
     And I press "Submit"
     Then I should see "Name: something"
-    And I should see an image with a path of "http://s3.amazonaws.com/paperclip/attachments/1/original/5k.png"
-    And the file at "http://s3.amazonaws.com/paperclip/attachments/1/original/5k.png" should be uploaded to S3
+    And I should see an image with a path of "http://s3.amazonaws.com/paperclip/attachments/original/5k.png"
+    And the file at "http://s3.amazonaws.com/paperclip/attachments/original/5k.png" should be uploaded to S3