phonie 3.1.6 → 3.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbb6d7902284f4bf12daeb9345220012cc06a8f7
-  data.tar.gz: 14f485bc407de6904c6c69c1a225ac3ed6af18b8
+  metadata.gz: 06bbfa37da7c3c35e3e79b70ca4128a52eb74063
+  data.tar.gz: d14a23a1c6e44267cfd576bc6054c81c57cd1bde
 SHA512:
-  metadata.gz: 6f536a324f1137921560cc4f44dfa7225ff16a60bb694768e15f537632c00a4568d36a245c52229a27909a063529d5c4d57317ca8d551bd6412ced2b860cf2e6
-  data.tar.gz: ce2f2c947262935e1d7c9526fd246ec20336bb040974ffcd6c0dd364d441872852e2174c7f4d3ded3faf97bdbce0ea5a801fa9f15bfd03bdb089577c540ec5d6
+  metadata.gz: a10e2fff7a3a6df19b71af58771e94c700bb08ef6ab03bb215e9093430b8ac34697f83a436a2ca68a354853ee1664ebd693fe9278f776d6042bd10d48ab8a506
+  data.tar.gz: a87707e27ff228cdd16cab2ca940a3ebb6118aa3b692e166d4851ceb499785294ce1dec53d3c357e863ee193dd0311965f7ddaa1cae04e203a652d32079dcfd1

data/Changelog.md

@@ -1,3 +1,8 @@
+3.1.7
+=====
+
+* Fixes Brazilian number parsing (Thanks nofxx!)
+
 3.1.6
 =====
 

data/lib/phonie/data/phone_countries.yml

@@ -178,14 +178,14 @@
   :international_dialing_prefix: '00'
 -
   :country_code: '55'
-  :national_dialing_prefix: '14'
-  :char_2_code: '14'
+  :national_dialing_prefix: '0'
+  :international_dialing_prefix: '00'
+  :char_2_code: '55'
   :iso_3166_code: BR
   :name: Brazil
-  :international_dialing_prefix: '00'
-  :area_code: '[1-9][1-9]'
-  :local_number_format: \d{7,9}
-  :mobile_format: '((1[1-9]|21|22|24|27|28)[6789]\d{8})|((23|2[5-9]|[3-9][1-9])[6789]\d{7})'
+  :area_code: ((1[1-9]|2[147]|3[1-578]|4[1-9]|5[1-5]|6[1235-9]|7[134579]|8[1-8]|9[12568])|0[3589]00)
+  :local_number_format: ([2-5]\d{7}|9?[6-9]\d{7}|\d{7})
+  :mobile_format: ([129][1-9]9|[3-9][1-9])[6-9]\d{7}
   :number_format: \d{10,11}
 -
   :country_code: '253'

data/lib/phonie/phone.rb

@@ -118,7 +118,7 @@ module Phonie
 
     def defaults
       { area_code:    Phonie.configuration.default_area_code,
-	country_code: Phonie.configuration.default_country_code }
+        country_code: Phonie.configuration.default_country_code }
     end
 
     def normalize_args(args)

data/lib/phonie/version.rb

@@ -1,3 +1,3 @@
 module Phonie
-  VERSION = '3.1.6'
+  VERSION = '3.1.7'
 end

data/test/countries/br_test.rb

@@ -1,14 +1,88 @@
 require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 
 ## Brazil
+# http://www.wisetel.com.br/acoes_de_regulacao/normas/n_96_28.htm
 class BRTest < Phonie::TestCase
+
   def test_local
-    parse_test('+559112345678', '55', "91", '12345678', 'Brazil', false)
-    #parse_failure('+5591123456789') # only mobile numebrs can be 11 digits
+    parse_test('+55 91 22345678', '55', '91', '22345678', 'Brazil', false)
+  end
+
+  def test_sao_paulo
+    parse_test('+55 11 22345678', '55', '11', '22345678', 'Brazil', false)
+  end
+
+  def test_minas_gerais
+    parse_test('+55 35 22345678', '55', '35', '22345678', 'Brazil', false)
+  end
+
+  def test_area_max
+    parse_test('+55 98 59995678', '55', '98', '59995678', 'Brazil', false)
+  end
+
+  def test_area_max_fail
+    parse_failure('+55 99 59995678')
   end
 
+  def test_paid_toll
+    parse_test('+55 0300 12 345 67', '55', '0300', '1234567', 'Brazil', false)
+  end
+
+  def test_donation_service
+    parse_test('+55 0500 12 345 67', '55', '0500', '1234567', 'Brazil', false)
+  end
+
+  def test_toll_free
+    parse_test('+55 0800 12 345 67', '55', '0800', '1234567', 'Brazil', false)
+  end
+
+  def test_paid_service
+    parse_test('+55 0900 123 4567', '55', '0900', '1234567', 'Brazil', false)
+  end
+
+  #
+  # Parse should fail
+  #
+  def test_area_validation_min
+    parse_failure('+55 10 1234 5678') # no area '10'
+  end
+
+  def test_area_cant_have_9
+    parse_failure('55 31 95101 4567')
+  end
+
+  def test_only_mobile_has_11_digits
+    parse_failure('+5591223456789') # only mobile numebrs can be 11 digits
+  end
+
+  #
+  # Mobile
+  #
   def test_mobile
-    parse_test('553161234567', '55', '31', '61234567', 'Brazil', true)
-    parse_test('5512612345678', '55', '12', '612345678', 'Brazil', true)
+    parse_test('+55 91 9786 5678', '55', "91", '97865678', 'Brazil', true)
+  end
+
+  def test_mobile_low_range
+    parse_test('55 35 6101 4567', '55', '35', '61014567', 'Brazil', true)
+  end
+
+  def test_mobile_high_range
+    parse_test('55 35 9991 4567', '55', '35', '99914567', 'Brazil', true)
+  end
+
+  def test_mobile_area_11_with_9
+    parse_test('55 11 99765 5678', '55', '11', '997655678', 'Brazil', true)
+  end
+
+  def test_mobile_area_16_with_9
+    parse_test('55 16 98765 5678', '55', '16', '987655678', 'Brazil', true)
+  end
+
+  def test_mobile_area_19_with_9
+    parse_test('55 19 98765 5678', '55', '19', '987655678', 'Brazil', true)
+  end
+
+  def test_mobile_area_21_with_9
+    parse_test('55 21 98765 5678', '55', '21', '987655678', 'Brazil', true)
   end
 end

data/test/test_helper.rb

@@ -15,16 +15,16 @@ def parse_test(raw, country_code, area_code, number, country_name = nil, is_mobi
   end
 
   unless is_mobile.nil?
-    assert_equal is_mobile, pn.is_mobile?
+    text = pn.is_mobile? ? :mobile : :local
+    assert_equal is_mobile ? :mobile : :local, text
   end
 end
 
 def parse_failure(raw)
-  pn = Phonie::Phone.parse!(raw)
+  pn = Phonie::Phone.parse(raw)
   assert_equal pn, nil
 end
 
-
 class Phonie::TestCase < Test::Unit::TestCase
 
   def setup

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phonie
 version: !ruby/object:Gem::Version
-  version: 3.1.6
+  version: 3.1.7
 platform: ruby
 authors:
 - Tomislav Car
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-16 00:00:00.000000000 Z
+date: 2015-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel