phony 1.7.10 → 1.7.11

data/lib/phony/countries/russia_kazakhstan_abhasia_south_osetia.rb

@@ -118,7 +118,11 @@ Phony.define do
                one_of(ndcs_with_7_subscriber_digits) >> split(3, 2, 2) |
                one_of(%w(800))                       >> split(3, 2, 2) | # Russia free number
                one_of(%w(929 995344 9971 99744 9976 997)) >> split(2, 2, 2) | # South Osetia
-               match(/([67]\d{2})/)                  >> split(2, 2, 2) | # Kazakhstan: (600..799)
-               one_of(%w(840 940))                   >> split(2,2,2) # Abhasia
+               
+               # The two following lines have been replaced by fixed(3).
+               #
+               # match(/([67]\d{2})/)                  >> split(2, 2, 2) | # Kazakhstan: (600..799)
+               # one_of(%w(840 940))                   >> split(2,2,2) # Abhasia
+               
                fixed(3)                              >> split(2,2,2)
 end

data/lib/phony/countries/united_kingdom.rb

@@ -1,34 +1,40 @@
-# 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 countries.rb explode.
 #
-# Note: The United Kingdom uses a variable ndc format from length 2 to 5.
+# Note: The United Kingdom uses a variable NDC format from length 2 to 5.
 #
 # The UK is special in formatting in that it uses:
-#  a 4-4 formatting rule with area codes that are 2 digits long,
-#  a 3-4 formatting rule with area codes that are 3 digits long,
-#  a 6 or 5 formatting rule with area codes that are 4 digits long, and
-#  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.
-#
-# TODO Implement and use length-based splitter.
+#  a 2-4-4 formatting rule with area codes that are 2 digits long,
+#  a 3-3-4 or 3-6 formatting rule with area codes that are 3 digits long,
+#  a 4-6 or 4-5 formatting rule with area codes that are 4 digits long, and
+#  a 5-5 or 5-4 formatting rule with area codes that are 5 digits long.
+# There can be a mix of number lengths within a single area code.
 #
 
 two_digit_ndc = [
+  # Geographic [2+8].
+  #
   '20',   # London
   '23',   # Southampton, Portsmith
   '24',   # Coventry
   '28',   # Northern Ireland
   '29',   # Cardiff
+
+  # Non-geographic [2+8].
+  #
   '55',   # Corporate
   '56',   # LIECS/VoIP
   '70',   # Personal numbers
 ]
 
+# three_digit_ndc_with_nine_digits
+  # Non-geographic [3+6].
+  #
+  # '500', # Freephone (9 digits) handled in specific rule, see below.
+  # '800', # Freephone (9 digits) handled in specific rule, see below.
+
 three_digit_ndc = [
-  # Geographic.
+  # Geographic [3+7].
   #
   '113',  # Leeds
   '114',  # Sheffield
@@ -41,15 +47,14 @@ three_digit_ndc = [
   '141',  # Glasgow
   '151',  # Liverpool
   '161',  # Manchester
-  '171',  # Used for inner London until 2000
-  '181',  # Used for outer London until 2000
   '191',  # Tyne and Wear/County Durham
 
-  # Services.
+  # Services [3+7].
   #
   '300', # Non-geographic charged at same rate as 01
   '301',
   '303',
+  '306',
   '308',
   '309',
   '330',
@@ -66,20 +71,20 @@ three_digit_ndc = [
   '372',
   '373',
 
-  '800', # Freephone (9 or 10 digits)
+  '800', # Freephone (10 digits) # 9 digits handled in specific rule, see below.
   '808', # Freephone (10 digits)
 
-  '842', # Business rate
+  '842', # Business rate [3+7].
   '843',
   '844',
   '845',
   '870',
 
-  '871', # Premium rate
+  '871', # Premium rate [3+7].
   '872',
   '873',
 
-  '900', # Premium rate content services
+  '900', # Premium rate content services [3+7].
   '901',
   '902',
   '903',
@@ -88,18 +93,42 @@ three_digit_ndc = [
   '906',
   '907',
 
-  '908', # Sexual entertainment services
-  '909', # Sexual entertainment services
-  '982', # Sexual entertainment services
+  '908', # Sexual entertainment services [3+7].
+  '909',
+  '982',
 ]
 
-# 6 is the fallback length.
-#
-no_split = [
-  '500', # Freephone (9 digits)
+# five_digit_ndc_with_nine_digits
+  # Geographic [5+4].
+  #
+  # '16977', # Brampton (contains both 4 and 5 digit numbers)
+  #          # 9 digits handled in specific rule, see below.
 
-  # Geographic.
+five_digit_ndc = [
+  # Geographic [5+5].
   #
+  # These areas use 5-5 format. One area has some 5-4 numbers too (see above).
+  # They share their initial digits with area codes using 4-6 (and 4-5).
+  '13873', # Langholm
+  '15242', # Hornby
+  '15394', # Hawkshead
+  '15395', # Grange-over-Sands
+  '15396', # Sedbergh
+  '16973', # Wigton
+  '16974', # Raughton Head
+  '16977', # Brampton (contains both 4 and 5 digit numbers)
+  '17683', # Appleby
+  '17684', # Pooley Bridge
+  '17687', # Keswick
+  '19467', # Gosforth
+]
+
+no_split = [
+  # Geographic [4+6]/[4+5].
+  #
+  # These 40 area codes have a mix of 4-6 and 4-5 numbers
+  # The three 'mixed' areas also have part of their number
+  # range sub-allocated as 5-5.
   '1204', # Bolton
   '1208', # Bodmin
   '1254', # Blackburn
@@ -141,51 +170,43 @@ no_split = [
   '1963', # Wincanton
   '1995', # Garstang 
 
-  # Geographic.
+# 6 is the fallback length.
+#
+  # Mobile [4+6].
   #
+  ('7400'..'7599').to_a,
+  '7624',
+  ('7700'..'7999').to_a,
+
+  # Geographic [4+6].
+  #
+  # About 500 area codes use the 4-6 format
+  # The three 'mixed' areas also have part of their number
+  # range sub-allocated as 5-5 and one also has some 5-4.
   '1224', # Aberdeen 
   '1244', # Chester
   '1382', # Dundee
+  '1387', # Dumfries (Mixed area)
   '1429', # Hartlepool
   '1482', # Hull
+  '1539', # Kendal (Mixed area)
   '1582', # Luton
   '1670', # Morpeth
+  '1697', # Brampton (Mixed area)
   '1730', # Petersfield
   '1736', # Penzance
   '1772', # Preston
   '1853', # Ullapool
   '1947', # Whitby
           # and 500 others
-
-  # Mobile.
-  #
-  ('7400'..'7599').to_a,
-  '7624',
-  ('7700'..'7999').to_a,
-
-  # 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
-  '15395', # Grange-over-Sands
-  '15396', # Sedbergh
-  '16973', # Wigton
-  '16974', # Raughton Head
-  '16977', # Brampton
-  '17683', # Appleby
-  '17684', # Pooley Bridge
-  '17687', # Keswick
-  '19467', # Gosforth
 ].flatten
 
-#  '16977', # Brampton -- TODO 016977 + 4 digits for 169772 and 169773
-
 Phony.define do
-  country '44', one_of(two_digit_ndc)   >> split(4,4) |
-                one_of(three_digit_ndc) >> split(3,4) |
-                one_of(no_split)        >> split(6)
+  country '44', one_of(two_digit_ndc)    >> split(4,4) | # 2-4-4
+                match(/^([58]00)\d{6}$/) >> split(6)   | # Special handling for 500 and 800: 3-6 numbers.
+                one_of(three_digit_ndc)  >> split(3,4) | # 3-3-4
+                match(/^(16977)\d{4}$/)  >> split(4)   | # Special handling for 16977: 5-4 numbers.
+                one_of(five_digit_ndc)   >> split(5)   | # 5-5
+                one_of(no_split)         >> split(6)   | # 4-6 and 4-5
+                fixed(4)                 >> split(6)     # Catchall for 4-6 numbers.
 end

data/lib/phony/country.rb

@@ -12,9 +12,7 @@ module Phony
       @codes = codes
     end
     
-    # DSL.
-    #
-    # TODO
+    # Chain two codes together.
     #
     def |(other)
       self.codes = self.codes + other.codes

data/lib/phony/national_code.rb

@@ -16,9 +16,9 @@ module Phony
     # its parts.
     #
     def split national_number
-      zero, ndc, rest = @national_splitter.split national_number.dup
-      return [zero, ndc] unless rest
-      [zero, ndc, *@local_splitter.split(rest)]
+      zero, ndc_or_rest, rest = @national_splitter.split national_number.dup
+      return [zero, ndc_or_rest] unless rest
+      [zero, ndc_or_rest, *@local_splitter.split(rest)]
     end
 
     # Split gets a number without country code and removes a relative zero.

data/lib/phony/national_splitters/none.rb

@@ -33,6 +33,8 @@ module Phony
       #
       # Note: Actually, it might stay in.
       #
+      # TODO Flip nil/false?
+      #
       def split national_number
         [nil, false, national_number]
       end

data/spec/lib/phony/countries_spec.rb

@@ -4,152 +4,156 @@ require 'spec_helper'
 
 describe 'country descriptions' do
 
+  def self.it_splits number, expected
+    it { Phony.split(number).should == expected }
+  end
+
   describe 'splitting' do
-    it 'handles afghan numbers' do
-      Phony.split('93201234567').should == ['93', '20', '1234567'] # Kabul
-    end
-    it 'handles algerian numbers' do
-      Phony.split('213211231234').should == ['213', '21', '123', '1234'] # Algiers
-      Phony.split('213331231234').should == ['213', '33', '123', '1234'] # Batna
-    end
-    it 'handles argentine numbers' do
-      Phony.split('541112345678').should == ['54', '11', '1234', '5678']
-      Phony.split('542911234567').should == ['54', '291', '123', '4567']
-      Phony.split('542965123456').should == ['54', '2965', '12', '3456']
-      Phony.split('5491112345678').should == ['54', '911', '1234', '5678']
-      Phony.split('5492201234567').should == ['54', '9220', '123', '4567']
-      Phony.split('5492221123456').should == ['54', '92221', '12', '3456']
-    end
-    it 'handles austrian numbers' do
-      Phony.split('43198110').should == ['43', '1', '98110'] # Vienna
-      Phony.split('4366914093902').should == ['43', '669', '14093902'] # Mobile
-      Phony.split('433161234567891').should == ['43', '316', '1234567891'] # Graz
-      Phony.split('432164123456789').should == ['43', '2164', '123456789'] # Rohrau
-    end
-    it 'handles australian numbers' do
-      Phony.split('61512341234').should == ['61', '5', '1234', '1234'] # Landline
-      Phony.split('61423123123').should == ['61', '423', '123', '123'] # Mobile
-    end
-    it 'handles belgian numbers' do
-      Phony.split('3235551212').should == ['32', '3', '555', '1212']   # Antwerpen
-      Phony.split('32505551212').should == ['32', '50', '555', '1212'] # Brugge
-      Phony.split('3225551212').should == ['32', '2', '555', '1212']   # Brussels
-      Phony.split('3295551914').should == ['32', '9', '555', '1914']   # Gent
-      Phony.split('3245551414').should == ['32', '4', '555', '1414']   # Liège
-      Phony.split('3216473200').should == ['32', '16', '473', '200']   # Leuven
-      Phony.split('32475279584').should == ['32', '475', '279584']     # mobile
-      Phony.split('3270123123').should == ['32', '70', '123', '123']   # Bus Service?
-    end
-    it 'handles brazilian numbers' do
-      Phony.split('551112341234').should == ['55', '11', '1234', '1234']
-    end
-    it 'handles chilean numbers' do
-      Phony.split('5621234567').should == ['56', '2', '1234567']       # Santiago
-      Phony.split('5675123456').should == ['56', '75', '123456']       # Curico
-      Phony.split('56912345678').should == ['56', '9', '12345678']     # Mobile
-      Phony.split('56137123456').should == ['56', '137', '123', '456'] # Service
-    end
-    it 'handles chinese numbers' do
-      Phony.split('862112345678').should == ['86', '21', '1234', '5678'] # Shanghai
-      Phony.split('8675582193447').should == ['86', '755', '8219', '3447'] # Shenzhen
-    end
-    it 'handles croatian numbers' do
-      Phony.split('385112312345').should == ['385', '1', '123', '12345'] # Zagreb
-      Phony.split('385491231234').should == ['385', '49', '123', '1234'] # Krapina
-    end
-    it 'handles cuban numbers' do
-      Phony.split('5351231234').should == ['53', '5123', '1234'] # Mobile
-      Phony.split('5371234567').should == ['53', '7', '1234567'] # Havana
-      Phony.split('5342123456').should == ['53', '42', '123456'] # Villa Clara
-    end
-    it 'handles danish numbers' do
-      Phony.split('4532121212').should == ['45', false, '32', '12', '12', '12']
-    end
-    it 'handles dutch numbers' do
-      Phony.split('31612345678').should == ['31', '6', '12345678'] # mobile
-      Phony.split('31201234567').should == ['31', '20', '1234567']
-      Phony.split('31222123456').should == ['31', '222', '123456']
-    end
-    it 'handles egyptian numbers' do
-      Phony.split('20212345678').should == ['20', '2', '12345678']
-      Phony.split('20921234567').should == ['20', '92', '1234567']
-      Phony.split('20951234567').should == ['20', '95', '1234567']
-    end
-    it 'handles finnish numbers' do
-      Phony.split('3589123123').should == ['358', '9', '123', '123'] # Helsinki
-      Phony.split('3581912312').should == ['358', '19', '123', '12'] # Nylandia
-      Phony.split('3585012312').should == ['358', '50', '123', '12'] # Mobile
-      Phony.split('358600123').should  == ['358', '600', '123'] # Service
-    end
-    it 'handles french numbers' do
-      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
-      Phony.split('4932221764542').should == ['49', '32', '221', '764542'] # Non-Geographical
-      Phony.split('4922137683323').should == ['49', '221', '376', '83323'] # Cologne
-      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 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
-    end
-    it 'handles greek numbers' do
-      Phony.split('3021123456').should == ['30', '21', '123456'] # Athens
-      Phony.split('3069512345').should == ['30', '695', '12345'] # Mobile
-      Phony.split('302108131234').should == ['30', '21', '08131234'] # Long mobile, noted by vilcsak in pull request #26.
-      Phony.split('3025941234').should == ['30', '2594', '1234']
-      Phony.split('3022631234').should == ['30', '2263', '1234']
-    end
-    it 'handles hungarian numbers' do
-      Phony.split('3612345678').should == ['36', '1', '234', '5678']
-      Phony.split('3622123456').should == ['36', '22', '123', '456']
-    end
-    it 'handles icelandic numbers' do
-      Phony.split('354112').should == ['354', false, '112'] # Emergency TODO
-      Phony.split('3544211234').should == ['354', false, '421', '1234'] # Keflavík
-      Phony.split('3544621234').should == ['354', false, '462', '1234'] # Akureyri
-      Phony.split('3545511234').should == ['354', false, '551', '1234'] # Reykjavík
-    end
-    it 'handles irish numbers' do
-      Phony.split('35311234567').should  == ['353', '1', '123', '4567']  # Dublin, 7 digit subscriber #
-      Phony.split('3532212345').should   == ['353', '22', '12345']       # Mallow, 5 digit subscriber #
-      Phony.split('35345123456').should  == ['353', '45', '123456']      # Naas, 6 digit subscriber #
-      Phony.split('353801234567').should == ['353', '80', '123', '4567'] # Mobile
-      Phony.split('353761234567').should == ['353', '76', '123', '4567'] # VoIP
-      Phony.split('353800123456').should == ['353', '800', '123456']     # Freefone
-      Phony.split('353000123456').should == ['353', '000', '123456']     # Default fixed 3 split for unrecognized
-    end
-    it 'handles italian numbers' do
-      Phony.split('3934869528').should   == ['39', '3486', '952', '8']   # Mobile
-      Phony.split('390612341234').should == ['39', '06', '1234', '1234'] # Roma
-      Phony.split('390909709511').should == ['39', '090', '970', '9511'] # Barcellona
-    end
-    it 'handles kenyan numbers' do
-      Phony.split('254201234567').should == ['254', '20', '1234567'] # Nairobi
-      Phony.split('254111234567').should == ['254', '11', '1234567'] # Mombasa
-    end
-    it 'handles lithuanian numbers' do
-      Phony.split('37070012123').should == ['370', '700', '12', '123']     # Service
-      Phony.split('37061212123').should == ['370', '612', '12', '123']     # Mobile
-      Phony.split('37051231212').should == ['370', '5', '123', '12', '12'] # Vilnius
-      Phony.split('37037121212').should == ['370', '37', '12', '12', '12'] # Kaunas
-      Phony.split('37044011212').should == ['370', '440', '1', '12', '12'] # Skuodas
-    end
-    it 'handles malay numbers' do
-      Phony.split('6082123456').should == ['60', '82', '123456'] # Kuching
-      Phony.split('60312345678').should == ['60', '3', '12345678'] # Kuala Lumpur
-      Phony.split('60212345678').should == ['60', '2', '12345678'] # Singapore
-    end
-    it 'handles mexican numbers' do
-      Phony.split('525512121212').should == ['52', '55', '12', '12', '12', '12'] # Mexico City
-      Phony.split('526641231212').should == ['52', '664', '123', '12', '12'] # Tijuana
-    end
-    it 'handles norwegian numbers' do
+    describe 'Afghanistan' do
+      it_splits '93201234567', ['93', '20', '1234567'] # Kabul
+    end
+    describe 'Algeria' do
+      it_splits '213211231234', ['213', '21', '123', '1234'] # Algiers
+      it_splits '213331231234', ['213', '33', '123', '1234'] # Batna
+    end
+    describe 'Argentina' do
+      it_splits '541112345678', ['54', '11', '1234', '5678']
+      it_splits '542911234567', ['54', '291', '123', '4567']
+      it_splits '542965123456', ['54', '2965', '12', '3456']
+      it_splits '5491112345678', ['54', '911', '1234', '5678']
+      it_splits '5492201234567', ['54', '9220', '123', '4567']
+      it_splits '5492221123456', ['54', '92221', '12', '3456']
+    end
+    describe 'Austria' do
+      it_splits '43198110', ['43', '1', '98110']               # Vienna
+      it_splits '4366914093902', ['43', '669', '14093902']     # Mobile
+      it_splits '433161234567891', ['43', '316', '1234567891'] # Graz
+      it_splits '432164123456789', ['43', '2164', '123456789'] # Rohrau
+    end
+    describe 'Australia' do
+      it_splits '61512341234', ['61', '5', '1234', '1234'] # Landline
+      it_splits '61423123123', ['61', '423', '123', '123'] # Mobile
+    end
+    describe 'Belgium' do
+      it_splits '3235551212', ['32', '3', '555', '1212']   # Antwerpen
+      it_splits '32505551212', ['32', '50', '555', '1212'] # Brugge
+      it_splits '3225551212', ['32', '2', '555', '1212']   # Brussels
+      it_splits '3295551914', ['32', '9', '555', '1914']   # Gent
+      it_splits '3245551414', ['32', '4', '555', '1414']   # Liège
+      it_splits '3216473200', ['32', '16', '473', '200']   # Leuven
+      it_splits '32475279584', ['32', '475', '279584']     # mobile
+      it_splits '3270123123', ['32', '70', '123', '123']   # Bus Service?
+    end
+    describe 'Brazil' do
+      it_splits '551112341234', ['55', '11', '1234', '1234']
+    end
+    describe 'Chile' do
+      it_splits '5621234567', ['56', '2', '1234567']       # Santiago
+      it_splits '5675123456', ['56', '75', '123456']       # Curico
+      it_splits '56912345678', ['56', '9', '12345678']     # Mobile
+      it_splits '56137123456', ['56', '137', '123', '456'] # Service
+    end
+    describe 'China' do
+      it_splits '862112345678', ['86', '21', '1234', '5678']   # Shanghai
+      it_splits '8675582193447', ['86', '755', '8219', '3447'] # Shenzhen
+    end
+    describe 'Croatia' do
+      it_splits '385112312345', ['385', '1', '123', '12345'] # Zagreb
+      it_splits '385491231234', ['385', '49', '123', '1234'] # Krapina
+    end
+    describe 'Cuba' do
+      it_splits '5351231234', ['53', '5123', '1234'] # Mobile
+      it_splits '5371234567', ['53', '7', '1234567'] # Havana
+      it_splits '5342123456', ['53', '42', '123456'] # Villa Clara
+    end
+    describe 'Denmark' do
+      it_splits '4532121212', ['45', false, '32', '12', '12', '12']
+    end
+    describe 'Egypt' do
+      it_splits '20212345678', ['20', '2', '12345678']
+      it_splits '20921234567', ['20', '92', '1234567']
+      it_splits '20951234567', ['20', '95', '1234567']
+    end
+    describe 'Finland' do
+      it_splits '3589123123', ['358', '9', '123', '123'] # Helsinki
+      it_splits '3581912312', ['358', '19', '123', '12'] # Nylandia
+      it_splits '3585012312', ['358', '50', '123', '12'] # Mobile
+      it_splits '358600123',  ['358', '600', '123']      # Service
+    end
+    describe 'France' do
+      it_splits '33112345678', ['33', '1', '12','34','56','78'] # Paris
+      it_splits '33812345678', ['33', '8', '12','34','56','78'] # Service number
+    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
+    end
+    describe 'Ghana' do
+      it_splits '233302123456', ['233', '30', '212', '3456'] # Mobile Vodafone, Accra
+    end
+    describe 'Greece' do
+      it_splits '3021123456', ['30', '21', '123456']     # Athens
+      it_splits '3069512345', ['30', '695', '12345']     # Mobile
+      it_splits '302108131234', ['30', '21', '08131234'] # Long mobile, noted by vilcsak in pull request #26.
+      it_splits '3025941234', ['30', '2594', '1234']
+      it_splits '3022631234', ['30', '2263', '1234']
+    end
+    describe 'Hungary' do
+      it_splits'3612345678', ['36', '1', '234', '5678']
+      it_splits'3622123456', ['36', '22', '123', '456']
+    end
+    describe 'Iceland' do
+      it_splits '354112',     ['354', false, '112']         # Emergency TODO
+      it_splits '3544211234', ['354', false, '421', '1234'] # Keflavík
+      it_splits '3544621234', ['354', false, '462', '1234'] # Akureyri
+      it_splits '3545511234', ['354', false, '551', '1234'] # Reykjavík
+    end
+    describe 'Ireland' do
+      it_splits '35311234567',  ['353', '1', '123', '4567']  # Dublin, 7 digit subscriber #
+      it_splits '3532212345',   ['353', '22', '12345']       # Mallow, 5 digit subscriber #
+      it_splits '35345123456',  ['353', '45', '123456']      # Naas, 6 digit subscriber #
+      it_splits '353801234567', ['353', '80', '123', '4567'] # Mobile
+      it_splits '353761234567', ['353', '76', '123', '4567'] # VoIP
+      it_splits '353800123456', ['353', '800', '123456']     # Freefone
+      it_splits '353000123456', ['353', '000', '123456']     # Default fixed 3 split for unrecognized
+    end
+    describe 'Italy' do
+      it_splits '3934869528',   ['39', '3486', '952', '8']   # Mobile
+      it_splits '390612341234', ['39', '06', '1234', '1234'] # Roma
+      it_splits '390909709511', ['39', '090', '970', '9511'] # Barcellona
+    end
+    describe 'Kenya' do
+      it { Phony.split('254201234567').should == ['254', '20', '1234567'] } # Nairobi
+      it { Phony.split('254111234567').should == ['254', '11', '1234567'] } # Mombasa
+    end
+    describe 'Lithuania' do
+      it { Phony.split('37070012123').should == ['370', '700', '12', '123']     } # Service
+      it { Phony.split('37061212123').should == ['370', '612', '12', '123']     } # Mobile
+      it { Phony.split('37051231212').should == ['370', '5', '123', '12', '12'] } # Vilnius
+      it { Phony.split('37037121212').should == ['370', '37', '12', '12', '12'] } # Kaunas
+      it { Phony.split('37044011212').should == ['370', '440', '1', '12', '12'] } # Skuodas
+    end
+    describe 'Malaysia' do
+      it { Phony.split('6082123456').should == ['60', '82', '123456']   } # Kuching
+      it { Phony.split('60312345678').should == ['60', '3', '12345678'] } # Kuala Lumpur
+      it { Phony.split('60212345678').should == ['60', '2', '12345678'] } # Singapore
+    end
+    describe 'Mexico' do
+      it { Phony.split('525512121212').should == ['52', '55', '12', '12', '12', '12'] } # Mexico City
+      it { Phony.split('526641231212').should == ['52', '664', '123', '12', '12']     } # Tijuana
+    end
+    describe 'The Netherlands' do
+      it { Phony.split('31612345678').should == ['31', '6', '12345678'] } # mobile
+      it { Phony.split('31201234567').should == ['31', '20', '1234567'] } 
+      it { Phony.split('31222123456').should == ['31', '222', '123456'] } 
+    end
+    describe 'Norway' do
       Phony.split('4721234567').should == ['47',false,'21','23','45','67']
       Phony.split('4731234567').should == ['47',false,'31','23','45','67']
       Phony.split('4741234567').should == ['47',false,'412','34','567']
@@ -159,114 +163,122 @@ describe 'country descriptions' do
       Phony.split('4781234567').should == ['47',false,'812','34','567']
       Phony.split('4791234567').should == ['47',false,'912','34','567']
     end
-    it 'handles peruvian numbers' do
+    describe 'Peru' do
       Phony.split('51112341234').should == ['51', '1', '1234', '1234'] # Lima
       Phony.split('51912341234').should == ['51', '9', '1234', '1234'] # mobile
       Phony.split('51841234123').should == ['51', '84', '1234', '123'] # Cuzco, best effort
     end
-    it 'handles polish numbers' do
+    describe 'Poland' do
       Phony.split('48123456789').should == ['48', '12', '345', '67', '89'] # Landline
       Phony.split('48501123456').should == ['48', '501', '123', '456']     # Mobile
       Phony.split('48800123456').should == ['48', '800', '123', '456']     # Free
       Phony.split('48801123456').should == ['48', '801', '123', '456']     # Shared cost
       Phony.split('48701123456').should == ['48', '701', '123', '456']     # Premium
     end
-    it 'handles portuguese numbers' do
+    describe 'Portugal' do
       Phony.split('351211231234').should == ['351', '21', '123', '1234'] # Lisboa
       Phony.split('351241123123').should == ['351', '241', '123', '123'] # Abrantes
       Phony.split('351931231234').should == ['351', '93', '123', '1234'] # mobile
     end
-    it 'handles romanian numbers' do
-      Phony.split('40211231234').should == ['40', '21', '123', '1234'] # Bucureşti
-      Phony.split('40721231234').should == ['40', '72', '123', '1234'] # mobile
-      Phony.split('40249123123').should == ['40', '249', '123', '123'] # Olt
-    end
-    it 'handles russian numbers' do
-      Phony.split('78122345678').should == ['7', '812', '234', '56', '78'] # Russia 3-digit
-      Phony.split('74012771077').should == ['7', '4012', '77', '10', '77'] # Russia 4-digit
-      Phony.split('78402411212').should == ['7', '84024', '1', '12', '12'] # Russia 5-digit
-      Phony.split('7840121212').should  == ['7', '840', '12', '12', '12'] # Abhasia
-      Phony.split('7209175276').should  == ['7', '209', '17', '52', '76'] # Fantasy number
-    end
-    it 'handles south korean numbers' do
-      Phony.split('82212345678').should  == ['82', '2', '1234', '5678']   # Seoul
-      Phony.split('825112345678').should == ['82', '51', '1234', '5678'] # Busan
-      Phony.split('821027975588').should == ['82', '10', '2797', '5588'] # mobile
-      Phony.split('821087971234').should == ['82', '10', '8797', '1234'] # mobile
-    end
-    it 'handles thai numbers' do
-      Phony.split('6621231234').should == ['66', '2', '123', '1234'] # Bangkok
-      Phony.split('6636123123').should == ['66', '36', '123', '123'] # Lop Buri
-    end
-    it 'handles tunisian numbers' do
-      Phony.split('21611231234').should == ['216', '1', '123', '1234'] # Ariana
-      Phony.split('21621231234').should == ['216', '2', '123', '1234'] # Bizerte
-    end
-    it 'handles singaporean numbers' do
-      Phony.split('6561231234').should == ['65', false, '6123', '1234'] # Fixed line
-    end
-    it 'handles slovakian numbers' do
-      Phony.split('421912123456').should == ['421', '912', '123456'] # Mobile
-      Phony.split('421212345678').should == ['421', '2', '12345678'] # Bratislava
-      Phony.split('421371234567').should == ['421', '37', '1234567'] # Nitra / Other
-    end
-    it 'handles swedish numbers' do
-      Phony.split('46812345678').should == ['46', '8', '12345678'] # Stockholm
-      Phony.split('46111234567').should == ['46', '11', '1234567']
-      Phony.split('46125123456').should == ['46', '125', '123456']
-    end
-    it 'handles swiss numbers' do
-      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
-      Phony.split('255651231234').should == ['255', '65', '123', '1234'] # TIGO
-      Phony.split('255861123123').should == ['255', '861', '123', '123'] # Special Rates
-    end
-    it 'handles turkish numbers' do
-      Phony.split('903121234567').should == ['90', '312', '123', '4567'] # Ankara
-    end
-    it 'handles ugandan numbers' do
-      Phony.split('256414123456').should == ['256', '41', '4123456'] # Kampania
-      Phony.split('256464441234').should == ['256', '464', '441234'] # Mubende
-    end
-    it 'handles UK numbers' do
-      Phony.split('442075671113').should == ['44', '20', '7567', '1113'] # London
-      Phony.split('442920229901').should == ['44', '29', '2022', '9901'] # Cardiff
-      Phony.split('441134770011').should == ['44', '113', '477', '0011'] # Leeds
-      Phony.split('441412770011').should == ['44', '141', '277', '0011'] # Glasgow
-      Phony.split('441382229845').should == ['44', '1382', '229845'] # Dundee
-      Phony.split('441204500532').should == ['44', '1204', '500532'] # Bolton
-      Phony.split('44120462532').should  == ['44', '1204', '62532']  # Bolton
-      Phony.split('441539648756').should == ['44', '15396', '48756'] # Sedbergh
-      Phony.split('441697744555').should == ['44', '16977', '44555'] # Brampton
-      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('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('448084682355').should == ['44', '808', '468', '2355'] # Freefone
-      Phony.split('448005878323').should == ['44', '800', '587', '8323'] # Freefone, regression
-    end
-    it 'handles US numbers' do
-      Phony.split('15551115511').should == ['1', '555', '111', '5511']
-    end
-    it 'handles venezuelan numbers' do
-      Phony.split('582121234567').should == ['58', '212', '1234567']
-    end
-    it 'handles vietnamese numbers' do
-      Phony.split('8498123456').should == ['84', '98', '123456'] # Viettel Mobile
-      Phony.split('8499612345').should == ['84', '996', '12345'] # GTel
-      Phony.split('8441234567').should == ['84', '4', '1234567'] # Hanoi
-    end
-    it 'handles new zealand / kiwi numbers' do
-      Phony.split('6491234567').should == ['64', '9', '123', '4567']
+    describe 'Romania' do
+      it { Phony.split('40211231234').should == ['40', '21', '123', '1234'] } # Bucureşti
+      it { Phony.split('40721231234').should == ['40', '72', '123', '1234'] } # mobile
+      it { Phony.split('40249123123').should == ['40', '249', '123', '123'] } # Olt
+    end
+    describe 'Russia' do
+      it { Phony.split('78122345678').should == ['7', '812', '234', '56', '78'] } # Russia 3-digit
+      it { Phony.split('74012771077').should == ['7', '4012', '77', '10', '77'] } # Russia 4-digit
+      it { Phony.split('78402411212').should == ['7', '84024', '1', '12', '12'] } # Russia 5-digit
+      it { Phony.split('7840121212').should  == ['7', '840', '12', '12', '12']  } # Abhasia
+      it { Phony.split('7799121212').should  == ['7', '799', '12', '12', '12']  } # Kazachstan
+      it { Phony.split('7995344121212').should == ['7','995344','12','12','12'] } # South Osetia
+      it { Phony.split('7209175276').should  == ['7', '209', '17', '52', '76']  } # Fantasy number
+    end
+    describe 'South Korea' do
+      it { Phony.split('82212345678').should  == ['82', '2', '1234', '5678']  } # Seoul
+      it { Phony.split('825112345678').should == ['82', '51', '1234', '5678'] } # Busan
+      it { Phony.split('821027975588').should == ['82', '10', '2797', '5588'] } # mobile
+      it { Phony.split('821087971234').should == ['82', '10', '8797', '1234'] } # mobile
+    end
+    describe 'Thailand' do
+      it { Phony.split('6621231234').should == ['66', '2', '123', '1234'] } # Bangkok
+      it { Phony.split('6636123123').should == ['66', '36', '123', '123'] } # Lop Buri
+    end
+    describe 'Tunesia' do
+      it { Phony.split('21611231234').should == ['216', '1', '123', '1234'] } # Ariana
+      it { Phony.split('21621231234').should == ['216', '2', '123', '1234'] } # Bizerte
+    end
+    describe 'Singapore' do
+      it { Phony.split('6561231234').should == ['65', false, '6123', '1234'] } # Fixed line
+    end
+    describe 'Slovakia' do
+      it { Phony.split('421912123456').should == ['421', '912', '123456'] } # Mobile
+      it { Phony.split('421212345678').should == ['421', '2', '12345678'] } # Bratislava
+      it { Phony.split('421371234567').should == ['421', '37', '1234567'] } # Nitra / Other
+    end
+    describe 'Sweden' do
+      it { Phony.split('46812345678').should == ['46', '8', '12345678'] } # Stockholm
+      it { Phony.split('46111234567').should == ['46', '11', '1234567'] } 
+      it { Phony.split('46125123456').should == ['46', '125', '123456'] } 
+    end
+    describe 'Switzerland' do
+      it { Phony.split('41443643532').should == ['41', '44', '364', '35', '32'] } # Zurich (usually)
+      it { Phony.split('41800334455').should == ['41', '800', '334', '455'] }     # Service number
+    end
+    describe 'Tanzania' do
+      it { Phony.split('255221231234').should == ['255', '22', '123', '1234'] } # Dar Es Salaam
+      it { Phony.split('255651231234').should == ['255', '65', '123', '1234'] } # TIGO
+      it { Phony.split('255861123123').should == ['255', '861', '123', '123'] } # Special Rates
+    end
+    describe 'Turkey' do
+      it { Phony.split('903121234567').should == ['90', '312', '123', '4567'] } # Ankara
+    end
+    describe 'Uganda' do
+      it { Phony.split('256414123456').should == ['256', '41', '4123456'] } # Kampania
+      it { Phony.split('256464441234').should == ['256', '464', '441234'] } # Mubende
+    end
+    describe 'The UK' do
+      it { Phony.split('442075671113').should == ['44', '20', '7567', '1113'] } # London
+      it { Phony.split('442920229901').should == ['44', '29', '2022', '9901'] } # Cardiff
+      it { Phony.split('441134770011').should == ['44', '113', '477', '0011'] } # Leeds
+      it { Phony.split('441412770022').should == ['44', '141', '277', '0022'] } # Glasgow
+      it { Phony.split('441204500532').should == ['44', '1204', '500532'] }     # Bolton
+      it { Phony.split('44120462532').should  == ['44', '1204', '62532']  }     # Bolton
+      it { Phony.split('441382229845').should == ['44', '1382', '229845'] }     # Dundee
+      it { Phony.split('441539248756').should == ['44', '1539', '248756'] }     # Kendal
+      it { Phony.split('441539648788').should == ['44', '15396', '48788'] }     # Sedbergh
+      it { Phony.split('441697222555').should == ['44', '1697', '222555'] }     # Brampton
+      it { Phony.split('441697388555').should == ['44', '16973', '88555'] }     # Wigton
+      it { Phony.split('44169772333').should  == ['44', '16977', '2333']  }     # Brampton
+      it { Phony.split('441697744888').should == ['44', '16977', '44888'] }     # Brampton
+      it { Phony.split('441946555777').should == ['44', '1946', '555777']  }    # Whitehaven
+      it { Phony.split('44194662888').should  == ['44', '1946', '62888']  }     # Whitehaven
+      it { Phony.split('441946722444').should == ['44', '19467', '22444']  }    # Gosforth 
+      it { Phony.split('443005878323').should == ['44', '300', '587', '8323'] } # Non-geographic
+      it { Phony.split('443457777334').should == ['44', '345', '777', '7334'] } # Non-geographic
+      it { Phony.split('44500557788').should  == ['44', '500', '557788'] }      # Freefone 500 + 6
+      it { Phony.split('445575671113').should == ['44', '55', '7567', '1113'] } # Corporate
+      it { Phony.split('445644775533').should == ['44', '56', '4477', '5533'] } # LIECS/VoIP
+      it { Phony.split('447020229901').should == ['44', '70', '2022', '9901'] } # Personal numbers
+      it { Phony.split('447780605207').should == ['44', '7780', '605207'] }     # Mobile
+      it { Phony.split('447480605207').should == ['44', '7480', '605207'] }     # Mobile
+      it { Phony.split('44800557788').should  == ['44', '800', '557788']  }     # Freefone 800 + 6
+      it { Phony.split('448084682355').should == ['44', '808', '468', '2355'] } # Freefone
+      it { Phony.split('448005878323').should == ['44', '800', '587', '8323'] } # Freefone, regression
+    end
+    describe 'US' do
+      it { Phony.split('15551115511').should == ['1', '555', '111', '5511'] }
+    end
+    describe 'Venezuela' do
+      it { Phony.split('582121234567').should == ['58', '212', '1234567'] }
+    end
+    describe 'Vietnam' do
+      it { Phony.split('8498123456').should == ['84', '98', '123456'] } # Viettel Mobile
+      it { Phony.split('8499612345').should == ['84', '996', '12345'] } # GTel
+      it { Phony.split('8441234567').should == ['84', '4', '1234567'] } # Hanoi
+    end
+    describe 'New Zealand' do
+      it { Phony.split('6491234567').should == ['64', '9', '123', '4567'] }
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phony
 version: !ruby/object:Gem::Version
-  version: 1.7.10
+  version: 1.7.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-20 00:00:00.000000000 Z
+date: 2012-08-24 00:00:00.000000000 Z
 dependencies: []
 description: ! 'Fast international phone number (E164 standard) normalizing, splitting
   and formatting. Lots of formatting options: International (+.., 00..), national