phony 2.15.29 → 2.15.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60cca0bdd96643bef48d567cb6f087aaaa5ac1a8
-  data.tar.gz: 470c4ea610e4886263b0ad715583f9bf13efe240
+  metadata.gz: a95efd861638e45e6481cb045402657210e257ce
+  data.tar.gz: 1a30bc92058003997101179806c701bdd91cd8bf
 SHA512:
-  metadata.gz: 6bc31e7baf9450aa6b0110640f2fc13af396e6b5db8eac656eb4b126f510f48d2432f56a015e9096cd3dbeecdb7b2d682c23bda9a30f86b18ad6bd3743174f1e
-  data.tar.gz: c65e9f7b42afa62c6ee94c1cb164c919d5cb047459ecd0d337acc46cd185b2dfa81966a59f574c2437fbf6b4baba7eb10a19b78f826e61d6fabe621c6dc34277
+  metadata.gz: 954b3d729540e8db55394fa70ec550b77087b59cf4dfcc01d07743fed592c141fef232b66620482a0d5a98af673697a98d3e08b840451cdf7e103d89eb2b61ca
+  data.tar.gz: fc49bb807e7615a33c83b1a89ac3941d9cfafa1446f410c9aadb777dee1e8bd5e0683443fec108a2690057cf7bdf700ae28c5a5387599902765bad30bdb01b9d

data/lib/phony/countries.rb

@@ -612,8 +612,12 @@ Phony.define do
   # country '353' # Republic of Ireland, see special file.
 
   country '354', none >> split(3,4) # Iceland
+
+  # Albania
+  #  https://en.wikipedia.org/wiki/Telephone_numbers_in_Albania
   country '355', trunk('0') |
-                 one_of('4') >> split(4,3) | # Albania
+                 one_of('4') >> split(3,4) | # Tirana
+                 match(/\A(6[6-9])\d*\z/) >> split(3,4) | # mobile
                  match(/\A(2[24]|3[2-5]|47|5[2-5]|6[6-9]|8[2-5])\d*\z/) >> split(3,3) |
                  fixed(3) >> split(3,2)
 
@@ -808,7 +812,14 @@ Phony.define do
           one_of(%w(11 16 17 18 19)) >> split(3) | # audiotext
           fixed(3) >> split(4) # geographic, audiotext
 
-  country '593', fixed(2) >> split(3, 4) # Ecuador http://www.wtng.info/wtng-593-ec.html
+  # Ecuador http://www.wtng.info/wtng-593-ec.html
+  # https://www.numberingplans.com/?page=plans&sub=phonenr&alpha_2_input=EC&current_page=1
+  # https://en.wikipedia.org/wiki/Telephone_numbers_in_Ecuador
+  country '593',
+    one_of('9') >> split(4,4) |
+    match(/\A([\d]{2})\d{7}\z/) >> split(3,4) |
+    fixed(1) >> split(3,4)
+
   country '594', fixed(3) >> split(3, 3) # French Guiana (French Department of) http://www.wtng.info/wtng-594-fr.html
 
   # country '595' # Paraguay (Republic of), see special file

data/lib/phony/countries/indonesia.rb

@@ -11,7 +11,9 @@ Phony.define do
         /\A\d+\z/ => [4,4]) |
     one_of(%w(22 23 24 25 26 27 28 29 31 32 33 34 35 36 37 38 39 72)) >> matched_split(
         /\A\d{5}\z/ => [3,2],
-        /\A\d+\z/ => [3,4]) |
+        /\A\d{7}\z/ => [3,4],
+        /\A\d{8}\z/ => [4,4],
+        /\A\d{9}\z/ => [3,3,3]) |
     one_of('70') >> split(3,3) |
     one_of(%w(71 73 74 75 76 77)) >> matched_split(
         /\A\d{6}\z/ => [3,3],

data/spec/functional/plausibility_spec.rb

@@ -55,7 +55,32 @@ describe 'plausibility' do
       it_is_correct_for 'Democratic Republic of the Congo', :samples => '+243 80 864 9794'
       it_is_correct_for 'Diego Garcia', :samples => '+246  123 7686'
       it_is_correct_for 'Djibouti', :samples => '+253  3671 1431'
-      it_is_correct_for 'Ecuador', :samples => '+593 68 467 4579'
+      it 'is correct for Ecuador' do
+        Phony.plausible?('+593 22 000 0000').should be_true
+        Phony.plausible?('+593 23 000 0000').should be_true
+        Phony.plausible?('+593 26 000 0000').should be_true
+        Phony.plausible?('+593 27 000 0000').should be_true
+        Phony.plausible?('+593 44 000 0000').should be_true
+        Phony.plausible?('+593 45 000 0000').should be_true
+        Phony.plausible?('+593 47 000 0000').should be_true
+        Phony.plausible?('+593 2 200 0000').should be_true
+        Phony.plausible?('+593 2 300 0000').should be_true
+        Phony.plausible?('+593 2 400 0000').should be_true
+        Phony.plausible?('+593 2 500 0000').should be_true
+        Phony.plausible?('+593 2 700 0000').should be_true
+        Phony.plausible?('+593 3 000 0000').should be_true
+        Phony.plausible?('+593 4 000 0000').should be_true
+        Phony.plausible?('+593 4 500 0000').should be_true
+        Phony.plausible?('+593 4 600 0000').should be_true
+        Phony.plausible?('+593 5 200 0000').should be_true
+        Phony.plausible?('+593 5 300 0000').should be_true
+        Phony.plausible?('+593 6 200 0000').should be_true
+        Phony.plausible?('+593 7 200 0000').should be_true
+        Phony.plausible?('+593 7 300 0000').should be_true
+        Phony.plausible?('+593 7 400 0000').should be_true
+        Phony.plausible?('+593 7 600 0000').should be_true
+        Phony.plausible?('+593 9 0000 0000').should be_true # mobile
+      end
       it_is_correct_for 'Equatorial Guinea', :samples => ['+240 222 201 123',
                                                           '+240 335 201 123']
       it_is_correct_for 'Eritrea', :samples => '+291 6 334 475'
@@ -341,6 +366,13 @@ describe 'plausibility' do
                                                  ['+263 270 123 456', '+263 270 123 45'],
                                                  '+263 86 1235 4567']
 
+      it 'is correct for Indonesia' do
+        Phony.plausible?('+62 22 000 0').should be_false
+        Phony.plausible?('+62 22 000 00').should be_true
+        Phony.plausible?('+62 22 000 0000').should be_true
+        Phony.plausible?('+62 22 0000 0000').should be_true
+        Phony.plausible?('+62 22 000 000 000').should be_true
+      end
     end
   end
 end

data/spec/lib/phony/countries_spec.rb

@@ -21,6 +21,12 @@ describe 'country descriptions' do
       it_splits '93201234567', ['93', '20', '1234567'] # Kabul
     end
 
+    describe 'Albania' do
+      it_splits '355691234567', ['355', '69', '123', '4567'] # Mobile 7 digits
+      it_splits '35569123456', ['355', '69', '123', '456'] # Mobile 6 digits
+      it_splits '35541234567', ['355', '4', '123', '4567'] # Tirana
+    end
+
     describe 'Algeria' do
       it_splits '213211231234', ['213', '21', '123', '1234'] # Algiers
       it_splits '213331231234', ['213', '33', '123', '1234'] # Batna
@@ -313,6 +319,8 @@ describe 'country descriptions' do
       it_splits '622112345567', %w(62 21 1234 5567)
       it_splits '622212345', %w(62 22 123 45)
       it_splits '62221234567', %w(62 22 123 4567)
+      it_splits '622200000000', %w(62 22 0000 0000)
+      it_splits '6222000000000', %w(62 22 000 000 000)
       it_splits '624311234', %w(62 4 311 234)
       it_splits '62431123456', %w(62 4 3112 3456)
       it_splits '6262212345', %w(62 6 221 2345)
@@ -801,7 +809,30 @@ describe 'country descriptions' do
       it_splits '25349828978', ['253', false, '4982', '8978']
     end
     describe 'Ecuador' do
-      it_splits '593445876756', %w(593 44 587 6756)
+      it_splits '593220000000', %w(593 22 000 0000)
+      it_splits '59322000000', %w(593 2 200 0000)
+      it_splits '593230000000', %w(593 23 000 0000)
+      it_splits '59323000000', %w(593 2 300 0000)
+      it_splits '59324000000', %w(593 2 400 0000)
+      it_splits '59325000000', %w(593 2 500 0000)
+      it_splits '593260000000', %w(593 26 000 0000)
+      it_splits '59327000000', %w(593 2 700 0000)
+      it_splits '593270000000', %w(593 27 000 0000)
+      it_splits '59330000000', %w(593 3 000 0000)
+      it_splits '59340000000', %w(593 4 000 0000)
+      it_splits '593440000000', %w(593 44 000 0000)
+      it_splits '593450000000', %w(593 45 000 0000)
+      it_splits '59345000000', %w(593 4 500 0000)
+      it_splits '59346000000', %w(593 4 600 0000)
+      it_splits '593470000000', %w(593 47 000 0000)
+      it_splits '59352000000', %w(593 5 200 0000)
+      it_splits '59353000000', %w(593 5 300 0000)
+      it_splits '59362000000', %w(593 6 200 0000)
+      it_splits '59372000000', %w(593 7 200 0000)
+      it_splits '59373000000', %w(593 7 300 0000)
+      it_splits '59374000000', %w(593 7 400 0000)
+      it_splits '59376000000', %w(593 7 600 0000)
+      it_splits '593900000000', %w(593 9 0000 0000)
     end
     describe 'Eritrea' do
       it_splits '2916537192', %w(291 6 537 192)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phony
 version: !ruby/object:Gem::Version
-  version: 2.15.29
+  version: 2.15.30
 platform: ruby
 authors:
 - Florian Hanke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-30 00:00:00.000000000 Z
+date: 2016-09-14 00:00:00.000000000 Z
 dependencies: []
 description: 'Fast international phone number (E164 standard) normalizing, splitting
   and formatting. Lots of formatting options: International (+.., 00..), national