From 7698f5d1b19564a07cfd30e855ea4bb34d638161 Mon Sep 17 00:00:00 2001 From: PJ Davis Date: Fri, 11 Feb 2011 12:39:07 -0600 Subject: [PATCH 1/2] Added failing test for number_to_phone with area_code and 7 digits --- actionpack/test/template/number_helper_test.rb | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/actionpack/test/template/number_helper_test.rb b/actionpack/test/template/number_helper_test.rb index 156b7cb..88e31a5 100644 --- a/actionpack/test/template/number_helper_test.rb +++ b/actionpack/test/template/number_helper_test.rb @@ -30,6 +30,7 @@ class NumberHelperTest < ActionView::TestCase def test_number_to_phone assert_equal("555-1234", number_to_phone(5551234)) + assert_equal("555-1234", number_to_phone(5551234, {:area_code => true})) assert_equal("800-555-1212", number_to_phone(8005551212)) assert_equal("(800) 555-1212", number_to_phone(8005551212, {:area_code => true})) assert_equal("800 555 1212", number_to_phone(8005551212, {:delimiter => " "})) -- 1.7.3.4 From 62a35715c6cc4304061db1358a52ac18e1195785 Mon Sep 17 00:00:00 2001 From: PJ Davis Date: Fri, 11 Feb 2011 13:05:19 -0600 Subject: [PATCH 2/2] Added a check to change area_code to false if the number is less than 7 digits long --- .../lib/action_view/helpers/number_helper.rb | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/actionpack/lib/action_view/helpers/number_helper.rb b/actionpack/lib/action_view/helpers/number_helper.rb index 26f8dce..7d1eb49 100644 --- a/actionpack/lib/action_view/helpers/number_helper.rb +++ b/actionpack/lib/action_view/helpers/number_helper.rb @@ -58,7 +58,7 @@ module ActionView number = number.to_s.strip options = options.symbolize_keys - area_code = options[:area_code] + area_code = options[:area_code] && number.size > 7 delimiter = options[:delimiter] || "-" extension = options[:extension] country_code = options[:country_code] -- 1.7.3.4