phone 1.1 → 1.2.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 9927575529414f0e507e81c228a7c6106670a6ab
+  data.tar.gz: f8ac795cbf0043375ecdb6d100210cdfe6dc2198
+SHA512:
+  metadata.gz: d21a6eb4e3e3e10e102b20dc63a9e477b85ba5a72761d996d36b5a61ac7880050d38b16458cf7b5897fe60604ae6f8abefeaa050495216eb1889f3a65b64f57c
+  data.tar.gz: a76493f7a957f556b3074cc3554da658793786de605e33b0b3c021abb0ba1c025e2b8f959e1f078760fd1c05763dc68f308a14a82adb613d10d54cad13ebd983

data/Readme.rdoc

@@ -85,15 +85,6 @@ You can add your own custom named formats like so:
     Phoner::Phone.named_formats[:short] = '%A/%n1-%n2'    
     pn.format(:short) # => 091/512-5486
 
-== Finding countries by their isocode
-If you don't have the country code, but you know from other sources what country a phone is from, you can retrieve the country using the country isocode (such as 'de', 'es', 'us', ...).
-
-    if country = Phoner::Country.find_by_country_isocode(user_country_isocode)
-      phone_number = Phoner::Phone.parse(user_input, :country_code => country.country_code)
-    end
-
-You have to remember to run Phoner::Country.load method before though.
-
 = TODO
 Parse testing for different countries. 
 
@@ -102,7 +93,6 @@ Currently tested on:
 [BA] Bosnia and Herzegovina
 [BE] Belgium
 [DE] Germany
-[ES] Spain
 [FR] France
 [GB] United Kingdom
 [HR] Croatia
@@ -116,11 +106,11 @@ Currently tested on:
 [ZA] South Africa
 
 = Known issues
-There's an issue with Germany and Spanish area codes.
+There's an issue with Germany and area codes.
 
 = Author
 Copyright © 2010 Tomislav Car, {Infinum}[http://www.infinumdigital.com]
 
 = Contributors
-Don Morrison, Michael Squires, Todd Eichel (Fooala, Inc.), chipiga, Etienne Samson, Luke Randall, Jakob Hilden, Tieg Zaharia
+Don Morrison, Michael Squires, Todd Eichel (Fooala, Inc.), chipiga, Etienne Samson, Luke Randall
 

data/data/phone_countries.yml

@@ -572,7 +572,6 @@
   :char_3_code: ES
   :name: Spain
   :international_dialing_prefix: "0"
-  :area_code: "6[0-9][0-9]|7[1-9][0-9]|9[0-9][0-9]"
 "232": 
   :country_code: "232"
   :national_dialing_prefix: "0"

data/lib/country.rb

@@ -1,5 +1,5 @@
 module Phoner
-  class Country < Struct.new(:name, :country_code, :char_2_code, :char_3_code, :area_code)
+  class Country < Struct.new(:name, :country_code, :char_2_code, :area_code)
     cattr_accessor :all
 
     def self.load
@@ -9,7 +9,7 @@ module Phoner
 
       @@all = {}
       YAML.load(File.read(data_file)).each_pair do |key, c|
-        @@all[key] = Country.new(c[:name], c[:country_code], c[:char_2_code], c[:char_3_code], c[:area_code])
+        @@all[key] = Country.new(c[:name], c[:country_code], c[:char_2_code], c[:area_code])
       end
       @@all
     end
@@ -19,17 +19,12 @@ module Phoner
     end
 
     def self.find_by_country_code(code)
-      @@all[code]
+      @@all[code]    
     end
-    
-    def self.find_by_country_isocode(isocode)
-      if country = @@all.detect{|c|c[1].char_3_code.downcase == isocode}
-        country[1]
-      end
-    end
-    
+
     def country_code_regexp
-      Regexp.new("^[+]#{country_code}")
+      Regexp.new("^[+]#{country_code}")    
     end
   end
-end
+  
+end

data/lib/errors.rb

@@ -0,0 +1,6 @@
+module Phoner
+  class PhoneError < RuntimeError;end
+  class BlankNumberError < PhoneError;end
+  class AreaCodeError < PhoneError;end
+  class CountryCodeError < PhoneError;end
+end

data/lib/phone.rb

@@ -11,11 +11,12 @@
 #
 require File.join(File.dirname(__FILE__), 'support') unless defined? ActiveSupport
 require File.join(File.dirname(__FILE__), 'country')
+require File.join(File.dirname(__FILE__), 'errors')
 
 module Phoner
   class Phone
     NUMBER = '([0-9]{1,8})$'  
-    DEFAULT_AREA_CODE = '[0-9][0-9][0-9]' # any 3 digits
+    DEFAULT_AREA_CODE = '[2-9][0-8][0-9]' # USA
 
     attr_accessor :country_code, :area_code, :number, :extension
 
@@ -48,9 +49,9 @@ module Phoner
       self.country_code = hash_or_args[ keys[:country_code] ] || self.default_country_code      
       self.extension = hash_or_args[ keys[:extension] ]
 
-      raise "Must enter number" if self.number.blank?
-      raise "Must enter area code or set default area code" if self.area_code.blank?
-      raise "Must enter country code or set default country code" if self.country_code.blank?    
+      raise NumberError, "Must enter number" if self.number.blank?
+      raise AreaCodeError, "Must enter area code or set default area code" if self.area_code.blank?
+      raise CountryCodeError, "Must enter country code or set default country code" if self.country_code.blank?
     end
 
     # create a new phone number by parsing a string
@@ -78,7 +79,8 @@ module Phoner
     def self.valid?(string)
       begin
         parse(string).present?
-      rescue RuntimeError # if we encountered exceptions (missing country code, missing area code etc)
+      # if we encountered exceptions (missing country code, missing area code etc)
+      rescue PhoneError
         return false
       end
     end
@@ -98,9 +100,9 @@ module Phoner
 
       if country.nil?
         if options[:country_code].nil?
-          raise "Must enter country code or set default country code"
+          raise CountryCodeError, "Must enter country code or set default country code"
         else
-          raise "Could not find country with country code #{options[:country_code]}"
+          raise CountryCodeError, "Could not find country with country code #{options[:country_code]}"
         end
       end
 
@@ -157,7 +159,7 @@ module Phoner
 
     # fix string so it's easier to parse, remove extra characters etc.
     def self.normalize(string_with_number)
-      string_with_number.gsub("(0)", "").gsub(/[^0-9+]/, '').gsub(/^00/, '+').gsub(/^\+00/, '+').gsub(/^\+0/, '+')
+      string_with_number.gsub("(0)", "").gsub(/[^0-9+]/, '').gsub(/^00/, '+')
     end
 
     # pull off anything that look like an extension
@@ -255,4 +257,4 @@ module Phoner
       return result
     end
   end  
-end
+end

data/test/phone_test.rb

@@ -4,17 +4,17 @@ class PhoneTest < Test::Unit::TestCase
   
   def test_number_without_country_code_initialize    
     Phoner::Phone.default_country_code = nil
-    
-    assert_raise RuntimeError do
+
+    assert_raise Phoner::CountryCodeError do
       pn = Phoner::Phone.new '5125486', '91'
     end
   end
   
   def test_number_without_country_and_area_code_initialize    
     Phoner::Phone.default_country_code = nil
-    Phoner::Phone.default_area_code = nil    
-    
-    assert_raise RuntimeError do
+    Phoner::Phone.default_area_code = nil
+
+    assert_raise Phoner::AreaCodeError do
       pn = Phoner::Phone.new '451588'
     end
   end  
@@ -54,16 +54,16 @@ class PhoneTest < Test::Unit::TestCase
   
   def test_parse_short_without_special_characters_without_country
     Phoner::Phone.default_country_code = nil
-     
-    assert_raise RuntimeError do   
+
+    assert_raise Phoner::CountryCodeError do
       pn = Phoner::Phone.parse "0915125486"
     end
   end  
   
   def test_parse_short_with_special_characters_without_country
     Phoner::Phone.default_country_code = nil
-        
-    assert_raise RuntimeError do
+
+    assert_raise Phoner::CountryCodeError do
       pn = Phoner::Phone.parse "091/512-5486"
     end
   end
@@ -114,12 +114,4 @@ class PhoneTest < Test::Unit::TestCase
     pn2 = Phoner::Phone.new '1234567', '91', '385'    
     assert pn1 != pn2
   end  
-
-  def test_find_by_country_isocode
-    Phoner::Country.load
-    assert_equal Phoner::Country.find_by_country_isocode('de').country_code, "49"
-    assert_equal Phoner::Country.find_by_country_isocode('xx'), nil
-    assert_equal Phoner::Country.find_by_country_isocode('bla'), nil
-  end
-
 end

metadata

@@ -1,42 +1,34 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: phone
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 1
-  version: "1.1"
+version: !ruby/object:Gem::Version
+  version: 1.2.1
 platform: ruby
-authors: 
+authors:
 - Tomislav Car
 - Todd Eichel
 - Don Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-24 00:00:00 +02:00
-default_executable: 
+date: 2013-10-24 00:00:00.000000000 Z
 dependencies: []
-
 description: Phone number parsing, validation and formatting.
-email: 
+email:
 - tomislav@infinum.hr
 - todd@toddeichel.com
 - elskwid@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - Readme.rdoc
 - LICENSE
-files: 
+files:
 - Readme.rdoc
 - LICENSE
 - data/phone_countries.yml
 - lib/phone.rb
 - lib/country.rb
+- lib/errors.rb
 - lib/support.rb
 - test/extension_test.rb
 - test/phone_test.rb
@@ -45,7 +37,6 @@ files:
 - test/countries/ba_test.rb
 - test/countries/be_test.rb
 - test/countries/de_test.rb
-- test/countries/es_test.rb
 - test/countries/fr_test.rb
 - test/countries/gb_test.rb
 - test/countries/hr_test.rb
@@ -57,44 +48,35 @@ files:
 - test/countries/si_test.rb
 - test/countries/ua_test.rb
 - test/countries/us_test.rb
-- test/countries/uy_test.rb
 - test/countries/za_test.rb
-has_rdoc: true
 homepage: http://github.com/carr/phone
 licenses: []
-
+metadata: {}
 post_install_message: 
-rdoc_options: 
-- --main
+rdoc_options:
+- "--main"
 - Readme.rdoc
-- --inline-source
-- --charset=UTF-8
-require_paths: 
+- "--inline-source"
+- "--charset=UTF-8"
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Phone number parsing, validation and formatting
-test_files: 
+test_files:
 - test/extension_test.rb
 - test/phone_test.rb
 - test/test_helper.rb
@@ -102,7 +84,6 @@ test_files:
 - test/countries/ba_test.rb
 - test/countries/be_test.rb
 - test/countries/de_test.rb
-- test/countries/es_test.rb
 - test/countries/fr_test.rb
 - test/countries/gb_test.rb
 - test/countries/hr_test.rb
@@ -114,5 +95,4 @@ test_files:
 - test/countries/si_test.rb
 - test/countries/ua_test.rb
 - test/countries/us_test.rb
-- test/countries/uy_test.rb
 - test/countries/za_test.rb

data/test/countries/es_test.rb

@@ -1,33 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
-
-## Spain
-# http://en.wikipedia.org/wiki/Telephone_numbers_in_Spain
-# http://gospain.about.com/od/practicaltraveltips/f/area_codes.htm
-
-# A problem is that landline area codes can be 2 (92) as well as 3 digits (923)
-# right now the area_code_regexp is only finding 3 digit area_codes
-
-class ESTest < Test::Unit::TestCase
-  
-  def test_validates
-    Phoner::Phone.default_country_code = nil
-    assert_equal Phoner::Phone.valid?("+34-695-097-612"), true
-    assert_equal Phoner::Phone.valid?("0034 91-3597426"), true
-    assert_equal Phoner::Phone.valid?("+0034 91-3597426"), true
-    assert_equal Phoner::Phone.valid?("+34 92-6563629"), true
-    assert_equal Phoner::Phone.valid?("(+34) 606 275 213"), true
-    assert_equal Phoner::Phone.valid?("+034 937 299 016"), true
-    assert_equal Phoner::Phone.valid?("+34 93 487 32 93"), true
-
-    Phoner::Phone.default_country_code = '34'
-    assert_equal Phoner::Phone.valid?(" 607 65 05 01 "), true
-    assert_equal Phoner::Phone.valid?(" 971 15 66 33"), true
-    assert_equal Phoner::Phone.valid?(" 93-4559934"), true
-    assert_equal Phoner::Phone.valid?("628 274 908"), true
-    assert_equal Phoner::Phone.valid?("744 486 62 78"), true
-    assert_equal Phoner::Phone.valid?("916754559"), true
-    assert_equal Phoner::Phone.valid?("93.4327119"), true
-    assert_equal Phoner::Phone.valid?("986300257"), true
-  end
-  
-end

data/test/countries/uy_test.rb

@@ -1,22 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
-
-## Uruguay
-# source: http://en.wikipedia.org/wiki/Telephone_numbers_in_Uruguay
-class UYTest < Test::Unit::TestCase
-  
-  # 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