phone 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34e8a065d7c2af3086436c2a7d6946cd6f9e2d02
-  data.tar.gz: 9d543d715d22246f7b150c6a7f8b2c21f8a3d110
+  metadata.gz: f34c77402ea12b6fafbda205f46bb897b0996c66
+  data.tar.gz: f29f3fd69c0f6415ba76d1d16da01279cdc76b8e
 SHA512:
-  metadata.gz: 4ff96c2231df0d988f8ec44942704e6169a8afd5c91b1b0db5625b5308b7ee8d06367f9add22898a447b1ed4de71a50c6cd14658158b4f1ba752e74d3ccd8be4
-  data.tar.gz: 51f4da5b4739af217a419b6a15271d1c5e7436853cbe3062108c99c44a042b6c2c04dd41290672581e93efe8e7b28cad4679516022db75b42e027e227d4a8396
+  metadata.gz: c94ec8394ccd7a4485d56caa2e701d147f241745909622b59a08c05e4d91733f01b21088e7c81d53cdb1a55efb5d73926c46f3abe9bf3496ae8d4a8bc9fa1087
+  data.tar.gz: 23f8e3d274b53614a54964c87bd7cc09a7ef103d47eccf1d53db75a444a986e6e40d8cf80dc657ed0febb7a0a48ec2a631fab8197b0e7f7a5c9bf6016685235c

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

@@ -572,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,18 @@ 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

@@ -16,7 +16,7 @@ require File.join(File.dirname(__FILE__), 'errors')
 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
 
@@ -159,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/, '+')
+      string_with_number.gsub("(0)", "").gsub(/[^0-9+]/, '').gsub(/^00/, '+').gsub(/^\+00/, '+').gsub(/^\+0/, '+')
     end
 
     # pull off anything that look like an extension
@@ -257,4 +257,4 @@ module Phoner
       return result
     end
   end  
-end
+end

data/test/phone_test.rb

@@ -114,4 +114,12 @@ 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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phone
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Tomislav Car