phone 0.9.9.1 → 0.9.9.3

data/test/countries/si_test.rb

@@ -0,0 +1,21 @@
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+
+## Slovenia
+class SITest < Test::Unit::TestCase
+  
+  def test_local
+    #Maribor
+    parse_test('+ 386 2 23 46 611', '386', '2', '2346611')
+  end
+  
+  def test_local_2
+    # Koper
+    parse_test('+ 386 5 23 46 611', '386', '5', '2346611')
+  end  
+  
+  def test_mobile
+    # Mobitel
+    parse_test('+386 51 258999', '386', '51', '258999')
+  end
+  
+end

data/test/countries/ua_test.rb

@@ -0,0 +1,18 @@
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+
+## Ukraine
+class UATest < Test::Unit::TestCase
+
+  def test_local
+    parse_test('+380 57 711 22 33', '380', '57', '7112233')
+  end
+  
+  def test_mobile
+    parse_test('+380-50-111-22-33', '380', '50', '1112233')
+  end
+
+  def test_mobile2
+    parse_test('+380-66-042-22-01', '380', '66', '0422201')
+  end
+  
+end

data/test/countries/us_test.rb

@@ -0,0 +1,24 @@
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+
+## United States
+class USTest < Test::Unit::TestCase
+  
+  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
+    Phone.default_country_code = '1'
+    parse_test('2069735100', '1', '206', '9735100')
+  end
+
+  def test_short_with_default_country_code_and_area_code
+    Phone.default_country_code = '1'
+    Phone.default_area_code = '206'
+    parse_test('9735100', '1', '206', '9735100')
+  end  
+end

data/test/countries/za_test.rb

@@ -0,0 +1,21 @@
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+
+## South Africa
+class ZATest < Test::Unit::TestCase
+  
+  def test_local
+    # Telkom
+    parse_test('+27 11 555 5555', '27', '11', '5555555')
+  end
+
+  def test_mobile
+    # Vodacom
+    parse_test('+27 82 555 5555', '27', '82', '5555555')
+  end
+
+  def test_tollfree
+    # Telkom
+    parse_test('+27 800 123 321', '27', '800', '123321')
+  end
+  
+end

data/test/extension_test.rb

@@ -0,0 +1,25 @@
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
+
+class ExtensionTest < Test::Unit::TestCase
+
+  def test_parse_usa_long_with_simple_extension
+    pn = Phone.parse "+1 2069735100 x143"
+
+    assert_not_nil pn, %Q{parse should pass}
+    assert_equal '9735100', pn.number
+    assert_equal '206', pn.area_code
+    assert_equal '1', pn.country_code
+    assert_equal '143', pn.extension
+  end
+
+  def test_to_s_with_extension
+    pn = Phone.new '5125486', '91', '385', '143'
+    assert_equal '+385915125486x143', pn.format(:default_with_extension)
+  end
+
+  def test_format_with_extension
+    pn = Phone.new '5125486', '91', '385', '143'
+    assert_equal '(091)/512-5486 x 143', pn.format('(%A)/%f-%l x %x')
+  end
+
+end

data/test/phone_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 
 class PhoneTest < Test::Unit::TestCase
   
@@ -52,46 +52,6 @@ class PhoneTest < Test::Unit::TestCase
     assert_equal Phone.parse(nil), nil
   end
   
-  def test_parse_long_without_special_characters
-    pn = Phone.parse "+385915125486"
-    
-    assert_equal pn.number, '5125486'
-    assert_equal pn.area_code, '91'
-    assert_equal pn.country_code, '385'    
-  end
-  
-  def test_parse_zagreb_long_without_special_characters
-    pn = Phone.parse "+38513668734"
-    
-    assert_equal pn.number, '3668734'
-    assert_equal pn.area_code, '1'
-    assert_equal pn.country_code, '385'    
-  end  
-  
-  def test_parse_long_with_special_characters
-    pn = Phone.parse "+ 385 (91) 512 / 5486 "
-    
-    assert pn.number == '5125486'
-    assert pn.area_code == '91'
-    assert pn.country_code == '385'    
-  end  
-  
-  def test_parse_long_with_leading_zeros
-    pn = Phone.parse "00385915125486"
-    
-    assert pn.number == '5125486'
-    assert pn.area_code == '91'
-    assert pn.country_code == '385'    
-  end  
-  
-  def test_parse_zagreb_long_with_leading_zeros
-    pn = Phone.parse "0038513668734"
-    
-    assert pn.number == '3668734'
-    assert pn.area_code == '1'
-    assert pn.country_code == '385'    
-  end     
-  
   def test_parse_short_without_special_characters_without_country
     Phone.default_country_code = nil
      
@@ -100,45 +60,14 @@ class PhoneTest < Test::Unit::TestCase
     end
   end  
   
-  def test_parse_short_without_special_characters_with_country
-    Phone.default_country_code = '385'
-        
-    pn = Phone.parse "044885047"
-    
-    assert_equal pn.number, '885047'
-    assert_equal pn.area_code, '44'
-    assert pn.country_code == '385'
-  end  
-  
-  def test_parse_zagreb_short_without_special_characters_with_country
-    Phone.default_country_code = '385'
-        
-    pn = Phone.parse "013668734"
-    
-    assert_equal pn.number, '3668734'
-    assert_equal pn.area_code, '1'
-    assert_equal pn.country_code, '385'
-  end     
-  
   def test_parse_short_with_special_characters_without_country
     Phone.default_country_code = nil
         
     assert_raise RuntimeError do
       pn = Phone.parse "091/512-5486"
     end
-  end      
-  
-  def test_parse_long_with_zero_in_brackets
-    Phone.default_country_code = nil
-    
-    pn = Phone.parse '+385 (0)1 366 8111'    
-    assert_equal pn.country_code, '385'
-    assert_equal pn.area_code, '1'
-    assert_equal pn.number, '3668111'
   end
   
-  
-  
   def test_to_s
     Phone.default_country_code = nil    
     pn = Phone.new '5125486', '91', '385'
@@ -174,34 +103,4 @@ class PhoneTest < Test::Unit::TestCase
     assert_equal Phone.valid?('385915125486'), false
   end
   
-  def test_validates
-    Phone.default_country_code = nil
-    assert_equal Phone.valid?('00385915125486'), true                    
-    assert_equal Phone.valid?('+385915125486'), true
-    assert_equal Phone.valid?('+385 (91) 512 5486'), true                  
-    assert_equal Phone.valid?('+38547451588'), true            
-
-    Phone.default_country_code = '385'    
-    assert_equal Phone.valid?('0915125486'), true
-    assert_equal Phone.valid?('091/512-5486'), true
-    assert_equal Phone.valid?('091/512-5486'), true
-    assert_equal Phone.valid?('091 512 54 86'), true    
-    assert_equal Phone.valid?('091-512-54-86'), true    
-    assert_equal Phone.valid?('047/451-588'), true    
-  end
-  
-  def test_has_default_country_code
-    Phone.default_country_code = '385'
-    
-    assert_equal Phone.parse('+38547451588').has_default_country_code?, true
-    assert_equal Phone.parse('+38647451588').has_default_country_code?, false
-  end
-  
-  def test_has_default_area_code
-    Phone.default_country_code = '385'    
-    Phone.default_area_code = '47'
-    
-    assert_equal Phone.parse('047/451-588').has_default_area_code?, true
-    assert_equal Phone.parse('032/336-1456').has_default_area_code?, false
-  end  
 end

data/test/test_helper.rb

@@ -4,3 +4,12 @@ require 'rubygems'
 
 require 'test/unit'
 require 'phone'
+
+def parse_test(raw, country_code, area_code, number)
+  pn = Phone.parse(raw)
+  
+  assert_not_nil pn, %Q{parse should pass}
+  assert_equal pn.country_code, country_code
+  assert_equal pn.area_code, area_code
+  assert_equal pn.number, number
+end

metadata

@@ -1,32 +1,32 @@
 --- !ruby/object:Gem::Specification 
 name: phone
 version: !ruby/object:Gem::Version 
-  version: 0.9.9.1
+  hash: 37
+  prerelease: false
+  segments: 
+  - 0
+  - 9
+  - 9
+  - 3
+  version: 0.9.9.3
 platform: ruby
 authors: 
 - Tomislav Car
 - Todd Eichel
+- Don Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-03-08 00:00:00 +01:00
+date: 2010-07-30 00:00:00 +02:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
+dependencies: []
+
 description: Phone number parsing, validation and formatting.
 email: 
 - tomislav@infinum.hr
 - todd@toddeichel.com
+- elskwid@gmail.com
 executables: []
 
 extensions: []
@@ -40,9 +40,25 @@ files:
 - data/phone_countries.yml
 - lib/phone.rb
 - lib/phone_country.rb
+- lib/support.rb
+- test/extension_test.rb
 - test/phone_test.rb
-- test/phone_country_test.rb
 - test/test_helper.rb
+- test/countries/au_test.rb
+- test/countries/ba_test.rb
+- test/countries/be_test.rb
+- test/countries/de_test.rb
+- test/countries/fr_test.rb
+- test/countries/gb_test.rb
+- test/countries/hr_test.rb
+- test/countries/hu_test.rb
+- test/countries/nl_test.rb
+- test/countries/rs_test.rb
+- test/countries/se_test.rb
+- test/countries/si_test.rb
+- test/countries/ua_test.rb
+- test/countries/us_test.rb
+- test/countries/za_test.rb
 has_rdoc: true
 homepage: http://github.com/carr/phone
 licenses: []
@@ -56,25 +72,46 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Phone number parsing, validation and formatting
 test_files: 
+- test/extension_test.rb
 - test/phone_test.rb
-- test/phone_country_test.rb
 - test/test_helper.rb
+- test/countries/au_test.rb
+- test/countries/ba_test.rb
+- test/countries/be_test.rb
+- test/countries/de_test.rb
+- test/countries/fr_test.rb
+- test/countries/gb_test.rb
+- test/countries/hr_test.rb
+- test/countries/hu_test.rb
+- test/countries/nl_test.rb
+- test/countries/rs_test.rb
+- test/countries/se_test.rb
+- test/countries/si_test.rb
+- test/countries/ua_test.rb
+- test/countries/us_test.rb
+- test/countries/za_test.rb

data/test/phone_country_test.rb

@@ -1,124 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper'
-
-class PhoneCountryTest < Test::Unit::TestCase
-  def test_parse_germany_local
-    pn = Phone.parse('+49 714 1605832')    
-
-    assert_equal pn.country_code, '49'
-    assert_equal pn.area_code, '714'
-    assert_equal pn.number, '1605832'
-  end
-  
-  def test_parse_germany_mobile
-    pn = Phone.parse('+49 162 3499558')
-
-    assert_equal pn.country_code, '49'
-    assert_equal pn.area_code, '162'
-    assert_equal pn.number, '3499558'
-  end  
-  
-  def test_parse_hungary_mobile
-    pn = Phone.parse('+36 30 5517999')    
-
-    assert_equal pn.country_code, '36'
-    assert_equal pn.area_code, '30'
-    assert_equal pn.number, '5517999'
-  end  
-  
-  def test_parse_slovenia_local
-    #Maribor
-    pn = Phone.parse '+ 386 2 23 46 611'
-    
-    assert_equal pn.country_code, '386'
-    assert_equal pn.area_code, '2'
-    assert_equal pn.number, '2346611'    
-  end
-  
-  def test_parse_slovenia_local_2
-    # Koper
-    pn = Phone.parse '+ 386 5 23 46 611'
-    
-    assert_equal pn.country_code, '386'
-    assert_equal pn.area_code, '5'
-    assert_equal pn.number, '2346611'    
-  end  
-  
-  def test_parse_slovenia_mobile
-    # Mobitel
-    pn = Phone.parse('+386 51 258999')    
-
-    assert_equal pn.country_code, '386'
-    assert_equal pn.area_code, '51'
-    assert_equal pn.number, '258999'
-  end
-  
-  def test_parse_serbia_local
-    # Beograd
-    pn = Phone.parse('+381 11 24 33 836')
-
-    assert_equal pn.country_code, '381'
-    assert_equal pn.area_code, '11'
-    assert_equal pn.number, '2433836'
-  end
-  
-  
-  def test_parse_serbia_mobile
-    # mts
-    pn = Phone.parse('+381 648542987')
-
-    assert_equal pn.country_code, '381'
-    assert_equal pn.area_code, '64'
-    assert_equal pn.number, '8542987'
-  end  
-  
-  def test_parse_bosnia_local
-    pn = Phone.parse '+387 33 25 02 33'
-    
-    assert_equal pn.country_code, '387'
-    assert_equal pn.area_code, '33'
-    assert_equal pn.number, '250233'    
-  end
-
-  def test_parse_south_africa_local
-    # Telkom
-    pn = Phone.parse('+27 11 555 5555')
-
-    assert_equal pn.country_code, '27'
-    assert_equal pn.area_code, '11'
-    assert_equal pn.number, '5555555'
-  end
-
-  def test_parse_south_africa_mobile
-    # Vodacom
-    pn = Phone.parse('+27 82 555 5555')
-
-    assert_equal pn.country_code, '27'
-    assert_equal pn.area_code, '82'
-    assert_equal pn.number, '5555555'
-  end
-
-  def test_parse_south_africa_tollfree
-    # Telkom
-    pn = Phone.parse('+27 800 123 321')
-
-    assert_equal pn.country_code, '27'
-    assert_equal pn.area_code, '800'
-    assert_equal pn.number, '123321'
-  end
-  
-  def test_parse_france_local
-    pn = Phone.parse('+33 4 75 06 07 07')
-    
-    assert_equal pn.country_code, '33'
-    assert_equal pn.area_code, '4'
-    assert_equal pn.number, '75060707'
-  end
-  
-  def test_parse_france_mobile
-    pn = Phone.parse('+33 6 11 22 33 44')
-    
-    assert_equal pn.country_code, '33'
-    assert_equal pn.area_code, '6'
-    assert_equal pn.number, '11223344'
-  end
-end