phony 1.7.7 → 1.7.8

data/lib/phony/countries.rb

@@ -10,7 +10,7 @@
 # * none:   Does not have a national destination code, e.g. Denmark, Iceland.
 # * one_of: Matches one of the following numbers. Splits if it does.
 # * match: Try to match the regex, and if it matches, splits it off.
-# * fixed:  Always splits off a fixed length ndc. (Always use last in a | chain) Offers a "zero" formatting option (default true).
+# * fixed:  Always splits off a fixed length ndc. (Always use last in a | chain as a catchall) Offers a "zero" formatting option (default true).
 #
 # For the national number part, there are two:
 # * split:         Use this number group splitting.
@@ -139,7 +139,7 @@ Phony.define do
   country '52',
           match(/^(0\d{2})\d+$/)   >> split(2,2,2,2) |
           match(/^(33|55|81)\d+$/) >> split(2,2,2,2) |
-          match(/^(\d{3})\d+$/)    >> split(3,2,2)
+          match(/^(\d{3})\d+$/)    >> split(3,2,2)     # catchall.
 
   # Cuba.
   #

data/lib/phony/countries/austria.rb

@@ -66,5 +66,6 @@ service = [
 ]
 
 Phony.define do
-  country '43', one_of(service + mobile + ndcs, :max_length => 4) >> split(10)
+  country '43', one_of(service + mobile + ndcs) >> split(10) |
+                fixed(4)                        >> split(10)
 end

data/lib/phony/countries/china.rb

@@ -21,7 +21,8 @@ mobile = %w{ 130 131 132 133 135 136 137 138 139 145 150 151 152 153 155 156 157
 service = %w{ 110 114 119 120 122 999 } # Probably not exhaustive. TODO Look at http://www.eoc.com.cn/?action-viewnews-itemid-11493.
 
 Phony.define do
-  country '86', one_of(service)                >> split(8)   |
-                one_of(mobile)                 >> split(4,4) |
-                one_of(ndcs, :max_length => 3) >> split(4,4)
+  country '86', one_of(service) >> split(8)   |
+                one_of(mobile)  >> split(4,4) |
+                one_of(ndcs)    >> split(4,4) |
+                fixed(3)        >> split(4,4)
 end

data/lib/phony/countries/germany.rb

@@ -4066,7 +4066,8 @@ service = [
 ]
 
 Phony.define do
-   country '49', one_of(service)                >> split(3,10) |
-                 match(/^(1[567]\d)\d*$/)       >> split(3,10) | # Mobile
-                 one_of(ndcs, :max_length => 5) >> split(3,10)
+   country '49', one_of(service)          >> split(3,10) |
+                 match(/^(1[567]\d)\d*$/) >> split(3,10) | # Mobile
+                 one_of(ndcs)             >> split(3,10) |
+                 fixed(5)                 >> split(3,10)
 end

data/lib/phony/countries/ireland.rb

@@ -69,8 +69,8 @@ Phony.define do
   country '353', one_of(ndcs_with_7_subscriber_digits)   >> split(3,4) |
                  one_of(ndcs_with_5_subscriber_digits)   >> split(5)   |
                  one_of(ndcs_with_6_subscriber_digits)   >> split(6)   |
-                 one_of(freefone) >> split(6) |
-                 match(/^(8\d).+$/) >> split(3,4) | # mobile
-                 fixed(3) >> split(6)
+                 one_of(freefone)                        >> split(6)   |
+                 match(/^(8\d).+$/)                      >> split(3,4) | # mobile
+                 fixed(3)                                >> split(6)     # Fallback
 
 end

data/lib/phony/countries/malaysia.rb

@@ -18,5 +18,5 @@ Phony.define do
   country '60', one_of(service) >> split(3,3) | # Service
                 one_of(mobile)  >> split(8)   | # Mobile
                 one_of(ndcs)    >> split(8)   | # 1-digit NDCs
-                fixed(2)        >> split(8)     # 2-digit NDCs
+                fixed(2)        >> split(8)     # 2-digit NDCs (Also, fallback)
 end

data/lib/phony/countries/netherlands.rb

@@ -51,7 +51,7 @@ service = [
  ]
 
 Phony.define do
-  country '31', one_of(service)                        >> split(3,3) |
-          one_of(['6'] + ndcs, :max_length => 3) >> split(8) # mobile + landline
-          # 8 is for mobile numbers, other numbers will work as well (they use 7).
+  country '31', one_of(service) >> split(3,3) |
+          one_of(['6'] + ndcs)  >> split(8)   | # mobile + landline
+          fixed(3)              >> split(8)     # 8 is for mobile numbers, other numbers will work as well (they use 7).
 end

data/lib/phony/countries/russia_kazakhstan_abhasia_south_osetia.rb

@@ -116,8 +116,9 @@ Phony.define do
   country '7', 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(800))                       >> split(3, 2, 2) | # Russia free number
                one_of(%w(929 995344 9971 99744 9976 997)) >> split(2, 2, 2) | # South Osetia
-               match(/([67]\d{2})/) >> split(2, 2, 2) | # Kazakhstan: (600..799)
-               one_of(%w(840 940), :max_length => 3) >> split(2, 2, 2) # Abhasia
+               match(/([67]\d{2})/)                  >> split(2, 2, 2) | # Kazakhstan: (600..799)
+               one_of(%w(840 940))                   >> split(2,2,2) # Abhasia
+               fixed(3)                              >> split(2,2,2)
 end

data/lib/phony/countries/south_korea.rb

@@ -7,10 +7,14 @@
 #
 
 special = %w{ 100 101 105 106 107 108 109 111 112 113 114 115 116 117 118 119 120 121 122 123 125 127 128 129 131 132 134 141 182 188 }
-# mobile  = ('10'..'19').to_a # Note: Mobile not used as it is (for now) handled by the one_of rule.
+# mobile  = ('10'..'19').to_a # Note: Mobile not used as it is (for now) handled by the fixed catchall.
 
 Phony.define do
   country '82', match(/^(#{special.join("|")})$/) >> split(3,3) | # Special actually don't need to be split – but better err.
+                one_of('2')                       >> split(4,4) | # Seoul, also includes "services".
+                fixed(2)                          >> split(4,4)   # catchall
+                
+                # See above.
+                #
                 # one_of(*mobile)                 >> split(4,4) |
-                one_of('2', :max_length => 2)     >> split(4,4)   # Seoul, also includes "services".
 end

data/lib/phony/countries/sweden.rb

@@ -54,6 +54,7 @@ service = [
 ]
 
 Phony.define do
-  country '46', one_of(service)                         >> split(3,3) |
-                one_of(ndcs + mobile, :max_length => 3) >> split(8)
+  country '46', one_of(service)       >> split(3,3) |
+                one_of(ndcs + mobile) >> split(8)   |
+                fixed(3)              >> split(8)     # catchall
 end

data/lib/phony/country.rb

@@ -28,7 +28,7 @@ module Phony
     def split national_number
       @codes.each do |code|
         zero, ndc, *rest = code.split national_number
-        return ndc ? [zero, ndc, *rest] : [zero, nil, *rest] if rest && !rest.empty?
+        return [zero, ndc, *rest] if rest && !rest.empty?
       end
     end
     

data/lib/phony/dsl.rb

@@ -79,6 +79,10 @@ module Phony
       NationalSplitters::Variable.new options[:max_length], ndcs
     end
     def match regex, options = {}
+      # Check if regexp has a group in it.
+      #
+      raise "Regexp /#{regex.source}/ needs a group in it that defines which digits belong to the NDC." unless regex.source =~ /\(/
+      
       on_fail_take = options.delete :on_fail_take
       NationalSplitters::Regex.instance_for regex, options[:on_fail_take], options
     end

data/lib/phony/national_splitters/none.rb

@@ -13,6 +13,30 @@ module Phony
         @instance ||= new
       end
       
+      # On false:
+      #
+      # This is a hack to make phony's
+      # plausible method work even with
+      # this splitter.
+      #
+      # Promise: We will rewrite this soon
+      # to beautify, but making it work for
+      # people in production is most important
+      # right now.
+      #
+      # The problem is that the validation looks
+      # at whether there is a NDC - if it is nil,
+      # it is not plausible.
+      # (Does not work with this class, of course
+      # since using nil is dangerous and breaks
+      # abstraction)
+      #
+      # Note: Actually, it might stay in.
+      #
+      def split national_number
+        [nil, false, national_number]
+      end
+      
     end
     
   end

data/lib/phony/validators.rb

@@ -48,8 +48,10 @@ module Phony
       
       # Element based checking.
       #
-      return false unless ndc
-      return false if ndc.empty?
+      # Note: ndc == false means the country has none.
+      #
+      return false if ndc.nil?
+      return false if ndc && ndc.empty?
       
       # A valid range for the rest is 0 or 3+ total digits.
       #

data/spec/lib/phony/countries_spec.rb

@@ -63,7 +63,7 @@ describe 'country descriptions' do
       Phony.split('5342123456').should == ['53', '42', '123456'] # Villa Clara
     end
     it 'handles danish numbers' do
-      Phony.split('4532121212').should == ['45', nil, '32', '12', '12', '12']
+      Phony.split('4532121212').should == ['45', false, '32', '12', '12', '12']
     end
     it 'handles dutch numbers' do
       Phony.split('31612345678').should == ['31', '6', '12345678'] # mobile
@@ -109,10 +109,10 @@ describe 'country descriptions' do
       Phony.split('3622123456').should == ['36', '22', '123', '456']
     end
     it 'handles icelandic numbers' do
-      Phony.split('354112').should == ['354', nil, '112'] # Emergency TODO
-      Phony.split('3544211234').should == ['354', nil, '421', '1234'] # Keflavík
-      Phony.split('3544621234').should == ['354', nil, '462', '1234'] # Akureyri
-      Phony.split('3545511234').should == ['354', nil, '551', '1234'] # Reykjavík
+      Phony.split('354112').should == ['354', false, '112'] # Emergency TODO
+      Phony.split('3544211234').should == ['354', false, '421', '1234'] # Keflavík
+      Phony.split('3544621234').should == ['354', false, '462', '1234'] # Akureyri
+      Phony.split('3545511234').should == ['354', false, '551', '1234'] # Reykjavík
     end
     it 'handles irish numbers' do
       Phony.split('35311234567').should  == ['353', '1', '123', '4567']  # Dublin, 7 digit subscriber #
@@ -149,14 +149,14 @@ describe 'country descriptions' do
       Phony.split('526641231212').should == ['52', '664', '123', '12', '12'] # Tijuana
     end
     it 'handles norwegian numbers' do
-      Phony.split('4721234567').should == ['47',nil,'21','23','45','67']
-      Phony.split('4731234567').should == ['47',nil,'31','23','45','67']
-      Phony.split('4741234567').should == ['47',nil,'412','34','567']
-      Phony.split('4751234567').should == ['47',nil,'51','23','45','67']
-      Phony.split('4761234567').should == ['47',nil,'61','23','45','67']
-      Phony.split('4771234567').should == ['47',nil,'71','23','45','67']
-      Phony.split('4781234567').should == ['47',nil,'812','34','567']
-      Phony.split('4791234567').should == ['47',nil,'912','34','567']
+      Phony.split('4721234567').should == ['47',false,'21','23','45','67']
+      Phony.split('4731234567').should == ['47',false,'31','23','45','67']
+      Phony.split('4741234567').should == ['47',false,'412','34','567']
+      Phony.split('4751234567').should == ['47',false,'51','23','45','67']
+      Phony.split('4761234567').should == ['47',false,'61','23','45','67']
+      Phony.split('4771234567').should == ['47',false,'71','23','45','67']
+      Phony.split('4781234567').should == ['47',false,'812','34','567']
+      Phony.split('4791234567').should == ['47',false,'912','34','567']
     end
     it 'handles peruvian numbers' do
       Phony.split('51112341234').should == ['51', '1', '1234', '1234'] # Lima
@@ -202,7 +202,7 @@ describe 'country descriptions' do
       Phony.split('21621231234').should == ['216', '2', '123', '1234'] # Bizerte
     end
     it 'handles singaporean numbers' do
-      Phony.split('6561231234').should == ['65', nil, '6123', '1234'] # Fixed line
+      Phony.split('6561231234').should == ['65', false, '6123', '1234'] # Fixed line
     end
     it 'handles slovakian numbers' do
       Phony.split('421912123456').should == ['421', '912', '123456'] # Mobile

data/spec/lib/phony/country_spec.rb

@@ -12,7 +12,7 @@ describe Phony::Country do
         @iceland          = described_class.new national_code
       end
       it 'splits correctly' do
-        @iceland.split('112').should == [nil, nil, '112']
+        @iceland.split('112').should == [nil, false, '112']
       end
     end
   end

data/spec/lib/phony/dsl_spec.rb

@@ -3,10 +3,21 @@
 require 'spec_helper'
 
 describe Phony::DSL do
+  
+  let(:dsl) { described_class.new }
 
   it 'has a todo' do
     Phony.define do
-      todo.split("123456789012345").should == [nil, nil, nil, nil, '123456789012345']
+      todo.split("123456789012345").should == [nil, false, nil, nil, '123456789012345']
+    end
+  end
+  
+  describe 'match' do
+    it 'checks for ( in regex' do
+      expect { dsl.match(/123/) }.to raise_error("Regexp /123/ needs a group in it that defines which digits belong to the NDC.")
+    end
+    it 'checks for ( in regex' do
+      dsl.match(/(123)/).should be_kind_of(Phony::NationalSplitters::Regex)
     end
   end
 

data/spec/lib/phony/national_code_spec.rb

@@ -12,7 +12,7 @@ describe Phony::NationalCode do
           @national         = Phony::NationalCode.new national_splitter, local_splitter
         end
         it 'splits correctly' do
-          @national.split('112').should == [nil, nil, '112']
+          @national.split('112').should == [nil, false, '112']
         end
       end
     end

data/spec/lib/phony/national_splitters/none_spec.rb

@@ -11,7 +11,7 @@ describe Phony::NationalSplitters::None do
   describe 'split' do
     let(:splitter) { described_class.instance_for }
     it 'splits correctly into ndc and rest' do
-      splitter.split('123456789').should == [nil, nil, '123456789']
+      splitter.split('123456789').should == [nil, false, '123456789']
     end
   end
   

data/spec/lib/phony/validations_spec.rb

@@ -22,6 +22,12 @@ describe 'validations' do
     # it 'is correct' do
     #   Phony.plausible?('+1911').should be_false
     # end
+    it 'is correct' do
+      Phony.plausible?('45 44 11 22 33').should be_true
+    end
+    it 'is correct' do
+      Phony.plausible?('+4231231212').should be_true
+    end
     it 'is correct' do
       Phony.plausible?('010').should be_false
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phony
 version: !ruby/object:Gem::Version
-  version: 1.7.7
+  version: 1.7.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-05 00:00:00.000000000 Z
+date: 2012-08-19 00:00:00.000000000 Z
 dependencies: []
 description: ! 'Fast international phone number (E164 standard) normalizing, splitting
   and formatting. Lots of formatting options: International (+.., 00..), national
@@ -83,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Fast international phone number (E164 standard) normalizing, splitting and
@@ -103,4 +103,3 @@ test_files:
 - spec/lib/phony/validations_spec.rb
 - spec/lib/phony/vanity_spec.rb
 - spec/lib/phony_spec.rb
-has_rdoc: false