Merge branch 'master' of github.com:lifo/docrails

2 files changed, 32 insertions, 14 deletions

diff --git a/activesupport/lib/active_support/core_ext/hash/keys.rb b/activesupport/lib/active_support/core_ext/hash/keys.rb
index e5e77bcef4..8e728691c6 100644
--- a/activesupport/lib/active_support/core_ext/hash/keys.rb
+++ b/activesupport/lib/active_support/core_ext/hash/keys.rb
@@ -1,8 +1,10 @@
 class Hash
   # Return a new hash with all keys converted using the block operation.
   #
-  #  { :name => 'Rob', :years => '28' }.transform_keys{ |key| key.to_s.upcase }
-  #  # => { "NAME" => "Rob", "YEARS" => "28" }
+  #  hash = { name: 'Rob', age: '28' }
+  #
+  #  hash.transform_keys{ |key| key.to_s.upcase }
+  #  # => { "NAME" => "Rob", "AGE" => "28" }
   def transform_keys
     result = {}
     keys.each do |key|
@@ -22,8 +24,10 @@ class Hash
 
   # Return a new hash with all keys converted to strings.
   #
-  #   { :name => 'Rob', :years => '28' }.stringify_keys
-  #   #=> { "name" => "Rob", "years" => "28" }
+  #   hash = { name: 'Rob', age: '28' }
+  #
+  #   hash.stringify_keys
+  #   #=> { "name" => "Rob", "age" => "28" }
   def stringify_keys
     transform_keys{ |key| key.to_s }
   end
@@ -37,8 +41,10 @@ class Hash
   # Return a new hash with all keys converted to symbols, as long as
   # they respond to +to_sym+.
   #
-  #   { 'name' => 'Rob', 'years' => '28' }.symbolize_keys
-  #   #=> { :name => "Rob", :years => "28" }
+  #   hash = { 'name' => 'Rob', 'age' => '28' }
+  #
+  #   hash.symbolize_keys
+  #   #=> { name: "Rob", age: "28" }
   def symbolize_keys
     transform_keys{ |key| key.to_sym rescue key }
   end
@@ -69,8 +75,10 @@ class Hash
   # This includes the keys from the root hash and from all
   # nested hashes.
   #
-  #  { :person => { :name => 'Rob', :years => '28' } }.deep_transform_keys{ |key| key.to_s.upcase }
-  #  # => { "PERSON" => { "NAME" => "Rob", "YEARS" => "28" } }
+  #  hash = { person: { name: 'Rob', age: '28' } }
+  #
+  #  hash.deep_transform_keys{ |key| key.to_s.upcase }
+  #  # => { "PERSON" => { "NAME" => "Rob", "AGE" => "28" } }
   def deep_transform_keys(&block)
     result = {}
     each do |key, value|
@@ -93,6 +101,11 @@ class Hash
   # Return a new hash with all keys converted to strings.
   # This includes the keys from the root hash and from all
   # nested hashes.
+  #
+  #   hash = { person: { name: 'Rob', age: '28' } }
+  #
+  #   hash.deep_stringify_keys
+  #   # => { "person" => { "name" => "Rob", "age" => "28" } }
   def deep_stringify_keys
     deep_transform_keys{ |key| key.to_s }
   end
@@ -107,6 +120,11 @@ class Hash
   # Return a new hash with all keys converted to symbols, as long as
   # they respond to +to_sym+. This includes the keys from the root hash
   # and from all nested hashes.
+  #
+  #   hash = { 'person' => { 'name' => 'Rob', 'age' => '28' } }
+  #
+  #   hash.deep_symbolize_keys
+  #   # => { person: { name: "Rob", age: "28" } }
   def deep_symbolize_keys
     deep_transform_keys{ |key| key.to_sym rescue key }
   end
diff --git a/activesupport/lib/active_support/core_ext/module/attribute_accessors.rb b/activesupport/lib/active_support/core_ext/module/attribute_accessors.rb
index f914425827..b8cb2e347f 100644
--- a/activesupport/lib/active_support/core_ext/module/attribute_accessors.rb
+++ b/activesupport/lib/active_support/core_ext/module/attribute_accessors.rb
@@ -48,17 +48,17 @@ class Module
   #
   #  module AppConfiguration
   #    mattr_accessor :google_api_key
-  #    self.google_api_key = "123456789"
   #
-  #    mattr_accessor :paypal_url
-  #    self.paypal_url = "www.sandbox.paypal.com"
+  #    self.google_api_key = "123456789"
   #  end
   #
+  #  AppConfiguration.google_api_key # => "123456789"
   #  AppConfiguration.google_api_key = "overriding the api key!"
+  #  AppConfiguration.google_api_key # => "overriding the api key!"
   #
-  # To opt out of the instance writer method, pass :instance_writer => false.
-  # To opt out of the instance reader method, pass :instance_reader => false.
-  # To opt out of both instance methods, pass :instance_accessor => false.
+  # To opt out of the instance writer method, pass instance_writer: false.
+  # To opt out of the instance reader method, pass instance_reader: false.
+  # To opt out of both instance methods, pass instance_accessor: false.
   def mattr_accessor(*syms)
     mattr_reader(*syms)
     mattr_writer(*syms)