phony 1.7.9 → 1.7.10

data/lib/phony/countries/united_kingdom.rb

@@ -1,4 +1,5 @@
-# The United Kingdom uses a variable-length ndc code, thus we use a separate file to not let all_other.rb explode.
+# The United Kingdom uses a variable-length ndc code,
+# thus we use a separate file to not let all_other.rb explode.
 #
 # Note: The United Kingdom uses a variable ndc format from length 2 to 5.
 #
@@ -9,13 +10,13 @@
 #  a 5 or 4 formatting rule with area codes that are 5 digits long.
 #
 # To reflect this different formatting, we need to install all handlers in a row.
-# First, the area codes of length 2, without a fallback length (since this captures all), but with a nil fallback length.
+# First, the area codes of length 2, without a fallback length (since this
+# captures all), but with a nil fallback length.
 #
 # TODO Implement and use length-based splitter.
 #
-handlers = []
 
-area_code_2_national = Phony::NationalSplitters::Variable.new nil, [
+two_digit_ndc = [
   '20',   # London
   '23',   # Southampton, Portsmith
   '24',   # Coventry
@@ -24,12 +25,9 @@ area_code_2_national = Phony::NationalSplitters::Variable.new nil, [
   '55',   # Corporate
   '56',   # LIECS/VoIP
   '70',   # Personal numbers
-
 ]
-area_code_2_local    = Phony::LocalSplitters::Fixed.instance_for [4, 4]
-handlers            << Phony::NationalCode.new(area_code_2_national, area_code_2_local)
 
-area_code_3_national = Phony::NationalSplitters::Variable.new nil, [
+three_digit_ndc = [
   # Geographic.
   #
   '113',  # Leeds
@@ -68,7 +66,6 @@ area_code_3_national = Phony::NationalSplitters::Variable.new nil, [
   '372',
   '373',
 
-#  '500', # Freephone (9 digits) -- to do  0500 + 6 digits
   '800', # Freephone (9 or 10 digits)
   '808', # Freephone (10 digits)
 
@@ -95,12 +92,12 @@ area_code_3_national = Phony::NationalSplitters::Variable.new nil, [
   '909', # Sexual entertainment services
   '982', # Sexual entertainment services
 ]
-area_code_3_local    = Phony::LocalSplitters::Fixed.instance_for [3, 4]
-handlers            << Phony::NationalCode.new(area_code_3_national, area_code_3_local)
 
 # 6 is the fallback length.
 #
-area_code_45_national = Phony::NationalSplitters::Variable.new 6, [
+no_split = [
+  '500', # Freephone (9 digits)
+
   # Geographic.
   #
   '1204', # Bolton
@@ -168,6 +165,9 @@ area_code_45_national = Phony::NationalSplitters::Variable.new 6, [
 
   # Geographic.
   #
+  # Note: We could remove these and use fixed(5) >> split(5)
+  #       for this as a catchall (see sweden.rb).
+  #
   '13873', # Langholm
   '15242', # Hornby
   '15394', # Hawkshead
@@ -181,11 +181,11 @@ area_code_45_national = Phony::NationalSplitters::Variable.new 6, [
   '17687', # Keswick
   '19467', # Gosforth
 ].flatten
-area_code_45_local    = Phony::LocalSplitters::Fixed.instance_for [6]
-handlers             << Phony::NationalCode.new(area_code_45_national, area_code_45_local)
 
-#  '16977', # Brampton -- to do  016977 + 4 digits for 169772 and 169773
+#  '16977', # Brampton -- TODO 016977 + 4 digits for 169772 and 169773
 
 Phony.define do
-  country '44', Phony::Country.new(*handlers)
+  country '44', one_of(two_digit_ndc)   >> split(4,4) |
+                one_of(three_digit_ndc) >> split(3,4) |
+                one_of(no_split)        >> split(6)
 end

data/spec/lib/phony/countries_spec.rb

@@ -82,7 +82,8 @@ describe 'country descriptions' do
       Phony.split('358600123').should  == ['358', '600', '123'] # Service
     end
     it 'handles french numbers' do
-      Phony.split('33112345678').should == ['33', '1', '12','34','56','78']
+      Phony.split('33112345678').should == ['33', '1', '12','34','56','78'] # Paris
+      Phony.split('33812345678').should == ['33', '8', '12','34','56','78'] # Service number
     end
     it 'handles german numbers' do
       Phony.split('493038625454').should  == ['49', '30', '386', '25454'] # Berlin
@@ -91,8 +92,8 @@ describe 'country descriptions' do
       Phony.split('497614767676').should  == ['49', '761', '476', '7676'] # Freiburg im Breisgau
       Phony.split('4921535100').should    == ['49', '2153', '510', '0'] # Nettetal-Lobberich
       Phony.split('493434144602').should  == ['49', '34341', '446', '02'] # Geithain
-      Phony.split('491805878323').should  == ['49', '180', '587', '8323'] # Service numbers
-      Phony.split('491815878323').should  == ['49', '181', '587', '8323'] # Service numbers
+      Phony.split('491805878323').should  == ['49', '180', '587', '8323'] # Service number
+      Phony.split('491815878323').should  == ['49', '181', '587', '8323'] # Service number
     end
     it 'handles ghanese numbers' do
       Phony.split('233302123456').should == ['233', '30', '212', '3456'] # Mobile Vodafone, Accra
@@ -215,7 +216,8 @@ describe 'country descriptions' do
       Phony.split('46125123456').should == ['46', '125', '123456']
     end
     it 'handles swiss numbers' do
-      Phony.split('41443643532').should == ['41', '44', '364', '35', '32']
+      Phony.split('41443643532').should == ['41', '44', '364', '35', '32'] # Zurich (usually)
+      Phony.split('41800334455').should == ['41', '800', '334', '455'] # Service number
     end
     it 'handles tanzanian numbers' do
       Phony.split('255221231234').should == ['255', '22', '123', '1234'] # Dar Es Salaam
@@ -242,13 +244,13 @@ describe 'country descriptions' do
       Phony.split('44169772333').should  == ['44', '16977', '2333']  # Brampton
       Phony.split('443005878323').should == ['44', '300', '587', '8323'] # Non-geographic
       Phony.split('443457777334').should == ['44', '345', '777', '7334'] # Non-geographic
-#     Phony.split('44500557788').should  == ['44', '500', '557788']  # Freefone
+      Phony.split('44500557788').should  == ['44', '500', '557788']  # Freefone
       Phony.split('445575671113').should == ['44', '55', '7567', '1113'] # Corporate
       Phony.split('445644775533').should == ['44', '56', '4477', '5533'] # LIECS/VoIP
       Phony.split('447020229901').should == ['44', '70', '2022', '9901'] # Personal numbers
       Phony.split('447780605207').should == ['44', '7780', '605207'] # Mobile
       Phony.split('447480605207').should == ['44', '7480', '605207'] # Mobile
-#     Phony.split('44800557788').should  == ['44', '800', '557788']  # Freefone
+      # Phony.split('44800557788').should  == ['44', '800', '557788']  # Freefone
       Phony.split('448084682355').should == ['44', '808', '468', '2355'] # Freefone
       Phony.split('448005878323').should == ['44', '800', '587', '8323'] # Freefone, regression
     end
@@ -263,16 +265,9 @@ describe 'country descriptions' do
       Phony.split('8499612345').should == ['84', '996', '12345'] # GTel
       Phony.split('8441234567').should == ['84', '4', '1234567'] # Hanoi
     end
-    it 'handles new zealand numbers' do
+    it 'handles new zealand / kiwi numbers' do
       Phony.split('6491234567').should == ['64', '9', '123', '4567']
     end
-
-    it 'handles french service numbers' do
-      Phony.split('33812345678').should == ['33', '8', '12','34','56','78']
-    end
-    it 'handles swiss service numbers' do
-      Phony.split('41800334455').should == ['41', '800', '334', '455']
-    end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phony
 version: !ruby/object:Gem::Version
-  version: 1.7.9
+  version: 1.7.10
   prerelease: 
 platform: ruby
 authors: