@@ -11,7 +11,7 @@ lib/phone_number/country_code/base.rb lib/phone_number/country_code/country_code_1.rb lib/phone_number/country_code/country_code_54.rb lib/phone_number/version.rb -phonenumber.gemspec +phone_number.gemspec test/test_country_code_1.rb test/test_country_code_54.rb test/test_helper.rb Manifest.txt @@ -1,12 +1,13 @@ require 'newgem' require File.dirname(__FILE__) + '/lib/phone_number/version.rb' -$hoe = Hoe.new('phonenumber', PhoneNumber::Version::STRING) do |p| +$hoe = Hoe.new('phone_number', PhoneNumber::Version::STRING) do |p| p.developer('Norman Clarke', 'norman@randomba.org') p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n") - p.rubyforge_name = p.name # TODO this is default value - p.summary = "" - p.description = "" + p.rubyforge_name = "phone_number" # TODO this is default value + p.summary = "none" + p.description = "none" + p.url = "http://github.com/norman/phonenumber" # p.extra_deps = [ # ['activesupport','>= 2.0.2'], # ] Rakefile @@ -11,6 +11,15 @@ module CountryCode CountryCode::Base end end + + # Return the numeric country code for the given ISO. + def code(iso) + CODES.select {|x| x[1].include?(iso)}[0][0] + rescue NoMethodError + nil + end + + end # Maps numeric country prefix to country ISO's. Taken from {Wikipedia}[http://en.wikipedia.org/wiki/List_of_country_calling_codes]. lib/phone_number/country_code.rb @@ -13,19 +13,19 @@ class CountryCode::CountryCode1 < CountryCode::Base end def real_number(phone_number) - phone_number.number.to_s.gsub(/^1/, '') + phone_number.number.to_s.gsub(/\A1/, '') end def area_code(phone_number) - phone_number.real_number.slice(0..2).to_s + phone_number.real_number.slice(0, 3).to_s end def prefix(phone_number) - phone_number.real_number.slice(3..5).to_s + phone_number.real_number.slice(3, 3).to_s end def line_number(phone_number) - phone_number.real_number.slice(6..9).to_s + phone_number.real_number.slice(6, 4).to_s end def region(phone_number) lib/phone_number/country_code/country_code_1.rb @@ -14,7 +14,8 @@ class CountryCode::CountryCode54 < CountryCode::Base end def real_number(phone_number) - phone_number.number.to_s.gsub(/\A0|\A54/, '') + num = phone_number.number.to_s.gsub(/\A0|\A54/, '') + num =~ /^4[\d]{7}/ ? "11#{num}" : num end def area_code(phone_number) lib/phone_number/country_code/country_code_54.rb @@ -2,7 +2,7 @@ module PhoneNumber module Version MAJOR = 0 MINOR = 0 - TINY = 0 + TINY = 1 STRING = [MAJOR, MINOR, TINY].join('.') end -end \ No newline at end of file +end lib/phone_number/version.rb @@ -8,13 +8,13 @@ class TestCountryCode54 < Test::Unit::TestCase city_should_be "Buenos Aires" country_code_should_be "54" country_should_be "AR" + default_format_should_be "011 4444 3333" line_number_should_be "3333" local_prefix_should_be nil prefix_should_be "4444" real_number_should_be "1144443333" real_number_without_local_prefix_should_be "1144443333" region_should_be "C" - default_format_should_be "011 4444 3333" end context "A Buenos Aires cell number" do @@ -23,13 +23,13 @@ class TestCountryCode54 < Test::Unit::TestCase city_should_be "Buenos Aires" country_code_should_be "54" country_should_be "AR" + default_format_should_be "011 15 5555 4444" line_number_should_be "4444" local_prefix_should_be "15" prefix_should_be "5555" real_number_should_be "111555554444" real_number_without_local_prefix_should_be "1155554444" region_should_be "C" - default_format_should_be "011 15 5555 4444" end context "A Buenos Aires cell number dialed from abroad" do @@ -38,6 +38,7 @@ class TestCountryCode54 < Test::Unit::TestCase city_should_be "Buenos Aires" country_code_should_be "54" country_should_be "AR" + # default_format_should_be "011 15 5555 4444" line_number_should_be "4444" local_prefix_should_be "9" prefix_should_be "5555" @@ -52,13 +53,13 @@ class TestCountryCode54 < Test::Unit::TestCase city_should_be "Bahía Blanca" country_code_should_be "54" country_should_be "AR" + default_format_should_be "0291 444 3333" line_number_should_be "3333" local_prefix_should_be nil prefix_should_be "444" real_number_should_be "2914443333" real_number_without_local_prefix_should_be "2914443333" region_should_be "B" - default_format_should_be "0291 444 3333" end context "A Bariloche phone number" do @@ -67,13 +68,13 @@ class TestCountryCode54 < Test::Unit::TestCase city_should_be "San Carlos de Bariloche" country_code_should_be "54" country_should_be "AR" + default_format_should_be "02944 444 333" line_number_should_be "333" local_prefix_should_be nil prefix_should_be "444" real_number_should_be "2944444333" real_number_without_local_prefix_should_be "2944444333" region_should_be "R" - default_format_should_be "02944 444 333" end end \ No newline at end of file test/test_country_code_54.rb phonenumber.gemspec ac248789f41b5749a255a1aa380c2d558dd781c5 Norman Clarke norman@randomba.org http://github.com/norman/phonenumber/commit/cd7e8106411455dc3f8db35beb6a06d05a82d48e cd7e8106411455dc3f8db35beb6a06d05a82d48e 2009-04-16T09:59:19-07:00 2009-04-16T09:59:19-07:00 Improved Buenos Aires city phone number normalization. ab95018c30de90c5654e7ac65fa7ecc393bc08ad Norman Clarke norman@randomba.org