phony 2.18.11 → 2.18.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0dec25f641694c9f28c6d38038e650ee1353ffe7d7756b11f3675a8d2e2edb5d
-  data.tar.gz: 46c14ea65fd3659bd58ae8f6764c723c0647b3bb172b535a1cfc0753b44663c6
+  metadata.gz: 2e481c3598ba7449e6772de7ddf1882f9422aad76f2fe91334f85686bb3587ac
+  data.tar.gz: c8dbdb47f2a242d2d564b2f4a5163bc3845c8aaf9f0f40ad907d40748f7c52ea
 SHA512:
-  metadata.gz: 25fa4f7c4212f45a77cd98bc18c978048d11579de5bb70680108a7e84cbe91a2ffe8935a94a9bbd4f78e9e9a32b675b341ddcaa4367666a0f7d386069352e3a8
-  data.tar.gz: 26b570a3ddbe060b034841ffad3ecf7548d2ed74644e6a56b8790582c66b2144610e99c8bb817ecdcbdd4ca92acc25f19077df08bc2ccc73335bbf8c2fb3dedf
+  metadata.gz: 53bffe4e61b1e0482bd3e725e6d22d329283dcf2057fa93c1386edaec998c3f2daac28bab1d87d4b57fb0ac206a6110df970db88a308e150a1308798eb2d18dc
+  data.tar.gz: 623709a2ca48f3038db1f8f12e46bc34222d1d1d35831c8d2a5a10b78ed20d136d917d31b6b6d33d3f193c2c83d339ce4d37a434b5111220b2bba0e73bdf6592

data/lib/phony/countries.rb

@@ -102,7 +102,7 @@ Phony.define do
                 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
+                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
 
@@ -257,6 +257,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) |
@@ -382,8 +383,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
@@ -407,7 +409,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)

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/vietnam.rb

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

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/spec/functional/plausibility_spec.rb

@@ -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',
@@ -607,6 +614,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,16 @@ 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 '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 +222,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']
@@ -598,6 +621,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']
@@ -935,6 +959,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']

data/spec/lib/phony/country_spec.rb

@@ -89,4 +89,4 @@ describe Phony::Country do
     end
   end
   
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phony
 version: !ruby/object:Gem::Version
-  version: 2.18.11
+  version: 2.18.17
 platform: ruby
 authors:
 - Florian Hanke
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-15 00:00:00.000000000 Z
+date: 2020-12-02 00:00:00.000000000 Z
 dependencies: []
 description: 'Fast international phone number (E164 standard) normalizing, splitting
   and formatting. Lots of formatting options: International (+.., 00..), national
@@ -95,11 +95,11 @@ files:
 - spec/lib/phony/national_splitters/variable_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,7 +115,7 @@ 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.