phony 2.5.3 → 2.5.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGQ1ZTY1ZTQ1NTMxY2E1ZGU0Mzk2Y2IxODQ0YWRjYTUxM2VkNDI2OA==
+    MjgwYTAxZTZiNTRiOTViNDdiZDI5OTA4ZmE3Nzc5MmQ4NjM2Y2IxYQ==
   data.tar.gz: !binary |-
-    MjQ5ODI0YzFlYjMxOTcxNjE2ODY4OWJkMmQzNjU3YTE4ZTdhYWJmYw==
+    NTM2M2M1NmE3YmZhZTg4MDM2MGY3ZTlkYmU4ZmQzMGRjNGViMzdkYQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MDQ1YWM2ZWQ4NWIyOWNmMDg5ZDIxMmEwNDQ2OTRhNzY5MDM3YjM3ODBhNGQw
-    MjQyZjIwOGQ2ZmY4MDBjNmY0OGI0Y2VhOWRiMTI3ZDhhZDAwMDJjNDA3ZjE1
-    YWVhNGVkNzFjY2JhY2RkNzA2ZGNlZjg5YmQxYmIzZGNmZDI3ODI=
+    NWY2NWYyNjlhMTFmOWZhZDM3YWZiNTM1NjVmNGU1ZWIxYTQ4NWJmOGEyYjZl
+    ZTg5NDYwNjg3NDBmODRhYjYzMjk0ZWVjZDFiOTU2MTYyNWIyMWFmNjg3YTcy
+    Mjk4ZmQ1NzIzZmY1MjJkYzI4ZGU2OWZhMmJkZjczYjU5YTAwYjM=
   data.tar.gz: !binary |-
-    YTk2N2Y1N2JlZjI2M2I1ZWY2YjY1MWJmNDk2MzFjOTljZmVlYTJkNmRmYmFj
-    Yzk3MWQ4OTRlNTQyNDQ4ZDlhNjFlYjMzYjYwZDVkMzMwODRhMGVjNDQ1OGFi
-    NTg1YmMxYTcwMzFiYTkzOWQ1NDQ3ZjhmNjQxYzAwNWE5NTZiMmI=
+    MzRiZjM0ZDUxNTE3OThiMzQyM2VkMDJjMjUwNjE0ZDU5MzhhYTIwYTZmNjM5
+    NWY5MzA5NWUzMmYzYTNiODg3OTdjMTRjZTBhNTE3YmM3MDc5OTAxODQ2MDc5
+    ZTQzZGQ3MWU2MmE5MWYzZDcxNGVlYWM3MGEzM2IyNDU4ZDgxYTE=

data/lib/phony/countries/germany.rb

@@ -71,8 +71,6 @@ ndcs3 = [
 '661', # Fulda
 '671', # Bad Kreuznach
 '681', # Saarbrücken
-'700', # Personal Numbers
-'701', # Personal Numbers, reserved
 '711', # Stuttgart
 '721', # Karlsruhe
 '731', # Ulm
@@ -82,8 +80,6 @@ ndcs3 = [
 '771', # Donaueschingen
 '781', # Offenburg
 '791', # Schwäbisch Hall
-'800', # Toll-Free Numbers
-'801', # Toll-Free Numbers, reserved
 '811', # Hallbergmoos
 '821', # Augsburg
 '831', # Kempten
@@ -92,8 +88,6 @@ ndcs3 = [
 '861', # Traunstein
 '871', # Landshut
 '881', # Weilheim in Oberbayern
-'900', # Premium Rate Numbers
-'901', # Premium Rate Numbers, reserved
 '902', # Replacement for 0137/0138
 '906', # Donauwörth
 '911', # Nürnberg
@@ -3992,34 +3986,44 @@ ndcs4 = [
 '9977',
 '9978',
 ]
-# mobile = [
-# '150', # Group3G/Quam
-# '151', # T-Mobile
-# '152', # Vodafone
-# '155', # E-Plus
-# '156', # Mobilcom
-# '157', # E-Plus
-# '159', # O2
-# '160', # T-Mobile
-# '161', # C-Netz
-# '162', # Vodafone
-# '163', # E-Plus
-# '164', # Cityruf
-# '165', # Quix
-# '166', # Telmi
-# '168', # Scall
-# '169', # Cityruf, Scall, Skyper (e*cityruf, e*message, e*skyper)
-# '170', # T-Mobile
-# '171', # T-Mobile
-# '172', # Vodafone
-# '173', # Vodafone
-# '174', # Vodafone
-# '175', # T-Mobile
-# '176', # O2 Germany
-# '177', # E-Plus
-# '178', # E-Plus
-# '179', # O2 Germany
-# ]
+mobile_3digits = [
+'150', # Group3G/Quam
+'151', # T-Mobile
+'152', # Vodafone
+'155', # E-Plus
+'156', # Mobilcom
+'157', # E-Plus
+'159', # O2
+'160', # T-Mobile
+'161', # C-Netz
+'162', # Vodafone
+'163', # E-Plus
+'164', # Cityruf
+'165', # Quix
+'166', # Telmi
+'168', # Scall
+'169', # Cityruf, Scall, Skyper (e*cityruf, e*message, e*skyper)
+'170', # T-Mobile
+'171', # T-Mobile
+'172', # Vodafone
+'173', # Vodafone
+'174', # Vodafone
+'175', # T-Mobile
+'176', # O2 Germany
+'177', # E-Plus
+'178', # E-Plus
+'179', # O2 Germany
+]
+
+mobile_4digits = [
+'1520', # Vodafone
+'1521', # Lycamobile
+'1522', # Vodafone
+'1570', # vistream
+'1527', # E-Plus
+'1672', # Dolphin Telecom
+]
+
 service = [
 '12',  # Innovative Services
 '130',
@@ -4073,19 +4077,18 @@ service = [
 # http://www.itu.int/dms_pub/itu-t/oth/02/02/T02020000510001PDFE.pdf
 # "Numbers assigned in the past, which are generally grandfathered, may be as short as five digits."
 #
-# http://www.bundesnetzagentur.de/cln_1911/DE/Sachgebiete/Telekommunikation/Unternehmen_Institutionen/Nummerierung/Nummerierungskonzept/nummerierungskonzept_node.html
+# http://www.bundesnetzagentur.de/cln_1422/DE/Sachgebiete/Telekommunikation/Unternehmen_Institutionen/Nummerierung/Rufnummern/Rufnummern_node.html
 #
 # TODO Define lower end of last part correctly.
 #
 Phony.define do
    country '49',
      trunk('0', normalize: true) |
-     one_of(service)           >> split(3,0)    |
-     match(/\A(151[124567]|152[012359]|157[035789]|1590)\d*\z/) >> split(3,4) |
-     match(/\A(15\d)\d*\z/)    >> split(3,4)    |
-     match(/\A(1[67]\d)\d*\z/) >> split(3,1..5) | # Seite 49 [?]
-     one_of(ndcs2)             >> split(3,2..10) | # 5-9 Stellen nach Seite 32 [?]
-     one_of(ndcs3)             >> split(3,1..9) |
-     one_of(ndcs4)             >> split(3,0..8) |
-     fixed(5)                  >> split(3,0..7)
+     one_of(*service)        >> split(3,4) |
+     one_of(*mobile_4digits) >> split(3,4) |
+     one_of(*mobile_3digits) >> split(4,3..4) |
+     one_of(*ndcs2)          >> split(3,2..10) |
+     one_of(*ndcs3)          >> split(3,1..9) |
+     one_of(*ndcs4)          >> split(3,0..8) |
+     fixed(5)                >> split(3,0..7)
 end

data/spec/functional/normalize_spec.rb

@@ -8,31 +8,31 @@ describe 'Phony#normalize' do
       it '#151' do
         # Normalizes, but this is a non-real case.
         #
-        Phony.normalize('1-111-111-1111').should        == '1111111111'
-        Phony.normalize('111-111-1111', cc: '1').should == '1111111111'
+        Phony.normalize('1-111-111-1111').should        eql '1111111111'
+        Phony.normalize('111-111-1111', cc: '1').should eql '1111111111'
       end
     end
 
     it 'handles the US (with cc) correctly' do
-      Phony.normalize('+1 724 999 9999').should == '17249999999'
+      Phony.normalize('+1 724 999 9999').should eql '17249999999'
     end
     it 'handles the Dutch number (without US cc) correctly' do
-      Phony.normalize('310 5552121').should == '315552121'
+      Phony.normalize('310 5552121').should eql '315552121'
     end
     it 'handles the US (with cc and cc option) correctly' do
-      Phony.normalize('+1 724 999 9999', cc: '1').should == '17249999999'
+      Phony.normalize('+1 724 999 9999', cc: '1').should eql '17249999999'
     end
     it 'handles the US (without cc) correctly' do
-      Phony.normalize('(310) 555-2121', cc: '1').should == '13105552121'
+      Phony.normalize('(310) 555-2121', cc: '1').should eql '13105552121'
     end
     it 'handles a German number with extra (0)' do
-      Phony.normalize('+49 (0) 209 22 33 44 55').should == '4920922334455'
+      Phony.normalize('+49 (0) 209 22 33 44 55').should eql '4920922334455'
     end
     it 'handles a German number with extra 0' do
-      Phony.normalize('+49 0 209 22 33 44 55').should == '4920922334455'
+      Phony.normalize('+49 0 209 22 33 44 55').should eql '4920922334455'
     end
     it 'handles Cambodian numbers with an extra 0' do
-      Phony.normalize('+855012239134').should == "85512239134"
+      Phony.normalize('+855012239134').should eql "85512239134"
     end
     it 'should normalize a too short number' do
       Phony.normalize('+972').should eql '972'

data/spec/functional/plausibility_spec.rb

@@ -332,6 +332,9 @@ describe 'plausibility' do
         Phony.plausible?('+49 31234 123456').should be_true
         Phony.plausible?('+49 7141 12345670').should be_true
         Phony.plausible?('+49 1609 1234567').should be_true # Bug: https://github.com/floere/phony/issues/146
+        Phony.plausible?('+49 800 1234567').should be_true
+        Phony.plausible?('+49 1805 878323').should be_true
+
         # Following tests implement specifications from
         # http://www.bundesnetzagentur.de/SharedDocs/Downloads/DE/Sachgebiete/Telekommunikation/Unternehmen_Institutionen/Nummerierung/Rufnummern/ONRufnr/NummernplanOrtsnetzrufnummern.pdf?__blob=publicationFile&v=2 (04.24.2014)
         # Page 3
@@ -507,7 +510,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 => [
-        '+4915775368708'
+        '+49 157 753 6870'
       ]
       it_is_correct_for 'Georgia', :samples => ['+995 220 123 45',
                                                 '+995 32 123 4567',

data/spec/lib/phony/countries_spec.rb

@@ -207,18 +207,22 @@ describe 'country descriptions' do
       it_splits '995596123456', %w(995 596 123 456)
     end
     describe 'Germany' do
-      it_splits '493038625454',  ['49', '30', '386', '25454']  # Berlin
-      it_splits '4932221764542', ['49', '32', '221', '764542'] # Non-Geographical
-      it_splits '4922137683323', ['49', '221', '376', '83323'] # Cologne
-      it_splits '497614767676',  ['49', '761', '476', '7676']  # Freiburg im Breisgau
-      it_splits '4921535100',    ['49', '2153', '510', '0']    # Nettetal-Lobberich
-      it_splits '493434144602',  ['49', '34341', '446', '02']  # Geithain
-      it_splits '491805878323',  ['49', '180', '587', '8323']  # Service number
-      it_splits '491815878323',  ['49', '181', '587', '8323']  # Service number
-      it_splits '4915111231234', ['49', '1511', '123', '1234']  # Mobile number
+      it_splits '493038625454',  ['49', '30', '386', '25454']   # Berlin
+      it_splits '4932221764542', ['49', '32', '221', '764542']  # Non-Geographical
+      it_splits '4922137683323', ['49', '221', '376', '83323']  # Cologne
+      it_splits '497614767676',  ['49', '761', '476', '7676']   # Freiburg im Breisgau
+      it_splits '4921535100',    ['49', '2153', '510', '0']     # Nettetal-Lobberich
+      it_splits '493434144602',  ['49', '34341', '446', '02']   # Geithain
+
+      it_splits '491805878323',  ['49', '180', '587', '8323']   # Service number
+      it_splits '491815878323',  ['49', '181', '587', '8323']   # Service number
+      it_splits '498001234567',  ['49', '800', '123', '4567']   # Service number
+
+      it_splits '4915111231234', ['49', '151', '1123', '1234']  # Mobile number
+      it_splits '4915771231234', ['49', '157', '7123', '1234']  # Mobile number
+      it_splits '491601234567',  ['49', '160', '1234', '567']   # Mobile number
+      it_splits '4916312345678', ['49', '163', '1234', '5678']  # Mobile number
       it_splits '4915211231234', ['49', '1521', '123', '1234']  # Mobile number
-      it_splits '4915771231234', ['49', '1577', '123', '1234']  # Mobile number
-      it_splits '4916312312345', ['49', '163', '123', '12345']  # Mobile number
     end
     describe 'Ghana' do
       it_splits '233302123456', ['233', '30', '212', '3456'] # Mobile Vodafone, Accra

data/spec/lib/phony_spec.rb

@@ -6,8 +6,8 @@ describe Phony do
 
   describe 'regression' do
     it 'best effort #152' do
-      described_class.split('39694805123').should == ['39', '694805123', []]
-      described_class.format('39694805123').should == '+39 694805123 '
+      described_class.split('39694805123').should eql ['39', '694805123', []]
+      described_class.format('39694805123').should eql '+39 694805123 '
     end
   end
 

metadata

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