phony 2.1.4 → 2.2.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MWEzOThmOTg4NjE5ODMzYzI1Zjg5NWJhYmNkMzY2MjIwMzc5NDkxMQ==
-  data.tar.gz: !binary |-
-    MzBmODNjNmUxNmQ3ZWUxYjJjYTQ2N2FmMGVkZWEyZTlkYjI5ZGFhMA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NGZiMDE5NWY0YmNiZDRiYWYxMDNjMTU3ZGEyYWViYTRkNmI1ZmFmODRjODgx
-    MWIwN2M1OTBlY2E1MmU0ZWM1ZTVhZDgxODczNDZjY2IwMTU2YzFkODg3NWUz
-    ZjAxNGJlODg2OWNkNjk2YWVkNDhiOTU4MTQ1ODE3MzQ2MjZjNmU=
-  data.tar.gz: !binary |-
-    ZmJjOTI5NzNjODU1YmI2YTdiMjU4ZjhiN2JhNzg2OGY3ZDkyZjNiNTNmNmUz
-    Mzg5N2YyMWNhNmRhYTlmNzM5NDBlYWViZDgyMjg2ZDMzODcwNjM5NTZkN2Y5
-    YzE0MDFkMjVkNDYwNzdjNDcwZDlhYTMzMWQ1OTI2ZDFjMzNhZDE=
+SHA1:
+  metadata.gz: cab09437919d2b8ac9980c997aca16b6029bc14b
+  data.tar.gz: c764db5c678f5bc78c6a49180319b7647e7c39a1
+SHA512:
+  metadata.gz: b6261b97af629e5f22fcfd53dff8c91decee37fa4ac50fec962cb065eab5e799ab33df8fe4c1997a22641a8facafa91af5a0f2a270a3c9a691d250f4f3411b71
+  data.tar.gz: 74e8df4cb1aa40c3416d8813a13d5e04639c54a0070293af51c792f60f5fecb914c2efdd8b5e8bc9aea79f7057c8597795ba935d17a2f4c855e7e7103cdce585

data/lib/phony/countries/italy.rb

@@ -158,6 +158,6 @@ Phony.define do
                 one_of(*service)     >> split(3,3) |
                 one_of(*mobile)      >> split(3,4) |
                 one_of(*ndcs_2digit) >> split(4,4) |
-                one_of(*ndcs_3digit) >> split(3,4) |
+                one_of(*ndcs_3digit) >> split(6..7) |
                 one_of(*ndcs_4digit) >> split(3,3)
 end

data/lib/phony/country.rb

@@ -24,9 +24,8 @@ module Phony
     # TODO Rewrite.
     #
     def with cc, options = {}
-      @cc              = cc
-      @countrify_regex = /\A(?!#{@cc})/
-      @invalid_ndcs    = options[:invalid_ndcs] || []
+      @cc           = cc
+      @invalid_ndcs = options[:invalid_ndcs] || []
     end
     
     # A number is split with the code handlers as given in the initializer.
@@ -60,18 +59,6 @@ module Phony
       number.gsub!(@@basic_cleaning_pattern, EMPTY_STRING) || number
     end
     
-    # Adds the country code to the front
-    # if it does not already start with it.
-    #
-    # Note: This won't be correct in some cases, but it is the best we can do.
-    #
-    def countrify number
-      countrify! number || number
-    end
-    def countrify! number
-      number.sub! @countrify_regex, @cc
-    end
-    
     # Removes 0s from partially normalized numbers
     # such as 410443643533.
     # 
@@ -87,8 +74,6 @@ module Phony
         break result if result
         number
       end
-      return unless normalized
-      countrify! normalized
       normalized
     end
     

data/lib/phony/country_codes.rb

@@ -40,6 +40,18 @@ module Phony
     def clean! number
       number.gsub!(@@basic_cleaning_pattern, EMPTY_STRING) || number
     end
+    
+    # Adds the country code to the front
+    # if it does not already start with it.
+    #
+    # Note: This won't be correct in some cases, but it is the best we can do.
+    #
+    def countrify number, cc
+      countrify!(number, cc) || number
+    end
+    def countrify! number, cc
+      number.sub! /\A/, cc # @countrify_regex, @cc
+    end
 
     # 00 for the standard international call prefix.
     # http://en.wikipedia.org/wiki/List_of_international_call_prefixes
@@ -60,7 +72,8 @@ module Phony
         country, cc, number = split_cc number
         country
       end
-      country.normalize number
+      number = country.normalize number
+      countrify! number, cc
     end
 
     # Splits this number into cc, ndc and locally split number parts.

data/spec/functional/error_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe 'Issues' do
+
+  describe '#136' do
+    
+    it 'is correct for country 39' do
+      Phony.normalize('+39 393 0000000').should == '393930000000'
+    end
+    
+    it 'fixes #136' do
+      italia = Phony['39']
+      italia.normalize('363 000000').should == '363000000'
+    end
+
+    it 'is correct for country 46' do
+      Phony.normalize('+46 (0)46 222 0000').should == '46462220000'
+    end
+    
+  end
+  
+end

data/spec/functional/plausibility_spec.rb

@@ -162,9 +162,16 @@ describe 'plausibility' do
       end
       it 'is correct for Italian numbers' do
         Phony.plausible?('+39 06 1234 4567').should be_true
+
+        Phony.plausible?('+39 035 00000').should be_false
+        Phony.plausible?('+39 035 000000').should be_true
+        Phony.plausible?('+39 015 8407324').should be_true
+
+        Phony.plausible?('+39 0471 123 456').should be_true
+
+        # Mobile
         Phony.plausible?('+39 335 123 4567').should be_true
         Phony.plausible?('+39 335 123').should be_false
-        Phony.plausible?('+39 0471 123 456').should be_true
       end
       it 'is correct for German numbers' do
         Phony.plausible?('+49 209 169 - 0').should be_true # Gelsenkirchen

data/spec/lib/phony/countries_spec.rb

@@ -339,8 +339,8 @@ describe 'country descriptions' do
       it_splits '390612341234', ['39', '06', '1234', '1234'] # Roma
       it_splits '390288838883', ['39', '02', '8883', '8883'] # Milano
       it_splits '390141595661', ['39', '0141', '595', '661'] # Asti
-      it_splits '3903123391',   ['39', '031', '233', '91']   # Como
-      it_splits '390909709511', ['39', '090', '970', '9511'] # Barcellona
+      it_splits '3903123391',   ['39', '031', '23391']   # Como
+      it_splits '390909709511', ['39', '090', '9709511'] # Barcellona
       it_splits '390471811353', ['39', '0471', '811', '353'] # Bolzano
     end
     describe 'Japan' do

data/spec/lib/phony/country_spec.rb

@@ -34,7 +34,7 @@ describe Phony::Country do
     end
     describe 'normalize' do
       it "should handle ZH" do
-        @switzerland.normalize('0443643532').should == '41443643532'
+        @switzerland.normalize('0443643532').should == '443643532'
       end
     end
   end

data/spec/lib/phony_spec.rb

@@ -9,7 +9,7 @@ describe Phony do
       it '' do
         us = described_class['1']
         us.plausible?('4159224711').should be_true
-        us.countrify!('4159224711').should == '14159224711'
+        us.normalize('4159224711').should == '4159224711'
       end
     end
   end
@@ -82,13 +82,13 @@ describe Phony do
     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'
+        Phony["1"].normalize("555 1234567890").should == '5551234567890'
+        Phony["1"].normalize("+1 555 1234567890").should == '5551234567890'
+        Phony["1"].normalize("+1 (0) 555 1234567890").should == '5551234567890'
       end
       it 'normalizes Japan correctly' do
-        Phony["81"].normalize("80 1234 5634").should == '818012345634'
-        Phony["81"].normalize("+81 80 1234 5634").should == '818012345634'
+        Phony["81"].normalize("80 1234 5634").should == '8012345634'
+        Phony["81"].normalize("Hello    80 1234 5634").should == '8012345634'
       end
     end
   end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: phony
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.2.0
 platform: ruby
 authors:
 - Florian Hanke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-12 00:00:00.000000000 Z
+date: 2014-02-21 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,7 @@ files:
 - lib/phony/national_splitters/variable.rb
 - lib/phony/trunk_code.rb
 - lib/phony/vanity.rb
-- lib/phony.rb
-- README.textile
+- spec/functional/error_spec.rb
 - spec/functional/normalize_spec.rb
 - spec/functional/plausibility_spec.rb
 - spec/lib/phony/countries_spec.rb
@@ -97,22 +98,23 @@ 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
   formatting.
 test_files:
+- spec/functional/error_spec.rb
 - spec/functional/normalize_spec.rb
 - spec/functional/plausibility_spec.rb
 - spec/lib/phony/countries_spec.rb