phony 2.19.4 → 2.19.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe07b2679b93f5f47130983d691b0c9cba7d99bc9cb83e68c62055dfc21b0c4d
-  data.tar.gz: cacc529ee97eb80c8538912869e836035c6c2458f464a99b23b97d13c791cd87
+  metadata.gz: c0fc7753788d596736d26fddf4ff8688d33348e45512f3edea923b8fb35afa7c
+  data.tar.gz: 570d9d1012de2b6a854bafc238e385619365b4a559cea14f321ded2f0644c851
 SHA512:
-  metadata.gz: effe3a2aa50125a4ecbabcb805dcb80c49f5b394ca5c8d443ea58eae124964e34bfa90309187dc91e934fb7df472d4884e036034c1a4d98387510ad81483892d
-  data.tar.gz: 364893e401aaad1bbbc0bd3e5466e78dd3eb94b3e2780a98c781109643818c7ce89eacc9cece8925e72029ec07cf22a9dae496b260e9c7e3f88bf39993f0a588
+  metadata.gz: b22cf9c9b8bffe3222333461c919b5a04fab9b4d7f111c0679b79e602787a262b0716a432affa4b1a35710ab26e188f947420dcf35a7b893ae7af22e58d0e4c5
+  data.tar.gz: '008fcad42c6dec3854a15b6dfe9d4856b5a26950cd8a9bfa4495d056159dd0dc9b3e77320380e97350fd7d6ec7886af542c6435da21771c12889f82cbac6a962'

data/lib/phony/countries.rb

@@ -486,27 +486,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(/^([79][5678]\d)/) >> split(6)   | # Mobile
+    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') |
@@ -993,7 +997,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 # -
@@ -1001,7 +1008,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_codes.rb

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

@@ -324,10 +324,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',
@@ -568,12 +577,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 761 123456').should be_truthy  # Mobile
-        Phony.plausible?('+260 772 123456').should be_truthy  # Mobile
-        Phony.plausible?('+260 783 123456').should be_truthy  # Mobile
-        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'],

data/spec/lib/phony/countries_spec.rb

@@ -851,9 +851,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
@@ -1053,9 +1053,10 @@ describe 'country descriptions' do
       it_splits '218911234456', %w(218 91 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']
@@ -1429,6 +1430,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phony
 version: !ruby/object:Gem::Version
-  version: 2.19.4
+  version: 2.19.8
 platform: ruby
 authors:
 - Florian Hanke
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-26 00:00:00.000000000 Z
+date: 2022-01-25 00:00:00.000000000 Z
 dependencies: []
 description: 'Fast international phone number (E164 standard) normalizing, splitting
   and formatting. Lots of formatting options: International (+.., 00..), national
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Fast international phone number (E164 standard) normalizing, splitting and