phony 2.18.5 → 2.18.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da81c89f8da18101dd1ad489ec5c6e7c66d6f3836058ba9b33f1eb4c02395ea2
-  data.tar.gz: a8fe8edd6e28d32ad7a0ea2ccdfb69c52897c2163f735b44b3e71e3fed7175ea
+  metadata.gz: 65cd9d252c032ff5116a79fa6e5b670f7d482d16534c43d2369c951aeaa01003
+  data.tar.gz: b1be2f32723b945d1854ea7b613e3121b95c5870e4704b3f0c42833f9c524271
 SHA512:
-  metadata.gz: b36455cfb130e3657e423b331f7a2978fd960be66af3834335506ce3c0a17690bb9775aefacbba1b5a617550e6f42f34b8e7a5c1c9cfb67d6a4d7e95cc2e17b0
-  data.tar.gz: 82d22fff926d5225418694fdcaa8553f621d529151f870d05530b74b11b9405b3164a67e7bc8bc14638610da58c14f0680939a7762243ec93f4d262f9d7b3b22
+  metadata.gz: e12dd75c0642fb9b50527957dbeb470fbc831e732f4e54b1a8ceafe05970db355ed0d4b4097f43bbb7ea98ca99d28aea382b10c51a345bf94976df981666c9e4
+  data.tar.gz: 40d2961f1b3fec24505c376deb4252253af59c71eeda0c6b1bb35b4f5bce41a7c8ea99ad4a233e40974bc7cce6f2ae8dd403febf3f09006b4c69fb045635c3a9

data/lib/phony/countries.rb

@@ -386,14 +386,19 @@ Phony.define do
   country '233', fixed(2) >> split(3,4)
 
   # Nigeria
-  # Wikipedia says 3 4 split, many local number with no splitting
+  # 3 4 split for mobile and 1 digit NDC, 3 2 or 3 3 otherwise
+  # Many local numbers with no splitting
   #
-  # mobile telephony number allocation taken from: http://www.ncc.gov.ng/index.php?option=com_content&view=article&id=113&Itemid=102
+  # mobile telephony number allocation taken from:
+  # https://www.ncc.gov.ng/technical-regulation/standards/numbering and
+  # https://www.itu.int/oth/T020200009C/en
   country '234',
-    match(/^([7-9]0\d)\d+$/) >> split(3,4) | # Mobile
-    match(/^(81\d)\d+$/)     >> split(3,4) | # Mobile
-    one_of('1', '2', '9')    >> split(3,4) | # Lagos, Ibadan and Abuja
-    fixed(2)                 >> split(3,4)   # 2-digit NDC
+    match(/^([7-9]0\d)\d+$/)            >> split(3,4)    | # Mobile
+    match(/^(81\d)\d+$/)                >> split(3,4)    | # Mobile
+    one_of('1', '2')                    >> split(3,3..4) | # Lagos, Ibadan
+    one_of('9')                         >> split(3,4)    | # Abuja
+    one_of((30..79).map(&:to_s))        >> split(3,2..3) | # 2-digit NDC
+    one_of(%w(82 83 84 85 86 87 88 89)) >> split(3,3)      # 2-digit NDC
 
   country '235', none >> split(4,4) # Chad http://www.wtng.info/wtng-235-td.html
   country '236', none >> split(4,4) # Central African Republic http://www.wtng.info/wtng-236-cf.html
@@ -731,11 +736,12 @@ Phony.define do
   # Monaco
   #
   country '377',
-          one_of('6')  >> split(2,2,2,2) | # mobile
+          one_of('6') >> split(2,2,2,2) | # mobile
           fixed(2) >> split(2,2,2)
 
   # San Marino
   country '378',
+          trunk('', :normalize => false) |
           none >> matched_split(
               /\A\d{6}\z/ => [3,3],
               /\A\d+\z/ => [3,3,4]

data/lib/phony/countries/argentina.rb

@@ -348,8 +348,8 @@ Phony.define do
       one_of(area_codes_4digits) >> split(2, 4) | # landline
       one_of(area_codes_3digits) >> split(3, 4) | # landline
       one_of(area_codes_2digits) >> split(4, 4) | # landline
-      one_of(area_codes_2digits.map{|x| "9#{x}" }) >> split(4, 5) | # mobile
-      one_of(area_codes_3digits.map{|x| "9#{x}" }) >> split(3, 5) | # mobile
-      one_of(area_codes_4digits.map{|x| "9#{x}" }) >> split(2, 5) | # mobile
+      one_of(area_codes_2digits.map{|x| "9#{x}" }) >> split(4, 4) | # mobile
+      one_of(area_codes_3digits.map{|x| "9#{x}" }) >> split(3, 4) | # mobile
+      one_of(area_codes_4digits.map{|x| "9#{x}" }) >> split(2, 4) | # mobile
       one_of(special_numbers)            >> split(3, 4)
 end

data/lib/phony/countries/austria.rb

@@ -85,7 +85,7 @@ service = [
  '939'
 ]
 
-# https://www.rtr.at/en/tk/E129/2312_Austrian_Numbering_Plan_2011-03-30.pdf
+# https://www.rtr.at/en/tk/E129/Austrian_Numbering_Plan_2011-03-30.pdf
 #
 # TODO Add more details.
 #
@@ -97,7 +97,7 @@ Phony.define do
                 one_of('800')            >> split(6..10)  | # Free number length is 9..13
                 one_of(corporate_2digit) >> split(3..11)  | # Corporate number length is 5..13
                 one_of(corporate)        >> split(2..10)  | # Corporate number length is 5..13
-                one_of(ndcs)             >> split(6..10)  |
+                one_of(ndcs)             >> split(5..10)  |
                 one_of('663')            >> split(6..8)   | # 6..8 digit mobile.
                 one_of(mobile)           >> split(4,3..9) |
                 one_of(mobile_2digit)    >> split(7..7)   | # Separate as mobile contains 676 - 67 violates the prefix rule.

data/lib/phony/countries/germany.rb

@@ -4090,7 +4090,7 @@ Phony.define do
      one_of(*service)        >> split(3,1..9) |
      one_of(*mobile_4digits) >> split(3,4) |
      one_of(*mobile_3digits) >> split(4,3..4) |
-     one_of(*ndcs2)          >> split(3,2..10) |
+     one_of(*ndcs2)          >> split(3,1..10) |
      one_of(*ndcs3)          >> split(3,1..9) |
      one_of(*ndcs4)          >> split(3,0..8) |
      fixed(5)                >> split(3,0..7)

data/spec/functional/plausibility_spec.rb

@@ -46,7 +46,8 @@ describe 'plausibility' do
     end
 
     context 'specific countries' do
-      it_is_correct_for 'Austria', :samples => '+43 720 116987' # VoIP
+      it_is_correct_for 'Austria', :samples => ['+43 720 116987', # VoIP
+                                                '+43 463 12345'] # Klagenfurt
       it_is_correct_for 'Bosnia and Herzegovina', :samples => ['+387 66 666 666',
                                                                '+387 37 123 456',
                                                                '+387 33 222 111']
@@ -251,6 +252,7 @@ describe 'plausibility' do
       it_is_correct_for 'Gabonese Republic', :samples => '+241 1 627 739'
       it_is_correct_for 'Gambia', :samples => '+220  989 5148'
       it_is_correct_for 'Germany', :samples => [
+        '+49 69 155 1',
         '+49 1577 536 8701'
       ]
       it_is_correct_for 'Georgia', :samples => ['+995 220 123 45',
@@ -353,6 +355,11 @@ describe 'plausibility' do
       end
       it_is_correct_for 'Nicaragua', :samples => '+505 12 345 678'
       it_is_correct_for 'Niger', :samples => '+227  1234 5678'
+      it_is_correct_for 'Nigeria', :samples => ['+234 807 059 1111',
+                                              '+234 811 234 5678',
+                                              '+234 64 830 00',
+                                              '+234 1 280 444',
+                                              '+234 85 123 456']
       it_is_correct_for 'Niue', :samples => '+683  3791'
       it_is_correct_for 'Oman', :samples => ['+968 24 423 123',
                                              '+968 25 423 123']

data/spec/lib/phony/countries_spec.rb

@@ -1103,6 +1103,8 @@ describe 'country descriptions' do
     describe 'Nigeria' do
       it_splits '23411231234', %w(234 1 123 1234) # Lagos
 
+      it_splits '23445123456', %w(234 45 123 456) # Ogoja
+
       # mobile numbers
       it_splits '2347007661234', %w(234 700 766 1234)
       it_splits '2347017661234', %w(234 701 766 1234)

data/spec/lib/phony/country_codes_spec.rb

@@ -147,9 +147,12 @@ describe Phony::CountryCodes do
       it "should format luxembourgian numbers" do
         @countries.formatted('35227855', :format => :international).should eql '+352 27 85 5'
       end
-      it "should format nigerian numbers" do
+      it "should format nigerian lagosian numbers" do
         @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'
+      end
       it "should format nigerian mobile numbers" do
         @countries.formatted('2347061234567', :format => :international).should eql '+234 706 123 4567'
       end

data/spec/lib/phony/country_spec.rb

@@ -23,7 +23,7 @@ describe Phony::Country do
   end
   
   context 'regression' do
-    describe 'iceland' do
+    describe 'Iceland' do
       let(:country) do
         national_splitter = Phony::NationalSplitters::None.instance_for
         local_splitter    = Phony::LocalSplitters::Fixed.instance_for [3, 4]
@@ -35,6 +35,14 @@ describe Phony::Country do
         country.split('112').should == [nil, false, '112']
       end
     end
+    describe 'San Marino' do
+      it 'normalizes correctly' do
+        Phony.normalize('+3780549903549').should == '3780549903549'
+      end
+      xit 'automatically adds the sole NC' do
+        Phony.normalize('+378903549').should == '3780549903549'
+      end
+    end
   end
   
   context "without special cases (with switzerland)" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phony
 version: !ruby/object:Gem::Version
-  version: 2.18.5
+  version: 2.18.10
 platform: ruby
 authors:
 - Florian Hanke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-28 00:00:00.000000000 Z
+date: 2019-11-20 00:00:00.000000000 Z
 dependencies: []
 description: 'Fast international phone number (E164 standard) normalizing, splitting
   and formatting. Lots of formatting options: International (+.., 00..), national
@@ -114,8 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Fast international phone number (E164 standard) normalizing, splitting and