Merge branch 'master' into joindep

* master: (23 commits)
  Escape the parentheses in the default function regexp
  Update docs on Tilt::Template in Asset Pipeline guide
  Fix loading a sql structure file on postgres when the file's path has whitespace in it
  remove trailing whitespace added with b057765 [ci skip].
  Allow unscope to work with `where.not`
  Raise an exception when model without primary key calls .find_with_ids
  Process sub-query relation's binding values
  Instrument the generation of Action Mailer messages
  Remove extra variable creation and merge.
  In Relation#empty? use #exists? instead of #count.
  [ci skip] avoid deprecation warning in sample code
  Convert Fixnum into String the port number in MySQL
  Fix some indentation on autosave association
  Make define_non_cyclic_method simpler
  Add Sass gobbling info to asset pipeline docs
  Ensure the state is clean after one failure
  Fix typo in form_helper.rb
  add a new local variable to track if digests are being stored, to ensure the cleanup works correctly
  [ci skip] Fix number of methods added by association.
  update digestor code based on review
  ...

2 files changed, 21 insertions, 12 deletions

diff --git a/guides/source/asset_pipeline.md b/guides/source/asset_pipeline.md
index 72aff1e0dd..40a6f3ebc7 100644
--- a/guides/source/asset_pipeline.md
+++ b/guides/source/asset_pipeline.md
@@ -503,7 +503,11 @@ NOTE. If you want to use multiple Sass files, you should generally use the [Sass
 rule](http://sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#import) instead
 of these Sprockets directives. Using Sprockets directives all Sass files exist
 within their own scope, making variables or mixins only available within the
-document they were defined in.
+document they were defined in. You can do file globbing as well using
+`@import "*"`, and `@import "**/*"` to add the whole tree equivalent to how
+`require_tree` works. Check the [sass-rails 
+documentation](https://github.com/rails/sass-rails#features) for more info and
+important caveats.
 
 You can have as many manifest files as you need. For example, the `admin.css`
 and `admin.js` manifest could contain the JS and CSS files that are used for the
@@ -1040,17 +1044,22 @@ Making Your Library or Gem a Pre-Processor
 As Sprockets uses [Tilt](https://github.com/rtomayko/tilt) as a generic
 interface to different templating engines, your gem should just implement the
 Tilt template protocol. Normally, you would subclass `Tilt::Template` and
-reimplement `evaluate` method to return final output. Template source is stored
-at `@code`. Have a look at
+reimplement the `prepare` method, which initializes your template, and the
+`evaluate` method, which returns the processed source. The original source is
+stored in `data`. Have a look at
 [`Tilt::Template`](https://github.com/rtomayko/tilt/blob/master/lib/tilt/template.rb)
 sources to learn more.
 
 ```ruby
 module BangBang
   class Template < ::Tilt::Template
+    def prepare
+      # Do any initialization here
+    end
+
     # Adds a "!" to original template.
     def evaluate(scope, locals, &block)
-      "#{@code}!"
+      "#{data}!"
     end
   end
 end
diff --git a/guides/source/association_basics.md b/guides/source/association_basics.md
index 91b268d766..c0482f6106 100644
--- a/guides/source/association_basics.md
+++ b/guides/source/association_basics.md
@@ -718,7 +718,7 @@ The `belongs_to` association creates a one-to-one match with another model. In d
 
 #### Methods Added by `belongs_to`
 
-When you declare a `belongs_to` association, the declaring class automatically gains four methods related to the association:
+When you declare a `belongs_to` association, the declaring class automatically gains five methods related to the association:
 
 * `association(force_reload = false)`
 * `association=(associate)`
@@ -1022,7 +1022,7 @@ The `has_one` association creates a one-to-one match with another model. In data
 
 #### Methods Added by `has_one`
 
-When you declare a `has_one` association, the declaring class automatically gains four methods related to the association:
+When you declare a `has_one` association, the declaring class automatically gains five methods related to the association:
 
 * `association(force_reload = false)`
 * `association=(associate)`
@@ -1140,10 +1140,10 @@ Controls what happens to the associated object when its owner is destroyed:
 * `:restrict_with_exception` causes an exception to be raised if there is an associated record
 * `:restrict_with_error` causes an error to be added to the owner if there is an associated object
 
-It's necessary not to set or leave `:nullify` option for those associations 
-that have `NOT NULL` database constraints. If you don't set `dependent` to 
-destroy such associations you won't be able to change the associated object 
-because initial associated object foreign key will be set to unallowed `NULL` 
+It's necessary not to set or leave `:nullify` option for those associations
+that have `NOT NULL` database constraints. If you don't set `dependent` to
+destroy such associations you won't be able to change the associated object
+because initial associated object foreign key will be set to unallowed `NULL`
 value.
 
 ##### `:foreign_key`
@@ -1289,7 +1289,7 @@ The `has_many` association creates a one-to-many relationship with another model
 
 #### Methods Added by `has_many`
 
-When you declare a `has_many` association, the declaring class automatically gains 13 methods related to the association:
+When you declare a `has_many` association, the declaring class automatically gains 16 methods related to the association:
 
 * `collection(force_reload = false)`
 * `collection<<(object, ...)`
@@ -1778,7 +1778,7 @@ The `has_and_belongs_to_many` association creates a many-to-many relationship wi
 
 #### Methods Added by `has_and_belongs_to_many`
 
-When you declare a `has_and_belongs_to_many` association, the declaring class automatically gains 13 methods related to the association:
+When you declare a `has_and_belongs_to_many` association, the declaring class automatically gains 16 methods related to the association:
 
 * `collection(force_reload = false)`
 * `collection<<(object, ...)`