phone 1.0 → 1.1

data/Readme.rdoc

@@ -85,6 +85,15 @@ 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. 
 
@@ -93,6 +102,7 @@ Currently tested on:
 [BA] Bosnia and Herzegovina
 [BE] Belgium
 [DE] Germany
+[ES] Spain
 [FR] France
 [GB] United Kingdom
 [HR] Croatia
@@ -106,11 +116,11 @@ Currently tested on:
 [ZA] South Africa
 
 = Known issues
-There's an issue with Germany and area codes.
+There's an issue with Germany and Spanish 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
+Don Morrison, Michael Squires, Todd Eichel (Fooala, Inc.), chipiga, Etienne Samson, Luke Randall, Jakob Hilden, Tieg Zaharia
 

data/data/phone_countries.yml

@@ -357,6 +357,7 @@
   :char_3_code: UY
   :name: Uruguay
   :international_dialing_prefix: "0"
+  :area_code: "2|42|43[34567]|4364|44[3457]|4452|4542|4544|456[7]?|4586|46[234]|4675|47[237]|4779|9[13456789]"
 "992": 
   :country_code: "992"
   :national_dialing_prefix: "8"
@@ -571,6 +572,7 @@
   :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, :area_code)
+  class Country < Struct.new(:name, :country_code, :char_2_code, :char_3_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[:area_code])
+        @@all[key] = Country.new(c[:name], c[:country_code], c[:char_2_code], c[:char_3_code], c[:area_code])
       end
       @@all
     end
@@ -19,12 +19,17 @@ 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/phone.rb

@@ -15,7 +15,7 @@ require File.join(File.dirname(__FILE__), 'country')
 module Phoner
   class Phone
     NUMBER = '([0-9]{1,8})$'  
-    DEFAULT_AREA_CODE = '[2-9][0-8][0-9]' # USA
+    DEFAULT_AREA_CODE = '[0-9][0-9][0-9]' # any 3 digits
 
     attr_accessor :country_code, :area_code, :number, :extension
 
@@ -157,7 +157,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/, '+')
+      string_with_number.gsub("(0)", "").gsub(/[^0-9+]/, '').gsub(/^00/, '+').gsub(/^\+00/, '+').gsub(/^\+0/, '+')
     end
 
     # pull off anything that look like an extension
@@ -235,6 +235,12 @@ module Phoner
     def has_default_area_code?
       area_code == self.class.default_area_code
     end
+    
+    # comparison of 2 phone objects
+    def ==(other)
+      methods = [:country_code, :area_code, :number, :extension]
+      methods.all? { |method| other.respond_to?(method) && send(method) == other.send(method) }
+    end    
 
     private
 
@@ -249,4 +255,4 @@ module Phoner
       return result
     end
   end  
-end
+end

data/test/countries/es_test.rb

@@ -0,0 +1,33 @@
+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

@@ -0,0 +1,22 @@
+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

data/test/phone_test.rb

@@ -103,4 +103,23 @@ class PhoneTest < Test::Unit::TestCase
     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'    
+    assert pn1 == pn2
+  end
+  
+  def test_comparison_false
+    pn1 = Phoner::Phone.new '5125486', '91', '385'    
+    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

@@ -4,8 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 0
-  version: "1.0"
+  - 1
+  version: "1.1"
 platform: ruby
 authors: 
 - Tomislav Car
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-05 00:00:00 +02:00
+date: 2011-06-24 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -45,6 +45,7 @@ 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
@@ -56,6 +57,7 @@ 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
@@ -100,6 +102,7 @@ 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
@@ -111,4 +114,5 @@ 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