phony 2.18.7 → 2.18.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc7effe6a83fbea02459d9360ed7b3110943b0f2f6cdd93842ba49a8b0c57a53
-  data.tar.gz: 2cce60443a4838b3d00465b4f846ee4672cae256b777b86a5b2a6ef21c09c4ea
+  metadata.gz: eb28b6f9cce0d35aae61c35e0c45f2f7afce7fd6e1c39bf014e6242e8e6fbed6
+  data.tar.gz: 4ab901070528ccb0c3dc5e1e0a0db329d85dfa4bf67c97af51fac0794b2d5bcb
 SHA512:
-  metadata.gz: 47fd5724f9f51c3f9ebec8066d807cec3696b29e28bb0089dea3f161dcac1f44339f77c14d47dd96666e975c0dea71f83c16f66bc4b30c2342ee476eb1204668
-  data.tar.gz: 2f5c1eb7b33ab1666ed3a8bcf84dab9accf91a0da767876f055266ac5a7b679e38d5f29fc4b895cf1d481e60b545763a2721cd2e852f331e5155a7040208d885
+  metadata.gz: 8e9bdc965a6046a2ea6e8c4e5e94310dc2d6d1fac4e7640f4a13005d17784974efcaa462951aaabdb574ec0185ef10e850fb0120950ebb3ab86487afa9c2f095
+  data.tar.gz: afb3c2b8fb427099a565369b6e2755dbb67502dc6116aabbfa34bfa74a68ea84231f188be016492ba210835cb6e6c894c0188cd6e39ae09d7875e24394603fcf

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/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/japan.rb

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

@@ -12,9 +12,9 @@ module Phony
   #
   # Phony.define.country ...
   #
-  def self.define
+  def self.define(&block)
     dsl = DSL.new
-    dsl.instance_eval(&Proc.new) if block_given?
+    dsl.instance_eval(&block) if block_given?
     dsl
   end
 

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']
@@ -354,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
@@ -81,4 +89,4 @@ describe Phony::Country do
     end
   end
   
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phony
 version: !ruby/object:Gem::Version
-  version: 2.18.7
+  version: 2.18.12
 platform: ruby
 authors:
 - Florian Hanke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-04 00:00:00.000000000 Z
+date: 2019-12-15 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.6
 signing_key: 
 specification_version: 4
 summary: Fast international phone number (E164 standard) normalizing, splitting and