phony 2.19.7 → 2.19.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f544b11a7d8e0f28ee13fc67d92fb3cd5a98f968ccfce3cb60b7781bc761fba5
-  data.tar.gz: cec200536113d42a5c6822c7d8e636b925a8c48ee062fc5ef99143548eb7cc13
+  metadata.gz: c0fc7753788d596736d26fddf4ff8688d33348e45512f3edea923b8fb35afa7c
+  data.tar.gz: 570d9d1012de2b6a854bafc238e385619365b4a559cea14f321ded2f0644c851
 SHA512:
-  metadata.gz: b4e9ac3559aa37f477e87e453c1316d12636fbedac8d9ae9f0e66e9af378009265abdf93882a159bfe6f42af2235e68a5cb55ec116593d2714de40b45c2c0d31
-  data.tar.gz: ed1fd348d0d1951c4de48ed8d7fca4f10c35f91d2a08b223d5fa14cbbf144c1d96a4d30e2c45af230760ad4733bbd9c053aded4f1c1052ed7ef618e6ef67dfab
+  metadata.gz: b22cf9c9b8bffe3222333461c919b5a04fab9b4d7f111c0679b79e602787a262b0716a432affa4b1a35710ab26e188f947420dcf35a7b893ae7af22e58d0e4c5
+  data.tar.gz: '008fcad42c6dec3854a15b6dfe9d4856b5a26950cd8a9bfa4495d056159dd0dc9b3e77320380e97350fd7d6ec7886af542c6435da21771c12889f82cbac6a962'

data/lib/phony/countries.rb

@@ -493,22 +493,24 @@ Phony.define do
     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') |

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',

data/spec/lib/phony/countries_spec.rb

@@ -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']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phony
 version: !ruby/object:Gem::Version
-  version: 2.19.7
+  version: 2.19.8
 platform: ruby
 authors:
 - Florian Hanke
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-16 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