phony 2.18.18 → 2.18.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35e5d35fc8879631ec6f0602d0d5cb1e006790c2332a8f4ff536066bc2a5f3c4
-  data.tar.gz: 302dbb2edb99ea91db4556161535c28b38d66726e1899197d8396baa41eec63f
+  metadata.gz: db67ba76e70a6de9c44cc306e4e07eac25c092b456b7a89fbbccd4f5298172b0
+  data.tar.gz: f94e5219ec1808746635853d3cafdca6c91895330bf6b201b259301736b3e3eb
 SHA512:
-  metadata.gz: 4e87c3f22321a3c86093f607ee00316ad0ff4fae588f309bd8ff8b609a125deda1199fe1db5b53f166a318aeaa46704eecf8f70ec53de1c97402e7c8ba8eb44b
-  data.tar.gz: d9a68e78d43829f1f7e7b42602adee5cc3c3c57ad83aa8b879e55fa7e75136a54b34ed7e5f73e5fe0651bc7cfdc1e0f12f5d6497609ad10f8571092f7c7c7f81
+  metadata.gz: 1119176e19553809a782b8300f263a4791bdb0cd45cf82356ba9dff7871ddc31866628de206734d830a6730eadd8cf1c0286aad0b8342ce95e0cbeb8383647ac
+  data.tar.gz: 1e2eaf69ad9f1b5d2160c0ad7b1b720f54d51c9ad2fcf9708fb23bf43ef91ddb812571a5962e7808ba3c309657acfc5849b95ed788bad629a953a6cf5c3e016f

data/lib/phony/countries.rb

@@ -352,13 +352,13 @@ Phony.define do
 
   # Côte d'Ivoire
   # http://www.wtng.info/wtng-225-ci.html
-  # http://www.itu.int/dms_pub/itu-t/oth/02/02/T02020000310001PDFE.pdf
+  # https://www.itu.int/dms_pub/itu-t/oth/02/02/T02020000310006PDFE.pdf
   # http://en.wikipedia.org/wiki/Telephone_numbers_in_Ivory_Coast
   #
   # There is no trunk code for this country and several of the mobile prefixes start with 0
   country '225',
     trunk('', :normalize => false) |
-    fixed(2) >> split(2,2,2)
+    fixed(2) >> split(2,2,2,2)
 
   country '226', none >> split(4,4) # Burkina Faso http://www.wtng.info/wtng-226-bf.html
   country '227', none >> split(4,4) # Niger http://www.wtng.info/wtng-227-ne.html
@@ -432,9 +432,9 @@ Phony.define do
   # http://en.wikipedia.org/wiki/Telephone_numbers_in_Rwanda
   country '250',
     trunk('0') |
-    one_of('25')       >> split(7) | # Geographic, fixed
-    match(/^(7[238])/) >> split(7) | # Non-geographic, mobile
-    one_of('06')       >> split(6)   # Satellite
+    one_of('25')        >> split(7) | # Geographic, fixed
+    match(/^(7[2389])/) >> split(7) | # Non-geographic, mobile
+    one_of('06')        >> split(6)   # Satellite
 
   country '251', fixed(2) >> split(3, 4) # Ethiopia http://www.wtng.info/wtng-251-et.html
 

data/lib/phony/countries/japan.rb

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

@@ -8,6 +8,9 @@ Phony.define do
     trunk('0') |
     one_of(%w(800)) >> split(3,2) | # freephone
     one_of(%w(808)) >> split(3,2) | # payphone
+    one_of(%w(677 678)) >> matched_split(
+        /\A\d{4}\z/ => [3],
+        /\A\d+\z/ => [3,3]) |
     one_of(%w(230)) >> matched_split(
         /\A\d{4}\z/ => [4],
         /\A\d+\z/ => [3,2]) |
@@ -21,6 +24,7 @@ Phony.define do
     one_of(%w(72)) >> split(3,3) | # ISP
     one_of(%w(60 61 68 69)) >> matched_split(
         /\A\d{3}\z/ => [3],
+        /\A\d{6}\z/ => [3,3],
         /\A\d{7}\z/ => [3,4],
         /\A\d+\z/ => [3,3,4]) | # mobile, voicemail (mobile)
     one_of(%w(66 63)) >> matched_split(
@@ -40,4 +44,4 @@ Phony.define do
     fixed(2) >> matched_split(
         /\A\d{5}\z/ => [3,2],
         /\A\d+\z/ => [3,3])
-end
+end

data/spec/functional/plausibility_spec.rb

@@ -192,7 +192,7 @@ describe 'plausibility' do
           Phony.plausible?('+385 60 12 345').should be_truthy   # Premium rate
           Phony.plausible?('+385 62 123 456').should be_truthy  # Premium, personal and UAN
       end
-      it_is_correct_for "Côte d'Ivoire", :samples => '+225  9358 8764'
+      it_is_correct_for "Côte d'Ivoire", :samples => '+225 01 9358 8764'
       it_is_correct_for 'Democratic Republic of Timor-Leste', :samples => ['+670 465 7886', '+670 7465 7886']
       it_is_correct_for 'Democratic Republic of the Congo', :samples => '+243 80 864 9794'
       it_is_correct_for 'Diego Garcia', :samples => '+246  123 7686'
@@ -399,6 +399,12 @@ describe 'plausibility' do
                                                              '+507 6 123 4567',
                                                              '+507 2 123 456']
       it_is_correct_for 'Reunion / Mayotte (new)', :samples => '+262 295 276 964'
+      it_is_correct_for 'Rwanda', :samples => ['+250 72 1234567',
+                                               '+250 73 1234567',
+                                               '+250 78 1234567',
+                                               '+250 79 1234567',
+                                               '+250 25 1234567',
+                                               '+250 06 123456']
       it_is_correct_for 'Saint Helena', :samples => '+290  5134'
       it_is_correct_for 'Saint Pierre and Miquelon (Collectivité territoriale de la République française)', :samples => '+508  474 714'
       it_is_correct_for 'Salvador (El)', :samples => [
@@ -427,8 +433,10 @@ describe 'plausibility' do
                                                ['+381 11 123 456', '+381 11 123 4567'],
                                                '+381 72 123 456',
                                                '+381 60 123',
-                                               '+381 60 123 4567',
+                                               ['+381 60 123 4567', '+381 69 123 456'],
                                                '+381 42 123 456',
+                                               '+381 677 123 456',
+                                               '+381 678 123 456',
                                                '+381 9 123 4567',
                                                '+381 60 123',
                                                '+381 60 123 456 7890',

data/spec/lib/phony/countries_spec.rb

@@ -677,6 +677,7 @@ describe 'country descriptions' do
       it_splits '250781234567', ['250', '78', '1234567'] # mobile
       it_splits '250721234567', ['250', '72', '1234567'] # mobile
       it_splits '250731234567', ['250', '73', '1234567'] # mobile
+      it_splits '250791234567', ['250', '79', '1234567'] # mobile
       it_splits '250251234567', ['250', '25', '1234567'] # fixed
       it_splits '25006123456',  ['250', '06', '123456']  # fixed
     end
@@ -895,8 +896,8 @@ describe 'country descriptions' do
       it_splits '50622345678', %w(506 2 234 5678)
     end
     describe "Côte d'Ivoire" do
-      it_splits '22507335518', ['225', '07', '33', '55', '18']
-      it_splits '22537335518', ['225', '37', '33', '55', '18']
+      it_splits '2250107335518', ['225', '01', '07', '33', '55', '18']
+      it_splits '2250237335518', ['225', '02', '37', '33', '55', '18']
     end
     describe 'Democratic Republic of Timor-Leste' do
       it_splits '6701742945', ['670', false, '174', '2945']

data/spec/lib/phony/country_codes_spec.rb

@@ -1,32 +1,30 @@
 require 'spec_helper'
 
 describe Phony::CountryCodes do
-
-  before(:all) do
-    @countries = Phony::CountryCodes.instance
-  end
+  
+  let(:countries) { Phony::CountryCodes.instance }
   
   describe '#[]' do
     it 'returns a country' do
-      @countries['41'].class.should eql Phony::Country
+      countries['41'].class.should eql Phony::Country
     end
   end
   
   describe '#country_for' do
     it 'returns a country' do
-      @countries.send(:country_for, '41').class.should eql Phony::Country
+      countries.send(:country_for, '41').class.should eql Phony::Country
     end
   end
   
   describe '#countrify' do
     it 'returns a country' do
-      @countries.send(:countrify, '441231212', '41').should eql '41441231212'
+      countries.send(:countrify, '441231212', '41').should eql '41441231212'
     end
   end
   describe '#countrify!' do
     it 'in-place replaces the number' do
       number = '441231212'
-      @countries.send(:countrify!, number, '41').should eql number
+      countries.send(:countrify!, number, '41').should eql number
       
       number.should == '41441231212'
     end
@@ -34,127 +32,127 @@ describe Phony::CountryCodes do
   
   describe '#vanity?' do
     it 'returns true if so' do
-      @countries.vanity?('1800HELLOES').should eql true
+      countries.vanity?('1800HELLOES').should eql true
     end
     it 'returns false if not' do
-      @countries.vanity?('18001234567').should eql false
+      countries.vanity?('18001234567').should eql false
     end
   end
 
   describe 'normalize' do
     it 'normalizes correctly' do
-      @countries.normalize('0041-44-364-35-32').should eql '41443643532'
+      countries.normalize('0041-44-364-35-32').should eql '41443643532'
     end
     it 'normalizes correctly with CC option' do
-      @countries.normalize('044-364-35-32', cc: '41').should eql '41443643532'
+      countries.normalize('044-364-35-32', cc: '41').should eql '41443643532'
     end
 
     context 'specific countries' do
       it 'handles Congo correctly' do
-        @countries.normalize('+242 0571 73992').should eql '242057173992'
-        @countries.normalize('+242 2221 15932').should eql '242222115932'
+        countries.normalize('+242 0571 73992').should eql '242057173992'
+        countries.normalize('+242 2221 15932').should eql '242222115932'
       end
     end
   end
 
   describe 'formatted' do
     it 'formats correctly' do
-      @countries.formatted('41443643532', :format => :international, :spaces => :-).should eql '+41-44-364-35-32'
+      countries.formatted('41443643532', :format => :international, :spaces => :-).should eql '+41-44-364-35-32'
     end
     it 'formats correctly' do
-      @countries.formatted('41443643532', :format => :international_relative, :spaces => :-).should eql '0041-44-364-35-32'
+      countries.formatted('41443643532', :format => :international_relative, :spaces => :-).should eql '0041-44-364-35-32'
     end
     it 'formats correctly' do
-      @countries.formatted('41443643532', :format => :national, :spaces => :-).should eql '044-364-35-32'
+      countries.formatted('41443643532', :format => :national, :spaces => :-).should eql '044-364-35-32'
     end
     context 'specific' do
       it 'formats Ireland correctly' do
-        @countries.formatted("3533451234", :format => :national).should eql '0345 1234'
+        countries.formatted("3533451234", :format => :national).should eql '0345 1234'
       end
       it 'formats Ireland correctly' do
-        @countries.formatted("353411231234", :format => :national).should eql '041 123 1234'
+        countries.formatted("353411231234", :format => :national).should eql '041 123 1234'
       end
       it 'formats Spain correctly' do
-        @countries.formatted("34123456789", :format => :national).should eql '123 456 789'
+        countries.formatted("34123456789", :format => :national).should eql '123 456 789'
       end
       it 'formats Cambodia correctly' do
-        @countries.formatted('85512239123', :format => :national).should eql '012 239 123'
+        countries.formatted('85512239123', :format => :national).should eql '012 239 123'
       end
       it 'formats the US correctly' do
-        @countries.formatted('18005551212', :format => :national, :spaces => :-).should eql '(800)-555-1212'
+        countries.formatted('18005551212', :format => :national, :spaces => :-).should eql '(800)-555-1212'
       end
       it 'formats the US correctly' do
-        @countries.formatted('18005551212', :format => :national, :spaces => :-).should eql '(800)-555-1212'
+        countries.formatted('18005551212', :format => :national, :spaces => :-).should eql '(800)-555-1212'
       end
     end
     context 'default' do
       it "should format swiss numbers" do
-        @countries.formatted('41443643532').should eql '+41 44 364 35 32'
+        countries.formatted('41443643532').should eql '+41 44 364 35 32'
       end
       it "should format swiss service numbers" do
-        @countries.formatted('41800112233').should eql '+41 800 112 233'
+        countries.formatted('41800112233').should eql '+41 800 112 233'
       end
       it "should format austrian numbers" do
-        @countries.formatted('43198110').should eql '+43 1 98110'
+        countries.formatted('43198110').should eql '+43 1 98110'
       end
       it "should format american numbers" do
-        @countries.formatted('18705551122').should eql '+1 (870) 555-1122'
+        countries.formatted('18705551122').should eql '+1 (870) 555-1122'
       end
       it "should format irish numbers" do
-        @countries.formatted('35311234567').should eql '+353 1 123 4567'
+        countries.formatted('35311234567').should eql '+353 1 123 4567'
       end
     end
     describe "international" do
       it "should format north american numbers" do
-        @countries.formatted('18091231234', :format => :international).should eql '+1 (809) 123-1234'
+        countries.formatted('18091231234', :format => :international).should eql '+1 (809) 123-1234'
       end
       it "should format austrian numbers" do
-        @countries.formatted('43198110', :format => :international).should eql '+43 1 98110'
+        countries.formatted('43198110', :format => :international).should eql '+43 1 98110'
       end
       it "should format austrian numbers" do
-        @countries.formatted('43198110', :format => :international_absolute).should eql '+43 1 98110'
+        countries.formatted('43198110', :format => :international_absolute).should eql '+43 1 98110'
       end
       it "should format french numbers" do
-        @countries.formatted('33142278186', :format => :+).should eql '+33 1 42 27 81 86'
+        countries.formatted('33142278186', :format => :+).should eql '+33 1 42 27 81 86'
       end
       it "should format austrian numbers" do
-        @countries.formatted('43198110', :format => :international_relative).should eql '0043 1 98110'
+        countries.formatted('43198110', :format => :international_relative).should eql '0043 1 98110'
       end
       it 'should format liechtensteiner numbers' do
-        @countries.formatted('4233841148', :format => :international_relative).should eql '00423 384 11 48'
+        countries.formatted('4233841148', :format => :international_relative).should eql '00423 384 11 48'
       end
       it "should format irish numbers" do
-        @countries.formatted('35311234567', :format => :international).should eql '+353 1 123 4567'
+        countries.formatted('35311234567', :format => :international).should eql '+353 1 123 4567'
       end
       it "should format luxembourgian numbers" do
-        @countries.formatted('352222809', :format => :international).should eql '+352 22 28 09'
+        countries.formatted('352222809', :format => :international).should eql '+352 22 28 09'
       end
       it "should format luxembourgian 4-digit ndc numbers" do
-        @countries.formatted('35226222809', :format => :international).should eql '+352 2622 28 09'
+        countries.formatted('35226222809', :format => :international).should eql '+352 2622 28 09'
       end
       it "should format luxembourgian mobile numbers" do
-        @countries.formatted('352621123456', :format => :international).should eql '+352 621 123 456'
+        countries.formatted('352621123456', :format => :international).should eql '+352 621 123 456'
       end
       it "should format luxembourgian city numbers" do
-        @countries.formatted('3524123456', :format => :international).should eql '+352 41 23 45 6'
+        countries.formatted('3524123456', :format => :international).should eql '+352 41 23 45 6'
       end
       it "should format luxembourgian machine to machine numbers" do
-        @countries.formatted('352602112345678', :format => :international).should eql '+352 6021 12 34 56 78'
+        countries.formatted('352602112345678', :format => :international).should eql '+352 6021 12 34 56 78'
       end
       it "should format luxembourgian numbers" do
-        @countries.formatted('352370431', :format => :international).should eql '+352 37 04 31'
+        countries.formatted('352370431', :format => :international).should eql '+352 37 04 31'
       end
       it "should format luxembourgian numbers" do
-        @countries.formatted('35227855', :format => :international).should eql '+352 27 85 5'
+        countries.formatted('35227855', :format => :international).should eql '+352 27 85 5'
       end
       it "should format nigerian lagosian numbers" do
-        @countries.formatted('23414480000', :format => :international).should eql '+234 1 448 0000'
+        countries.formatted('23414480000', :format => :international).should eql '+234 1 448 0000'
       end
       it "should format nigerian beninese numbers" do
-        @countries.formatted('23452123456', :format => :international).should eql '+234 52 123 456'
+        countries.formatted('23452123456', :format => :international).should eql '+234 52 123 456'
       end
       it "should format nigerian mobile numbers" do
-        @countries.formatted('2347061234567', :format => :international).should eql '+234 706 123 4567'
+        countries.formatted('2347061234567', :format => :international).should eql '+234 706 123 4567'
       end
       context 'with no spaces' do
         it "should format north american numbers" do

metadata

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