Permalink
Browse files

Added :extension option to NumberHelper#number_to_phone #1361 [delynnb]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1438 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 43c470f commit 665ab93761f3a42ccce12b10c1e9a958ae53e691 @dhh dhh committed Jun 16, 2005
@@ -1,5 +1,7 @@
*SVN*
+* Added :extension option to NumberHelper#number_to_phone #1361 [delynnb]
+
* Added button_to as a form-based solution to deal with harmful actions that should be hidden behind POSTs. This makes it just as easy as link_to to create a safe trigger for actions like destroy, although it's limited by being a block element, the fixed look, and a no-no inside other forms. #1371 [tom@moertel.com]
* Fixed image_tag so an exception is not thrown just because the image is missing and alt value can't be generated #1395 [Marcel]
@@ -8,20 +8,18 @@ module NumberHelper
# The area code can be surrounded by parenthesis by setting +:area_code+ to true; default is false
# The delimiter can be set using +:delimiter+; default is "-"
# Examples:
- # number_to_phone(1235551234) => 123-555-1234
- # number_to_phone(1235551234, {:area_code => true}) => (123) 555-1234
- # number_to_phone(1235551234, {:delimiter => " "}) => 123 555 1234
+ # number_to_phone(1235551234) => 123-555-1234
+ # number_to_phone(1235551234, {:area_code => true}) => (123) 555-1234
+ # number_to_phone(1235551234, {:delimiter => " "}) => 123 555 1234
+ # number_to_phone(1235551234, {:area_code => true, :extension => 555}) => (123) 555-1234 x 555
def number_to_phone(number, options = {})
- options = options.stringify_keys
+ options = options.stringify_keys
area_code = options.delete("area_code") { false }
delimiter = options.delete("delimiter") { "-" }
+ extension = options.delete("extension") { "" }
begin
- str = number.to_s
- if area_code == true
- str.gsub!(/([0-9]{3})([0-9]{3})([0-9]{4})/,"(\\1) \\2#{delimiter}\\3")
- else
- str.gsub!(/([0-9]{3})([0-9]{3})([0-9]{4})/,"\\1#{delimiter}\\2#{delimiter}\\3")
- end
+ str = area_code == true ? number.to_s.gsub(/([0-9]{3})([0-9]{3})([0-9]{4})/,"(\\1) \\2#{delimiter}\\3") : number.to_s.gsub(/([0-9]{3})([0-9]{3})([0-9]{4})/,"\\1#{delimiter}\\2#{delimiter}\\3")
+ extension.to_s.strip.empty? ? str : "#{str} x #{extension.to_s.strip}"
rescue
number
end
@@ -11,6 +11,8 @@ def test_number_to_phone
assert_equal("123-555-1234", number_to_phone(1235551234))
assert_equal("(123) 555-1234", number_to_phone(1235551234, {:area_code => true}))
assert_equal("123 555 1234", number_to_phone(1235551234, {:delimiter => " "}))
+ assert_equal("(123) 555-1234 x 555", number_to_phone(1235551234, {:area_code => true, :extension => 555}))
+ assert_equal("123-555-1234", number_to_phone(1235551234, :extension => " "))
end
def test_number_to_currency

0 comments on commit 665ab93

Please sign in to comment.