diff options
Diffstat (limited to 'activesupport/lib/active_support')
3 files changed, 24 insertions, 14 deletions
diff --git a/activesupport/lib/active_support/core_ext/array.rb b/activesupport/lib/active_support/core_ext/array.rb index 83eef79b38..ddf2a369c1 100644 --- a/activesupport/lib/active_support/core_ext/array.rb +++ b/activesupport/lib/active_support/core_ext/array.rb @@ -1,5 +1,5 @@ -require File.dirname(__FILE__) + '/array/to_param' +require File.dirname(__FILE__) + '/array/conversions' class Array #:nodoc: - include ActiveSupport::CoreExtensions::Array::ToParam + include ActiveSupport::CoreExtensions::Array::Conversions end diff --git a/activesupport/lib/active_support/core_ext/array/conversions.rb b/activesupport/lib/active_support/core_ext/array/conversions.rb new file mode 100644 index 0000000000..19220da2b1 --- /dev/null +++ b/activesupport/lib/active_support/core_ext/array/conversions.rb @@ -0,0 +1,22 @@ +module ActiveSupport #:nodoc: + module CoreExtensions #:nodoc: + module Array #:nodoc: + # Enables to conversion of Arrays to human readable lists. ['one', 'two', 'three'] => "one, two, and three" + module Conversions + # Converts the array to comma-seperated sentence where the last element is joined by the connector word (default is 'and'). + def to_sentence(connector = 'and') + if length > 1 + "#{self[0...-1].join(', ')}, #{connector} #{self[-1]}" + elsif length == 1 + self[0] + end + end + + # When an array is given to url_for, it is converted to a slash separated string. + def to_param + join '/' + end + end + end + end +end diff --git a/activesupport/lib/active_support/core_ext/array/to_param.rb b/activesupport/lib/active_support/core_ext/array/to_param.rb deleted file mode 100644 index 85e91e6b1a..0000000000 --- a/activesupport/lib/active_support/core_ext/array/to_param.rb +++ /dev/null @@ -1,12 +0,0 @@ -module ActiveSupport #:nodoc: - module CoreExtensions #:nodoc: - module Array #:nodoc: - module ToParam #:nodoc: - # When an array is given to url_for, it is converted to a slash separated string. - def to_param - join '/' - end - end - end - end -end |