phony 2.18.10 → 2.18.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65cd9d252c032ff5116a79fa6e5b670f7d482d16534c43d2369c951aeaa01003
-  data.tar.gz: b1be2f32723b945d1854ea7b613e3121b95c5870e4704b3f0c42833f9c524271
+  metadata.gz: d8b68b69c83acc6190f9fc36b4d9d3b0db6878ddc4bdb2c7cfabae8a77ee3ddc
+  data.tar.gz: 1552ef3d9749adde09192d5951218ec399aac9bfe7d5a40c6c5ac50cac6003be
 SHA512:
-  metadata.gz: e12dd75c0642fb9b50527957dbeb470fbc831e732f4e54b1a8ceafe05970db355ed0d4b4097f43bbb7ea98ca99d28aea382b10c51a345bf94976df981666c9e4
-  data.tar.gz: 40d2961f1b3fec24505c376deb4252253af59c71eeda0c6b1bb35b4f5bce41a7c8ea99ad4a233e40974bc7cce6f2ae8dd403febf3f09006b4c69fb045635c3a9
+  metadata.gz: 375e4422e3e19806732fb2ccfee87905754b56822538ae2eaf357d3e9fdc6d3d3cbdf800d10ea202c45f9c5bfc5cd3fd634f40964b5248fe6bd46c1632aef4c7
+  data.tar.gz: 75f9f196bf936e481741a1c9f45f23bcc0d695843288505a57467d01edc8d0cdc1daa898083e12d402b582f0b8b46c22413d9b94e58714fe54bbed6cd352ab60

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

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

@@ -403,7 +403,7 @@ ndcs_with_5_subscriber_numbers = %w(
 
 Phony.define do
   country '81',
-    trunk('0') |
+    trunk('0', :normalize => false, :format => true, :split => true) |
     one_of('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) |

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

@@ -607,6 +607,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']

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.10
+  version: 2.18.15
 platform: ruby
 authors:
 - Florian Hanke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-20 00:00:00.000000000 Z
+date: 2020-07-12 00:00:00.000000000 Z
 dependencies: []
 description: 'Fast international phone number (E164 standard) normalizing, splitting
   and formatting. Lots of formatting options: International (+.., 00..), national