carrierwave 0.11.2 → 1.0.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c1689fd908e56b671c45e5cb1eebe3ec938a4df
-  data.tar.gz: 89668d77484c786139f513dc1b82c82879da4e11
+  metadata.gz: a4ebc3c2c8a7083953582084c27f7abd61fbbc31
+  data.tar.gz: c1877d8a5780cf897943b43ed124fa40ff669a7a
 SHA512:
-  metadata.gz: a03780cb6e64ad439c1f12378be2f4392617dbbe9f83329eccc6bc05064385e0e95a4b4609e32d922a0ce6d5543bbc795eb4abb8e429d5e366040fdfa3c82bfd
-  data.tar.gz: ee26ab882ed995b677c38e6064843101633a07166cf2dda0e522bf1b13eb7a30a373312d67b786bc86365fd3ef4cb974f8f57a564dafbf9eafaf1c60b7e3e3e8
+  metadata.gz: 37f4ed1affddf04996b406fcb201731ec1d52fcb46eb7aa212517604844b3163f88ecdd0733c750d0ea6b5e2c5bf7ccaa6f0e70c4cd288ad2974eb39d0057c69
+  data.tar.gz: d2f91768a496e1b7740838f76d1f7c54f84bc10712ff7894e02b1f75eecbc4a8da246887fb3760decc3ea7131aa7b1a281fec2b39921a862f5cd09feebf02461

data/README.md

@@ -3,8 +3,15 @@
 This gem provides a simple and extremely flexible way to upload files from Ruby applications.
 It works well with Rack based web applications, such as Ruby on Rails.
 
-[![Build Status](https://travis-ci.org/carrierwaveuploader/carrierwave.png?branch=master)](http://travis-ci.org/carrierwaveuploader/carrierwave)
-[![Code Climate](https://codeclimate.com/github/carrierwaveuploader/carrierwave.png)](https://codeclimate.com/github/carrierwaveuploader/carrierwave)
+[![Build Status](https://travis-ci.org/carrierwaveuploader/carrierwave.svg?branch=master)](http://travis-ci.org/carrierwaveuploader/carrierwave)
+[![Code Climate](http://img.shields.io/codeclimate/github/carrierwaveuploader/carrierwave.svg)](https://codeclimate.com/github/carrierwaveuploader/carrierwave)
+[![git.legal](https://git.legal/projects/1363/badge.svg "Number of libraries approved")](https://git.legal/projects/1363)
+
+
+> ## carrierwave version disclaimer
+> ***This README is for a branch which is still in development.
+> Please switch to latest `0.x` branch for stable version.***
+
 
 ## Information
 
@@ -14,25 +21,27 @@ It works well with Rack based web applications, such as Ruby on Rails.
 
 ## Getting Help
 
-* Please ask the [Google Group](http://groups.google.com/group/carrierwave) for help if you have any questions.
+* Please ask the community on [Stack Overflow](http://stackoverflow.com/) for help if you have any questions. Please do not post usage questions on the issue tracker.
 * Please report bugs on the [issue tracker](http://github.com/carrierwaveuploader/carrierwave/issues) but read the "getting help" section in the wiki first.
 
 ## Installation
 
-Install the latest stable release:
+Install the latest release:
 
-	[sudo] gem install carrierwave
+```
+$ gem install carrierwave -v "1.0.0.beta"
+```
 
 In Rails, add it to your Gemfile:
 
 ```ruby
-gem 'carrierwave'
+gem 'carrierwave', '>= 1.0.0.beta', '< 2.0'
 ```
 
 Finally, restart the server to apply the changes.
 
-Note that CarrierWave is not compatible with Rails 2 as of version 0.5. If you want to use
-Rails 2, please use the 0.4-stable branch on GitHub.
+As of version 1.0.0 (forthcoming), CarrierWave requires Rails 4.0 or higher and Ruby 2.0
+or higher. If you're on Rails 3, you should use v0.11.0.
 
 ## Getting Started
 
@@ -100,24 +109,81 @@ automatically be stored when the record is saved.
 
 ```ruby
 u = User.new
-u.avatar = params[:file]
-u.avatar = File.open('somewhere')
+u.avatar = params[:file] # Assign a file like this, or
+
+# like this
+File.open('somewhere') do |f|
+  u.avatar = f
+end
+
 u.save!
 u.avatar.url # => '/url/to/file.png'
 u.avatar.current_path # => 'path/to/file.png'
-u.avatar.identifier # => 'file.png'
+u.avatar_identifier # => 'file.png'
 ```
 
+**Note**: `u.avatar` will never return nil, even if there is no photo associated to it.
+To check if a photo was saved to the model, use `u.avatar.file.nil?` instead.
+
 ### DataMapper, Mongoid, Sequel
 
 Other ORM support has been extracted into separate gems:
 
 * [carrierwave-datamapper](https://github.com/carrierwaveuploader/carrierwave-datamapper)
 * [carrierwave-mongoid](https://github.com/carrierwaveuploader/carrierwave-mongoid)
-* [carrierwave-sequel](https://github.com/jnicklas/carrierwave-sequel)
+* [carrierwave-sequel](https://github.com/carrierwaveuploader/carrierwave-sequel)
 
 There are more extensions listed in [the wiki](https://github.com/carrierwaveuploader/carrierwave/wiki)
 
+## Multiple file uploads
+**Note:** You must specify using the master branch to enable this feature:
+
+`gem 'carrierwave', github: 'carrierwaveuploader/carrierwave'`.
+
+CarrierWave also has convenient support for multiple file upload fields.
+
+### ActiveRecord
+
+Add a column which can store an array. This could be an array column or a JSON
+column for example. Your choice depends on what your database supports. For
+example, create a migration like this:
+
+
+	rails g migration add_avatars_to_users avatars:json
+	rake db:migrate
+
+Open your model file and mount the uploader:
+
+```ruby
+class User < ActiveRecord::Base
+  mount_uploaders :avatars, AvatarUploader
+end
+```
+
+Make sure your file input fields are set up as multiple file fields. For
+example in Rails you'll want to do something like this:
+
+```erb
+<%= form.file_field :avatars, multiple: true %>
+```
+
+Also, make sure your upload controller permits the multiple file upload attribute, *pointing to an empty array in a hash*. For example:
+
+```ruby
+params.require(:user).permit(:email, :first_name, :last_name, {avatars: []})
+```
+
+Now you can select multiple files in the upload dialog (e.g. SHIFT+SELECT), and they will
+automatically be stored when the record is saved.
+
+```ruby
+u = User.new(params[:user])
+u.save!
+u.avatars[0].url # => '/url/to/file.png'
+u.avatars[0].current_path # => 'path/to/file.png'
+u.avatars[0].identifier # => 'file.png'
+```
+
 ## Changing the storage directory
 
 In order to change where uploaded files are put, just override the `store_dir`
@@ -146,85 +212,69 @@ end
 
 ## Securing uploads
 
-Certain file might be dangerous if uploaded to the wrong location, such as php
-files or other script files. CarrierWave allows you to specify a white-list of
-allowed extensions.
+Certain files might be dangerous if uploaded to the wrong location, such as PHP
+files or other script files. CarrierWave allows you to specify a whitelist of
+allowed extensions or content types.
 
 If you're mounting the uploader, uploading a file with the wrong extension will
 make the record invalid instead. Otherwise, an error is raised.
 
 ```ruby
 class MyUploader < CarrierWave::Uploader::Base
-  def extension_white_list
+  def extension_whitelist
     %w(jpg jpeg gif png)
   end
 end
 ```
 
-### CVE-2016-3714 (ImageTragick)
-This version of CarrierWave has the ability to mitigate CVE-2016-3714. However, you **MUST** set a `content_type_whitelist` in your uploaders for this protection to be effective, and you **MUST** either disable ImageMagick's default SVG delegate or use the RSVG delegate for SVG processing.
-
-A valid whitelist that will restrict your uploader to images only, and mitigate the CVE is:
+The same thing could be done using content types.
+Let's say we need an uploader that accepts only images. This can be done like this
 
 ```ruby
 class MyUploader < CarrierWave::Uploader::Base
   def content_type_whitelist
-    [/image\//]
+    /image\//
   end
 end
 ```
 
-**WARNING**: A `content_type_whitelist` is the only form of whitelist or blacklist supported by CarrierWave that can effectively mitigate against CVE-2016-3714. Use of `extension_type_whitelist` will not inspect the file headers, and thus still leaves your application open to the vulnerability.
+You can use a blacklist to reject content types.
+Let's say we need an uploader that reject JSON files. This can be done like this
 
+```ruby
+class NoJsonUploader < CarrierWave::Uploader::Base
+  def content_type_blacklist
+    ['application/text', 'application/json']
+  end
+end
+```
 
 ### Filenames and unicode chars
 
 Another security issue you should care for is the file names (see
 [Ruby On Rails Security Guide](http://guides.rubyonrails.org/security.html#file-uploads)).
-By default, CarrierWave provides only English letters, arabic numerals and '-+_.' symbols as
+By default, CarrierWave provides only English letters, arabic numerals and some symbols as
 white-listed characters in the file name. If you want to support local scripts (Cyrillic letters, letters with diacritics and so on), you
 have to override `sanitize_regexp` method. It should return regular expression which would match
 all *non*-allowed symbols.
 
-With Ruby 1.9 and higher you can simply write (as it has [Oniguruma](http://oniguruma.rubyforge.org/oniguruma/)
-built-in):
-
 ```ruby
 CarrierWave::SanitizedFile.sanitize_regexp = /[^[:word:]\.\-\+]/
 ```
 
-With Ruby 1.8 you have to manually specify all character ranges. For example, for files which may
-contain Russian letters:
-
-```ruby
-CarrierWave::SanitizedFile.sanitize_regexp = /[^a-zA-Zа-яА-ЯёЁ0-9\.\-\+_]/u
-```
-
 Also make sure that allowing non-latin characters won't cause a compatibility issue with a third-party
 plugins or client-side software.
 
 ## Setting the content type
 
-If you care about the content type of your files and notice that it's not being set
-as expected, you can configure your uploaders to use `CarrierWave::MimeTypes`.
-This adds a dependency on the [mime-types](http://rubygems.org/gems/mime-types) gem,
-but is recommended when using fog, and fog already has a dependency on mime-types.
-
-```ruby
-require 'carrierwave/processing/mime_types'
-
-class MyUploader < CarrierWave::Uploader::Base
-  include CarrierWave::MimeTypes
-
-  process :set_content_type
-end
-```
+As of v0.11.0, the `mime-types` gem is a runtime dependency and the content type is set automatically.
+You no longer need to do this manually.
 
 ## Adding versions
 
 Often you'll want to add different versions of the same file. The classic example is image thumbnails. There is built in support for this*:
 
-*Note: You must have Imagemagick and MiniMagick installed to do image resizing. MiniMagick is a Ruby interface for Imagemagick which is a C program. This is why MiniMagick fails on 'bundle install' without Imagemagick installed.
+*Note:* You must have Imagemagick and MiniMagick installed to do image resizing. MiniMagick is a Ruby interface for Imagemagick which is a C program. This is why MiniMagick fails on 'bundle install' without Imagemagick installed.
 
 Some documentation refers to RMagick instead of MiniMagick but MiniMagick is recommended.
 
@@ -238,10 +288,10 @@ $ brew install imagemagick
 class MyUploader < CarrierWave::Uploader::Base
   include CarrierWave::MiniMagick
 
-  process :resize_to_fit => [800, 800]
+  process resize_to_fit: [800, 800]
 
   version :thumb do
-    process :resize_to_fill => [200,200]
+    process resize_to_fill: [200,200]
   end
 
 end
@@ -283,11 +333,11 @@ properties within the model or based on the picture itself.
 ```ruby
 class MyUploader < CarrierWave::Uploader::Base
 
-  version :human, :if => :is_human?
-  version :monkey, :if => :is_monkey?
-  version :banner, :if => :is_landscape?
+  version :human, if: :is_human?
+  version :monkey, if: :is_monkey?
+  version :banner, if: :is_landscape?
 
-protected
+private
 
   def is_human? picture
     model.can_program?(:ruby)
@@ -321,7 +371,7 @@ class MyUploader < CarrierWave::Uploader::Base
     process resize_to_fill: [280, 280]
   end
 
-  version :small_thumb, :from_version => :thumb do
+  version :small_thumb, from_version: :thumb do
     process resize_to_fill: [20, 20]
   end
 
@@ -340,7 +390,7 @@ file, just add a hidden field called `avatar_cache` (don't forget to add it to
 the attr_accessible list as necessary). In Rails, this would look like this:
 
 ```erb
-<%= form_for @user, :html => {:multipart => true} do |f| %>
+<%= form_for @user, html: { multipart: true } do |f| %>
   <p>
     <label>My Avatar</label>
     <%= f.file_field :avatar %>
@@ -353,7 +403,7 @@ It might be a good idea to show the user that a file has been uploaded, in the
 case of images, a small thumbnail would be a good indicator:
 
 ```erb
-<%= form_for @user, :html => {:multipart => true} do |f| %>
+<%= form_for @user, html: { multipart: true } do |f| %>
   <p>
     <label>My Avatar</label>
     <%= image_tag(@user.avatar_url) if @user.avatar? %>
@@ -369,7 +419,7 @@ If you want to remove a previously uploaded file on a mounted uploader, you can
 easily add a checkbox to the form which will remove the file when checked.
 
 ```erb
-<%= form_for @user, :html => {:multipart => true} do |f| %>
+<%= form_for @user, html: { multipart: true } do |f| %>
   <p>
     <label>My Avatar</label>
     <%= image_tag(@user.avatar_url) if @user.avatar? %>
@@ -400,7 +450,7 @@ via a URL. CarrierWave makes this simple, just add the appropriate attribute to
 form and you're good to go:
 
 ```erb
-<%= form_for @user, :html => {:multipart => true} do |f| %>
+<%= form_for @user, html: { multipart: true } do |f| %>
   <p>
     <label>My Avatar URL:</label>
     <%= image_tag(@user.avatar_url) if @user.avatar? %>
@@ -422,7 +472,7 @@ this easily by overriding the `default_url` method in your uploader:
 
 ```ruby
 class MyUploader < CarrierWave::Uploader::Base
-  def default_url
+  def default_url(*args)
     "/images/fallback/" + [version_name, "default.png"].compact.join('_')
   end
 end
@@ -432,7 +482,7 @@ Or if you are using the Rails asset pipeline:
 
 ```ruby
 class MyUploader < CarrierWave::Uploader::Base
-  def default_url
+  def default_url(*args)
     ActionController::Base.helpers.asset_path("fallback/" + [version_name, "default.png"].compact.join('_'))
   end
 end
@@ -459,7 +509,7 @@ instance.recreate_versions!(:thumb, :large)
 Or on a mounted uploader:
 
 ```ruby
-User.all.each do |user|
+User.find_each do |user|
   user.avatar.recreate_versions!
 end
 ```
@@ -467,7 +517,7 @@ end
 Note: `recreate_versions!` will throw an exception on records without an image. To avoid this, scope the records to those with images or check if an image exists within the block. If you're using ActiveRecord, recreating versions for a user avatar might look like this:
 
 ```ruby
-User.all.each do |user|
+User.find_each do |user|
   user.avatar.recreate_versions! if user.avatar?
 end
 ```
@@ -497,6 +547,16 @@ If you're using Rails, create an initializer for this:
 
 	config/initializers/carrierwave.rb
 
+If you want CarrierWave to fail noisily in development, you can change these configs in your environment file:
+
+```ruby
+CarrierWave.configure do |config|
+  config.ignore_integrity_errors = false
+  config.ignore_processing_errors = false
+  config.ignore_download_errors = false
+end
+```
+
 
 ## Testing with CarrierWave
 
@@ -527,31 +587,37 @@ require 'carrierwave/test/matchers'
 describe MyUploader do
   include CarrierWave::Test::Matchers
 
+  let(:user) { double('user') }
+  let(:uploader) { MyUploader.new(user, :avatar) }
+
   before do
     MyUploader.enable_processing = true
-    @uploader = MyUploader.new(@user, :avatar)
-    @uploader.store!(File.open(path_to_file))
+    File.open(path_to_file) { |f| uploader.store!(f) }
   end
 
   after do
     MyUploader.enable_processing = false
-    @uploader.remove!
+    uploader.remove!
   end
 
   context 'the thumb version' do
-    it "should scale down a landscape image to be exactly 64 by 64 pixels" do
-      @uploader.thumb.should have_dimensions(64, 64)
+    it "scales down a landscape image to be exactly 64 by 64 pixels" do
+      expect(uploader.thumb).to have_dimensions(64, 64)
     end
   end
 
   context 'the small version' do
-    it "should scale down a landscape image to fit within 200 by 200 pixels" do
-      @uploader.small.should be_no_larger_than(200, 200)
+    it "scales down a landscape image to fit within 200 by 200 pixels" do
+      expect(uploader.small).to be_no_larger_than(200, 200)
     end
   end
 
-  it "should make the image readable only to the owner and not executable" do
-    @uploader.should have_permissions(0600)
+  it "makes the image readable only to the owner and not executable" do
+    expect(uploader).to have_permissions(0600)
+  end
+
+  it "has the correct format" do
+    expect(uploader).to be_format('png')
   end
 end
 ```
@@ -563,31 +629,42 @@ Processing can be enabled for a single version by setting the processing flag on
 @uploader.thumb.enable_processing = true
 ```
 
+## Fog
+
+If you want to use fog you must add in your CarrierWave initializer the
+following lines
+
+```ruby
+config.fog_provider = 'fog' # 'fog/aws' etc. Defaults to 'fog'
+config.fog_credentials = { ... } # Provider specific credentials
+```
+
 ## Using Amazon S3
 
-[Fog](http://github.com/fog/fog) is used to support Amazon S3. Ensure you have it in your Gemfile:
+[Fog AWS](http://github.com/fog/fog-aws) is used to support Amazon S3. Ensure you have it in your Gemfile:
 
 ```ruby
-gem "fog", "~> 1.3.1"
+gem "fog-aws"
 ```
 
 You'll need to provide your fog_credentials and a fog_directory (also known as a bucket) in an initializer.
-For the sake of performance it is assumed that the directory already exists, so please create it if need be.
+For the sake of performance it is assumed that the directory already exists, so please create it if it needs to be.
 You can also pass in additional options, as documented fully in lib/carrierwave/storage/fog.rb. Here's a full example:
 
 ```ruby
 CarrierWave.configure do |config|
+  config.fog_provider = 'fog/aws'                        # required
   config.fog_credentials = {
-    :provider               => 'AWS',                        # required
-    :aws_access_key_id      => 'xxx',                        # required
-    :aws_secret_access_key  => 'yyy',                        # required
-    :region                 => 'eu-west-1',                  # optional, defaults to 'us-east-1'
-    :host                   => 's3.example.com',             # optional, defaults to nil
-    :endpoint               => 'https://s3.example.com:8080' # optional, defaults to nil
+    provider:              'AWS',                        # required
+    aws_access_key_id:     'xxx',                        # required
+    aws_secret_access_key: 'yyy',                        # required
+    region:                'eu-west-1',                  # optional, defaults to 'us-east-1'
+    host:                  's3.example.com',             # optional, defaults to nil
+    endpoint:              'https://s3.example.com:8080' # optional, defaults to nil
   }
-  config.fog_directory  = 'name_of_directory'                     # required
-  config.fog_public     = false                                   # optional, defaults to true
-  config.fog_attributes = {'Cache-Control'=>'max-age=315576000'}  # optional, defaults to {}
+  config.fog_directory  = 'name_of_directory'                          # required
+  config.fog_public     = false                                        # optional, defaults to true
+  config.fog_attributes = { 'Cache-Control' => "max-age=#{365.day.to_i}" } # optional, defaults to {}
 end
 ```
 
@@ -616,11 +693,12 @@ Using a US-based account:
 
 ```ruby
 CarrierWave.configure do |config|
+  config.fog_provider = "fog/rackspace/storage"   # optional, defaults to "fog"
   config.fog_credentials = {
-    :provider           => 'Rackspace',
-    :rackspace_username => 'xxxxxx',
-    :rackspace_api_key  => 'yyyyyy',
-    :rackspace_region   => :ord                # optional, defaults to :dfw
+    provider:           'Rackspace',
+    rackspace_username: 'xxxxxx',
+    rackspace_api_key:  'yyyyyy',
+    rackspace_region:   :ord                      # optional, defaults to :dfw
   }
   config.fog_directory = 'name_of_directory'
 end
@@ -630,12 +708,13 @@ Using a UK-based account:
 
 ```ruby
 CarrierWave.configure do |config|
+  config.fog_provider = "fog/rackspace/storage"   # optional, defaults to "fog"
   config.fog_credentials = {
-    :provider           => 'Rackspace',
-    :rackspace_username => 'xxxxxx',
-    :rackspace_api_key  => 'yyyyyy',
-    :rackspace_auth_url  => Fog::Rackspace::UK_AUTH_ENDPOINT,
-    :rackspace_region   => :lon
+    provider:           'Rackspace',
+    rackspace_username: 'xxxxxx',
+    rackspace_api_key:  'yyyyyy',
+    rackspace_auth_url: Fog::Rackspace::UK_AUTH_ENDPOINT,
+    rackspace_region:   :lon
   }
   config.fog_directory = 'name_of_directory'
 end
@@ -662,25 +741,27 @@ the url to the file on Rackspace Cloud Files.
 
 ## Using Google Storage for Developers
 
-[Fog](http://github.com/fog/fog) is used to support Google Storage for Developers. Ensure you have it in your Gemfile:
+[Fog](http://github.com/fog/fog-google) is used to support Google Storage for Developers. Ensure you have it in your Gemfile:
 
 ```ruby
-gem "fog"
+gem "fog-google"
+gem "google-api-client", "< 0.9", ">= 0.6.2"
+gem "mime-types"
 ```
 
 You'll need to configure a directory (also known as a bucket), access key id and secret access key in the initializer.
 For the sake of performance it is assumed that the directory already exists, so please create it if need be.
 
-Sign up [here](http://gs-signup-redirect.appspot.com/) and get your credentials [here](https://storage.cloud.google.com/m)
-under the section “Interoperable Access”.
+Please read the [fog-google README](https://github.com/fog/fog-google/blob/master/README.md) on how to get credentials.
 
 
 ```ruby
 CarrierWave.configure do |config|
+  config.fog_provider = 'fog/google'                        # required
   config.fog_credentials = {
-    :provider                         => 'Google',
-    :google_storage_access_key_id     => 'xxxxxx',
-    :google_storage_secret_access_key => 'yyyyyy'
+    provider:                         'Google',
+    google_storage_access_key_id:     'xxxxxx',
+    google_storage_secret_access_key: 'yyyyyy'
   }
   config.fog_directory = 'name_of_directory'
 end
@@ -697,6 +778,31 @@ end
 That's it! You can still use the `CarrierWave::Uploader#url` method to return
 the url to the file on Google.
 
+## Optimized Loading of Fog
+
+Since Carrierwave doesn't know which parts of Fog you intend to use, it will just load the entire library (unless you use e.g. [`fog-aws`, `fog-google`] instead of fog proper). If you prefer to load fewer classes into your application, you need to load those parts of Fog yourself *before* loading CarrierWave in your Gemfile.  Ex:
+
+```ruby
+gem "fog", "~> 1.27", require: "fog/rackspace/storage"
+gem "carrierwave"
+```
+
+A couple of notes about versions:
+* This functionality was introduced in Fog v1.20.
+* This functionality is slated for CarrierWave v1.0.0.
+
+If you're not relying on Gemfile entries alone and are requiring "carrierwave" anywhere, ensure you require "fog/rackspace/storage" before it.  Ex:
+
+```ruby
+require "fog/rackspace/storage"
+require "carrierwave"
+```
+
+Beware that this specific require is only needed when working with a fog provider that was not extracted to its own gem yet.
+A list of the extracted providers can be found in the page of the `fog` organizations [here](https://github.com/fog).
+
+When in doubt, inspect `Fog.constants` to see what has been loaded.
+
 ## Dynamic Asset Host
 
 The `asset_host` config property can be assigned a proc (or anything that responds to `call`) for generating the host dynamically. The proc-compliant object gets an instance of the current `CarrierWave::Storage::Fog::File` or `CarrierWave::SanitizedFile` as its only argument.
@@ -734,8 +840,8 @@ Convert will only work if the file has the same file extension, thus the use of
 class AvatarUploader < CarrierWave::Uploader::Base
   include CarrierWave::RMagick
 
-  process :resize_to_fill => [200, 200]
-  process :convert => 'png'
+  process resize_to_fill: [200, 200]
+  process convert: 'png'
 
   def filename
     super.chomp(File.extname(super)) + '.png' if original_filename.present?
@@ -767,7 +873,7 @@ for the RMagick processor.
 class AvatarUploader < CarrierWave::Uploader::Base
   include CarrierWave::MiniMagick
 
-  process :resize_to_fill => [200, 200]
+  process resize_to_fill: [200, 200]
 end
 ```
 
@@ -787,14 +893,10 @@ details.
 Be sure to use mount_on to specify the correct column:
 
 ```ruby
-mount_uploader :avatar, AvatarUploader, :mount_on => :avatar_file_name
+mount_uploader :avatar, AvatarUploader, mount_on: :avatar_file_name
 ```
 
-Unfortunately attachment_fu differs too much in philosophy for there to be a
-sensible compatibility mode. Patches for migrating from other solutions will be
-happily accepted.
-
-## i18n
+## I18n
 
 The Active Record validations use the Rails i18n framework. Add these keys to
 your translations file:
@@ -805,8 +907,8 @@ errors:
     carrierwave_processing_error: "Cannot resize image."
     carrierwave_integrity_error: "Not an image."
     carrierwave_download_error: "Couldn't download image."
-    extension_white_list_error: "You are not allowed to upload %{extension} files, allowed types: %{allowed_types}"
-    extension_black_list_error: "You are not allowed to upload %{extension} files, prohibited types: %{prohibited_types}"
+    extension_whitelist_error: "You are not allowed to upload %{extension} files, allowed types: %{allowed_types}"
+    extension_blacklist_error: "You are not allowed to upload %{extension} files, prohibited types: %{prohibited_types}"
 ```
 
 ## Large files
@@ -822,6 +924,7 @@ class MyUploader < CarrierWave::Uploader::Base
   def move_to_cache
     true
   end
+
   def move_to_store
     true
   end
@@ -848,9 +951,10 @@ Will add these callbacks:
 ```ruby
 after_save :store_avatar!
 before_save :write_avatar_identifier
-after_commit :remove_avatar! :on => :destroy
-before_update :store_previous_model_for_avatar
-after_save :remove_previously_stored_avatar
+after_commit :remove_avatar!, on: :destroy
+after_commit :mark_remove_avatar_false, on: :update
+after_save :store_previous_changes_for_avatar
+after_commit :remove_previously_stored_avatar, on: :update
 ```
 
 If you want to skip any of these callbacks (eg. you want to keep the existing
@@ -860,7 +964,7 @@ avatar, even after uploading a new one), you can use ActiveRecord’s
 ```ruby
 class User
   mount_uploader :avatar, AvatarUploader
-  skip_callback :save, :after, :remove_previously_stored_avatar
+  skip_callback :commit, :after, :remove_previously_stored_avatar
 end
 ```
 
@@ -870,7 +974,7 @@ See [CONTRIBUTING.md](https://github.com/carrierwaveuploader/carrierwave/blob/ma
 
 ## License
 
-Copyright (c) 2008-2013 Jonas Nicklas
+Copyright (c) 2008-2015 Jonas Nicklas
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the