phony 2.1.2 → 2.1.3

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NTI2YjZiNDBhODQ4NWQ1NTIzNmNlODllOTY3N2UyZTRhM2MxNmM1MQ==
-  data.tar.gz: !binary |-
-    M2UwYmM0ZmNjMjMwNWE1YTE5ZTY5YjNiOWY4ZjU4ZGI4ZDM4Y2Q5Mw==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    ZjM2MzVlMGU3ODM4NmFmMmM0MGFjZjc5ZTk2Y2UxMmI0NjBjNDQzN2E3MWVh
-    ZmU1Y2NjMDE1ZTU2YWY3ZGM4MzI5ZDJlMjY0YTBhYjUwNDk4NDQ3Zjc4Zjcz
-    NDE4NmQ2MGJhYzk3N2RlNDEzNzUwYmNlOGRiYjE4Y2JiNGUxODA=
-  data.tar.gz: !binary |-
-    MjM0NjU1MDNkYjA2YTU2MjBmYTU4ZmM4ZTMxYmUxNTNiNjgwOGViYjE2ODM3
-    MjNlZmJiZTE4YTk3ZTkwNjUwYjYzOThkODRkM2E3ZjNjMDVhZTkwYzg0Zjkx
-    YzJlZmU0ZDRjOGQzNzVlNDMyZTY1NmM3NTI0OTU5NWQ1N2YwOWM=
+SHA1:
+  metadata.gz: 3760bfc4fdec14fa4c466bce49cb8511e1e2acae
+  data.tar.gz: 9cca82ff693ac209e595f10eee22071efc46c313
+SHA512:
+  metadata.gz: 58960e8e161f56e7d9c551ffcea11371f1d0a6264d18c4640bf020c0dbb23bb3e6880959ffca17894eff35b921e168a4058a24465b2483fb1c864cd51903fe93
+  data.tar.gz: e6476901e1e58b17da77613f2b1bbeaef380e1e6cad9ac9ac8762f50454a8770d5977c6755560e250969ba06e7ead4f7028e45b0a05b7a5bded917b9003757b6

data/lib/phony/countries.rb

@@ -67,6 +67,8 @@ Phony.define do
 
   # Belgium.
   #
+  # http://en.wikipedia.org/wiki/Telephone_numbers_in_Belgium
+  #
   country '32', match(/^(70|800|90\d)\d+$/) >> split(3,3)   | # Service
                 match(/^(4[789]\d)\d{6}$/)  >> split(6)     | # Mobile
                 one_of('2','3','4','9')     >> split(3,2,2) | # Short NDCs

data/lib/phony/countries/brazil.rb

@@ -1,108 +1,104 @@
 # Brazilian phone numbers.
 #
-# http://www.anatel.gov.br/hotsites/CodigosNacionaisLocalidade/TelefoneCelular-CodigosDeArea.htm
-#
-# 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
- '14', #Sao Paulo
- '15', #Sao Paulo
- '16', #Sao Paulo
- '17', #Sao Paulo
- '18', #Sao Paulo
- '19', #Sao Paulo
-
- '21', #Rio de Janeiro
- '22', #Rio de Janeiro
-
- '24', #Rio de Janeiro
-
-
- '27', #Espírito Santo
- '28', #Espírito Santo
-
-
- '31', #Minas Gerais
- '32', #Minas Gerais
- '33', #Minas Gerais
- '34', #Minas Gerais
- '35', #Minas Gerais
- '36', #Minas Gerais
- '37', #Minas Gerais
- '38', #Minas Gerais
-
-
- '41', #Paraná
- '42', #Paraná
- '43', #Paraná
- '44', #Paraná
- '45', #Paraná
- '46', #Paraná
- '47', #Santa Catarina
- '48', #Santa Catarina
- '49', #Santa Catarina
-
- '51', #Rio Grande do Sul
- '52', #Rio Grande do Sul
- '53', #Rio Grande do Sul
- '54', #Rio Grande do Sul
- '55', #Rio Grande do Sul
-
- '61', #Distrito Federal
- '62', #Goiânia
- '63', #Tocantins
- '64', #Goiânia
- '65', #Mato Grosso
- '66', #Mato Grosso
- '67', #Mato Grosso do Sul
- '68', #Acre
- '69', #Rondônia
-
- '71', #Bahia
- '72', #Bahia
- '73', #Bahia
- '74', #Bahia
- '75', #Bahia
-
- '77', #Bahia
- '78', #Bahia
- '79', #Sergipe
-
- '81', #Pernambuco
- '82', #Alagoas
- '83', #Paraíba
- '84', #Rio Grande do Norte
- '85', #Ceará
- '86', #Piauí
- '87', #Pernambuco
- '88', #Ceará
- '89', #Piauí
-
- '91', #Pará
- '92', #Amazonas
- '93', #Pará
- '94', #Pará
- '95', #Roraima
- '96', #Amapá
- '97', #Amazonas
- '98', #Maranhão
- '99', #Maranhão
+# NDC Reference
+# http://www.anatel.gov.br/hotsites/CodigosNacionaisLocalidade/TelefoneCelular-CodigosDeArea.htm
 
-]
-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
+ # 11 #Sao Paulo
+ # 12 #Sao Paulo
+ # 13 #Sao Paulo
+ # 14 #Sao Paulo
+ # 15 #Sao Paulo
+ # 16 #Sao Paulo
+ # 17 #Sao Paulo
+ # 18 #Sao Paulo
+ # 19 #Sao Paulo
+ #
+ # 21 #Rio de Janeiro
+ # 22 #Rio de Janeiro
+ #
+ # 24 #Rio de Janeiro
+ #
+ # 27 #Espírito Santo
+ # 28 #Espírito Santo
+ #
+ # 31 #Minas Gerais
+ # 32 #Minas Gerais
+ # 33 #Minas Gerais
+ # 34 #Minas Gerais
+ # 35 #Minas Gerais
+ # 36 #Minas Gerais
+ # 37 #Minas Gerais
+ # 38 #Minas Gerais
+ #
+ # 41 #Paraná
+ # 42 #Paraná
+ # 43 #Paraná
+ # 44 #Paraná
+ # 45 #Paraná
+ # 46 #Paraná
+ # 47 #Santa Catarina
+ # 48 #Santa Catarina
+ # 49 #Santa Catarina
+ #
+ # 51 #Rio Grande do Sul
+ # 52 #Rio Grande do Sul
+ # 53 #Rio Grande do Sul
+ # 54 #Rio Grande do Sul
+ # 55 #Rio Grande do Sul
+ #
+ # 61 #Distrito Federal
+ # 62 #Goiânia
+ # 63 #Tocantins
+ # 64 #Goiânia
+ # 65 #Mato Grosso
+ # 66 #Mato Grosso
+ # 67 #Mato Grosso do Sul
+ # 68 #Acre
+ # 69 #Rondônia
+ #
+ # 71 #Bahia
+ # 72 #Bahia
+ # 73 #Bahia
+ # 74 #Bahia
+ # 75 #Bahia
+ #
+ # 77 #Bahia
+ # 78 #Bahia
+ # 79 #Sergipe
+ #
+ # 81 #Pernambuco
+ # 82 #Alagoas
+ # 83 #Paraíba
+ # 84 #Rio Grande do Norte
+ # 85 #Ceará
+ # 86 #Piauí
+ # 87 #Pernambuco
+ # 88 #Ceará
+ # 89 #Piauí
+ #
+ # 91 #Pará
+ # 92 #Amazonas
+ # 93 #Pará
+ # 94 #Pará
+ # 95 #Roraima
+ # 96 #Amapá
+ # 97 #Amazonas
+ # 98 #Maranhão
+ # 99 #Maranhão
+
+ndcs = /(11|12|13|14|15|16|17|18|19|21|22|24|27|28|31|32|33|34|35|36|37|38|41|42|43|44|45|46|47|48|49|51|52|53|54|55|61|62|63|64|65|66|67|68|69|71|72|73|74|75|77|78|79|81|82|83|84|85|86|87|88|89|91|92|93|94|95|96|97|98|99)\d{8}/
+
+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', match(/^(11|12|13|14|15|16|17|18|19|21|22|24|27|28)9\d+$/) >> split(5,4) |
+  country '55', match(/^(11|12|13|14|15|16|17|18|19|21|22|24|27|28)9\d{8}$/) >> split(5,4) |
+                match(ndcs)                  >> split(4,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)
+                one_of(service)              >> split(3) |
+                fixed(3)                     >> split(3)
 end

data/lib/phony/countries/serbia.rb

@@ -16,8 +16,13 @@ Phony.define do
         /\A\d{5}\z/ => [3,2],
         /\A\d+\z/ => [3,3]) |
     one_of(%w(72)) >> split(3,3) | # ISP
-    one_of(%w(60 61 62 63 66 68 69)) >> matched_split(
-        /\A\d{3}\z/ => [3],
+    one_of(%w(60 61 62 63 68 69)) >> matched_split(
+        /\A\d{3}\z/ => [3],        
+        /\A\d{7}\z/ => [3,4],
+        /\A\d+\z/ => [3,3,4]) | # mobile, voicemail (mobile)
+    one_of(%w(66)) >> matched_split(
+        /\A\d{3}\z/ => [3],        
+        /\A\d{6}\z/ => [3,3],
         /\A\d{7}\z/ => [3,4],
         /\A\d+\z/ => [3,3,4]) | # mobile, voicemail (mobile)
     one_of(%w(64 65)) >> matched_split(

data/lib/phony/country.rb

@@ -24,8 +24,9 @@ module Phony
     # TODO Rewrite.
     #
     def with cc, options = {}
-      @cc           = cc
-      @invalid_ndcs = options[:invalid_ndcs] || []
+      @cc              = cc
+      @countrify_regex = /\A(?!#{@cc})/
+      @invalid_ndcs    = options[:invalid_ndcs] || []
     end
     
     # A number is split with the code handlers as given in the initializer.
@@ -68,7 +69,7 @@ module Phony
       countrify! number || number
     end
     def countrify! number
-      number.sub! /\A(?!#{@cc})/, @cc
+      number.sub! @countrify_regex, @cc
     end
     
     # Removes 0s from partially normalized numbers

data/lib/phony/national_splitters/variable.rb

@@ -26,9 +26,9 @@ module Phony
         
         # Try for all possible mapped.
         #
-        @mapped_ndc_min_length.upto(@mapped_ndc_max_length) do |i|
-          sized_ndcs = @ndcs[i]
-          return [@zero, presumed_code, national_number] unless sized_ndcs && !sized_ndcs.include?(presumed_code)
+        @mapped_ndc_min_length.upto @mapped_ndc_max_length do |i|
+          ndcs_of_size_i = @ndcs[i]
+          return [@zero, presumed_code, national_number] unless ndcs_of_size_i && !ndcs_of_size_i.include?(presumed_code)
           presumed_code << national_number.slice!(0..0)
         end
         
@@ -45,10 +45,6 @@ module Phony
       
       private
         
-        # def restructure ndc_map
-        #   optimize ndc_map.values.flatten
-        # end
-        
         # Optimizes and restructures the given ndcs array.
         #
         def optimize ndc_ary

data/spec/functional/plausibility_spec.rb

@@ -628,7 +628,8 @@ describe 'plausibility' do
                                                '+381 9 123 4567',
                                                '+381 60 123',
                                                '+381 60 123 456 7890',
-                                               '+381 70 123 456']
+                                               '+381 70 123 456',
+                                               '+381 66 12 1234']
       it_is_correct_for 'Sierra Leone', :samples => '+232 42 393 972'
       it_is_correct_for 'Solomon Islands', :samples => '+677  97851'
       it_is_correct_for 'Somali Democratic Republic', :samples => ['+252 1034 123 45',

data/spec/lib/phony/countries_spec.rb

@@ -105,6 +105,8 @@ describe 'country descriptions' do
       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
+      it_splits '551931311234', ['55', '19', '3131', '1234'] # Rio de Janeiro's 9 digits mobile
+      it_splits '5519991311234', ['55', '19', '99131', '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|
@@ -118,6 +120,11 @@ describe 'country descriptions' do
         it_splits '5540209999', ['55', '4020', '9999']
         it_splits '5540048999', ['55', '4004', '8999']
       end
+
+      context "service numbers" do
+        it_splits '55100', ['55', '100', ""]
+        it_splits '55199', ['55', '199', ""]
+      end
     end
     describe 'Cambodia' do
       it_splits '85512236142', ["855", "12", "236", "142"]   # mobile (Mobitel)

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: phony
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Florian Hanke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-09 00:00:00.000000000 Z
+date: 2014-01-14 00:00:00.000000000 Z
 dependencies: []
-description: ! 'Fast international phone number (E164 standard) normalizing, splitting
+description: 'Fast international phone number (E164 standard) normalizing, splitting
   and formatting. Lots of formatting options: International (+.., 00..), national
   (0..), and local).'
 email: florian.hanke+phony@gmail.com
@@ -19,6 +19,9 @@ extensions: []
 extra_rdoc_files:
 - README.textile
 files:
+- README.textile
+- lib/phony.rb
+- lib/phony/countries.rb
 - lib/phony/countries/austria.rb
 - lib/phony/countries/bangladesh.rb
 - lib/phony/countries/belarus.rb
@@ -55,7 +58,6 @@ files:
 - lib/phony/countries/united_kingdom.rb
 - lib/phony/countries/uruguay.rb
 - lib/phony/countries/zimbabwe.rb
-- lib/phony/countries.rb
 - lib/phony/country.rb
 - lib/phony/country_codes.rb
 - lib/phony/dsl.rb
@@ -70,8 +72,6 @@ files:
 - lib/phony/national_splitters/variable.rb
 - lib/phony/trunk_code.rb
 - lib/phony/vanity.rb
-- lib/phony.rb
-- README.textile
 - spec/functional/normalize_spec.rb
 - spec/functional/plausibility_spec.rb
 - spec/lib/phony/countries_spec.rb
@@ -97,17 +97,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Fast international phone number (E164 standard) normalizing, splitting and