phony 2.19.2 → 2.20.12

data/spec/functional/plausibility_spec.rb

@@ -25,11 +25,11 @@ describe 'plausibility' do
           incorrect = [shortest.sub(/\d\s*\z/, '')] # , longest + '0']
 
           correct.each do |value|
-            Phony.plausible?(value).should be_truthy,
+            expect(Phony.plausible?(value)).to be_truthy,
               "It should validate #{value}, but does not."
           end
           incorrect.each do |value|
-            Phony.plausible?(value).should be_falsey,
+            expect(Phony.plausible?(value)).to be_falsey,
               "It should not validate #{value}, but does."
           end
         end
@@ -38,7 +38,7 @@ describe 'plausibility' do
           invalid = [*sample]
 
           invalid.each do |value|
-            Phony.plausible?(value).should be_falsey,
+            expect(Phony.plausible?(value)).to be_falsey,
               "It should not validate #{value}, but does."
           end
         end
@@ -51,6 +51,14 @@ describe 'plausibility' do
       it_is_correct_for 'Bosnia and Herzegovina', :samples => ['+387 66 666 666',
                                                                '+387 37 123 456',
                                                                '+387 33 222 111']
+      it 'is correct for Brasil' do
+        Phony.plausible?('+55 67 998280912').should be_truthy
+        Phony.plausible?('+55 67 98280912').should be_falsey
+        Phony.plausible?('+55 11 12345678').should be_falsey
+        Phony.plausible?('+55 11 123456789').should be_falsey
+        Phony.plausible?('+55 11 023456789').should be_falsey
+        Phony.plausible?('+55 11 22345678').should be_truthy
+      end
       it 'is correct for Bulgaria' do
           Phony.plausible?('+359 2 1234567').should be_truthy
           Phony.plausible?('+359 30 12345').should be_truthy
@@ -179,6 +187,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'
@@ -285,7 +301,7 @@ describe 'plausibility' do
                                              '+964 71 1234 5678']
 
 
-      it_is_correct_for 'Kiribati (Republic of)', :samples => '+686  31993'
+      it_is_correct_for 'Kiribati (Republic of)', :samples => '+686  34814527'
       it_is_correct_for "Democratic People's Republic of Korea", :samples => ['+850 2 123 45',
                                                                               '+850 2 123 456 789',
                                                                               '+850 2 381 2356',
@@ -324,10 +340,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',
@@ -338,7 +363,8 @@ describe 'plausibility' do
       it_is_correct_for 'Marshall Islands (Republic of the)', :samples => '+692  372 7183'
       it_is_correct_for 'Martinique (French Department of)', :samples => '+596 596 123 456'
       it_is_correct_for 'Mauritania', :samples => '+222  1234 5678'
-      it_is_correct_for 'Mauritius', :samples => '+230  5695 2277'
+      it_is_correct_for 'Mauritius', :samples => ['+230  5 695 2277',
+                                                  '+230  260 0070']
       it_is_correct_for 'Micronesia (Federated States of)', :samples => '+691  766 7914'
       it_is_correct_for 'Moldova', :samples => ['+373 800 123 45',
                                                 '+373 22 123 345',
@@ -507,7 +533,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',
@@ -561,19 +590,21 @@ describe 'plausibility' do
                                                                       '+598 805 123 45']
       it_is_correct_for 'Vietnam', :samples => ['+84 24 41234567',
                                                 '+84 28 41234567',
-                                                '+84 23 61234567']
+                                                '+84 23 61234567',
+                                                '+84 1900 1212',
+                                                '+84 1900 541234']
       it_is_correct_for 'Yemen', :samples => [['+967 1 234 567', '+967 1 234 5678'],
                                               '+967 7 234 567',
                                               '+967 77 123 4567',
                                               '+967 58 1234']
       it 'is correct for Zambia' do
         Phony.plausible?('+260 211 123456').should be_truthy  # Fixed
-        Phony.plausible?('+260 761 123456').should be_truthy  # Mobile
-        Phony.plausible?('+260 772 123456').should be_truthy  # Mobile
-        Phony.plausible?('+260 783 123456').should be_truthy  # Mobile
-        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'],
@@ -589,6 +620,29 @@ describe 'plausibility' do
         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
+
+        Phony.plausible?('+39 800 081631').should be_truthy
+        Phony.plausible?('+39 800 0816311').should be_falsy
+
+        Phony.plausible?('+39 803 08163').should be_falsy
+        Phony.plausible?('+39 803 081').should be_truthy
+
+        Phony.plausible?('+39 06 8323074181').should be_falsy
+        Phony.plausible?('+39 06 832307418').should be_truthy
+      end
+
       it 'is correct for Russia' do
         Phony.plausible?('+7 3522 000 000').should be_truthy
       end

data/spec/lib/phony/countries_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 describe 'country descriptions' do
 
   def self.it_splits number, expected
-    it { Phony.split(number).should == expected }
+    it { expect(Phony.split(number)).to eq expected }
   end
 
   describe 'regression' do
@@ -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)
@@ -146,9 +147,8 @@ describe 'country descriptions' do
     end
 
     describe 'Brazil' do
-      it_splits '551112341234', ['55', '11', '1234', '1234']
+      it_splits '551122341234', ['55', '11', '2234', '1234']
       it_splits '5511981231234', ['55', '11', '98123', '1234'] # São Paulo's 9 digits mobile
-      it_splits '552181231234', ['55', '21', '8123', '1234']
       it_splits '5521981231234', ['55', '21', '98123', '1234'] # Rio de Janeiro's 9 digits mobile
       it_splits '551931311234', ['55', '19', '3131', '1234']
       it_splits '5531991311234', ['55', '31', '99131', '1234'] # Belo Horizonte's 9th digit
@@ -156,6 +156,7 @@ describe 'country descriptions' do
       it_splits '5579991311234', ['55', '79', '99131', '1234'] # Sergipe's 9th digit
       it_splits '5547991311234', ['55', '47', '99131', '1234'] # Santa Catarina's 9th digit
       it_splits '5541991311234', ['55', '41', '99131', '1234'] # Parana's 9th digit
+      it_splits '556734212121', ['55', '67', '3421', '2121']
 
       context 'mobile numbers' do
         %w{
@@ -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
@@ -525,6 +528,8 @@ describe 'country descriptions' do
       it_splits '352545258',       ['352', '54', '52', '58']
       it_splits '352818181',       ['352', '81', '81', '81']
       it_splits '3523572141',      ['352', '35', '72', '14', '1']
+      it_splits '3522634731',      ['352', '26', '34', '73', '1']
+      it_splits '352264412701',    ['352', '26', '44', '12', '701']
     end
     describe 'Macedonia' do
       it_splits '38921234567', ['389', '2', '123', '4567'] # Skopje
@@ -590,6 +595,10 @@ describe 'country descriptions' do
       it_splits '31222123456', ['31', '222', '123', '456']
       it_splits '3197012345678', ['31', '970', '1234', '5678'] # machine-to-machine
     end
+    describe 'Norfolk Island' do
+      it_splits '672321234', ['672', '3', '21', '234'] # fixed
+      it_splits '672351234', ['672', '3', '51', '234'] # mobile
+    end
     describe 'Norway' do
       it_splits '4721234567', ['47',false,'21','23','45','67']
       it_splits '4731234567', ['47',false,'31','23','45','67']
@@ -762,6 +771,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,12 +857,14 @@ describe 'country descriptions' do
       it_splits '842841234567', ['84', '28', '4123', '4567'] # Ho Chi Minh City
       it_splits '84341234567', ['84', '34', '1234567'] # Viettel
       it_splits '84841234567', ['84', '84', '1234567'] # Vinaphone
+      it_splits '8419001212', ['84', '1900', '1212'] # Vinaphone
+      it_splits '841900541234', ['84', '1900', '541234'] # Vinaphone
     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
@@ -867,7 +879,8 @@ describe 'country descriptions' do
       it_splits '6737932744', %w(673 7 932 744)
     end
     describe 'Burkina Faso' do
-      it_splits '22667839323', ['226', false, '6783', '9323']
+      it_splits '22667839323', ['226', false, '67', '83', '93', '23']
+      it_splits '22601234567', ['226', false, '01', '23', '45', '67'] # 0 not removed.
     end
     describe 'Burundi' do
       it_splits '25712345678', ['257', false, '1234', '5678']
@@ -1008,7 +1021,7 @@ describe 'country descriptions' do
       it_splits '96287901456', %w(962 8790 1456)
     end
     describe 'Kiribati (Republic of)' do
-      it_splits '68634814', ['686', false, '34', '814']
+      it_splits '68634814527', ['686', false, '34814527']
     end
     describe "Democratic People's Republic of Korea" do
       it_splits '850212345', %w(850 2 123 45)
@@ -1050,11 +1063,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']
@@ -1078,7 +1094,8 @@ describe 'country descriptions' do
       it_splits '22212345678', ['222', false, '1234', '5678']
     end
     describe 'Mauritius' do
-      it_splits '23059518919', ['230', false, '5951', '8919']
+      it_splits '23059518919', ['230', false, '5', '951', '8919']
+      it_splits '2302600070', ['230', false, '260', '0070']
     end
     describe 'Micronesia (Federated States of)' do
       it_splits '6911991754', ['691', false, '199', '1754']
@@ -1229,6 +1246,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']
@@ -1317,6 +1335,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)
@@ -1427,6 +1446,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

@@ -4,197 +4,220 @@ describe Phony::CountryCodes do
   
   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')
+      
+      expect(cc).to eq '1'
+      expect(ndc).to eq '868'
+    end
+    it 'splits a ccc correctly' do
+      cc, ndc, *local = countries.split('1868')
+      
+      expect(cc).to eq '1'
+      expect(ndc).to eq '868'
+    end
+  end
+  
   describe '#[]' do
     it 'returns a country' do
-      countries['41'].class.should eql Phony::Country
+      expect(countries['41'].class).to eq Phony::Country
     end
   end
   
   describe '#country_for' do
     it 'returns a country' do
-      countries.send(:country_for, '41').class.should eql Phony::Country
+      expect(countries.send(:country_for, '41').class).to eq Phony::Country
     end
   end
   
   describe '#countrify' do
     it 'returns a country' do
-      countries.send(:countrify, '441231212', '41').should eql '41441231212'
+      expect(countries.send(:countrify, '441231212', '41')).to eq '41441231212'
     end
   end
   describe '#countrify!' do
     it 'in-place replaces the number' do
       number = '441231212'
-      countries.send(:countrify!, number, '41').should eql number
+      expect(countries.send(:countrify!, number, '41')).to eq number
       
-      number.should == '41441231212'
+      expect(number).to eq '41441231212'
     end
   end
   
   describe '#vanity?' do
     it 'returns true if so' do
-      countries.vanity?('1800HELLOES').should eql true
+      expect(countries.vanity?('1800HELLOES')).to eq true
     end
     it 'returns false if not' do
-      countries.vanity?('18001234567').should eql false
+      expect(countries.vanity?('18001234567')).to eq false
     end
   end
 
   describe 'normalize' do
     it 'normalizes correctly' do
-      countries.normalize('0041-44-364-35-32').should eql '41443643532'
+      expect(countries.normalize('0041-44-364-35-32')).to eq '41443643532'
     end
     it 'normalizes correctly with CC option' do
-      countries.normalize('044-364-35-32', cc: '41').should eql '41443643532'
+      expect(countries.normalize('044-364-35-32', cc: '41')).to eq '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'
+        expect(countries.normalize('+242 0571 73992')).to eq '242057173992'
+        expect(countries.normalize('+242 2221 15932')).to eq '242222115932'
       end
     end
   end
 
   describe 'formatted' do
     it 'formats correctly' do
-      countries.formatted('41443643532', :format => :international, :spaces => :-).should eql '+41-44-364-35-32'
+      expect(countries.formatted('41443643532', :format => :international, :spaces => :-)).to eq '+41-44-364-35-32'
     end
     it 'formats correctly' do
-      countries.formatted('41443643532', :format => :international_relative, :spaces => :-).should eql '0041-44-364-35-32'
+      expect(countries.formatted('41443643532', :format => :international_relative, :spaces => :-)).to eq '0041-44-364-35-32'
     end
     it 'formats correctly' do
-      countries.formatted('41443643532', :format => :national, :spaces => :-).should eql '044-364-35-32'
+      expect(countries.formatted('41443643532', :format => :national, :spaces => :-)).to eq '044-364-35-32'
     end
     context 'specific' do
       it 'formats Ireland correctly' do
-        countries.formatted("3533451234", :format => :national).should eql '0345 1234'
+        expect(countries.formatted("3533451234", :format => :national)).to eq '0345 1234'
       end
       it 'formats Ireland correctly' do
-        countries.formatted("353411231234", :format => :national).should eql '041 123 1234'
+        expect(countries.formatted("353411231234", :format => :national)).to eq '041 123 1234'
       end
       it 'formats Spain correctly' do
-        countries.formatted("34123456789", :format => :national).should eql '123 456 789'
+        expect(countries.formatted("34123456789", :format => :national)).to eq '123 456 789'
       end
       it 'formats Cambodia correctly' do
-        countries.formatted('85512239123', :format => :national).should eql '012 239 123'
+        expect(countries.formatted('85512239123', :format => :national)).to eq '012 239 123'
       end
       it 'formats the US correctly' do
-        countries.formatted('18005551212', :format => :national, :spaces => :-).should eql '(800)-555-1212'
+        expect(countries.formatted('18005551212', :format => :national, :spaces => :-)).to eq '(800)-555-1212'
       end
       it 'formats the US correctly' do
-        countries.formatted('18005551212', :format => :national, :spaces => :-).should eql '(800)-555-1212'
+        expect(countries.formatted('18005551212', :format => :national, :spaces => :-)).to eq '(800)-555-1212'
       end
     end
     context 'default' do
       it "should format swiss numbers" do
-        countries.formatted('41443643532').should eql '+41 44 364 35 32'
+        expect(countries.formatted('41443643532')).to eq '+41 44 364 35 32'
       end
       it "should format swiss service numbers" do
-        countries.formatted('41800112233').should eql '+41 800 112 233'
+        expect(countries.formatted('41800112233')).to eq '+41 800 112 233'
       end
       it "should format austrian numbers" do
-        countries.formatted('43198110').should eql '+43 1 98110'
+        expect(countries.formatted('43198110')).to eq '+43 1 98110'
       end
       it "should format american numbers" do
-        countries.formatted('18705551122').should eql '+1 (870) 555-1122'
+        expect(countries.formatted('18705551122')).to eq '+1 (870) 555-1122'
       end
       it "should format irish numbers" do
-        countries.formatted('35311234567').should eql '+353 1 123 4567'
+        expect(countries.formatted('35311234567')).to eq '+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'
+        expect(countries.formatted('18091231234', :format => :international)).to eq '+1 (809) 123-1234'
       end
       it "should format austrian numbers" do
-        countries.formatted('43198110', :format => :international).should eql '+43 1 98110'
+        expect(countries.formatted('43198110', :format => :international)).to eq '+43 1 98110'
       end
       it "should format austrian numbers" do
-        countries.formatted('43198110', :format => :international_absolute).should eql '+43 1 98110'
+        expect(countries.formatted('43198110', :format => :international_absolute)).to eq '+43 1 98110'
       end
       it "should format french numbers" do
-        countries.formatted('33142278186', :format => :+).should eql '+33 1 42 27 81 86'
+        expect(countries.formatted('33142278186', :format => :+)).to eq '+33 1 42 27 81 86'
       end
       it "should format austrian numbers" do
-        countries.formatted('43198110', :format => :international_relative).should eql '0043 1 98110'
+        expect(countries.formatted('43198110', :format => :international_relative)).to eq '0043 1 98110'
       end
       it 'should format liechtensteiner numbers' do
-        countries.formatted('4233841148', :format => :international_relative).should eql '00423 384 11 48'
+        expect(countries.formatted('4233841148', :format => :international_relative)).to eq '00423 384 11 48'
       end
       it "should format irish numbers" do
-        countries.formatted('35311234567', :format => :international).should eql '+353 1 123 4567'
+        expect(countries.formatted('35311234567', :format => :international)).to eq '+353 1 123 4567'
       end
       it "should format luxembourgian numbers" do
-        countries.formatted('352222809', :format => :international).should eql '+352 22 28 09'
+        expect(countries.formatted('352222809', :format => :international)).to eq '+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'
+        expect(countries.formatted('35226222809', :format => :international)).to eq '+352 2622 28 09'
       end
       it "should format luxembourgian mobile numbers" do
-        countries.formatted('352621123456', :format => :international).should eql '+352 621 123 456'
+        expect(countries.formatted('352621123456', :format => :international)).to eq '+352 621 123 456'
       end
       it "should format luxembourgian city numbers" do
-        countries.formatted('3524123456', :format => :international).should eql '+352 41 23 45 6'
+        expect(countries.formatted('3524123456', :format => :international)).to eq '+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'
+        expect(countries.formatted('352602112345678', :format => :international)).to eq '+352 6021 12 34 56 78'
       end
       it "should format luxembourgian numbers" do
-        countries.formatted('352370431', :format => :international).should eql '+352 37 04 31'
+        expect(countries.formatted('352370431', :format => :international)).to eq '+352 37 04 31'
       end
       it "should format luxembourgian numbers" do
-        countries.formatted('35227855', :format => :international).should eql '+352 27 85 5'
+        expect(countries.formatted('35227855', :format => :international)).to eq '+352 27 85 5'
       end
       it "should format nigerian lagosian numbers" do
-        countries.formatted('23414480000', :format => :international).should eql '+234 1 448 0000'
+        expect(countries.formatted('23414480000', :format => :international)).to eq '+234 1 448 0000'
       end
       it "should format nigerian beninese numbers" do
-        countries.formatted('23452123456', :format => :international).should eql '+234 52 123 456'
+        expect(countries.formatted('23452123456', :format => :international)).to eq '+234 52 123 456'
       end
       it "should format nigerian mobile numbers" do
-        countries.formatted('2347061234567', :format => :international).should eql '+234 706 123 4567'
+        expect(countries.formatted('2347061234567', :format => :international)).to eq '+234 706 123 4567'
       end
       context 'with no spaces' do
         it "should format north american numbers" do
-          Phony.formatted('18091231234', :format => :international, :spaces => '').should eql '+1(809)123-1234'
+          expect(Phony.formatted('18091231234', :format => :international, :spaces => '')).to eq '+1(809)123-1234'
         end
         it "should format austrian numbers" do
-          Phony.formatted('43198110', :format => :international, :spaces => '').should eql '+43198110'
+          expect(Phony.formatted('43198110', :format => :international, :spaces => '')).to eq '+43198110'
         end
         it "should format austrian numbers" do
-          Phony.formatted('43198110', :format => :international_absolute, :spaces => '').should eql '+43198110'
+          expect(Phony.formatted('43198110', :format => :international_absolute, :spaces => '')).to eq '+43198110'
         end
         it "should format french numbers" do
-          Phony.formatted('33142278186', :format => :+, :spaces => '').should eql '+33142278186'
+          expect(Phony.formatted('33142278186', :format => :+, :spaces => '')).to eq '+33142278186'
         end
         it "should format austrian numbers" do
-          Phony.formatted('43198110', :format => :international_relative, :spaces => '').should eql '0043198110'
+          expect(Phony.formatted('43198110', :format => :international_relative, :spaces => '')).to eq '0043198110'
         end
         it 'should format liechtensteiner numbers' do
-          Phony.formatted('4233841148', :format => :international_relative, :spaces => '').should eql '004233841148'
+          expect(Phony.formatted('4233841148', :format => :international_relative, :spaces => '')).to eq '004233841148'
         end
       end
       context 'with special spaces' do
         it "should format swiss numbers" do
-          Phony.formatted('41443643532', :format => :international).should eql '+41 44 364 35 32'
+          expect(Phony.formatted('41443643532', :format => :international)).to eq '+41 44 364 35 32'
         end
         it "should format north american numbers" do
-          Phony.formatted('18091231234', :format => :international, :spaces => :-).should eql '+1-(809)-123-1234'
+          expect(Phony.formatted('18091231234', :format => :international, :spaces => :-)).to eq '+1-(809)-123-1234'
         end
         it "should format austrian numbers" do
-          Phony.formatted('43198110', :format => :international, :spaces => :-).should eql '+43-1-98110'
+          expect(Phony.formatted('43198110', :format => :international, :spaces => :-)).to eq '+43-1-98110'
         end
         it "should format austrian numbers" do
-          Phony.formatted('43198110', :format => :international_absolute, :spaces => :-).should eql '+43-1-98110'
+          expect(Phony.formatted('43198110', :format => :international_absolute, :spaces => :-)).to eq '+43-1-98110'
         end
         it "should format french numbers" do
-          Phony.formatted('33142278186', :format => :+, :spaces => :-).should eql '+33-1-42-27-81-86'
+          expect(Phony.formatted('33142278186', :format => :+, :spaces => :-)).to eq '+33-1-42-27-81-86'
         end
         it "should format austrian numbers" do
-          Phony.formatted('43198110', :format => :international_relative, :spaces => :-).should eql '0043-1-98110'
+          expect(Phony.formatted('43198110', :format => :international_relative, :spaces => :-)).to eq '0043-1-98110'
         end
         it 'should format liechtensteiner numbers' do
-          Phony.formatted('4233841148', :format => :international_relative, :spaces => :-).should eql '00423-384-11-48'
+          expect(Phony.formatted('4233841148', :format => :international_relative, :spaces => :-)).to eq '00423-384-11-48'
         end
 
       end