phony 2.19.15 → 2.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45ec2d2d9ab9772ae3f05cd031cd6d4214f1a541838ac8539e5a8d60039d5119
-  data.tar.gz: 4998f527b3b6e2414ef7411c9736a39eaf4b9639faaca8d604a9802b1cf24d5b
+  metadata.gz: f2e0337c11693c028c028c978936d9753067bab16cceb1deba77f39e535fbb50
+  data.tar.gz: 45468532f0d66381ce8b52f8c500881ee6a34f134450f6ffac5b57193c1d4323
 SHA512:
-  metadata.gz: 8fc13c0c16a9dd41bc947308ca2e0c36d59f4efce442c9d21a105aeb919ce323e8190ee0e302cd184e7145b26d6f3b3c9c42009ed6905240c7884fba98b98918
-  data.tar.gz: 5cdc031002c1e727a852b67897d93e3c93c3aef931f1f9a563f62d0b37af9eb137a8e81b37648b57d05f1466e8bebcf0b175cba71215b4c97d7dc80fa78a5bdc
+  metadata.gz: 1c2ad0d4272a0eaf808bc95f8ace53b1d3c5f7fe2718bd555547b5611915eee4a5f34ea968ef7ebe8fb7b4b8cb86b9040b8af48a8181a7d287a9a39d9906f312
+  data.tar.gz: 0a2e811f7f43f4e357fbe384381565a884073d98e6f1376664df1f457cf210dc759bf50c140749e7447cb034cc40e9d2916a77d3c7555df7f922fa5f522652f0

data/lib/phony/countries.rb

@@ -489,13 +489,14 @@ Phony.define do
   # http://www.wtng.info/wtng-260-zm.html
   # https://github.com/googlei18n/libphonenumber/
   # https://en.wikipedia.org/wiki/Telephone_numbers_in_Zambia
+
   country '260',
     trunk('0') |
-    match(/^(76|77|95|96|97)/) >> split(3, 4) | # Mobile
+    match(/^(75|76|77|94|95|96|97)/) >> split(3, 4) | # Mobile
     match(/^(800)/)          >> split(3,3) | # Toll free
     match(/^(21[1-8])/)      >> split(6)     # Fixed
 
-  # Madagascar 
+  # Madagascar
   # https://en.wikipedia.org/wiki/Telephone_numbers_in_Madagascar
   # http://www.itu.int/oth/T020200007F/en
   country '261',

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/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.15
+  version: 2.20.1
 platform: ruby
 authors:
 - Florian Hanke
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-27 00:00:00.000000000 Z
+date: 2022-10-03 00:00:00.000000000 Z
 dependencies: []
 description: 'Fast international phone number (E164 standard) normalizing, splitting
   and formatting. Lots of formatting options: International (+.., 00..), national