phony 2.18.15 → 2.20.0

data/spec/functional/plausibility_spec.rb

@@ -179,6 +179,14 @@ describe 'plausibility' do
           Phony.plausible?('+359 998 123456').should be_truthy
           Phony.plausible?('+359 999 123456').should be_truthy
       end
+      it_is_correct_for 'Colombia', :samples => ['+57 601 411 1899',
+                                                 '+57 602 111 2222',
+                                                 '+57 603 111 2222',
+                                                 '+57 604 111 2222',
+                                                 '+57 605 111 2222',
+                                                 '+57 606 111 2222',
+                                                 '+57 607 111 2222',
+                                                 '+57 608 111 2222']
       it_is_correct_for 'Congo', :samples => '+242 1234 56789'
       it_is_correct_for 'Cook Islands', :samples => '+682  71928'
       it_is_correct_for 'Costa Rica', :samples => '+506 2 234 5678'
@@ -192,7 +200,7 @@ describe 'plausibility' do
           Phony.plausible?('+385 60 12 345').should be_truthy   # Premium rate
           Phony.plausible?('+385 62 123 456').should be_truthy  # Premium, personal and UAN
       end
-      it_is_correct_for "Côte d'Ivoire", :samples => '+225  9358 8764'
+      it_is_correct_for "Côte d'Ivoire", :samples => '+225 01 9358 8764'
       it_is_correct_for 'Democratic Republic of Timor-Leste', :samples => ['+670 465 7886', '+670 7465 7886']
       it_is_correct_for 'Democratic Republic of the Congo', :samples => '+243 80 864 9794'
       it_is_correct_for 'Diego Garcia', :samples => '+246  123 7686'
@@ -249,7 +257,14 @@ describe 'plausibility' do
       end
       it_is_correct_for 'French Guiana (French Department of)', :samples => '+594 594 123 456'
       it_is_correct_for "French Polynesia (Territoire français d'outre-mer)", :samples => '+689 87 27 84 00'
-      it_is_correct_for 'Gabonese Republic', :samples => '+241 1 627 739'
+      it 'is correct for Gabon' do
+        Phony.plausible?('+241 1 627 739').should be_truthy
+        Phony.plausible?('+241 12 34 56 78').should be_truthy
+      end
+      # it_is_correct_for 'Gabonese Republic', :samples => [
+      #   '+241 1 627 739',
+      #   '+241 12 34 56 78',
+      # ]
       it_is_correct_for 'Gambia', :samples => '+220  989 5148'
       it_is_correct_for 'Germany', :samples => [
         '+49 69 155 1',
@@ -317,10 +332,19 @@ describe 'plausibility' do
       it_is_correct_for 'Macedonia', :samples => ['+389 2 123 4567',
                                                    '+389 7 124 3456',
                                                    '+389 7 234 5678']
-      it_is_correct_for 'Madagascar', :samples => ['+261 20 012 345 678',
-                                                   '+261 20 124 3456',
-                                                   '+261 512 345 678',
-                                                   '+261 33 345 6789']
+      it_is_correct_for 'Madagascar', :samples => ['+261 20 23 456 78',
+                                                   '+261 32 34 546 78',
+                                                   '+261 33 34 546 78',
+                                                   '+261 34 34 546 78',
+                                                   '+261 38 34 546 78']
+      it 'is incorrect for Madagascar' do
+        Phony.plausible?('+261 20 012 345 678').should be_falsey
+        Phony.plausible?('+261 20 12 434 569').should be_falsey
+        Phony.plausible?('+261 51 23 4567 8').should be_falsey
+        Phony.plausible?('+261 34 345 46789').should be_falsey
+        Phony.plausible?('+261 34 345 467').should be_falsey
+      end
+
       it_is_correct_for 'Malawi', :samples => ['+265 1725 123',
                                                '+265 213 456 789',
                                                '+265 9123 456',
@@ -392,6 +416,12 @@ describe 'plausibility' do
                                                              '+507 6 123 4567',
                                                              '+507 2 123 456']
       it_is_correct_for 'Reunion / Mayotte (new)', :samples => '+262 295 276 964'
+      it_is_correct_for 'Rwanda', :samples => ['+250 72 1234567',
+                                               '+250 73 1234567',
+                                               '+250 78 1234567',
+                                               '+250 79 1234567',
+                                               '+250 25 1234567',
+                                               '+250 06 123456']
       it_is_correct_for 'Saint Helena', :samples => '+290  5134'
       it_is_correct_for 'Saint Pierre and Miquelon (Collectivité territoriale de la République française)', :samples => '+508  474 714'
       it_is_correct_for 'Salvador (El)', :samples => [
@@ -420,8 +450,10 @@ describe 'plausibility' do
                                                ['+381 11 123 456', '+381 11 123 4567'],
                                                '+381 72 123 456',
                                                '+381 60 123',
-                                               '+381 60 123 4567',
+                                               ['+381 60 123 4567', '+381 69 123 456'],
                                                '+381 42 123 456',
+                                               '+381 677 123 456',
+                                               '+381 678 123 456',
                                                '+381 9 123 4567',
                                                '+381 60 123',
                                                '+381 60 123 456 7890',
@@ -492,7 +524,10 @@ describe 'plausibility' do
       it_is_correct_for 'Lybia', :samples => ['+218 205 123 45',
                                               '+218 22 123 456',
                                               '+218 21 1234 456',
-                                              '+218 91 1234 456']
+                                              '+218 91 1234 456',
+                                              '+218 92 1234 456',
+                                              '+218 94 1234 456',
+                                              '+218 95 1234 456']
       it_is_correct_for 'Mongolia', :samples => ['+976 11 123 45',
                                                  ['+976 121 12 34', '+976 121 12 345'],
                                                  '+976 70 123 456',
@@ -553,9 +588,12 @@ describe 'plausibility' do
                                               '+967 58 1234']
       it 'is correct for Zambia' do
         Phony.plausible?('+260 211 123456').should be_truthy  # Fixed
-        Phony.plausible?('+260 955 123456').should be_truthy  # Mobile
-        Phony.plausible?('+260 967 123456').should be_truthy  # Mobile
-        Phony.plausible?('+260 978 123456').should be_truthy  # Mobile
+        Phony.plausible?('+260 96 512 4567').should be_truthy # MTN Mobile
+        Phony.plausible?('+260 97 712 3456').should be_truthy # Airtel Mobile
+        Phony.plausible?('+260 95 512 4567').should be_truthy # Zamtel Mobile
+        Phony.plausible?('+260 96 512 456').should be_falsy   # MTN Mobile (Too short)
+        Phony.plausible?('+260 97 812 345').should be_falsy   # Airtel Mobile (Too short)
+        Phony.plausible?('+260 95 512 345').should be_falsy   # Zamtel Mobile (Too short)
         Phony.plausible?('+260 800 123 456').should be_truthy # Toll free
       end
       it_is_correct_for 'Zimbabwe', :samples => [['+263 2582 123 456', '+263 2582 123'],
@@ -570,6 +608,20 @@ describe 'plausibility' do
         Phony.plausible?('+62 22 0000 0000').should be_truthy
         Phony.plausible?('+62 22 000 000 000').should be_truthy
       end
+      
+      it 'is correct for Italy' do
+        Phony.plausible?('+39 0574 123').should be_falsy
+        Phony.plausible?('+39 0574 1234').should be_truthy
+        Phony.plausible?('+39 0574 12345').should be_falsy
+        
+        Phony.plausible?('+39 085 541').should be_falsy
+        Phony.plausible?('+39 085 5410').should be_truthy
+        Phony.plausible?('+39 085 54105').should be_truthy
+        
+        Phony.plausible?('+39 06 4991').should be_falsy
+        Phony.plausible?('+39 06 49911').should be_truthy
+        Phony.plausible?('+39 06 499112').should be_truthy
+      end
 
       it 'is correct for Russia' do
         Phony.plausible?('+7 3522 000 000').should be_truthy

data/spec/lib/phony/countries_spec.rb

@@ -110,6 +110,7 @@ describe 'country descriptions' do
       it_splits '32466123456', ['32', '466', '12', '34', '56'] # mobile (Vectone)
       it_splits '32467123456', ['32', '467', '12', '34', '56'] # mobile (Telenet)
       it_splits '32468123456', ['32', '468', '12', '34', '56'] # mobile (Telenet)
+      it_splits '32469123456', ['32', '469', '12', '34', '56'] # mobile ()
       it_splits '32475123456', ['32', '475', '12', '34', '56'] # mobile (Proximus)
       it_splits '32485123456', ['32', '485', '12', '34', '56'] # mobile (Telenet)
       it_splits '32495123456', ['32', '495', '12', '34', '56'] # mobile (Orange)
@@ -239,7 +240,7 @@ describe 'country descriptions' do
       end
     end
     describe 'Colombia' do
-      it_splits '5711234567', ['57', '1', '123', '4567']
+      it_splits '5711234567', ['57', '1', '123', '4567'] # Outdated.
       it_splits '573101234567', ['57', '310', '123', '4567'] # mobile
     end
     describe 'Croatia' do
@@ -459,8 +460,9 @@ describe 'country descriptions' do
       it_splits '3934869528123',['39', '348', '695', '2812', '3']  # Mobile (8-digit subscriber no - new)
       it_splits '393357210488', ['39', '335', '721', '0488'] # Mobile
       it_splits '393248644272', ['39', '324', '864', '4272'] # Mobile
-      it_splits '3906123412',   ['39', '06', '1234', '12'] # Roma 6 digit
-      it_splits '39061234123',  ['39', '06', '1234', '123'] # Roma 7 digit
+      it_splits '390612341',    ['39', '06', '12341']        # Roma 5 digit
+      it_splits '3906123412',   ['39', '06', '1234', '12']   # Roma 6 digit
+      it_splits '39061234123',  ['39', '06', '1234', '123']  # Roma 7 digit
       it_splits '390612341234', ['39', '06', '1234', '1234'] # Roma 8 digit
       it_splits '3902888388',   ['39', '02', '8883', '88'] # Milano 6 digit
       it_splits '39028883888',  ['39', '02', '8883', '888'] # Milano 7 digit
@@ -469,6 +471,7 @@ describe 'country descriptions' do
       it_splits '3903123391',   ['39', '031', '23391']   # Como
       it_splits '390909709511', ['39', '090', '9709511'] # Barcellona
       it_splits '390471811353', ['39', '0471', '811', '353'] # Bolzano
+      it_splits '3905745730', ['39', '0574', '5730'] # Prato
     end
     describe 'Japan' do
       it_splits '81312345678', %w(81 3 1234 5678) # Tokyo
@@ -484,6 +487,8 @@ describe 'country descriptions' do
       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
+      it_splits '810570123456', %w(81 570 123 456)  # Navi-dial
+      it_splits '810180123456', %w(81 180 123 456)  # Tele-gong/Tele-dome
     end
     describe 'Kenya' do
       it_splits '254201234567', ['254', '20', '1234567'] # Nairobi
@@ -677,6 +682,7 @@ describe 'country descriptions' do
       it_splits '250781234567', ['250', '78', '1234567'] # mobile
       it_splits '250721234567', ['250', '72', '1234567'] # mobile
       it_splits '250731234567', ['250', '73', '1234567'] # mobile
+      it_splits '250791234567', ['250', '79', '1234567'] # mobile
       it_splits '250251234567', ['250', '25', '1234567'] # fixed
       it_splits '25006123456',  ['250', '06', '123456']  # fixed
     end
@@ -759,6 +765,7 @@ describe 'country descriptions' do
     describe 'Switzerland' do
       it_splits '41443643532', ['41', '44', '364', '35', '32'] # Zurich (usually)
       it_splits '41800334455', ['41', '800', '334', '455']     # Service number
+      it_splits '41860443643532', ['41', '860', '44', '364', '35', '32'] # Voicemail access
       it_splits '41900123456', ['41', '900', '123', '456']     # Business Number
       it_splits '41901123456', ['41', '901', '123', '456']     # Business Number Entertainment
       it_splits '41906123456', ['41', '906', '123', '456']     # Business Number Adult Entertainment
@@ -847,9 +854,9 @@ describe 'country descriptions' do
     end
     describe 'Zambia' do
       it_splits '260211123456', ['260', '211', '123456']     # Fixed
-      it_splits '260955123456', ['260', '955', '123456']     # Mobile
-      it_splits '260967123456', ['260', '967', '123456']     # Mobile
-      it_splits '260978123456', ['260', '978', '123456']     # Mobile
+      it_splits '260955123456', ['260', '95', '512', '3456'] # Mobile
+      it_splits '260967123456', ['260', '96', '712', '3456'] # Mobile
+      it_splits '260978123456', ['260', '97', '812', '3456'] # Mobile
       it_splits '260800123456', ['260', '800', '123', '456'] # Toll free
     end
     describe 'New Zealand' do
@@ -895,8 +902,8 @@ describe 'country descriptions' do
       it_splits '50622345678', %w(506 2 234 5678)
     end
     describe "Côte d'Ivoire" do
-      it_splits '22507335518', ['225', '07', '33', '55', '18']
-      it_splits '22537335518', ['225', '37', '33', '55', '18']
+      it_splits '2250107335518', ['225', '01', '07', '33', '55', '18']
+      it_splits '2250237335518', ['225', '02', '37', '33', '55', '18']
     end
     describe 'Democratic Republic of Timor-Leste' do
       it_splits '6701742945', ['670', false, '174', '2945']
@@ -959,6 +966,7 @@ describe 'country descriptions' do
     end
     describe 'Gabonese Republic' do
       it_splits '2411834375', ['241', '1', '834', '375']
+      it_splits '24174012345', ['241', '74', '01', '23', '45']
     end
     describe 'Gambia' do
       it_splits '2206683355', ['220', false, '668', '3355']
@@ -1046,11 +1054,14 @@ describe 'country descriptions' do
       it_splits '21822123456', %w(218 22 123 456)
       it_splits '218211234456', %w(218 21 1234 456)
       it_splits '218911234456', %w(218 91 1234 456)
+      it_splits '218941234456', %w(218 94 1234 456)
+      it_splits '218951234456', %w(218 95 1234 456)
     end
     describe 'Madagascar' do
-      it_splits '26120012345678', ['261', false, '20', '012', '345', '678']
-      it_splits '261201243456', ['261', false, *%w(20 124 3456)]
-      it_splits '261512345678', ['261', false, *%w(512 345 678)]
+      it_splits '261202254716', ['261', '20', *%w(22 547 16)]
+      it_splits '261320254716', ['261', '32', *%w(02 547 16)]
+      it_splits '261330254716', ['261', '33', *%w(02 547 16)]
+      it_splits '261340254716', ['261', '34', *%w(02 547 16)]
     end
     describe 'Malawi' do
       it_splits '2651725123', ['265', false, '1725', '123']
@@ -1163,6 +1174,17 @@ describe 'country descriptions' do
       it_splits '2349087661234', %w(234 908 766 1234)
       it_splits '2349097661234', %w(234 909 766 1234)
 
+      it_splits '2349107661234', %w(234 910 766 1234)
+      it_splits '2349117661234', %w(234 911 766 1234)
+      it_splits '2349127661234', %w(234 912 766 1234)
+      it_splits '2349137661234', %w(234 913 766 1234)
+      it_splits '2349147661234', %w(234 914 766 1234)
+      it_splits '2349157661234', %w(234 915 766 1234)
+      it_splits '2349167661234', %w(234 916 766 1234)
+      it_splits '2349177661234', %w(234 917 766 1234)
+      it_splits '2349187661234', %w(234 918 766 1234)
+      it_splits '2349197661234', %w(234 919 766 1234)
+
       it_splits '2348107661234', %w(234 810 766 1234)
       it_splits '2348117661234', %w(234 811 766 1234)
       it_splits '2348127661234', %w(234 812 766 1234)
@@ -1214,6 +1236,7 @@ describe 'country descriptions' do
     describe 'Samoa (Independent State of)' do
       it_splits '685800123', ['685', false, '800', '123']
       it_splits '68561123', ['685', false, '61', '123']
+      it_splits '6857112345', ['685', false, '711', '2345']
       it_splits '6857212345', ['685', false, '721', '2345']
       it_splits '685830123', ['685', false, '830', '123']
       it_splits '685601234', ['685', false, '601', '234']
@@ -1302,6 +1325,7 @@ describe 'country descriptions' do
       it_splits '88633123456', %w(886 3 312 3456)
       it_splits '88637123456', %w(886 37 12 3456)
       it_splits '88682712345', %w(886 82 71 2345)
+      it_splits '886801123123', %w(886 801 123 123)
       it_splits '88689712345', %w(886 89 71 2345)
       it_splits '88682672345', %w(886 826 7 2345)
       it_splits '88683672345', %w(886 836 7 2345)
@@ -1412,6 +1436,14 @@ describe 'country descriptions' do
         it_splits  number, ['263', prefix, '234', '5678']
       end
     end
+
+    describe 'Universal International Freephone' do
+      it_splits '80012345678', ['800', false, '12345678']
+    end
+
+    describe 'Shared-Cost Service' do
+      it_splits '80812345678', ['808', false, '12345678']
+    end
   end
 
 end

data/spec/lib/phony/country_codes_spec.rb

@@ -1,32 +1,51 @@
 require 'spec_helper'
 
 describe Phony::CountryCodes do
-
-  before(:all) do
-    @countries = Phony::CountryCodes.instance
+  
+  let(:countries) { Phony::CountryCodes.instance }
+  
+  describe '#plausible?' do
+    it 'raises an error on a too long ccc' do
+      expect do
+        countries.plausible?('+1 868 7620266', ccc: '1868123')
+      end.to raise_error(ArgumentError, %Q{The provided ccc option is too long and includes more than a cc ('1') and ndc ('868'). It also includes '123'.})
+    end
+  end
+  
+  describe 'ccc handling' do
+    it 'splits a ccc correctly' do
+      cc, ndc, *local = countries.split('1868')
+      cc.should eq('1')
+      ndc.should eq('868')
+    end
+    it 'splits a ccc correctly' do
+      cc, ndc, *local = countries.split('1868')
+      cc.should eq('1')
+      ndc.should eq('868')
+    end
   end
   
   describe '#[]' do
     it 'returns a country' do
-      @countries['41'].class.should eql Phony::Country
+      countries['41'].class.should eql Phony::Country
     end
   end
   
   describe '#country_for' do
     it 'returns a country' do
-      @countries.send(:country_for, '41').class.should eql Phony::Country
+      countries.send(:country_for, '41').class.should eql Phony::Country
     end
   end
   
   describe '#countrify' do
     it 'returns a country' do
-      @countries.send(:countrify, '441231212', '41').should eql '41441231212'
+      countries.send(:countrify, '441231212', '41').should eql '41441231212'
     end
   end
   describe '#countrify!' do
     it 'in-place replaces the number' do
       number = '441231212'
-      @countries.send(:countrify!, number, '41').should eql number
+      countries.send(:countrify!, number, '41').should eql number
       
       number.should == '41441231212'
     end
@@ -34,127 +53,127 @@ describe Phony::CountryCodes do
   
   describe '#vanity?' do
     it 'returns true if so' do
-      @countries.vanity?('1800HELLOES').should eql true
+      countries.vanity?('1800HELLOES').should eql true
     end
     it 'returns false if not' do
-      @countries.vanity?('18001234567').should eql false
+      countries.vanity?('18001234567').should eql false
     end
   end
 
   describe 'normalize' do
     it 'normalizes correctly' do
-      @countries.normalize('0041-44-364-35-32').should eql '41443643532'
+      countries.normalize('0041-44-364-35-32').should eql '41443643532'
     end
     it 'normalizes correctly with CC option' do
-      @countries.normalize('044-364-35-32', cc: '41').should eql '41443643532'
+      countries.normalize('044-364-35-32', cc: '41').should eql '41443643532'
     end
 
     context 'specific countries' do
       it 'handles Congo correctly' do
-        @countries.normalize('+242 0571 73992').should eql '242057173992'
-        @countries.normalize('+242 2221 15932').should eql '242222115932'
+        countries.normalize('+242 0571 73992').should eql '242057173992'
+        countries.normalize('+242 2221 15932').should eql '242222115932'
       end
     end
   end
 
   describe 'formatted' do
     it 'formats correctly' do
-      @countries.formatted('41443643532', :format => :international, :spaces => :-).should eql '+41-44-364-35-32'
+      countries.formatted('41443643532', :format => :international, :spaces => :-).should eql '+41-44-364-35-32'
     end
     it 'formats correctly' do
-      @countries.formatted('41443643532', :format => :international_relative, :spaces => :-).should eql '0041-44-364-35-32'
+      countries.formatted('41443643532', :format => :international_relative, :spaces => :-).should eql '0041-44-364-35-32'
     end
     it 'formats correctly' do
-      @countries.formatted('41443643532', :format => :national, :spaces => :-).should eql '044-364-35-32'
+      countries.formatted('41443643532', :format => :national, :spaces => :-).should eql '044-364-35-32'
     end
     context 'specific' do
       it 'formats Ireland correctly' do
-        @countries.formatted("3533451234", :format => :national).should eql '0345 1234'
+        countries.formatted("3533451234", :format => :national).should eql '0345 1234'
       end
       it 'formats Ireland correctly' do
-        @countries.formatted("353411231234", :format => :national).should eql '041 123 1234'
+        countries.formatted("353411231234", :format => :national).should eql '041 123 1234'
       end
       it 'formats Spain correctly' do
-        @countries.formatted("34123456789", :format => :national).should eql '123 456 789'
+        countries.formatted("34123456789", :format => :national).should eql '123 456 789'
       end
       it 'formats Cambodia correctly' do
-        @countries.formatted('85512239123', :format => :national).should eql '012 239 123'
+        countries.formatted('85512239123', :format => :national).should eql '012 239 123'
       end
       it 'formats the US correctly' do
-        @countries.formatted('18005551212', :format => :national, :spaces => :-).should eql '(800)-555-1212'
+        countries.formatted('18005551212', :format => :national, :spaces => :-).should eql '(800)-555-1212'
       end
       it 'formats the US correctly' do
-        @countries.formatted('18005551212', :format => :national, :spaces => :-).should eql '(800)-555-1212'
+        countries.formatted('18005551212', :format => :national, :spaces => :-).should eql '(800)-555-1212'
       end
     end
     context 'default' do
       it "should format swiss numbers" do
-        @countries.formatted('41443643532').should eql '+41 44 364 35 32'
+        countries.formatted('41443643532').should eql '+41 44 364 35 32'
       end
       it "should format swiss service numbers" do
-        @countries.formatted('41800112233').should eql '+41 800 112 233'
+        countries.formatted('41800112233').should eql '+41 800 112 233'
       end
       it "should format austrian numbers" do
-        @countries.formatted('43198110').should eql '+43 1 98110'
+        countries.formatted('43198110').should eql '+43 1 98110'
       end
       it "should format american numbers" do
-        @countries.formatted('18705551122').should eql '+1 (870) 555-1122'
+        countries.formatted('18705551122').should eql '+1 (870) 555-1122'
       end
       it "should format irish numbers" do
-        @countries.formatted('35311234567').should eql '+353 1 123 4567'
+        countries.formatted('35311234567').should eql '+353 1 123 4567'
       end
     end
     describe "international" do
       it "should format north american numbers" do
-        @countries.formatted('18091231234', :format => :international).should eql '+1 (809) 123-1234'
+        countries.formatted('18091231234', :format => :international).should eql '+1 (809) 123-1234'
       end
       it "should format austrian numbers" do
-        @countries.formatted('43198110', :format => :international).should eql '+43 1 98110'
+        countries.formatted('43198110', :format => :international).should eql '+43 1 98110'
       end
       it "should format austrian numbers" do
-        @countries.formatted('43198110', :format => :international_absolute).should eql '+43 1 98110'
+        countries.formatted('43198110', :format => :international_absolute).should eql '+43 1 98110'
       end
       it "should format french numbers" do
-        @countries.formatted('33142278186', :format => :+).should eql '+33 1 42 27 81 86'
+        countries.formatted('33142278186', :format => :+).should eql '+33 1 42 27 81 86'
       end
       it "should format austrian numbers" do
-        @countries.formatted('43198110', :format => :international_relative).should eql '0043 1 98110'
+        countries.formatted('43198110', :format => :international_relative).should eql '0043 1 98110'
       end
       it 'should format liechtensteiner numbers' do
-        @countries.formatted('4233841148', :format => :international_relative).should eql '00423 384 11 48'
+        countries.formatted('4233841148', :format => :international_relative).should eql '00423 384 11 48'
       end
       it "should format irish numbers" do
-        @countries.formatted('35311234567', :format => :international).should eql '+353 1 123 4567'
+        countries.formatted('35311234567', :format => :international).should eql '+353 1 123 4567'
       end
       it "should format luxembourgian numbers" do
-        @countries.formatted('352222809', :format => :international).should eql '+352 22 28 09'
+        countries.formatted('352222809', :format => :international).should eql '+352 22 28 09'
       end
       it "should format luxembourgian 4-digit ndc numbers" do
-        @countries.formatted('35226222809', :format => :international).should eql '+352 2622 28 09'
+        countries.formatted('35226222809', :format => :international).should eql '+352 2622 28 09'
       end
       it "should format luxembourgian mobile numbers" do
-        @countries.formatted('352621123456', :format => :international).should eql '+352 621 123 456'
+        countries.formatted('352621123456', :format => :international).should eql '+352 621 123 456'
       end
       it "should format luxembourgian city numbers" do
-        @countries.formatted('3524123456', :format => :international).should eql '+352 41 23 45 6'
+        countries.formatted('3524123456', :format => :international).should eql '+352 41 23 45 6'
       end
       it "should format luxembourgian machine to machine numbers" do
-        @countries.formatted('352602112345678', :format => :international).should eql '+352 6021 12 34 56 78'
+        countries.formatted('352602112345678', :format => :international).should eql '+352 6021 12 34 56 78'
       end
       it "should format luxembourgian numbers" do
-        @countries.formatted('352370431', :format => :international).should eql '+352 37 04 31'
+        countries.formatted('352370431', :format => :international).should eql '+352 37 04 31'
       end
       it "should format luxembourgian numbers" do
-        @countries.formatted('35227855', :format => :international).should eql '+352 27 85 5'
+        countries.formatted('35227855', :format => :international).should eql '+352 27 85 5'
       end
       it "should format nigerian lagosian numbers" do
-        @countries.formatted('23414480000', :format => :international).should eql '+234 1 448 0000'
+        countries.formatted('23414480000', :format => :international).should eql '+234 1 448 0000'
       end
       it "should format nigerian beninese numbers" do
-        @countries.formatted('23452123456', :format => :international).should eql '+234 52 123 456'
+        countries.formatted('23452123456', :format => :international).should eql '+234 52 123 456'
       end
       it "should format nigerian mobile numbers" do
-        @countries.formatted('2347061234567', :format => :international).should eql '+234 706 123 4567'
+        countries.formatted('2347061234567', :format => :international).should eql '+234 706 123 4567'
       end
       context 'with no spaces' do
         it "should format north american numbers" do

data/spec/lib/phony/country_spec.rb

@@ -43,6 +43,18 @@ describe Phony::Country do
         Phony.normalize('+378903549').should == '3780549903549'
       end
     end
+    describe 'Japan' do
+      it 'normalizes correctly' do
+        Phony.normalize('+81-03-1234-5634').should == '81312345634'
+        Phony.normalize('03-1234-5634', cc: '81').should == '81312345634'
+      end
+      it 'formats correctly' do
+        Phony.format('81312345634').should == '+81-3-1234-5634'
+      end
+      it 'splits correctly' do
+        Phony.split('81312345634').should == %w(81 3 1234 5634)
+      end
+    end
   end
   
   context "without special cases (with switzerland)" do

data/spec/lib/phony/trunk_code_spec.rb

@@ -0,0 +1,85 @@
+require 'spec_helper'
+
+describe Phony::TrunkCode do
+  
+  describe '#format' do
+    it 'is correct' do
+      code = described_class.new('0')
+      expect(code.format('%s %s')).to eq '0'
+    end
+    it 'is correct' do
+      code = described_class.new('0', format: true)
+      expect(code.format('%s %s')).to eq '0'
+    end
+    it 'is correct' do
+      code = described_class.new('0', format: false)
+      expect(code.format('%s %s')).to eq nil
+    end
+    it 'is correct' do
+      code = described_class.new('06')
+      expect(code.format('%s %s')).to eq '06'
+    end
+    it 'is correct' do
+      code = described_class.new('06', format: true)
+      expect(code.format('%s %s')).to eq '06'
+    end
+    it 'is correct' do
+      code = described_class.new('06', format: false)
+      expect(code.format('%s %s')).to eq nil
+    end
+  end
+  
+  describe '#normalize' do
+    it 'is correct' do
+      code = described_class.new('0')
+      expect(code.normalize('0123')).to eq '0123'
+    end
+    it 'is correct' do
+      code = described_class.new('0', normalize: true)
+      expect(code.normalize('0123')).to eq '0123'
+    end
+    it 'is correct' do
+      code = described_class.new('0', normalize: false)
+      expect(code.normalize('0123')).to eq '0123'
+    end
+    it 'is correct' do
+      code = described_class.new('06')
+      expect(code.normalize('06123')).to eq '06123'
+    end
+    it 'is correct' do
+      code = described_class.new('06', normalize: true)
+      expect(code.normalize('06123')).to eq '06123'
+    end
+    it 'is correct' do
+      code = described_class.new('06', normalize: false)
+      expect(code.normalize('0123')).to eq '0123'
+    end
+  end
+  
+  describe '#split' do
+    it 'is correct' do
+      code = described_class.new('0')
+      expect(code.split('0123')).to eq [code, '0123']
+    end
+    it 'is correct' do
+      code = described_class.new('0', split: true)
+      expect(code.split('0123')).to eq [code, '123']
+    end
+    it 'is correct' do
+      code = described_class.new('0', split: false)
+      expect(code.split('0123')).to eq [code, '0123']
+    end
+    it 'is correct' do
+      code = described_class.new('06')
+      expect(code.split('06123')).to eq [code, '06123']
+    end
+    it 'is correct' do
+      code = described_class.new('06', split: true)
+      expect(code.split('06123')).to eq [code, '123']
+    end
+    it 'is correct' do
+      code = described_class.new('06', split: false)
+      expect(code.split('06123')).to eq [code, '06123']
+    end
+  end
+end