phony 2.15.42 → 2.15.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b90966199c054b9b7bd7967444e4c16daf43c4fa
-  data.tar.gz: 9e44b2e83b3e9696ca1b6ba61fcda6c69d6a6fc6
+  metadata.gz: 6224b3a86d75b35405663ba54e9c4a0df59e3dca
+  data.tar.gz: 4865b3f594f023a6f5200d01aff512516883ceba
 SHA512:
-  metadata.gz: c1ef2d3e28da0f71ff9f09e5804ebebd7b9f18bef2538487be0b889689b5fc3a34104c637d4f2d1137be80da4124f88b61a35681852ba948153ef61d3a6f6b77
-  data.tar.gz: a1a118463cac97953d9b0b4ae7c4978e9c893fe36373a03aa9fa80aa59596d619bcb41b19f08699e7537ce4cb44388838399b9b30ce146436b4aab8111751f54
+  metadata.gz: 4aa5c624fd7dad4a7542d9983e04204b97f9d5d23e5188c760d08fc1e3678e92b17865e745c5a60cbe7cea84ab36e55e578e19f27bed1c2e36114f7a52787534
+  data.tar.gz: 66e69794dc94c5457ab7c66d1234e0fb3aecb50e3bed85548b4087f36711fbaee3e543467e7382fa4bf90db8d6914d72ea85a35a5d30fefe6a513ef19fbcfacc

data/lib/phony/countries.rb

@@ -178,7 +178,7 @@ Phony.define do
   # Note: http://wapedia.mobi/en/Telephone_numbers_in_Poland, mobile not yet correct
   #
   country '48',
-          match(/^(5[013]\d|6[069]\d|7[02389]\d|80[01]|88\d)/) >> split(3,3) |
+          match(/^(45\d|5[0137]\d|6[069]\d|7[02389]\d|80[01]|88\d)/) >> split(3,3) |
           fixed(2)                                             >> split(3,2,2)
 
   # country '49' # Germany, see special file.
@@ -401,7 +401,9 @@ Phony.define do
 
   country '240', none >> split(3,3,3) # Equatorial Guinea
   country '241', fixed(1) >> split(3,3) # Gabonese Republic http://www.wtng.info/wtng-241-ga.html
-  country '242', none >> split(4,5) # Congo http://www.wtng.info/wtng-242-cg.html
+  country '242', # Congo http://www.wtng.info/wtng-242-cg.html
+    trunk('', :normalize => false) |
+    none >> split(4,5)
   country '243', fixed(2) >> split(3,4) # Democratic Republic of the Congo http://www.wtng.info/wtng-243-cd.html
   country '244', one_of('321', '348', '358', '363', '364', '485', '526', '535', '546', '612', '643', '652', '655', '722', '726', '728', '729', '777') >> split(3,3) | # Angola
                  fixed(2) >> split(3,4)

data/lib/phony/countries/somalia.rb

@@ -1,6 +1,7 @@
 Phony.define do
   # Somali Democratic Republic http://www.wtng.info/wtng-252-so.html
   # https://www.numberingplans.com/?page=plans&sub=phonenr&alpha_2_input=SO
+  # https://en.wikipedia.org/wiki/Telecommunications_in_Somaliland#Telesom
   country '252',
     one_of('88216') >> split(3) | # Thuraya Satellite Telecommunications Company
     one_of(%w(1034 1043)) >> split(3,2) | # Hortel
@@ -13,10 +14,11 @@ Phony.define do
     one_of(%w(642 643 644 648 649)) >> split(2,2) | # Galcom
     one_of(%w(33 51 52 54 55 56 57 58 59 68 71 76 78 79 88)) >> split(3,2) |
     match(/\A(67)\d{5}\z/) >> split(3,2) | # Golis Telecom Somalia
+    match(/\A(63)\d{7}\z/) >> split(3,4) | # Telesom
     one_of(%w(15 40 42 45 46 60 61 90 91)) >> split(3,3) | # mobile Somafone, Hortel
     one_of(%w(18)) >> split(3,2) | # Hortel
     one_of(%w(27 28 29 62 63 87)) >> split(2,2) | # Telcom Somalia, Emir Set
     one_of(%w(67 69)) >> split(4,3) | # mobile NationLink Telecom
     one_of('1') >> split(3,3) |
     fixed(1) >> split(3,3)
-end
+end

data/spec/lib/phony/countries_spec.rb

@@ -569,6 +569,8 @@ describe 'country descriptions' do
     describe 'Poland' do
       it_splits '48123456789', ['48', '12', '345', '67', '89'] # Landline
       it_splits '48501123456', ['48', '501', '123', '456']     # Mobile
+      it_splits '48571123456', ['48', '571', '123', '456']     # Mobile
+      it_splits '48451123456', ['48', '451', '123', '456']     # Mobile
       it_splits '48800123456', ['48', '800', '123', '456']     # Free
       it_splits '48801123456', ['48', '801', '123', '456']     # Shared cost
       it_splits '48701123456', ['48', '701', '123', '456']     # Premium
@@ -1179,12 +1181,14 @@ describe 'country descriptions' do
       it_splits '67754692', ['677', false, '54', '692']
       it_splits '6777546921', ['677', false, '7546', '921']
     end
-    describe 'Somali Democratic Republic' do
+    describe 'Somalia' do
       it_splits '252103412345', %w(252 1034 123 45)
       it_splits '2521313123', %w(252 1313 123)
       it_splits '2521601234', %w(252 160 12 34)
       it_splits '25250012345', %w(252 500 123 45)
       it_splits '252671234567', %w(252 67 1234 567)
+      it_splits '252634000613', %w(252 63 400 0613)
+      it_splits '252634423020', %w(252 63 442 3020)
     end
     describe 'Suriname (Republic of)' do
       it_splits '597958434', ['597', false, '958', '434']

data/spec/lib/phony/country_codes_spec.rb

@@ -48,6 +48,13 @@ describe Phony::CountryCodes do
     it 'normalizes correctly with CC option' do
       @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'
+      end
+    end
   end
 
   describe 'formatted' do

metadata

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