diff options
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 4 | ||||
| -rw-r--r-- | activerecord/lib/active_record/nested_attributes.rb | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/core_ext/array/random_access.rb | 7 |
3 files changed, 11 insertions, 2 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 3b6e2c6387..11fa978b9c 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -535,7 +535,9 @@ module ActionMailer #:nodoc: # :reply_to => 'bounces@test.lindsaar.net' # end # - # If you need other headers not listed above, use the <tt>headers['name'] = value</tt> method. + # If you need other headers not listed above, you can either pass them in + # as part of the headers hash or use the <tt>headers['name'] = value</tt> + # method. # # When a <tt>:return_path</tt> is specified as header, that value will be used as the 'envelope from' # address for the Mail message. Setting this is useful when you want delivery notifications diff --git a/activerecord/lib/active_record/nested_attributes.rb b/activerecord/lib/active_record/nested_attributes.rb index c0302136ea..cf8c5aaf84 100644 --- a/activerecord/lib/active_record/nested_attributes.rb +++ b/activerecord/lib/active_record/nested_attributes.rb @@ -213,7 +213,7 @@ module ActiveRecord # that will reject a record where all the attributes are blank. # [:limit] # Allows you to specify the maximum number of the associated records that - # can be processes with the nested attributes. If the size of the + # can be processed with the nested attributes. If the size of the # nested attributes array exceeds the specified limit, NestedAttributes::TooManyRecords # exception is raised. If omitted, any number associations can be processed. # Note that the :limit option is only applicable to one-to-many associations. diff --git a/activesupport/lib/active_support/core_ext/array/random_access.rb b/activesupport/lib/active_support/core_ext/array/random_access.rb index 7a4836cecd..edac7278bc 100644 --- a/activesupport/lib/active_support/core_ext/array/random_access.rb +++ b/activesupport/lib/active_support/core_ext/array/random_access.rb @@ -1,5 +1,12 @@ class Array # Backport of Array#sample based on Marc-Andre Lafortune's http://github.com/marcandre/backports/ + # Returns a random element or +n+ random elements from the array. + # If the array is empty and +n+ is nil, returns <tt>nil</tt>. if +n+ is passed, returns <tt>[]</tt>. + # + # [1,2,3,4,5,6].sample # => 4 + # [1,2,3,4,5,6].sample(3) # => [2, 4, 5] + # [].sample # => nil + # [].sample(3) # => [] def sample(n=nil) return self[Kernel.rand(size)] if n.nil? n = n.to_int |