phony 2.15.25 → 2.20.1

data/lib/phony/countries/russia_kazakhstan_abkhasia_south_ossetia.rb

@@ -1,20 +1,23 @@
+# frozen_string_literal: true
+
 ndcs_with_5_subscriber_digits = %w(30130 30131 30132 30133 30134 30135 30136 30137 30138 30140 30141 30142 30143 30144
   30145 30146 30147 30148 30149 30150 30153 30230 30231 30232 30233 30234 30235 30236 30237 30238 30239 30240 30241
   30242 30243 30244 30245 30246 30247 30248 30249 30251 30252 30253 30255 30256 30257 30261 30262 30264 30265 30266
+  33622
   34126 34130 34132 34133 34134 34136 34138 34139 34141 34145 34147 34150 34151 34152 34153 34154 34155 34157 34158
-  34159 34161 34162 34163 34164 34166 34240 34241 34242 34243 34244 34245 34246 34248 34249 34250 34251 34252 34253
+  34159 34161 34162 34163 34164 34166 34240 34241 34243 34244 34245 34246 34248 34249 34250 34251 34252 34253
   34254 34255 34256 34257 34258 34259 34260 34261 34262 34263 34265 34266 34268 34269 34271 34272 34273 34274 34275
   34276 34277 34278 34279 34291 34292 34293 34294 34296 34297 34298 34341 34342 34343 34344 34345 34346 34347 34349
   34350 34355 34356 34357 34358 34360 34361 34362 34363 34364 34365 34367 34368 34369 34370 34371 34372 34373 34374
   34375 34376 34377 34380 34383 34384 34385 34386 34387 34388 34389 34391 34394 34395 34397 34398 34531 34533 34535
   34537 34539 34541 34542 34543 34544 34545 34546 34547 34550 34551 34553 34554 34555 34556 34557 34561 34634 34638
-  34643 34667 34668 34669 34670 34672 34673 34674 34675 34676 34677 34678 34731 34739 34740 34741 34742 34743 34744
+  34643 34667 34668 34669 34670 34672 34674 34675 34676 34677 34678 34731 34739 34740 34741 34742 34743 34744
   34745 34746 34747 34748 34749 34750 34751 34752 34753 34754 34755 34756 34757 34758 34759 34760 34761 34762 34763
   34764 34765 34766 34767 34768 34769 34770 34771 34772 34773 34774 34775 34776 34777 34778 34779 34780 34781 34782
   34783 34784 34785 34786 34787 34788 34789 34791 34792 34794 34795 34796 34797 34798 34922 34932 34934 34936 34938
   34940 34948 34949 34992 34993 34994 34995 34996 34997 35130 35131 35133 35134 35138 35139 35140 35141 35142 35143
   35144 35145 35146 35147 35148 35149 35150 35151 35152 35153 35154 35155 35156 35157 35158 35159 35160 35161 35163
-  35164 35165 35166 35167 35168 35169 35190 35191 3522 35230 35231 35232 35233 35234 35235 35236 35237 35238 35239
+  35164 35165 35166 35167 35168 35169 35190 35191 35230 35231 35232 35233 35234 35235 35236 35237 35238 35239
   35240 35241 35242 35243 35244 35245 35247 35248 35249 35251 35252 35253 35256 35257 35330 35331 35332 35333 35334
   35335 35336 35337 35338 35339 35341 35342 35344 35345 35346 35347 35348 35349 35351 35352 35354 35355 35356 35357
   35358 35359 35361 35362 35363 35364 35365 35366 35367 35368 35379 38141 38150 38151 38152 38153 38154 38155 38156
@@ -61,7 +64,9 @@ ndcs_with_5_subscriber_digits = %w(30130 30131 30132 30133 30134 30135 30136 301
   49146 49147 49148 49151 49152 49153 49154 49155 49156 49157 49158 49231 49232 49233 49234 49235 49236 49237 49238
   49241 49242 49243 49244 49245 49246 49247 49248 49254 49331 49333 49334 49336 49337 49339 49341 49343 49344 49345
   49346 49347 49349 49351 49352 49353 49354 49355 49356 49357 49430 49431 49432 49433 49434 49435 49436 49437 49438
-  49439 49440 49441 49442 49443 49444 49445 49446 49447 49448 49449 49450 49451 49452 49453 81131 81132 81133 81134
+  49439 49440 49441 49442 49443 49444 49445 49446 49447 49448 49449 49450 49451 49452 49453 71036 71063 71133 71237
+  71336 71337 71431 71433 71435 71536 71538 71543 71630 71636 71644 71645 71651 71837 72137 72153 72251 72335 72336
+  72340 72433 72533 72537 72636 72752 72771 72772 72774 72775 72834 72835 81131 81132 81133 81134
   81135 81136 81137 81138 81139 81140 81141 81142 81143 81144 81145 81146 81147 81148 81149 81150 81151 81152 81153
   81361 81362 81363 81364 81365 81366 81367 81368 81369 81370 81371 81372 81373 81374 81375 81376 81378 81379 81430
   81431 81433 81434 81436 81437 81439 81450 81451 81452 81454 81455 81456 81457 81458 81459 81530 81531 81532 81533
@@ -85,7 +90,7 @@ ndcs_with_5_subscriber_digits = %w(30130 30131 30132 30133 30134 30135 30136 301
   84377 84378 84379 84396 84442 84443 84444 84445 84446 84447 84452 84453 84454 84455 84456 84457 84458 84461 84462
   84463 84464 84465 84466 84467 84468 84472 84473 84474 84475 84476 84477 84478 84479 84492 84493 84494 84495 84540
   84542 84543 84544 84545 84548 84549 84550 84551 84552 84554 84555 84557 84558 84560 84561 84562 84563 84564 84565
-  84566 84567 84568 84573 84574 84575 84576 84577 84578 84579 84591 84592 84593 84595 84596 84630 84635 84639 84646
+  84566 84567 84568 84573 84574 84575 84576 84577 84578 84579 84591 84592 84593 84595 84596 84635 84639 84646
   84647 84648 84650 84651 84652 84653 84654 84655 84656 84657 84658 84660 84661 84663 84664 84666 84667 84670 84671
   84672 84673 84674 84675 84676 84677 84722 84731 84732 84733 84734 84735 84736 84741 84742 84743 84744 84745 84746
   84747 84862 85140 85141 85142 85143 85144 85145 85146 85147 85148 85149 85171 85172 85549 85551 85552 85555 85556
@@ -103,21 +108,26 @@ ndcs_with_5_subscriber_digits = %w(30130 30131 30132 30133 30134 30135 30136 301
   87872 87873 87874 87875 87876 87877 87878 87879 87922 87932 87934 87935 87937 87938 87951 87961 87964
 )
 
-ndcs_with_6_subscriber_digits = %w(3012 3022 3412 3435 3439 3452 3456 3462 3463 3466 3473 3494 3496 3513 3519 3532 3537
-  3812 3822 3823 3842 3843 3846 3852 3854 3882 3902 3919 3942 3952 3953 3955 4012 4112 4132 4152 4162 4212 4217 4232 4234
-  4236 4242 4712 4722 4725 4742 4752 4812 4822 4832 4842 4852 4855 4862 4872 4912 4922 4932 4942 8112 8142 8152 8162
-  8172 8202 8212 8216 8313 8332 8342 8352 8362 8412 8422 8442 8443 8452 8453 8464 8482 8512 8552 8553 8555 8557 8617
-  8622 8634 8635 8636 8639 8652 8662 8672 8712 8722 8732 8772 8782 8793
+ndcs_with_6_subscriber_digits = %w(3012 3022 3412 3424 3435 3439 3452 3456 3462 3463 3466 3467 3473 3494 3496 3513 3519
+  3522 3532 3537 3812 3822 3823 3842 3843 3846 3852 3854 3882 3902 3919 3942 3952 3953 3955 4012 4112 4132 4152 4162
+  4212 4217 4234 4236 4242 4712 4722 4725 4742 4752 4812 4822 4832 4842 4852 4855 4862 4872 4912 4922 4932 4942
+  7102 7112 7122 7132 7142 7152 7162 7172 7182 7187 7212 7213 7222 7232 7242 7252 7262 7272 7282 7292 8112 8142 8152
+  8162 8172 8202 8212 8216 8313 8332 8342 8352 8362 8412 8422 8442 8443 8452 8453 8464 8482 8512 8552 8553 8555 8557
+  8617 8622 8634 8635 8636 8639 8652 8662 8672 8712 8722 8732 8772 8782 8793
 )
 
-ndcs_with_7_subscriber_digits = %w(342 343 347 351 383 391 473 495 496 498 499 812 818 831 843 844 846 861 863
-  901 902 903 904 905 906 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929
-  930 931 932 933 934 936 937 938 950 951 952 953 960 961 962 963 964 965 967 968 980 981 982 983 984 985 987 988
-  989 997
+# 978, 869, and 365 are mobile, Sevastopol landlines, and Crimean landlines,
+# which I can't wait to have removed from this library ASAP due to the illegal
+# annexation of Ukrainian territory.
+ndcs_with_7_subscriber_digits = %w(342 343 347 351 365 383 391 423 473 495 496 498 499 700 701 702 727 777 778 804 812
+  818 831 843 844 846 861 863 869 900 901 902 903 904 905 906 908 909 910 911 912 913 914 915 916 917 918 919 920 921
+  922 923 924 925 926 927 928 929 930 931 932 933 934 936 937 938 950 951 952 953 958 960 961 962 963 964 965 966 967
+  968 969 977 978 980 981 982 983 984 985 986 987 988 989 992 993 995 996 997 999
 )
 
 Phony.define do
   country '7',
+    # trunk('8', normalize: true, split: true) | # TODO Figure out if this is the way to go.
     trunk('8', normalize: false) |
     one_of(ndcs_with_5_subscriber_digits)  >> split(1, 2, 2) |
     one_of(ndcs_with_6_subscriber_digits)  >> split(2, 2, 2) |

data/lib/phony/countries/saudi_arabia.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # References:
 # http://www.itu.int/oth/T02020000B7/en
 # https://en.wikipedia.org/wiki/Telephone_numbers_in_Saudi_Arabia
@@ -11,6 +13,7 @@ ndcs_with_7_subscriber_digits = [
   '17', # Southern regions like Asir, Al-Baha, Jizan, Najran & Khamis Mushait
   '50', # Mobile: STC
   '51', # Mobile: Trunking services
+  '52', # Mobile: Reserved for future use
   '53', # Mobile: STC
   '54', # Mobile: Mobily
   '55', # Mobile: STC

data/lib/phony/countries/serbia.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Serbia
 # https://www.numberingplans.com/?page=plans&sub=phonenr&alpha_2_input=RS
 
@@ -6,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]) |
@@ -19,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(
@@ -38,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/somalia.rb

@@ -1,6 +1,9 @@
+# frozen_string_literal: true
+
 Phony.define do
   # Somali Democratic Republic http://www.wtng.info/wtng-252-so.html
   # https://www.numberingplans.com/?page=plans&sub=phonenr&alpha_2_input=SO
+  # https://en.wikipedia.org/wiki/Telecommunications_in_Somaliland#Telesom
   country '252',
     one_of('88216') >> split(3) | # Thuraya Satellite Telecommunications Company
     one_of(%w(1034 1043)) >> split(3,2) | # Hortel
@@ -10,6 +13,7 @@ Phony.define do
     one_of(%w(201 204 208 210 214)) >> split(2,2) | # Telcom Somalia
     one_of(%w(500 501 502 503 504 505 506 507 508 509)) >> split(3,2) | # mobile NationLink Telecom
     one_of(%w(523 525 526)) >> split(2,2) | # Netco
+    match(/\A(61|62|63|64|65|66|67|68|69|90)\d{7}\z/) >> split(3,4) | # mobile Hormuud, Somtel Mogadishu, Telesom, Hormuud, Somtel, Somtel Puntland, Nationlink Mogadishu, Nationlink Mogadishu, Nationlink, Golis
     one_of(%w(642 643 644 648 649)) >> split(2,2) | # Galcom
     one_of(%w(33 51 52 54 55 56 57 58 59 68 71 76 78 79 88)) >> split(3,2) |
     match(/\A(67)\d{5}\z/) >> split(3,2) | # Golis Telecom Somalia
@@ -19,4 +23,4 @@ Phony.define do
     one_of(%w(67 69)) >> split(4,3) | # mobile NationLink Telecom
     one_of('1') >> split(3,3) |
     fixed(1) >> split(3,3)
-end
+end

data/lib/phony/countries/south_korea.rb

@@ -1,22 +1,29 @@
+# frozen_string_literal: true
+
 # South Korean (Republic of Korea) phone numbers.
 #
 # http://en.wikipedia.org/wiki/Telephone_numbers_in_South_Korea
+# https://www.numberingplans.com/?page=plans&sub=phonenr&alpha_2_input=KR
 #
 
 # TODO 4-digit services, like "unreasonable infringement of livelihood report" number :)
 #
 
-special = %w{ 100 101 105 106 107 108 109 111 112 113 114 115 116 117 118 119 120 121 122 123 125 127 128 129 131 132 134 141 182 188 }
-# mobile  = ('10'..'19').to_a # Note: Mobile not used as it is (for now) handled by the fixed catchall.
+special = %w(100 101 105 106 107 108 109 111 112 113 114 115 116 117 118 119 120 121 122 123 125 127 128 129 131 132 134 141 182 188)
+# NOTE was:
+#   mobile  = ('10'..'19').to_a
+# but this was not frozen so easily.
+mobile = %w(10 11 12 13 14 15 16 17 18 19)
 
 Phony.define do
   country '82',
     trunk('0') |
     match(/^(#{special.join("|")})$/) >> split(3,3) | # Special actually don't need to be split – but better err.
-    one_of('2')                       >> split(4,4) | # Seoul, also includes "services".
-    fixed(2)                          >> split(4,4)   # Catchall.
-    
-    # See above.
-    #
-    # one_of(*mobile)                 >> split(4,4) |
-end
+    one_of(*mobile) >> split(4,4) |
+    one_of('2') >> matched_split(
+      /\A\d{7}\z/ => [3,4],
+      /\A\d{8}\z/ => [4,4]) | # Seoul, also includes "services".
+    fixed(2) >> matched_split(
+      /\A\d{7}\z/ => [3,4],
+      /\A\d{8}\z/ => [4,4]) # Rest of cities
+end

data/lib/phony/countries/sweden.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Sweden uses a variable-length ndc code, thus we use a separate file to not let all_other.rb explode.
 #
 # Note: Sweden use a variable ndc format from length 2 to 3.
@@ -25,7 +27,6 @@ ndcs = [
   '35', # Halmstad
   '36', # Jönköping-Huskvarna
   '40', # Malmö
- '417', # Tomelilla
   '42', # Helsingborg-Höganäs
   '44', # Kristianstad
   '46', # Lund
@@ -33,8 +34,7 @@ ndcs = [
   '60', # Sundsvall-Timrå
   '63', # Östersund
   '90', # Umeå
- '522', # Uddevalla
-  '77', #Dalarna
+  '77', # Dalarna
 ]
 mobile = [
  '70', # Mobile
@@ -45,24 +45,36 @@ mobile = [
  '76', # Mobile
  '79', # Mobile
 ]
-service = [
-    '99', # Premium Rate
-   '112', # Emergency Service
-   '116', # Psychological Help
-   '118', # Number enquiries
-   '900', # Premium Rate
-   '939', # Premium Rate
-   '944', # Premium Rate
-  '1177', # Health Care Advice
- '11414', # Police
+services = [
+    '112', # Emergency Service
+   '1177', # Health Care Advice
+  '11414', # Police
+]
+service_ndcs = [
+  '99',  # Premium Rate
+  '900', # Premium Rate
+  '939', # Premium Rate
+  '944', # Premium Rate
+]
+three_digit_service = [
+  '116', # Psychological Help (116 xxx)
+  '118', # Number enquiries (118 xxx)
 ]
 
 Phony.define do
   country '46',
     trunk('0') |
-    one_of(service)       >> split(3,3)   |
-    one_of(ndcs + mobile) >> matched_split(
-      /^\d{5}$/ => [3, 2], /^\d{6}$/ => [2, 2, 2], /^\d{7}$/ => [3, 2, 2], /^\d{8}$/ => [3, 2, 3]
+    match(/^(#{services.join('|')})$/) >> split(0) |
+    one_of(service_ndcs)       >> split(3,3) |
+    match(/^(#{three_digit_service.join('|')})\d{3}$/) >> split(3) |
+    one_of(ndcs + mobile)      >> matched_split(
+      /^\d{5}$/ => [3, 2],
+      /^\d{6}$/ => [2, 2, 2],
+      /^\d{7}$/ => [3, 2, 2],
+      /^\d{8}$/ => [3, 2, 3]
     ) |
-    fixed(3)              >> split(3,3,2)   # catchall
+    fixed(3)                   >> matched_split(
+      /^\d{5}$/ => [3, 2],
+      /^\d{6}$/ => [2, 2, 2]
+    )
 end

data/lib/phony/countries/taiwan.rb

@@ -1,52 +1,28 @@
-# Taiwan
-# https://www.numberingplans.com/?page=dialling&sub=areacodes
-#
-
-ndcs_with_8_subscriber_numbers = %w(1 2)
-
-ndcs_with_7_subscriber_numbers = %w(3 4 5 6 7 8)
+# frozen_string_literal: true
 
-ndcs_with_6_subscriber_numbers = %w(
-33
-34
-35
-36
-37
-38
-39
-42
-43
-44
-45
-46
-47
-48
-49
-55
-56
-62
-66
-67
-69
-88
-89
-)
-
-ndcs_with_5_subscriber_numbers = %w(823 826 827)
+# Taiwan
+# https://zh.wikipedia.org/wiki/%E4%B8%AD%E8%8F%AF%E6%B0%91%E5%9C%8B%E9%95%B7%E9%80%94%E9%9B%BB%E8%A9%B1%E5%8D%80%E8%99%9F%E8%A1%A8
+# https://en.wikipedia.org/wiki/Telephone_numbers_in_Taiwan
 
 Phony.define do
   country '886',
     trunk('0') |
-    one_of(ndcs_with_5_subscriber_numbers) >> split(3,2) |
-    match(/\A(6\d\d)\d{7}\z/) >> split(3,4) | # geographic ; Taipei
-    one_of(%w(412)) >> split(4) | # VoIP telephony ; Taichung
-    one_of(ndcs_with_6_subscriber_numbers) >> split(3,3) |
-    one_of(%w(18)) >> split(3,3) | # freephone
-    one_of(%w(90 91 92 93 95 96 97 98)) >> matched_split(
-       /\A\d{6}\z/ => [3,3],
-       /\A\d+\z/ => [3,4]) | # mobile
-    one_of(%w(60 70 94 95 99)) >> split(3,3) | # pager
-    one_of(ndcs_with_7_subscriber_numbers) >> split(3,4) |
-    one_of(ndcs_with_8_subscriber_numbers) >> split(4,4) |
-    fixed(2) >> split(3,3)
+    match(/\A(826)\d{5}\z/) >> split(1,4) | # 烏坵, start with 0826, plus 5 digits
+    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(
+       /\A\d{7}\z/          =>      [3,4],  # 彰化, start with 04, plus 7 digits
+       /\A\d+\z/            =>      [4,4])| # 臺中, start with 04, plus 8 digits
+    match(/\A(37)\d{6}\z/)  >> split(2,4) | # 苗栗, start with 037, plus 6 digits
+    match(/\A(3)\d{7}\z/)   >> split(3,4) | # 桃園 新竹 花蓮 宜蘭, start with 03, plus 7 digits
+    match(/\A(5)\d{7}\z/)   >> split(3,4) | # 嘉義 雲林, start with 05, plus 7 digits
+    match(/\A(6)\d{7}\z/)   >> split(3,4) | # 臺南 澎湖, start with 06, plus 7 digits
+    match(/\A(7)\d{7}\z/)   >> split(3,4) | # 高雄, start with 07, plus 7 digits
+    match(/\A(2)\d{8}\z/)   >> split(4,4) | # 臺北, start with 02, plus 8 digits
+    match(/\A(9\d\d)\d{6}\z/)   >> split(3,3) | # mobile phone, start with 09, plus 8 digits, but local usually show 4-3-3.
+    fixed(2)                >> split(4,4)   # fallback unknown
 end

data/lib/phony/countries/tajikistan.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Tajikistan (Republic of)
 
 ndcs_with_6_subscriber_digits = %w(372)

data/lib/phony/countries/turkmenistan.rb

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

data/lib/phony/countries/ukraine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Ukraine
 # https://www.numberingplans.com/?page=dialling&sub=areacodes
 
@@ -28,6 +30,7 @@ ndcs_with_7_subscriber_numbers = %w(
 64
 65
 69
+72
 )
 
 ndcs_with_6_subscriber_numbers = %w(

data/lib/phony/countries/united_kingdom.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # The United Kingdom uses a variable-length NDC code,
 # thus we use a separate file to not let countries.rb explode.
 #
@@ -16,9 +18,10 @@
 mobile_ndc = [
   # Mobile [4+6].
   #
-  *('7100'..'7599'),
+  # NOTE We're explicitly denoting this as dynamic strings cannot be frozen.
+  *%w(7100 7101 7102 7103 7104 7105 7106 7107 7108 7109 7110 7111 7112 7113 7114 7115 7116 7117 7118 7119 7120 7121 7122 7123 7124 7125 7126 7127 7128 7129 7130 7131 7132 7133 7134 7135 7136 7137 7138 7139 7140 7141 7142 7143 7144 7145 7146 7147 7148 7149 7150 7151 7152 7153 7154 7155 7156 7157 7158 7159 7160 7161 7162 7163 7164 7165 7166 7167 7168 7169 7170 7171 7172 7173 7174 7175 7176 7177 7178 7179 7180 7181 7182 7183 7184 7185 7186 7187 7188 7189 7190 7191 7192 7193 7194 7195 7196 7197 7198 7199 7200 7201 7202 7203 7204 7205 7206 7207 7208 7209 7210 7211 7212 7213 7214 7215 7216 7217 7218 7219 7220 7221 7222 7223 7224 7225 7226 7227 7228 7229 7230 7231 7232 7233 7234 7235 7236 7237 7238 7239 7240 7241 7242 7243 7244 7245 7246 7247 7248 7249 7250 7251 7252 7253 7254 7255 7256 7257 7258 7259 7260 7261 7262 7263 7264 7265 7266 7267 7268 7269 7270 7271 7272 7273 7274 7275 7276 7277 7278 7279 7280 7281 7282 7283 7284 7285 7286 7287 7288 7289 7290 7291 7292 7293 7294 7295 7296 7297 7298 7299 7300 7301 7302 7303 7304 7305 7306 7307 7308 7309 7310 7311 7312 7313 7314 7315 7316 7317 7318 7319 7320 7321 7322 7323 7324 7325 7326 7327 7328 7329 7330 7331 7332 7333 7334 7335 7336 7337 7338 7339 7340 7341 7342 7343 7344 7345 7346 7347 7348 7349 7350 7351 7352 7353 7354 7355 7356 7357 7358 7359 7360 7361 7362 7363 7364 7365 7366 7367 7368 7369 7370 7371 7372 7373 7374 7375 7376 7377 7378 7379 7380 7381 7382 7383 7384 7385 7386 7387 7388 7389 7390 7391 7392 7393 7394 7395 7396 7397 7398 7399 7400 7401 7402 7403 7404 7405 7406 7407 7408 7409 7410 7411 7412 7413 7414 7415 7416 7417 7418 7419 7420 7421 7422 7423 7424 7425 7426 7427 7428 7429 7430 7431 7432 7433 7434 7435 7436 7437 7438 7439 7440 7441 7442 7443 7444 7445 7446 7447 7448 7449 7450 7451 7452 7453 7454 7455 7456 7457 7458 7459 7460 7461 7462 7463 7464 7465 7466 7467 7468 7469 7470 7471 7472 7473 7474 7475 7476 7477 7478 7479 7480 7481 7482 7483 7484 7485 7486 7487 7488 7489 7490 7491 7492 7493 7494 7495 7496 7497 7498 7499 7500 7501 7502 7503 7504 7505 7506 7507 7508 7509 7510 7511 7512 7513 7514 7515 7516 7517 7518 7519 7520 7521 7522 7523 7524 7525 7526 7527 7528 7529 7530 7531 7532 7533 7534 7535 7536 7537 7538 7539 7540 7541 7542 7543 7544 7545 7546 7547 7548 7549 7550 7551 7552 7553 7554 7555 7556 7557 7558 7559 7560 7561 7562 7563 7564 7565 7566 7567 7568 7569 7570 7571 7572 7573 7574 7575 7576 7577 7578 7579 7580 7581 7582 7583 7584 7585 7586 7587 7588 7589 7590 7591 7592 7593 7594 7595 7596 7597 7598 7599),
   '7624', # Isle of Man
-  *('7700'..'7999')
+  *%w(7700 7701 7702 7703 7704 7705 7706 7707 7708 7709 7710 7711 7712 7713 7714 7715 7716 7717 7718 7719 7720 7721 7722 7723 7724 7725 7726 7727 7728 7729 7730 7731 7732 7733 7734 7735 7736 7737 7738 7739 7740 7741 7742 7743 7744 7745 7746 7747 7748 7749 7750 7751 7752 7753 7754 7755 7756 7757 7758 7759 7760 7761 7762 7763 7764 7765 7766 7767 7768 7769 7770 7771 7772 7773 7774 7775 7776 7777 7778 7779 7780 7781 7782 7783 7784 7785 7786 7787 7788 7789 7790 7791 7792 7793 7794 7795 7796 7797 7798 7799 7800 7801 7802 7803 7804 7805 7806 7807 7808 7809 7810 7811 7812 7813 7814 7815 7816 7817 7818 7819 7820 7821 7822 7823 7824 7825 7826 7827 7828 7829 7830 7831 7832 7833 7834 7835 7836 7837 7838 7839 7840 7841 7842 7843 7844 7845 7846 7847 7848 7849 7850 7851 7852 7853 7854 7855 7856 7857 7858 7859 7860 7861 7862 7863 7864 7865 7866 7867 7868 7869 7870 7871 7872 7873 7874 7875 7876 7877 7878 7879 7880 7881 7882 7883 7884 7885 7886 7887 7888 7889 7890 7891 7892 7893 7894 7895 7896 7897 7898 7899 7900 7901 7902 7903 7904 7905 7906 7907 7908 7909 7910 7911 7912 7913 7914 7915 7916 7917 7918 7919 7920 7921 7922 7923 7924 7925 7926 7927 7928 7929 7930 7931 7932 7933 7934 7935 7936 7937 7938 7939 7940 7941 7942 7943 7944 7945 7946 7947 7948 7949 7950 7951 7952 7953 7954 7955 7956 7957 7958 7959 7960 7961 7962 7963 7964 7965 7966 7967 7968 7969 7970 7971 7972 7973 7974 7975 7976 7977 7978 7979 7980 7981 7982 7983 7984 7985 7986 7987 7988 7989 7990 7991 7992 7993 7994 7995 7996 7997 7998 7999)
 ]
 
 two_digit_ndc = [

data/lib/phony/countries/uruguay.rb

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

data/lib/phony/countries/vietnam.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Vietnamese phone numbers.
 #
 # http://en.wikipedia.org/wiki/Telephone_numbers_in_Vietnam
@@ -8,122 +10,122 @@
 #
 
 ndcs_with_7_subscriber_digits = [
-  '20',  # Lào Cai Province
+  '203', # Quảng Ninh Province
+  '204', # Bắc Giang (From 15 April 2017)
+  '205', # Lạng Sơn Province
+  '206', # Cao Bằng Province
+  '207', # Tuyên Quang Province
+  '208', # Thái Nguyên Provine
+  '209', # Bắc Kạn Province
   '210', # Phú Thọ Province
   '211', # Vĩnh Phúc Province
-  '218', # Hòa Bình Province (18 before 24 Nov 2007)
-  '219', # Hà Giang Province (19 before 24 Nov 2007)
-  '22',  # Sơn La Province
-  '230', # Điện Biên Province (23 before 24 Nov 2007)
-  '231', # Lai Châu Province (23 before 24 Nov 2007)
-  '240', # Bắc Giang Province
-  '241', # Bắc Ninh Province
-  '25',  # Lạng Sơn Province
-  '26',  # Cao Bằng Province
-  '27',  # Tuyên Quang Province
-  '280', # Thái Nguyên Province
-  '281', # Bắc Kạn Province
-  '29',  # Yên Bái Province
-
-  '30',  # Ninh Bình Province
-  '31',  # Hai Phong city
-  '320', # Hải Dương Province
-  '321', # Hưng Yên Province
-  '33',  # Quảng Ninh Province
-  '350', # Nam Định Province
-  '351', # Hà Nam Province
-  '36',  # Thái Bình Province
-  '37',  # Thanh Hóa Province
-  '38',  # Nghệ An Province
-  '39',  # Hà Tĩnh Province
-
-  '500', # Đắk Lắk Province (50 before 24 Nov 2007)
-  '501', # Đắk Nông Province (50 before 24 Nov 2007)
-  '510', # Quảng Nam Province
-  '511', # Da Nang city
-  '52',  # Quảng Bình Province
-  '53',  # Quảng Trị Province
-  '54',  # Thừa Thiên–Huế Province
-  '55',  # Quảng Ngãi Province
-  '56',  # Bình Định Province
-  '57',  # Phú Yên Province
-  '58',  # Khánh Hòa Province
-  '59',  # Gia Lai Province
-
-  '60',  # Kon Tum Province
-  '61',  # Đồng Nai Province
-  '62',  # Bình Thuận Province
-  '63',  # Lâm Đồng Province
-  '64',  # Bà Rịa–Vũng Tàu Province
-  '650', # Bình Dương Province
-  '651', # Bình Phước Province
-  '66',  # Tây Ninh Province
-  '67',  # Đồng Tháp Province
-  '68',  # Ninh Thuận Province
-
-  '70',  # Vĩnh Long Province
-  '710', # Cần Thơ city (71 before 24 Nov 2007)
-  '711', # Hậu Giang Province (71 before 24 Nov 2007)
-  '72',  # Long An Province
-  '73',  # Tiền Giang Province
-  '74',  # Trà Vinh Province
-  '75',  # Bến Tre Province
-  '76',  # An Giang Province
-  '77',  # Kiên Giang Province
-  '780', # Cà Mau Province
-  '781', # Bạc Liêu Province
-  '79'   # Sóc Trăng Province
+  '212', # Sơn La Province
+  '213', # Lai Châu
+  '214', # Lào Cai Province
+  '215', # Điện Biên Province
+  '216', # Yên Bái Province
+  '218', # Hòa Bình Province
+  '219', # Hà Giang Province
+  '220', # Hải Dương Province
+  '221', # Hưng Yên Province
+  '222', # Bắc Ninh Province
+  '225', # Hải Phòng Province
+  '226', # Hà Nam Province
+  '227', # Thái Bình Province
+  '228', # Nam Định Province
+  '229', # Ninh Bình Province
+  '232', # Quảng Bình Province
+  '233', # Quảng Trị Province
+  '234', # Thừa Thiên Huế Province
+  '235', # Quảng Nam Province
+  '236', # Đà Nẵng Province
+  '237', # Thanh Hóa Province
+  '238', # Nghệ An Province
+  '239', # Hà Tĩnh Province
+  '251', # Đồng Nai Province
+  '252', # Bình Thuận Province
+  '254', # Bà Rịa Vũng Tàu Province
+  '255', # Quảng Ngãi Province
+  '256', # Bình Định Province
+  '257', # Phú Yên Province
+  '258', # Khánh Hòa Province
+  '259', # Ninh Thuận Province
+  '260', # Kon Tum Province
+  '261', # Đăk Nông Province
+  '262', # Đăk Lăk Province
+  '263', # Lâm Đồng Province
+  '269', # Gia Lai Province
+  '270', # Vĩnh Long Province
+  '271', # Bình Phước Province
+  '272', # Long An Province
+  '273', # Tiền Giang Province
+  '274', # Bình Dương Province
+  '275', # Bến Tre Province
+  '276', # Tây Ninh Province
+  '277', # Đồng Tháp Province
+  '290', # Cà Mau Province
+  '291', # Bạc Liêu Province
+  '292', # Cần Thơ Province
+  '293', # Hậu Giang Province
+  '294', # Trà Vinh Province
+  '296', # An Giang Province
+  '297', # Kiên Giang Province
+  '299', # Sóc Trăng Province
 ]
 
 ndcs_with_8_subscriber_digits = [
-  '4', # Hanoi
-  '8'  # Ho Chi Minh City
+  '4',  # Hà Nội Province
+  '24', # Hà Nội Province
+  '28', # Hồ Chí Minh Province
+  '8',  # Hồ Chí Minh Province
 ]
 
 mobile = [
+  '32', # Viettel Mobile
+  '33', # Viettel Mobile
+  '34', # Viettel Mobile
+  '35', # Viettel Mobile
+  '36', # Viettel Mobile
+  '37', # Viettel Mobile
+  '38', # Viettel Mobile
+  '39', # Viettel Mobile
+  '52', # Vietnammobile
+  '56', # Vietnamobile
+  '58', # Vietnamobile (previously known as HT Mobile)
+  '59',  # GTel (traded as Beeline)
+  '70', # MobiFone
+  '76', # MobiFone
+  '77', # MobiFone
+  '78', # MobiFone
+  '79', # MobiFone
+  '81', # Vinaphone
+  '82', # Vinaphone
+  '83', # Vinaphone
+  '84', # Vinaphone
+  '85', # Vinaphone
+  '86', # Viettel
+  '87', # Itelecom
+  '88', # Vinaphone
+  '89',  # MobiFone,
   '90', # MobiFone
   '91', # Vinaphone
   '92', # Vietnamobile (previously known as HT Mobile)
   '93', # MobiFone
   '94', # Vinaphone
-  '95', # S-Fone
   '96', # previously EVN Telecom, now Viettel Mobile
   '97', # Viettel Mobile
   '98', # Viettel Mobile
-  '996', # Gmobile (traded as Beeline)
-  '997', # Gmobile (traded as Beeline)
-  '998', # Indochina Telecom
-  '999', # Indochina Telecom
-  '120', # MobiFone
-  '121', # MobiFone
-  '122', # MobiFone
-  '123', # Vinaphone
-  '124', # Vinaphone
-  '125', # Vinaphone
-  '126', # MobiFone
-  '127', # Vinaphone
-  '128', # MobiFone
-  '129', # Vinaphone
-  '163', # Viettel Mobile
-  '164', # Viettel Mobile
-  '165', # Viettel Mobile
-  '166', # Viettel Mobile
-  '167', # Viettel Mobile
-  '168', # Viettel Mobile
-  '169', # Viettel Mobile
-  '186', # Vietnamobile
-  '188', # Vietnamobile (previously known as HT Mobile)
-  '199'  # GTel (traded as Beeline)
+  '99', # Gmobile (traded as Beeline)
 ]
 
-mobile_with_trunk = mobile.map{|num| "0#{num}" }
+mobile_with_trunk = (mobile).map{ |num| "0#{num}" }
 
 Phony.define do
   country '84',
     trunk('0') |
+    one_of(mobile)                        >> split(4..8)|
     one_of(ndcs_with_7_subscriber_digits) >> split(3,4) |
     one_of(ndcs_with_8_subscriber_digits) >> split(4,4) |
-    one_of(mobile)                        >> split(5..8)|
     one_of(mobile_with_trunk)             >> split(5..8)|
     # Govt reserved
     fixed(80)                             >> split(5)   |

data/lib/phony/countries/zimbabwe.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Zimbabwe, https://www.numberingplans.com/?page=plans&sub=phonenr&alpha_2_input=ZW
 # http://www.itu.int/dms_pub/itu-t/oth/02/02/T02020000E90002PDFE.pdf