phony 1.2.9 → 1.2.10

data/README.textile

@@ -7,8 +7,8 @@ This gem can normalize, format and split E164 numbers.
 
 The (admittedly crazy) *goal* of this Gem is to be able to format/split all phone numbers in the world.
 
-Currently handles Afghan, Austrian, Australian, Belgian, Brazilian, Chilean, Chinese, Czech, Danish, Dutch, Egyptian, French, German, Greek, Hungarian, Italian, Malaysian, (The) Netherlands, New Zealand, Norwegian, Peruvian, Polish, Russian, Romanian, South African, South Korean, Spanish, Swedish, Swiss, Turkish, Liechtenstein, US, Venezuelan numbers.
-And to some extend, all others. Just try if it works for you.
+Currently handles Afghan, Austrian, Australian, Belgian, Brazilian, Chilean, Chinese, Czech, Danish, Dutch, Egyptian, French, German, Greek, Hungarian, Italian, Malaysian, (The) Netherlands, New Zealand, Norwegian, Peruvian, Polish, Russian, Romanian, South African, South Korean, Spanish, Swedish, Swiss, Turkish, Liechtenstein, UK, US, and Venezuelan numbers.
+And to some extent, all others. Just try if it works for you.
 
 If it doesn't, please "enter an issue":http://github.com/floere/phony/issues.
 

data/lib/phony/countries/all_other.rb

@@ -72,7 +72,7 @@ module Phony
                         # }
                   ),
           '43' => Countries::Austria,
-          '44' => fixed(2), # TODO United Kingdom of Great Britain and Northern Ireland
+          '44' => Countries::UnitedKingdom, # TODO United Kingdom of Great Britain and Northern Ireland
           '45' => fixed(2,  # Denmark
                         :local_format => [2, 2, 2],
                         :service_ndcs => %w{112 114}

data/lib/phony/countries/united_kingdom.rb

@@ -0,0 +1,105 @@
+# 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 6.
+#
+# The UK is special in formatting in that it uses a 4-4, or 3-4 formatting rule with area
+# codes that are 2 or 3 digits long, and a 6 formatting rule with area codes that are 4-6 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.
+#
+handlers = []
+
+area_code_2_national = Phony::NationalSplitters::Variable.new nil, :landline => [
+  '20',   # London
+  '23',   # Southampton, Portsmith
+  '24',   # Coventry
+  '28',   # Northern Ireland
+  '29',   # Cardiff 
+]
+area_code_2_local    = Phony::LocalSplitter.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, :landline => [
+  # Geographical.
+  #
+  '113',  # Leeds
+  '114',  # Sheffield	
+  '115',  # Nottingham	
+  '116',  # Leicester	
+  '117',  # Bristol	
+  '118',  # Reading
+  '121',  # Birmingham
+  '131',  # Edinburgh
+  '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.
+  #
+  '800', # Freephone
+  '808', # Freephone
+  '842',
+  '843',
+  '844',
+  '845', 
+  '870',
+  '871',
+  '872',
+  '873',
+  '900', # Premium rate content services
+  '908', # Sexual entertainment services
+  '909', # Sexual entertainment services
+  '982', # Sexual entertainment services
+]
+area_code_3_local    = Phony::LocalSplitter.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, :landline => [
+  # Geographical.
+  #
+  '1204', # Bolton
+  '1224', # Aberdeen
+  '1244', # Chester
+  '1382', # Dundee
+  '1429', # Hartlepool
+  '1482', # Hull
+  '1527', # Redditch	
+  '1582', # Luton
+  '1670', # Morpeth
+  '1730', # Petersfield
+  '1736', # Penzance
+  '1750', # Selkirk
+  '1772', # Preston
+  '1853', # Ullapool
+  '1900', # Workington
+  '1946', # Whitehaven
+  '1947', # Whitby
+  # Mobile.
+  #
+  ('7400'..'7599').to_a,
+  '7624',
+  ('7700'..'7999').to_a,
+  # Geographical.
+  #
+  '13873', # Langholm
+  '15242', # Hornby
+  '15394', # Hawkshead
+  '15395', # Grange-over-Sands
+  '15396', # Sedbergh
+  '16973', # Wigton
+  '16974', # Raughton Head
+  '16977', # Brampton[3][4]
+  '17683', # Appleby
+  '17684', # Pooley Bridge
+  '17687', # Keswick
+  '19467', # Gosforth
+]
+area_code_45_local    = Phony::LocalSplitter.instance_for [6]
+handlers             << Phony::NationalCode.new(area_code_45_national, area_code_45_local)
+
+Phony::Countries::UnitedKingdom = Phony::Country.new *handlers

data/lib/phony/country.rb

@@ -4,21 +4,19 @@ module Phony
   #
   class Country
     
-    def initialize national_code, special_code = nil, mobile_code = nil
-      @national_code = national_code
-      @special_code  = special_code
-      @mobile_code   = mobile_code
+    # 
+    #
+    def initialize *codes
+      @codes = codes
     end
     
-    #
+    # A number is split with the code handlers as given in the initializer.
     #
     def split national_number
-      ndc, *rest = @special_code.split national_number if @special_code
-      return [ndc, *rest] if rest && !rest.empty?
-      ndc, *rest = @mobile_code.split national_number if @mobile_code
-      return [ndc, *rest] if rest && !rest.empty?
-      ndc, *rest = @national_code.split national_number
-      [ndc, *rest]
+      @codes.each do |code|
+        ndc, *rest = code.split national_number
+        return [ndc, *rest] if rest && !rest.empty?
+      end
     end
     
     # Removes 0s from partially normalized numbers
@@ -30,11 +28,10 @@ module Phony
     # In some cases it doesn't, like Italy.
     #
     def normalize national_number
-      normalized = @special_code.normalize national_number if @special_code
-      return normalized if normalized && !normalized.empty?
-      normalized = @mobile_code.normalize national_number if @mobile_code
-      return normalized if normalized && !normalized.empty?
-      @national_code.normalize national_number
+      @codes.each do |code|
+        normalized = code.normalize national_number
+        return normalized if normalized && !normalized.empty?
+      end
     end
     
     # Is this national number a vanity number?
@@ -74,23 +71,25 @@ module Phony
       ndc_fallback_length  = options[:ndc_fallback_length]
       ndc_mapping          = options[:ndc_mapping] || raise("No ndc_mapping given!")
       
-      national_splitter = Phony::NationalSplitters::Variable.new ndc_fallback_length, ndc_mapping
-      local_splitter    = Phony::LocalSplitter.instance_for options[:local_format] || [3, 2, 2]
-      national_code     = Phony::NationalCode.new national_splitter, local_splitter, normalize
+      codes = []
       
       if ndc_mapping[:service]
         service_national_splitter = Phony::NationalSplitters::Variable.new nil, :service => ndc_mapping[:service]
         service_local_splitter    = Phony::LocalSplitter.instance_for options[:service_local_format] || [3, 6]
-        service_code              = Phony::NationalCode.new service_national_splitter, service_local_splitter, normalize
+        codes                    << Phony::NationalCode.new(service_national_splitter, service_local_splitter, normalize)
       end
       if ndc_mapping[:mobile]
         mobile_local_format      = options[:mobile_local_format] || options[:local_format] || [9]
         mobile_national_splitter = Phony::NationalSplitters::Variable.new nil, :mobile => ndc_mapping[:mobile]
         mobile_local_splitter    = Phony::LocalSplitter.instance_for mobile_local_format
-        mobile_code              = Phony::NationalCode.new mobile_national_splitter, mobile_local_splitter, normalize
+        codes                   << Phony::NationalCode.new(mobile_national_splitter, mobile_local_splitter, normalize)
       end
       
-      new national_code, service_code, mobile_code
+      national_splitter = Phony::NationalSplitters::Variable.new ndc_fallback_length, ndc_mapping
+      local_splitter    = Phony::LocalSplitter.instance_for options[:local_format] || [3, 2, 2]
+      codes            << Phony::NationalCode.new(national_splitter, local_splitter, normalize)
+      
+      new *codes
     end
     
     # Gets a configured country instance with fixed length ndc code.
@@ -110,19 +109,20 @@ module Phony
       service_ndcs = options[:service_ndcs]
       local_format = options[:local_format]
       
-      national_splitter = Phony::NationalSplitters::Fixed.new ndc_length
-      local_splitter    = Phony::LocalSplitter.instance_for local_format || [3, 2, 2]
-      national_code     = Phony::NationalCode.new national_splitter, local_splitter, normalize
+      codes = []
       
-      service_code = nil
       if service_ndcs
         service_local_format      = options[:service_local_format] || local_format || [3, 3]
         service_national_splitter = Phony::NationalSplitters::Variable.new nil, :service => service_ndcs
         service_local_splitter    = Phony::LocalSplitter.instance_for service_local_format
-        service_code              = Phony::NationalCode.new service_national_splitter, service_local_splitter, normalize
+        codes                    << Phony::NationalCode.new(service_national_splitter, service_local_splitter, normalize)
       end
       
-      new national_code, service_code
+      national_splitter = Phony::NationalSplitters::Fixed.new ndc_length
+      local_splitter    = Phony::LocalSplitter.instance_for local_format || [3, 2, 2]
+      codes            << Phony::NationalCode.new(national_splitter, local_splitter, normalize)
+      
+      new *codes
     end
     
   end

data/lib/phony.rb

@@ -28,6 +28,7 @@ require File.expand_path '../phony/countries/portugal', __FILE__
 require File.expand_path '../phony/countries/romania', __FILE__
 require File.expand_path '../phony/countries/south_korea', __FILE__
 require File.expand_path '../phony/countries/sweden', __FILE__
+require File.expand_path '../phony/countries/united_kingdom', __FILE__
 
 require File.expand_path '../phony/country_codes', __FILE__
 

data/spec/lib/phony/countries/belgium_spec.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 #
+
 require 'spec_helper'
 
 describe Phony::Countries::Belgium do

data/spec/lib/phony/countries/united_kingdom_spec.rb

@@ -0,0 +1,50 @@
+require 'spec_helper'
+
+describe Phony::Countries::UnitedKingdom do
+  
+  before(:each) do
+    @uk = Phony::Countries::UnitedKingdom
+  end
+  
+  # Note: Many Specs
+  #
+  describe "split" do
+    it "should handle London" do
+      @uk.split('2045671113').should == ['20', '4567', '1113']
+    end
+    it "should handle Cardiff" do
+      @uk.split('2076229901').should == ['20', '7622', '9901']
+    end
+    it "should handle Leeds" do
+      @uk.split('1136770011').should == ['113', '677', '0011']
+    end
+    it "should handle Dundee" do
+      @uk.split('1382229845').should == ['1382', '229845']
+    end
+    it "should handle Bolten" do
+      @uk.split('120499532').should == ['1204', '99532']
+    end
+    it "should handle Sedbergh" do
+      @uk.split('1539618756').should ==['15396', '18756']
+    end
+    it "should handle Mobile Numbers" do
+      @uk.split('7780605207').should == ['7780', '605207']
+    end
+    it "should handle Mobile Numbers" do
+      @uk.split('7480605207').should == ['7480', '605207']
+    end
+    it "should handle service numbers with 800 [regression]" do
+      @uk.split('8005878323').should == ['800', '587', '8323']
+    end
+    #
+    # 44 116 xxx xxxx Leicester
+    # 44 131 xxx xxxx Edinburgh
+    # 44 151 xxx xxxx Liverpool
+    # 44 1382  xxxxxx Dundee
+    # 44 1386  xxxxxx Evesham
+    # 44 1865  xxxxxx Oxford
+    # 44 153 96 xxxxx Sedbergh
+    # 44 169 77  xxxx Brampton
+  end
+  
+end

data/spec/lib/phony/country_spec.rb

@@ -73,15 +73,15 @@ describe Phony::Country do
   
   context "without special cases" do
     before(:each) do
-      national_splitter         = Phony::NationalSplitters::Variable.new 4, { :normal => ['44'] }
-      local_splitter            = Phony::LocalSplitter.instance_for [3, 2, 2]
-      national_code             = Phony::NationalCode.new national_splitter, local_splitter
-      
       special_national_splitter = Phony::NationalSplitters::Variable.new nil, { :service => ['800'] }
       special_local_splitter    = Phony::LocalSplitter.instance_for [3, 3]
       special_code              = Phony::NationalCode.new special_national_splitter, special_local_splitter
       
-      @switzerland              = Phony::Country.new national_code, special_code
+      national_splitter         = Phony::NationalSplitters::Variable.new 4, { :normal => ['44'] }
+      local_splitter            = Phony::LocalSplitter.instance_for [3, 2, 2]
+      national_code             = Phony::NationalCode.new national_splitter, local_splitter
+      
+      @switzerland              = Phony::Country.new special_code, national_code
     end
     
     describe "split" do

data/spec/lib/phony_spec.rb

@@ -73,7 +73,7 @@ describe Phony do
       Phony.split('51912341234').should == ['51', '9', '1234', '1234'] # mobile
       Phony.split('51841234123').should == ['51', '84', '1234', '123'] # Cuzco, best effort
     end
-    it "should handle polish numbers" do
+    it "handles polish numbers" do
       Phony.split('48123123123').should == ['48', '123', '123', '123']
     end
     it 'handles portuguese numbers' do

metadata

@@ -2,7 +2,7 @@
 name: phony
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.2.9
+  version: 1.2.10
 platform: ruby
 authors: 
 - Florian Hanke
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-03 00:00:00 +01:00
+date: 2011-02-13 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -40,6 +40,7 @@ files:
 - lib/phony/countries/romania.rb
 - lib/phony/countries/south_korea.rb
 - lib/phony/countries/sweden.rb
+- lib/phony/countries/united_kingdom.rb
 - lib/phony/country.rb
 - lib/phony/country_codes.rb
 - lib/phony/local_splitter.rb
@@ -57,6 +58,7 @@ files:
 - spec/lib/phony/countries/hungary_spec.rb
 - spec/lib/phony/countries/portugal_spec.rb
 - spec/lib/phony/countries/switzerland_spec.rb
+- spec/lib/phony/countries/united_kingdom_spec.rb
 - spec/lib/phony/country_codes_spec.rb
 - spec/lib/phony/country_spec.rb
 - spec/lib/phony/local_splitter_spec.rb
@@ -102,6 +104,7 @@ test_files:
 - spec/lib/phony/countries/hungary_spec.rb
 - spec/lib/phony/countries/portugal_spec.rb
 - spec/lib/phony/countries/switzerland_spec.rb
+- spec/lib/phony/countries/united_kingdom_spec.rb
 - spec/lib/phony/country_codes_spec.rb
 - spec/lib/phony/country_spec.rb
 - spec/lib/phony/local_splitter_spec.rb