phony 2.1.0 → 2.1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTIxZGU3ZmFlODE0ZGE2ZDAwYWVlODk5N2VhZWJkNDgxNDdlYzg1ZQ==
+    NTI2YjZiNDBhODQ4NWQ1NTIzNmNlODllOTY3N2UyZTRhM2MxNmM1MQ==
   data.tar.gz: !binary |-
-    ODZmM2Q4MDE2YTQ1NGZjZjg0N2EyZTAwNzc2NDUyNTY1NzA3ZWY5Mw==
-SHA512:
+    M2UwYmM0ZmNjMjMwNWE1YTE5ZTY5YjNiOWY4ZjU4ZGI4ZDM4Y2Q5Mw==
+!binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZTA0OWFmMzAzYzVmZjU1ZGZmYjcxMjI5YjljMGE1NTY0ZjU1ZDk4ZjgzNzc5
-    ZTY0ZTFhMWIwYjI1ZTUyNWUxZWM1M2Q2NTVjNWI0OWM3MGI4ZGY5ODRhZjc3
-    MjM5MzEzNDc3ZmEzMmQwZmVlZGVhNjg0ZmJiZGIxZDIyODBjMTE=
+    ZjM2MzVlMGU3ODM4NmFmMmM0MGFjZjc5ZTk2Y2UxMmI0NjBjNDQzN2E3MWVh
+    ZmU1Y2NjMDE1ZTU2YWY3ZGM4MzI5ZDJlMjY0YTBhYjUwNDk4NDQ3Zjc4Zjcz
+    NDE4NmQ2MGJhYzk3N2RlNDEzNzUwYmNlOGRiYjE4Y2JiNGUxODA=
   data.tar.gz: !binary |-
-    OWM1NTM1YTE5ZDQ3NjQ2NWNiNzQzNzIxMjM1NGY5MTc4NjMyNzZiZDg0ZjI4
-    ZjUwOTQ1OWM4NmM4MjJiYzM0MDQwNTVkMDdkZjY2NjdlMzMzYzEyMmMzM2Vm
-    YjJmMmEyOWZhMzI5ZGU0NmU4NTkyZTgxMmVjNTU5ZjQyYTI0ZGY=
+    MjM0NjU1MDNkYjA2YTU2MjBmYTU4ZmM4ZTMxYmUxNTNiNjgwOGViYjE2ODM3
+    MjNlZmJiZTE4YTk3ZTkwNjUwYjYzOThkODRkM2E3ZjNjMDVhZTkwYzg0Zjkx
+    YzJlZmU0ZDRjOGQzNzVlNDMyZTY1NmM3NTI0OTU5NWQ1N2YwOWM=

data/lib/phony/countries.rb

@@ -67,10 +67,10 @@ Phony.define do
 
   # 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,5) | # Short NDCs
-                fixed(2)                    >> split(3,5)   # 2-digit NDCs
+  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
+                fixed(2)                    >> split(2,2,2)   # 2-digit NDCs
 
   # France.
   #

data/lib/phony/country.rb

@@ -45,15 +45,17 @@ module Phony
       end
     end
     
-    # TODO This is now in country_codes and country.
+    # Cleans all non-numeric characters.
+    #
+    @@basic_cleaning_pattern = /\(0\)|\D/
+    # Clean number of all non-numeric characters and return a copy.
     #
-    @@basic_cleaning_pattern = /\D/
     def clean number
       clean! number && number.dup
     end
+    # Clean number of all non-numeric characters and return it.
+    #
     def clean! number
-      # Remove non-digit chars.
-      #
       number.gsub!(@@basic_cleaning_pattern, EMPTY_STRING) || number
     end
     
@@ -66,7 +68,7 @@ module Phony
       countrify! number || number
     end
     def countrify! number
-      number.sub! /\A(?!#{@cc})?/, @cc
+      number.sub! /\A(?!#{@cc})/, @cc
     end
     
     # Removes 0s from partially normalized numbers
@@ -79,7 +81,7 @@ module Phony
     #
     def normalize national_number
       clean! national_number
-      normalized = @codes.reduce(national_number) do |number, code|
+      normalized = @codes.reduce national_number do |number, code|
         result = code.normalize number
         break result if result
         number

data/lib/phony/country_codes.rb

@@ -27,15 +27,17 @@ module Phony
       countries[cc.size][cc]
     end
     
-    # TODO This is now in country_codes and country.
+    # Clean number of all non-numeric characters, initial zeros or (0).
     #
     @@basic_cleaning_pattern = /\A00?|\(0\)|\D/
+    # Clean number of all non-numeric characters, initial zeros or (0) and return it.
+    #
     def clean number
       clean! number && number.dup
     end
+    # Clean number of all non-numeric characters, initial zeros or (0) and return a copy.
+    #
     def clean! number
-      # Remove non-digit chars.
-      #
       number.gsub!(@@basic_cleaning_pattern, EMPTY_STRING) || number
     end
 

data/spec/functional/plausibility_spec.rb

@@ -122,6 +122,12 @@ describe 'plausibility' do
         Phony.plausible?('+41 44 111 22 334').should be_false
         Phony.plausible?('+41 44 111 22').should be_false
       end
+      
+      it "is correct for Belgian numbers" do
+        Phony.plausible?('+32 3 241 11 32').should be_true
+        Phony.plausible?('0032 3 241 11 32').should be_true
+        Phony.plausible?('0032 (0) 3 241 11 32').should be_true
+      end
 
       it "is correct for Danish numbers" do
         Phony.plausible?('+45 44 11 12 23 34').should be_false

data/spec/lib/phony/countries_spec.rb

@@ -70,12 +70,12 @@ describe 'country descriptions' do
     end
 
     describe 'Belgium' do
-      it_splits '3235551212', ['32', '3', '555', '1212']   # Antwerpen
-      it_splits '32505551212', ['32', '50', '555', '1212'] # Brugge
-      it_splits '3225551212', ['32', '2', '555', '1212']   # Brussels
-      it_splits '3295551914', ['32', '9', '555', '1914']   # Gent
-      it_splits '3245551414', ['32', '4', '555', '1414']   # Liège
-      it_splits '3216473200', ['32', '16', '473', '200']   # Leuven
+      it_splits '3235551212', ['32', '3', '555', '12', '12']   # Antwerpen
+      it_splits '3250551212', ['32', '50', '55', '12', '12'] # Brugge
+      it_splits '3225551212', ['32', '2', '555', '12', '12']   # Brussels
+      it_splits '3295551914', ['32', '9', '555', '19', '14']   # Gent
+      it_splits '3245551414', ['32', '4', '555', '14', '14']   # Liège
+      it_splits '3216473200', ['32', '16', '47', '32', '00']   # Leuven
       it_splits '32475279584', ['32', '475', '279584']     # mobile
       it_splits '3270123123', ['32', '70', '123', '123']   # Bus Service?
     end

data/spec/lib/phony_spec.rb

@@ -75,9 +75,21 @@ describe Phony do
         it 'normalizes Lithuania' do
           Phony.normalize('370 8 5 1234567').should == '37051234567'
         end
-        it 'normalizes Belarus'
+        it 'normalizes Belarus' do
+          Phony.normalize('375 152450911').should == '375152450911'
+        end
+      end
+    end
+    describe 'country-based' do
+      it 'normalizes the US correctly' do
+        Phony["1"].normalize("555 1234567890").should == '15551234567890'
+        Phony["1"].normalize("+1 555 1234567890").should == '15551234567890'
+        Phony["1"].normalize("+1 (0) 555 1234567890").should == '15551234567890'
+      end
+      it 'normalizes Japan correctly' do
+        Phony["81"].normalize("80 1234 5634").should == '818012345634'
+        Phony["81"].normalize("+81 80 1234 5634").should == '818012345634'
       end
-
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phony
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.2
 platform: ruby
 authors:
 - Florian Hanke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-06 00:00:00.000000000 Z
+date: 2014-01-09 00:00:00.000000000 Z
 dependencies: []
 description: ! 'Fast international phone number (E164 standard) normalizing, splitting
   and formatting. Lots of formatting options: International (+.., 00..), national
@@ -19,9 +19,6 @@ 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
@@ -58,6 +55,7 @@ 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
@@ -72,6 +70,8 @@ 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
@@ -107,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Fast international phone number (E164 standard) normalizing, splitting and