Skip to content

Use default or default with extension depending on whether or not extension is present #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
moxie wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Use default or default with extension depending on whether or not extension is present #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ba388c
Use default or default with extension depending on whether or not ext…
moxie Aug 28, 2014
122fe48
added test for default with extension
moxie Aug 28, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/phone.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand Down
6 changes: 6 additions & 0 deletions test/phone_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down