phony 2.12.8 → 2.12.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4fa0e706a618d0a9b1a60f0256ad496743c52235
-  data.tar.gz: a483882673bc99b4d88b82ffadad0cc7465557b7
+  metadata.gz: 6e3d86e7298e2ebf5c621f7cabbafdb706863231
+  data.tar.gz: 90e5956221c59daa70fad43fef10c300f9525f8d
 SHA512:
-  metadata.gz: fda7a75e5097c61a0df6a60fc254be719e0f2157dbd57c3ce45d96972fd13835773ba2b79e2a52f073a01bd81e4196ae3c8a4b607fe98144f621d615841ac585
-  data.tar.gz: ed85fd7b00cd8a7ae12185e272fb483380ece8e52fc32f7c6a7e6432973f0df94e75bafde1d6533cc3546a8e19ff218db332a0bb0ad8a45c4d4f68da7a92ec4c
+  metadata.gz: 05c9832e7d1de23aa9114cbc1998859dc1c29e8a69b8281b890dd134aa7b2a7efafe5e888548a4034c477c3e3240ffde87e67c6ccfcf401feca97fb3046db692
+  data.tar.gz: 14e74fd73e52ef533f39443d2a4d02fbe20ceae43076a28203c6d35c0d8356e7f61f27c32590c484ea361b995549b12b369e8cfabe34d9ea312e5cbd2e5d2dad

data/lib/phony/country.rb

@@ -56,7 +56,7 @@ module Phony
 
     # Cleans all non-numeric characters.
     #
-    @@basic_cleaning_pattern = /\(0\)|\D/
+    @@basic_cleaning_pattern = /\(0|\D/
     # Clean number of all non-numeric characters and return a copy.
     #
     def clean number

data/lib/phony/country_codes.rb

@@ -28,15 +28,15 @@ module Phony
       countries[cc.size][cc]
     end
 
-    # Clean number of all non-numeric characters, initial zeros or (0).
+    # Clean number of all non-numeric characters, initial zeros or (0.
     #
-    @@basic_cleaning_pattern = /\A00?|\(0\)|\D/
-    # Clean number of all non-numeric characters, initial zeros or (0) and return it.
+    @@basic_cleaning_pattern = /\A00?|\(0|\D/
+    # Clean number of all non-numeric characters, initial zeros or (0 and return it.
     #
     def clean number
       clean! number && number.dup
     end
-    # Clean number of all non-numeric characters, initial zeros or (0) and return a copy.
+    # Clean number of all non-numeric characters, initial zeros or (0 and return a copy.
     #
     def clean! number
       number.gsub!(@@basic_cleaning_pattern, EMPTY_STRING) || number

data/spec/functional/format_spec.rb

@@ -2,203 +2,140 @@ require 'spec_helper'
 
 describe 'Phony#format' do
 
-  describe 'formatted' do
-    it 'is an alias of format' do
-      Phony.formatted('41443643532').should eql '+41 44 364 35 32'
-    end
-  end
-
-  describe 'with templates' do
-    it 'handles a basic template correctly' do
-      Phony.format('41443643532', :format => 'A%{cc}B%{ndc}C%{local}').should eql 'A41B44C364 35 32'
-    end
-    it 'handles a funky template correctly' do
-      Phony.format('41443643532', :format => '%{local}%{ndc}%{cc}', :local_spaces => '').should eql '36435324441'
-    end
-    it 'handles local_spaces correctly' do
-      Phony.format('41443643532', :format => 'A%{cc}B%{ndc}C%{local}', :local_spaces => '/').should eql 'A41B44C364/35/32'
-    end
-    it 'handles a russian example correctly' do
-      # https://github.com/floere/phony/issues/214
-      Phony.format('71234567890', :format => '(+%{cc} %{ndc}) %{local}', :local_spaces => '-').should eql '(+7 123) 45-67890'
-    end
-  end
-
   describe 'cases' do
-
-    describe 'exceptions' do
+    describe 'Exceptions' do
       it 'raises on nil' do
         expect {
           Phony.format nil
         }.to raise_error(ArgumentError, 'Phone number cannot be nil. Use e.g. number && Phony.format(number).')
       end
     end
-    describe 'default' do
-      it 'formats Swiss numbers' do
-        Phony.format('41443643532').should eql '+41 44 364 35 32'
-      end
-      it 'formats Swiss national numbers' do
-        Phony.format('41443643532', :format => :national).should eql '044 364 35 32'
-      end
-      it 'formats Swiss service numbers' do
-        Phony.format('41800112233').should eql '+41 800 112 233'
-      end
-      it 'formats Austrian numbers' do
-        Phony.format('43198110').should eql '+43 1 98110'
-      end
-      it 'formats Danish national numbers' do
-        Phony.format('4540506070', format: :national).should eql '40 50 60 70'
-      end
-      it 'formats American numbers' do
-        Phony.format('18705551122').should eql '+1 870 555 1122'
-      end
-      it 'formats New Zealand 021 6-digit mobile numbers' do
-        Phony.format('6421123456').should eql '+64 21 123 456'
+    
+    describe 'Templates' do
+      it 'handles a basic template correctly' do
+        Phony.format('41443643532', :format => 'A%{cc}B%{ndc}C%{local}').should eql 'A41B44C364 35 32'
       end
-      it 'formats New Zealand 021 7-digit mobile numbers' do
-        Phony.format('64211234567').should eql '+64 21 123 4567'
+      it 'handles a funky template correctly' do
+        Phony.format('41443643532', :format => '%{local}%{ndc}%{cc}', :local_spaces => '').should eql '36435324441'
       end
-      it 'formats New Zealand 021 8-digit mobile numbers' do
-        Phony.format('642112345678').should eql '+64 21 12 345 678'
+      it 'handles local_spaces correctly' do
+        Phony.format('41443643532', :format => 'A%{cc}B%{ndc}C%{local}', :local_spaces => '/').should eql 'A41B44C364/35/32'
       end
-      it 'formats New Zealand landline numbers' do
-        Phony.format('6493791234').should eql '+64 9 379 1234'
-      end
-      it 'formats Indian numbers' do
-        Phony.format('914433993939').should eql '+91 44 339 93 939'
-      end
-      it 'formats Russian numbers' do
-        Phony.format(Phony.normalize('+370 800 12345'), :format => :international).should eql '+370 800 12 345'
-      end
-      it 'formats Russian numbers' do
-        Phony.format(Phony.normalize('+7 812 123 4567'), :format => :international).should eql '+7 812 123-45-67'
-      end
-      it 'formats Russian numbers' do
-        Phony.format(Phony.normalize('+370 800 12345'), :format => :national).should eql '8800 12 345'
-      end
-      it 'formats Russian numbers' do
-        Phony.format(Phony.normalize('+7 812 123 4567'), :format => :national).should eql '8812 123-45-67'
+      it 'handles a russian example correctly' do
+        # https://github.com/floere/phony/issues/214
+        Phony.format('71234567890', :format => '(+%{cc} %{ndc}) %{local}', :local_spaces => '-').should eql '(+7 123) 45-67890'
       end
     end
-    describe 'international' do
-      it 'formats north american numbers' do
-        Phony.format('18091231234', :format => :international).should eql '+1 809 123 1234'
-      end
-      it 'formats north american numbers' do
-        # Gets a trunk code.
-        Phony.format('14152223333', :format => :national).should eql '1 415 222 3333'
-        # Does not show a trunk code.
-        Phony.format('14152223333', :format => :national, :trunk => false).should eql '415 222 3333'
-      end
-      it 'formats austrian numbers' do
-        Phony.format('43198110', :format => :international).should eql '+43 1 98110'
-      end
-      it 'formats austrian numbers' do
-        Phony.format('43198110', :format => :international_absolute).should eql '+43 1 98110'
-      end
-      it 'formats french numbers' do
-        Phony.format('33142278186', :format => :+).should eql '+33 1 42 27 81 86'
-      end
-      it 'formats austrian numbers' do
-        Phony.format('43198110', :format => :international_relative).should eql '0043 1 98110'
-      end
-      it 'formats liechtensteiner numbers' do
-        Phony.format('4233841148', :format => :international_relative).should eql '00423 384 11 48'
-      end
-      context 'with no spaces' do
-        it 'formats north american numbers' do
-          Phony.format('18091231234', :format => :international, :spaces => '').should eql '+18091231234'
-        end
-        it 'formats austrian numbers' do
-          Phony.format('43198110', :format => :international, :spaces => '').should eql '+43198110'
-        end
-        it 'formats austrian numbers' do
-          Phony.format('43198110', :format => :international_absolute, :spaces => '').should eql '+43198110'
-        end
-        it 'formats french numbers' do
-          Phony.format('33142278186', :format => :+, :spaces => '').should eql '+33142278186'
-        end
-        it 'formats italian numbers' do
-          Phony.format('393333337647', :format => :international).should eql '+39 333 333 7647'
-          Phony.format('390108480161', :format => :international).should eql '+39 010 8480161'
-        end
-        it 'formats austrian numbers' do
-          Phony.format('43198110', :format => :international_relative, :spaces => '').should eql '0043198110'
-        end
-        it 'formats liechtensteiner numbers' do
-          Phony.format('4233841148', :format => :international_relative, :spaces => '').should eql '004233841148'
-        end
-      end
-      context 'with special spaces' do
-        it 'formats swiss numbers' do
-          Phony.format('41443643532', :format => :international).should eql '+41 44 364 35 32'
-        end
-        it 'formats north american numbers' do
-          Phony.format('18091231234', :format => :international, :spaces => :-).should eql '+1-809-123-1234'
-        end
-        it 'formats austrian numbers' do
-          Phony.format('43198110', :format => :international, :spaces => :-).should eql '+43-1-98110'
-        end
-        it 'formats austrian numbers' do
-          Phony.format('43198110', :format => :international_absolute, :spaces => :-).should eql '+43-1-98110'
-        end
-        it 'formats french numbers' do
-          Phony.format('33142278186', :format => :+, :spaces => :-).should eql '+33-1-42-27-81-86'
-        end
-        it 'formats austrian numbers' do
-          Phony.format('43198110', :format => :international_relative, :spaces => :-).should eql '0043-1-98110'
-        end
-        it 'formats liechtensteiner numbers' do
-          Phony.format('4233841148', :format => :international_relative, :spaces => :-).should eql '00423-384-11-48'
-        end
-      end
-      describe "'unsupported' countries" do
-        it 'formats as a single block' do
-          Phony.format('88132155605220').should eql '+881 32155605220'
-        end
-        it 'formats as a single block, regardless of format' do
-          Phony.format('8811819372205', :format => :international).should eql '+881 1819372205'
-        end
-        it 'formats as a single block, respecting custom spaces' do
-          Phony.format('8811819372205', :spaces => :-).should eql '+881-1819372205'
-        end
-        it 'formats as a single block, even without spaces' do
-          Phony.format('8811819372205', :spaces => '').should eql '+8811819372205'
+    
+    def self.for_each_from tsv_file_name
+      require 'csv'
+      describe "from file #{tsv_file_name}" do
+        CSV.open(tsv_file_name, headers: true, col_sep: "\t").each.with_index do |row, index|
+          country, expected, original, format, spaces, local_spaces = *row.
+            values_at('Country', 'Expected', 'Original', 'Format', 'Spaces', 'Local Spaces')
+          options = {}
+          options[:format] = format.to_sym if format
+          options[:spaces] = spaces.to_sym if spaces
+          it "(row #{index + 2}) #{country}: #{expected} from #{original} with #{format}, #{spaces}, #{local_spaces}" do
+            Phony.format(original, options).should eql expected
+          end
         end
       end
     end
-    describe 'national' do
-      it 'formats italian numbers' do
-        Phony.format('393333337647', :format => :national).should eql '333 333 7647'
-        Phony.format('390108480161', :format => :national).should eql '010 8480161'
-      end
-      it 'formats swiss numbers' do
-        Phony.format('41443643532', :format => :national).should eql '044 364 35 32'
-      end
-      # TODO
-      #
-      it 'formats swiss service numbers' do
-        Phony.format('41800112233', :format => :national).should eql '0800 112 233'
-      end
-      it 'formats austrian numbers' do
-        Phony.format('43198110', :format => :national).should eql '01 98110'
-      end
-      it 'formats US numbers with a leading trunk 1' do
-        Phony.format('14159224711', :format => :national).should eql '1 415 922 4711'
-      end
-      it 'formats Dutch numbers with a trunk code' do
-        Phony.format('311012341234', :format => :national).should eql '010 123 41234'
-      end
+    
+    # Countries.
+    #
+    for_each_from 'spec/functional/format.tab'
+    
+    describe 'Austria' do
+      it { Phony.format('43198110').should eql '+43 1 98110' }
+      it { Phony.format('43198110', :format => :international).should eql '+43 1 98110' }
+      it { Phony.format('43198110', :format => :international_absolute).should eql '+43 1 98110' }
+      it { Phony.format('43198110', :format => :international_relative).should eql '0043 1 98110' }
+      it { Phony.format('43198110', :format => :international, :spaces => '').should eql '+43198110' }
+      it { Phony.format('43198110', :format => :international_absolute, :spaces => '').should eql '+43198110' }
+      it { Phony.format('43198110', :format => :international_relative, :spaces => '').should eql '0043198110' }
+      it { Phony.format('43198110', :format => :international, :spaces => :-).should eql '+43-1-98110' }
+      it { Phony.format('43198110', :format => :international_absolute, :spaces => :-).should eql '+43-1-98110' }
+      it { Phony.format('43198110', :format => :international_relative, :spaces => :-).should eql '0043-1-98110' }
+      it { Phony.format('43198110', :format => :national).should eql '01 98110' }
     end
-    describe 'local' do
-      it 'formats swiss numbers' do
-        Phony.format('41443643532', :format => :local).should eql '364 35 32'
-      end
-      it 'formats german numbers' do
-        Phony.format('493038625454', :format => :local).should eql '386 25454'
-      end
+    describe 'Denmark' do
+      it { Phony.format('4540506070', format: :national).should eql '40 50 60 70' }
+    end
+    describe 'France' do
+      it { Phony.format('33142278186', :format => :+).should eql '+33 1 42 27 81 86' }
+      it { Phony.format('33142278186', :format => :+, :spaces => '').should eql '+33142278186' }
+      it { Phony.format('33142278186', :format => :+, :spaces => :-).should eql '+33-1-42-27-81-86' }
+    end
+    describe 'India' do
+      it { Phony.format('914433993939').should eql '+91 44 339 93 939' }
+    end
+    describe 'Italy' do
+      it { Phony.format('393333337647', :format => :international).should eql '+39 333 333 7647' }
+      it { Phony.format('390108480161', :format => :international).should eql '+39 010 8480161' }
+      it { Phony.format('393333337647', :format => :national).should eql '333 333 7647' }
+      it { Phony.format('390108480161', :format => :national).should eql '010 8480161' }
+    end
+    describe 'Liechtenstein' do
+      it { Phony.format('4233841148', :format => :international_relative).should eql '00423 384 11 48' }
+      it { Phony.format('4233841148', :format => :international_relative, :spaces => '').should eql '004233841148' }
+      it { Phony.format('4233841148', :format => :international_relative, :spaces => :-).should eql '00423-384-11-48' }
+    end
+    describe 'NANP' do
+      it { Phony.format('18705551122').should eql '+1 870 555 1122' }
+      it { Phony.format('18091231234', :format => :international).should eql '+1 809 123 1234' }
+      it { Phony.format('18091231234', :format => :international, :spaces => '').should eql '+18091231234' }
+      # Gets a trunk code.
+      it { Phony.format('14152223333', :format => :national).should eql '1 415 222 3333' }
+      # Does not show a trunk code.
+      it { Phony.format('14152223333', :format => :national, :trunk => false).should eql '415 222 3333' }
+      it { Phony.format('18091231234', :format => :international, :spaces => :-).should eql '+1-809-123-1234' }
+      # leading trunk
+      it { Phony.format('14159224711', :format => :national).should eql '1 415 922 4711' }
+    end
+    describe 'Netherlands' do
+      it { Phony.format('311012341234', :format => :national).should eql '010 123 41234' }
+    end
+    describe 'New Zealand' do
+      it { Phony.format('6421123456').should eql '+64 21 123 456' }
+      it { Phony.format('64211234567').should eql '+64 21 123 4567' }
+      it { Phony.format('642112345678').should eql '+64 21 12 345 678' }
+      it { Phony.format('6493791234').should eql '+64 9 379 1234' }
+    end
+    describe 'Russia' do
+      it { Phony.format(Phony.normalize('+370 800 12345'), :format => :international).should eql '+370 800 12 345' }
+      it { Phony.format(Phony.normalize('+7 812 123 4567'), :format => :international).should eql '+7 812 123-45-67' }
+      it { Phony.format(Phony.normalize('+370 800 12345'), :format => :national).should eql '8800 12 345' }
+      it { Phony.format(Phony.normalize('+7 812 123 4567'), :format => :national).should eql '8812 123-45-67' }
+    end
+    describe 'Switzerland' do
+      it { Phony.format('41443643532').should eql '+41 44 364 35 32' }
+      it { Phony.format('41443643532', :format => :national).should eql '044 364 35 32' }
+      it { Phony.format('41800112233').should eql '+41 800 112 233' }
+      it { Phony.format('41443643532', :format => :international).should eql '+41 44 364 35 32' }
+      it { Phony.format('41443643532', :format => :national).should eql '044 364 35 32' }
+      it { Phony.format('41800112233', :format => :national).should eql '0800 112 233' }
+      it { Phony.format('41443643532', :format => :local).should eql '364 35 32' }
+      it { Phony.format('493038625454', :format => :local).should eql '386 25454' }
+    end
+    describe 'yet unsupported' do
+      # formats as a single block
+      it { Phony.format('88132155605220').should eql '+881 32155605220' }
+      # formats as a single block, regardless of format
+      it { Phony.format('8811819372205', :format => :international).should eql '+881 1819372205' }
+      # formats as a single block, respecting custom spaces
+      it { Phony.format('8811819372205', :spaces => :-).should eql '+881-1819372205' }
+      # formats as a single block, even without spaces
+      it { Phony.format('8811819372205', :spaces => '').should eql '+8811819372205' }
     end
 
   end
+  
+  describe 'formatted' do
+    it 'is an alias of format' do
+      Phony.formatted('41443643532').should eql '+41 44 364 35 32'
+    end
+  end
 
 end

data/spec/functional/plausibility_spec.rb

@@ -491,12 +491,11 @@ describe 'plausibility' do
         Phony.plausible?('+386 41 123 4567').should be_false
       end
 
-      # TODO: more needs to be done here
-      #
       it "is correct for Swiss numbers" do
         Phony.plausible?('+41 44 111 22 33').should be_true
         Phony.plausible?('+41 44 111 22 334').should be_false
         Phony.plausible?('+41 44 111 22').should be_false
+        Phony.plausible?('+41 (044) 364 35 33').should be_true
       end
 
       it "is correct for Swedish numbers" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phony
 version: !ruby/object:Gem::Version
-  version: 2.12.8
+  version: 2.12.9
 platform: ruby
 authors:
 - Florian Hanke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-07 00:00:00.000000000 Z
+date: 2015-04-08 00:00:00.000000000 Z
 dependencies: []
 description: 'Fast international phone number (E164 standard) normalizing, splitting
   and formatting. Lots of formatting options: International (+.., 00..), national