phony 1.6.8 → 1.7.0

data/README.textile

@@ -1,7 +1,11 @@
+"!{float:right}https://secure.travis-ci.org/floere/phony.png!":http://travis-ci.org/floere/phony
+
 h1. Phony
 
 Used in e.g.: "airbnb.com":http://airbnb.com, "restorm.com":http://restorm.com, "socialcam.com":http://socialcam.com, "zendesk.com":http://www.zendesk.com/ (and many, many others).
 
+There's also a Rails wrapper: https://github.com/joost/phony_rails.
+
 h2. Description
 
 This gem can normalize, format and split E164 numbers.
@@ -9,7 +13,7 @@ This gem can normalize, format and split E164 numbers.
 
 The (admittedly crazy) *goal* of this Gem is to be able to format/split all phone numbers in the world.
 
-Currently handles Afghan, Algerian, Austrian, Australian, Belgian, Brazilian, Chilean, Chinese, Croatian, Cuban, Czech, Danish, Dutch, Egyptian, French, German, Ghanan, Greek, Hungarian, Italian, Ireland, Lithuanian, Malaysian, Mexican, (The) Netherlands, New Zealand, Norwegian, Peruvian, Polish, Russian, Romanian, Singapore, Slovakian, South African, South Korean, Spanish, Swedish, Swiss, Thailand, Tunisian, Turkish, Liechtenstein, UK, US, and Venezuelan numbers.
+Currently handles Afghan, Algerian, Austrian, Australian, Belgian, Brazilian, Chilean, Chinese, Croatian, Cuban, Czech, Danish, Dutch, Egyptian, French, German, Ghanan, Greek, Hungarian, Italian, Irish, Lithuanian, Malaysian, Mexican, New Zealand, Norwegian, Peruvian, Polish, Russian, Romanian, Singapore, Slovakian, South African, South Korean, Spanish, Swedish, Swiss, Thailand, Tunisian, Turkish, Liechtenstein, UK, US, Venezuelan, and Vietnamese numbers.
 And to some extent, all others. Just try if it works for you.
 
 If it doesn't, please "enter an issue":http://github.com/floere/phony/issues.
@@ -18,9 +22,39 @@ h2. Installation
 
 <pre><code>gem install phony</code></pre>
 
-h2. Some examples
+h2(#examples). Some examples
+
+h3(#plausibility). Plausibility
+
+"Plausible" means "seems reasonable or probable", not implying 100% correctness on a @true@, but implying 100% correctness on a @false@ return value. So if this returns @true@, it might still be not a plausible number. If it returns @false@, it is definitely not an E164 conform number.
+
+Use this method in combination with @normalize@ for saving it into the database. Also see https://github.com/floere/phony/issues/35 for a discussion on the topic.
+
+Note that you can add constraints to the plausibility check like the country code, @cc@, and the national destination code, @ndc@. Use the options to further limit the plausibility range. For example, only allow a small number of countries.
+
+@Phony.plausible?('0000000').should be_false@
+
+@Phony.plausible?('hello').should be_false@
+
+@Phony.plausible?('+41 44 111 22 33').should be_true@
+
+@Phony.plausible?('+41 44 111 22 33', cc: '41').should be_true@
+
+@Phony.plausible?('+41 44 111 22 33', ndc: '44').should be_true@
+
+@Phony.plausible?('+41 44 111 22 33', cc: '1').should be_false@
+
+@Phony.plausible?('+41 44 111 22 33', ndc: '43').should be_false@
+    
+@Phony.plausible?('+41 44 111 22 33', cc: '41', ndc: '44').should be_true@
+
+@Phony.plausible?('+41 44 111 22 33', cc: /4(0|2)/, ndc: /4(4|5)/).should be_false@
+
+@Phony.plausible?('+41 44 111 22 33', cc: /4(0|1)/, ndc: /4(4|5)/).should be_true@
+
+h3(#normalizing). Normalizing
 
-h3. Normalizing
+This will often raise an error if you try normalizing a non E164-izable number (a number that does not contain enough information to be normalized into an E164 conform number). Use @Phony.plausible?@ for checking if it can be normalized first. 
 
 @Phony.normalize('41443643533').should == '41443643533'@
 
@@ -40,7 +74,7 @@ h3. Normalizing
 
 @Phony.normalize('+41 (044) 364 35 33').should == '41443643533'@
 
-h3. Formatting
+h3(#formatting). Formatting
 
 @Phony.formatted('41443643532').should == '+41 44 364 35 32'@
 
@@ -50,7 +84,7 @@ h3. Formatting
 
 @Phony.formatted('18705551122').should == '+1 870 555 1122'@
 
-h4. International
+h4(#international). International
 
 @Phony.formatted('18091231234', :format => :international).should == '+1 809 123 1234'@
 
@@ -64,7 +98,7 @@ h4. International
 
 @Phony.formatted('4233841148', :format => :international_relative).should == '00423 384 11 48'@
 
-h4. With spaces
+h4(#spaces). With spaces
 
 @Phony.formatted('18091231234', :format => :international, :spaces => '').should == '+18091231234'@
 
@@ -78,7 +112,7 @@ h4. With spaces
 
 @Phony.formatted('4233841148', :format => :international_relative, :spaces => '').should == '004233841148'@
 
-h4. With special spaces
+h4(#special). With special spaces
 
 @Phony.formatted('18091231234', :format => :international, :spaces => :-).should == '+1-809-123-1234'@
 
@@ -92,7 +126,7 @@ h4. With special spaces
 
 @Phony.formatted('4233841148', :format => :international_relative, :spaces => :-).should == '00423-384-11-48'@
 
-h4. National
+h4(#national). National
 
 @Phony.formatted('41443643532', :format => :national).should == '044 364 35 32'@
 
@@ -100,13 +134,13 @@ h4. National
 
 @Phony.formatted('43198110', :format => :national).should == '01 98110'@
 
-h4. Local
+h4(#local). Local
 
 @Phony.formatted('41443643532', :format => :local).should == '364 35 32'@
 
 @Phony.formatted('493038625454', :format => :local).should == '386 25454'@
 
-h3. Splitting
+h3(#splitting). Splitting
 
 @Phony.split('43198110').should == ['43', '1', '98110']@
 

data/lib/phony.rb

@@ -7,8 +7,8 @@ require File.expand_path '../phony/national_splitters/dsl', __FILE__
 require File.expand_path '../phony/national_splitters/fixed', __FILE__
 require File.expand_path '../phony/national_splitters/variable', __FILE__
 require File.expand_path '../phony/national_splitters/regex', __FILE__
-require File.expand_path '../phony/national_splitters/none', __FILE__
 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/country_codes', __FILE__
@@ -63,7 +63,9 @@ module Phony
       split! phone_number.dup
     end
     def split! phone_number
-      @codes.split phone_number
+      parts = @codes.split phone_number
+      parts.delete_at 1
+      parts
     end
 
     # Formats a E164 number according to local customs.

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)
+# * fixed:  Always splits off a fixed length ndc. (Always use last in a | chain) Offers a "zero" formatting option (default true).
 #
 # For the national number part, there are two:
 # * split:         Use this number group splitting.
@@ -32,7 +32,7 @@ Phony.define do
   # USA, Canada, etc.
   #
   country '1',
-          fixed(3) >> split(3,4),
+          fixed(3, :zero => false) >> split(3,4),
           invalid_ndcs('911') # /911/ would also work.
 
   # Kazakhstan (Republic of) & Russian Federation.
@@ -527,7 +527,7 @@ Phony.define do
   country '878', todo # Universal Personal Telecommunication Service (UPT)
   country '879', todo # Reserved for national non-commercial purposes
 
-  country '880', todo                  # Bangladesh (People's Republic of)
+  country '880', todo # Bangladesh (People's Republic of)
   country '881', todo # International Mobile, shared code
   country '882', todo # International Networks, shared code
   country '883', todo # -

data/lib/phony/country.rb

@@ -27,8 +27,8 @@ module Phony
     #
     def split national_number
       @codes.each do |code|
-        ndc, *rest = code.split national_number
-        return ndc ? [ndc, *rest] : rest if rest && !rest.empty?
+        zero, ndc, *rest = code.split national_number
+        return ndc ? [zero, ndc, *rest] : [zero, nil, *rest] if rest && !rest.empty?
       end
     end
     
@@ -55,7 +55,7 @@ module Phony
     #
     #
     def vanity_to_number vanity_number
-      ndc, *rest = split vanity_number
+      zero, ndc, *rest = split vanity_number
       "#{ndc}#{Vanity.replace(rest.join)}"
     end
     

data/lib/phony/country_codes.rb

@@ -10,9 +10,9 @@ module Phony
     attr_accessor :international_absolute_format, :international_relative_format, :national_format
 
     def initialize
-      @international_absolute_format = '+%s%s%s%s'
-      @international_relative_format = '00%s%s%s%s'
-      @national_format               = '0%s%s'
+      @international_absolute_format = '+%s%s%s'
+      @international_relative_format = '00%s%s%s'
+      @national_format               = '%s%s'
 
       @normalize_format = '%s%s'
       @default_space    = ' '
@@ -37,8 +37,8 @@ module Phony
     # Splits this number into cc, ndc and locally split number parts.
     #
     def split number
-      national_handler, cc, rest = split_cc number
-      [cc, *national_handler.split(rest)]
+      country_handler, cc, rest = split_cc number
+      [cc, *country_handler.split(rest)]
     end
 
     def formatted number, options = {}
@@ -46,67 +46,71 @@ module Phony
     end
     # Formats country code and national destination code.
     #
-    def format_cc_ndc_local format, space, cc, ndc, *parts
-      cc_ndc = format_cc_ndc(format, space, cc, ndc)
-      local  = \
-        if parts.empty?
-          cc_ndc = cc_ndc.slice 0...cc_ndc.rindex(space.to_s)
-          EMPTY_STRING
-        else
-          format_local(space, parts) unless parts.empty?
-        end
-      "#{cc_ndc}#{local}"
-    end
-    def format_cc_ndc format, space, cc, ndc
+    def format_cc_ndc_local format, space, cc, zero, ndc, *parts
+      cc_ndc = format_cc_ndc format, space, cc, zero, ndc
+      local  = if parts.empty?
+                 cc_ndc = cc_ndc.slice 0...cc_ndc.rindex(space.to_s)
+                 EMPTY_STRING
+               else
+                 format_local(space, parts) unless parts.empty?
+               end
+      cc_ndc.empty?? local : "#{cc_ndc}#{space}#{local}"
+    end
+    def format_cc_ndc format, space, cc, zero, ndc
       case format
       when nil, :international_absolute, :international, :+
-        @international_absolute_format % [cc, space, ndc, space]
+        ndc ?
+          @international_absolute_format % [cc, space, ndc] :
+          @international_absolute_format % [cc, nil, nil]
       when :international_relative
-        @international_relative_format % [cc, space, ndc, space]
+        ndc ?
+          @international_relative_format % [cc, space, ndc] :
+          @international_relative_format % [cc, nil, nil]
       when :national
-        (ndc.empty? ? EMPTY_STRING : @national_format) % [ndc, space]
+        (ndc.empty? ? EMPTY_STRING : @national_format) % [zero, ndc]
       when :local
         EMPTY_STRING
       end
     end
     def format_local space, parts_ary
+      parts_ary.compact!
       parts_ary.join space.to_s
     end
 
     #
     #
     def service? number
-      national_handler, cc, rest = split_cc number
-      national_handler.service? rest
+      country_handler, cc, rest = split_cc number
+      country_handler.service? rest
     end
     def mobile? number
-      national_handler, cc, rest = split_cc number
-      national_handler.mobile? rest
+      country_handler, cc, rest = split_cc number
+      country_handler.mobile? rest
     end
     def landline? number
-      national_handler, cc, rest = split_cc number
-      national_handler.landline? rest
+      country_handler, cc, rest = split_cc number
+      country_handler.landline? rest
     end
 
     # Is the given number a vanity number?
     #
     def vanity? number
-      national_handler, _, rest = split_cc number
-      national_handler.vanity? rest
+      country_handler, _, rest = split_cc number
+      country_handler.vanity? rest
     end
     # Converts a vanity number into a normalized E164 number.
     #
     def vanity_to_number vanity_number
-      national_handler, cc, rest = split_cc vanity_number
-      "#{cc}#{national_handler.vanity_to_number(rest)}"
+      country_handler, cc, rest = split_cc vanity_number
+      "#{cc}#{country_handler.vanity_to_number(rest)}"
     end
 
     def split_cc rest
       presumed_cc = ''
       1.upto(3) do |i|
         presumed_cc << rest.slice!(0..0)
-        national_code_handler = splitter_mapping[i][presumed_cc]
-        return [national_code_handler, presumed_cc, rest] if national_code_handler
+        country_handler = splitter_mapping[i][presumed_cc]
+        return [country_handler, presumed_cc, rest] if country_handler
       end
       # This line is never reached as CCs are in prefix code.
     end

data/lib/phony/dsl.rb

@@ -54,10 +54,17 @@ module Phony
     # National matcher & splitters.
     #
 
+    # By default, a fixed length NDC
+    # uses a zero prefix when formatted
+    # with format :national.
     #
+    # Options:
+    #  * length: Length of the fixed length NDC.
+    #  * options: Set :zero to false to not add a zero on format :national.
     #
-    def fixed size
-      NationalSplitters::Fixed.instance_for size
+    def fixed length, options = {}
+      options[:zero] = true if options[:zero].nil?
+      NationalSplitters::Fixed.instance_for length, options
     end
     def none
       NationalSplitters::None.instance_for
@@ -72,7 +79,8 @@ module Phony
       NationalSplitters::Variable.new options[:max_length], ndcs
     end
     def match regex, options = {}
-      NationalSplitters::Regex.instance_for regex, options[:on_fail_take]
+      on_fail_take = options.delete :on_fail_take
+      NationalSplitters::Regex.instance_for regex, options[:on_fail_take], options
     end
     def todo
       none >> NationalSplitters::Default.instance_for

data/lib/phony/national_code.rb

@@ -16,9 +16,9 @@ module Phony
     # its parts.
     #
     def split national_number
-      ndc, rest = @national_splitter.split national_number.dup
-      return ndc unless rest
-      [ndc, *@local_splitter.split(rest)]
+      zero, ndc, rest = @national_splitter.split national_number.dup
+      return [zero, ndc] unless rest
+      [zero, ndc, *@local_splitter.split(rest)]
     end
 
     # Split gets a number without country code and removes a relative zero.

data/lib/phony/national_splitters/default.rb

@@ -8,8 +8,8 @@ module Phony
         @instance ||= new
       end
 
-      def split number
-        number
+      def split national_number
+        [nil, nil, national_number]
       end
 
     end

data/lib/phony/national_splitters/dsl.rb

@@ -6,13 +6,19 @@ module Phony
     #
     class DSL
       
-      # TODO normalize option!
+      #
       #
       def >> local_splitter
-        national_code = Phony::NationalCode.new self, local_splitter
-        Phony::Country.new national_code
+        country_for local_splitter, true
       end
       
+      private
+      
+        def country_for local_splitter, with_zero
+          national_code = Phony::NationalCode.new self, local_splitter, with_zero
+          Phony::Country.new national_code
+        end
+      
     end
     
   end

data/lib/phony/national_splitters/fixed.rb

@@ -14,19 +14,20 @@ module Phony
       #
       # Caches the created splitter for the given format.
       #
-      def self.instance_for size
-        @mapping[size] ||= new(size)
+      def self.instance_for *parameters
+        @mapping[parameters] ||= new(*parameters)
       end
       
-      def initialize size
+      def initialize size, options = {}
         @size = size
+        @zero = options[:zero] == false ? nil : '0'
       end
       
       # Takes a national number and splits it into ndc and rest.
       #
       def split national_number
-        return [national_number] unless @size
-        [national_number.slice!(0...@size), national_number]
+        return [@zero, national_number] unless @size
+        [@zero, national_number.slice!(0...@size), national_number]
       end
       
     end

data/lib/phony/national_splitters/none.rb

@@ -5,7 +5,7 @@ module Phony
     # This is a national splitter for countries
     # which have no NDC / Area Code.
     #
-    class None < DSL
+    class None < Default
       
       # Get a splitter. Caches.
       #
@@ -13,12 +13,6 @@ module Phony
         @instance ||= new
       end
       
-      # Takes a national number and splits it into ndc and rest.
-      #
-      def split national_number
-        [nil, national_number]
-      end
-      
     end
     
   end

data/lib/phony/national_splitters/regex.rb

@@ -17,12 +17,12 @@ module Phony
       #
       # Note: Not cached.
       #
-      def self.instance_for regex, on_fail_take = nil
-        new regex, on_fail_take
+      def self.instance_for regex, on_fail_take = nil, options = {}
+        new regex, on_fail_take, options
       end
 
-      def initialize regex, on_fail_take = nil
-        super on_fail_take
+      def initialize regex, on_fail_take = nil, options = {}
+        super on_fail_take, options
 
         @regex = regex
       end
@@ -32,14 +32,14 @@ module Phony
       # Examples
       # * split '3643533' # => ['364', '35', '33'] # (Switzerland)
       #
-      def split number
+      def split national_number
         # Improve matching.
         #
-        return [number.slice!(0..$1.size-1), number] if number =~ regex
+        return [@zero, national_number.slice!(0..$1.size-1), national_number] if national_number =~ regex
         
         # Not found.
         #
-        super number
+        super national_number
       end
       
     end

data/lib/phony/national_splitters/variable.rb

@@ -6,8 +6,8 @@ module Phony
       
       #
       #
-      def initialize fallback, ndcs
-        super fallback
+      def initialize fallback, ndcs, options = {}
+        super fallback, options
         @ndcs = optimize ndcs
       end
       
@@ -28,7 +28,7 @@ module Phony
         #
         @mapped_ndc_min_length.upto(@mapped_ndc_max_length) do |i|
           sized_ndcs = @ndcs[i]
-          return [presumed_code, national_number] unless sized_ndcs && !sized_ndcs.include?(presumed_code)
+          return [@zero, presumed_code, national_number] unless sized_ndcs && !sized_ndcs.include?(presumed_code)
           presumed_code << national_number.slice!(0..0)
         end
         

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', '32', '12', '12', '12']
+      Phony.split('4532121212').should == ['45', nil, '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', '112'] # Emergency TODO
-      Phony.split('3544211234').should == ['354', '421', '1234'] # Keflavík
-      Phony.split('3544621234').should == ['354', '462', '1234'] # Akureyri
-      Phony.split('3545511234').should == ['354', '551', '1234'] # Reykjavík
+      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
     end
     it 'handles irish numbers' do
       Phony.split('35311234567').should  == ['353', '1', '123', '4567']  # Dublin, 7 digit subscriber #
@@ -121,7 +121,7 @@ describe 'country descriptions' do
       Phony.split('353801234567').should == ['353', '80', '123', '4567'] # Mobile
       Phony.split('353761234567').should == ['353', '76', '123', '4567'] # VoIP
       Phony.split('353800123456').should == ['353', '800', '123456']     # Freefone
-      Phony.split('353000123456').should == ['353', '000123456']         # No NDC/local split for unrecognized
+      Phony.split('353000123456').should == ['353', nil, '000123456']         # No NDC/local split for unrecognized
     end
     it 'handles italian numbers' do
       Phony.split('3934869528').should   == ['39', '3486', '952', '8']   # Mobile
@@ -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','21','23','45','67']
-      Phony.split('4731234567').should == ['47','31','23','45','67']
-      Phony.split('4741234567').should == ['47','412','34','567']
-      Phony.split('4751234567').should == ['47','51','23','45','67']
-      Phony.split('4761234567').should == ['47','61','23','45','67']
-      Phony.split('4771234567').should == ['47','71','23','45','67']
-      Phony.split('4781234567').should == ['47','812','34','567']
-      Phony.split('4791234567').should == ['47','912','34','567']
+      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']
     end
     it 'handles peruvian numbers' do
       Phony.split('51112341234').should == ['51', '1', '1234', '1234'] # Lima
@@ -194,7 +194,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', '6123', '1234'] # Fixed line
+      Phony.split('6561231234').should == ['65', nil, '6123', '1234'] # Fixed line
     end
     it 'handles slovakian numbers' do
       Phony.split('421912123456').should == ['421', '912', '123456'] # Mobile

data/spec/lib/phony/country_codes_spec.rb

@@ -12,7 +12,7 @@ describe Phony::CountryCodes do
     end
     it 'formats correctly' do
       old_format = @countries.international_absolute_format
-      @countries.international_absolute_format = '!!! %s%s%s%s'
+      @countries.international_absolute_format = '!!! %s%s%s'
       
       @countries.formatted('41443643532', :format => :international).should == '!!! 41 44 364 35 32'
       
@@ -25,7 +25,7 @@ describe Phony::CountryCodes do
     end
     it 'formats correctly' do
       old_format = @countries.international_relative_format
-      @countries.international_relative_format = '000 %s%s%s%s'
+      @countries.international_relative_format = '000 %s%s%s'
       
       @countries.formatted('41443643532', :format => :international_relative).should == '000 41 44 364 35 32'
       
@@ -48,7 +48,7 @@ describe Phony::CountryCodes do
   
   describe 'split' do
     it 'splits correctly' do
-      @countries.split('41443643532').should == ['41', '44', '364', '35', '32']
+      @countries.split('41443643532').should == ['41', '0', '44', '364', '35', '32']
     end
   end
   

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 == ['112']
+        @iceland.split('112').should == [nil, nil, '112']
       end
     end
   end
@@ -28,7 +28,7 @@ describe Phony::Country do
     
     describe "split" do
       it "should handle ZH" do
-        @switzerland.split('443643532').should == ['44', '364', '35', '32']
+        @switzerland.split('443643532').should == ['0', '44', '364', '35', '32']
       end
     end
     describe 'normalize' do
@@ -53,10 +53,10 @@ describe Phony::Country do
     
     describe "split" do
       it "should handle ZH" do
-        @switzerland.split('443643532').should == ['44', '364', '35', '32']
+        @switzerland.split('443643532').should == ['0', '44', '364', '35', '32']
       end
       it "should handle 800" do
-        @switzerland.split('800333666').should == ['800', '333', '666']
+        @switzerland.split('800333666').should == ['0', '800', '333', '666']
       end
     end
   end

data/spec/lib/phony/dsl_spec.rb

@@ -6,7 +6,7 @@ describe Phony::DSL do
 
   it 'has a todo' do
     Phony.define do
-      todo.split("123456789012345").should == ["123456789012345"]
+      todo.split("123456789012345").should == [nil, nil, nil, nil, '123456789012345']
     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, '112']
+          @national.split('112').should == [nil, nil, '112']
         end
       end
     end
@@ -24,10 +24,10 @@ describe Phony::NationalCode do
         @national         = Phony::NationalCode.new national_splitter, local_splitter
       end
       it 'splits correctly' do
-        @national.split('443643532').should == ['44', '364', '35', '32']
+        @national.split('443643532').should == ['0', '44', '364', '35', '32']
       end
       it 'splits correctly' do
-        @national.split('44364353').should == ['44', '364', '35', '3']
+        @national.split('44364353').should == ['0', '44', '364', '35', '3']
       end
       it 'normalizes correctly' do
         @national.normalize('044364353').should == '44364353'
@@ -44,10 +44,10 @@ describe Phony::NationalCode do
         @national         = Phony::NationalCode.new national_splitter, local_splitter
       end
       it 'splits correctly' do
-        @national.split('142278186').should == ['1', '42', '27', '81', '86']
+        @national.split('142278186').should == ['0', '1', '42', '27', '81', '86']
       end
       it 'splits correctly' do
-        @national.split('14227818').should == ['1', '42', '27', '81', '8']
+        @national.split('14227818').should == ['0', '1', '42', '27', '81', '8']
       end
       it 'normalizes correctly' do
         @national.normalize('0142278186').should == '142278186'

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

@@ -16,13 +16,13 @@ describe Phony::NationalSplitters::Fixed do
       @splitter = Phony::NationalSplitters::Fixed.new 2
     end
     it 'splits correctly' do
-      @splitter.split('443643532').should == ['44', '3643532']
+      @splitter.split('443643532').should == ['0', '44', '3643532']
     end
     it 'splits correctly even when the number is too long' do
-      @splitter.split('44364353211').should == ['44', '364353211']
+      @splitter.split('44364353211').should == ['0', '44', '364353211']
     end
     it 'splits correctly even when the number is too short' do
-      @splitter.split('443').should == ['44','3']
+      @splitter.split('443').should == ['0', '44','3']
     end
   end
   describe 'split' do
@@ -30,13 +30,13 @@ describe Phony::NationalSplitters::Fixed do
       @splitter = Phony::NationalSplitters::Fixed.new nil
     end
     it 'splits correctly' do
-      @splitter.split('443643532').should == ['443643532']
+      @splitter.split('443643532').should == ['0', '443643532']
     end
     it 'splits correctly even when the number is too long' do
-      @splitter.split('44364353211').should == ['44364353211']
+      @splitter.split('44364353211').should == ['0', '44364353211']
     end
     it 'splits correctly even when the number is too short' do
-      @splitter.split('443').should == ['443']
+      @splitter.split('443').should == ['0', '443']
     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, '123456789']
+      splitter.split('123456789').should == [nil, nil, '123456789']
     end
   end
   

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

@@ -15,7 +15,7 @@ describe Phony::NationalSplitters::Regex do
     context 'with on_fail 2' do
       let(:splitter) { described_class.instance_for(/^(123)\d+$/, 2) }
       it 'uses the on_fail_take' do
-        splitter.split('23456789').should == ['23', '456789']
+        splitter.split('23456789').should == ['0', '23', '456789']
       end
     end
   end

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

@@ -8,16 +8,16 @@ describe Phony::NationalSplitters::Variable do
         @splitter = Phony::NationalSplitters::Variable.new 4, ['1', '316', '67', '68', '669', '711']
       end
       it "handles Vienna" do
-        @splitter.split('198110').should == ['1', '98110']
+        @splitter.split('198110').should == ['0', '1', '98110']
       end
       it "handles some mobile services" do
-        @splitter.split('66914093902').should == ['669', '14093902']
+        @splitter.split('66914093902').should == ['0', '669', '14093902']
       end
       it "handles Graz" do
-        @splitter.split('3161234567891').should == ['316', '1234567891']
+        @splitter.split('3161234567891').should == ['0', '316', '1234567891']
       end
       it "handles Rohrau" do
-        @splitter.split('2164123456789').should == ['2164', '123456789']
+        @splitter.split('2164123456789').should == ['0', '2164', '123456789']
       end
     end
     context 'special handling for using the variable size splitter for Swiss service numbers' do
@@ -25,7 +25,7 @@ describe Phony::NationalSplitters::Variable do
         @splitter = Phony::NationalSplitters::Variable.new 2, ['800']
       end
       it "should handle swiss service numbers" do
-        @splitter.split('800223344').should == ['800', '223344']
+        @splitter.split('800223344').should == ['0', '800', '223344']
       end
     end
   end

data/spec/lib/phony_spec.rb

@@ -172,6 +172,9 @@ describe Phony do
       it "should format austrian numbers" do
         Phony.format('43198110', :format => :national).should == '01 98110'
       end
+      it "should format US numbers without a leading zero" do
+        Phony.format('14159224711', :format => :national).should == '415 922 4711'
+      end
     end
     describe "local" do
       it "should format swiss numbers" do
@@ -212,8 +215,11 @@ describe Phony do
       end
     end
     context '"unsupported" countries' do
-      it 'handles normalizing, then formatting' do
-        Phony.format(Phony.normalize('+880-321 5560 5220')).should == '+880 32155605220'
+      it 'handles formatting' do
+        Phony.format('88032155605220').should == '+880 32155605220'
+      end
+      it 'handles normalizing' do
+        Phony.normalize('+880-321 5560 5220').should == '88032155605220'
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phony
 version: !ruby/object:Gem::Version
-  version: 1.6.8
+  version: 1.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-13 00:00:00.000000000 Z
+date: 2012-05-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