From 0ba388ca604ab153f28edb59cd4d7bf2b58cc6c8 Mon Sep 17 00:00:00 2001 From: Joe Peduto Date: Thu, 28 Aug 2014 12:39:48 -0400 Subject: [PATCH 1/2] Use default or default with extension depending on whether or not extension is present --- lib/phone.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/phone.rb b/lib/phone.rb index 978f43f..227cb38 100644 --- a/lib/phone.rb +++ b/lib/phone.rb @@ -242,7 +242,7 @@ def format(fmt) # the default format is "+%c%a%n" def to_s - format(:default) + extension.nil? ? format(:default) : format(:default_with_extension) end # does this number belong to the default country code? From 122fe48a0810fc9aef42cea0f43b5c795bb4e981 Mon Sep 17 00:00:00 2001 From: Joe Peduto Date: Thu, 28 Aug 2014 12:45:21 -0400 Subject: [PATCH 2/2] added test for default with extension --- test/phone_test.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/phone_test.rb b/test/phone_test.rb index 8fa3617..e667ff4 100644 --- a/test/phone_test.rb +++ b/test/phone_test.rb @@ -101,6 +101,12 @@ def test_to_s assert pn.to_s == '+385915125486' end + def test_to_s_with_extension + Phoner::Phone.default_country_code = nil + pn = Phoner::Phone.new '5125486', '91', '385', '111' + assert pn.to_s == '+385915125486x111' + end + def test_to_s_without_country_code Phoner::Phone.default_country_code = '385' pn = Phoner::Phone.new '5125486', '91'