paperclip 4.2.2 → 5.0.0

data/README.md

@@ -1,9 +1,67 @@
 Paperclip
 =========
 
-[![Build Status](https://secure.travis-ci.org/thoughtbot/paperclip.png?branch=master)](http://travis-ci.org/thoughtbot/paperclip) [![Dependency Status](https://gemnasium.com/thoughtbot/paperclip.png?travis)](https://gemnasium.com/thoughtbot/paperclip) [![Code Climate](https://codeclimate.com/github/thoughtbot/paperclip.png)](https://codeclimate.com/github/thoughtbot/paperclip) [![Inline docs](http://inch-ci.org/github/thoughtbot/paperclip.png)](http://inch-ci.org/github/thoughtbot/paperclip) [![Security](https://hakiri.io/github/thoughtbot/paperclip/master.svg)](https://hakiri.io/github/thoughtbot/paperclip/master)
+## Documentation valid for `master` branch
 
-Paperclip is intended as an easy file attachment library for Active Record. The
+Please check the documentation for the paperclip version you are using:
+https://github.com/thoughtbot/paperclip/releases
+
+---
+
+[![Build Status](https://secure.travis-ci.org/thoughtbot/paperclip.svg?branch=master)](http://travis-ci.org/thoughtbot/paperclip)
+[![Dependency Status](https://gemnasium.com/thoughtbot/paperclip.svg?travis)](https://gemnasium.com/thoughtbot/paperclip)
+[![Code Climate](https://codeclimate.com/github/thoughtbot/paperclip.svg)](https://codeclimate.com/github/thoughtbot/paperclip)
+[![Inline docs](http://inch-ci.org/github/thoughtbot/paperclip.svg)](http://inch-ci.org/github/thoughtbot/paperclip)
+[![Security](https://hakiri.io/github/thoughtbot/paperclip/master.svg)](https://hakiri.io/github/thoughtbot/paperclip/master)
+
+<!-- START doctoc generated TOC please keep comment here to allow auto update -->
+<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
+
+
+- [Requirements](#requirements)
+  - [Ruby and Rails](#ruby-and-rails)
+  - [Image Processor](#image-processor)
+  - [`file`](#file)
+- [Installation](#installation)
+- [Quick Start](#quick-start)
+  - [Models](#models)
+  - [Migrations](#migrations)
+  - [Edit and New Views](#edit-and-new-views)
+  - [Edit and New Views with Simple Form](#edit-and-new-views-with-simple-form)
+  - [Controller](#controller)
+  - [View Helpers](#view-helpers)
+  - [Deleting an Attachment](#deleting-an-attachment)
+- [Usage](#usage)
+- [Validations](#validations)
+- [Internationalization (I18n)](#internationalization-i18n)
+- [Security Validations](#security-validations)
+- [Defaults](#defaults)
+- [Migrations](#migrations-1)
+  - [Add Attachment Column To A Table](#add-attachment-column-to-a-table)
+  - [Schema Definition](#schema-definition)
+  - [Vintage syntax](#vintage-syntax)
+- [Storage](#storage)
+  - [Understanding Storage](#understanding-storage)
+- [Post Processing](#post-processing)
+- [Events](#events)
+- [URI Obfuscation](#uri-obfuscation)
+- [MD5 Checksum / Fingerprint](#md5-checksum--fingerprint)
+- [File Preservation for Soft-Delete](#file-preservation-for-soft-delete)
+- [Custom Attachment Processors](#custom-attachment-processors)
+- [Dynamic Configuration](#dynamic-configuration)
+  - [Dynamic Styles:](#dynamic-styles)
+  - [Dynamic Processors:](#dynamic-processors)
+- [Logging](#logging)
+- [Deployment](#deployment)
+  - [Attachment Styles](#attachment-styles)
+- [Testing](#testing)
+- [Contributing](#contributing)
+- [License](#license)
+- [About thoughtbot](#about-thoughtbot)
+
+<!-- END doctoc generated TOC please keep comment here to allow auto update -->
+
+Paperclip is intended as an easy file attachment library for ActiveRecord. The
 intent behind it was to keep setup as easy as possible and to treat files as
 much like other attributes as possible. This means they aren't saved to their
 final locations on disk, nor are they deleted if set to nil, until
@@ -15,10 +73,10 @@ packages). Attached files are saved to the filesystem and referenced in the
 browser by an easily understandable specification, which has sensible and
 useful defaults.
 
-See the documentation for `has_attached_file` in [`Paperclip::ClassMethods`](http://rubydoc.info/gems/paperclip/Paperclip/ClassMethods) for
+See the documentation for `has_attached_file` in [`Paperclip::ClassMethods`](http://www.rubydoc.info/gems/paperclip/Paperclip/ClassMethods) for
 more detailed options.
 
-The complete [RDoc](http://rdoc.info/gems/paperclip) is online.
+The complete [RDoc](http://www.rubydoc.info/gems/paperclip) is online.
 
 ---
 
@@ -27,9 +85,8 @@ Requirements
 
 ### 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.
+Paperclip now requires Ruby version **>= 2.1** and Rails version **>= 4.2**
+(only if you're going to use Paperclip with Ruby on Rails.)
 
 ### Image Processor
 
@@ -47,20 +104,25 @@ In development mode, you might add this line to `config/environments/development
 Paperclip.options[:command_path] = "/usr/local/bin/"
 ```
 
-If you're on Mac OS X, you'll want to run the following with Homebrew:
+If you're on Mac OS X, you'll want to run the following with [Homebrew] (http://www.brew.sh):
 
     brew install imagemagick
 
 If you are dealing with pdf uploads or running the test suite, you'll also need
-GhostScript to be installed. On Mac OS X, you can also install that using Homebrew:
+to install GhostScript. On Mac OS X, you can also install that using Homebrew:
 
     brew install gs
 
+If you are on Ubuntu (or any Debian base Linux distribution), you'll want to run
+the following with apt-get:
+
+    sudo apt-get install imagemagick -y
+
 ### `file`
 
-The Unix [`file` command](http://en.wikipedia.org/wiki/File_(command)) is required for content type checking.
-This utility isn't available in Windows, but comes bundled with Ruby [Devkit](https://github.com/oneclick/rubyinstaller/wiki/Development-Kit), 
-so Windows users must make sure that the devkit is installed and added to system `PATH`.
+The Unix [`file` command](https://en.wikipedia.org/wiki/File_(command)) is required for content-type checking.
+This utility isn't available in Windows, but comes bundled with Ruby [Devkit](https://github.com/oneclick/rubyinstaller/wiki/Development-Kit),
+so Windows users must make sure that the devkit is installed and added to the system `PATH`.
 
 **Manual Installation**
 
@@ -70,21 +132,21 @@ To manually install, you should perform the following:
 
 > **Download & install `file` from [this URL](http://gnuwin32.sourceforge.net/packages/file.htm)**
 
-To test, you can use the following:
+To test, you can use the image below:
 ![untitled](https://cloud.githubusercontent.com/assets/1104431/4524452/a1f8cce4-4d44-11e4-872e-17adb96f79c9.png)
 
-Next, you need to integrate with your environment - preferrably through the `PATH` variable, or by changing your `config/environments/development.rb` file
+Next, you need to integrate with your environment - preferably through the `PATH` variable, or by changing your `config/environments/development.rb` file
 
 **PATH**
 
     1. Click "Start"
     2. On "Computer", right-click and select "Properties"
-    3. In properties, select "Advanced System Settings"
+    3. In Properties, select "Advanced System Settings"
     4. Click the "Environment Variables" button
     5. Locate the "PATH" var - at the end, add the path to your newly installed `file.exe` (typically `C:\Program Files (x86)\GnuWin32\bin`)
     6. Restart any CMD shells you have open & see if it works
 
-OR 
+OR
 
 **Environment**
 
@@ -92,7 +154,7 @@ OR
     2. Add the following line: `Paperclip.options[:command_path] = 'C:\Program Files (x86)\GnuWin32\bin'`
     3. Restart your Rails server
 
-Either of these methods will give your Rails setup access to the `file.exe` functionality, this providing the ability to check the contents of a file (fixing the spoofing problem)
+Either of these methods will give your Rails setup access to the `file.exe` functionality, thus providing the ability to check the contents of a file (fixing the spoofing problem)
 
 ---
 
@@ -104,24 +166,18 @@ Paperclip is distributed as a gem, which is how it should be used in your app.
 Include the gem in your Gemfile:
 
 ```ruby
-gem "paperclip", "~> 4.2"
-```
-
-If you're still using Rails 2.3.x, you should do this instead:
-
-```ruby
-gem "paperclip", "~> 2.7"
+gem "paperclip", "~> 5.0.0"
 ```
 
 Or, if you want to get the latest, you can get master from the main paperclip repository:
 
 ```ruby
-gem "paperclip", :git => "git://github.com/thoughtbot/paperclip.git"
+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
+use them. This README is probably ahead of the latest released version if you're reading it
 on GitHub.
 
 For Non-Rails usage:
@@ -140,22 +196,10 @@ Quick Start
 
 ### Models
 
-**Rails 3**
-
-```ruby
-class User < ActiveRecord::Base
-  attr_accessible :avatar
-  has_attached_file :avatar, :styles => { :medium => "300x300>", :thumb => "100x100>" }, :default_url => "/images/:style/missing.png"
-  validates_attachment_content_type :avatar, :content_type => /\Aimage\/.*\Z/
-end
-```
-
-**Rails 4**
-
 ```ruby
 class User < ActiveRecord::Base
-  has_attached_file :avatar, :styles => { :medium => "300x300>", :thumb => "100x100>" }, :default_url => "/images/:style/missing.png"
-  validates_attachment_content_type :avatar, :content_type => /\Aimage\/.*\Z/
+  has_attached_file :avatar, styles: { medium: "300x300>", thumb: "100x100>" }, default_url: "/images/:style/missing.png"
+  validates_attachment_content_type :avatar, content_type: /\Aimage\/.*\Z/
 end
 ```
 
@@ -163,37 +207,35 @@ end
 
 ```ruby
 class AddAvatarColumnsToUsers < ActiveRecord::Migration
-  def self.up
+  def up
     add_attachment :users, :avatar
   end
 
-  def self.down
+  def down
     remove_attachment :users, :avatar
   end
 end
 ```
 
-(Or you can use migration generator: `rails generate paperclip user avatar`)
+(Or you can use the Rails migration generator: `rails generate paperclip user avatar`)
 
 ### Edit and New Views
 
 ```erb
-<%= form_for @user, :url => users_path, :html => { :multipart => true } do |form| %>
+<%= form_for @user, url: users_path, html: { multipart: true } do |form| %>
   <%= form.file_field :avatar %>
 <% end %>
 ```
 
-### Controller
-
-**Rails 3**
+### Edit and New Views with [Simple Form](https://github.com/plataformatec/simple_form)
 
-```ruby
-def create
-  @user = User.create( params[:user] )
-end
+```erb
+<%= simple_form_for @user, url: users_path do |form| %>
+  <%= form.input :avatar, as: :file %>
+<% end %>
 ```
 
-**Rails 4**
+### Controller
 
 ```ruby
 def create
@@ -210,7 +252,7 @@ def user_params
 end
 ```
 
-### Show View
+### View Helpers
 
 ```erb
 <%= image_tag @user.avatar.url %>
@@ -231,7 +273,7 @@ Set the attribute to `nil` and save.
 Usage
 -----
 
-The basics of paperclip are quite simple: Declare that your model has an
+The basics of Paperclip are quite simple: Declare that your model has an
 attachment with the `has_attached_file` method, and give it a name.
 
 Paperclip will wrap up to four attributes (all prefixed with that attachment's name,
@@ -243,12 +285,12 @@ friendly front end. These attributes are:
 * `<attachment>_content_type`
 * `<attachment>_updated_at`
 
-By default, only `<attachment>_file_name` is required for paperclip to operate.
+By default, only `<attachment>_file_name` is required for Paperclip to operate.
 You'll need to add `<attachment>_content_type` in case you want to use content type
 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).
+More information about the options passed to `has_attached_file` is available in the
+documentation of [`Paperclip::ClassMethods`](http://www.rubydoc.info/gems/paperclip/Paperclip/ClassMethods).
 
 Validations
 -----------
@@ -262,9 +304,9 @@ For validations, Paperclip introduces several validators to validate your attach
 Example Usage:
 
 ```ruby
-validates :avatar, :attachment_presence => true
-validates_with AttachmentPresenceValidator, :attributes => :avatar
-validates_with AttachmentSizeValidator, :attributes => :avatar, :less_than => 1.megabytes
+validates :avatar, attachment_presence: true
+validates_with AttachmentPresenceValidator, attributes: :avatar
+validates_with AttachmentSizeValidator, attributes: :avatar, less_than: 1.megabytes
 
 ```
 
@@ -283,13 +325,13 @@ validates_attachment_presence :avatar
 Lastly, you can also define multiple validations on a single attachment using `validates_attachment`:
 
 ```ruby
-validates_attachment :avatar, :presence => true,
-  :content_type => { :content_type => "image/jpeg" },
-  :size => { :in => 0..10.kilobytes }
+validates_attachment :avatar, presence: true,
+  content_type: { content_type: "image/jpeg" },
+  size: { in: 0..10.kilobytes }
 ```
 
-_NOTE: Post processing will not even *start* if the attachment is not valid
-according to the validations. Your callbacks and processors will *only* be
+_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._
 
 ```ruby
@@ -343,7 +385,7 @@ image-y ones:
 
 ```ruby
 validates_attachment :avatar,
-  :content_type => { :content_type => ["image/jpeg", "image/gif", "image/png"] }
+  content_type: { content_type: ["image/jpeg", "image/gif", "image/png"] }
 ```
 
 `Paperclip::ContentTypeDetector` will attempt to match a file's extension to an
@@ -351,6 +393,12 @@ inferred content_type, regardless of the actual contents of the file.
 
 ---
 
+Internationalization (I18n)
+---------------------------
+
+For using or adding locale files in different languages, check the project
+https://github.com/thoughtbot/paperclip-i18n.
+
 Security Validations
 ====================
 
@@ -367,9 +415,9 @@ do this.
 class ActiveRecord::Base
   has_attached_file :avatar
   # Validate content type
-  validates_attachment_content_type :avatar, :content_type => /\Aimage/
+  validates_attachment_content_type :avatar, content_type: /\Aimage/
   # Validate filename
-  validates_attachment_file_name :avatar, :matches => [/png\Z/, /jpe?g\Z/]
+  validates_attachment_file_name :avatar, matches: [/png\Z/, /jpe?g\Z/]
   # Explicitly do not validate
   do_not_validate_attachment_file_type :avatar
 end
@@ -382,48 +430,47 @@ NOTE: Also starting at version 4.0.0, Paperclip has another validation that
 cannot be turned off. This validation will prevent content type spoofing. That
 is, uploading a PHP document (for example) as part of the EXIF tags of a
 well-formed JPEG. This check is limited to the media type (the first part of the
-MIME type, so, 'text' in 'text/plain'). This will prevent HTML documents from
+MIME type, so, 'text' in `text/plain`). This will prevent HTML documents from
 being uploaded as JPEGs, but will not prevent GIFs from being uploaded with a
-.jpg extension. This validation will only add validation errors to the form. It
-will not cause Errors to be raised.
+`.jpg` extension. This validation will only add validation errors to the form. It
+will not cause errors to be raised.
 
-This can sometimes cause false validation errors in applications that use custom 
+This can sometimes cause false validation errors in applications that use custom
 file extensions. In these cases you may wish to add your custom extension to the
-list of file extensions allowed for your mime type configured by the mime-types 
-gem:
+list of content type mappings by creating `config/initializers/paperclip.rb`:
 
 ```ruby
-# Allow ".foo" as an extension for files with the mime type "text/plain".
-text_plain = MIME::Types["text/plain"].first
-text_plain.extensions << "foo"
-MIME::Types.index_extensions text_plain
+# Allow ".foo" as an extension for files with the MIME type "text/plain".
+Paperclip.options[:content_type_mappings] = {
+  foo: %w(text/plain)
+}
 ```
 
 ---
 
 Defaults
 --------
-Global defaults for all your paperclip attachments can be defined by changing the Paperclip::Attachment.default_options Hash, this can be useful for setting your default storage settings per example so you won't have to define them in every has_attached_file definition.
+Global defaults for all your Paperclip attachments can be defined by changing the Paperclip::Attachment.default_options Hash. This can be useful for setting your default storage settings per example so you won't have to define them in every `has_attached_file` definition.
 
-If you're using Rails you can define a Hash with default options in config/application.rb or in any of the config/environments/*.rb files on config.paperclip_defaults, these will get merged into Paperclip::Attachment.default_options as your Rails app boots. An example:
+If you're using Rails, you can define a Hash with default options in `config/application.rb` or in any of the `config/environments/*.rb` files on config.paperclip_defaults. These will get merged into `Paperclip::Attachment.default_options` as your Rails app boots. An example:
 
 ```ruby
 module YourApp
   class Application < Rails::Application
     # Other code...
 
-    config.paperclip_defaults = {:storage => :fog, :fog_credentials => {:provider => "Local", :local_root => "#{Rails.root}/public"}, :fog_directory => "", :fog_host => "localhost"}
+    config.paperclip_defaults = { storage: :fog, fog_credentials: { provider: "Local", local_root: "#{Rails.root}/public"}, fog_directory: "", fog_host: "localhost"}
   end
 end
 ```
 
-Another option is to directly modify the Paperclip::Attachment.default_options Hash, this method works for non-Rails applications or is an option if you prefer to place the Paperclip default settings in an initializer.
+Another option is to directly modify the `Paperclip::Attachment.default_options` Hash - this method works for non-Rails applications or is an option if you prefer to place the Paperclip default settings in an initializer.
 
 An example Rails initializer would look something like this:
 
 ```ruby
 Paperclip::Attachment.default_options[:storage] = :fog
-Paperclip::Attachment.default_options[:fog_credentials] = {:provider => "Local", :local_root => "#{Rails.root}/public"}
+Paperclip::Attachment.default_options[:fog_credentials] = { provider: "Local", local_root: "#{Rails.root}/public"}
 Paperclip::Attachment.default_options[:fog_directory] = ""
 Paperclip::Attachment.default_options[:fog_host] = "http://localhost:3000"
 ```
@@ -432,25 +479,32 @@ Paperclip::Attachment.default_options[:fog_host] = "http://localhost:3000"
 Migrations
 ----------
 
-Paperclip defines several migration methods which can be used to create necessary columns in your
-model. There are two types of method:
+Paperclip defines several migration methods which can be used to create the necessary columns in your
+model. There are two types of helper methods to aid in this, as follows:
 
-### Table Definition
+### Add Attachment Column To A Table
+
+The `attachment` helper can be used when creating a table:
 
 ```ruby
-class AddAttachmentToUsers < ActiveRecord::Migration
-  def self.up
+class CreateUsersWithAttachments < ActiveRecord::Migration
+  def up
     create_table :users do |t|
       t.attachment :avatar
     end
   end
+
+  # This is assuming you are only using the users table for Paperclip attachment. Drop with care!
+  def down
+    drop_table :users
+  end
 end
 ```
 
-If you're using Rails 3.2 or newer, this method works in `change` method as well:
+You can also use the `change` method, instead of the `up`/`down` combination above, as shown below:
 
 ```ruby
-class AddAttachmentToUsers < ActiveRecord::Migration
+class CreateUsersWithAttachments < ActiveRecord::Migration
   def change
     create_table :users do |t|
       t.attachment :avatar
@@ -461,22 +515,24 @@ end
 
 ### Schema Definition
 
+Alternatively, the `add_attachment` and `remove_attachment` methods can be used to add new Paperclip columns to an existing table:
+
 ```ruby
-class AddAttachmentToUsers < ActiveRecord::Migration
-  def self.up
+class AddAttachmentColumnsToUsers < ActiveRecord::Migration
+  def up
     add_attachment :users, :avatar
   end
 
-  def self.down
+  def down
     remove_attachment :users, :avatar
   end
 end
 ```
 
-If you're using Rails 3.2 or newer, you only need `add_attachment` in your `change` method:
+Or you can do this with the `change` method:
 
 ```ruby
-class AddAttachmentToUsers < ActiveRecord::Migration
+class AddAttachmentColumnsToUsers < ActiveRecord::Migration
   def change
     add_attachment :users, :avatar
   end
@@ -485,7 +541,7 @@ end
 
 ### Vintage syntax
 
-Vintage syntax (such as `t.has_attached_file` and `drop_attached_file`) are still supported in
+Vintage syntax (such as `t.has_attached_file` and `drop_attached_file`) is still supported in
 Paperclip 3.x, but you're advised to update those migration files to use this new syntax.
 
 ---
@@ -510,9 +566,9 @@ gems along side with Paperclip:
 The files that are assigned as attachments are, by default, placed in the
 directory specified by the `:path` option to `has_attached_file`. By default, this
 location is `:rails_root/public/system/:class/:attachment/:id_partition/:style/:filename`.
-This location was chosen because on standard Capistrano deployments, the
-`public/system` directory is symlinked to the app's shared directory, meaning it
-will survive between deployments. For example, using that `:path`, you may have a
+This location was chosen because, on standard Capistrano deployments, the
+`public/system` directory can be symlinked to the app's shared directory, meaning it
+survives between deployments. For example, using that `:path`, you may have a
 file at
 
     /data/myapp/releases/20081229172410/public/system/users/avatar/000/000/013/small/my_pic.png
@@ -524,12 +580,12 @@ You may also choose to store your files using Amazon's S3 service. To do so, inc
 the `aws-sdk` gem in your Gemfile:
 
 ```ruby
-gem 'aws-sdk', '~> 1.5.7'
+gem 'aws-sdk', '>= 2.0.34'
 ```
 
 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).
+[the `Paperclip::Storage::S3` documentation](http://www.rubydoc.info/gems/paperclip/Paperclip/Storage/S3).
 
 Files on the local filesystem (and in the Rails app's public directory) will be
 available to the internet at large. If you require access control, it's
@@ -545,49 +601,50 @@ Post Processing
 
 Paperclip supports an extensible selection of post-processors. When you define
 a set of styles for an attachment, by default it is expected that those
-"styles" are actually "thumbnails". However, you can do much more than just
+"styles" are actually "thumbnails." However, you can do much more than just
 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` and `lib/paperclip_processors` directories is
-automatically loaded by paperclip, allowing you to easily define custom
-processors. You can specify a processor with the :processors option to
+automatically loaded by Paperclip, allowing you to easily define custom
+processors. You can specify a processor with the `:processors` option to
 `has_attached_file`:
 
 ```ruby
-has_attached_file :scan, :styles => { :text => { :quality => :better } },
-                         :processors => [:ocr]
+has_attached_file :scan, styles: { text: { quality: :better } },
+                         processors: [:ocr]
 ```
 
 This would load the hypothetical class Paperclip::Ocr, which would have the
-hash "{ :quality => :better }" passed to it along with the uploaded file. For
-more information about defining processors, see Paperclip::Processor.
+hash "{ quality: :better }" passed to it along with the uploaded file. For
+more information about defining processors, see
+[Paperclip::Processor](https://github.com/thoughtbot/paperclip/blob/master/lib/paperclip/processor.rb).
 
-The default processor is Paperclip::Thumbnail. For backwards compatibility
+The default processor is Paperclip::Thumbnail. For backward compatibility
 reasons, you can pass a single geometry string or an array containing a
-geometry and a format, which the file will be converted to, like so:
+geometry and a format that the file will be converted to, like so:
 
 ```ruby
-has_attached_file :avatar, :styles => { :thumb => ["32x32#", :png] }
+has_attached_file :avatar, styles: { thumb: ["32x32#", :png] }
 ```
 
-This will convert the "thumb" style to a 32x32 square in png format, regardless
+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
+JPGs will remain JPGs). For more information on the accepted style formats, see
 [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
+they are defined in the `:processors` array. Each successive processor will
 be given the result of the previous processor's execution. All processors will
-receive the same parameters, which are what you define in the :styles hash.
+receive the same parameters, which are defined in the `:styles` hash.
 For example, assuming we had this definition:
 
 ```ruby
-has_attached_file :scan, :styles => { :text => { :quality => :better } },
-                         :processors => [:rotator, :ocr]
+has_attached_file :scan, styles: { text: { quality: :better } },
+                         processors: [:rotator, :ocr]
 ```
 
 then both the :rotator processor and the :ocr processor would receive the
-options "{ :quality => :better }". This parameter may not mean anything to one
+options `{ quality: :better }`. This parameter may not mean anything to one
 or more or the processors, and they are expected to ignore it.
 
 _NOTE: Because processors operate by turning the original attachment into the
@@ -615,8 +672,8 @@ normal ActiveRecord callbacks as possible, so if you return false (specifically
 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
+_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._
 
 ```ruby
@@ -643,8 +700,8 @@ Example Usage:
 
 ```ruby
 has_attached_file :avatar, {
-    :url => "/system/:hash.:extension",
-    :hash_secret => "longSecretString"
+    url: "/system/:hash.:extension",
+    hash_secret: "longSecretString"
 }
 ```
 
@@ -652,24 +709,24 @@ has_attached_file :avatar, {
 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.
+`: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)
+For more on this feature, read [the author's own explanation](https://github.com/thoughtbot/paperclip/pull/416)
 
 MD5 Checksum / Fingerprint
 -------
 
-A MD5 checksum of the original file assigned will be placed in the model if it
+An MD5 checksum of the original file assigned will be placed in the model if it
 has an attribute named fingerprint.  Following the user model migration example
-above, the migration would look like the following.
+above, the migration would look like the following:
 
 ```ruby
 class AddAvatarFingerprintColumnToUser < ActiveRecord::Migration
-  def self.up
+  def up
     add_column :users, :avatar_fingerprint, :string
   end
 
-  def self.down
+  def down
     remove_column :users, :avatar_fingerprint
   end
 end
@@ -682,7 +739,7 @@ An option is available to preserve attachments in order to play nicely with soft
 
 ```ruby
 has_attached_file :some_attachment, {
-    :preserve_files => "true",
+    preserve_files: "true",
 }
 ```
 
@@ -698,11 +755,11 @@ to inherit from `Paperclip::Processor` (see `lib/paperclip/processor.rb`).
 For example, when `:styles` are specified for an image attachment, the
 thumbnail processor (see `lib/paperclip/thumbnail.rb`) is loaded without having
 to specify it as a `:processor` parameter to `has_attached_file`.  When any
-other processor is defined it must be called out in the `:processors`
+other processor is defined, it must be called out in the `:processors`
 parameter if it is to be applied to the attachment.  The thumbnail processor
-uses the imagemagick `convert` command to do the work of resizing image
+uses the ImageMagick `convert` command to do the work of resizing image
 thumbnails.  It would be easy to create a custom processor that watermarks
-an image using imagemagick's `composite` command.  Following the
+an image using ImageMagick's `composite` command.  Following the
 implementation pattern of the thumbnail processor would be a way to implement a
 watermark processor.  All kinds of attachment processors can be created;
 a few utility examples would be compression and encryption processors.
@@ -722,7 +779,7 @@ instances.
 ### Dynamic Styles:
 
 Imagine a user model that had different styles based on the role of the user.
-Perhaps some users are bosses (e.g. a User model instance responds to #boss?)
+Perhaps some users are bosses (e.g. a User model instance responds to `#boss?`)
 and merit a bigger avatar thumbnail than regular users. The configuration to
 determine what style parameters are to be used based on the user role might
 look as follows where a boss will receive a `300x300` thumbnail otherwise a
@@ -730,7 +787,7 @@ look as follows where a boss will receive a `300x300` thumbnail otherwise a
 
 ```ruby
 class User < ActiveRecord::Base
-  has_attached_file :avatar, :styles => lambda { |attachment| { :thumb => (attachment.instance.boss? ? "300x300>" : "100x100>") } }
+  has_attached_file :avatar, styles: lambda { |attachment| { thumb: (attachment.instance.boss? ? "300x300>" : "100x100>") } }
 end
 ```
 
@@ -747,7 +804,7 @@ processors, where a defined `watermark` processor is invoked after the
 
 ```ruby
 class User < ActiveRecord::Base
-  has_attached_file :avatar, :processors => lambda { |instance| instance.processors }
+  has_attached_file :avatar, processors: lambda { |instance| instance.processors }
   attr_accessor :processors
 end
 ```
@@ -757,7 +814,7 @@ end
 Logging
 ----------
 
-By default Paperclip outputs logging according to your logger level. If you want to disable logging (e.g. during testing) add this in to your environment's configuration:
+By default, Paperclip outputs logging according to your logger level. If you want to disable logging (e.g. during testing) add this into your environment's configuration:
 ```ruby
 Your::Application.configure do
 ...
@@ -766,13 +823,23 @@ Your::Application.configure do
 end
 ```
 
-More information in the [rdocs](http://rdoc.info/github/thoughtbot/paperclip/Paperclip.options)
+More information in the [rdocs](http://www.rubydoc.info/github/thoughtbot/paperclip/Paperclip.options)
 
 ---
 
 Deployment
 ----------
 
+To make Capistrano symlink the `public/system` directory so that attachments
+survive new deployments, set the `linked_dirs` option in your `config/deploy.rb`
+file:
+
+```ruby
+set :linked_dirs, fetch(:linked_dirs, []).push('public/system')
+```
+
+### Attachment Styles
+
 Paperclip is aware of new attachment styles you have added in previous deploys. The only thing you should do after each deployment is to call
 `rake paperclip:refresh:missing_styles`.  It will store current attachment styles in `RAILS_ROOT/public/system/paperclip_attachments.yml`
 by default. You can change it by:
@@ -784,32 +851,36 @@ Paperclip.registered_attachments_styles_path = '/tmp/config/paperclip_attachment
 Here is an example for Capistrano:
 
 ```ruby
-namespace :deploy do
+namespace :paperclip do
   desc "build missing paperclip styles"
-  task :build_missing_paperclip_styles do
+  task :build_missing_styles do
     on roles(:app) do
-      execute "cd #{current_path}; RAILS_ENV=production bundle exec rake paperclip:refresh:missing_styles"
+      within release_path do
+        with rails_env: fetch(:rails_env) do
+          execute :rake, "paperclip:refresh:missing_styles"
+        end
+      end
     end
   end
 end
 
-after("deploy:compile_assets", "deploy:build_missing_paperclip_styles")
+after("deploy:compile_assets", "paperclip:build_missing_styles")
 ```
 
 Now you don't have to remember to refresh thumbnails in production every time you add a new style.
-Unfortunately it does not work with dynamic styles - it just ignores them.
+Unfortunately, it does not work with dynamic styles - it just ignores them.
 
 If you already have a working app and don't want `rake paperclip:refresh:missing_styles` to refresh old pictures, you need to tell
 Paperclip about existing styles. Simply create a `paperclip_attachments.yml` file by hand. For example:
 
 ```ruby
 class User < ActiveRecord::Base
-  has_attached_file :avatar, :styles => {:thumb => 'x100', :croppable => '600x600>', :big => '1000x1000>'}
+  has_attached_file :avatar, styles: { thumb: 'x100', croppable: '600x600>', big: '1000x1000>' }
 end
 
 class Book < ActiveRecord::Base
-  has_attached_file :cover, :styles => {:small => 'x100', :large => '1000x1000>'}
-  has_attached_file :sample, :styles => {:thumb => 'x100'}
+  has_attached_file :cover, styles: { small: 'x100', large: '1000x1000>' }
+  has_attached_file :sample, styles: { thumb: 'x100' }
 end
 ```
 
@@ -836,7 +907,7 @@ Testing
 -------
 
 Paperclip provides rspec-compatible matchers for testing attachments. See the
-documentation on [Paperclip::Shoulda::Matchers](http://rubydoc.info/gems/paperclip/Paperclip/Shoulda/Matchers)
+documentation on [Paperclip::Shoulda::Matchers](http://www.rubydoc.info/gems/paperclip/Paperclip/Shoulda/Matchers)
 for more information.
 
 **Parallel Tests**
@@ -855,7 +926,7 @@ else
 end
 ```
 
-The important part here being the inclusion of `ENV['TEST_ENV_NUMBER']`, or the
+The important part here being the inclusion of `ENV['TEST_ENV_NUMBER']`, or a
 similar mechanism for whichever parallel testing library you use.
 
 **Integration Tests**
@@ -876,6 +947,17 @@ config.after(:suite) do
   FileUtils.rm_rf(Dir["#{Rails.root}/spec/test_files/"])
 end
 ```
+
+**Example of test configuration with Factory Girl**
+
+
+```ruby
+FactoryGirl.define do
+  factory :user do
+    avatar { File.new("#{Rails.root}/spec/support/fixtures/image.jpg") }
+  end
+end
+```
 ---
 
 Contributing
@@ -891,25 +973,27 @@ guidelines:
    about writing tests for paperclip, please open a
    [GitHub issue](https://github.com/thoughtbot/paperclip/issues/new).
 
-Please see `CONTRIBUTING.md` for more details on contributing and running test.
+Please see [`CONTRIBUTING.md`](./CONTRIBUTING.md) for more details on contributing and running test.
 
----
+Thank you to all [the contributors](https://github.com/thoughtbot/paperclip/graphs/contributors)!
 
-Credits
+License
 -------
 
-![thoughtbot](http://thoughtbot.com/logo.png)
+Paperclip is Copyright © 2008-2016 thoughtbot, inc. It is free software, and may be
+redistributed under the terms specified in the MIT-LICENSE file.
 
-Paperclip is maintained and funded by [thoughtbot, inc](http://thoughtbot.com/community)
+About thoughtbot
+----------------
 
-Thank you to all [the contributors](https://github.com/thoughtbot/paperclip/contributors)!
+![thoughtbot](https://thoughtbot.com/logo.png)
 
+Paperclip is maintained and funded by thoughtbot.
 The names and logos for thoughtbot are trademarks of thoughtbot, inc.
 
----
-
-License
--------
+We love open source software!
+See [our other projects][community] or
+[hire us][hire] to design, develop, and grow your product.
 
-Paperclip is Copyright © 2008-2014 thoughtbot, inc. It is free software, and may be
-redistributed under the terms specified in the MIT-LICENSE file.
+[community]: https://thoughtbot.com/community?utm_source=github
+[hire]: https://thoughtbot.com?utm_source=github