phony 2.18.10 → 2.19.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65cd9d252c032ff5116a79fa6e5b670f7d482d16534c43d2369c951aeaa01003
-  data.tar.gz: b1be2f32723b945d1854ea7b613e3121b95c5870e4704b3f0c42833f9c524271
+  metadata.gz: d8e8c59adf885678317d72197e37fc237635f43e83bdc49b3162dc0226142185
+  data.tar.gz: fae6cff7e1fb009729a6098c69b76dd95f51596cac3c6ac1006562bd8759cdfd
 SHA512:
-  metadata.gz: e12dd75c0642fb9b50527957dbeb470fbc831e732f4e54b1a8ceafe05970db355ed0d4b4097f43bbb7ea98ca99d28aea382b10c51a345bf94976df981666c9e4
-  data.tar.gz: 40d2961f1b3fec24505c376deb4252253af59c71eeda0c6b1bb35b4f5bce41a7c8ea99ad4a233e40974bc7cce6f2ae8dd403febf3f09006b4c69fb045635c3a9
+  metadata.gz: c75466301cd92d29728be0570c9c300697fa0c7c1ea00143420af3f4b5c2e6bd10d9e39bbe4327946be6703bef773ad36df9328fdb7bb8838647726352d6b0af
+  data.tar.gz: 38ffb42f3b733f312b83b9d37d7e5f678836fd4be25b611f73d6465198491508ba14352a77687f3db4507ba44de3ef61a8cd2d1fc30b94df2946587b42c4e5bd

data/README.textile

@@ -104,7 +104,7 @@ 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, 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, 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. License
 

data/lib/phony/countries/cambodia.rb

@@ -71,6 +71,7 @@ six_digit_extended_range_mobile_prefixes = [
 ]
 
 seven_digit_mobile_prefixes = [
+  '18', # Seatel
   '31', # Metfone
   '38', # CooTel
   '39', # EMAXX
@@ -85,10 +86,6 @@ variable_length_extended_range_mobile_prefixes = [
   '12' # Mobitel
 ]
 
-mobile_prefixes_with_variable_length = [
-  '18' # Seatel
-]
-
 six_digit_total_single_digit_fixed_line_prefixes = [
   '2',  # Telecom Cambodia
   '3',  # Mobitel
@@ -126,7 +123,6 @@ 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]) |

data/lib/phony/countries/china.rb

@@ -19,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
@@ -28,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/ireland.rb

@@ -9,14 +9,14 @@
 #
 # 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', '23', '24', '25', '26', '27', '28', '29', # Mallow, Bandon, Youghal, Fermoy, Macroom, Bantry, Skibbereen, Kanturk
+  '22', '24', '25', '26', '27', '28', '29', # Mallow, Youghal, Fermoy, Macroom, Bantry, Skibbereen, Kanturk
   '402', # Arklow
   '404', # Wicklow
-  '43',  # Longford, Granard
   '47',  # Monaghan, Clones
   '48',  # Northern Ireland
   '502', # Portlaoise, Abbeyleix
@@ -24,12 +24,10 @@ ndcs_with_5_subscriber_digits = [
   '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
@@ -47,15 +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

@@ -269,7 +269,7 @@ service = [ # Not exhaustive.
 ]
 
 Phony.define do
-  country '39', trunk('', :normalize => false) |
+  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) |
@@ -280,6 +280,7 @@ Phony.define do
                   /^[^1]\d{6}$/ => [7]
                 ) |
                 one_of(*ndcs_4digit) >> matched_split(
+                /\A\d{4}\z/ => [4],
                 /^1\d{5}$/ => [6],
                 /^1\d{6}$/ => [7],
                 /^[^1]\d{4}$/ => [5],

data/lib/phony/countries/japan.rb

@@ -166,6 +166,7 @@ ndcs_with_6_subscriber_numbers = %w(
 422
 428
 436
+438
 439
 460
 463
@@ -281,7 +282,6 @@ ndcs_with_6_subscriber_numbers = %w(
 846
 847
 848
-849
 852
 853
 854
@@ -361,7 +361,6 @@ ndcs_with_5_subscriber_numbers = %w(
 1374
 1377
 1392
-1394
 1397
 1398
 1456
@@ -393,7 +392,6 @@ ndcs_with_5_subscriber_numbers = %w(
 8477
 8512
 8514
-8636
 9496
 9802
 9912
@@ -403,12 +401,15 @@ 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
     one_of(ndcs_with_5_subscriber_numbers) >> split(1,4) |
     one_of(ndcs_with_6_subscriber_numbers) >> split(2,4) |
     one_of(%w(120))                        >> split(3,3) | # freephone
-    one_of(%w(120 800))                    >> split(3,4) | # freephone
+    one_of(%w(800))                        >> split(3,4) | # freephone
+    one_of(%w(180 570))                    >> split(3,3) | # Tele-gong/Tele-dome, Navi-dial
+    one_of(%w(170 990))                    >> split(2,4) | # Dengon-dial, Dial Q2 (discontinued)
+    one_of(%w(80))                         >> split(4,4) | # mobile
     one_of(ndcs_with_7_subscriber_numbers) >> split(3,4) |
     one_of(ndcs_with_8_subscriber_numbers) >> split(4,4) |
     # TODO: 91(NDC) N(S)N length: 5-13 - Non-geographic number (Direct subscriber telephone service (legacy))

data/lib/phony/countries/libya.rb

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

data/lib/phony/countries/serbia.rb

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

data/lib/phony/countries/taiwan.rb

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

data/lib/phony/countries/vietnam.rb

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

data/lib/phony/countries.rb

@@ -96,15 +96,16 @@ Phony.define do
   # Belgium.
   #
   # http://en.wikipedia.org/wiki/Telephone_numbers_in_Belgium
+  # https://www.bipt.be/operators/publication/national-numbering-plan
   #
   country '32', trunk('0') |
-                match(/^(7[08])\d+$/)       >> split(3,3)   | # Premium and national rate Services
-                match(/^(800|90\d)\d+$/)    >> split(2,3)   | # Toll free service and premium numbers
-                match(/^(46[05678])\d{6}$/) >> split(2,2,2) | # Mobile (Lycamobile, Telenet, Join Experience, Proximus 0460)
-                match(/^(4[789]\d)\d{6}$/)  >> split(2,2,2) | # Mobile
-                match(/^(456)\d{6}$/)       >> split(2,2,2) | # Mobile Vikings
-                one_of('2','3','4','9')     >> split(3,2,2) | # Short NDCs
-                fixed(2)                    >> split(2,2,2)   # 2-digit NDCs
+                match(/^(7[08])\d+$/)        >> split(3,3)   | # Premium and national rate Services
+                match(/^(800|90\d)\d+$/)     >> split(2,3)   | # Toll free service and premium numbers
+                match(/^(46[056789])\d{6}$/) >> split(2,2,2) | # Mobile (Lycamobile, Telenet, Join Experience, Proximus 0460)
+                match(/^(4[789]\d)\d{6}$/)   >> split(2,2,2) | # Mobile
+                match(/^(45[56])\d{6}$/)     >> split(2,2,2) | # Mobile Vikings and Voo
+                one_of('2','3','4','9')      >> split(3,2,2) | # Short NDCs
+                fixed(2)                     >> split(2,2,2)   # 2-digit NDCs
 
   # France.
   #
@@ -154,6 +155,7 @@ Phony.define do
   #
   country '41',
           trunk('0', normalize: true) |
+          match(/^(860)\d+$/) >> split(2, 3, 2, 2) | # Voice Mail access
           match(/^(8(?:00|4[0248]))\d+$/) >> split(3,3) |  # Freecall/Shared Cost
           match(/^(90[016])\d+$/)       >> split(3,3) |  # Business
           fixed(2)                      >> split(3,2,2)
@@ -257,6 +259,7 @@ Phony.define do
     trunk('0') |
     # 7/10 digits for area code '2'.
     match(/\A(2)\d{10}\z/) >> split(10) |
+    match(/\A(2)\d{8}\z/) >> split(8) |
     one_of('2') >> split(7) |
     # mobile
     match(/\A([89]\d\d)\d{7}\z/) >> split(7) |
@@ -351,13 +354,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
@@ -382,8 +385,9 @@ 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
   # 3 4 split for mobile and 1 digit NDC, 3 2 or 3 3 otherwise
@@ -395,6 +399,7 @@ Phony.define do
   country '234',
     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
@@ -407,7 +412,9 @@ Phony.define do
   country '239', fixed(1) >> split(3,3) # Sao Tome and Principe, http://www.wtng.info/wtng-239-st.html
 
   country '240', none >> split(3,3,3) # Equatorial Guinea
-  country '241', fixed(1) >> split(3,3) # Gabonese Republic http://www.wtng.info/wtng-241-ga.html
+  country '241',
+    match(/^(\d)\d{6}$/) >> split(3,3) |  # Gabonese Republic http://www.wtng.info/wtng-241-ga.html
+    match(/^(\d\d)\d{6}$/) >> split(2,2,2)    # 2019 update https://en.wikipedia.org/wiki/Telephone_numbers_in_Gabon
   country '242', # Congo http://www.wtng.info/wtng-242-cg.html
     trunk('', :normalize => false) |
     none >> split(4,5)
@@ -427,9 +434,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
 
@@ -480,27 +487,31 @@ Phony.define do
   # Zambia
   # http://www.wtng.info/wtng-260-zm.html
   # https://github.com/googlei18n/libphonenumber/
+  # https://en.wikipedia.org/wiki/Telephone_numbers_in_Zambia
   country '260',
-    match(/^(9(5[034589]|[67]\d))/) >> split(6)   | # Mobile
-    match(/^(800)/)                 >> split(3,3) | # Toll free
-    match(/^(21[1-8])/)             >> split(6)     # Fixed
+    trunk('0') |
+    match(/^(76|77|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') |
@@ -987,7 +998,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 # -
@@ -995,7 +1009,7 @@ Phony.define do
   country '805', todo # -
   country '806', todo # -
   country '807', todo # -
-  country '808', todo # International Shared Cost Service (ISCS)
+  country '808', none >> split(12) # International Shared Cost Service (ISCS)
   country '809', todo # -
 
   country '830', todo # -

data/lib/phony/country.rb

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

data/lib/phony/country_codes.rb

@@ -66,7 +66,7 @@ module Phony
         country, cc, number = partial_split number
         country
       end
-      number = country.normalize number
+      number = country.normalize number, cc: cc
       countrify! number, cc
     end
 
@@ -97,7 +97,7 @@ 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
 

data/lib/phony/dsl.rb

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

data/lib/phony/local_splitters/fixed.rb

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

data/lib/phony/national_code.rb

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

data/lib/phony/national_splitters/none.rb

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

data/lib/phony/trunk_code.rb

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

data/spec/functional/plausibility_spec.rb

@@ -192,7 +192,7 @@ describe 'plausibility' do
           Phony.plausible?('+385 60 12 345').should be_truthy   # Premium rate
           Phony.plausible?('+385 62 123 456').should be_truthy  # Premium, personal and UAN
       end
-      it_is_correct_for "Côte d'Ivoire", :samples => '+225  9358 8764'
+      it_is_correct_for "Côte d'Ivoire", :samples => '+225 01 9358 8764'
       it_is_correct_for 'Democratic Republic of Timor-Leste', :samples => ['+670 465 7886', '+670 7465 7886']
       it_is_correct_for 'Democratic Republic of the Congo', :samples => '+243 80 864 9794'
       it_is_correct_for 'Diego Garcia', :samples => '+246  123 7686'
@@ -249,7 +249,14 @@ describe 'plausibility' do
       end
       it_is_correct_for 'French Guiana (French Department of)', :samples => '+594 594 123 456'
       it_is_correct_for "French Polynesia (Territoire français d'outre-mer)", :samples => '+689 87 27 84 00'
-      it_is_correct_for 'Gabonese Republic', :samples => '+241 1 627 739'
+      it 'is correct for Gabon' do
+        Phony.plausible?('+241 1 627 739').should be_truthy
+        Phony.plausible?('+241 12 34 56 78').should be_truthy
+      end
+      # it_is_correct_for 'Gabonese Republic', :samples => [
+      #   '+241 1 627 739',
+      #   '+241 12 34 56 78',
+      # ]
       it_is_correct_for 'Gambia', :samples => '+220  989 5148'
       it_is_correct_for 'Germany', :samples => [
         '+49 69 155 1',
@@ -273,6 +280,7 @@ describe 'plausibility' do
       it_is_correct_for 'Guinea-Bissau', :samples => '+245 44 728 6998'
       it_is_correct_for 'Guyana', :samples => '+592 263 1234'
       it_is_correct_for 'Honduras (Republic of)', :samples => '+504 12 961 637'
+      it_is_correct_for 'Italy', :samples => ['+39 0574 1234']
       it_is_correct_for 'Iraq', :samples => ['+964 1 123 4567',
                                              '+964 21 113 456',
                                              '+964 71 1234 5678']
@@ -317,10 +325,19 @@ describe 'plausibility' do
       it_is_correct_for 'Macedonia', :samples => ['+389 2 123 4567',
                                                    '+389 7 124 3456',
                                                    '+389 7 234 5678']
-      it_is_correct_for 'Madagascar', :samples => ['+261 20 012 345 678',
-                                                   '+261 20 124 3456',
-                                                   '+261 512 345 678',
-                                                   '+261 33 345 6789']
+      it_is_correct_for 'Madagascar', :samples => ['+261 20 23 456 78',
+                                                   '+261 32 34 546 78',
+                                                   '+261 33 34 546 78',
+                                                   '+261 34 34 546 78',
+                                                   '+261 38 34 546 78']
+      it 'is incorrect for Madagascar' do
+        Phony.plausible?('+261 20 012 345 678').should be_falsey
+        Phony.plausible?('+261 20 12 434 569').should be_falsey
+        Phony.plausible?('+261 51 23 4567 8').should be_falsey
+        Phony.plausible?('+261 34 345 46789').should be_falsey
+        Phony.plausible?('+261 34 345 467').should be_falsey
+      end
+
       it_is_correct_for 'Malawi', :samples => ['+265 1725 123',
                                                '+265 213 456 789',
                                                '+265 9123 456',
@@ -392,6 +409,12 @@ describe 'plausibility' do
                                                              '+507 6 123 4567',
                                                              '+507 2 123 456']
       it_is_correct_for 'Reunion / Mayotte (new)', :samples => '+262 295 276 964'
+      it_is_correct_for 'Rwanda', :samples => ['+250 72 1234567',
+                                               '+250 73 1234567',
+                                               '+250 78 1234567',
+                                               '+250 79 1234567',
+                                               '+250 25 1234567',
+                                               '+250 06 123456']
       it_is_correct_for 'Saint Helena', :samples => '+290  5134'
       it_is_correct_for 'Saint Pierre and Miquelon (Collectivité territoriale de la République française)', :samples => '+508  474 714'
       it_is_correct_for 'Salvador (El)', :samples => [
@@ -420,8 +443,10 @@ describe 'plausibility' do
                                                ['+381 11 123 456', '+381 11 123 4567'],
                                                '+381 72 123 456',
                                                '+381 60 123',
-                                               '+381 60 123 4567',
+                                               ['+381 60 123 4567', '+381 69 123 456'],
                                                '+381 42 123 456',
+                                               '+381 677 123 456',
+                                               '+381 678 123 456',
                                                '+381 9 123 4567',
                                                '+381 60 123',
                                                '+381 60 123 456 7890',
@@ -492,7 +517,10 @@ describe 'plausibility' do
       it_is_correct_for 'Lybia', :samples => ['+218 205 123 45',
                                               '+218 22 123 456',
                                               '+218 21 1234 456',
-                                              '+218 91 1234 456']
+                                              '+218 91 1234 456',
+                                              '+218 92 1234 456',
+                                              '+218 94 1234 456',
+                                              '+218 95 1234 456']
       it_is_correct_for 'Mongolia', :samples => ['+976 11 123 45',
                                                  ['+976 121 12 34', '+976 121 12 345'],
                                                  '+976 70 123 456',
@@ -553,9 +581,12 @@ describe 'plausibility' do
                                               '+967 58 1234']
       it 'is correct for Zambia' do
         Phony.plausible?('+260 211 123456').should be_truthy  # Fixed
-        Phony.plausible?('+260 955 123456').should be_truthy  # Mobile
-        Phony.plausible?('+260 967 123456').should be_truthy  # Mobile
-        Phony.plausible?('+260 978 123456').should be_truthy  # Mobile
+        Phony.plausible?('+260 96 512 4567').should be_truthy # MTN Mobile
+        Phony.plausible?('+260 97 712 3456').should be_truthy # Airtel Mobile
+        Phony.plausible?('+260 95 512 4567').should be_truthy # Zamtel Mobile
+        Phony.plausible?('+260 96 512 456').should be_falsy   # MTN Mobile (Too short)
+        Phony.plausible?('+260 97 812 345').should be_falsy   # Airtel Mobile (Too short)
+        Phony.plausible?('+260 95 512 345').should be_falsy   # Zamtel Mobile (Too short)
         Phony.plausible?('+260 800 123 456').should be_truthy # Toll free
       end
       it_is_correct_for 'Zimbabwe', :samples => [['+263 2582 123 456', '+263 2582 123'],
@@ -607,6 +638,7 @@ describe 'plausibility' do
       end
 
       it 'is correct for Philippine' do
+        Phony.plausible?('+63 2 89889999').should be_truthy
         Phony.plausible?('+63 976 1234567').should be_truthy # mobile phone with area code 9
         Phony.plausible?('+63 876 1234567').should be_truthy # mobile phone with area code 8
       end

data/spec/lib/phony/countries_spec.rb

@@ -103,8 +103,17 @@ describe 'country descriptions' do
       it_splits '3295551914', ['32', '9', '555', '19', '14']   # Gent
       it_splits '3245551414', ['32', '4', '555', '14', '14']   # Liège
       it_splits '3216473200', ['32', '16', '47', '32', '00']   # Leuven
-      it_splits '32475279584', ['32', '475', '27', '95', '84'] # mobile
-      it_splits '32468279584', ['32', '468', '27', '95', '84'] # mobile (Telenet)
+      it_splits '32455123456', ['32', '455', '12', '34', '56'] # mobile (Voo)
+      it_splits '32456123456', ['32', '456', '12', '34', '56'] # mobile (MobileViking)
+      it_splits '32460123456', ['32', '460', '12', '34', '56'] # mobile (Proximus)
+      it_splits '32465123456', ['32', '465', '12', '34', '56'] # mobile (Lycamobile)
+      it_splits '32466123456', ['32', '466', '12', '34', '56'] # mobile (Vectone)
+      it_splits '32467123456', ['32', '467', '12', '34', '56'] # mobile (Telenet)
+      it_splits '32468123456', ['32', '468', '12', '34', '56'] # mobile (Telenet)
+      it_splits '32469123456', ['32', '469', '12', '34', '56'] # mobile ()
+      it_splits '32475123456', ['32', '475', '12', '34', '56'] # mobile (Proximus)
+      it_splits '32485123456', ['32', '485', '12', '34', '56'] # mobile (Telenet)
+      it_splits '32495123456', ['32', '495', '12', '34', '56'] # mobile (Orange)
       it_splits '3270123123', ['32', '70', '123', '123']       # Bus Service?
       it_splits '3278123123', ['32', '78', '123', '123']       # National rate service
       it_splits '3290123123', ['32', '901', '23', '123']       # National rate service
@@ -214,6 +223,21 @@ describe 'country descriptions' do
     describe 'China' do
       it_splits '862112345678', ['86', '21', '1234', '5678']   # Shanghai
       it_splits '8675582193447', ['86', '755', '8219', '3447'] # Shenzhen
+      it_splits '869511234567', ['86', '951', '123', '4567']   # Yinchuan
+
+      context 'mobile numbers' do
+        %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
+        }.each do |prefix|
+          it_splits "86#{prefix}12345678", ['86', prefix, '1234', '5678']
+        end
+      end
     end
     describe 'Colombia' do
       it_splits '5711234567', ['57', '1', '123', '4567']
@@ -446,6 +470,7 @@ describe 'country descriptions' do
       it_splits '3903123391',   ['39', '031', '23391']   # Como
       it_splits '390909709511', ['39', '090', '9709511'] # Barcellona
       it_splits '390471811353', ['39', '0471', '811', '353'] # Bolzano
+      it_splits '3905745730', ['39', '0574', '5730'] # Prato
     end
     describe 'Japan' do
       it_splits '81312345678', %w(81 3 1234 5678) # Tokyo
@@ -461,6 +486,8 @@ describe 'country descriptions' do
       it_splits '817012345678', %w(81 70 1234 5678) # PHS
       it_splits '818012345678', %w(81 80 1234 5678) # Cellular
       it_splits '819012345678', %w(81 90 1234 5678) # Cellular
+      it_splits '810570123456', %w(81 570 123 456)  # Navi-dial
+      it_splits '810180123456', %w(81 180 123 456)  # Tele-gong/Tele-dome
     end
     describe 'Kenya' do
       it_splits '254201234567', ['254', '20', '1234567'] # Nairobi
@@ -598,6 +625,7 @@ describe 'country descriptions' do
     end
     describe 'Philippines' do
       it_splits '6321234567', ['63', '2', '1234567']
+      it_splits '63289889999', ['63', '2', '89889999']
       it_splits '6321234567890', ['63', '2', '1234567890']
       it_splits '632123456789012', ['63', '2', '123456789012']
       it_splits '639121234567', ['63', '912', '1234567']
@@ -653,6 +681,7 @@ describe 'country descriptions' do
       it_splits '250781234567', ['250', '78', '1234567'] # mobile
       it_splits '250721234567', ['250', '72', '1234567'] # mobile
       it_splits '250731234567', ['250', '73', '1234567'] # mobile
+      it_splits '250791234567', ['250', '79', '1234567'] # mobile
       it_splits '250251234567', ['250', '25', '1234567'] # fixed
       it_splits '25006123456',  ['250', '06', '123456']  # fixed
     end
@@ -735,6 +764,7 @@ describe 'country descriptions' do
     describe 'Switzerland' do
       it_splits '41443643532', ['41', '44', '364', '35', '32'] # Zurich (usually)
       it_splits '41800334455', ['41', '800', '334', '455']     # Service number
+      it_splits '41860443643532', ['41', '860', '44', '364', '35', '32'] # Voicemail access
       it_splits '41900123456', ['41', '900', '123', '456']     # Business Number
       it_splits '41901123456', ['41', '901', '123', '456']     # Business Number Entertainment
       it_splits '41906123456', ['41', '906', '123', '456']     # Business Number Adult Entertainment
@@ -823,9 +853,9 @@ describe 'country descriptions' do
     end
     describe 'Zambia' do
       it_splits '260211123456', ['260', '211', '123456']     # Fixed
-      it_splits '260955123456', ['260', '955', '123456']     # Mobile
-      it_splits '260967123456', ['260', '967', '123456']     # Mobile
-      it_splits '260978123456', ['260', '978', '123456']     # Mobile
+      it_splits '260955123456', ['260', '95', '512', '3456'] # Mobile
+      it_splits '260967123456', ['260', '96', '712', '3456'] # Mobile
+      it_splits '260978123456', ['260', '97', '812', '3456'] # Mobile
       it_splits '260800123456', ['260', '800', '123', '456'] # Toll free
     end
     describe 'New Zealand' do
@@ -871,8 +901,8 @@ describe 'country descriptions' do
       it_splits '50622345678', %w(506 2 234 5678)
     end
     describe "Côte d'Ivoire" do
-      it_splits '22507335518', ['225', '07', '33', '55', '18']
-      it_splits '22537335518', ['225', '37', '33', '55', '18']
+      it_splits '2250107335518', ['225', '01', '07', '33', '55', '18']
+      it_splits '2250237335518', ['225', '02', '37', '33', '55', '18']
     end
     describe 'Democratic Republic of Timor-Leste' do
       it_splits '6701742945', ['670', false, '174', '2945']
@@ -935,6 +965,7 @@ describe 'country descriptions' do
     end
     describe 'Gabonese Republic' do
       it_splits '2411834375', ['241', '1', '834', '375']
+      it_splits '24174012345', ['241', '74', '01', '23', '45']
     end
     describe 'Gambia' do
       it_splits '2206683355', ['220', false, '668', '3355']
@@ -1022,11 +1053,14 @@ describe 'country descriptions' do
       it_splits '21822123456', %w(218 22 123 456)
       it_splits '218211234456', %w(218 21 1234 456)
       it_splits '218911234456', %w(218 91 1234 456)
+      it_splits '218941234456', %w(218 94 1234 456)
+      it_splits '218951234456', %w(218 95 1234 456)
     end
     describe 'Madagascar' do
-      it_splits '26120012345678', ['261', false, '20', '012', '345', '678']
-      it_splits '261201243456', ['261', false, *%w(20 124 3456)]
-      it_splits '261512345678', ['261', false, *%w(512 345 678)]
+      it_splits '261202254716', ['261', '20', *%w(22 547 16)]
+      it_splits '261320254716', ['261', '32', *%w(02 547 16)]
+      it_splits '261330254716', ['261', '33', *%w(02 547 16)]
+      it_splits '261340254716', ['261', '34', *%w(02 547 16)]
     end
     describe 'Malawi' do
       it_splits '2651725123', ['265', false, '1725', '123']
@@ -1139,6 +1173,17 @@ describe 'country descriptions' do
       it_splits '2349087661234', %w(234 908 766 1234)
       it_splits '2349097661234', %w(234 909 766 1234)
 
+      it_splits '2349107661234', %w(234 910 766 1234)
+      it_splits '2349117661234', %w(234 911 766 1234)
+      it_splits '2349127661234', %w(234 912 766 1234)
+      it_splits '2349137661234', %w(234 913 766 1234)
+      it_splits '2349147661234', %w(234 914 766 1234)
+      it_splits '2349157661234', %w(234 915 766 1234)
+      it_splits '2349167661234', %w(234 916 766 1234)
+      it_splits '2349177661234', %w(234 917 766 1234)
+      it_splits '2349187661234', %w(234 918 766 1234)
+      it_splits '2349197661234', %w(234 919 766 1234)
+
       it_splits '2348107661234', %w(234 810 766 1234)
       it_splits '2348117661234', %w(234 811 766 1234)
       it_splits '2348127661234', %w(234 812 766 1234)
@@ -1278,6 +1323,7 @@ describe 'country descriptions' do
       it_splits '88633123456', %w(886 3 312 3456)
       it_splits '88637123456', %w(886 37 12 3456)
       it_splits '88682712345', %w(886 82 71 2345)
+      it_splits '886801123123', %w(886 801 123 123)
       it_splits '88689712345', %w(886 89 71 2345)
       it_splits '88682672345', %w(886 826 7 2345)
       it_splits '88683672345', %w(886 836 7 2345)
@@ -1388,6 +1434,14 @@ describe 'country descriptions' do
         it_splits  number, ['263', prefix, '234', '5678']
       end
     end
+
+    describe 'Universal International Freephone' do
+      it_splits '80012345678', ['800', false, '12345678']
+    end
+
+    describe 'Shared-Cost Service' do
+      it_splits '80812345678', ['808', false, '12345678']
+    end
   end
 
 end

data/spec/lib/phony/country_codes_spec.rb

@@ -1,32 +1,30 @@
 require 'spec_helper'
 
 describe Phony::CountryCodes do
-
-  before(:all) do
-    @countries = Phony::CountryCodes.instance
-  end
+  
+  let(:countries) { Phony::CountryCodes.instance }
   
   describe '#[]' do
     it 'returns a country' do
-      @countries['41'].class.should eql Phony::Country
+      countries['41'].class.should eql Phony::Country
     end
   end
   
   describe '#country_for' do
     it 'returns a country' do
-      @countries.send(:country_for, '41').class.should eql Phony::Country
+      countries.send(:country_for, '41').class.should eql Phony::Country
     end
   end
   
   describe '#countrify' do
     it 'returns a country' do
-      @countries.send(:countrify, '441231212', '41').should eql '41441231212'
+      countries.send(:countrify, '441231212', '41').should eql '41441231212'
     end
   end
   describe '#countrify!' do
     it 'in-place replaces the number' do
       number = '441231212'
-      @countries.send(:countrify!, number, '41').should eql number
+      countries.send(:countrify!, number, '41').should eql number
       
       number.should == '41441231212'
     end
@@ -34,127 +32,127 @@ describe Phony::CountryCodes do
   
   describe '#vanity?' do
     it 'returns true if so' do
-      @countries.vanity?('1800HELLOES').should eql true
+      countries.vanity?('1800HELLOES').should eql true
     end
     it 'returns false if not' do
-      @countries.vanity?('18001234567').should eql false
+      countries.vanity?('18001234567').should eql false
     end
   end
 
   describe 'normalize' do
     it 'normalizes correctly' do
-      @countries.normalize('0041-44-364-35-32').should eql '41443643532'
+      countries.normalize('0041-44-364-35-32').should eql '41443643532'
     end
     it 'normalizes correctly with CC option' do
-      @countries.normalize('044-364-35-32', cc: '41').should eql '41443643532'
+      countries.normalize('044-364-35-32', cc: '41').should eql '41443643532'
     end
 
     context 'specific countries' do
       it 'handles Congo correctly' do
-        @countries.normalize('+242 0571 73992').should eql '242057173992'
-        @countries.normalize('+242 2221 15932').should eql '242222115932'
+        countries.normalize('+242 0571 73992').should eql '242057173992'
+        countries.normalize('+242 2221 15932').should eql '242222115932'
       end
     end
   end
 
   describe 'formatted' do
     it 'formats correctly' do
-      @countries.formatted('41443643532', :format => :international, :spaces => :-).should eql '+41-44-364-35-32'
+      countries.formatted('41443643532', :format => :international, :spaces => :-).should eql '+41-44-364-35-32'
     end
     it 'formats correctly' do
-      @countries.formatted('41443643532', :format => :international_relative, :spaces => :-).should eql '0041-44-364-35-32'
+      countries.formatted('41443643532', :format => :international_relative, :spaces => :-).should eql '0041-44-364-35-32'
     end
     it 'formats correctly' do
-      @countries.formatted('41443643532', :format => :national, :spaces => :-).should eql '044-364-35-32'
+      countries.formatted('41443643532', :format => :national, :spaces => :-).should eql '044-364-35-32'
     end
     context 'specific' do
       it 'formats Ireland correctly' do
-        @countries.formatted("3533451234", :format => :national).should eql '0345 1234'
+        countries.formatted("3533451234", :format => :national).should eql '0345 1234'
       end
       it 'formats Ireland correctly' do
-        @countries.formatted("353411231234", :format => :national).should eql '041 123 1234'
+        countries.formatted("353411231234", :format => :national).should eql '041 123 1234'
       end
       it 'formats Spain correctly' do
-        @countries.formatted("34123456789", :format => :national).should eql '123 456 789'
+        countries.formatted("34123456789", :format => :national).should eql '123 456 789'
       end
       it 'formats Cambodia correctly' do
-        @countries.formatted('85512239123', :format => :national).should eql '012 239 123'
+        countries.formatted('85512239123', :format => :national).should eql '012 239 123'
       end
       it 'formats the US correctly' do
-        @countries.formatted('18005551212', :format => :national, :spaces => :-).should eql '(800)-555-1212'
+        countries.formatted('18005551212', :format => :national, :spaces => :-).should eql '(800)-555-1212'
       end
       it 'formats the US correctly' do
-        @countries.formatted('18005551212', :format => :national, :spaces => :-).should eql '(800)-555-1212'
+        countries.formatted('18005551212', :format => :national, :spaces => :-).should eql '(800)-555-1212'
       end
     end
     context 'default' do
       it "should format swiss numbers" do
-        @countries.formatted('41443643532').should eql '+41 44 364 35 32'
+        countries.formatted('41443643532').should eql '+41 44 364 35 32'
       end
       it "should format swiss service numbers" do
-        @countries.formatted('41800112233').should eql '+41 800 112 233'
+        countries.formatted('41800112233').should eql '+41 800 112 233'
       end
       it "should format austrian numbers" do
-        @countries.formatted('43198110').should eql '+43 1 98110'
+        countries.formatted('43198110').should eql '+43 1 98110'
       end
       it "should format american numbers" do
-        @countries.formatted('18705551122').should eql '+1 (870) 555-1122'
+        countries.formatted('18705551122').should eql '+1 (870) 555-1122'
       end
       it "should format irish numbers" do
-        @countries.formatted('35311234567').should eql '+353 1 123 4567'
+        countries.formatted('35311234567').should eql '+353 1 123 4567'
       end
     end
     describe "international" do
       it "should format north american numbers" do
-        @countries.formatted('18091231234', :format => :international).should eql '+1 (809) 123-1234'
+        countries.formatted('18091231234', :format => :international).should eql '+1 (809) 123-1234'
       end
       it "should format austrian numbers" do
-        @countries.formatted('43198110', :format => :international).should eql '+43 1 98110'
+        countries.formatted('43198110', :format => :international).should eql '+43 1 98110'
       end
       it "should format austrian numbers" do
-        @countries.formatted('43198110', :format => :international_absolute).should eql '+43 1 98110'
+        countries.formatted('43198110', :format => :international_absolute).should eql '+43 1 98110'
       end
       it "should format french numbers" do
-        @countries.formatted('33142278186', :format => :+).should eql '+33 1 42 27 81 86'
+        countries.formatted('33142278186', :format => :+).should eql '+33 1 42 27 81 86'
       end
       it "should format austrian numbers" do
-        @countries.formatted('43198110', :format => :international_relative).should eql '0043 1 98110'
+        countries.formatted('43198110', :format => :international_relative).should eql '0043 1 98110'
       end
       it 'should format liechtensteiner numbers' do
-        @countries.formatted('4233841148', :format => :international_relative).should eql '00423 384 11 48'
+        countries.formatted('4233841148', :format => :international_relative).should eql '00423 384 11 48'
       end
       it "should format irish numbers" do
-        @countries.formatted('35311234567', :format => :international).should eql '+353 1 123 4567'
+        countries.formatted('35311234567', :format => :international).should eql '+353 1 123 4567'
       end
       it "should format luxembourgian numbers" do
-        @countries.formatted('352222809', :format => :international).should eql '+352 22 28 09'
+        countries.formatted('352222809', :format => :international).should eql '+352 22 28 09'
       end
       it "should format luxembourgian 4-digit ndc numbers" do
-        @countries.formatted('35226222809', :format => :international).should eql '+352 2622 28 09'
+        countries.formatted('35226222809', :format => :international).should eql '+352 2622 28 09'
       end
       it "should format luxembourgian mobile numbers" do
-        @countries.formatted('352621123456', :format => :international).should eql '+352 621 123 456'
+        countries.formatted('352621123456', :format => :international).should eql '+352 621 123 456'
       end
       it "should format luxembourgian city numbers" do
-        @countries.formatted('3524123456', :format => :international).should eql '+352 41 23 45 6'
+        countries.formatted('3524123456', :format => :international).should eql '+352 41 23 45 6'
       end
       it "should format luxembourgian machine to machine numbers" do
-        @countries.formatted('352602112345678', :format => :international).should eql '+352 6021 12 34 56 78'
+        countries.formatted('352602112345678', :format => :international).should eql '+352 6021 12 34 56 78'
       end
       it "should format luxembourgian numbers" do
-        @countries.formatted('352370431', :format => :international).should eql '+352 37 04 31'
+        countries.formatted('352370431', :format => :international).should eql '+352 37 04 31'
       end
       it "should format luxembourgian numbers" do
-        @countries.formatted('35227855', :format => :international).should eql '+352 27 85 5'
+        countries.formatted('35227855', :format => :international).should eql '+352 27 85 5'
       end
       it "should format nigerian lagosian numbers" do
-        @countries.formatted('23414480000', :format => :international).should eql '+234 1 448 0000'
+        countries.formatted('23414480000', :format => :international).should eql '+234 1 448 0000'
       end
       it "should format nigerian beninese numbers" do
-        @countries.formatted('23452123456', :format => :international).should eql '+234 52 123 456'
+        countries.formatted('23452123456', :format => :international).should eql '+234 52 123 456'
       end
       it "should format nigerian mobile numbers" do
-        @countries.formatted('2347061234567', :format => :international).should eql '+234 706 123 4567'
+        countries.formatted('2347061234567', :format => :international).should eql '+234 706 123 4567'
       end
       context 'with no spaces' do
         it "should format north american numbers" do

data/spec/lib/phony/country_spec.rb

@@ -43,6 +43,18 @@ describe Phony::Country do
         Phony.normalize('+378903549').should == '3780549903549'
       end
     end
+    describe 'Japan' do
+      it 'normalizes correctly' do
+        Phony.normalize('+81-03-1234-5634').should == '81312345634'
+        Phony.normalize('03-1234-5634', cc: '81').should == '81312345634'
+      end
+      it 'formats correctly' do
+        Phony.format('81312345634').should == '+81-3-1234-5634'
+      end
+      it 'splits correctly' do
+        Phony.split('81312345634').should == %w(81 3 1234 5634)
+      end
+    end
   end
   
   context "without special cases (with switzerland)" do
@@ -89,4 +101,4 @@ describe Phony::Country do
     end
   end
   
-end
+end

data/spec/lib/phony/trunk_code_spec.rb

@@ -0,0 +1,85 @@
+require 'spec_helper'
+
+describe Phony::TrunkCode do
+  
+  describe '#format' do
+    it 'is correct' do
+      code = described_class.new('0')
+      expect(code.format('%s %s')).to eq '0'
+    end
+    it 'is correct' do
+      code = described_class.new('0', format: true)
+      expect(code.format('%s %s')).to eq '0'
+    end
+    it 'is correct' do
+      code = described_class.new('0', format: false)
+      expect(code.format('%s %s')).to eq nil
+    end
+    it 'is correct' do
+      code = described_class.new('06')
+      expect(code.format('%s %s')).to eq '06'
+    end
+    it 'is correct' do
+      code = described_class.new('06', format: true)
+      expect(code.format('%s %s')).to eq '06'
+    end
+    it 'is correct' do
+      code = described_class.new('06', format: false)
+      expect(code.format('%s %s')).to eq nil
+    end
+  end
+  
+  describe '#normalize' do
+    it 'is correct' do
+      code = described_class.new('0')
+      expect(code.normalize('0123')).to eq '0123'
+    end
+    it 'is correct' do
+      code = described_class.new('0', normalize: true)
+      expect(code.normalize('0123')).to eq '0123'
+    end
+    it 'is correct' do
+      code = described_class.new('0', normalize: false)
+      expect(code.normalize('0123')).to eq '0123'
+    end
+    it 'is correct' do
+      code = described_class.new('06')
+      expect(code.normalize('06123')).to eq '06123'
+    end
+    it 'is correct' do
+      code = described_class.new('06', normalize: true)
+      expect(code.normalize('06123')).to eq '06123'
+    end
+    it 'is correct' do
+      code = described_class.new('06', normalize: false)
+      expect(code.normalize('0123')).to eq '0123'
+    end
+  end
+  
+  describe '#split' do
+    it 'is correct' do
+      code = described_class.new('0')
+      expect(code.split('0123')).to eq [code, '0123']
+    end
+    it 'is correct' do
+      code = described_class.new('0', split: true)
+      expect(code.split('0123')).to eq [code, '123']
+    end
+    it 'is correct' do
+      code = described_class.new('0', split: false)
+      expect(code.split('0123')).to eq [code, '0123']
+    end
+    it 'is correct' do
+      code = described_class.new('06')
+      expect(code.split('06123')).to eq [code, '06123']
+    end
+    it 'is correct' do
+      code = described_class.new('06', split: true)
+      expect(code.split('06123')).to eq [code, '123']
+    end
+    it 'is correct' do
+      code = described_class.new('06', split: false)
+      expect(code.split('06123')).to eq [code, '06123']
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phony
 version: !ruby/object:Gem::Version
-  version: 2.18.10
+  version: 2.19.10
 platform: ruby
 authors:
 - Florian Hanke
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-11-20 00:00:00.000000000 Z
+date: 2022-03-30 00:00:00.000000000 Z
 dependencies: []
 description: 'Fast international phone number (E164 standard) normalizing, splitting
   and formatting. Lots of formatting options: International (+.., 00..), national
@@ -93,13 +93,14 @@ files:
 - spec/lib/phony/national_splitters/none_spec.rb
 - spec/lib/phony/national_splitters/regex_spec.rb
 - spec/lib/phony/national_splitters/variable_spec.rb
+- spec/lib/phony/trunk_code_spec.rb
 - spec/lib/phony/vanity_spec.rb
 - spec/lib/phony_spec.rb
-homepage: http://github.com/floere/phony
+homepage: https://github.com/floere/phony
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -115,12 +116,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Fast international phone number (E164 standard) normalizing, splitting and
   formatting.
 test_files:
 - spec/lib/phony_spec.rb
+- spec/lib/phony/trunk_code_spec.rb
 - spec/lib/phony/country_spec.rb
 - spec/lib/phony/national_code_spec.rb
 - spec/lib/phony/countries_spec.rb