phony 2.19.2 → 2.20.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a25ea5ae1863104772974d3d8a632ef53bd45563a583d4598850c0488d319613
-  data.tar.gz: eaf8164939b8f6b86f0923f808d939f357bff541d4edbdea8471524c3c7d1e00
+  metadata.gz: b309483112eea98930ed42b246d6df922d06e268212e696aa23c28035956f65c
+  data.tar.gz: 1ee4fbc7968e7bbc3d90ac062635c2cc810d9aa3890103aeeb03fd13dbddedc5
 SHA512:
-  metadata.gz: 7f0a932b5089196f06e373fb83cb1586304ce6ac8a1764d8b6b6be97a7a8c3edec1b1017ce0dbaaa5a26a46ab42ae250a3716c7207c669fa2a520a1180ab3f22
-  data.tar.gz: 0f58eaca4e4b4981e6ebe92ad309f51d3607567976dd106881ad453adeca1d63756df3ed2f4693f14a79f135db00ac3ec6c4b5efff1fe8818bad291a6c6db5b1
+  metadata.gz: 76d9ad6a66e4df3eecdd12338ac140f3f93eb8fde71975c01035373f1f4074a9590d32251f50ef0207949f23561cc9b72ae83b1d3960148c23cb3156c9c172ad
+  data.tar.gz: a4e5c31d362c9afbca54e4fd7248569b008d405ea4b2ea52891f3f4b84cc01514f982e79a80a619886cb57f5c142c55de9342f8c1af4a7df1f9893ea1182dfd7

data/README.textile

@@ -104,7 +104,11 @@ For example, when just loading the NANP CC, the retained memory usage is ~63kB.
 
 h2. List of Handled Countries
 
-Mildly unmaintained list: Abhas, Afghan, Algerian, Argentina, Austrian, Australian, Azerbaijani, Belgian, Brazilian, Cambodian, Chilean, Chinese, Croatian, Cuban, Cypriot, Czech, Danish, Dutch, Egyptian, El Salvadorian, Estonian, French, German, Ghanan, Gibraltar, Greek, Haiti, Hong Kong, Hungarian, Indian, Iran, Irish, Israel, Italian, Japanese, Kazakh, Liberian, Lithuanian, Luxembourgian, Malaysian, Malta, Mexican, Monaco, Morocco, New Zealand, Nigerian, Norwegian, Peruvian, Polish, Romanian, Russian, Rwandan, Seychelles, Singapore, Slovakian, South African, South Korean, South Osetian, Spanish, Sri Lankan, Sudan, Swedish, Swiss, Thailand, Tunisian, Turkish, Liechtenstein, UK, US, Venezuelan, Vietnamese, and Zambian numbers.
+Mildly unmaintained list: Abhas, Afghan, Algerian, Argentina, Austrian, Australian, Azerbaijani, Belgian, Brazilian, Cambodian, Chilean, Chinese, Croatian, Cuban, Cypriot, Czech, Danish, Dutch, Egyptian, El Salvadorian, Estonian, French, German, Ghanan, Gibraltar, Greek, Haiti, Hong Kong, Hungarian, Indian, Iran, Irish, Israel, Italian, Japanese, Kazakh, Liberian, Lithuanian, Luxembourgian, Malaysian, Malta, Mauritian, Mexican, Monaco, Morocco, New Zealand, Nigerian, Norwegian, Peruvian, Polish, Romanian, Russian, Rwandan, Seychelles, Singapore, Slovakian, South African, South Korean, South Osetian, Spanish, Sri Lankan, Sudan, Swedish, Swiss, Thailand, Tunisian, Turkish, Liechtenstein, UK, US, Venezuelan, Vietnamese, and Zambian numbers.
+
+h2. Proud Sponsors
+
+* Renuo AG (July 22 –): "Github":https://github.com/renuo, "Homepage":https://www.renuo.ch
 
 h2. License
 

data/lib/phony/countries/brazil.rb

@@ -4,7 +4,7 @@
 #
 #
 # NDC Reference
-# http://www.anatel.gov.br/hotsites/CodigosNacionaisLocalidade/TelefoneCelular-CodigosDeArea.htm
+# https://www.gov.br/anatel/pt-br/regulado/numeracao/plano-de-numeracao-brasileiro
 
  # 11 #Sao Paulo
  # 12 #Sao Paulo
@@ -99,7 +99,7 @@ special_numbers_4 = %w{ 3003 4003 4004 4020 }
 Phony.define do
   country '55',
     match(/^#{ndcs}9\d{8}$/)     >> split(5,4) |
-    match(/^#{ndcs}\d{8}$/)      >> split(4,4) |
+    match(/^#{ndcs}[2-5]\d{7}$/) >> split(4,4) |
     one_of(special_numbers_3_4)  >> split(3,4) |
     one_of(special_numbers_4)    >> split(4) |
     one_of(service)              >> split(3) |

data/lib/phony/countries/italy.rb

@@ -3,14 +3,14 @@
 # Italian phone numbers.
 #
 # http://en.wikipedia.org/wiki/Telephone_numbers_in_Italy
-#
+# https://www.itu.int/dms_pub/itu-t/oth/02/02/T020200006B0001PDFE.pdf
 
-ndcs_2digit = [
+ndcs_1digit = [
   '02', # Milan
   '06', # Rome (including State of Vatican City) and Aprilia
 ]
 
-ndcs_3digit = [
+ndcs_2digit = [
  '010', # Genoa
  '011', # Turin
  '015', # Biella
@@ -42,7 +42,7 @@ ndcs_3digit = [
  '099', # Taranto
 ]
 
-ndcs_4digit = [
+ndcs_3digit = [
   '0121', # Pinerolo
   '0122', # Sestrieres, Bardonecchia and other Susa Valley mountain resorts
   '0123', # Lanzo Torinese
@@ -256,7 +256,8 @@ ndcs_4digit = [
 # but this was not frozen so easily.
 mobile = %w(300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399)
 
-service = [ # Not exhaustive.
+# Not exhaustive.
+service = [
  '112',
  '113',
  '115',
@@ -268,21 +269,38 @@ service = [ # Not exhaustive.
  '1530'
 ]
 
+# Not exhaustive. Unused below - just for info purposes.
+free_of_charge_services = [
+  '800',
+  '803'
+]
+
 Phony.define do
+  # Note: The 0 does not count towards NDC number length.
   country '39', trunk('', normalize: false) |
                 one_of(*service)     >> split(3,3) |
                 one_of(*mobile)      >> split(3,4,-1..1) |
-                one_of(*ndcs_2digit) >> split(4, 2..4) |
-                one_of(*ndcs_3digit) >> matched_split(
-                  /^1\d{6}$/ => [7],
-                  /^1\d{7}$/ => [8],
-                  /^[^1]\d{5}$/ => [6],
-                  /^[^1]\d{6}$/ => [7]
+                match(/^(800)\d{6}$/) >> split(6) | # 3-6, Special handling for 800 numbers.
+                match(/^(803)\d{3}$/) >> split(3) | # 3-3, Special handling for 803 numbers.
+                one_of(*ndcs_1digit) >> matched_split(
+                  /\A\d{5}\z/ => [5],
+                  /\A\d{6}\z/ => [4,2],
+                  /\A\d{7}\z/ => [4,3],
+                  /\A\d{8}\z/ => [4,4],
+                  /\A\d{9}\z/ => [4,5]
                 ) |
-                one_of(*ndcs_4digit) >> matched_split(
-                /^1\d{5}$/ => [6],
-                /^1\d{6}$/ => [7],
-                /^[^1]\d{4}$/ => [5],
-                /^[^1]\d{5}$/ => [3,3]
+                one_of(*ndcs_2digit) >> matched_split(
+                  /\A\d{4}\z/ => [4],
+                  /\A\d{5}\z/ => [5],
+                  /\A\d{6}\z/ => [6],
+                  /\A\d{7}\z/ => [7],
+                  /\A\d{8}\z/ => [8]
+                ) |
+                one_of(*ndcs_3digit) >> matched_split(
+                  /\A\d{4}\z/ => [4],
+                  /\A1\d{5}\z/ => [6],
+                  /\A1\d{6}\z/ => [7],
+                  /\A[^1]\d{4}\z/ => [5],
+                  /\A[^1]\d{5}\z/ => [3,3]
                 )
 end

data/lib/phony/countries/japan.rb

@@ -403,7 +403,56 @@ Phony.define do
   country '81',
     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(800))                        >> split(3,4) | # freephone
@@ -414,6 +463,6 @@ Phony.define do
     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/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

@@ -127,6 +127,9 @@ Phony.define do
     one_of(ndcs_with_7_subscriber_digits) >> split(3,4) |
     one_of(ndcs_with_8_subscriber_digits) >> split(4,4) |
     one_of(mobile_with_trunk)             >> split(5..8)|
+    one_of('1900')                        >> matched_split(
+      /\A\d{4}\z/ => [4],
+      /\A\d{6}\z/ => [6]) | # Premium rate
     # Govt reserved
     fixed(80)                             >> split(5)   |
     fixed(69)                             >> split(1,5)

data/lib/phony/countries.rb

@@ -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(/^(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
+                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)
@@ -230,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)
@@ -360,12 +363,29 @@ Phony.define do
     trunk('', :normalize => false) |
     fixed(2) >> split(2,2,2,2)
 
-  country '226', none >> split(4,4) # Burkina Faso http://www.wtng.info/wtng-226-bf.html
+  # 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 '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
 
-  country '230', none >> split(4,4) # Mauritius http://www.wtng.info/wtng-230-mu.html
+  # Mauritius
+  # http://www.wtng.info/wtng-230-mu.html
+  # https://en.wikipedia.org/wiki/Telephone_numbers_in_Mauritius
+  #
+  # There is no trunk code for this country.
+  country '230',
+    none >> matched_split(
+      /^5\d{7}$/ => [1,3,4], # Mobile
+      /^[246]\d{6}$/ => [3,4], # Landline
+    )
 
   # Liberia
   # https://www.numberingplans.com/?page=plans&sub=phonenr&alpha_2_input=LR
@@ -474,7 +494,7 @@ Phony.define do
     one_of('802') >> split(3,3) | # national rate
     one_of(%w(251 252 271 272 281 282 293)) >> split(3,2) |
     one_of(%w(21 23 24 26)) >> split(3,3) |
-    one_of(%w(82 84 86)) >> split(4,3) | # mobile
+    one_of(%w(82 83 84 85 86 87)) >> split(4,3) | # mobile
     one_of('89') >> split(4,3) | # satellite GMPCS
     one_of('7') >> split(4,4) | # universal access
     one_of('9') >> split(4,4) | # premium rate
@@ -485,27 +505,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(/^([79][5678]\d)/) >> split(6)   | # Mobile
+    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') |
@@ -629,12 +654,12 @@ Phony.define do
           match(/^(2[467]\d{2})\d{4}$/)       >> split(2,2)     | # 4-digit NDC
           match(/^(6\d[18])\d+$/)             >> split(3,3)     | # mobile
           match(/^(60\d{2})\d{8}$/)           >> split(2,2,2,2) | # mobile machine to machine
-          match(/^((2[^467]|[3-9]\d))\d{4}$/) >> split(2,2)     | # 2-digit NDC Regular 6 digits number
-          match(/^((2[^467]|[3-9]\d))\d{4}$/) >> split(2,2)     | # 2-digit NDC Regular 6 digits number
-          match(/^((2[^467]|[3-9]\d))\d{5}$/) >> split(2,2,1)   | # 2-digit NDC Regular 6 digits number w/ 1 digit extension
-          match(/^((2[^467]|[3-9]\d))\d{6}$/) >> split(2,2,2)   | # 2-digit NDC Regular 8 digits number or 6 digits with 2 digits extension
-          match(/^((2[^467]|[3-9]\d))\d{7}$/) >> split(2,2,3)   | # 2-digit NDC Regular 6 digits with 4 digits extension
-          match(/^((2[^467]|[3-9]\d))\d{8}$/) >> split(2,2,4)   | # 2-digit NDC Regular 6 digits number with 4 digits extension
+          match(/^((2[^467]|[2-9]\d))\d{4}$/) >> split(2,2)     | # 2-digit NDC Regular 6 digits number
+          match(/^((2[^467]|[2-9]\d))\d{4}$/) >> split(2,2)     | # 2-digit NDC Regular 6 digits number
+          match(/^((2[^467]|[2-9]\d))\d{5}$/) >> split(2,2,1)   | # 2-digit NDC Regular 6 digits number w/ 1 digit extension
+          match(/^((2[^467]|[2-9]\d))\d{6}$/) >> split(2,2,2)   | # 2-digit NDC Regular 8 digits number or 6 digits with 2 digits extension
+          match(/^((2[^467]|[2-9]\d))\d{7}$/) >> split(2,2,3)   | # 2-digit NDC Regular 6 digits with 4 digits extension
+          match(/^((2[^467]|[2-9]\d))\d{8}$/) >> split(2,2,4)   | # 2-digit NDC Regular 6 digits number with 4 digits extension
           match(/^(\d{2})\d{3}$/)             >> split(2,2,1)     # fallback for 5 digit number
 
   # country '353' # Republic of Ireland, see special file.
@@ -904,7 +929,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
 
@@ -971,12 +1003,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
@@ -992,7 +1024,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 # -
@@ -1000,7 +1035,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 # -
@@ -1044,6 +1079,7 @@ Phony.define do
 
   # Lao People's Democratic Republic http://www.wtng.info/wtng-856-la.html, https://www.numberingplans.com
   country '856',
+          trunk('0') |
           one_of('30') >> split(3,4) | # geographic
           one_of('20') >> split(4,4) | # mobile
           fixed(2) >> split(3,3) # geographic

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

data/lib/phony/country_codes.rb

@@ -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/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_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/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