aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Gemfile2
-rw-r--r--actionmailer/CHANGELOG.md2
-rw-r--r--actionpack/CHANGELOG.md9
-rw-r--r--actionpack/lib/action_controller/test_case.rb3
-rw-r--r--activemodel/CHANGELOG.md62
-rw-r--r--activerecord/CHANGELOG.md8
6 files changed, 45 insertions, 41 deletions
diff --git a/Gemfile b/Gemfile
index 0bcfab7b79..e5b9345a0c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -29,7 +29,7 @@ group :doc do
gem 'sdoc', '~> 0.4.0'
gem 'redcarpet', '~> 3.2.2', platforms: :ruby
gem 'w3c_validators'
- gem 'kindlerb'
+ gem 'kindlerb', '0.1.1'
end
# AS
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md
index 008760f2fc..86ecb3ee88 100644
--- a/actionmailer/CHANGELOG.md
+++ b/actionmailer/CHANGELOG.md
@@ -1,5 +1,7 @@
* Add `assert_enqueued_emails` and `assert_no_enqueued_emails`.
+ Example:
+
def test_emails
assert_enqueued_emails 2 do
ContactMailer.welcome.deliver_later
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index aeb961decc..5e0c64900f 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,7 +1,7 @@
* Migrating to keyword arguments syntax in `ActionController::TestCase` and
- `ActionDispatch::Integration` HTTP request methods
+ `ActionDispatch::Integration` HTTP request methods.
- New syntax example:
+ Example:
post :create, params: { y: x }, session: { a: 'b' }
get :view, params: { id: 1 }
@@ -9,7 +9,7 @@
*Kir Shatrov*
-* Preserve default url options when generating URLs
+* Preserve default url options when generating URLs.
Fixes an issue that would cause default_url_options to be lost when
generating URLs with fewer positional arguments than parameters in the
@@ -47,6 +47,7 @@
* Allow you to pass `prepend: false` to protect_from_forgery to have the
verification callback appended instead of prepended to the chain.
This allows you to let the verification step depend on prior callbacks.
+
Example:
class ApplicationController < ActionController::Base
@@ -143,7 +144,7 @@
*Travis Grathwell*
-* Stop converting empty arrays in `params` to `nil`
+* Stop converting empty arrays in `params` to `nil`.
This behaviour was introduced in response to CVE-2012-2660, CVE-2012-2694
and CVE-2013-0155
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index 15e587bcea..afe95e3fec 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -579,6 +579,7 @@ module ActionController
# (<tt>application/x-www-form-urlencoded</tt> or <tt>multipart/form-data</tt>).
# - +session+: A hash of parameters to store in the session. This may be +nil+.
# - +flash+: A hash of parameters to store in the flash. This may be +nil+.
+ # - +format+: Request format. Defaults to +nil+. Can be string or symbol.
#
# Example calling +create+ action and sending two params:
#
@@ -754,7 +755,7 @@ module ActionController
Examples:
get :show, params: { id: 1 }, session: { user_id: 1 }
- process :update, http_method: :post, params: { id: 1 }
+ process :update, method: :post, params: { id: 1 }
MSG
end
diff --git a/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md
index 77386e5e41..5830a00bc5 100644
--- a/activemodel/CHANGELOG.md
+++ b/activemodel/CHANGELOG.md
@@ -2,48 +2,46 @@
will now raise `ActiveModel::AttributeAssignment::UnknownAttributeError` instead of
`NoMethodError`
- ```ruby
- User.new(foo: 'some value')
- # => ActiveModel::AttributeAssignment::UnknownAttributeError: unknown attribute 'foo' for User.
- ```
+ Example:
+
+ User.new(foo: 'some value')
+ # => ActiveModel::AttributeAssignment::UnknownAttributeError: unknown attribute 'foo' for User.
*Eugene Gilburg*
* Extracted `ActiveRecord::AttributeAssignment` to `ActiveModel::AttributeAssignment`
- allowing to use it for any object as an includable module
-
- ``` ruby
- class Cat
- include ActiveModel::AttributeAssignment
- attr_accessor :name, :status
- end
-
- cat = Cat.new
- cat.assign_attributes(name: "Gorby", status: "yawning")
- cat.name # => 'Gorby'
- cat.status => 'yawning'
- cat.assign_attributes(status: "sleeping")
- cat.name # => 'Gorby'
- cat.status => 'sleeping'
- ```
+ allowing to use it for any object as an includable module.
+
+ Example:
+
+ class Cat
+ include ActiveModel::AttributeAssignment
+ attr_accessor :name, :status
+ end
+
+ cat = Cat.new
+ cat.assign_attributes(name: "Gorby", status: "yawning")
+ cat.name # => 'Gorby'
+ cat.status => 'yawning'
+ cat.assign_attributes(status: "sleeping")
+ cat.name # => 'Gorby'
+ cat.status => 'sleeping'
*Bogdan Gusiev*
* Add `ActiveModel::Errors#details`
To be able to return type of used validator, one can now call `details`
- on Errors instance:
-
- ```ruby
- class User < ActiveRecord::Base
- validates :name, presence: true
- end
- ```
-
- ```ruby
- user = User.new; user.valid?; user.errors.details
- => {name: [{error: :blank}]}
- ```
+ on errors instance.
+
+ Example:
+
+ class User < ActiveRecord::Base
+ validates :name, presence: true
+ end
+
+ user = User.new; user.valid?; user.errors.details
+ => {name: [{error: :blank}]}
*Wojciech Wnętrzak*
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 3bd1fe32b4..4cc62346cb 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,7 +1,9 @@
* Fixed ActiveRecord::Relation#group method when argument is SQL reserved key word:
- SplitTest.group(:key).count
- Property.group(:value).count
+ Example:
+
+ SplitTest.group(:key).count
+ Property.group(:value).count
*Bogdan Gusiev*
@@ -86,7 +88,7 @@
A deprecation warning will be emitted if you have a `:time` column, and have
not explicitly opted out.
- Fixes #3145
+ Fixes #3145.
*Sean Griffin*