aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo Liss <joliss42@gmail.com>2012-09-20 18:29:12 +0200
committerJo Liss <joliss42@gmail.com>2012-09-20 18:29:12 +0200
commit920abaa52d9b0d62cf846477ed51d5a2e8e1dc8c (patch)
tree177145e2b9ac66bba0d7bf2b5703c90b084b47c3
parentefef82ffb0c3b5c3c2092f56793cd5940e9526cd (diff)
downloadrails-920abaa52d9b0d62cf846477ed51d5a2e8e1dc8c.tar.gz
rails-920abaa52d9b0d62cf846477ed51d5a2e8e1dc8c.tar.bz2
rails-920abaa52d9b0d62cf846477ed51d5a2e8e1dc8c.zip
Fix indentation and update documentation for Array#wrap for Ruby 1.9
-rw-r--r--activesupport/lib/active_support/core_ext/array/wrap.rb19
1 files changed, 10 insertions, 9 deletions
diff --git a/activesupport/lib/active_support/core_ext/array/wrap.rb b/activesupport/lib/active_support/core_ext/array/wrap.rb
index 55582c6487..7bf28b2f27 100644
--- a/activesupport/lib/active_support/core_ext/array/wrap.rb
+++ b/activesupport/lib/active_support/core_ext/array/wrap.rb
@@ -7,17 +7,17 @@ class Array
# * Otherwise, if the argument responds to +to_ary+ it is invoked, and its result returned.
# * Otherwise, returns an array with the argument as its single element.
#
- # Array.wrap(nil) # => []
- # Array.wrap([1, 2, 3]) # => [1, 2, 3]
- # Array.wrap(0) # => [0]
+ # Array.wrap(nil) # => []
+ # Array.wrap([1, 2, 3]) # => [1, 2, 3]
+ # Array.wrap(0) # => [0]
#
# This method is similar in purpose to <tt>Kernel#Array</tt>, but there are some differences:
#
# * If the argument responds to +to_ary+ the method is invoked. <tt>Kernel#Array</tt>
- # moves on to try +to_a+ if the returned value is +nil+, but <tt>Array.wrap</tt> returns
- # such a +nil+ right away.
+ # moves on to try +to_a+ if the returned value is +nil+, but <tt>Array.wrap</tt> returns
+ # such a +nil+ right away.
# * If the returned value from +to_ary+ is neither +nil+ nor an +Array+ object, <tt>Kernel#Array</tt>
- # raises an exception, while <tt>Array.wrap</tt> does not, it just returns the value.
+ # raises an exception, while <tt>Array.wrap</tt> does not, it just returns the value.
# * It does not call +to_a+ on the argument, though special-cases +nil+ to return an empty array.
#
# The last point is particularly worth comparing for some enumerables:
@@ -29,10 +29,11 @@ class Array
#
# [*object]
#
- # which returns <tt>[nil]</tt> for +nil+, and calls to <tt>Array(object)</tt> otherwise.
+ # which for +nil+ returns <tt>[nil]</tt> (Ruby 1.8.7) or <tt>[]</tt> (Ruby
+ # 1.9), and calls to <tt>Array(object)</tt> otherwise.
#
- # Thus, in this case the behavior is different for +nil+, and the differences with
- # <tt>Kernel#Array</tt> explained above apply to the rest of +object+s.
+ # Thus, in this case the behavior may be different for +nil+, and the differences with
+ # <tt>Kernel#Array</tt> explained above apply to the rest of <tt>object</tt>s.
def self.wrap(object)
if object.nil?
[]