phony 1.6.0 → 1.6.1

data/lib/phony/country_codes.rb

@@ -22,10 +22,11 @@ module Phony
       @instance ||= new
     end
 
+    @@normalizing_pattern = /^0+|\D/
     def normalize number
       # Remove non-digit chars.
       #
-      number.gsub! /\D*/, EMPTY_STRING
+      number.gsub! @@normalizing_pattern, EMPTY_STRING
       national_handler, cc, rest = split_cc number
       @normalize_format % [cc, national_handler.normalize(rest)]
     end

data/lib/phony/national_code.rb

@@ -1,9 +1,9 @@
 module Phony
-  
+
   # NationalCodes have a special numbers splitter, a national code splitter and a local code splitter.
   #
   class NationalCode
-    
+
     #
     #
     def initialize national_splitter, local_splitter, normalize = nil
@@ -11,7 +11,7 @@ module Phony
       @local_splitter    = local_splitter
       @normalize         = normalize != false
     end
-    
+
     # Split gets a number without country code and splits it into
     # its parts.
     #
@@ -20,7 +20,7 @@ module Phony
       return ndc unless rest
       [ndc, *@local_splitter.split(rest)]
     end
-    
+
     # Split gets a number without country code and removes a relative zero.
     #
     # Note: Some cases, like Italy, don't remove the relative zero.
@@ -29,7 +29,7 @@ module Phony
       return national_number unless @normalize
       national_number.gsub(/^0+/, '')
     end
-    
+
   end
-  
+
 end

data/spec/lib/phony/countries_spec.rb

@@ -86,6 +86,7 @@ describe 'country descriptions' do
     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

data/spec/lib/phony_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe Phony do
-  
+
   describe 'nil cases' do
     it "should raise on normalize nil" do
       expect {
@@ -21,7 +21,7 @@ describe Phony do
       }.to raise_error(ArgumentError, "Phone number cannot be nil. Use e.g. number && Phony.split(number).")
     end
   end
-  
+
   describe "normalize" do
     describe "some examples" do
       it "should normalize an already normalized number" do
@@ -30,8 +30,8 @@ describe Phony do
       it "should normalize a format number" do
         Phony.normalize('+41 44 364 35 33').should == '41443643533'
       end
-      it "should normalize a format number" do
-        Phony.normalize('+41 44 364 35 33').should == '41443643533'
+      it "should normalize a 00 number" do
+        Phony.normalize('0041 44 364 35 33').should == '41443643533'
       end
       it "should normalize a service number" do
         Phony.normalize('+41 800 11 22 33').should == '41800112233'
@@ -59,13 +59,13 @@ describe Phony do
       end
     end
   end
-  
+
   describe 'formatted' do
     it 'is an alias of format' do
       Phony.formatted('41443643532').should == '+41 44 364 35 32'
     end
   end
-  
+
   describe "format" do
     describe "default" do
       it "should format swiss numbers" do
@@ -182,7 +182,7 @@ describe Phony do
       end
     end
   end
-  
+
   context 'minimal cases' do
     context 'normalizing' do
       it 'handles completely crazy "numbers"' do
@@ -217,7 +217,7 @@ describe Phony do
       end
     end
   end
-  
+
   context "speed" do
     before(:each) do
       @phone_numbers = [
@@ -256,7 +256,7 @@ describe Phony do
       end
     end
   end
-  
+
   describe 'vanity' do
     describe 'vanity_number?' do
       it {Phony.vanity?('41800 WEGGLI').should be_true}
@@ -266,7 +266,7 @@ describe Phony do
       it {Phony.vanity?('41900 KURZ').should be_false}
       it {Phony.vanity?('41 44 364 35 32').should be_false}
     end
-    
+
     describe 'vanity_to_number' do
       it {Phony.vanity_to_number('41800WEGGLI').should == '41800934454'}
       it {Phony.vanity_to_number('41800weggli').should == '41800934454'}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phony
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-26 00:00:00.000000000 +11:00
-default_executable: 
+date: 2011-11-25 00:00:00.000000000 Z
 dependencies: []
 description: ! 'Fast international phone number (E164 standard) normalizing, splitting
   and formatting. Lots of formatting options: International (+.., 00..), national
@@ -59,7 +58,6 @@ files:
 - spec/lib/phony/national_splitters/variable_spec.rb
 - spec/lib/phony/vanity_spec.rb
 - spec/lib/phony_spec.rb
-has_rdoc: true
 homepage: http://github.com/floere/phony
 licenses: []
 post_install_message: 
@@ -80,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Fast international phone number (E164 standard) normalizing, splitting and