phonie 2.0.2 → 2.1.0

data/Readme.rdoc

@@ -100,6 +100,8 @@ Currently tested on:
 [BY] Belarus
 [BZ] Belize
 [CA] Canada
+[CH] Switzerland
+[CN] China
 [CR] Costa Rica
 [CY] Cyprus
 [CZ] Czech Republic

data/lib/phonie/country.rb

@@ -1,12 +1,12 @@
 module Phonie
-  class Country < Struct.new(:name, :country_code, :char_2_code, :iso_3166_code, :area_code, :local_number_format, :mobile_format, :full_number_length, :number_format)
+  class Country < Struct.new(:name, :country_code, :char_2_code, :iso_3166_code, :area_code, :local_number_format, :mobile_format, :full_number_length, :number_format, :national_dialing_prefix)
     def self.load
       data_file = File.join(File.dirname(__FILE__), 'data', 'phone_countries.yml')
 
       all = []
       YAML.load(File.read(data_file)).each do |c|
         next unless c[:area_code] && c[:local_number_format]
-        all << Country.new(c[:name], c[:country_code], c[:char_2_code], c[:iso_3166_code], c[:area_code], c[:local_number_format], c[:mobile_format], c[:full_number_length], c[:number_format])
+        all << Country.new(c[:name], c[:country_code], c[:char_2_code], c[:iso_3166_code], c[:area_code], c[:local_number_format], c[:mobile_format], c[:full_number_length], c[:number_format], c[:national_dialing_prefix])
       end
       all
     end
@@ -77,6 +77,15 @@ module Phonie
       end
     end
 
+    def national_dialing_prefix
+      prefix = super
+      if prefix == "None"
+        nil
+      else
+        prefix
+      end
+    end
+
     private
 
     def number_format_regex

data/lib/phonie/data/phone_countries.yml

@@ -282,6 +282,10 @@
   :iso_3166_code: CN
   :name: China
   :international_dialing_prefix: '00'
+  :area_code: 1[3458]|2[0-9]|[3456789][0-9][0-9]
+  :local_number_format: \d{4,10}
+  :mobile_format: 1[3458]\d{9}
+  :number_format: \d{8,12}
 -
   :country_code: '960'
   :national_dialing_prefix: None
@@ -1202,6 +1206,10 @@
   :iso_3166_code: CH
   :name: Switzerland
   :international_dialing_prefix: '00'
+  :area_code: 21|22|24|26|27|31|32|33|34|41|43|44|51|52|55|56|58|61|62|71|74|76|77|78|79|81|91
+  :mobile_format: (74|76|77|78|79)\d{7}
+  :local_number_format: \d{7}
+  :number_format: \d{9}
 -
   :country_code: '974'
   :national_dialing_prefix: None

data/lib/phonie/version.rb

@@ -1,3 +1,3 @@
 module Phonie
-  VERSION = '2.0.2'
+  VERSION = '2.1.0'
 end

data/test/countries/ch_test.rb

@@ -0,0 +1,14 @@
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+
+## Switzerland
+class CHTest < Phonie::TestCase
+
+  def test_local
+    parse_test('+41213459020', '41', '21', '3459020', 'Switzerland', false)
+  end
+
+  def test_mobile
+    parse_test('+41743459020', '41', '74', '3459020', 'Switzerland', true)
+  end
+end
+

data/test/countries/cn_test.rb

@@ -0,0 +1,12 @@
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+
+## China
+class CNTest < Phonie::TestCase
+  def test_local
+    parse_test('+863721234567', '86', '372', '1234567', 'China', false)
+  end
+
+  def test_mobile
+    parse_test('8613123456789', '86', '13', '123456789', 'China', true)
+  end
+end

data/test/country_test.rb

@@ -24,4 +24,11 @@ class CountryTest < Phonie::TestCase
     assert_equal "Norway", countries.first.name
   end
 
+  def test_national_dialing_prefix
+    tonga = Phonie::Country.find_by_country_code('TO')
+    assert_nil tonga.national_dialing_prefix
+
+    us_and_a = Phonie::Country.find_by_country_code('US')
+    assert_equal '1', us_and_a.national_dialing_prefix
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phonie
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-29 00:00:00.000000000 Z
+date: 2013-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -109,7 +109,9 @@ files:
 - test/countries/by_test.rb
 - test/countries/bz_test.rb
 - test/countries/ca_test.rb
+- test/countries/ch_test.rb
 - test/countries/cl_test.rb
+- test/countries/cn_test.rb
 - test/countries/cr_test.rb
 - test/countries/cy_test.rb
 - test/countries/cz_test.rb
@@ -188,7 +190,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4097196119145454561
+      hash: -2285805841961836759
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -197,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4097196119145454561
+      hash: -2285805841961836759
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -224,7 +226,9 @@ test_files:
 - test/countries/by_test.rb
 - test/countries/bz_test.rb
 - test/countries/ca_test.rb
+- test/countries/ch_test.rb
 - test/countries/cl_test.rb
+- test/countries/cn_test.rb
 - test/countries/cr_test.rb
 - test/countries/cy_test.rb
 - test/countries/cz_test.rb