phony 2.19.13 → 2.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8b500d924945f02432d8c59be7c70a3de2b2ee90af197f746c325877be4e8e7
-  data.tar.gz: 2365b18fa83a7da4e57cca35985337d0962eb6929315818f415031ad2447a6b4
+  metadata.gz: 53e35e946aea7db6e2c7901a5df43de446fc04289fa976f4d2d655a09f4bdbae
+  data.tar.gz: f7f0cb0e4ee68d31a754d2c57fcde82116907fced053416c630eafcf71e8cd12
 SHA512:
-  metadata.gz: a27aae884d2a466dbb0bbe613190f4b052e458810f55b0d3764431252938863c47d8db22f0bedf3a08ff95cc4c2d45d9b5d5c6afbc69e60d0f75c6b2126fd1d1
-  data.tar.gz: 91f9d8805a7097fbd0bc2132e20c3e1bf91ccd1b02c107b30a191f9f42432f7337269794fc3cb0cdc90300bd9c38adb939b5157d8543329569c334ec981eed74
+  metadata.gz: 4e43b987e4313294e70a389da3441e364c8c0cd4930344c2beaadaef58cc60afdf3fc8f265e75923968f8dba565988237067375d41f9546f1dae1c9d258c6aa3
+  data.tar.gz: b3d7ba6dd615c1d36be9b284da5a578c1f8d11937230bf73185f172250c74d17ffb5a00fe2002f787731c2970587c3e19c1be012469227f28763563389c2da95

data/README.textile

@@ -106,6 +106,10 @@ h2. List of Handled Countries
 
 Mildly unmaintained list: Abhas, Afghan, Algerian, Argentina, Austrian, Australian, Azerbaijani, Belgian, Brazilian, Cambodian, Chilean, Chinese, Croatian, Cuban, Cypriot, Czech, Danish, Dutch, Egyptian, El Salvadorian, Estonian, French, German, Ghanan, Gibraltar, Greek, Haiti, Hong Kong, Hungarian, Indian, Iran, Irish, Israel, Italian, Japanese, Kazakh, Liberian, Lithuanian, Luxembourgian, Malaysian, Malta, Mexican, Monaco, Morocco, New Zealand, Nigerian, Norwegian, Peruvian, Polish, Romanian, Russian, Rwandan, Seychelles, Singapore, Slovakian, South African, South Korean, South Osetian, Spanish, Sri Lankan, Sudan, Swedish, Swiss, Thailand, Tunisian, Turkish, Liechtenstein, UK, US, Venezuelan, Vietnamese, and Zambian numbers.
 
+h2. Proud Sponsors
+
+* Renuo AG (July 22 –): "Github":https://github.com/renuo, "Homepage":https://www.renuo.ch
+
 h2. License
 
 MIT.

data/lib/phony/countries/italy.rb

@@ -3,14 +3,14 @@
 # Italian phone numbers.
 #
 # http://en.wikipedia.org/wiki/Telephone_numbers_in_Italy
-#
+# https://www.itu.int/dms_pub/itu-t/oth/02/02/T020200006B0001PDFE.pdf
 
-ndcs_2digit = [
+ndcs_1digit = [
   '02', # Milan
   '06', # Rome (including State of Vatican City) and Aprilia
 ]
 
-ndcs_3digit = [
+ndcs_2digit = [
  '010', # Genoa
  '011', # Turin
  '015', # Biella
@@ -42,7 +42,7 @@ ndcs_3digit = [
  '099', # Taranto
 ]
 
-ndcs_4digit = [
+ndcs_3digit = [
   '0121', # Pinerolo
   '0122', # Sestrieres, Bardonecchia and other Susa Valley mountain resorts
   '0123', # Lanzo Torinese
@@ -269,26 +269,28 @@ service = [ # Not exhaustive.
 ]
 
 Phony.define do
+  # Note: The 0 does not count towards NDC number length.
   country '39', trunk('', normalize: false) |
                 one_of(*service)     >> split(3,3) |
                 one_of(*mobile)      >> split(3,4,-1..1) |
-                one_of(*ndcs_2digit) >> matched_split(
+                one_of(*ndcs_1digit) >> matched_split(
                   /\A\d{5}\z/ => [5],
                   /\A\d{6}\z/ => [4,2],
                   /\A\d{7}\z/ => [4,3],
                   /\A\d{8}\z/ => [4,4],
                 ) |
-                one_of(*ndcs_3digit) >> matched_split(
-                  /^1\d{6}$/ => [7],
-                  /^1\d{7}$/ => [8],
-                  /^[^1]\d{5}$/ => [6],
-                  /^[^1]\d{6}$/ => [7]
+                one_of(*ndcs_2digit) >> matched_split(
+                  /\A\d{4}\z/ => [4],
+                  /\A\d{5}\z/ => [5],
+                  /\A\d{6}\z/ => [6],
+                  /\A\d{7}\z/ => [7],
+                  /\A\d{8}\z/ => [8]
                 ) |
-                one_of(*ndcs_4digit) >> matched_split(
-                /\A\d{4}\z/ => [4],
-                /^1\d{5}$/ => [6],
-                /^1\d{6}$/ => [7],
-                /^[^1]\d{4}$/ => [5],
-                /^[^1]\d{5}$/ => [3,3]
+                one_of(*ndcs_3digit) >> matched_split(
+                  /\A\d{4}\z/ => [4],
+                  /\A1\d{5}\z/ => [6],
+                  /\A1\d{6}\z/ => [7],
+                  /\A[^1]\d{4}\z/ => [5],
+                  /\A[^1]\d{5}\z/ => [3,3]
                 )
 end

data/lib/phony/countries.rb

@@ -232,6 +232,7 @@ Phony.define do
   # http://www.itu.int/oth/T020200002C/en
   country '57',
     match(/\A(3\d\d)\d+\z/) >> split(3,4) | # mobile (300 310 311 312 313 315 316)
+    match(/\A(60\d)\d+\z/) >> split(3,4) |
     fixed(1) >> split(3,4)
 
   # Venezuela (Bolivarian Republic of)

data/lib/phony/country_codes.rb

@@ -100,6 +100,17 @@ module Phony
       return false unless (4..16) === normalized.size # unless hints[:check_length] == false
 
       country, cc, rest = partial_split normalized
+      
+      # Was a country calling code given?
+      #
+      if ccc = hints[:ccc]
+        cc, ndc, *local = split ccc
+        
+        raise ArgumentError.new("The provided ccc option is too long and includes more than a cc ('#{cc}') and ndc ('#{ndc}'). It also includes '#{local.join}'.") unless local.size == 1 && local[0].empty?
+        
+        hints[:cc] = cc
+        hints[:ndc] = ndc
+      end
 
       # Country code plausible?
       #
@@ -109,6 +120,8 @@ module Phony
       # Country specific tests.
       #
       country.plausible? rest, hints
+    rescue ArgumentError
+      raise
     rescue StandardError
       return false
     end

data/spec/functional/plausibility_spec.rb

@@ -179,6 +179,14 @@ describe 'plausibility' do
           Phony.plausible?('+359 998 123456').should be_truthy
           Phony.plausible?('+359 999 123456').should be_truthy
       end
+      it_is_correct_for 'Colombia', :samples => ['+57 601 411 1899',
+                                                 '+57 602 111 2222',
+                                                 '+57 603 111 2222',
+                                                 '+57 604 111 2222',
+                                                 '+57 605 111 2222',
+                                                 '+57 606 111 2222',
+                                                 '+57 607 111 2222',
+                                                 '+57 608 111 2222']
       it_is_correct_for 'Congo', :samples => '+242 1234 56789'
       it_is_correct_for 'Cook Islands', :samples => '+682  71928'
       it_is_correct_for 'Costa Rica', :samples => '+506 2 234 5678'
@@ -280,8 +288,6 @@ describe 'plausibility' do
       it_is_correct_for 'Guinea-Bissau', :samples => '+245 44 728 6998'
       it_is_correct_for 'Guyana', :samples => '+592 263 1234'
       it_is_correct_for 'Honduras (Republic of)', :samples => '+504 12 961 637'
-      it_is_correct_for 'Italy', :samples => ['+39 0574 1234',
-                                              '+39 06 49911']
       it_is_correct_for 'Iraq', :samples => ['+964 1 123 4567',
                                              '+964 21 113 456',
                                              '+964 71 1234 5678']
@@ -602,6 +608,20 @@ describe 'plausibility' do
         Phony.plausible?('+62 22 0000 0000').should be_truthy
         Phony.plausible?('+62 22 000 000 000').should be_truthy
       end
+      
+      it 'is correct for Italy' do
+        Phony.plausible?('+39 0574 123').should be_falsy
+        Phony.plausible?('+39 0574 1234').should be_truthy
+        Phony.plausible?('+39 0574 12345').should be_falsy
+        
+        Phony.plausible?('+39 085 541').should be_falsy
+        Phony.plausible?('+39 085 5410').should be_truthy
+        Phony.plausible?('+39 085 54105').should be_truthy
+        
+        Phony.plausible?('+39 06 4991').should be_falsy
+        Phony.plausible?('+39 06 49911').should be_truthy
+        Phony.plausible?('+39 06 499112').should be_truthy
+      end
 
       it 'is correct for Russia' do
         Phony.plausible?('+7 3522 000 000').should be_truthy

data/spec/lib/phony/countries_spec.rb

@@ -240,7 +240,7 @@ describe 'country descriptions' do
       end
     end
     describe 'Colombia' do
-      it_splits '5711234567', ['57', '1', '123', '4567']
+      it_splits '5711234567', ['57', '1', '123', '4567'] # Outdated.
       it_splits '573101234567', ['57', '310', '123', '4567'] # mobile
     end
     describe 'Croatia' do

data/spec/lib/phony/country_codes_spec.rb

@@ -4,6 +4,27 @@ describe Phony::CountryCodes do
   
   let(:countries) { Phony::CountryCodes.instance }
   
+  describe '#plausible?' do
+    it 'raises an error on a too long ccc' do
+      expect do
+        countries.plausible?('+1 868 7620266', ccc: '1868123')
+      end.to raise_error(ArgumentError, %Q{The provided ccc option is too long and includes more than a cc ('1') and ndc ('868'). It also includes '123'.})
+    end
+  end
+  
+  describe 'ccc handling' do
+    it 'splits a ccc correctly' do
+      cc, ndc, *local = countries.split('1868')
+      cc.should eq('1')
+      ndc.should eq('868')
+    end
+    it 'splits a ccc correctly' do
+      cc, ndc, *local = countries.split('1868')
+      cc.should eq('1')
+      ndc.should eq('868')
+    end
+  end
+  
   describe '#[]' do
     it 'returns a country' do
       countries['41'].class.should eql Phony::Country

metadata

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