phone 0.9.9 → 0.9.9.1

data/LICENSE

@@ -1,4 +1,5 @@
 Copyright (c) 2010 Tomislav Car
+Modifications copyright (c) 2010 Todd Eichel for Fooala, Inc.
  
 Permission is hereby granted, free of charge, to any person obtaining a copy of 
 this software and associated documentation files (the "Software"), to deal in 

data/Readme.rdoc

@@ -79,7 +79,10 @@ You can add your own custom named formats like so:
 
 = TODO
 Parse testing for different countries. Currently tested on: US, South Africa, Croatia, Slovenia, Hungary, Serbia, 
-Bosnia and Herzegovina, Germany.
+Bosnia and Herzegovina, Germany, France.
     
 = Author
 Copyright © 2010 Tomislav Car, Infinum
+
+Modifications copyright © 2010 Todd Eichel for Fooala, Inc.
+

data/data/{countries.yml → phone_countries.yml}

@@ -525,6 +525,7 @@
   :char_3_code: FR
   :name: France
   :international_dialing_prefix: "0"
+  :area_code: "[1-6,8-9]"
 "995": 
   :country_code: "995"
   :national_dialing_prefix: 8*

data/lib/phone.rb

@@ -9,8 +9,8 @@
 #   Phone.default_country_code
 #   Phone.default_area_code
 #
-require 'active_support'
-require File.join(File.dirname(__FILE__), 'country')
+require 'active_support/core_ext' # for Class#cattr_accessor, String#present?
+require File.join(File.dirname(__FILE__), 'phone_country')
 class Phone    
   NUMBER = '([^0][0-9]{1,7})$'  
   DEFAULT_AREA_CODE = '[2-9][0-8][0-9]' # USA
@@ -53,7 +53,7 @@ class Phone
   # the format of the string is detect automatically (from FORMATS)
   def self.parse(string, options={})       
     if string.present?    
-      Country.load
+      PhoneCountry.load
       string = normalize(string)
       
       options[:country_code] ||= self.default_country_code
@@ -83,7 +83,7 @@ class Phone
       string = string.gsub(country.country_code_regexp, '0')
     else
       if options[:country_code]
-        country = Country.find_by_country_code options[:country_code]
+        country = PhoneCountry.find_by_country_code options[:country_code]
       end
     end
     
@@ -113,7 +113,7 @@ class Phone
   def self.detect_country(string)
     detected_country = nil
     # find if the number has a country code
-    Country.all.each_pair do |country_code, country|
+    PhoneCountry.all.each_pair do |country_code, country|
       if string =~ country.country_code_regexp
         detected_country = country
       end

data/lib/{country.rb → phone_country.rb}

@@ -1,15 +1,16 @@
-require 'active_support'
-class Country < Struct.new(:name, :country_code, :char_2_code, :area_code)
+require 'active_support/core_ext' # for Class#cattr_accessor
+
+class PhoneCountry < Struct.new(:name, :country_code, :char_2_code, :area_code)
   cattr_accessor :all
   
   def self.load
     return @@all if @@all.present?
     
-    data_file = File.join(File.dirname(__FILE__), '..', 'data', 'countries.yml')
+    data_file = File.join(File.dirname(__FILE__), '..', 'data', 'phone_countries.yml')
     
     @@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] = PhoneCountry.new(c[:name], c[:country_code], c[:char_2_code], c[:area_code])
     end
     @@all
   end

data/test/{country.rb → phone_country_test.rb}

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/test_helper'
 
-class CountryTest < Test::Unit::TestCase
+class PhoneCountryTest < Test::Unit::TestCase
   def test_parse_germany_local
     pn = Phone.parse('+49 714 1605832')    
 
@@ -105,4 +105,20 @@ class CountryTest < Test::Unit::TestCase
     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

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification 
 name: phone
 version: !ruby/object:Gem::Version 
-  version: 0.9.9
+  version: 0.9.9.1
 platform: ruby
 authors: 
 - Tomislav Car
+- Todd Eichel
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-01-04 00:00:00 +01:00
+date: 2010-03-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,7 +24,9 @@ dependencies:
         version: "0"
     version: 
 description: Phone number parsing, validation and formatting.
-email: tomislav@infinum.hr
+email: 
+- tomislav@infinum.hr
+- todd@toddeichel.com
 executables: []
 
 extensions: []
@@ -34,11 +37,11 @@ extra_rdoc_files:
 files: 
 - Readme.rdoc
 - LICENSE
-- data/countries.yml
+- data/phone_countries.yml
 - lib/phone.rb
-- lib/country.rb
-- test/phone.rb
-- test/country.rb
+- lib/phone_country.rb
+- test/phone_test.rb
+- test/phone_country_test.rb
 - test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/carr/phone
@@ -72,6 +75,6 @@ signing_key:
 specification_version: 3
 summary: Phone number parsing, validation and formatting
 test_files: 
-- test/phone.rb
-- test/country.rb
+- test/phone_test.rb
+- test/phone_country_test.rb
 - test/test_helper.rb