phonie 3.2.2 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9daf70450b82b58df845ca521df4422b5df09ce9
-  data.tar.gz: aed438682499790cfaa43c5f9069dc7995e1223b
+  metadata.gz: ed1a7332cfe5e4371c273e9872030726f30f6484
+  data.tar.gz: ca1d252e1648897e9fb27224e58b59612b451343
 SHA512:
-  metadata.gz: 6e3ff1af95ff7cb8c1f83dbf1fa6a5ba928791ce18cbb2c7cc38d1de8fb5c099d400ea7c29fdccf660ae54d836b55e1ff42de4d766595c4a406f1125e0cb8359
-  data.tar.gz: b076886d96aa2ed0f439ca43c4d215d7c6de26aba7ffae04408cb3a414e3646907d0c1c00c4e4a1e24fbee5f0a3f686bfc03c0d91cc4e065d2e87c07d5fec784
+  metadata.gz: c0c296ec4b38c9e28d92e876ab90073854290668eb4f1fa39b4e5d1c080a69f855e4c660c48102a6f37a8846d30d8199027e12055fbd53113d5256bfd9bda3bf
+  data.tar.gz: d5c5697192bdddf7c4e188c2f830ed641710b7040c17562553688f480fbddc40159229fe86dcf5e47e4b9fd58e8684eada2044a0bf978271a486fe3bf73333e9

data/Changelog.md

@@ -1,3 +1,18 @@
+3.3.1
+=====
+
+* Adds support for multiple countries (Thanks @dramalho):
+  * Jordan
+  * Seychelles
+  * Panama
+  * Venezuela
+  * Guadeloupe
+  * Mali
+  * Tanzania
+  * Jamaica
+
+* Adds new formatter option for extensions with prefix: %X (Thanks @feldpost)
+
 3.2.2
 =====
 

data/Readme.rdoc

@@ -59,6 +59,7 @@ When given a string, it interpolates the string with the following fields:
 * %f - first @@n1_length characters of number (configured through Phonie.n1_length), default is 3 (512)
 * %l - last characters of number (5486)
 * %x - the extension number
+* %X - the extension number with prefix
 
     pn = Phonie::Phone.parse('+385915125486')
     pn.to_s # => "+385915125486"
@@ -140,6 +141,7 @@ Currently tested on:
 [GE] Georgia
 [GF] French Guiana
 [GH] Ghana
+[GP] Guadeloupe
 [GR] Greece
 [GT] Guatemala
 [GU] Guam
@@ -154,6 +156,8 @@ Currently tested on:
 [IQ] Iraq
 [IR] Iran
 [IT] Italy
+[JM] Jamaica
+[JO] Jordan
 [JP] Japan
 [KE] Kenya
 [KR] South Korea
@@ -164,6 +168,7 @@ Currently tested on:
 [LV] Latvia
 [MA] Morocco
 [ME] Montenegro
+[ML] Mali
 [MT] Malta
 [MX] Mexico
 [MY] Malaysia
@@ -173,6 +178,7 @@ Currently tested on:
 [NO] Norway
 [NP] Nepal
 [NZ] New Zealand
+[PA] Panama
 [PH] Philippines
 [PK] Pakistan
 [PT] Portugal
@@ -180,6 +186,7 @@ Currently tested on:
 [RS] Serbia
 [RU] Russian Federation
 [SA] Saudi Arabia
+[SC] Seychelles
 [SE] Sweden
 [SG] Singapore
 [SI] Slovenia
@@ -189,10 +196,12 @@ Currently tested on:
 [TO] Tonga
 [TT] Trinidad and Tobago
 [TW] Taiwan
+[TZ] Tanzania
 [UA] Ukraine
 [UG] Uganda
 [US] United States
 [UY] Uruguay
+[VE] Venezuela
 [VN] Vietnam
 [ZA] South Africa
 [ZW] Zimbabwe

data/lib/phonie/data/phone_countries.yml

@@ -48,8 +48,23 @@
   :national_dialing_prefix: None
   :char_2_code: None
   :iso_3166_code: GP
+  :area_code: '590|690'
+  :mobile_format: '690\d{6}'
+  :number_format: '\d{9}'
+  :local_number_format: '\d{6}'
   :name: Guadeloupe
   :international_dialing_prefix: '00'
+-
+  :country_code: '1'
+  :national_dialing_prefix: '0'
+  :char_2_code: '0'
+  :iso_3166_code: JM
+  :name: Jamaica
+  :area_code: '876'
+  :mobile_format: '876(2|3|4|77|781|782|783|784|787|788|789|790|791|792|793|796|797|798|799|8|909|919|990|995|997|999)\d{4,6}'
+  :number_format: '\d{7,10}'
+  :local_number_format: '\d{4,7}'
+  :international_dialing_prefix: '011'
 -
   :country_code: '81'
   :national_dialing_prefix: '0'
@@ -77,6 +92,10 @@
   :national_dialing_prefix: '0'
   :char_2_code: '0'
   :iso_3166_code: ML
+  :area_code: '2\d{3}|442\d{1}|6\d{2}|7\d{2}'
+  :mobile_format: '(6|7)\d{7}'
+  :number_format: '\d{8}'
+  :local_number_format: '\d{4,5}'
   :name: Mali
   :international_dialing_prefix: '00'
 -
@@ -121,6 +140,10 @@
   :char_2_code: None
   :iso_3166_code: PA
   :name: Panama
+  :area_code: '2|4|6|7|9'
+  :mobile_format: '6\d{7}'
+  :number_format: '\d{7,8}'
+  :local_number_format: '\d{6,7}'
   :international_dialing_prefix: '00'
 -
   :country_code: '591'
@@ -290,6 +313,10 @@
   :national_dialing_prefix: '0'
   :char_2_code: '0'
   :iso_3166_code: TZ
+  :area_code: '2\d{1}|41|6\d{1}|7\d{1}'
+  :mobile_format: '(6|7)\d{8}'
+  :number_format: '\d{9}'
+  :local_number_format: '\d{7}'
   :name: Tanzania, United Republic of
   :international_dialing_prefix: '00'
 -
@@ -344,6 +371,10 @@
   :national_dialing_prefix: '0'
   :char_2_code: '0'
   :iso_3166_code: VE
+  :area_code: '(2|4)\d{2}'
+  :mobile_format: '4\d{9}'
+  :number_format: '\d{10}'
+  :local_number_format: '\d{7}'
   :name: Venezuela, Bolivarian Republic of
   :international_dialing_prefix: '00'
 -
@@ -404,6 +435,10 @@
   :national_dialing_prefix: '0'
   :char_2_code: '0'
   :iso_3166_code: JO
+  :area_code: '2|3|5|6|7\d{2}|8|9'
+  :mobile_format: '7\d{8}'
+  :number_format: '\d{8,9}'
+  :local_number_format: '\d{6,8}'
   :name: Jordan
   :international_dialing_prefix: '00'
 -
@@ -1715,6 +1750,10 @@
   :char_2_code: None
   :iso_3166_code: SC
   :name: Seychelles
+  :area_code: '2|3|4|5|6|7'
+  :mobile_format: '2\d{6,8}'
+  :number_format: '\d{7,8}'
+  :local_number_format: '\d{5,7}'
   :international_dialing_prefix: '00'
 -
   :country_code: '20'

data/lib/phonie/formatter.rb

@@ -43,7 +43,8 @@ module Phonie
         gsub("%n", pn.number.to_s).
         gsub("%f", pn.number1.to_s).
         gsub("%l", pn.number2.to_s).
-        gsub("%x", pn.extension.to_s)
+        gsub("%x", pn.extension.to_s).
+        gsub("%X", pn.extension_with_prefix.to_s)
     end
 
     private

data/lib/phonie/phone.rb

@@ -38,6 +38,8 @@ module Phonie
     def self.parse(string, options = {})
       return if string.nil?
 
+      string = string.to_s
+
       options[:country_code] ||= Phonie.configuration.default_country_code
       options[:area_code]    ||= Phonie.configuration.default_area_code
 
@@ -84,6 +86,11 @@ module Phonie
       number[-n2_length, n2_length]
     end
 
+    def extension_with_prefix
+      return unless extension
+      [' x', extension ].join
+    end
+
     def format(fmt)
       Formatter.new(format: fmt, phone_number: self).to_s
     end

data/lib/phonie/version.rb

@@ -1,3 +1,3 @@
 module Phonie
-  VERSION = '3.2.2'
+  VERSION = '3.3.1'
 end

data/test/countries/gp_test.rb

@@ -0,0 +1,13 @@
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+
+## Guadeloupe
+class GPTest < Phonie::TestCase
+  def test_local
+    parse_test('+590590878888', '590', '590', '878888', 'Guadeloupe', false)
+  end
+
+  def test_mobile
+    parse_test('+590690638764', '590', '690', '638764', 'Guadeloupe', true)
+  end
+
+end

data/test/countries/jm_test.rb

@@ -0,0 +1,12 @@
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+
+## Norway
+class JMTest < Phonie::TestCase
+  def test_local
+    parse_test('+18769696268', '1', '876', '9696268', 'Jamaica', false)
+  end
+
+  def test_mobile
+    parse_test('+18764884110', '1', '876', '4884110', 'Jamaica', true)
+  end
+end

data/test/countries/jo_test.rb

@@ -0,0 +1,13 @@
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+
+## Jordan
+class JOTest < Phonie::TestCase
+  def test_local
+    parse_test('+96265522796',  '962', '6',  '5522796', 'Jordan', false)
+  end
+
+  def test_mobile
+    parse_test('+962796899550', '962', '796', '899550', 'Jordan', true)
+  end
+
+end

data/test/countries/ml_test.rb

@@ -0,0 +1,13 @@
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+
+## Mali
+class MLTest < Phonie::TestCase
+  def test_local
+    parse_test('+22320203134', '223', '2020', '3134', 'Mali', false)
+  end
+
+  def test_mobile
+    parse_test('+22366089000', '223', '660', '89000', 'Mali', true)
+    parse_test('+22378458504', '223', '784', '58504', 'Mali', true)
+  end
+end

data/test/countries/pa_test.rb

@@ -0,0 +1,12 @@
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+
+## Panama
+class PATest < Phonie::TestCase
+  def test_local
+    parse_test('+50741869702', '507', '4', '1869702', 'Panama', false)
+  end
+
+  def test_mobile
+    parse_test('+50767677540', '507', '6', '7677540', 'Panama', true)
+  end
+end

data/test/countries/sc_test.rb

@@ -0,0 +1,13 @@
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+
+## Seychelles
+class SCTest < Phonie::TestCase
+  def test_local
+    parse_test('+2487985442', '248', '7', '985442', 'Seychelles', false)
+  end
+
+  def test_mobile
+    parse_test('+24825255813', '248', '2', '5255813', 'Seychelles', true)
+  end
+
+end

data/test/countries/tz_test.rb

@@ -0,0 +1,13 @@
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+
+## Mali
+class TZTest < Phonie::TestCase
+  def test_local
+    parse_test('+255262390044', '255', '26', '2390044', 'Tanzania, United Republic of', false)
+  end
+
+  def test_mobile
+    parse_test('+255673596267', '255', '67', '3596267', 'Tanzania, United Republic of', true)
+    parse_test('+255777375744', '255', '77', '7375744', 'Tanzania, United Republic of', true)
+  end
+end

data/test/countries/ve_test.rb

@@ -0,0 +1,13 @@
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+
+## Venezuela
+class VETest < Phonie::TestCase
+  def test_local
+    parse_test('+582742662406', '58', '274', '2662406', 'Venezuela, Bolivarian Republic of', false)
+  end
+
+  def test_mobile
+    parse_test('+584141809033', '58', '414', '1809033', 'Venezuela, Bolivarian Republic of', true)
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phonie
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 3.3.1
 platform: ruby
 authors:
 - Tomislav Car
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-12 00:00:00.000000000 Z
+date: 2016-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -146,6 +146,7 @@ files:
 - test/countries/ge_test.rb
 - test/countries/gf_test.rb
 - test/countries/gh_test.rb
+- test/countries/gp_test.rb
 - test/countries/gr_test.rb
 - test/countries/gt_test.rb
 - test/countries/gu_test.rb
@@ -162,6 +163,8 @@ files:
 - test/countries/ir_test.rb
 - test/countries/is_test.rb
 - test/countries/it_test.rb
+- test/countries/jm_test.rb
+- test/countries/jo_test.rb
 - test/countries/jp_test.rb
 - test/countries/ke_test.rb
 - test/countries/kh_text.rb
@@ -174,6 +177,7 @@ files:
 - test/countries/lv_test.rb
 - test/countries/ma_test.rb
 - test/countries/me_test.rb
+- test/countries/ml_test.rb
 - test/countries/mt_test.rb
 - test/countries/mu_test.rb
 - test/countries/mx_test.rb
@@ -184,6 +188,7 @@ files:
 - test/countries/no_test.rb
 - test/countries/np_test.rb
 - test/countries/nz_test.rb
+- test/countries/pa_test.rb
 - test/countries/ph_test.rb
 - test/countries/pk_test.rb
 - test/countries/pl_test.rb
@@ -194,6 +199,7 @@ files:
 - test/countries/rs_test.rb
 - test/countries/ru_test.rb
 - test/countries/sa_test.rb
+- test/countries/sc_test.rb
 - test/countries/se_test.rb
 - test/countries/sg_test.rb
 - test/countries/si_test.rb
@@ -206,10 +212,12 @@ files:
 - test/countries/tr_test.rb
 - test/countries/tt_test.rb
 - test/countries/tw_test.rb
+- test/countries/tz_test.rb
 - test/countries/ua_test.rb
 - test/countries/ug_test.rb
 - test/countries/us_test.rb
 - test/countries/uy_test.rb
+- test/countries/ve_test.rb
 - test/countries/vn_test.rb
 - test/countries/za_test.rb
 - test/countries/zw_test.rb
@@ -288,6 +296,7 @@ test_files:
 - test/countries/ge_test.rb
 - test/countries/gf_test.rb
 - test/countries/gh_test.rb
+- test/countries/gp_test.rb
 - test/countries/gr_test.rb
 - test/countries/gt_test.rb
 - test/countries/gu_test.rb
@@ -304,6 +313,8 @@ test_files:
 - test/countries/ir_test.rb
 - test/countries/is_test.rb
 - test/countries/it_test.rb
+- test/countries/jm_test.rb
+- test/countries/jo_test.rb
 - test/countries/jp_test.rb
 - test/countries/ke_test.rb
 - test/countries/kh_text.rb
@@ -316,6 +327,7 @@ test_files:
 - test/countries/lv_test.rb
 - test/countries/ma_test.rb
 - test/countries/me_test.rb
+- test/countries/ml_test.rb
 - test/countries/mt_test.rb
 - test/countries/mu_test.rb
 - test/countries/mx_test.rb
@@ -326,6 +338,7 @@ test_files:
 - test/countries/no_test.rb
 - test/countries/np_test.rb
 - test/countries/nz_test.rb
+- test/countries/pa_test.rb
 - test/countries/ph_test.rb
 - test/countries/pk_test.rb
 - test/countries/pl_test.rb
@@ -336,6 +349,7 @@ test_files:
 - test/countries/rs_test.rb
 - test/countries/ru_test.rb
 - test/countries/sa_test.rb
+- test/countries/sc_test.rb
 - test/countries/se_test.rb
 - test/countries/sg_test.rb
 - test/countries/si_test.rb
@@ -348,10 +362,12 @@ test_files:
 - test/countries/tr_test.rb
 - test/countries/tt_test.rb
 - test/countries/tw_test.rb
+- test/countries/tz_test.rb
 - test/countries/ua_test.rb
 - test/countries/ug_test.rb
 - test/countries/us_test.rb
 - test/countries/uy_test.rb
+- test/countries/ve_test.rb
 - test/countries/vn_test.rb
 - test/countries/za_test.rb
 - test/countries/zw_test.rb