phony 1.2.6 → 1.2.7

data/lib/phony/countries/italy.rb

@@ -4,6 +4,7 @@
 #
 Phony::Countries::Italy = Phony::Country.configured :local_format => [3, 4],
   :local_special_format => [3, 3],
+  :normalize => false,
   :ndc_fallback_length => 3,
   :ndc_mapping => {
     :landline => [

data/lib/phony/country.rb

@@ -17,6 +17,20 @@ module Phony
       [ndc, *rest]
     end
     
+    # Removes 0s from partially normalized numbers
+    # such as 410443643533.
+    # 
+    # Example:
+    #   410443643533 -> 41443643533
+    #
+    # In some cases it doesn't, like Italy.
+    #
+    def normalize national_number
+      normalized = @special_code.normalize national_number if @special_code
+      normalized = @national_code.normalize national_number unless normalized && !normalized.empty?
+      normalized
+    end
+    
     # Is this national number a vanity number?
     #
     def vanity? national_number
@@ -50,17 +64,18 @@ module Phony
     # If that is not the case, I will expand the framework.
     #
     def self.configured options = {}
+      normalize            = options[:normalize]
       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
+      national_code     = Phony::NationalCode.new national_splitter, local_splitter, normalize
       
       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
+        service_code              = Phony::NationalCode.new service_national_splitter, service_local_splitter, normalize
       end
       
       new national_code, service_code
@@ -78,20 +93,21 @@ module Phony
     #                       :service_ndcs         => ['800']
     #
     def self.fixed options = {}
+      normalize    = options[:normalize]
       ndc_length   = options[:ndc_length]
       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
+      national_code     = Phony::NationalCode.new national_splitter, local_splitter, normalize
       
       service_code = nil
       if service_ndcs
         service_local_format      = options[:service_local_format] || local_format
         service_national_splitter = Phony::NationalSplitters::Variable.new nil, :service => service_ndcs
         service_local_splitter    = Phony::LocalSplitter.instance_for service_local_format || [3, 3]
-        service_code              = Phony::NationalCode.new service_national_splitter, service_local_splitter
+        service_code              = Phony::NationalCode.new service_national_splitter, service_local_splitter, normalize
       end
       
       new national_code, service_code

data/lib/phony/country_codes.rb

@@ -8,7 +8,8 @@ module Phony
       # Remove non-digit chars.
       #
       number.gsub! /\D*/, ''
-      remove_relative_zeros! number
+      national_handler, cc, rest = split_cc number
+      '%s%s' % [cc, national_handler.normalize(rest)]
     end
     
     # Splits this number into cc, ndc and locally split number parts.
@@ -79,17 +80,6 @@ module Phony
       # This line is never reached as CCs are in prefix code.
     end
     
-    # Removes 0s from partially normalized numbers
-    # such as 410443643533.
-    # 
-    # Example:
-    #   410443643533 -> 41443643533
-    #
-    def remove_relative_zeros! phone_number
-      _, cc, rest = split_cc phone_number
-      '%s%s' % [cc, rest].collect! { |code| code.gsub(/^0+/, '') }
-    end
-    
     # Cached mapping of all countries.
     #
     def mapping

data/lib/phony/national_code.rb

@@ -8,9 +8,10 @@ module Phony
     
     #
     #
-    def initialize national_splitter, local_splitter
+    def initialize national_splitter, local_splitter, normalize = nil
       @national_splitter = national_splitter
       @local_splitter    = local_splitter
+      @normalize         = !(normalize == false) # if nil, true (default), if false, false, if true, true.
     end
     
     # Split gets a number without country code and splits it into
@@ -22,6 +23,15 @@ module Phony
       [ndc, *@local_splitter.split(rest)]
     end
     
+    # Split gets a number withou country code and removes a relative zero.
+    #
+    # Note: Some cases, like Italy, don't remove the relative zero.
+    #
+    def normalize national_number
+      return national_number unless @normalize
+      national_number.gsub(/^0+/, '')
+    end
+    
   end
   
 end

data/spec/lib/phony/country_codes_spec.rb

@@ -12,12 +12,6 @@ describe Phony::CountryCodes do
     end
   end
   
-  describe 'remove_relative_zeros' do
-    it "should remove an ndc zero from an almost normalized number and return it" do
-      @countries.remove_relative_zeros!('410443643533').should == '41443643533'
-    end
-  end
-  
   describe 'formatted' do
     it 'formats correctly' do
       @countries.formatted('41443643532', :format => :international, :spaces => :-).should == '+41-44-364-35-32'

data/spec/lib/phony/country_spec.rb

@@ -63,6 +63,11 @@ describe Phony::Country do
         @switzerland.split('443643532').should == ['44', '364', '35', '32']
       end
     end
+    describe 'normalize' do
+      it "should handle ZH" do
+        @switzerland.normalize('0443643532').should == '443643532'
+      end
+    end
   end
   
   context "without special cases" do

data/spec/lib/phony/national_code_spec.rb

@@ -16,6 +16,12 @@ describe Phony::NationalCode do
       it 'splits correctly' do
         @national.split('44364353').should == ['44', '364', '35', '3']
       end
+      it 'normalizes correctly' do
+        @national.normalize('044364353').should == '44364353'
+      end
+      it 'normalizes correctly' do
+        @national.normalize('44364353').should == '44364353'
+      end
     end
     context 'with fixed ndc (French)' do
       before(:each) do
@@ -30,6 +36,42 @@ describe Phony::NationalCode do
       it 'splits correctly' do
         @national.split('14227818').should == ['1', '42', '27', '81', '8']
       end
+      it 'normalizes correctly' do
+        @national.normalize('0142278186').should == '142278186'
+      end
+      it 'normalizes correctly' do
+        @national.normalize('142278186').should == '142278186'
+      end
+    end
+    context 'normalizing' do
+      context 'false' do
+        before(:each) do
+          @national = Phony::NationalCode.new nil, nil, false
+        end
+        it 'normalizes an italian case correctly' do
+          @national.normalize('0909709511').should == '0909709511'
+        end
+      end
+      context 'true' do
+        before(:each) do
+          national_splitter = Phony::NationalSplitters::Fixed.instance_for 2
+          local_splitter    = Phony::LocalSplitter.instance_for [3, 2, 2]
+          @national = Phony::NationalCode.new national_splitter, local_splitter, true
+        end
+        it 'normalizes a swiss case correctly' do
+          @national.normalize('044364353').should == '44364353'
+        end
+      end
+      context 'nil (true)' do
+        before(:each) do
+          national_splitter = Phony::NationalSplitters::Fixed.instance_for 2
+          local_splitter    = Phony::LocalSplitter.instance_for [3, 2, 2]
+          @national = Phony::NationalCode.new national_splitter, local_splitter, nil
+        end
+        it 'normalizes a swiss case correctly' do
+          @national.normalize('044364353').should == '44364353'
+        end
+      end
     end
   end
   

data/spec/lib/phony_spec.rb

@@ -155,6 +155,9 @@ describe Phony do
       it "should normalize a number with erroneous zero inside" do
         Phony.normalize('+410443643533').should == '41443643533'
       end
+      it "should not normalize a number with a correct zero inside" do
+        Phony.normalize('+390909709511').should == '390909709511'
+      end
     end
   end
   

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 2
-  - 6
-  version: 1.2.6
+  - 7
+  version: 1.2.7
 platform: ruby
 authors: 
 - Florian Hanke