phone 1.2.3 → 1.3.0.beta0

data/test/countries/us_test.rb

@@ -1,16 +1,16 @@
-require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+require "helper"
 
 ## United States
-class USTest < Test::Unit::TestCase
-  
+class USTest < Minitest::Test
+
   def test_local
     parse_test('+1 555 123 4567', '1', '555', '1234567')
   end
-  
+
   def test_tollfree
     parse_test('+1 800 555 3456', '1', '800', '5553456')
   end
-  
+
   def test_long_with_default_country_code
     Phoner::Phone.default_country_code = '1'
     parse_test('2069735100', '1', '206', '9735100')
@@ -20,5 +20,5 @@ class USTest < Test::Unit::TestCase
     Phoner::Phone.default_country_code = '1'
     Phoner::Phone.default_area_code = '206'
     parse_test('9735100', '1', '206', '9735100')
-  end  
+  end
 end

data/test/countries/uy_test.rb

@@ -0,0 +1,22 @@
+require "helper"
+
+## Uruguay
+# source: http://en.wikipedia.org/wiki/Telephone_numbers_in_Uruguay
+class UYTest < Minitest::Test
+
+  # 02 Montevideo
+  def test_montevideo
+    parse_test('+598 2 1234567', '598', '2', '1234567')
+  end
+
+  # 042 Maldonado
+  def test_maldonado
+    parse_test('+598 42 123456', '598', '42', '123456')
+  end
+
+  # 09 Mobile phones
+  def test_mobile_phones
+    parse_test('+598 99 570110', '598', '99', '570110')
+  end
+
+end

data/test/countries/za_test.rb

@@ -1,8 +1,8 @@
-require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+require "helper"
 
 ## South Africa
-class ZATest < Test::Unit::TestCase
-  
+class ZATest < Minitest::Test
+
   def test_local
     # Telkom
     parse_test('+27 11 555 5555', '27', '11', '5555555')
@@ -17,5 +17,5 @@ class ZATest < Test::Unit::TestCase
     # Telkom
     parse_test('+27 800 123 321', '27', '800', '123321')
   end
-  
+
 end

data/test/extension_test.rb

@@ -1,11 +1,11 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper')
+require "helper"
 
-class ExtensionTest < Test::Unit::TestCase
+class ExtensionTest < Minitest::Test
 
   def test_parse_usa_long_with_simple_extension
     pn = Phoner::Phone.parse "+1 2069735100 x143"
 
-    assert_not_nil pn, %Q{parse should pass}
+    refute_nil pn, %Q{parse should pass}
     assert_equal '9735100', pn.number
     assert_equal '206', pn.area_code
     assert_equal '1', pn.country_code

data/test/helper.rb

@@ -0,0 +1,41 @@
+require "rubygems"
+
+begin
+  require "bundler"
+rescue LoadError => e
+  STDERR.puts e.message
+  STDERR.puts "Run `gem install bundler` to install Bundler."
+  exit e.status_code
+end
+
+begin
+  Bundler.setup(:default, :development, :test)
+rescue Bundler::BundlerError => e
+  STDERR.puts e.message
+  STDERR.puts "Run `bundle install` to install missing gems."
+  exit e.status_code
+end
+
+require "phone"
+require "minitest/autorun"
+
+class Minitest::Test
+  def setup
+    Phoner::Phone.default_country_code = nil
+    Phoner::Phone.default_area_code = nil
+  end
+
+  def teardown
+    Phoner::Phone.default_country_code = nil
+    Phoner::Phone.default_area_code = nil
+  end
+end
+
+def parse_test(raw, country_code, area_code, number)
+  pn = Phoner::Phone.parse(raw)
+
+  refute_nil pn, %Q{parse should pass}
+  assert_equal country_code, pn.country_code
+  assert_equal area_code, pn.area_code
+  assert_equal number, pn.number
+end

data/test/phone_test.rb

@@ -1,119 +1,166 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper')
+require "helper"
 
-class PhoneTest < Test::Unit::TestCase
-  
-  def test_number_without_country_code_initialize    
+class PhoneTest < Minitest::Test
+
+  def test_with_nil_number_initialize
+    assert_raises Phoner::BlankNumberError do
+      pn = Phoner::Phone.new nil
+    end
+  end
+
+  def test_with_empty_number_initialize
+    assert_raises Phoner::BlankNumberError do
+      pn = Phoner::Phone.new ""
+    end
+  end
+
+  def test_number_without_country_code_initialize
     Phoner::Phone.default_country_code = nil
 
-    assert_raise Phoner::CountryCodeError do
+    assert_raises Phoner::CountryCodeError do
       pn = Phoner::Phone.new '5125486', '91'
     end
   end
-  
-  def test_number_without_country_and_area_code_initialize    
+
+  def test_number_without_country_and_area_code_initialize
     Phoner::Phone.default_country_code = nil
     Phoner::Phone.default_area_code = nil
 
-    assert_raise Phoner::AreaCodeError do
+    assert_raises Phoner::AreaCodeError do
       pn = Phoner::Phone.new '451588'
     end
-  end  
-  
-  def test_number_with_default_area_code_initialize    
+  end
+
+  def test_number_with_default_area_code_initialize
     Phoner::Phone.default_country_code = '385'
-    Phoner::Phone.default_area_code = '47'    
-    
+    Phoner::Phone.default_area_code = '47'
+
     pn = Phoner::Phone.new '451588'
     assert pn.number == '451588'
-    assert pn.area_code == '47'    
-    assert pn.country_code == '385' 
-  end    
-  
+    assert pn.area_code == '47'
+    assert pn.country_code == '385'
+  end
+
   def test_number_with_default_country_code_initialize
     Phoner::Phone.default_country_code = '386'
-    
+
     pn = Phoner::Phone.new '5125486', '91'
     assert pn.number == '5125486'
-    assert pn.area_code == '91'    
-    assert pn.country_code == '386'    
-  end  
-  
+    assert pn.area_code == '91'
+    assert pn.country_code == '386'
+  end
+
   def test_number_with_country_code_initialize
     Phoner::Phone.default_country_code = '387'
-    
+
     pn = Phoner::Phone.new '5125486', '91', '385'
     assert pn.number == '5125486'
     assert pn.area_code == '91'
     assert pn.country_code == '385'
-  end  
-  
+  end
+
   def test_parse_empty
     assert_equal Phoner::Phone.parse(''), nil
     assert_equal Phoner::Phone.parse(nil), nil
   end
-  
+
+  def test_parse_with_special_characters_with_country
+    pn = Phoner::Phone.parse "+1 545-545-5454"
+    assert "1", pn.country_code
+    assert "545", pn.area_code
+    assert "5455454", pn.number
+  end
+
+  def test_parse_with_extension
+    pn = Phoner::Phone.parse"+1 545-545-5454 ext. 4307"
+    assert "1", pn.country_code
+    assert "545", pn.area_code
+    assert "5455454", pn.number
+    assert "4307", pn.extension
+  end
+
   def test_parse_short_without_special_characters_without_country
     Phoner::Phone.default_country_code = nil
 
-    assert_raise Phoner::CountryCodeError do
+    assert_raises Phoner::CountryCodeError do
       pn = Phoner::Phone.parse "0915125486"
     end
-  end  
-  
+  end
+
   def test_parse_short_with_special_characters_without_country
     Phoner::Phone.default_country_code = nil
 
-    assert_raise Phoner::CountryCodeError do
+    assert_raises Phoner::CountryCodeError do
       pn = Phoner::Phone.parse "091/512-5486"
     end
   end
-  
+
   def test_to_s
-    Phoner::Phone.default_country_code = nil    
+    Phoner::Phone.default_country_code = nil
     pn = Phoner::Phone.new '5125486', '91', '385'
     assert pn.to_s == '+385915125486'
-  end  
-  
+  end
+
   def test_to_s_without_country_code
-    Phoner::Phone.default_country_code = '385'   
+    Phoner::Phone.default_country_code = '385'
     pn = Phoner::Phone.new '5125486', '91'
     assert pn.format("0%a%n") == '0915125486'
   end
-  
+
   def test_format_special_with_country_code
-    Phoner::Phone.default_country_code = nil    
+    Phoner::Phone.default_country_code = nil
     pn = Phoner::Phone.new '5125486', '91', '385'
     assert pn.format("+ %c (%a) %n") == '+ 385 (91) 5125486'
-  end  
-  
+  end
+
   def test_format_special_without_country_code
-    Phoner::Phone.default_country_code = '385'    
+    Phoner::Phone.default_country_code = '385'
     pn = Phoner::Phone.new '5125486', '91'
     assert_equal pn.format("%A/%f-%l"), '091/512-5486'
-  end  
-  
+  end
+
   def test_format_with_symbol_specifier
-    Phoner::Phone.default_country_code = nil    
+    Phoner::Phone.default_country_code = nil
     pn = Phoner::Phone.new '5125486', '91', '385'
     assert_equal pn.format(:europe), '+385 (0) 91 512 5486'
-  end    
-  
+  end
+
+  def test_validity
+    assert true, Phoner::Phone.valid?("+17788827175")
+  end
+
+  def test_successful_validity_wont_alter_parameter
+    number = "+17755551212"
+    Phoner::Phone.valid?(number)
+    assert_equal "+17755551212", number
+  end
+
+  def test_failing_validity_wont_alter_parameter
+    number = "ABC123"
+    Phoner::Phone.valid?(number)
+    assert_equal "ABC123", number
+  end
+
+  def test_validity_with_country_code
+    assert true, Phoner::Phone.valid?("7788827175", :country_code => "1")
+  end
+
   def test_doesnt_validate
     assert_equal Phoner::Phone.valid?('asdas'), false
     assert_equal Phoner::Phone.valid?('385915125486'), false
   end
-  
+
   def test_comparison_true
-    pn1 = Phoner::Phone.new '5125486', '91', '385'    
-    pn2 = Phoner::Phone.new '5125486', '91', '385'    
+    pn1 = Phoner::Phone.new '5125486', '91', '385'
+    pn2 = Phoner::Phone.new '5125486', '91', '385'
     assert pn1 == pn2
   end
-  
+
   def test_comparison_false
-    pn1 = Phoner::Phone.new '5125486', '91', '385'    
-    pn2 = Phoner::Phone.new '1234567', '91', '385'    
+    pn1 = Phoner::Phone.new '5125486', '91', '385'
+    pn2 = Phoner::Phone.new '1234567', '91', '385'
     assert pn1 != pn2
-  end  
+  end
 
   def test_find_by_country_isocode
     Phoner::Country.load
@@ -121,5 +168,4 @@ class PhoneTest < Test::Unit::TestCase
     assert_equal Phoner::Country.find_by_country_isocode('xx'), nil
     assert_equal Phoner::Country.find_by_country_isocode('bla'), nil
   end
-
 end

data/test_usa_phones_with_extensions.csv

@@ -0,0 +1,99 @@
+601-867-5000 ext 75292
+(334)821-2223 Ext. 107
+(863) 983-6171 ext: 0055
+601-987-3995 ext 10
+(512) 473-3200Ext2396
+(727) 558-5010 ext: 0112
+(904) 360-5611 ext: 5611
+(937) 255-7204Ext337
+228-374-5022 ext 5386
+(205)987-3500 Ext. 205-32
+(607) 273-8588x402
+(205)328-3330 Ext. 802-59
+(407) 251-2452 ext: 0146
+502-564-8110 xt 312
+(828) 698-3923x13
+(608)836-7433 Ext. 5147
+(1-808)935-3222 Ext. 2#
+(770)420-3179 Ext. x 179
+(415) 558-8669x218
+(205)879-6330 Ext. 731-50
+(205)987-5995 Ext. 802-58
+(609) 924-2200Ext10
+(312) 440-4373x12
+(978) 369-9602x457
+1-602-264-1774 # 135
+502-564-8890 x4340
+502-564-5550 x4569
+(480)437-2600 Ext. VM123
+(850) 245-4131 ext: 3506
+601-354-6161 ext 103
+(414)778-5400 Ext. 127
+(262)338-4475 Ext. #16
+(602) 264-1774 extention # 135
+(314) 361-3221x107
+(800) 255-5747x46
+410-514-7336 TDDTTY + Voice
+(617) 695-2300x393
+1-334-386-8800 Ext. 107
+(928)634-9536 Ext. 143
+502-573-1555 x266
+(978) 927-8000x246
+(920) 887-4600Ext340
+502-564-1404 x4536
+(850) 245-6774 ext: 4774
+(718) 852-3000 Ext 269
+228-374-5022 ext 5022
+502-564-0105 x10260
+(850) 000-0000 ext: 00000000
+(979) 233-1616x306
+(207) 333-3267x224
+(561) 625-5122 ext: 687
+(386) 961-7414 ext: 7414
+(262)549-2249 Ext. 104
+(205)322-7500 Ext. BECKYS
+(303)858-8100 Ext. n.a.
+(937) 255-7204x337
+601-944-4830 ext 104
+228-432-1056 ext 104
+(209) 586-1495Ext104
+502-564-8139 : 4645
+(602) 264-1774 ext is 135
+(602) 264-1774Ext135
+502-564-7822 x4212
+(609) 921-8808Ext3
+(703) 739-7900x222
+(609) 758-2241x144
+(970)223-6500 Ext. X6510
+(734) 485-2000Ext255
+(904) 620-4424 ext: 8614424
+(904) 827-2520 ext: 2520
+(978) 774-1050x251
+(541) 343-0123x2269
+(608)277-2752 Ext. 2752
+(203) 869-6786x335
+502-564-5981 x272
+606-878-5908 x6085
+502-564-2257 x3464
+(205)871-1911 Ext. (205)
+502-564-7770 x3965
+(608)374-2130 Ext. 28
+(850) 410-9660 ext: 9240
+601-987-6837 ext 102
+(414)529-1101 Ext. 153
+(209) 586-1495x104
+(520)408-1885 Ext. # 227
+601-605-5388 ext 100
+(352) 375-8484 ext: 0174
+15025645981x225
+(602) 264-1774 X 135
+(205)803-1499 Ext. 414-03
+(651) 459-4121x203
++61 3 9811 2400
+(262)681-2020 Ext. 6682
+601-944-4845 ext 118
+384-1100 VOICE MAIL:3004
+(205)251-1267 Ext. 802-09
+(410) 280-2038Ext11
+502-564-3170 x190
+15025646734x4420