phony 2.18.3 → 2.20.5

data/lib/phony/countries/japan.rb

@@ -166,6 +166,7 @@ ndcs_with_6_subscriber_numbers = %w(
 422
 428
 436
+438
 439
 460
 463
@@ -281,7 +282,6 @@ ndcs_with_6_subscriber_numbers = %w(
 846
 847
 848
-849
 852
 853
 854
@@ -361,7 +361,6 @@ ndcs_with_5_subscriber_numbers = %w(
 1374
 1377
 1392
-1394
 1397
 1398
 1456
@@ -393,7 +392,6 @@ ndcs_with_5_subscriber_numbers = %w(
 8477
 8512
 8514
-8636
 9496
 9802
 9912
@@ -403,16 +401,68 @@ ndcs_with_5_subscriber_numbers = %w(
 
 Phony.define do
   country '81',
-    trunk('0') |
-    one_of('20', '50', '60', '70', '90')   >> split(4,4) | # mobile, VoIP telephony
+    trunk('0', normalize: true, format: true, split: true) |
+    one_of(%w(20 50 60 70 90))             >> split(4,4) | # mobile, VoIP telephony
+    match(/\A(597)9[0178]\d+\z/)           >> split(2,4) |
     one_of(ndcs_with_5_subscriber_numbers) >> split(1,4) |
+    match(/\A(4)70[019]\d+\z/)             >> split(4,4) |
+    match(/\A(4)71\d+\z/)                  >> split(4,4) |
+    match(/\A(4)20\d+\z/)                  >> split(4,4) |
+    match(/\A(4)29[02-69]\d+\z/)           >> split(4,4) |
+    match(/\A(15)4[018]\d+\z/)             >> split(3,4) |
+    match(/\A(22)3[014-9]\d+\z/)           >> split(3,4) |
+    match(/\A(25)[04][01]\d+\z/)           >> split(3,4) |
+    match(/\A(25)5[0-69]\d+\z/)            >> split(3,4) |
+    match(/\A(25)[68][01]\d+\z/)           >> split(3,4) |
+    match(/\A(25)7[015-9]\d+\z/)           >> split(3,4) |
+    match(/\A(25)917\d+\z/)                >> split(3,4) |
+    match(/\A(25)999\d+\z/)                >> split(3,4) |
+    match(/\A(26)4[016-9]\d+\z/)           >> split(3,4) |
+    match(/\A(28)3[0134]\d+\z/)            >> split(3,4) |
+    match(/\A(28)9[0-5]\d+\z/)             >> split(3,4) |
+    match(/\A(29)17\d+\z/)                 >> split(3,4) |
+    match(/\A(29)3[015-9]\d+\z/)           >> split(3,4) |
+    match(/\A(42)21\d+\z/)                 >> split(3,4) |
+    match(/\A(42)8[01456]\d+\z/)           >> split(3,4) |
+    match(/\A(47)5[019]\d+\z/)             >> split(3,4) |
+    match(/\A(47)9[019]\d+\z/)             >> split(3,4) |
+    match(/\A(59)8[019]\d+\z/)             >> split(3,4) |
+    match(/\A(59)9[01]\d+\z/)              >> split(3,4) |
+    match(/\A(79)4[0-59]\d+\z/)            >> split(3,4) |
+    match(/\A(79)5[01569]\d+\z/)           >> split(3,4) |
+    match(/\A(79)6[0167]\d+\z/)            >> split(3,4) |
+    match(/\A(82)4[0-39]\d+\z/)            >> split(3,4) |
+    match(/\A(82)9[019]\d+\z/)             >> split(3,4) |
+    match(/\A(82)92[1-9]\d+\z/)            >> split(3,4) |
+    match(/\A(82)94[1-3]\d+\z/)            >> split(3,4) |
+    match(/\A(82)96[0-47-9]\d+\z/)         >> split(3,4) |
+    match(/\A(82)965[01346-9]\d+\z/)       >> split(3,4) |
+    match(/\A(82)966[1-9]\d+\z/)           >> split(3,4) |
+    match(/\A(83)76[6-8]\d+\z/)            >> split(3,4) |
+    match(/\A(83)7[01789]\d+\z/)           >> split(3,4) |
+    match(/\A(83)8[01]\d+\z/)              >> split(3,4) |
+    match(/\A(86)36[23]\d+\z/)             >> split(3,4) |
+    match(/\A(86)5[0-389]\d+\z/)           >> split(3,4) |
+    match(/\A(86)55[23]\d+\z/)             >> split(3,4) |
+    match(/\A(86)[01]\d+\z/)               >> split(3,4) |
+    match(/\A(86)9[178]\d+\z/)             >> split(3,4) |
+    match(/\A(86)72\d+\z/)                 >> split(3,4) |
+    match(/\A(86)8[019]\d+\z/)             >> split(3,4) |
+    match(/\A(86)9[0145]\d+\z/)            >> split(3,4) |
+    match(/\A(86)99[014-9]\d+\z/)          >> split(3,4) |
+    match(/\A(99)331\d+\z/)                >> split(3,4) |
+    match(/\A(99)34[357]\d+\z/)            >> split(3,4) |
+    match(/\A(99)4[0178]\d+\z/)            >> split(3,4) |
     one_of(ndcs_with_6_subscriber_numbers) >> split(2,4) |
     one_of(%w(120))                        >> split(3,3) | # freephone
-    one_of(%w(120 800))                    >> split(3,4) | # freephone
+    one_of(%w(800))                        >> split(3,4) | # freephone
+    one_of(%w(180 570))                    >> split(3,3) | # Tele-gong/Tele-dome, Navi-dial
+    one_of(%w(170 990))                    >> split(2,4) | # Dengon-dial, Dial Q2 (discontinued)
+    one_of(%w(80))                         >> split(4,4) | # mobile
     one_of(ndcs_with_7_subscriber_numbers) >> split(3,4) |
     one_of(ndcs_with_8_subscriber_numbers) >> split(4,4) |
     # TODO: 91(NDC) N(S)N length: 5-13 - Non-geographic number (Direct subscriber telephone service (legacy))
     fixed(2) >> split(4,4),
-    :local_space => :- ,
-    :space => :-
+    local_space: :-,
+    space: :-
 end

data/lib/phony/countries/libya.rb

@@ -111,6 +111,6 @@ Phony.define do
           one_of(ndcs_with_5_subscriber_numbers) >> split(3,2) |
           one_of(ndcs_with_6_subscriber_numbers) >> split(3,3) |
           one_of(ndcs_with_7_subscriber_numbers) >> split(4,3) |
-          one_of(%w(91 92)) >> split(4,3) | # mobile
+          one_of(%w(91 92 94 95)) >> split(4,3) | # mobile
           fixed(2) >> split(3,3)
 end

data/lib/phony/countries/serbia.rb

@@ -8,6 +8,9 @@ Phony.define do
     trunk('0') |
     one_of(%w(800)) >> split(3,2) | # freephone
     one_of(%w(808)) >> split(3,2) | # payphone
+    one_of(%w(677 678)) >> matched_split(
+        /\A\d{4}\z/ => [3],
+        /\A\d+\z/ => [3,3]) |
     one_of(%w(230)) >> matched_split(
         /\A\d{4}\z/ => [4],
         /\A\d+\z/ => [3,2]) |
@@ -21,6 +24,7 @@ Phony.define do
     one_of(%w(72)) >> split(3,3) | # ISP
     one_of(%w(60 61 68 69)) >> matched_split(
         /\A\d{3}\z/ => [3],
+        /\A\d{6}\z/ => [3,3],
         /\A\d{7}\z/ => [3,4],
         /\A\d+\z/ => [3,3,4]) | # mobile, voicemail (mobile)
     one_of(%w(66 63)) >> matched_split(
@@ -40,4 +44,4 @@ Phony.define do
     fixed(2) >> matched_split(
         /\A\d{5}\z/ => [3,2],
         /\A\d+\z/ => [3,3])
-end
+end

data/lib/phony/countries/taiwan.rb

@@ -11,6 +11,7 @@ Phony.define do
     match(/\A(836)\d{5}\z/) >> split(1,4) | # 馬祖, start with 0836, plus 5 digits
     match(/\A(82)\d{6}\z/)  >> split(2,4) | # 金門, start with 082, plus 6 digits
     match(/\A(89)\d{6}\z/)  >> split(2,4) | # 臺東, start with 089, plus 6 digits
+    match(/\A(80\d)\d{6}\z/)>> split(3,4) | # Toll-free number
     match(/\A(8)\d{7}\z/)   >> split(3,4) | # 屏東, start with 08, plus 7 digits
     match(/\A(49)\d{7}\z/)  >> split(3,4) | # 南投, start with 049, plus 7 digits
     one_of(%w(4)) >> matched_split(

data/lib/phony/countries/vietnam.rb

@@ -104,6 +104,7 @@ mobile = [
   '84', # Vinaphone
   '85', # Vinaphone
   '86', # Viettel
+  '87', # Itelecom
   '88', # Vinaphone
   '89',  # MobiFone,
   '90', # MobiFone

data/lib/phony/countries.rb

@@ -69,7 +69,7 @@ Phony.define do
   country '20', one_of('800')    >> split(7..7) | # Egypt toll free
                 one_of('3')      >> split(7..7) | # Alexandria
                 one_of('2')      >> split(8..8) | # Cairo/Giza
-                one_of('10', '11', '12') >> split(8..8) | # the 3 mobile operators
+                one_of('10', '11', '12', '15') >> split(8..8) | # the 4 mobile operators
                 fixed(2)         >> split(7..7) # all the other 24 provinces
 
   # South Africa.
@@ -96,15 +96,16 @@ Phony.define do
   # Belgium.
   #
   # http://en.wikipedia.org/wiki/Telephone_numbers_in_Belgium
+  # https://www.bipt.be/operators/publication/national-numbering-plan
   #
   country '32', trunk('0') |
-                match(/^(7[08])\d+$/)       >> split(3,3)   | # Premium and national rate Services
-                match(/^(800|90\d)\d+$/)    >> split(2,3)   | # Toll free service and premium numbers
-                match(/^(46[05678])\d{6}$/) >> split(2,2,2) | # Mobile (Lycamobile, Telenet, Join Experience, Proximus 0460)
-                match(/^(4[789]\d)\d{6}$/)  >> split(2,2,2) | # Mobile
-                match(/^(456)\d{6}$/)       >> split(2,2,2) | # Mobile Vikings
-                one_of('2','3','4','9')     >> split(3,2,2) | # Short NDCs
-                fixed(2)                    >> split(2,2,2)   # 2-digit NDCs
+                match(/^(7[08])\d+$/)        >> split(3,3)   | # Premium and national rate Services
+                match(/^(800|90\d)\d+$/)     >> split(2,3)   | # Toll free service and premium numbers
+                match(/^(46[056789])\d{6}$/) >> split(2,2,2) | # Mobile (Lycamobile, Telenet, Join Experience, Proximus 0460)
+                match(/^(4[789]\d)\d{6}$/)   >> split(2,2,2) | # Mobile
+                match(/^(45[56])\d{6}$/)     >> split(2,2,2) | # Mobile Vikings and Voo
+                one_of('2','3','4','9')      >> split(3,2,2) | # Short NDCs
+                fixed(2)                     >> split(2,2,2)   # 2-digit NDCs
 
   # France.
   #
@@ -154,6 +155,7 @@ Phony.define do
   #
   country '41',
           trunk('0', normalize: true) |
+          match(/^(860)\d+$/) >> split(2, 3, 2, 2) | # Voice Mail access
           match(/^(8(?:00|4[0248]))\d+$/) >> split(3,3) |  # Freecall/Shared Cost
           match(/^(90[016])\d+$/)       >> split(3,3) |  # Business
           fixed(2)                      >> split(3,2,2)
@@ -213,14 +215,7 @@ Phony.define do
           fixed(3)                           >> split(7)   # 3-digit NDCs
 
   # Argentine Republic.
-  #
-  country '54',
-          one_of('11', '911') >> split(4,4) | # Fixed & Mobile
-          match(/^(22[0137]|237|26[14]|29[179]|34[1235]|35[138]|38[1578])/) >> split(3,4) |        # Fixed
-          match(/^(922[0137]|9237|926[14]|929[179]|934[1235]|935[138]|938[1578])/) >> split(3,4) | # Mobile
-          match(/^(9\d{4})/) >> split(2,4) | # Mobile
-          match(/^([68]\d{2})/) >> split(3,4) | # Service
-          fixed(4) >> split(2,4) # Fixed
+  # country '54' # argentina, see special file.
 
   # Brazil (Federative Republic of).
   # http://en.wikipedia.org/wiki/Telephone_numbers_in_Brazil
@@ -237,6 +232,7 @@ Phony.define do
   # http://www.itu.int/oth/T020200002C/en
   country '57',
     match(/\A(3\d\d)\d+\z/) >> split(3,4) | # mobile (300 310 311 312 313 315 316)
+    match(/\A(60\d)\d+\z/) >> split(3,4) |
     fixed(1) >> split(3,4)
 
   # Venezuela (Bolivarian Republic of)
@@ -264,6 +260,7 @@ Phony.define do
     trunk('0') |
     # 7/10 digits for area code '2'.
     match(/\A(2)\d{10}\z/) >> split(10) |
+    match(/\A(2)\d{8}\z/) >> split(8) |
     one_of('2') >> split(7) |
     # mobile
     match(/\A([89]\d\d)\d{7}\z/) >> split(7) |
@@ -358,15 +355,23 @@ Phony.define do
 
   # Côte d'Ivoire
   # http://www.wtng.info/wtng-225-ci.html
-  # http://www.itu.int/dms_pub/itu-t/oth/02/02/T02020000310001PDFE.pdf
+  # https://www.itu.int/dms_pub/itu-t/oth/02/02/T02020000310006PDFE.pdf
   # http://en.wikipedia.org/wiki/Telephone_numbers_in_Ivory_Coast
   #
   # There is no trunk code for this country and several of the mobile prefixes start with 0
   country '225',
     trunk('', :normalize => false) |
-    fixed(2) >> split(2,2,2)
+    fixed(2) >> split(2,2,2,2)
+
+  # Burkina Faso
+  # http://www.wtng.info/wtng-226-bf.html
+  # https://en.wikipedia.org/wiki/Telephone_numbers_in_Burkina_Faso
+  #
+  # There is no trunk code for this country and several of the mobile prefixes start with 0
+  country '226',
+    trunk('', normalize: false) |
+    none >> split(2,2,2,2)
 
-  country '226', none >> split(4,4) # Burkina Faso http://www.wtng.info/wtng-226-bf.html
   country '227', none >> split(4,4) # Niger http://www.wtng.info/wtng-227-ne.html
   country '228', none >> split(4,4) # Togolese Republic http://www.wtng.info/wtng-228-tg.html
   country '229', none >> split(4,4) # Benin http://www.itu.int/oth/T0202000017/en
@@ -389,18 +394,25 @@ Phony.define do
   # Ghana
   #
   # From http://www.itu.int/oth/T0202000052/en
+  # https://en.wikipedia.org/wiki/Telephone_numbers_in_Ghana
   #
-  country '233', fixed(2) >> split(3,4)
+  country '233', trunk('0') | fixed(2) >> split(3,4)
 
   # Nigeria
-  # Wikipedia says 3 4 split, many local number with no splitting
+  # 3 4 split for mobile and 1 digit NDC, 3 2 or 3 3 otherwise
+  # Many local numbers with no splitting
   #
-  # mobile telephony number allocation taken from: http://www.ncc.gov.ng/index.php?option=com_content&view=article&id=113&Itemid=102
+  # mobile telephony number allocation taken from:
+  # https://www.ncc.gov.ng/technical-regulation/standards/numbering and
+  # https://www.itu.int/oth/T020200009C/en
   country '234',
-    match(/^([7-9]0\d)\d+$/) >> split(3,4) | # Mobile
-    match(/^(81\d)\d+$/)     >> split(3,4) | # Mobile
-    one_of('1', '2', '9')    >> split(3,4) | # Lagos, Ibadan and Abuja
-    fixed(2)                 >> split(3,4)   # 2-digit NDC
+    match(/^([7-9]0\d)\d+$/)            >> split(3,4)    | # Mobile
+    match(/^(81\d)\d+$/)                >> split(3,4)    | # Mobile
+    match(/^(91\d)\d+$/)                >> split(3,4)    | # Mobile
+    one_of('1', '2')                    >> split(3,3..4) | # Lagos, Ibadan
+    one_of('9')                         >> split(3,4)    | # Abuja
+    one_of((30..79).map(&:to_s))        >> split(3,2..3) | # 2-digit NDC
+    one_of(%w(82 83 84 85 86 87 88 89)) >> split(3,3)      # 2-digit NDC
 
   country '235', none >> split(4,4) # Chad http://www.wtng.info/wtng-235-td.html
   country '236', none >> split(4,4) # Central African Republic http://www.wtng.info/wtng-236-cf.html
@@ -409,7 +421,9 @@ Phony.define do
   country '239', fixed(1) >> split(3,3) # Sao Tome and Principe, http://www.wtng.info/wtng-239-st.html
 
   country '240', none >> split(3,3,3) # Equatorial Guinea
-  country '241', fixed(1) >> split(3,3) # Gabonese Republic http://www.wtng.info/wtng-241-ga.html
+  country '241',
+    match(/^(\d)\d{6}$/) >> split(3,3) |  # Gabonese Republic http://www.wtng.info/wtng-241-ga.html
+    match(/^(\d\d)\d{6}$/) >> split(2,2,2)    # 2019 update https://en.wikipedia.org/wiki/Telephone_numbers_in_Gabon
   country '242', # Congo http://www.wtng.info/wtng-242-cg.html
     trunk('', :normalize => false) |
     none >> split(4,5)
@@ -429,9 +443,9 @@ Phony.define do
   # http://en.wikipedia.org/wiki/Telephone_numbers_in_Rwanda
   country '250',
     trunk('0') |
-    one_of('25')       >> split(7) | # Geographic, fixed
-    match(/^(7[238])/) >> split(7) | # Non-geographic, mobile
-    one_of('06')       >> split(6)   # Satellite
+    one_of('25')        >> split(7) | # Geographic, fixed
+    match(/^(7[2389])/) >> split(7) | # Non-geographic, mobile
+    one_of('06')        >> split(6)   # Satellite
 
   country '251', fixed(2) >> split(3, 4) # Ethiopia http://www.wtng.info/wtng-251-et.html
 
@@ -482,27 +496,32 @@ Phony.define do
   # Zambia
   # http://www.wtng.info/wtng-260-zm.html
   # https://github.com/googlei18n/libphonenumber/
+  # https://en.wikipedia.org/wiki/Telephone_numbers_in_Zambia
+
   country '260',
-    match(/^(9(5[034589]|[67]\d))/) >> split(6)   | # Mobile
-    match(/^(800)/)                 >> split(3,3) | # Toll free
-    match(/^(21[1-8])/)             >> split(6)     # Fixed
+    trunk('0') |
+    match(/^(75|76|77|94|95|96|97)/) >> split(3, 4) | # Mobile
+    match(/^(800)/)          >> split(3,3) | # Toll free
+    match(/^(21[1-8])/)      >> split(6)     # Fixed
 
-  # Madagascar http://www.wtng.info/wtng-261-mg.html
+  # Madagascar
+  # https://en.wikipedia.org/wiki/Telephone_numbers_in_Madagascar
   # http://www.itu.int/oth/T020200007F/en
   country '261',
-          none >> matched_split(
-              /\A200\d+\z/ => [2,3,3,3], # Telecom Malagasy (Telma)
-              /\A20\d+\z/ => [2,3,4], # Telecom Malagasy (Telma)
-              /\A23\d+\z/ => [2,3,4], # Digitel
-              /\A30\d+\z/ => [2,3,4], # mobile Madamobil (CDMA2000)
-              /\A31\d+\z/ => [2,3,4], # mobile Airtel Madagascar
-              /\A32\d+\z/ => [2,3,4], # mobile Orange Madagascar
-              /\A33\d+\z/ => [2,3,4], # mobile Airtel Madagascar
-              /\A34\d+\z/ => [2,3,4], # mobile Telecom Malagasy (Telma)
-              /\A5\d+\z/ => [3,3,3],  # pager
-              /\A22\d+\z/ => [3,3,3], # satellite GULFSAT Téléphonie
-              /\A6\d+\z/ => [3,3,3]   # satellite
-          )
+          # none >> matched_split(
+          #     /\A20\d+\z/ => [2,2,3,2], # Telecom Malagasy (Telma)
+          #     /\A32\d+\z/ => [2,2,3,2], # mobile Orange Madagascar
+          #     /\A33\d+\z/ => [2,2,3,2], # mobile Airtel Madagascar
+          #     /\A34\d+\z/ => [2,2,3,2], # mobile Telecom Malagasy (Telma)
+          #     /\A38\d+\z/ => [2,2,3,2], # mobile Telecom Malagasy (Telma)
+          #     /\A39\d+\z  => [2,2,3,2]  # mobile Blueline
+          # ),
+          match(/\A(20)\d+\z/) >> split(2,3,2) | # fix Telecom Malagasy (Telma)
+          match(/\A(32)\d+\z/) >> split(2,3,2) | # mobile Orange Madagascar
+          match(/\A(33)\d+\z/) >> split(2,3,2) | # mobile Airtel Madagascar
+          match(/\A(34)\d+\z/) >> split(2,3,2) | # mobile Telecom Malagasy (Telma)
+          match(/\A(38)\d+\z/) >> split(2,3,2) | # mobile Telecom Malagasy (Telma)
+          match(/\A(39)\d+\z/) >> split(2,3,2)   # mobile Blueline Madagascar
 
   country '262', # Reunion / Mayotte (new) http://www.wtng.info/wtng-262-fr.html
     trunk('0') |
@@ -738,11 +757,12 @@ Phony.define do
   # Monaco
   #
   country '377',
-          one_of('6')  >> split(2,2,2,2) | # mobile
+          one_of('6') >> split(2,2,2,2) | # mobile
           fixed(2) >> split(2,2,2)
 
   # San Marino
   country '378',
+          trunk('', :normalize => false) |
           none >> matched_split(
               /\A\d{6}\z/ => [3,3],
               /\A\d+\z/ => [3,3,4]
@@ -900,7 +920,14 @@ Phony.define do
           )
 
   country '671', todo # Spare code
-  country '672', todo # Australian External Territories
+
+  # Australian External Territories https://en.wikipedia.org/wiki/Telephone_numbers_in_Norfolk_Island
+  # Norfolk Island
+  country '672',
+          fixed(1) >> split(2,3) |
+          match(/^(2\d+)$/) >> split(3) | # Fixed
+          match(/^(5\d+)$/) >> split(3) # Mobile
+
   country '673', fixed(1) >> split(3, 3) # Brunei Darussalam http://www.wtng.info/wtng-673-bn.html
   country '674', none >> split(3, 4) # Nauru (Republic of) http://www.wtng.info/wtng-674-nr.html
 
@@ -967,12 +994,12 @@ Phony.define do
               /\A800\d+\z/ => [3,3], # freephone
               /\A830\d+\z/ => [3,3], # shared cost
               /\A60\d+\z/ => [3,3], # wireless geographic
-              /\A(72|75|76|77)\d+\z/ => [3,4], # mobile
+              /\A(71|72|75|76|77)\d+\z/ => [3,4], # mobile
               /\A84\d+\z/ => [3,4], # wireless geographic
               /\A\d+\z/ => [2,3] # geographic
           )
 
-  country '686', none >> split(2,3) # Kiribati (Republic of) http://www.wtng.info/wtng-686-ki.html
+  country '686', none >> split(8) # Kiribati (Republic of) https://www.numberingplans.com/?page=plans&sub=phonenr&alpha_2_input=KI
   country '687', none >> split(3,3) # New Caledonia (Territoire français d'outre-mer) http://www.wtng.info/wtng-687-nc.html
   country '688', none >> split(5) # Tuvalu http://www.wtng.info/wtng-688-tv.html
   country '689', none >> split(2,2,2,2) # French Polynesia (Territoire français d'outre-mer) http://www.wtng.info/wtng-689-pf.html
@@ -988,7 +1015,10 @@ Phony.define do
   country '698', todo # -
   country '699', todo # -
 
-  country '800', todo # International Freephone Service
+  # International Freephone Service
+  # https://www.itu.int/en/ITU-T/inr/unum/Pages/uifn.aspx
+  country '800', none >> split(8)
+
   country '801', todo # -
   country '802', todo # -
   country '803', todo # -
@@ -996,7 +1026,7 @@ Phony.define do
   country '805', todo # -
   country '806', todo # -
   country '807', todo # -
-  country '808', todo # International Shared Cost Service (ISCS)
+  country '808', none >> split(12) # International Shared Cost Service (ISCS)
   country '809', todo # -
 
   country '830', todo # -

data/lib/phony/country.rb

@@ -97,6 +97,9 @@ module Phony
       end
     end
     def format_cc_ndc trunk, ndc, local, type, space, parentheses, use_trunk
+      # Note: We mark NDCs that are of type "none" with false (nil trips plausible?). This would result in false being printed.
+      #       Therefore we set NDC to nil when formatting.
+      ndc = nil if ndc == false
       case type
       when String
         trunk &&= trunk.format(space, use_trunk)
@@ -125,6 +128,7 @@ module Phony
       end
     end
     def format_ndc ndc, parentheses
+      ndc = nil if ndc == false # TODO
       parentheses ? "(#{ndc})" : ndc
     end
     def format_with_ndc format, cc, ndc, local, space
@@ -156,10 +160,12 @@ module Phony
     #
     # In some cases it doesn't, like Italy.
     #
-    def normalize national_number
+    # Note: Options such as CC
+    #
+    def normalize national_number, options = {}
       clean! national_number
       normalized = @codes.reduce national_number do |number, code|
-        result = code.normalize number
+        result = code.normalize number, options
         break result if result
         number
       end

data/lib/phony/country_codes.rb

@@ -66,7 +66,7 @@ module Phony
         country, cc, number = partial_split number
         country
       end
-      number = country.normalize number
+      number = country.normalize number, cc: cc
       countrify! number, cc
     end
 
@@ -97,9 +97,20 @@ module Phony
 
       # False if it fails the basic check.
       #
-      return false unless (4..16) === normalized.size
+      return false unless (4..16) === normalized.size # unless hints[:check_length] == false
 
       country, cc, rest = partial_split normalized
+      
+      # Was a country calling code given?
+      #
+      if ccc = hints[:ccc]
+        cc, ndc, *local = split ccc
+        
+        raise ArgumentError.new("The provided ccc option is too long and includes more than a cc ('#{cc}') and ndc ('#{ndc}'). It also includes '#{local.join}'.") unless local.size == 1 && local[0].empty?
+        
+        hints[:cc] = cc
+        hints[:ndc] = ndc
+      end
 
       # Country code plausible?
       #
@@ -109,6 +120,8 @@ module Phony
       # Country specific tests.
       #
       country.plausible? rest, hints
+    rescue ArgumentError
+      raise
     rescue StandardError
       return false
     end

data/lib/phony/dsl.rb

@@ -12,9 +12,9 @@ module Phony
   #
   # Phony.define.country ...
   #
-  def self.define
+  def self.define(&block)
     dsl = DSL.new
-    dsl.instance_eval(&Proc.new) if block_given?
+    dsl.instance_eval(&block) if block_given?
     dsl
   end
 

data/lib/phony/local_splitters/fixed.rb

@@ -62,6 +62,8 @@ module Phony
       #
       #
       def plausible? rest, hints = {}
+        return true if hints[:check_length] == false
+        
         @length === rest.inject(0) { |total, part| total + part.size }
       end
       

data/lib/phony/national_code.rb

@@ -26,7 +26,7 @@ module Phony
     #
     # Note: Some cases, like Italy, don't remove the relative zero.
     #
-    def normalize national_number
+    def normalize national_number, options = {}
       national_number.gsub(/\A0+/, EMPTY_STRING)
     end
 

data/lib/phony/national_splitters/none.rb

@@ -31,9 +31,7 @@ module Phony
       # since using nil is dangerous and breaks
       # abstraction)
       #
-      # Note: Actually, it might stay in.
-      #
-      # TODO Flip nil/false?
+      # Note: Decided it stays in. When formatting, it's turned into nil.
       #
       def split national_number
         [nil, false, national_number]

data/lib/phony/trunk_code.rb

@@ -6,9 +6,9 @@ module Phony
     #  * code: The trunk code, e.g. 0.
     #
     # Options:
-    #  * normalize: Remove the trunk code when normalizing (only use if number scheme is defined unambiguously).
-    #  * split: Remove the trunk code when splitting (only use if number scheme is defined unambiguously).
-    #  * format: Add the trunk code when formatting (passing `false` will not add it).
+    #  * normalize: [true (default), false] Remove the trunk code when normalizing (only use if number scheme is defined unambiguously).
+    #  * split: [true, false (default)] Remove the trunk code when splitting (only use if number scheme is defined unambiguously).
+    #  * format: [true (default), false] Add the trunk code when formatting (passing `false` will not add it).
     #
     def initialize code, options = {}
       @code = code
@@ -35,8 +35,8 @@ module Phony
     
     # Normalize normalizes the given national number.
     #
-    def normalize national_number
-      national_number.gsub! @trunk_code_replacement, EMPTY_STRING if @normalize
+    def normalize national_number, options = {}
+      national_number.gsub! @trunk_code_replacement, EMPTY_STRING if @normalize && options[:cc]
       return national_number
     end
     

data/lib/phony.rb

@@ -24,6 +24,7 @@ load File.expand_path '../phony/dsl.rb', __FILE__
 #
 # The ones that need more space to define.
 #
+load File.expand_path '../phony/countries/argentina.rb', __FILE__
 load File.expand_path '../phony/countries/austria.rb', __FILE__
 load File.expand_path '../phony/countries/bangladesh.rb', __FILE__
 load File.expand_path '../phony/countries/belarus.rb', __FILE__

data/spec/functional/config_spec.rb

@@ -18,27 +18,27 @@ describe 'Phony::Config' do
     it 'does not fail when loading all' do
       Phony::Config.load
       
-      Phony.split('15551115511').should == ['1', '555', '111', '5511']
+      expect(Phony.split('15551115511')).to eq ['1', '555', '111', '5511']
     end
     it 'raises when a CC is used that has not been loaded.' do
       Phony::Config.load('41')
       
-      expect { Phony.split('15551115511') }.to raise_error
+      expect { Phony.split('15551115511') }.to raise_error(Phony::SplittingError)
     end
     it 'raises when a CC is used that has not been loaded.' do
       Phony::Config.load(only: ['41'])
       
-      expect { Phony.split('15551115511') }.to raise_error
+      expect { Phony.split('15551115511') }.to raise_error(Phony::SplittingError)
     end
     it 'raises when a CC is used that has not been loaded.' do
       Phony::Config.load(except: ['1'])
       
-      expect { Phony.split('15551115511') }.to raise_error
+      expect { Phony.split('15551115511') }.to raise_error(Phony::SplittingError)
     end
     it 'does not raise when a CC is used that has been loaded.' do
       Phony::Config.load(except: ['41'])
       
-      Phony.split('15551115511').should == ['1', '555', '111', '5511']
+      expect(Phony.split('15551115511')).to eq ['1', '555', '111', '5511']
     end
   end
 end