phony 2.14.0 → 2.14.1

data/spec/lib/phony/countries_spec.rb

@@ -373,12 +373,18 @@ describe 'country descriptions' do
       it_splits '390471811353', ['39', '0471', '811', '353'] # Bolzano
     end
     describe 'Japan' do
-      it_splits '81312345678', %w(81 3 1234 5678)
-      it_splits '81120123456', %w(81 120 123 456)
-      it_splits '81111234567', %w(81 11 1234 567)
-      it_splits '81123123456', %w(81 123 123 456)
-      it_splits '81126712345', %w(81 1267 123 45)
-      it_splits '819012345678', %w(81 90 1234 5678)
+      it_splits '81312345678', %w(81 3 1234 5678) # Tokyo
+      it_splits '81612345678', %w(81 6 1234 5678) # Osaka
+      it_splits '81120123456', %w(81 120 123 456) # Freephone
+      it_splits '81111234567', %w(81 11 123 4567)
+      it_splits '81123123456', %w(81 123 12 3456)
+      it_splits '81126712345', %w(81 1267 1 2345)
+      it_splits '812012345678', %w(81 20 1234 5678) # Pager(Calling Party Pay)
+      it_splits '815012345678', %w(81 50 1234 5678) # IP Telephone
+      it_splits '816012345678', %w(81 60 1234 5678) # UPT
+      it_splits '817012345678', %w(81 70 1234 5678) # PHS
+      it_splits '818012345678', %w(81 80 1234 5678) # Cellular
+      it_splits '819012345678', %w(81 90 1234 5678) # Cellular
     end
     describe 'Kenya' do
       it_splits '254201234567', ['254', '20', '1234567'] # Nairobi

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phony
 version: !ruby/object:Gem::Version
-  version: 2.14.0
+  version: 2.14.1
 platform: ruby
 authors:
 - Florian Hanke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-22 00:00:00.000000000 Z
+date: 2015-05-26 00:00:00.000000000 Z
 dependencies: []
 description: 'Fast international phone number (E164 standard) normalizing, splitting
   and formatting. Lots of formatting options: International (+.., 00..), national
@@ -75,9 +75,6 @@ files:
 - lib/phony/national_splitters/variable.rb
 - lib/phony/trunk_code.rb
 - lib/phony/vanity.rb
-- spec/functional/error_spec.rb
-- spec/functional/format_spec.rb
-- spec/functional/normalize_spec.rb
 - spec/functional/plausibility_spec.rb
 - spec/lib/phony/countries_spec.rb
 - spec/lib/phony/country_codes_spec.rb
@@ -91,8 +88,6 @@ files:
 - spec/lib/phony/national_splitters/none_spec.rb
 - spec/lib/phony/national_splitters/regex_spec.rb
 - spec/lib/phony/national_splitters/variable_spec.rb
-- spec/lib/phony/vanity_spec.rb
-- spec/lib/phony_spec.rb
 homepage: http://github.com/floere/phony
 licenses:
 - MIT
@@ -119,9 +114,6 @@ specification_version: 4
 summary: Fast international phone number (E164 standard) normalizing, splitting and
   formatting.
 test_files:
-- spec/functional/error_spec.rb
-- spec/functional/format_spec.rb
-- spec/functional/normalize_spec.rb
 - spec/functional/plausibility_spec.rb
 - spec/lib/phony/countries_spec.rb
 - spec/lib/phony/country_codes_spec.rb
@@ -135,5 +127,3 @@ test_files:
 - spec/lib/phony/national_splitters/none_spec.rb
 - spec/lib/phony/national_splitters/regex_spec.rb
 - spec/lib/phony/national_splitters/variable_spec.rb
-- spec/lib/phony/vanity_spec.rb
-- spec/lib/phony_spec.rb

data/spec/functional/error_spec.rb

@@ -1,22 +0,0 @@
-require 'spec_helper'
-
-describe 'Issues' do
-
-  describe '#136' do
-    
-    it 'is correct for country 39' do
-      Phony.normalize('+39 393 0000000').should == '393930000000'
-    end
-    
-    it 'fixes #136' do
-      italia = Phony['39']
-      italia.normalize('363 000000').should == '363000000'
-    end
-
-    it 'is correct for country 46' do
-      Phony.normalize('+46 (0)46 222 0000').should == '46462220000'
-    end
-    
-  end
-  
-end

data/spec/functional/format_spec.rb

@@ -1,154 +0,0 @@
-require 'spec_helper'
-
-# This is a very helpful page for phone number formatting:
-# http://en.wikipedia.org/wiki/National_conventions_for_writing_telephone_numbers 
-#
-describe 'Phony#format' do
-
-  describe 'cases' 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 'Templates' do
-      it 'handles a basic template correctly' do
-        Phony.format('41443643532', :format => 'A%{cc}B%{trunk}C%{ndc}D%{local}').should eql 'A41B0C44D364 35 32'
-      end
-      it 'handles a funky template correctly' do
-        Phony.format('41443643532', :format => '%{local} %{ndc} %{trunk} %{cc}', :local_spaces => '').should eql '3643532 44 0 41'
-      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} (%{trunk}%{ndc}) %{local}', :local_spaces => '-').should eql '+7 (8123) 45-67890'
-      end
-      it 'handles an American example correctly' do
-        Phony.format('13015550100', :format => '+%{cc} %{trunk}%{ndc} %{local}', :local_spaces => '-').should eql '+1 301 555-0100'
-      end
-    end
-    
-    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
-    
-    # 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 '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 '+1(809)123-1234' }
-      # Gets a trunk code.
-      it { Phony.format('14152223333', :format => :national).should eql '(415) 222-3333' }
-      # Does not show a trunk code.
-      it { Phony.format('14152223333', :format => :national).should eql '(415) 222-3333' }
-      it { Phony.format('18091231234', :format => :international, :spaces => :-).should eql '+1-(809)-123-1234' }
-      it { Phony.format('14159224711', :format => :national).should eql '(415) 922-4711' }
-      # With forced trunk.
-      it { Phony.format('14159224711', :format => :national, :trunk => true).should eql '1 (415) 922-4711' }
-      it { Phony.format('14159224711', :format => :national, :trunk => false).should eql '(415) 922-4711' }
-      # With forced parentheses.
-      it { Phony.format('14159224711', :format => :national, :parentheses => true).should eql '(415) 922-4711' }
-      it { Phony.format('14159224711', :format => :national, :parentheses => false).should eql '415 922-4711' }
-    end
-    describe 'Netherlands' do
-      it { Phony.format('311012341234', :format => :national).should eql '010 123 41234' }
-      # With forced trunk.
-      it { Phony.format('311012341234', :format => :national, :trunk => true).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/normalize_spec.rb

@@ -1,121 +0,0 @@
-require 'spec_helper'
-
-describe 'Phony#normalize' do
-
-  describe 'cases' do
-
-    describe 'regressions' do
-      it '#151' do
-        # Normalizes, but this is a non-real case.
-        #
-        Phony.normalize('1-111-111-1111').should        eql '1111111111'
-        Phony.normalize('111-111-1111', cc: '1').should eql '1111111111'
-      end
-    end
-
-    it 'handles the US (with cc) correctly' do
-      Phony.normalize('+1 724 999 9999').should eql '17249999999'
-    end
-    it 'handles the Dutch number (without US cc) correctly' do
-      Phony.normalize('310 5552121').should eql '315552121'
-    end
-    it 'handles the US (with cc and cc option) correctly' do
-      Phony.normalize('+1 724 999 9999', cc: '1').should eql '17249999999'
-    end
-    it 'handles the US (without cc) correctly' do
-      Phony.normalize('(310) 555-2121', cc: '1').should eql '13105552121'
-    end
-    it 'handles a German number with extra (0)' do
-      Phony.normalize('+49 (0) 209 22 33 44 55').should eql '4920922334455'
-    end
-    it 'handles a German number with extra 0' do
-      Phony.normalize('+49 0 209 22 33 44 55').should eql '4920922334455'
-    end
-    it 'handles Cambodian numbers with an extra 0' do
-      Phony.normalize('+855012239134').should eql "85512239134"
-    end
-    it 'should normalize a too short number' do
-      Phony.normalize('+972').should eql '972'
-    end
-    it 'should normalize an already normalized number' do
-      Phony.normalize('41443643533').should eql '41443643533'
-    end
-    it 'should normalize a format number' do
-      Phony.normalize('+41 44 364 35 33').should eql '41443643533'
-    end
-    it 'should normalize a 00 number' do
-      Phony.normalize('0041 44 364 35 33').should eql '41443643533'
-    end
-    it 'should normalize a service number' do
-      Phony.normalize('+41 800 11 22 33').should eql '41800112233'
-    end
-    it 'should remove characters from the number' do
-      Phony.normalize('John: +41 44 364 35 33').should eql '41443643533'
-    end
-    it 'should normalize one of these crazy american numbers' do
-      Phony.normalize('1 (703) 451-5115').should eql '17034515115'
-    end
-    it 'should normalize another one of these crazy american numbers' do
-      Phony.normalize('1-888-407-4747').should eql '18884074747'
-    end
-    it 'should normalize a number with colons' do
-      Phony.normalize('1.906.387.1698').should eql '19063871698'
-    end
-    it 'should normalize a number with erroneous zero inside' do
-      Phony.normalize('+410443643533').should eql '41443643533'
-    end
-    it 'should not normalize a number with a correct zero inside' do
-      Phony.normalize('+390909709511').should eql '390909709511'
-    end
-
-    it "handles completely crazy 'numbers'" do
-      Phony.normalize('Hello, I am Cora, the 41th parrot, and 44 is my 364 times 35 funky number. 32.').should eql '41443643532'
-    end
-
-    context 'special trunk prefixes are not handled' do
-      it 'normalizes Hungary' do
-        Phony.normalize('36 0630245506').should eql '360630245506'
-      end
-      it 'normalizes Russia' do
-        Phony.normalize('7 8 342 1234567').should eql '783421234567'
-      end
-      it 'normalizes Lithuania' do
-        Phony.normalize('370 8 5 1234567').should eql '370851234567'
-      end
-      it 'normalizes Belarus' do
-        Phony.normalize('375 152450911').should eql '375152450911'
-      end
-    end
-
-    describe 'exceptions' do
-      it 'raises on nil' do
-        expect {
-          Phony.normalize nil
-        }.to raise_error(ArgumentError, 'Phone number cannot be nil. Use e.g. number && Phony.normalize(number).')
-      end
-      it 'raises if number starts with reserved zero code' do
-        expect do
-          Phony.normalize '+00 00 00 00 01'
-        end.to raise_error(Phony::NormalizationError, 'Phony could not normalize the given number. Is it a phone number?')
-      end
-      it 'raises a nice error message' do
-        expect do
-          Phony.normalize 'test'
-        end.to raise_error(Phony::NormalizationError, 'Phony could not normalize the given number. Is it a phone number?')
-      end
-    end
-
-    describe 'country-based' do
-      it 'normalizes the US correctly' do
-        Phony["1"].normalize("555 1234567890").should eql '5551234567890'
-        Phony["1"].normalize("+1 555 1234567890").should eql '5551234567890'
-        Phony["1"].normalize("+1 (0) 555 1234567890").should eql '5551234567890'
-      end
-      it 'normalizes Japan correctly' do
-        Phony["81"].normalize("80 1234 5634").should eql '8012345634'
-        Phony["81"].normalize("Hello    80 1234 5634").should eql '8012345634'
-      end
-    end
-  end
-
-end

data/spec/lib/phony/vanity_spec.rb

@@ -1,34 +0,0 @@
-# encoding: utf-8
-#
-require 'spec_helper'
-
-describe Phony::Vanity do
-  
-  describe "vanity?" do
-    it 'recognizes a vanity number' do
-      Phony::Vanity.vanity?('800HELLOWORLD').should == true
-    end
-    it 'recognizes a non vanity number' do
-      Phony::Vanity.vanity?('444443322').should == false
-    end
-  end
-  
-  describe "replace" do
-    it 'replaces all characters' do
-      Phony::Vanity.replace('0123456789abcdefghijklmnopqrstuvwxyz').should == '012345678922233344455566677778889999'
-    end
-  end
-  
-  describe 'mapping' do
-    it 'caches' do
-      Phony::Vanity.mapping.should equal(Phony::Vanity.mapping)
-    end
-    it 'returns the right thing' do
-      Phony::Vanity.mapping.should == [
-        'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.freeze,
-        '2223334445556667777888999922233344455566677778889999'.freeze
-      ]
-    end
-  end
-  
-end

data/spec/lib/phony_spec.rb

@@ -1,122 +0,0 @@
-# encoding: utf-8
-#
-require 'spec_helper'
-
-describe Phony do
-
-  describe 'regression' do
-    it 'best effort #152' do
-      described_class.split('39694805123').should eql ['39', '694805123', []]
-      described_class.format('39694805123').should eql '+39 694805123 '
-    end
-  end
-
-  describe 'OO interface' do
-    describe '[]' do
-      it '' do
-        us = described_class['1']
-        us.plausible?('4159224711').should be_true
-        us.normalize('4159224711').should eql '4159224711'
-      end
-    end
-  end
-
-  context 'minimal cases' do
-    context 'splitting' do
-      describe 'exceptions' do
-        it 'should raise on split nil' do
-          expect {
-            Phony.split nil
-          }.to raise_error(ArgumentError, 'Phone number cannot be nil. Use e.g. number && Phony.split(number).')
-        end
-      end
-      it 'handles completely missing numbers well enough' do
-        Phony.split('4144').should eql ['41', '44', '']
-      end
-      it 'handles a missing number part' do
-        Phony.split('4144364').should eql ['41', '44', '364']
-      end
-      it 'handles a missing number part' do
-        Phony.split('414436435').should eql ['41', '44', '364', '35']
-      end
-    end
-    context 'formatting' do
-      it 'handles completely missing numbers well enough' do
-        Phony.format('4144').should eql '+41 44 '
-      end
-      it 'handles a missing number part' do
-        Phony.format('4144364').should eql '+41 44 364'
-      end
-      it 'handles a missing number part' do
-        Phony.format('414436435').should eql '+41 44 364 35'
-      end
-    end
-    context "'unsupported' countries" do
-      it 'handles formatting' do
-        Phony.format('88132155605220').should eql '+881 32155605220'
-      end
-      it 'handles normalizing' do
-        Phony.normalize('+881-321 5560 5220').should eql '88132155605220'
-      end
-    end
-  end
-
-  context 'speed' do
-    before(:each) do
-      @phone_numbers = [
-        '41443643532',
-        '18091231234',
-        '43198110',
-        '33142278186',
-        '4233841148'
-      ]
-    end
-    describe 'split' do
-      it 'is fast' do
-        number = @phone_numbers.first
-        performance_of { Phony.split(number) }.should < 0.00005
-      end
-      it 'is fast' do
-        performance_of { @phone_numbers.each { |number| Phony.split(number) } }.should < 0.00015
-      end
-    end
-    describe 'normalize' do
-      it 'is fast' do
-        number = @phone_numbers.first
-        performance_of { Phony.normalize(number) }.should < 0.0001
-      end
-      it 'is fast' do
-        performance_of { @phone_numbers.each { |number| Phony.normalize(number) } }.should < 0.00016
-      end
-    end
-    describe 'format' do
-      it 'is fast' do
-        number = @phone_numbers.first
-        performance_of { Phony.format(number) }.should < 0.000075
-      end
-      it 'is fast' do
-        performance_of { @phone_numbers.each { |number| Phony.format(number) } }.should < 0.00016
-      end
-    end
-  end
-
-  describe 'vanity' do
-    describe 'vanity_number?' do
-      it {Phony.vanity?('41800 WEGGLI').should be_true}
-      it {Phony.vanity?('41800WEGGLI').should be_true}
-      it {Phony.vanity?('41848 SUCCESSMATCH').should be_true}
-      it {Phony.vanity?('4180 NO NO NO').should be_false}
-      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 eql '41800934454'}
-      it {Phony.vanity_to_number('41800weggli').should eql '41800934454'}
-      # it {Phony.vanity_to_number('41800SUCCESSMATCH').should eql '41800782237'} # Cut off according to the swiss norms.
-      it {Phony.vanity_to_number('41800SUCCESSMATCH').should eql '41800782237762824'} # Allow for call-through numbers (>= 1.6.0)
-      it {Phony.vanity_to_number('4180BLA').should eql '4180252'} # Does not check for validity of number.
-    end
-  end
-
-end