TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #22556 from imanel/range_prepend

Browse Source 
Use Module.prepend instead of alias_method for Range#to_s
This commit is contained in:
Kasper Timm Hansen 2015-12-16 19:21:54 +01:00
commit 27710b1eda
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
activesupport/lib/active_support/core_ext/range/conversions.rb
View File

@ -1,34 +1,31 @@
class Range module ActiveSupport::RangeWithFormat
RANGE_FORMATS = { RANGE_FORMATS = {
:db => Proc.new { |start, stop| "BETWEEN '#{start.to_s(:db)}' AND '#{stop.to_s(:db)}'" } :db => Proc.new { |start, stop| "BETWEEN '#{start.to_s(:db)}' AND '#{stop.to_s(:db)}'" }
} }
# Convert range to a formatted string. See RANGE_FORMATS for predefined formats. # Convert range to a formatted string. See RANGE_FORMATS for predefined formats.
# #
# This method is aliased to <tt>to_s</tt>.
#
# range = (1..100) # => 1..100 # range = (1..100) # => 1..100
# #
# range.to_formatted_s # => "1..100"
# range.to_s # => "1..100" # range.to_s # => "1..100"
#
# range.to_formatted_s(:db) # => "BETWEEN '1' AND '100'"
# range.to_s(:db) # => "BETWEEN '1' AND '100'" # range.to_s(:db) # => "BETWEEN '1' AND '100'"
# #
# == Adding your own range formats to to_formatted_s # == Adding your own range formats to to_s
# You can add your own formats to the Range::RANGE_FORMATS hash. # You can add your own formats to the Range::RANGE_FORMATS hash.
# Use the format name as the hash key and a Proc instance. # Use the format name as the hash key and a Proc instance.
# #
# # config/initializers/range_formats.rb # # config/initializers/range_formats.rb
# Range::RANGE_FORMATS[:short] = ->(start, stop) { "Between #{start.to_s(:db)} and #{stop.to_s(:db)}" } # Range::RANGE_FORMATS[:short] = ->(start, stop) { "Between #{start.to_s(:db)} and #{stop.to_s(:db)}" }
def to_formatted_s(format = :default) def to_s(format = :default)
if formatter = RANGE_FORMATS[format] if formatter = RANGE_FORMATS[format]
formatter.call(first, last) formatter.call(first, last)
else else
to_default_s super()
end end
end end
alias_method :to_default_s, :to_s alias_method :to_default_s, :to_s
alias_method :to_s, :to_formatted_s alias_method :to_formatted_s, :to_s
end end
Range.prepend(ActiveSupport::RangeWithFormat)