phony 2.15.25 → 2.20.1

data/lib/phony/countries/cambodia.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Cambodia (Kingdom of)
 # http://en.wikipedia.org/wiki/Telecommunications_in_Cambodia#Mobile_networks
 # http://en.wikipedia.org/wiki/Telephone_numbers_in_Cambodia
@@ -35,7 +37,6 @@ ndcs = [
 six_digit_mobile_prefixes = [
   '10', # Smart
   '11', # Mobitel
-  '12', # Mobitel
   '13', # qb
   '14', # Mobitel
   '15', # Smart
@@ -70,6 +71,7 @@ six_digit_extended_range_mobile_prefixes = [
 ]
 
 seven_digit_mobile_prefixes = [
+  '18', # Seatel
   '31', # Metfone
   '38', # CooTel
   '39', # EMAXX
@@ -80,8 +82,8 @@ seven_digit_mobile_prefixes = [
   '97', # Metfone
 ]
 
-mobile_prefixes_with_variable_length = [
-  '18' # Seatel
+variable_length_extended_range_mobile_prefixes = [
+  '12' # Mobitel
 ]
 
 six_digit_total_single_digit_fixed_line_prefixes = [
@@ -121,7 +123,7 @@ seven_digit_total_double_digit_fixed_line_prefixes = [
 
 Phony.define do
   country '855', trunk('0', :normalize => true) |
-                 one_of(mobile_prefixes_with_variable_length) >> matched_split(/^9/ => [3, 4], /^[2-8]/ => [3, 3]) |
+                 one_of(variable_length_extended_range_mobile_prefixes) >> matched_split(/^1/ => [3, 4], /^[2-9]/ => [3, 3]) |
                  one_of(six_digit_mobile_prefixes)   >> matched_split(/^[2-9]/ => [3, 3]) |
                  one_of(six_digit_extended_range_mobile_prefixes) >> matched_split(/^[1-9]/ => [3, 3]) |
                  one_of(seven_digit_mobile_prefixes) >> matched_split(/^[2-9]/ => [3, 4]) |

data/lib/phony/countries/china.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Chinese phone numbers.
 #
 # http://en.wikipedia.org/wiki/Telephone_numbers_in_China
@@ -17,7 +19,7 @@ ndcs = [
  '28', # Chengdu
  '29', # Xi'an
 ]
-mobile = %w{ 130 131 132 133 134 135 136 137 138 139 145 150 151 152 153 155 156 157 158 159 185 186 187 188 189 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 }
+mobile = %w{ 130 131 132 133 134 135 136 137 138 139 145 146 147 148 149 150 151 152 153 155 156 157 158 159 162 165 166 167 170 171 172 173 174 175 176 177 178 180 181 182 183 184 185 186 187 188 189 190 191 192 193 195 196 197 198 199 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 }
 service = %w{ 110 114 119 120 122 999 } # Probably not exhaustive. TODO Look at http://www.eoc.com.cn/?action-viewnews-itemid-11493.
 
 Phony.define do
@@ -26,5 +28,8 @@ Phony.define do
     one_of(service) >> split(8)   |
     one_of(mobile)  >> split(4,4) |
     one_of(ndcs)    >> split(4,4) |
-    fixed(3)        >> split(4,4)
+    fixed(3)        >> matched_split(
+        /\A\d{7}\z/ => [3,4],
+        /\A\d{8}\z/ => [4,4]
+    )
 end

data/lib/phony/countries/croatia.rb

@@ -1,26 +1,23 @@
+# frozen_string_literal: true
+
 # Croatia
 #
 # http://en.wikipedia.org/wiki/Telephone_numbers_in_Croatia
 # http://dialcode.org/Europe/Croatia/
 # http://www.howtocallabroad.com/croatia/
-#
-# Landline numbers are composed by a 2 digits area code + 6 fixed digits 
-# Mobile numbers are composed by a 2 digits prefix + 7 fixed digits 
+# https://github.com/googlei18n/libphonenumber/
 #
 
-mobile = %w(
-  91
-  92
-  95
-  97
-  977
-  98
-  99
-)
+landline = /^(2[0-3]|3[1-5]|4[02-47-9]|5[1-3])/
 
 Phony.define do
   country '385', trunk('0') |
-                 one_of(mobile) >> split(3, 4) |
-                 one_of('1')    >> split(4, 3) | # Zagreb
-                 fixed(2)       >> split(3, 3)   # 2-digit NDCs
-end
+                 one_of('1')         >> split(4, 3)       | # Zagreb
+                 match(/^(80[01])/)  >> matched_split(
+                                    /\A\d{4}\z/ => [4],
+                                    /\A\d{6}\z/ => [3,3]) | # Toll free
+                 match(/^(9\d)/)     >> split(3, 3..4)    | # Mobile
+                 match(landline)     >> split(3, 3..4)    | # Landline
+                 match(/^(6[01])/)   >> split(2,2..3)     | # Premium rate
+                 match(/^([67]\d)/)  >> split(3,3..4)       # Premium, personal and UAN
+end

data/lib/phony/countries/georgia.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 # Georgia
 # https://www.numberingplans.com/?page=dialling&sub=areacodes
 # https://www.numberingplans.com/?page=plans&sub=phonenr&alpha_2_input=GE
 
-ndcs_with_7_subscirber_digits = %w(32)
-ndcs_with_6_subscirber_digits = %w(
+ndcs_with_7_subscriber_digits = %w(32)
+ndcs_with_6_subscriber_digits = %w(
 341
 342
 344
@@ -86,7 +88,7 @@ Phony.define do
           trunk('0') |
           one_of('220') >> split(3,2) |
           one_of(%w(514 550 551 555 557 558 568 571 574 577 578 579 591 592 593 595 596 597 598 599 770 790)) >> split(3,3) | # mobile
-          one_of(ndcs_with_6_subscirber_digits) >> split(3,3) |
-          one_of(ndcs_with_7_subscirber_digits) >> split(3,4) |
+          one_of(ndcs_with_6_subscriber_digits) >> split(3,3) |
+          one_of(ndcs_with_7_subscriber_digits) >> split(3,4) |
           fixed(3) >> split(3,3)
 end

data/lib/phony/countries/germany.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Germany uses a variable-length ndc code, thus we use a separate file to not let countries.rb explode.
 #
 # Note: Germany uses a variable ndc format from length 2 to 5.
@@ -4019,8 +4021,9 @@ mobile_4digits = [
 '1520', # Vodafone
 '1521', # Lycamobile
 '1522', # Vodafone
+'1523', # Vodafone
 '1570', # vistream
-'1527', # E-Plus
+'1577', # E-Plus
 '1672', # Dolphin Telecom
 ]
 
@@ -4087,7 +4090,7 @@ Phony.define do
      one_of(*service)        >> split(3,1..9) |
      one_of(*mobile_4digits) >> split(3,4) |
      one_of(*mobile_3digits) >> split(4,3..4) |
-     one_of(*ndcs2)          >> split(3,2..10) |
+     one_of(*ndcs2)          >> split(3,1..10) |
      one_of(*ndcs3)          >> split(3,1..9) |
      one_of(*ndcs4)          >> split(3,0..8) |
      fixed(5)                >> split(3,0..7)

data/lib/phony/countries/guinea.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Guinea (sometimes Guinea-Conakry; officially Republic of Guinea)
 # http://www.itu.int/oth/T020200005B/en
 
@@ -25,12 +27,13 @@ land_ndcs_with_5_digits = [
   '30613' # Télimélé
 ]
 
+# NOTE We're not using *('660'..'669') since it does not freeze easily.
 mobile_ndcs_with_3_digits = [
-  *('660'..'669'), # Areeba
-  *('620'..'629'), # Orange
-  *('650'..'659'), # Cellcom
-  *('630'..'639'), # Intercel
-  *('600'..'609')  # Sotelgui
+  '600', '601', '602', '603', '604', '605', '606', '607', '608', '609', # Sotelgui
+  '620', '621', '622', '623', '624', '625', '626', '627', '628', '629', # Orange
+  '650', '651', '652', '653', '654', '655', '656', '657', '658', '659', # Cellcom
+  '630', '631', '632', '633', '634', '635', '636', '637', '638', '639', # Intercel
+  '660', '661', '662', '663', '664', '665', '666', '667', '668', '669', # Areeba
 ]
 
 Phony.define do

data/lib/phony/countries/india.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Indian phone numbers.
 #
 # http://en.wikipedia.org/wiki/Telephone_numbers_in_India

data/lib/phony/countries/indonesia.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Indonesia (Republic of)
 # http://www.numberingplans.com/?page=dialling&sub=areacodes
 # https://www.numberingplans.com/?page=plans&sub=phonenr&alpha_2_input=ID
@@ -11,7 +13,9 @@ Phony.define do
         /\A\d+\z/ => [4,4]) |
     one_of(%w(22 23 24 25 26 27 28 29 31 32 33 34 35 36 37 38 39 72)) >> matched_split(
         /\A\d{5}\z/ => [3,2],
-        /\A\d+\z/ => [3,4]) |
+        /\A\d{7}\z/ => [3,4],
+        /\A\d{8}\z/ => [4,4],
+        /\A\d{9}\z/ => [3,3,3]) |
     one_of('70') >> split(3,3) |
     one_of(%w(71 73 74 75 76 77)) >> matched_split(
         /\A\d{6}\z/ => [3,3],
@@ -32,7 +36,8 @@ Phony.define do
     match(/\A(81\d|82\d|83\d|84\d|85\d|86\d|87\d|88\d|89\d)\d+\z/) >> matched_split(  # mobile
         /\A\d{6}\z/ => [3,3],
         /\A\d{7}\z/ => [3,4],
-        /\A\d+\z/ => [4,4]) |
+        /\A\d{8}\z/ => [4,4],
+        /\A\d+\z/ => [4,5]) |
     one_of(%w(9)) >> matched_split( # geographic
         /\A\d{7}\z/ => [4,3],
         /\A\d+\z/ => [3,3,3]) |

data/lib/phony/countries/ireland.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # The Republic of Ireland has variable-length NDCs from 2-3 digits in length.  Depending on the NDC, the length of the subscriber number varies from 5-7 characters in length.  There does not appear to be any pattern that relates NDCs to subscriber number length.
 #
 # 7 digit subscriber numbers follow a 3-4 split pattern.
@@ -7,33 +9,30 @@
 #
 # References:
 # http://www.comreg.ie/_fileupload/publications/ComReg03147.pdf (2003)
+# https://www.comreg.ie/media/dlm_uploads/2015/12/ComReg0804.pdf (2008)
 # http://www.comreg.ie/licensing_and_services/area_code_maps.552.1040.html
 # http://en.wikipedia.org/wiki/Telephone_numbers_in_the_Republic_of_Ireland
 #
 ndcs_with_5_subscriber_digits = [
-  ('22'..'29').to_a, # Mallow, Bandon, Youghal, Fermoy, Macroom, Bantry, Skibbereen, Kanturk
-  '402',  # Arklow
-  '404',  # Wicklow
-  '43',   # Longford, Granard
-  '44',   # Mullingar, Castlepollard, Tyrellspass
-  '47',   # Monaghan, Clones
-  '48',   # Northern Ireland
-  '502',  # Portlaoise, Abbeyleix
-  '504',  # Thurles
-  '505',  # Roscrea
-  '506',  # Tullamore
-  '509',  # Bin-
-  '52',   # Killenaule
-  '54',   # Legacy Ferns, Enniscorthy
-  '55',   # Legacy Gorey
-  '62',   # Tipperary, Cashel
-  '63',   # Charleville
-  '64',   # Killarney, Rathmore
-  '67',   # Nenagh
-  '68',   # Listowel
-  '69',   # Newcastle West
-  '93',   # Tuam
-  ('94'..'99').to_a # Castlebar, Castlerea, Claremorris, Clifden, Ballina, Belmullet, Westport, Kilronan
+  '22', '24', '25', '26', '27', '28', '29', # Mallow, Youghal, Fermoy, Macroom, Bantry, Skibbereen, Kanturk
+  '402', # Arklow
+  '404', # Wicklow
+  '47',  # Monaghan, Clones
+  '48',  # Northern Ireland
+  '502', # Portlaoise, Abbeyleix
+  '504', # Thurles
+  '505', # Roscrea
+  '506', # Tullamore
+  '509', # Bin-
+  '54',  # Legacy Ferns, Enniscorthy
+  '55',  # Legacy Gorey
+  '62',  # Tipperary, Cashel
+  '63',  # Charleville
+  '67',  # Nenagh
+  '68',  # Listowel
+  '69',  # Newcastle West
+  '93',  # Tuam
+  '94', '95', '96', '97', '98', '99' # Castlebar, Castlerea, Claremorris, Clifden, Ballina, Belmullet, Westport, Kilronan
 ].flatten
 
 ndcs_with_6_subscriber_digits = [
@@ -46,14 +45,19 @@ ndcs_with_6_subscriber_digits = [
 ndcs_with_7_subscriber_digits = [
   '1',  # Dublin
   '21', # Cork, Coachford, Kinsale
+  '23', # Bandon
   '41', # Ardee
   '42', # Dundalk, Carrickmacross, Castleblaney
+  '43', # Longford, Granard
+  '44', # Mullingar, Castlepollard, Tyrellspass
   '46', # Navan, Kells, Trim, Enfield, Edenderry
   '49', # Cavan, Cootehill, Oldcastle, Belturbet
+  '52', # Killenaule
   '53', # Wexford, Enniscorthy, Ferns, Gorey, Craanford
   '56', # Kilkenny, Castlecomer
   '58', # Dungarvan
   '59', # Carlow, Muine Bheag, Athy, Baltinglass
+  '64', # Killarney, Rathmore
   '65', # Ennistymon, Kilrush
   '66', # Tralee, Dingle, Killorglin, Cahirciveen
   '71', # Sligo, Manorhamilton, Carrick-on-Shannon

data/lib/phony/countries/italy.rb

@@ -1,14 +1,16 @@
+# frozen_string_literal: true
+
 # 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
@@ -40,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
@@ -249,7 +251,10 @@ ndcs_4digit = [
 
 # All 3-- numbers are reserved for mobile phones according to
 # http://en.wikipedia.org/wiki/Telephone_numbers_in_Italy#Mobile_telephones
-mobile = (300..399).collect(&:to_s).to_a
+# NOTE was:
+#   mobile = ('300'..'399').to_a
+# 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.
  '112',
@@ -264,20 +269,28 @@ service = [ # Not exhaustive.
 ]
 
 Phony.define do
-  country '39', trunk('', :normalize => false) |
+  # 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,4) |
-                one_of(*ndcs_3digit) >> matched_split(
-                  /^1\d{6}$/ => [7],
-                  /^1\d{7}$/ => [8],
-                  /^[^1]\d{5}$/ => [6],
-                  /^[^1]\d{6}$/ => [7]
+                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],
                 ) |
-                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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Japan
 # http://www.itu.int/oth/T020200006D/en
 
@@ -164,6 +166,7 @@ ndcs_with_6_subscriber_numbers = %w(
 422
 428
 436
+438
 439
 460
 463
@@ -279,7 +282,6 @@ ndcs_with_6_subscriber_numbers = %w(
 846
 847
 848
-849
 852
 853
 854
@@ -359,7 +361,6 @@ ndcs_with_5_subscriber_numbers = %w(
 1374
 1377
 1392
-1394
 1397
 1398
 1456
@@ -391,7 +392,6 @@ ndcs_with_5_subscriber_numbers = %w(
 8477
 8512
 8514
-8636
 9496
 9802
 9912
@@ -401,15 +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 800))                    >> split(3,3) | # freephone
+    one_of(%w(120))                        >> split(3,3) | # 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/kyrgyzstan.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Kyrgyz Republic
 # https://www.numberingplans.com/?page=dialling&sub=areacodes
 # https://www.numberingplans.com/?page=plans&sub=phonenr&alpha_2_input=KG

data/lib/phony/countries/latvia.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Latvia
 # https://www.numberingplans.com/?page=plans&sub=phonenr&alpha_2_input=LV
 # https://www.numberingplans.com/?page=dialling&sub=areacodes

data/lib/phony/countries/libya.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Lybia, https://www.numberingplans.com/?page=dialling&sub=areacodes
 # https://www.numberingplans.com/?page=plans&sub=phonenr&alpha_2_input=LY
 
@@ -109,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/malaysia.rb

@@ -1,19 +1,37 @@
+# frozen_string_literal: true
+
 # Malaysian phone numbers.
 #
 # http://en.wikipedia.org/wiki/Telephone_numbers_in_Malaysia
 #
 ndcs = [
   '2', # Singapore
-  '3', # Selangor & Federal Territories of Kuala Lumpur & Putrajaya & also Genting Highlands, Pahang
   '4', # Kedah, Penang & Perlis
   '5', # Perak & Cameron Highlands (Pahang)
   '6', # Melaka, Negeri Sembilan & Muar (Johor)
   '7', # Johor (except Muar)
   '9', # Kelantan, Pahang (except Cameron Highlands & Genting Highlands) & Terengganu
 ]
+
+ndcs_two_digits = [
+  '80', # Domestic access code from East Malaysia to  Brunei
+  '81', # Reserved number for future use
+  '82', # Sarawak – Kuching, Samarahan and Serian
+  '83', # Sarawak – Sri Aman and Betong
+  '84', # Sarawak – Sibu, Sarikei, Mukah and Kapit
+  '85', # Sarawak – Miri, Limbang and Lawas
+  '86', # Sarawak – Bintulu and Belaga
+  '87', # Labuan Interior Division,  Sabah
+  '88', # Sabah – Kota Kinabalu and Kudat
+  '89', # Sabah – Lahad Datu, Sandakan and Tawau
+]
+
 mobile = %w{ 10 11 12 13 14 153 154 156 158 16 17 18 19 }
 # service = %w{ 100 101 102 103 104 108 991 994 995 999 }  # Emergeny and Service numbers, only 3 digits long
 freephone = %w{ 300 700 800 }
+ndcs_eight = [
+  '3' # Selangor & Federal Territories of Kuala Lumpur & Putrajaya & also Genting Highlands, Pahang
+]
 
 Phony.define do
   country '60',
@@ -21,6 +39,8 @@ Phony.define do
     one_of(freephone) >> split(2,4) | # Freephone, Tollfree, Forwarding
     # one_of(service) >>  none  | # Service
     one_of(mobile)  >> split(3,4..5)   | # Mobile
-    one_of(ndcs)    >> split(8)     | # 1-digit NDCs
+    one_of(ndcs_two_digits)    >> split(6)     | # 2-digit NDCs
+    one_of(ndcs)    >> split(7)     | # 1-digit NDCs
+    one_of(ndcs_eight)    >> split(8)     | # 1-digit NDCs
     fixed(2)        >> split(8)       # 2-digit NDCs (Also, fallback)
 end

data/lib/phony/countries/moldova.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Moldova
 # https://www.numberingplans.com/?page=dialling&sub=areacodes
 # https://www.numberingplans.com/?page=plans&sub=phonenr&alpha_2_input=MD

data/lib/phony/countries/montenegro.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Montenegro
 # https://www.numberingplans.com/?page=dialling&sub=areacodes
 # https://www.numberingplans.com/?page=plans&sub=phonenr&alpha_2_input=ME

data/lib/phony/countries/myanmar.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Myanmar: http://www.itu.int/dms_pub/itu-t/oth/02/02/T02020000920003PDFE.pdf
 #
 # formatting according to Google's libphonenumber library. (r680 7/30/2014)

data/lib/phony/countries/namibia.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Namibia
 # https://www.numberingplans.com/?page=dialling&sub=areacodes
 # https://www.numberingplans.com/?page=plans&sub=phonenr&alpha_2_input=NA

data/lib/phony/countries/nepal.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Nepal
 # https://www.numberingplans.com/?page=dialling&sub=areacodes
 # https://www.numberingplans.com/?page=plans&sub=phonenr&alpha_2_input=NP

data/lib/phony/countries/netherlands.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # The Netherlands use a variable-length ndc code, thus we use a separate file to not let all_other.rb explode. The
 # latest version of the numbering plan is available at http://wetten.overheid.nl/BWBR0010198/
 #

data/lib/phony/countries/pakistan.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Pakistan (Islamic Republic of)
 # https://www.numberingplans.com/?page=plans&sub=phonenr&alpha_2_input=PK
 

data/lib/phony/countries/paraguay.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Paraguay (Republic of)
 # https://www.numberingplans.com/?page=dialling&sub=areacodes
 # https://www.numberingplans.com/?page=plans&sub=phonenr&alpha_2_input=PY