phony 2.0.0.beta11 → 2.0.0.beta12

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGU2OTIyNGI5NGE1MjkxNWNmYzBlYzRiM2Y3YWRhMjc0ZWFkZTM3Yg==
+    YTgxNzcwMjc1YzQ3NWMxNjI2OTliMjc5ODNmZWM4ZGZmZWUxNDc4Nw==
   data.tar.gz: !binary |-
-    YTE2MWIzODdiYWE0Y2I1NTczZDIyOTBkMjBiOTEyOWEzYTMwYTFlYQ==
+    NDc2YTFiODczMGRkYWMzOTlhMGQ2ZWMyNmNmYTU0YTBlOTVhZWE4MA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YzAzM2UwYmQ2NDc2Njg5MWI2ZWYxZmQzOGU5NGY5YTQ0Yzc0ZjhjZmM3ZTM2
-    Njg1ZGNhYzM5Y2E2NWU4NjM0OGQ3NDcwOWQ5NWQ4NjcxMGMwM2FkNDc3NmIw
-    ODhmZTA5ZWE1MDFlZDE3NWI2YTI1ZmE5YzEwNzM5YTRkYmQ2NjQ=
+    MmIyYTJiMzc5NTdhMmI3NjY0NmE4ZmVmOWFjNDliYjMxNDc4MmM5M2Q0ODJh
+    MTExYmZhMmE4Nzc3YTNmMzQ3OTRjOThiOGVhNTg3N2EwYmE1NTg2YjM0Yjg0
+    ZGFjYzA4ZThiZTFkYmE2MDYyNmEyMDJkOTQ1MzAxOTRhMTQ1MTg=
   data.tar.gz: !binary |-
-    NDU3NWJiYWIyODQxMDg0ZDYxNjg5MjVmNDhiZmQyNzcxMjZiNzljZTg3NGZm
-    ODhiZjU4YzlkZWYzZDdjZGJjZmVhY2NmMTVjOThkODRlOGNhMDc5ODQ1NWUz
-    ZDczYzgwZWUyNjg4MWRlN2M3ODRhNTAwMzA4YjFlZTM2ZGM2Nzg=
+    ZTE0MTMzZTZkMDcwY2Y5MDI5MjM5MzhjMWQxMjRlMzcyMzZmZDNkZjBjNGU0
+    ZjNlYTcyYzgzOWYyMDVhZjhjMDFlZjYxYTJkZWIzOWE1OWVlNWY2MzA4ZDg4
+    YjdiMDJjYzZkN2NmNjgwODRhMzUzYTFmYjZkYTVjNTIxN2E2YTc=

data/lib/phony/countries/austria.rb

@@ -78,10 +78,10 @@ service = [
 # TODO Add more details.
 #
 Phony.define do
-  country '43', one_of('1')       >> split(4) | # Vienna
-                one_of(service)   >> split(9) |
-                one_of(corporate) >> split(5) |
-                one_of(ndcs)      >> split(6) |
-                one_of(mobile)    >> split(7) |
-                fixed(4)          >> split(7)
+  country '43', one_of('1')       >> split(4..4) | # Vienna
+                one_of(service)   >> split(9..9) |
+                one_of(corporate) >> split(5..5) |
+                one_of(ndcs)      >> split(6..6) |
+                one_of(mobile)    >> split(7..7) |
+                fixed(4)          >> split(7..7)
 end

data/lib/phony/countries/germany.rb

@@ -2,8 +2,7 @@
 #
 # Note: Germany uses a variable ndc format from length 2 to 5.
 #
-
-ndcs2and3 = [
+ndcs2 = [
 '10',  # Call-By-Call
 '11',  # formerly Value Added Services
 '13',  # Voting and Lottery Numbers
@@ -12,6 +11,8 @@ ndcs2and3 = [
 '40',  # Hamburg
 '69',  # Frankfurt am Main
 '89',  # München
+]
+ndcs3 = [
 '201', # Essen
 '202', # Wuppertal
 '203', # Duisburg
@@ -4079,9 +4080,10 @@ Phony.define do
                  one_of('1609')              >> split(3,5) |
                  one_of('1521', '1529', '1570', '1575', '1579') >> split(3,4) |
                  match(/\A(1[57]\d)\d*\z/)   >> split(3,4) |
-                 match(/\A(16\d)\d*\z/)   >> split(3,5) |
-                 one_of(ndcs2and3)           >> split(3,5) |
-                 one_of(ndcs4)               >> split(3,4) |
-                 fixed(5)                    >> split(3,3)
+                 match(/\A(16\d)\d*\z/)      >> split(3,5) |
+                 one_of(ndcs2)               >> split(3,0..6) |
+                 one_of(ndcs3)               >> split(3,0..5) |
+                 one_of(ndcs4)               >> split(3,0..4) |
+                 fixed(5)                    >> split(3,3..3) 
 
 end

data/lib/phony/countries/sweden.rb

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

data/lib/phony/countries.rb

@@ -39,9 +39,9 @@ Phony.define do
 
   # Egypt.
   #
-  country '20', one_of('800')    >> split(7) | # Egypt
-                one_of('2', '3') >> split(8) | # Cairo/Giza, Alexandria
-                fixed(2)         >> split(8)
+  country '20', one_of('800')    >> split(7..7) | # Egypt
+                one_of('2', '3') >> split(8..8) | # Cairo/Giza, Alexandria
+                fixed(2)         >> split(8..8)
                 # :mobile? => /^1[01246-9]\d+$/, :service? => /^800\d+$/
 
   # South Africa.
@@ -100,7 +100,7 @@ Phony.define do
   # Switzerland.
   #
   country '41',
-          match(/^(8(00|4[0248]))\d+$/) >> split(3,3) |
+          match(/^(8(00|4[0248]))\d+$/) >> split(3,3)|
           fixed(2)                      >> split(3,2,2)
 
   # country '43' # Austria, see special file.
@@ -109,8 +109,8 @@ Phony.define do
   # Denmark.
   #
   country '45',
-          none >> split(2,2,2,2)
-
+          none >> split(2,2,2,2..2)
+          
   # country '46' # Sweden, see special file.
 
   # Norway.
@@ -1001,7 +1001,7 @@ Phony.define do
           one_of('2', '3', '4', '8', '9')        >> split(3,4)   | # 1 digit ndc
           match(/^(5[023456789]|7[23467])\d+$/)  >> split(3,4)     # 2 digit ndc
 
-  country '973', none >> split(4,4) # Bahrain (Kingdom of) http://www.itu.int/oth/T0202000011/en
+  country '973', none >> split(4,4..4) # Bahrain (Kingdom of) http://www.itu.int/oth/T0202000011/en
 
   # Qatar (State of)
   # https://www.numberingplans.com/?page=plans&sub=phonenr&alpha_2_input=QA

data/lib/phony/country.rb

@@ -23,8 +23,8 @@ module Phony
     #
     # TODO Rewrite.
     #
-    def with options = {}
-      @cc           = options[:cc]
+    def with cc, options = {}
+      @cc           = cc
       @invalid_ndcs = options[:invalid_ndcs] || []
     end
     

data/lib/phony/country_codes.rb

@@ -50,6 +50,8 @@ module Phony
       @normalize_format % [cc, country.normalize(rest)]
     end
     
+    #
+    #
     def countrify! number, options = {}
       if cc = options[:cc]
         self[cc].countrify! number

data/lib/phony/dsl.rb

@@ -50,7 +50,7 @@ module Phony
     #   country '27', # CC, followed by rules, for example fixed(2) >> ...
     #
     def country country_code, definition, options = {}
-      definition.with options.merge! :cc => country_code
+      definition.with country_code, options
       Phony::CountryCodes.instance.add country_code, definition
     end
     
@@ -162,7 +162,7 @@ module Phony
     #   match(/^(0\d{2})\d+$/) >> split(2,2,2,2) # If it matches, split in 4 groups of size 2.
     #
     def split *local
-      local << local.pop + 10 # Allow for call-through numbers with an arbitrary size.
+      # local << local.pop + 10 # Allow for call-through numbers with an arbitrary size.
       LocalSplitters::Fixed.instance_for local
     end
     
@@ -179,10 +179,10 @@ module Phony
     #                           :fallback   => [2,2,2,2])
     #
     def matched_split options = {}
-      # TODO: Refactor: it's a workaround. It creates high coupling with Phony::LocalSplitters::Regex.
-      options.each do |_, format|
-        format << format.pop + 10
-      end
+      # # TODO: Refactor: it's a workaround. It creates high coupling with Phony::LocalSplitters::Regex.
+      # options.each do |_, format|
+      #   format << format.pop + 10
+      # end
       Phony::LocalSplitters::Regex.instance_for options
     end
     

data/lib/phony/local_splitters/fixed.rb

@@ -27,8 +27,23 @@ module Phony
       # The format [3, 2, 2] splits a number like '3332222' into ['333', '22', '22'].
       #
       def initialize format = nil
-        @format = format && format.dup || [3, 2, 2]
-        # @format << @format.pop + 10 # Allow for call-through numbers with an arbitrary size.
+        format = format && format.dup || [3, 2, 2]
+        @format, @length = extract_params format
+        @format << @format.pop + 10
+      end
+      
+      #
+      #
+      def extract_params format
+        if format.last.respond_to? :max
+          last = format.pop
+          length = format.inject(0) { |total, part| total + part }
+          length = (length+last.min..length+last.max)
+          format << last.min
+        else
+          length = format.inject(0) { |total, part| total + part }
+        end
+        [format, length]
       end
     
       # Split a local number according to an assumed country specific format.
@@ -47,13 +62,7 @@ module Phony
       # TODO Fix length fudging.
       #
       def plausible? rest, hints = {}
-        (length > 10 ? length - 10 : length) === rest.inject(0) { |total, part| total + part.size }
-      end
-      
-      # A valid length.
-      #
-      def length
-        @length ||= @format.inject { |total, part| total + part }
+        @length === rest.inject(0) { |total, part| total + part.size }
       end
       
     end

data/lib/phony/local_splitters/regex.rb

@@ -58,12 +58,11 @@ module Phony
             result << number.slice!(0..size-1)
             return result if number.empty?
             result
-          end
+          end << number
         end
         
         def plausible_with? number, format
-          length = format.inject(0, :+)
-          length -= 10 if length > 10
+          length = format.inject 0, :+
           number.length == length
         end
 

data/spec/functional/normalize_spec.rb

@@ -7,6 +7,9 @@ describe 'Phony.normalize' do
     it 'handles the US (with cc) correctly' do
       Phony.normalize('+1 724 999 9999').should == '17249999999'
     end
+    it 'handles the Dutch number (without US cc) correctly' do
+      Phony.normalize('310 5552121').should == '315552121'
+    end
     it 'handles the US (with cc and cc option) correctly' do
       Phony.normalize('+1 724 999 9999', cc: '1').should == '17249999999'
     end

data/spec/lib/phony/countries_spec.rb

@@ -532,10 +532,10 @@ describe 'country descriptions' do
     end
 
     describe 'Sweden' do
-      it { Phony.split('46812345678').should == ['46', '8', '12345678'] } # Stockholm
-      it { Phony.split('46111234567').should == ['46', '11', '1234567'] }
-      it { Phony.split('46721234567').should == ['46', '72', '1234567'] } # mobile
-      it { Phony.split('46125123456').should == ['46', '125', '123456'] }
+      it { Phony.split('46812345678').should == ['46', '8', '123', '45', '678'] } # Stockholm
+      it { Phony.split('46111234567').should == ['46', '11', '123', '45', '67'] }
+      it { Phony.split('46721234567').should == ['46', '72', '123', '45', '67'] } # mobile
+      it { Phony.split('46125123456').should == ['46', '125', '123', '456'] }
     end
     describe 'Switzerland' do
       it { Phony.split('41443643532').should == ['41', '44', '364', '35', '32'] } # Zurich (usually)

data/spec/lib/phony/local_splitters/fixed_spec.rb

@@ -22,8 +22,8 @@ describe Phony::LocalSplitters::Fixed do
       it 'splits correctly' do
         @splitter.split('3643532').should == ['364','35','32']
       end
-      it 'splits correctly even when the number is too long' do
-        @splitter.split('3643532111').should == ['364','35','32']
+      it 'splits correctly even when the number is too long (but leniently)' do
+        @splitter.split('3643532111').should == ['364','35','32111']
       end
       it 'splits correctly even when the number is too short' do
         @splitter.split('364353').should == ['364','35','3']
@@ -36,8 +36,8 @@ describe Phony::LocalSplitters::Fixed do
       it 'splits correctly' do
         @splitter.split('3643532').should == ['364','35','32']
       end
-      it 'splits correctly even when the number is too long' do
-        @splitter.split('3643532111').should == ['364','35','32']
+      it 'splits correctly even when the number is too long (but leniently)' do
+        @splitter.split('3643532111').should == ['364','35','32111']
       end
       it 'splits correctly even when the number is too short' do
         @splitter.split('364353').should == ['364','35','3']

data/spec/lib/phony/validations_spec.rb

@@ -21,7 +21,7 @@ describe 'validations' do
 
           shortest = correct.min_by{|x| x.scan(/\d/).length}
           longest = correct.max_by{|x| x.scan(/\d/).length}
-          incorrect = [shortest.sub(/\d\s*\z/, ''), longest + '0']
+          incorrect = [shortest.sub(/\d\s*\z/, '')] # , longest + '0']
 
           correct.each do |value|
             Phony.plausible?(value).should be_true,
@@ -156,18 +156,20 @@ describe 'validations' do
         Phony.plausible?('+39 335 123').should be_false
       end
       it 'is correct for German numbers' do
+        Phony.plausible?('+49 209 169 - 0').should be_true # Gelsenkirchen
+        Phony.plausible?('+49 209 169 - 3530').should be_true # Gelsenkirchen
         Phony.plausible?('+49 40 123 45678').should be_true
-        Phony.plausible?('+49 40 123 456789').should be_false
+        Phony.plausible?('+49 40 123 456789').should be_true # TODO ?
         Phony.plausible?('+49 171 123 4567').should be_true
         Phony.plausible?('+49 171 123 45678').should be_false
         Phony.plausible?('+49 177 123 1234').should be_true
         Phony.plausible?('+49 176 123 12345').should be_true
         # Phony.plausible?('+49 991 1234').should be_true   # stricter 3 digit ndc rules
-        # Phony.plausible?('+49 2041 123').should be_true # Grandfathered numbers. TODO
+        Phony.plausible?('+49 2041 123').should be_true # Grandfathered numbers.
         Phony.plausible?('+49 2041 1234567').should be_true
-        Phony.plausible?('+49 2041 12345689').should be_false
+        # Phony.plausible?('+49 2041 12345689').should be_false # Could be a call-through number
         Phony.plausible?('+49 31234 123456').should be_true
-        Phony.plausible?('+49 31234 1234567').should be_false
+        # Phony.plausible?('+49 31234 1234567').should be_false # Could be a call-through number
       end
 
       it 'is correct for Isralian numbers' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phony
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta11
+  version: 2.0.0.beta12
 platform: ruby
 authors:
 - Florian Hanke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-17 00:00:00.000000000 Z
+date: 2013-10-17 00:00:00.000000000 Z
 dependencies: []
 description: ! 'Fast international phone number (E164 standard) normalizing, splitting
   and formatting. Lots of formatting options: International (+.., 00..), national