phony 2.15.25 → 2.20.1

data/lib/phony/countries.rb

@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
+
 # All countries, ordered by country code.
 #
 # Definitions are in the format:
@@ -67,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.
@@ -94,13 +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(/^(70|800|90\d)\d+$/) >> split(3,3)   | # Service
-                match(/^(46[0568])\d{6}$/)  >> split(2,2,2) | # Mobile (Lycamobile, Telenet, Proximus 0460)
-                match(/^(4[789]\d)\d{6}$/)  >> split(2,2,2) | # Mobile
-                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.
   #
@@ -121,11 +126,19 @@ Phony.define do
 
   # Hungary.
   #
+  # http://webpub-ext.nmhh.hu/aga/foldr/DoIndexAction.do
+  #
   country '36',
     trunk('06', normalize: false) |
-    one_of('104','105','107','112') >> split(3,3) | # Service
-    one_of('1')                     >> split(3,4) | # Budapest
-    fixed(2)                        >> split(3,4)   # 2-digit NDCs
+    one_of('104', '105', '107', '112')   >> split(3,3) | # Service
+    one_of('1')                          >> split(3,4) | # Budapest
+    one_of('20', '30', '31', '50', '70') >> split(3,4) | # Mobile
+    one_of('21')                         >> split(3,4) | # VOIP
+    one_of('40', '80', '90', '91')       >> split(3,3) | # Special charged numbers
+    one_of('51')                         >> split(3,3) | # Corporate network, M2M
+    one_of('38')                         >> split(3,4) | # Corporate network, M2M
+    one_of('71')                         >> split(5,5) | # M2M Numbers
+    fixed(2)                             >> split(3,3)   # Geographic numbers
 
   # country '39' # Italy, see special file.
 
@@ -142,7 +155,9 @@ Phony.define do
   #
   country '41',
           trunk('0', normalize: true) |
-          match(/^(8(00|4[0248]))\d+$/) >> split(3,3)|
+          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)
 
   # country '43' # Austria, see special file.
@@ -167,17 +182,19 @@ Phony.define do
   # Note: http://wapedia.mobi/en/Telephone_numbers_in_Poland, mobile not yet correct
   #
   country '48',
-          match(/^(5[013]\d|6[069]\d|7[02389]\d|80[01]|88\d)/) >> split(3,3) |
+          match(/^(45\d|5[0137]\d|6[069]\d|7[02389]\d|80[01]|88\d)/) >> split(3,3) |
           fixed(2)                                             >> split(3,2,2)
 
   # country '49' # Germany, see special file.
 
   # Peru.
-  #
+  # Note: https://en.wikipedia.org/wiki/Telephone_numbers_in_Peru
+  # Note: https://www.numberingplans.com/?page=plans&sub=phonenr&alpha_2_input=PE
   country '51',
           one_of('103', '105') >> split(3,3) | # Service.
-          one_of('1', '9')     >> split(4,4) | # Lima and mobile.
-          fixed(2)             >> split(4,4)   # 2-digit NDCs.
+          one_of('9')          >> split(4,4) | # Mobile.
+          one_of('1')          >> split(3,4) | # Lima.
+          fixed(2)             >> split(3,3)   # 2-digit NDCs.
 
   # Mexico.
   #
@@ -198,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
@@ -222,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)
@@ -234,7 +245,7 @@ Phony.define do
   # Australia.
   #
   country '61',
-    trunk('0') |
+    trunk('0', format: false) |
     match(/^(4\d\d)\d+$/) >> split(3,3) | # Mobile
     match(/^(1800)\d+$/)  >> split(3,3) | # 1800 free call
     match(/^(1300)\d+$/)  >> split(3,3) | # 1300 local rate
@@ -249,9 +260,10 @@ 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(9\d\d)\d{7}\z/) >> split(7) |
+    match(/\A([89]\d\d)\d{7}\z/) >> split(7) |
     match(/\A(9\d\d)\d+\z/) >> split(6) |
     #
     fixed(2) >> split(7)
@@ -263,12 +275,17 @@ Phony.define do
     match(/^(2\d)\d{7}$/) >> split(3,4)   | # Mobile
     match(/^(2\d)\d{6}$/) >> split(3,3)   |
     match(/^(2\d)\d{8}$/) >> split(2,3,3) |
+    match(/^(800)\d{6}$/) >> split(3,3)   | # International 800 service where agreed
+    match(/^(800)\d{7}$/) >> split(3,4)   | # International 800 service where agreed
     fixed(1) >> split(3,4)                  # Rest
 
   # Singapore (Republic of).
   #
   country '65',
-    none >> split(4,4) # TODO Short Codes.
+    none >> matched_split(
+        /^(800)\d{7}$/ => [3,3,4], # International Toll Free Service (ITFS) and Home Country Direct Service (HCDS) Numbers
+        /^\d{8}$/ => [4,4]         # TODO Short Codes
+    )
 
   # Thailand.
   #
@@ -338,13 +355,13 @@ 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)
 
   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
@@ -369,18 +386,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
@@ -389,8 +413,12 @@ 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 '242', none >> split(4,5) # Congo http://www.wtng.info/wtng-242-cg.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)
   country '243', fixed(2) >> split(3,4) # Democratic Republic of the Congo http://www.wtng.info/wtng-243-cd.html
   country '244', one_of('321', '348', '358', '363', '364', '485', '526', '535', '546', '612', '643', '652', '655', '722', '726', '728', '729', '777') >> split(3,3) | # Angola
                  fixed(2) >> split(3,4)
@@ -407,9 +435,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
 
@@ -459,25 +487,33 @@ 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(55|66|7[7-9]))/) >> split(6) | # mobile
-    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 Sacel
-              /\A32\d+\z/ => [2,3,4], # mobile Orange 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') |
@@ -612,8 +648,12 @@ Phony.define do
   # country '353' # Republic of Ireland, see special file.
 
   country '354', none >> split(3,4) # Iceland
+
+  # Albania
+  #  https://en.wikipedia.org/wiki/Telephone_numbers_in_Albania
   country '355', trunk('0') |
-                 one_of('4') >> split(4,3) | # Albania
+                 one_of('4') >> split(3,4) | # Tirana
+                 match(/\A(6[6-9])\d*\z/) >> split(3,4) | # mobile
                  match(/\A(2[24]|3[2-5]|47|5[2-5]|6[6-9]|8[2-5])\d*\z/) >> split(3,3) |
                  fixed(3) >> split(3,2)
 
@@ -634,17 +674,48 @@ Phony.define do
   #
   country '358',
           trunk('0') |
-          match(/^([1-3]0)\d+$/)          >> split(3,3,0..6) | # Service/subscriber
-          match(/^([6-8]00)\d+$/)         >> split(3,3)   | # Service
-          match(/^(457|4\d|50)\d+$/)      >> split(3,2,0..2) | # Mobile
-          one_of('2','3','5','6','8','9') >> split(3,2..4)   | # Short NDCs
-          fixed(2)                        >> split(3,3)     # 2-digit NDCs
+          match(/^(600[3-5]\d|601\d\d|700[3457]\d|7500[12]|7532[12]|7575[12]|7598[12])\d{3,4}$/) >> split(3..4) | # national service numbers, 5-digit NDC
+          match(/^(753[02][3-9]|7575[3-9]|7598[3-9])\d{3,5}$/)                                   >> split(3..5) |  # national subscriber numbers, 5-digit NDC
+          match(/^(73[0-4]\d\d)\d{5}$/)                                                          >> split(5) |     # national subscriber numbers, 5-digit NDC (starting with 073)
+          match(/^(202[023]|209[8-9]|600[0126-9]|700[0126]|7099|800\d)\d{4,5}$/) >> split(2, 2..3) | # national service numbers, 4-digit NDCs
+          match(/^(606\d|70[78]\d)\d{6}$/)                                       >> split(3, 3) |    # national service numbers, 4-digit NDCs (starting with 0606/0707/0708)
+          match(/^(202[14-9]|209[0-7])\d{4,6}$/)                                 >> split(3, 1..3) |  # national subscriber numbers, 4-digit NDCs
+          match(/^(45[45789]\d)\d{2,6}$/)                                        >> split(2, 0..4) | # mobile numbers, 4-digit NDCs
+          match(/^([123]00|602)\d{5,6}$/)                      >> split(3, 2..3) |  # national service numbers, 3-digit NDCs
+          match(/^(10[1-9]|20[13-8]|30[1-9]|73[5-9])\d{5,7}$/) >> split(3, 2..4) | # national subscriber numbers, 3-digit NDCs
+          match(/^(71\d)\d{6}$/)                               >> split(3, 3) |    # national subscriber numbers, 3-digit NDCs (starting with 071)
+          match(/^(73[5-9])\d{7}$/)                            >> split(3, 4) |    # national subscriber numbers, 3-digit NDCs (starting with 073)
+          match(/^(43\d|45[0-36])\d{5,7}$/)                    >> split(3, 2..4) |  # mobile numbers, 3-digit NDCs
+          match(/^(49\d)\d{8}$/)                               >> split(3, 3, 2) |  # mobile numbers, 3-digit NDCs (starting with 049)
+          match(/^([235]9)\d{6,8}$/)        >> split(3, 3, 0..2) | # national subscriber numbers, 2-digit NDCs
+          match(/^(4[0124678]|50)\d{4,8}$/) >> split(3, 1..5) | # mobile numbers, 2-digit NDCs
+          one_of('2','3','5','6','8','9') >> split(3,1..5)   | # Short NDCs
+          fixed(2)                        >> split(3, 0..4)    # 2-digit NDCs
 
   # Bulgaria
   #
+  # Note: https://www.numberingplans.com/?page=plans&sub=phonenr&alpha_2_input=BG
+  # Note: https://en.wikipedia.org/wiki/Telephone_numbers_in_Bulgaria
   country '359',
           trunk('0') |
-          fixed(2) >> split(3,2,2) # Bulgaria
+          match(/^(2)\d{6}$/) >> split(3,3)  | # Landline Sofia (optional last digit)
+          match(/^(2)\d{7}$/) >> split(3,4)  | # Landline Sofia (optional last digit)
+          match(/^(30|31|33|36|37|39|41|43\d|45|47|51|53|55|57|59)\d{5}$/) >> split(5) |
+          match(/^(30|31|32|33|34|35|36|37|38|39|41|42|44|45|46|47|51|52|53|54|55|56|57|58|59)\d{6}$/) >> split(2,4) |
+
+          match(/^(60|61|63|65|66|69)\d{5}$/) >> split(5) |
+          match(/^(60|61|62|63|64|65|66|68|69)\d{6}$/) >> split(6) |
+
+          match(/^(700|701|703|704|705|706|707|708|709)\d{5}$/) >> split(5) |
+          match(/^(701|702|703|704|705|706|707|708|709)\d{4}$/) >> split(4) |
+
+          match(/^(71|72|74|75|77)\d{5}$/) >> split(5) |
+          match(/^(71|72|73|74|75|76|77|78|79)\d{6}$/) >> split(6) |
+
+          match(/^(80\d|81|91|93|95|97)\d{5}$/) >> split(5) |
+          match(/^(81|82|84|86)\d{6}$/) >> split(6) |
+          match(/^(87|88|89)\d{7}$/) >> split(4,3) |
+          match(/^(90|91|92|93|94|95|96|97|98\d|99\d)\d{6}$/) >> split(6)
 
   # Lithuania
   #
@@ -678,11 +749,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]
@@ -696,7 +768,13 @@ Phony.define do
 
   # country '382' # Montenegro, see special file
 
-  country '383', todo # -
+  # Kosovo
+  #
+  # Note: https://en.wikipedia.org/wiki/Telephone_numbers_in_Kosovo
+  country '383',
+          trunk('0') |
+          fixed(2) >> split(3,3)
+
   country '384', todo # -
 
   # country '385' # Croatia, see special file.
@@ -710,7 +788,7 @@ Phony.define do
           one_of('1','2','3','4','5','7')  >> split(3,4) | # Ljubljana, Maribor, Celje, Kranj, Nova Gorica, Novo mesto
           fixed(3)                         >> split(2,3)   # catchall
 
-  country '387', trunk('0') | fixed(2) >> split(3,2,2) # Bosnia and Herzegovina
+  country '387', trunk('0') | fixed(2) >> split(3,3) # Bosnia and Herzegovina
   country '388', trunk('0') | fixed(2) >> split(3,2,2) # Group of countries, shared code
 
   # The Former Yugoslav Republic of Macedonia
@@ -722,9 +800,11 @@ Phony.define do
 
   # Slovak Republic.
   #
-  country '421', match(/^(9\d\d).+$/) >> split(6) | # Mobile
-                 one_of('2')          >> split(8) | # Bratislava
-                 fixed(2)             >> split(7)   # 2-digit NDCs
+  country '421', match(/^(9\d\d).+$/)          >> split(6) | # Mobile
+                 match(/\A(2)1\d{2,4}\z/)      >> split(3..5) | # Bratislava Short
+                 match(/\A(\d{2})1\d{2,4}\z/)  >> split(3..5) | # 2-digit NDCs Short
+                 one_of('2')                   >> split(8) | # Bratislava
+                 fixed(2)                      >> split(7) # 2-digit NDCs
 
   country '422', todo # Spare code
   country '423', none >> split(3,2,2) # Liechtenstein (Principality of)
@@ -796,7 +876,14 @@ Phony.define do
           one_of(%w(11 16 17 18 19)) >> split(3) | # audiotext
           fixed(3) >> split(4) # geographic, audiotext
 
-  country '593', fixed(2) >> split(3, 4) # Ecuador http://www.wtng.info/wtng-593-ec.html
+  # Ecuador http://www.wtng.info/wtng-593-ec.html
+  # https://www.numberingplans.com/?page=plans&sub=phonenr&alpha_2_input=EC&current_page=1
+  # https://en.wikipedia.org/wiki/Telephone_numbers_in_Ecuador
+  country '593',
+    one_of('9') >> split(4,4) |
+    match(/\A([\d]{2})\d{7}\z/) >> split(3,4) |
+    fixed(1) >> split(3,4)
+
   country '594', fixed(3) >> split(3, 3) # French Guiana (French Department of) http://www.wtng.info/wtng-594-fr.html
 
   # country '595' # Paraguay (Republic of), see special file
@@ -842,7 +929,14 @@ Phony.define do
           one_of('115') >> split(4,4) | # voicemail (mobile)
           one_of(%w(28 29)) >> split(3,2) | # pager
           one_of(%w(16 18)) >> split(3,2) | # ISP
-          one_of(%w(71 72 73 76)) >> split(3,3) | # mobile
+          one_of(%w(70 71 72 74 75 76 78 79)) >> split(3,3) | # mobile
+          one_of(%w(731 732 733 734 735 736 738 739)) >> split(2,3) | # mobile
+          one_of(%w(770)) >> split(2,3) | # wireless geographic; Port Moresby, National Capital District
+          one_of(%w(771)) >> split(2,3) | # wireless geographic; Momase region
+          one_of(%w(772)) >> split(2,3) | # wireless geographic; Highlands region
+          one_of(%w(7730)) >> split(1,3) | # wireless geographic; Southern region
+          one_of(%w(774)) >> split(2,3) | # wireless geographic; Islands region
+          one_of(%w(775)) >> split(2,3) | # mobile
           one_of(%w(80 81 82 83)) >> split(3,3) | # freephone
           one_of(%w(90 91 92 93)) >> split(3,3) | # geographic, ISDN
           one_of(%w(3 4 5 6 7 8 9)) >> split(3,3) # geographic
@@ -885,7 +979,7 @@ 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
           )
@@ -906,7 +1000,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 # -
@@ -914,7 +1011,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 # -
@@ -945,12 +1042,14 @@ Phony.define do
   # Hong Kong, China
 
   country '852',
+          match(/^(800)\d+$/) >> split(2, 4) |
           none >> split(4,4)
 
   # Macao, China
   country '853', # Macao, China
     match(/^(28)\d+$/) >> split(2,4) | # Landline.
-    match(/^(6)\d+$/)  >> split(3,4)  # Mobile.
+    match(/^(8)\d+$/)  >> split(3,4) | # Landline.
+    match(/^(6)\d+$/)  >> split(3,4)   # Mobile.
 
   country '854', todo # Spare code
 
@@ -978,7 +1077,10 @@ Phony.define do
   # Bangladesh (People's Republic of)
   #  country '880' # see special file
 
-  country '881', todo # International Mobile, shared code
+  # Global Mobile Satellite System (i.e. Iridium, Globalstar, etc)
+  #  https://www.numberingplans.com/?page=plans&sub=phonenr&alpha_2_input=QM
+  country '881', fixed(1) >> split(3,5)
+
   country '882', todo # International Networks, shared code
   country '883', todo # -
   country '884', todo # -
@@ -1089,17 +1191,18 @@ Phony.define do
           one_of(%w(500 700 900)) >> split(3,3) | # premium rate
           one_of('800') >> matched_split(
               /\A\d{2}\z/ => [2],
+              /\A\d{7}\z/ => [2,3,2],
               /\A\d+\z/ => [2,3,4]) | # freephone
-          one_of(%w(50 52 55 56)) >> split(3,4) | # mobile
+          one_of(%w(50 52 54 55 56 58)) >> split(3,4) | # mobile
           one_of(%w(2 3 4 6 7 9)) >> split(3,4) |
           fixed(1) >> split(3,4)
 
   # Israel (State of) (also works for numbers in Palestinian territories)
   country '972',
     trunk('0') |
-    one_of('1')                            >> split(3,3,3) | # special numbers
-    one_of('2', '3', '4', '8', '9')        >> split(3,4)   | # 1 digit ndc
-    match(/^(5[023456789]|7[23467])\d+$/)  >> split(3,4)     # 2 digit ndc
+    one_of('1')                                 >> split(3,3,3) | # special numbers
+    one_of('2', '3', '4', '8', '9')             >> split(3,4)   | # 1 digit ndc
+    match(/^(5[012345689]|7[234679])\d+$/)      >> split(3,4)     # 2 digit ndc
 
   country '973', none >> split(4,4..4) # Bahrain (Kingdom of) http://www.itu.int/oth/T0202000011/en
 

data/lib/phony/country.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Phony
 
   #
@@ -95,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)
@@ -123,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
@@ -154,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
@@ -168,7 +176,7 @@ module Phony
     #
     def plausible? rest, hints = {}
       local, _, ndc, *rest = internal_split rest
-
+      
       # Element based checking.
       #
       # Note: ndc == false means the country has none.
@@ -185,6 +193,10 @@ module Phony
       #
       ndc_needed = hints[:ndc]
       return false if ndc_needed && !(ndc_needed === ndc)
+      
+      # If there is no local part, we can assume it's not a plausible number.
+      # (Or, not defined correctly in Phony yet)
+      return false unless local
 
       # Local code specific checks.
       #

data/lib/phony/country_codes.rb

@@ -1,6 +1,6 @@
 module Phony
 
-  EMPTY_STRING = ''
+  EMPTY_STRING = '' unless defined?(EMPTY_STRING)
 
   # Handles determining the correct national code handler.
   #
@@ -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
 
@@ -77,7 +77,7 @@ module Phony
       country, cc, national_number = partial_split number
       
       # Split the national number into ndc and local part.
-      trunk, ndc, *local = country.split national_number
+      _, ndc, *local = country.split national_number
       
       [cc, ndc, *local]
     end
@@ -97,9 +97,20 @@ module Phony
 
       # False if it fails the basic check.
       #
-      return false unless (4..15) === 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
 
@@ -41,6 +41,8 @@ module Phony
     #   country '27', # CC, followed by rules, for example fixed(2) >> ...
     #
     def country country_code, definition, options = {}
+      return unless Phony.config.load?(country_code)
+      
       definition.with country_code, options
       Phony::CountryCodes.instance.add country_code, definition
     end
@@ -139,7 +141,7 @@ module Phony
       #
       ndcs = ndcs.first if Array === ndcs.first
 
-      NationalSplitters::Variable.new options[:max_length], ndcs
+      NationalSplitters::Variable.new options[:max_length], ndcs.map(&:freeze)
     end
     
     # If you have a number of (possibly) variable length NDCs