phony 2.0.0.beta13 → 2.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGM3YzY5ZGU1OWYxZjQ1ZTRmNWEzMTRmNTFkZDM2YzliNTQzMjU3Zg==
+    NzVjNGJlYTgwN2Q5NzFmODAzYzY5YjUzZmVkY2FkNjc2MjRkOTQwMg==
   data.tar.gz: !binary |-
-    OGUwYmEzYzdlOWM1NmFkYjczNTJkNWQxN2JhZThkZGE3YzNiYjI0Yw==
+    MjdjMWU2ZjBiODg2YjE2MThiNGQyZDlkODE2OGM1MGJkNjAyNTE0NA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NWE5ZDEwNmNiNjI0YzIzZjM3NzYyNDY4YzNhMDc5NDg5YzhjYmI1ZGJlM2Y4
-    NWVkYzg4YTZlY2ZjOWJkMzkzYzMyMzE1NmM2Njk0M2RmNmEwMjFmNDJiMzFh
-    NTRjNmFkYjZmZjRhNzc2ZGQzMTYwYjA2ZmI0NDg0MjI3ZGQ4MDg=
+    ZTM3NDM2MGM3MjVhZmVjYjBjZTQ0YTEwNmEzYWUwMDk4NDRhNDZlNDU0NjU0
+    ODRjZTQ4ZTQ0YTA1NjAxMzlkODQyOTJiMzFkYTZmYWYzYmNiNGNkZWMxZmIx
+    MjQyYzUwNWE2MTMxNDJkZDU3MTY5MTY1MmRjZTg4ZTExOGQ1MTA=
   data.tar.gz: !binary |-
-    OGIwZmQ2YWJlMTY0NjNmMTMyNWUzYTM0OGZlMmUyOWVlMjg3MGVhMmRlYjUy
-    Y2Q1YWM2OTI4NDQ2MTNlMzg4NDExNDgzMzJkNzkzYzNmMDUwZjJhNDdlY2Rm
-    YTdmODY3MmM0ZDQxZjA3NjZkN2Q0ODMxYzNmNTE2NzBiNGU5NTQ=
+    MjY4Zjk0MjdjNWQ1NzZmNjEyMjQyMzhjY2M5YTNjZTA5MDlmMDY2NjI4MmRk
+    ZTY2ZjdhY2U2ZDNhZjZlMTJlMDY4NGM2OGRlMTI1ZTIzYzI1YjU5ZjdlNDVm
+    YmE0Njk0NGI4NDRhYTAzYmQ1ZTI0MDYzMThmYzQ1MzkyMGU1MTE=

data/lib/phony/countries/brazil.rb

@@ -5,6 +5,7 @@
 # Note: São Paulo recently added an extra 9 digit to all mobile phones in the 11 area code
 #
 ndcs = [
+
  '11', #Sao Paulo
  '12', #Sao Paulo
  '13', #Sao Paulo
@@ -94,8 +95,14 @@ ndcs = [
 ]
 service = %w{ 100, 128, 190 191 192 193 194 197 198 199 } # State specific numbers were not added. See http://www.brasil.gov.br/navegue_por/aplicativos/agenda
 
+special_numbers_3_4 = %w{ 0800 }
+special_numbers_4 = %w{ 3003 4004 4020 }
+
 Phony.define do
-  country '55', one_of(service) >> split(3,3) |
-                one_of(ndcs)    >> split(4,4) |
-                fixed(3)        >> split(4,4)
+  country '55', match(/^(11|12|13|14|15|16|17|18|19|21|22|24|27|28)9\d+$/) >> split(5,4) |
+                one_of(special_numbers_3_4)  >> split(3,4) |
+                one_of(special_numbers_4)    >> split(4) |
+                one_of(service)              >> split(3,3) |
+                one_of(ndcs)                 >> split(4,4) |
+                fixed(3)                     >> split(4,4)
 end

data/spec/lib/phony/countries_spec.rb

@@ -7,11 +7,11 @@ describe 'country descriptions' do
   def self.it_splits number, expected
     it { Phony.split(number).should == expected }
   end
-  
+
   describe 'regression' do
     it_splits '33630588659', ["33", "6", "30", "58", "86", "59"]
   end
-  
+
   describe 'splitting' do
     describe 'Ascension Island' do
       it_splits '2473551', ['247', false, '3551']
@@ -102,7 +102,22 @@ describe 'country descriptions' do
     end
     describe 'Brazil' do
       it_splits '551112341234', ['55', '11', '1234', '1234']
-      it_splits '5511981231234', ['55', '11', '9812', '31234'] # São Paulo's 9 digits mobile
+      it_splits '5511981231234', ['55', '11', '98123', '1234'] # São Paulo's 9 digits mobile
+      it_splits '552181231234', ['55', '21', '8123', '1234']
+      it_splits '5521981231234', ['55', '21', '98123', '1234'] # Rio de Janeiro's 9 digits mobile
+
+      context "special states with 9 in mobile" do
+        %w{ 11 12 13 14 15 16 17 18 19 21 22 24 27 28}.each do |state_code|
+          it_splits "55#{state_code}993051123", ['55', state_code, '99305', '1123']
+        end
+      end
+
+      context "special numbers" do
+        it_splits '5508002221234', ['55', '0800', '222', '1234']
+        it_splits '5530032221', ['55', '3003', '2221']
+        it_splits '5540209999', ['55', '4020', '9999']
+        it_splits '5540048999', ['55', '4004', '8999']
+      end
     end
     describe 'Cambodia' do
       it_splits '85512236142', ["855", "12", "236", "142"]   # mobile (Mobitel)
@@ -273,7 +288,7 @@ describe 'country descriptions' do
       it_splits '912212345678', ['91', '22', '123', '45', '678'] # New Delhi
       it_splits '911411234567', ['91', '141', '123', '45', '67'] # Jaipur
       it_splits '913525123456', ['91', '3525', '123', '456']     # DALKHOLA
-      it_splits '914433993939', ['91', '44', '339', '93', '939'] # 
+      it_splits '914433993939', ['91', '44', '339', '93', '939'] #
     end
 
     describe 'Iran' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phony
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta13
+  version: 2.0.0
 platform: ruby
 authors:
 - Florian Hanke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-26 00:00:00.000000000 Z
+date: 2013-12-11 00:00:00.000000000 Z
 dependencies: []
 description: ! 'Fast international phone number (E164 standard) normalizing, splitting
   and formatting. Lots of formatting options: International (+.., 00..), national
@@ -100,9 +100,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3