phony 2.0.0 → 2.0.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzVjNGJlYTgwN2Q5NzFmODAzYzY5YjUzZmVkY2FkNjc2MjRkOTQwMg==
+    NGI2NWU3NWFlYjc4MmE5Y2EyYTdlYmFhYmM4Yzg2MjNmNWRkYzhlMw==
   data.tar.gz: !binary |-
-    MjdjMWU2ZjBiODg2YjE2MThiNGQyZDlkODE2OGM1MGJkNjAyNTE0NA==
+    MGI0NTI1ZTRjYzg1ZGU4OTc0NTA0ZmM5NmYzM2U4NzQ5ZTk4NjIxOA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZTM3NDM2MGM3MjVhZmVjYjBjZTQ0YTEwNmEzYWUwMDk4NDRhNDZlNDU0NjU0
-    ODRjZTQ4ZTQ0YTA1NjAxMzlkODQyOTJiMzFkYTZmYWYzYmNiNGNkZWMxZmIx
-    MjQyYzUwNWE2MTMxNDJkZDU3MTY5MTY1MmRjZTg4ZTExOGQ1MTA=
+    YjllNWExZjBhNTk5YTNjMTM5NjYxMTJlZDNmNmM5MjAxNDE1NzgwNzEyNDFi
+    OGU2ZWZhMTY5MmYyY2Q5YTVkNmIzODc1YTViMDMyMzg0ZTcxZTJjZTVlYzc2
+    Zjk2NTQwOTNmNDJkZGExMzAyMTk4ODgyNzQxODM1ZjM2ZjM3ZDU=
   data.tar.gz: !binary |-
-    MjY4Zjk0MjdjNWQ1NzZmNjEyMjQyMzhjY2M5YTNjZTA5MDlmMDY2NjI4MmRk
-    ZTY2ZjdhY2U2ZDNhZjZlMTJlMDY4NGM2OGRlMTI1ZTIzYzI1YjU5ZjdlNDVm
-    YmE0Njk0NGI4NDRhYTAzYmQ1ZTI0MDYzMThmYzQ1MzkyMGU1MTE=
+    ZTE5NzRjMzBlZWMwMzkxNDNmZTE0ZTQ5NDc4ZTdlMTI1ZDQwNzUxNTNkODNh
+    NjM0M2UxNWE4MmRhZGY4ZGZiMWFlNzEwNGVmOGI4OTIwMmZjZGI2NTcxNWNm
+    NDhmZjI2NTJmZDdlZTNjZGE5ODViOWM0MjczNjNhMGFiYzRhYjg=

data/lib/phony.rb

@@ -11,6 +11,7 @@ require File.expand_path '../phony/national_splitters/default', __FILE__
 require File.expand_path '../phony/national_splitters/none', __FILE__
 require File.expand_path '../phony/national_code', __FILE__
 require File.expand_path '../phony/country', __FILE__
+require File.expand_path '../phony/trunk_code', __FILE__
 require File.expand_path '../phony/country_codes', __FILE__
 
 require File.expand_path '../phony/dsl', __FILE__

data/lib/phony/countries.rb

@@ -20,7 +20,7 @@
 # Note: The ones that are commented are defined in their special files.
 #
 Phony.define do
-
+  
   # Reserved.
   #
   country '0', fixed(1) >> split(10) # Reserved.
@@ -28,9 +28,9 @@ Phony.define do
   # USA, Canada, etc.
   #
   country '1',
-          fixed(3, :zero => false) >> trunk('1') >> split(3,4),
-          # invalid_ndcs('911'), # /911/ would also work.
-          :invalid_ndcs => ['911'] # TODO
+    trunk('1') |
+    fixed(3, :zero => false) >> split(3,4),
+    :invalid_ndcs => ['911']
 
   # Kazakhstan (Republic of) & Russsian Federation.
   # also Abhasia and South Osetia autonomous regions / recognized by some states as independent countries
@@ -51,16 +51,17 @@ Phony.define do
   # Greece. http://www.numberingplans.com/?page=dialling&sub=areacodes
   # https://www.numberingplans.com/?page=plans&sub=phonenr&alpha_2_input=GR
   country '30',
-          one_of(%w(231 241 251 261 271 281)) >> split(3,4) |
-          one_of('800') >> split(3,4) | # freephone
-          one_of(%w(801 807)) >> split(3,4) | # shared cost, premium rate
-          one_of('896') >> split(3,4) | # ISP
-          one_of(%w(901 909)) >> split(3,4) | # premium rate
-          one_of(%w(21 22 23 24 25 26 27 28)) >> split(4,4) |
-          one_of('50') >> split(4,4) | # VPN
-          one_of('69') >> split(4,4) | # mobile, pager
-          one_of('70') >> split(4,4) | # universal access
-          fixed(4) >> split(6)   # 3-digit NDCs
+    trunk('0') |
+    one_of(%w(231 241 251 261 271 281)) >> split(3,4) |
+    one_of('800') >> split(3,4) | # freephone
+    one_of(%w(801 807)) >> split(3,4) | # shared cost, premium rate
+    one_of('896') >> split(3,4) | # ISP
+    one_of(%w(901 909)) >> split(3,4) | # premium rate
+    one_of(%w(21 22 23 24 25 26 27 28)) >> split(4,4) |
+    one_of('50') >> split(4,4) | # VPN
+    one_of('69') >> split(4,4) | # mobile, pager
+    one_of('70') >> split(4,4) | # universal access
+    fixed(4) >> split(6)   # 3-digit NDCs
 
   # country '31' # Netherlands, see special file.
 
@@ -83,9 +84,10 @@ Phony.define do
   # Hungary.
   #
   country '36',
-          one_of('104','105','107','112') >> trunk('06') >> split(3,3) | # Service
-          one_of('1')                     >> trunk('06') >> split(3,4) | # Budapest
-          fixed(2)                        >> trunk('06') >> split(3,4)   # 2-digit NDCs
+    trunk('06') |
+    one_of('104','105','107','112') >> split(3,3) | # Service
+    one_of('1')                     >> split(3,4) | # Budapest
+    fixed(2)                        >> split(3,4)   # 2-digit NDCs
 
   # country '39' # Italy, see special file.
 
@@ -340,8 +342,8 @@ Phony.define do
   # http://en.wikipedia.org/wiki/Telephone_numbers_in_Rwanda
   country '250',
           one_of('25')       >> split(7) | # Geographic, fixed
-          match(/^(7[238])/) >> split(7)  | # Non-geographic, mobile
-          one_of('06')       >> split(6)    # Satellite
+          match(/^(7[238])/) >> split(7) | # Non-geographic, mobile
+          one_of('06')       >> split(6)   # Satellite
 
   country '251', fixed(2) >> split(3, 4) # Ethiopia http://www.wtng.info/wtng-251-et.html
 
@@ -352,8 +354,9 @@ Phony.define do
   # Kenya
   # http://en.wikipedia.org/wiki/Telephone_numbers_in_Kenya
   country '254',
-          match(/^(7\d\d)/)  >> split(6) | # mobile
-          fixed(2)           >> split(7)   # landline
+    trunk('0') |
+    match(/^(7\d\d)/) >> split(6) | # mobile
+    fixed(2)          >> split(7)   # landline
 
   # Tanzania.
   #
@@ -562,11 +565,12 @@ Phony.define do
   # Lithuania
   #
   country '370',
-          one_of('700', '800')  >> trunk('8') >> split(2,3)   | # Service
-          match(/^(6\d\d)\d+$/) >> trunk('8') >> split(2,3)   | # Mobile
-          one_of('5')           >> trunk('8') >> split(3,2,2) | # Vilnius
-          one_of('37','41')     >> trunk('8') >> split(2,2,2) | # Kaunas, Šiauliai
-          fixed(3)              >> trunk('8') >> split(1,2,2)   # 3-digit NDCs.
+    trunk('8') |
+    one_of('700', '800')  >> split(2,3)   | # Service
+    match(/^(6\d\d)\d+$/) >> split(2,3)   | # Mobile
+    one_of('5')           >> split(3,2,2) | # Vilnius
+    one_of('37','41')     >> split(2,2,2) | # Kaunas, Šiauliai
+    fixed(3)              >> split(1,2,2)   # 3-digit NDCs.
 
   # country '371' # Latvia, see special file
 

data/lib/phony/countries/italy.rb

@@ -152,8 +152,9 @@ service = [ # Not exhaustive.
 ]
 
 Phony.define do
-  country '39', one_of(*service)                >> trunk('0', normalize: false) >> split(3,3) |
-                one_of(*mobile)                 >> trunk('0', normalize: false) >> split(3,4) |
-                one_of(*ndcs_2digit)            >> trunk('0', normalize: false) >> split(4,4) |
-                one_of(*ndcs, :max_length => 3) >> trunk('0', normalize: false) >> split(3,4)
+  country '39', trunk('0', :normalize => false) |
+                one_of(*service)                >> split(3,3) |
+                one_of(*mobile)                 >> split(3,4) |
+                one_of(*ndcs_2digit)            >> split(4,4) |
+                one_of(*ndcs, :max_length => 3) >> split(3,4)
 end

data/lib/phony/countries/latvia.rb

@@ -33,8 +33,9 @@ ndcs_with_5_subscriber_numbers = %w(
 ndcs_with_6_subscriber_numbers = %w(67)
 
 Phony.define do
-  country '371',
-          one_of(ndcs_with_5_subscriber_numbers) >> trunk('8') >> split(3,2) |
-          one_of(ndcs_with_6_subscriber_numbers) >> trunk('8') >> split(3,3) |
-          fixed(3) >> trunk('8') >> split(3,2)
+  country '371', 
+    trunk('8', :normalize => false) |
+    one_of(ndcs_with_5_subscriber_numbers) >> split(3,2) |
+    one_of(ndcs_with_6_subscriber_numbers) >> split(3,3) |
+    fixed(3)                               >> split(3,2)
 end

data/lib/phony/countries/netherlands.rb

@@ -51,8 +51,9 @@ service = [
  ]
 
 Phony.define do
-  country '31', one_of(service) >> split(3,3) |
-          one_of('6')  >> split(2,2,2,2) | # mobile
-          one_of(ndcs) >> split(3,4)     | # landline (geographic region)
-          fixed(3)     >> split(3,3)       # 3 digit ndc
+  country '31', 
+    one_of(service) >> split(3,3) |
+    one_of('6')  >> split(2,2,2,2) | # mobile
+    one_of(ndcs) >> split(3,4)     | # landline (geographic region)
+    fixed(3)     >> split(3,3)       # 3 digit ndc
 end

data/lib/phony/countries/russia_kazakhstan_abkhasia_south_ossetia.rb

@@ -117,16 +117,12 @@ ndcs_with_7_subscriber_digits = %w(342 343 347 351 383 391 473 495 496 498 499 8
 )
 
 Phony.define do
-  country '7', one_of(ndcs_with_5_subscriber_digits)      >> trunk('8') >> split(1, 2, 2) |
-               one_of(ndcs_with_6_subscriber_digits)      >> trunk('8') >> split(2, 2, 2) |
-               one_of(ndcs_with_7_subscriber_digits)      >> trunk('8') >> split(3, 2, 2) |
-               one_of(%w(800))                            >> trunk('8') >> split(3, 2, 2) | # Russia free number
-               one_of(%w(995344 9971 99744 9976 997)) >> trunk('8') >> split(2, 2, 2) | # South Osetia
-               
-               # The two following lines have been replaced by fixed(3).
-               #
-               # match(/([67]\d{2})/)                  >> split(2, 2, 2) | # Kazakhstan: (600..799)
-               # one_of(%w(840 940))                   >> split(2,2,2) # Abhasia
-               
-               fixed(3) >> trunk('8') >> split(2,2,3) # TODO 2,2,3 or 2,2,2?
+  country '7', 
+    trunk('8') |
+    one_of(ndcs_with_5_subscriber_digits)  >> split(1, 2, 2) |
+    one_of(ndcs_with_6_subscriber_digits)  >> split(2, 2, 2) |
+    one_of(ndcs_with_7_subscriber_digits)  >> split(3, 2, 2) |
+    one_of(%w(800))                        >> split(3, 2, 2) | # Russia free number
+    one_of(%w(995344 9971 99744 9976 997)) >> split(2, 2, 2) | # South Osetia
+    fixed(3)                               >> split(2, 2, 3)
 end

data/lib/phony/countries/tajikistan.rb

@@ -67,10 +67,11 @@ ndcs_with_3_subscriber_digits = %w(331700)
 
 Phony.define do
   country '992',
-          one_of(ndcs_with_3_subscriber_digits) >> trunk('8') >> split(3) |
-          one_of(ndcs_with_5_subscriber_digits) >> trunk('8') >> split(3,2) |
-          one_of(ndcs_with_6_subscriber_digits) >> trunk('8') >> split(3,3) |
-          match(/\A(505|9\d\d)\d+\z/) >> trunk('8') >> split(3,3) | # mobile
-          one_of(%w(446 474 487)) >> trunk('8') >> split(3,3) | # wireless geographic
-          fixed(3) >> trunk('8') >> split(3,3)
+    trunk('8') |
+    one_of(ndcs_with_3_subscriber_digits) >> split(3)   |
+    one_of(ndcs_with_5_subscriber_digits) >> split(3,2) |
+    one_of(ndcs_with_6_subscriber_digits) >> split(3,3) |
+    match(/\A(505|9\d\d)\d+\z/)           >> split(3,3) | # mobile
+    one_of(%w(446 474 487))               >> split(3,3) | # wireless geographic
+    fixed(3)                              >> split(3,3)
 end

data/lib/phony/countries/turkmenistan.rb

@@ -65,9 +65,10 @@ ndcs_with_4_subscriber_digits = %w(1392)
 
 Phony.define do
   country '993',
-          one_of(ndcs_with_4_subscriber_digits) >> trunk('8') >> split(4) |
-          one_of(ndcs_with_5_subscriber_digits) >> trunk('8') >> split(3,2) |
-          one_of(ndcs_with_6_subscriber_digits) >> trunk('8') >> split(3,3) |
-          one_of('6') >> trunk('8') >> split(3,4) | # mobile
-          fixed(3) >> trunk('8') >> split(3,2)
+    trunk('8') |
+    one_of(ndcs_with_4_subscriber_digits) >> split(4) |
+    one_of(ndcs_with_5_subscriber_digits) >> split(3,2) |
+    one_of(ndcs_with_6_subscriber_digits) >> split(3,3) |
+    one_of('6')                           >> split(3,4) | # mobile
+    fixed(3)                              >> split(3,2)
 end

data/lib/phony/country_codes.rb

@@ -34,14 +34,19 @@ module Phony
     # We can't know from what country that person was calling, so we
     # can't remove the intl' call prefix.
     #
-    @@basic_normalizing_pattern = /^00?|\D/
+    # We remove:
+    #  * 0 or 00 at the very beginning.
+    #  * (0) anywhere.
+    #  * Non-digits.
+    #
+    @@basic_cleaning_pattern = /^00?|\(0\)|\D/
     def clean number
       clean! number && number.dup
     end
     def clean! number
       # Remove non-digit chars.
       #
-      number.gsub!(@@basic_normalizing_pattern, EMPTY_STRING) || number
+      number.gsub!(@@basic_cleaning_pattern, EMPTY_STRING) || number
     end
     def normalize number, options = {}
       clean! number

data/lib/phony/dsl.rb

@@ -54,25 +54,10 @@ module Phony
       Phony::CountryCodes.instance.add country_code, definition
     end
     
-    class Trunk
-      
-      def initialize code, options = {}
-        @code = code
-        @normalize = options[:normalize]
-      end
-      
-      def national_splitter= national_splitter
-        @national_splitter = national_splitter
-      end
-      
-      def >> local_splitter
-        @national_splitter.country_for local_splitter, @normalize, @code
-      end
-      
-    end
-    
+    #
+    #
     def trunk code, options = {}
-      Trunk.new code, options
+      TrunkCode.new code, options
     end
 
     # National matcher & splitters.
@@ -150,7 +135,7 @@ module Phony
     # This country still uses a default NDC (and needs to be done, hence the todo).
     #
     def todo
-      none >> NationalSplitters::Default.instance_for
+      none >> split(10)
     end
 
     # Local splitters.

data/lib/phony/local_splitters/fixed.rb

@@ -59,7 +59,7 @@ module Phony
         end
       end
       
-      # TODO Fix length fudging.
+      #
       #
       def plausible? rest, hints = {}
         @length === rest.inject(0) { |total, part| total + part.size }

data/lib/phony/national_code.rb

@@ -8,12 +8,9 @@ module Phony
     
     #
     #
-    def initialize national_splitter, local_splitter, normalize = nil, trunk_code = '0'
+    def initialize national_splitter, local_splitter
       @national_splitter = national_splitter
       @local_splitter    = local_splitter
-      @normalize         = normalize != false
-      @trunk_code        = trunk_code
-      @trunk_code_replacement = /\A#{@trunk_code}+/
     end
 
     # Split gets a number without country code and splits it into
@@ -30,8 +27,7 @@ module Phony
     # Note: Some cases, like Italy, don't remove the relative zero.
     #
     def normalize national_number
-      return national_number unless @normalize
-      national_number.gsub(@trunk_code_replacement, EMPTY_STRING)
+      national_number.gsub(/\A0+/, EMPTY_STRING)
     end
 
   end

data/lib/phony/national_splitters/dsl.rb

@@ -10,15 +10,15 @@ module Phony
       #
       def >> local_splitter
         if local_splitter.respond_to? :split
-          country_for local_splitter, true
+          country_for local_splitter
         else
           local_splitter.national_splitter = self
           local_splitter
         end
       end
       
-      def country_for local_splitter, with_zero, trunk = '0'
-        Phony::Country.new Phony::NationalCode.new(self, local_splitter, with_zero, trunk)
+      def country_for local_splitter
+        Phony::Country.new Phony::NationalCode.new(self, local_splitter)
       end
       
     end

data/lib/phony/trunk_code.rb

@@ -0,0 +1,35 @@
+module Phony
+
+  class TrunkCode
+  
+    def initialize code, options = {}
+      @trunk_code_replacement = /\A#{code}+/
+      @normalize = options[:normalize] != false
+      @split     = options[:split]
+    end
+    
+    # Prepends itself to the other codes.
+    #
+    def | other
+      other.codes.unshift self
+      other
+    end
+
+    # Split gets a number without country code and splits it into
+    # its parts.
+    #
+    def split national_number
+      national_number.gsub! @trunk_code_replacement, EMPTY_STRING if @split
+      return [@code, national_number]
+    end
+
+    # Never normalizes.
+    # 
+    def normalize national_number
+      return national_number unless @normalize
+      national_number.gsub @trunk_code_replacement, EMPTY_STRING
+    end
+  
+  end
+
+end

data/spec/lib/phony/national_code_spec.rb

@@ -56,36 +56,36 @@ describe Phony::NationalCode do
         @national.normalize('142278186').should == '142278186'
       end
     end
-    context 'normalizing' do
-      context 'false' do
-        before(:each) do
-          @national = Phony::NationalCode.new nil, nil, false
-        end
-        it 'normalizes an italian case correctly' do
-          @national.normalize('0909709511').should == '0909709511'
-        end
-      end
-      context 'true' do
-        before(:each) do
-          national_splitter = Phony::NationalSplitters::Fixed.instance_for 2
-          local_splitter    = Phony::LocalSplitters::Fixed.instance_for [3, 2, 2]
-          @national = Phony::NationalCode.new national_splitter, local_splitter, true
-        end
-        it 'normalizes a swiss case correctly' do
-          @national.normalize('044364353').should == '44364353'
-        end
-      end
-      context 'nil (true)' do
-        before(:each) do
-          national_splitter = Phony::NationalSplitters::Fixed.instance_for 2
-          local_splitter    = Phony::LocalSplitters::Fixed.instance_for [3, 2, 2]
-          @national = Phony::NationalCode.new national_splitter, local_splitter, nil
-        end
-        it 'normalizes a swiss case correctly' do
-          @national.normalize('044364353').should == '44364353'
-        end
-      end
-    end
+    # context 'normalizing' do
+    #   context 'false' do
+    #     before(:each) do
+    #       @national = Phony::NationalCode.new nil, nil, false
+    #     end
+    #     it 'normalizes an italian case correctly' do
+    #       @national.normalize('0909709511').should == '0909709511'
+    #     end
+    #   end
+    #   context 'true' do
+    #     before(:each) do
+    #       national_splitter = Phony::NationalSplitters::Fixed.instance_for 2
+    #       local_splitter    = Phony::LocalSplitters::Fixed.instance_for [3, 2, 2]
+    #       @national = Phony::NationalCode.new national_splitter, local_splitter, true
+    #     end
+    #     it 'normalizes a swiss case correctly' do
+    #       @national.normalize('044364353').should == '44364353'
+    #     end
+    #   end
+    #   context 'nil (true)' do
+    #     before(:each) do
+    #       national_splitter = Phony::NationalSplitters::Fixed.instance_for 2
+    #       local_splitter    = Phony::LocalSplitters::Fixed.instance_for [3, 2, 2]
+    #       @national = Phony::NationalCode.new national_splitter, local_splitter, nil
+    #     end
+    #     it 'normalizes a swiss case correctly' do
+    #       @national.normalize('044364353').should == '44364353'
+    #     end
+    #   end
+    # end
   end
   
 end

data/spec/lib/phony/validations_spec.rb

@@ -440,6 +440,13 @@ describe 'validations' do
                                                                               #'+850 2 8801 1234 5678 1256',
                                                                               '+850 191 123 4567']
       it_is_correct_for 'Kuwait (State of)', :samples => ['+965 2345 6789', '+965 181 2345' ]
+      it_is_correct_for 'Kenya', :samples => [
+        '254201234567',
+        '254111234567',
+        '254723100220',
+        '+254-20-4262 140',
+        '+254-(0)20-4262 140'
+      ]
       it_is_correct_for 'Kyrgyzstan', :samples => ['+996 312 212 345',
                                                    '+996 315 212 345',
                                                    '+996 3131 212 34',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phony
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Florian Hanke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-11 00:00:00.000000000 Z
+date: 2013-12-15 00:00:00.000000000 Z
 dependencies: []
 description: ! 'Fast international phone number (E164 standard) normalizing, splitting
   and formatting. Lots of formatting options: International (+.., 00..), national
@@ -67,6 +67,7 @@ files:
 - lib/phony/national_splitters/none.rb
 - lib/phony/national_splitters/regex.rb
 - lib/phony/national_splitters/variable.rb
+- lib/phony/trunk_code.rb
 - lib/phony/vanity.rb
 - lib/phony.rb
 - README.textile