phony 2.2.4 → 2.2.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTY1NmNhOWEwODE4N2MyYzZmODZkMjY5ZGExYzVhMTQ3ZjJkMTU3Zg==
+    Y2I0ZWIxMzc3NTZlMzdlYTYyOGM4MjUwZjc1MDdkYTQ4ODJlYzY1Ng==
   data.tar.gz: !binary |-
-    MTE2YTEyMDNlYTc2YTBkZTI4NGIxM2E4MzMzODhlNjA4NWI5MjQzYg==
+    YTM5OWNkMTNmNjEyYjU5YzY2MTA0MjBkNDFkMTZkYWRiM2JkZWNjMA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YTEzYzk4YWZjZDZjZGJhMDMxNDJlNzAzMGY3YmEwN2Y0NDQyOWI4MGM0MjMx
-    ZGU1ZDgyZDQ3MzdjN2VlMTdjODE0YzBjMDQzZTYzMjcwODEyZWViZjM5ZmNl
-    ZTAxMzhmZDNjYWZkZmZhZWNmYzI1OTljZjVhZjg0NjliZjQwOTQ=
+    ZGZiNWViN2VjMWU1ZjEwZGFhZmVlNGJjNjdlOWMwYjU5MDNkYTI1OTY3NzAw
+    ZTdiODdhMGMzYmY3ZDgwNTBkMWE4ODkxNDJlOWIxZjBhZDgxY2RhNjJiYzUz
+    NDExMDllYTczMmU3NjA5OWI0NDFiZTEwMDM5MDlhMzdlZmEwODY=
   data.tar.gz: !binary |-
-    Mzk4ZWNjNTQzZWNmZGJkMTJjYTExZGM1NzI4MGY2ZDA3ZmMxNDkyNjU2MWY0
-    MTYwZThjNDAyZTVmNzQ3OTk4ZTY2NDkwZDg4YjJhZjEyNTE4MWYzNzI4MmQy
-    Y2EwNzk3NmVhMTg1Y2NmMDAxYjlhOWQ3MjhiOTYyZjQyMDIwOTM=
+    ZWVkMDFmMTYwMDI0YjJmYWNiZmY1ZjBkMjQ1NTZkNTgzYzg5ZDhlMmM5MTQ4
+    ZjQyZGU3MDU1MjlmNTRjODQ3NzIwYWRjZTA1YTE4YTE0ZDE0NTk0YWRjMDc2
+    ZTMwYTRhYTBiOTJkMTAyZDI3MWVkNDlkNmNiMDBmMmVhNzA1Y2Q=

data/README.textile

@@ -91,69 +91,71 @@ This will often raise an error if you try normalizing a non E164-izable number (
 
 h3(#formatting). Formatting
 
-@Phony.formatted('41443643532').should == '+41 44 364 35 32'@
+Aliased as @Phony.formatted(number_string)@. 
 
-@Phony.formatted('41800112233').should == '+41 800 11 22 33'@
+@Phony.format('41443643532').should == '+41 44 364 35 32'@
 
-@Phony.formatted('43198110').should == '+43 1 98110'@
+@Phony.format('41800112233').should == '+41 800 11 22 33'@
 
-@Phony.formatted('18705551122').should == '+1 870 555 1122'@
+@Phony.format('43198110').should == '+43 1 98110'@
+
+@Phony.format('18705551122').should == '+1 870 555 1122'@
 
 h4(#international). International
 
-@Phony.formatted('18091231234', :format => :international).should == '+1 809 123 1234'@
+@Phony.format('18091231234', :format => :international).should == '+1 809 123 1234'@
 
-@Phony.formatted('43198110', :format => :international).should == '+43 1 98110'@
+@Phony.format('43198110', :format => :international).should == '+43 1 98110'@
 
-@Phony.formatted('43198110', :format => :international_absolute).should == '+43 1 98110'@
+@Phony.format('43198110', :format => :international_absolute).should == '+43 1 98110'@
 
-@Phony.formatted('33142278186', :format => :+).should == '+33 1 42 27 81 86'@
+@Phony.format('33142278186', :format => :+).should == '+33 1 42 27 81 86'@
 
-@Phony.formatted('43198110', :format => :international_relative).should == '0043 1 98110'@
+@Phony.format('43198110', :format => :international_relative).should == '0043 1 98110'@
 
-@Phony.formatted('4233841148', :format => :international_relative).should == '00423 384 11 48'@
+@Phony.format('4233841148', :format => :international_relative).should == '00423 384 11 48'@
 
 h4(#spaces). With spaces
 
-@Phony.formatted('18091231234', :format => :international, :spaces => '').should == '+18091231234'@
+@Phony.format('18091231234', :format => :international, :spaces => '').should == '+18091231234'@
 
-@Phony.formatted('43198110', :format => :international, :spaces => '').should == '+43198110'@
+@Phony.format('43198110', :format => :international, :spaces => '').should == '+43198110'@
 
-@Phony.formatted('43198110', :format => :international_absolute, :spaces => '').should == '+43198110'@
+@Phony.format('43198110', :format => :international_absolute, :spaces => '').should == '+43198110'@
 
-@Phony.formatted('33142278186', :format => :+, :spaces => '').should == '+33142278186'@
+@Phony.format('33142278186', :format => :+, :spaces => '').should == '+33142278186'@
 
-@Phony.formatted('43198110', :format => :international_relative, :spaces => '').should == '0043198110'@
+@Phony.format('43198110', :format => :international_relative, :spaces => '').should == '0043198110'@
 
-@Phony.formatted('4233841148', :format => :international_relative, :spaces => '').should == '004233841148'@
+@Phony.format('4233841148', :format => :international_relative, :spaces => '').should == '004233841148'@
 
 h4(#special). With special spaces
 
-@Phony.formatted('18091231234', :format => :international, :spaces => :-).should == '+1-809-123-1234'@
+@Phony.format('18091231234', :format => :international, :spaces => :-).should == '+1-809-123-1234'@
 
-@Phony.formatted('43198110', :format => :international, :spaces => :-).should == '+43-1-98110'@
+@Phony.format('43198110', :format => :international, :spaces => :-).should == '+43-1-98110'@
 
-@Phony.formatted('43198110', :format => :international_absolute, :spaces => :-).should == '+43-1-98110'@
+@Phony.format('43198110', :format => :international_absolute, :spaces => :-).should == '+43-1-98110'@
 
-@Phony.formatted('33142278186', :format => :+, :spaces => :-).should == '+33-1-42-27-81-86'@
+@Phony.format('33142278186', :format => :+, :spaces => :-).should == '+33-1-42-27-81-86'@
 
-@Phony.formatted('43198110', :format => :international_relative, :spaces => :-).should == '0043-1-98110'@
+@Phony.format('43198110', :format => :international_relative, :spaces => :-).should == '0043-1-98110'@
 
-@Phony.formatted('4233841148', :format => :international_relative, :spaces => :-).should == '00423-384-11-48'@
+@Phony.format('4233841148', :format => :international_relative, :spaces => :-).should == '00423-384-11-48'@
 
 h4(#national). National
 
-@Phony.formatted('41443643532', :format => :national).should == '044 364 35 32'@
+@Phony.format('41443643532', :format => :national).should == '044 364 35 32'@
 
-@Phony.formatted('41800112233', :format => :national).should == '0800 11 22 33'@
+@Phony.format('41800112233', :format => :national).should == '0800 11 22 33'@
 
-@Phony.formatted('43198110', :format => :national).should == '01 98110'@
+@Phony.format('43198110', :format => :national).should == '01 98110'@
 
 h4(#local). Local
 
-@Phony.formatted('41443643532', :format => :local).should == '364 35 32'@
+@Phony.format('41443643532', :format => :local).should == '364 35 32'@
 
-@Phony.formatted('493038625454', :format => :local).should == '386 25454'@
+@Phony.format('493038625454', :format => :local).should == '386 25454'@
 
 h3(#splitting). Splitting
 

data/lib/phony.rb

@@ -115,10 +115,10 @@ module Phony
     #
     def format phone_number, options = {}
       raise ArgumentError, "Phone number cannot be nil. Use e.g. number && Phony.format(number)." unless phone_number
-      formatted! phone_number.dup, options
+      format! phone_number.dup, options
     end
     def format! phone_number, options = {}
-      @codes.formatted phone_number, options
+      @codes.format phone_number, options
     end
     alias formatted  format
     alias formatted! format!

data/lib/phony/countries/ireland.rb

@@ -9,8 +9,6 @@
 # http://www.comreg.ie/_fileupload/publications/ComReg03147.pdf
 # http://en.wikipedia.org/wiki/Telephone_numbers_in_the_Republic_of_Ireland
 #
-handlers = []
-
 ndcs_with_5_subscriber_digits = [
   ('22'..'29').to_a, # Mallow, Bandon, Youghal, Fermoy, Macroom, Bantry, Skibbereen, Kanturk
   '402',  # Arklow
@@ -73,4 +71,4 @@ Phony.define do
                  match(/^(8\d).+$/)                      >> split(3,4) | # mobile
                  fixed(3)                                >> split(6)     # Fallback
 
-end
+end

data/lib/phony/countries/malaysia.rb

@@ -12,7 +12,7 @@ ndcs = [
   '9', # Kelantan, Pahang (except Cameron Highlands & Genting Highlands) & Terengganu
 ]
 mobile = %w{ 10 11 12 13 14 153 154 156 158 16 17 18 19 }
-service = %w{ 100 101 102 103 104 108 991 994 995 999 }  # Emergeny and Service numbers, only 3 digits long
+# service = %w{ 100 101 102 103 104 108 991 994 995 999 }  # Emergeny and Service numbers, only 3 digits long
 freephone = %w{ 300 700 800 }
 
 Phony.define do
@@ -21,4 +21,4 @@ Phony.define do
                 one_of(mobile)  >> split(3,4)   | # Mobile
                 one_of(ndcs)    >> split(8)     | # 1-digit NDCs
                 fixed(2)        >> split(8)       # 2-digit NDCs (Also, fallback)
-end
+end

data/lib/phony/country.rb

@@ -1,24 +1,24 @@
 module Phony
-  
+
   #
   #
   class Country
-    
+
     attr_accessor :codes
-    
-    # 
+
+    #
     #
     def initialize *codes
       @codes = codes
     end
-    
+
     # Chain two codes together.
     #
     def |(other)
       self.codes = self.codes + other.codes
       self
     end
-    
+
     # Options.
     #
     # TODO Rewrite.
@@ -27,7 +27,7 @@ module Phony
       @cc           = cc
       @invalid_ndcs = options[:invalid_ndcs] || []
     end
-    
+
     # A number is split with the code handlers as given in the initializer.
     #
     # Note: If the ndc is nil, it will not return it.
@@ -37,6 +37,9 @@ module Phony
         zero, ndc, *rest = code.split national_number
         return [zero, ndc, *rest] if rest && !rest.empty?
       end
+      # Best effort in error case.
+      #
+      [nil, national_number, []]
     end
     def split_ndc national_number
       @codes.each do |code|
@@ -44,7 +47,7 @@ module Phony
         return [code.local_splitter, zero, ndc, *rest] if rest && !rest.empty?
       end
     end
-    
+
     # Cleans all non-numeric characters.
     #
     @@basic_cleaning_pattern = /\(0\)|\D/
@@ -58,10 +61,10 @@ module Phony
     def clean! number
       number.gsub!(@@basic_cleaning_pattern, EMPTY_STRING) || number
     end
-    
+
     # Removes 0s from partially normalized numbers
     # such as 410443643533.
-    # 
+    #
     # Example:
     #   410443643533 -> 41443643533
     #
@@ -76,12 +79,12 @@ module Phony
       end
       normalized
     end
-    
+
     # Tests for plausibility of this national number.
     #
     def plausible? rest, hints = {}
       local, _, ndc, *rest = split_ndc rest
-      
+
       # Element based checking.
       #
       # Note: ndc == false means the country has none.
@@ -89,21 +92,21 @@ module Phony
       return false if ndc.nil?
       return false if ndc && ndc.empty?
       return false if @invalid_ndcs.include? ndc # TODO Refactor.
-      
+
       # # A valid range for the rest is 0 or 3+ total digits.
       # #
       # return false if (1..2) === rest_size
-      
+
       # National destination code plausible?
       #
       ndc_needed = hints[:ndc]
       return false if ndc_needed && !(ndc_needed === ndc)
-      
+
       # Local code specific checks.
       #
       return local.plausible? rest, hints
     end
-    
+
     # Is this national number a vanity number?
     #
     def vanity? national_number
@@ -112,10 +115,10 @@ module Phony
     #
     #
     def vanity_to_number vanity_number
-      zero, ndc, *rest = split vanity_number
+      _, ndc, *rest = split vanity_number
       "#{ndc}#{Vanity.replace(rest.join)}"
     end
-    
+
   end
-  
-end
+
+end

data/lib/phony/country_codes.rb

@@ -50,7 +50,7 @@ module Phony
       countrify!(number, cc) || number
     end
     def countrify! number, cc
-      number.sub! /\A/, cc # @countrify_regex, @cc
+      number.sub!(/\A/, cc) # @countrify_regex, @cc
     end
 
     # 00 for the standard international call prefix.
@@ -83,9 +83,11 @@ module Phony
       [cc, *country.split(rest)]
     end
 
-    def formatted number, options = {}
+    def format number, options = {}
       format_cc_ndc_local options[:format], options[:spaces] || @default_space, *split(number)
     end
+    alias formatted format
+
     # Formats country code and national destination code.
     #
     def format_cc_ndc_local format, space, cc, zero, ndc, *parts
@@ -127,15 +129,15 @@ module Phony
     #
     #
     def service? number
-      country, cc, rest = split_cc number
+      country, _, rest = split_cc number
       country.service? rest
     end
     def mobile? number
-      country, cc, rest = split_cc number
+      country, _, rest = split_cc number
       country.mobile? rest
     end
     def landline? number
-      country, cc, rest = split_cc number
+      country, _, rest = split_cc number
       country.landline? rest
     end
 
@@ -179,7 +181,7 @@ module Phony
       # Country specific tests.
       #
       country.plausible? rest, hints
-    rescue StandardError => e
+    rescue StandardError
       return false
     end
 

data/lib/phony/dsl.rb

@@ -38,7 +38,7 @@ module Phony
   #
   def self.define
     dsl = DSL.new
-    dsl.instance_eval &Proc.new if block_given?
+    dsl.instance_eval(&Proc.new) if block_given?
     dsl
   end
 
@@ -190,4 +190,4 @@ module Phony
 
   end
 
-end
+end

data/lib/phony/national_code.rb

@@ -27,9 +27,9 @@ module Phony
     # Note: Some cases, like Italy, don't remove the relative zero.
     #
     def normalize national_number
-      national_number.gsub /\A0+/, EMPTY_STRING
+      national_number.gsub(/\A0+/, EMPTY_STRING)
     end
 
   end
 
-end
+end

data/lib/phony/trunk_code.rb

@@ -20,7 +20,7 @@ module Phony
     #
     def split national_number
       national_number.gsub! @trunk_code_replacement, EMPTY_STRING if @split
-      return [@code, national_number]
+      return [nil, national_number]
     end
     
     def normalize national_number

data/lib/phony/vanity.rb

@@ -16,7 +16,7 @@ module Phony
     # Replaces (and normalizes) vanity characters of passed number with correct digits.
     #
     def self.replace number
-      number.tr *mapping
+      number.tr(*mapping)
     end
     
     # Returns true if there is a character in the number
@@ -29,7 +29,7 @@ module Phony
     
     # Vanity-Normalized.
     #
-    @@vanity_normalizing_regexp = /^0*|[^\d\w]/
+    @@vanity_normalizing_regexp = /^0*|[^\w]/
     def self.normalized number
       number.gsub @@vanity_normalizing_regexp, ''
     end

data/spec/functional/plausibility_spec.rb

@@ -20,7 +20,6 @@ describe 'plausibility' do
           correct = [*sample]
 
           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']
 
           correct.each do |value|

data/spec/lib/phony/country_codes_spec.rb

@@ -8,39 +8,39 @@ describe Phony::CountryCodes do
   
   describe 'international_absolute_format=' do
     it 'formats correctly' do
-      @countries.formatted('41443643532', :format => :international).should == '+41 44 364 35 32'
+      @countries.formatted('41443643532', :format => :international).should eql '+41 44 364 35 32'
     end
     it 'formats correctly' do
       old_format = @countries.international_absolute_format
       @countries.international_absolute_format = '!!! %s%s%s'
       
-      @countries.formatted('41443643532', :format => :international).should == '!!! 41 44 364 35 32'
+      @countries.formatted('41443643532', :format => :international).should eql '!!! 41 44 364 35 32'
       
       @countries.international_absolute_format = old_format
     end
   end
   describe 'international_relative_format=' do
     it 'formats correctly' do
-      @countries.formatted('41443643532', :format => :international_relative).should == '0041 44 364 35 32'
+      @countries.formatted('41443643532', :format => :international_relative).should eql '0041 44 364 35 32'
     end
     it 'formats correctly' do
       old_format = @countries.international_relative_format
       @countries.international_relative_format = '000 %s%s%s'
       
-      @countries.formatted('41443643532', :format => :international_relative).should == '000 41 44 364 35 32'
+      @countries.formatted('41443643532', :format => :international_relative).should eql '000 41 44 364 35 32'
       
       @countries.international_relative_format = old_format
     end
   end
   describe 'national_format=' do
     it 'formats correctly' do
-      @countries.formatted('41443643532', :format => :international_relative).should == '0041 44 364 35 32'
+      @countries.formatted('41443643532', :format => :international_relative).should eql '0041 44 364 35 32'
     end
     it 'formats correctly' do
       old_format = @countries.national_format
       @countries.national_format = '%s%s'
       
-      @countries.formatted('11231231234', :format => :national).should == '123 123 1234'
+      @countries.formatted('11231231234', :format => :national).should eql '123 123 1234'
       
       @countries.national_format = old_format
     end
@@ -48,139 +48,139 @@ describe Phony::CountryCodes do
   
   describe 'split' do
     it 'splits correctly' do
-      @countries.split('41443643532').should == ['41', '0', '44', '364', '35', '32']
+      @countries.split('41443643532').should eql ['41', '0', '44', '364', '35', '32']
     end
   end
   
   describe 'formatted' do
     it 'formats correctly' do
-      @countries.formatted('41443643532', :format => :international, :spaces => :-).should == '+41-44-364-35-32'
+      @countries.formatted('41443643532', :format => :international, :spaces => :-).should eql '+41-44-364-35-32'
     end
     it 'formats correctly' do
-      @countries.formatted('41443643532', :format => :international_relative, :spaces => :-).should == '0041-44-364-35-32'
+      @countries.formatted('41443643532', :format => :international_relative, :spaces => :-).should eql '0041-44-364-35-32'
     end
     it 'formats correctly' do
-      @countries.formatted('41443643532', :format => :national, :spaces => :-).should == '044-364-35-32'
+      @countries.formatted('41443643532', :format => :national, :spaces => :-).should eql '044-364-35-32'
     end
     context 'specific' do
       it 'formats ireland correctly' do
-        @countries.formatted("3533451234", :format => :national).should == '0345 1234'
+        @countries.formatted("3533451234", :format => :national).should eql '0345 1234'
       end
       it 'formats ireland correctly' do
-        @countries.formatted("353411231234", :format => :national).should == '041 123 1234'
+        @countries.formatted("353411231234", :format => :national).should eql '041 123 1234'
       end
     end
     context 'default' do
       it "should format swiss numbers" do
-        @countries.formatted('41443643532').should == '+41 44 364 35 32'
+        @countries.formatted('41443643532').should eql '+41 44 364 35 32'
       end
       it "should format swiss service numbers" do
-        @countries.formatted('41800112233').should == '+41 800 112 233'
+        @countries.formatted('41800112233').should eql '+41 800 112 233'
       end
       it "should format austrian numbers" do
-        @countries.formatted('43198110').should == '+43 1 98110'
+        @countries.formatted('43198110').should eql '+43 1 98110'
       end
       it "should format american numbers" do
-        @countries.formatted('18705551122').should == '+1 870 555 1122'
+        @countries.formatted('18705551122').should eql '+1 870 555 1122'
       end
       it "should format irish numbers" do
-        @countries.formatted('35311234567').should == '+353 1 123 4567'
+        @countries.formatted('35311234567').should eql '+353 1 123 4567'
       end
     end
     describe "international" do
       it "should format north american numbers" do
-        @countries.formatted('18091231234', :format => :international).should == '+1 809 123 1234'
+        @countries.formatted('18091231234', :format => :international).should eql '+1 809 123 1234'
       end
       it "should format austrian numbers" do
-        @countries.formatted('43198110', :format => :international).should == '+43 1 98110'
+        @countries.formatted('43198110', :format => :international).should eql '+43 1 98110'
       end
       it "should format austrian numbers" do
-        @countries.formatted('43198110', :format => :international_absolute).should == '+43 1 98110'
+        @countries.formatted('43198110', :format => :international_absolute).should eql '+43 1 98110'
       end
       it "should format french numbers" do
-        @countries.formatted('33142278186', :format => :+).should == '+33 1 42 27 81 86'
+        @countries.formatted('33142278186', :format => :+).should eql '+33 1 42 27 81 86'
       end
       it "should format austrian numbers" do
-        @countries.formatted('43198110', :format => :international_relative).should == '0043 1 98110'
+        @countries.formatted('43198110', :format => :international_relative).should eql '0043 1 98110'
       end
       it 'should format liechtensteiner numbers' do
-        @countries.formatted('4233841148', :format => :international_relative).should == '00423 384 11 48'
+        @countries.formatted('4233841148', :format => :international_relative).should eql '00423 384 11 48'
       end
       it "should format irish numbers" do
-        @countries.formatted('35311234567', :format => :international).should == '+353 1 123 4567'
+        @countries.formatted('35311234567', :format => :international).should eql '+353 1 123 4567'
       end
       it "should format luxembourgian numbers" do
-        @countries.formatted('352222809', :format => :international).should == '+352 22 28 09'
+        @countries.formatted('352222809', :format => :international).should eql '+352 22 28 09'
       end
       it "should format luxembourgian 4-digit ndc numbers" do
-        @countries.formatted('35226222809', :format => :international).should == '+352 26 22 28 09'
+        @countries.formatted('35226222809', :format => :international).should eql '+352 26 22 28 09'
       end
       it "should format luxembourgian mobile numbers" do
-        @countries.formatted('352621123456', :format => :international).should == '+352 621 123 456'
+        @countries.formatted('352621123456', :format => :international).should eql '+352 621 123 456'
       end
       it "should format luxembourgian city numbers" do
-        @countries.formatted('3524123456', :format => :international).should == '+352 4 12 34 56'
+        @countries.formatted('3524123456', :format => :international).should eql '+352 4 12 34 56'
       end
       it "should format luxembourgian machine to machine numbers" do
-        @countries.formatted('352602112345678', :format => :international).should == '+352 6021 12 34 56 78'
+        @countries.formatted('352602112345678', :format => :international).should eql '+352 6021 12 34 56 78'
       end
       it "should format luxembourgian numbers" do
-        @countries.formatted('352370431', :format => :international).should == '+352 37 04 31'
+        @countries.formatted('352370431', :format => :international).should eql '+352 37 04 31'
       end
       it "should format luxembourgian numbers" do
-        @countries.formatted('35227855', :format => :international).should == '+352 27 85 5'
+        @countries.formatted('35227855', :format => :international).should eql '+352 27 85 5'
       end
       it "should format nigerian numbers" do
-        @countries.formatted('23414480000', :format => :international).should == '+234 1 448 0000'
+        @countries.formatted('23414480000', :format => :international).should eql '+234 1 448 0000'
       end
       it "should format nigerian mobile numbers" do
-        @countries.formatted('2347061234567', :format => :international).should == '+234 706 123 4567'
+        @countries.formatted('2347061234567', :format => :international).should eql '+234 706 123 4567'
       end
       context 'with no spaces' do
         it "should format north american numbers" do
-          Phony.formatted('18091231234', :format => :international, :spaces => '').should == '+18091231234'
+          Phony.formatted('18091231234', :format => :international, :spaces => '').should eql '+18091231234'
         end
         it "should format austrian numbers" do
-          Phony.formatted('43198110', :format => :international, :spaces => '').should == '+43198110'
+          Phony.formatted('43198110', :format => :international, :spaces => '').should eql '+43198110'
         end
         it "should format austrian numbers" do
-          Phony.formatted('43198110', :format => :international_absolute, :spaces => '').should == '+43198110'
+          Phony.formatted('43198110', :format => :international_absolute, :spaces => '').should eql '+43198110'
         end
         it "should format french numbers" do
-          Phony.formatted('33142278186', :format => :+, :spaces => '').should == '+33142278186'
+          Phony.formatted('33142278186', :format => :+, :spaces => '').should eql '+33142278186'
         end
         it "should format austrian numbers" do
-          Phony.formatted('43198110', :format => :international_relative, :spaces => '').should == '0043198110'
+          Phony.formatted('43198110', :format => :international_relative, :spaces => '').should eql '0043198110'
         end
         it 'should format liechtensteiner numbers' do
-          Phony.formatted('4233841148', :format => :international_relative, :spaces => '').should == '004233841148'
+          Phony.formatted('4233841148', :format => :international_relative, :spaces => '').should eql '004233841148'
         end
       end
       context 'with special spaces' do
         it "should format swiss numbers" do
-          Phony.formatted('41443643532', :format => :international).should == '+41 44 364 35 32'
+          Phony.formatted('41443643532', :format => :international).should eql '+41 44 364 35 32'
         end
         it "should format north american numbers" do
-          Phony.formatted('18091231234', :format => :international, :spaces => :-).should == '+1-809-123-1234'
+          Phony.formatted('18091231234', :format => :international, :spaces => :-).should eql '+1-809-123-1234'
         end
         it "should format austrian numbers" do
-          Phony.formatted('43198110', :format => :international, :spaces => :-).should == '+43-1-98110'
+          Phony.formatted('43198110', :format => :international, :spaces => :-).should eql '+43-1-98110'
         end
         it "should format austrian numbers" do
-          Phony.formatted('43198110', :format => :international_absolute, :spaces => :-).should == '+43-1-98110'
+          Phony.formatted('43198110', :format => :international_absolute, :spaces => :-).should eql '+43-1-98110'
         end
         it "should format french numbers" do
-          Phony.formatted('33142278186', :format => :+, :spaces => :-).should == '+33-1-42-27-81-86'
+          Phony.formatted('33142278186', :format => :+, :spaces => :-).should eql '+33-1-42-27-81-86'
         end
         it "should format austrian numbers" do
-          Phony.formatted('43198110', :format => :international_relative, :spaces => :-).should == '0043-1-98110'
+          Phony.formatted('43198110', :format => :international_relative, :spaces => :-).should eql '0043-1-98110'
         end
         it 'should format liechtensteiner numbers' do
-          Phony.formatted('4233841148', :format => :international_relative, :spaces => :-).should == '00423-384-11-48'
+          Phony.formatted('4233841148', :format => :international_relative, :spaces => :-).should eql '00423-384-11-48'
         end
 
       end
     end
   end
   
-end
+end

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

@@ -12,7 +12,7 @@ describe Phony::LocalSplitters::Regex do
     before(:each) do
       # Norway as example.
       #
-      @splitter = described_class.instance_for /^[489].*$/ => [3,2,3], :fallback => [2,2,2,2]
+      @splitter = described_class.instance_for(/^[489].*$/ => [3,2,3], :fallback => [2,2,2,2])
     end
     it 'splits a number correctly' do
       @splitter.split('21234567').should == ['21','23','45','67']
@@ -58,28 +58,28 @@ describe Phony::LocalSplitters::Regex do
     end
 
     context 'Mapping does not exist for a number' do
-      let(:local_splitter) { described_class.instance_for /\A5/ => [1,2,3]}
+      let(:local_splitter) { described_class.instance_for(/\A5/ => [1,2,3])}
       it 'returns false' do
         result.should be_false
       end
     end
 
     context "Mapping exists, but the length is greater" do
-      let(:local_splitter) { described_class.instance_for /\A123/ => [2,2]}
+      let(:local_splitter) { described_class.instance_for(/\A123/ => [2,2])}
       it 'returns false' do
         result.should be_false
       end
     end
 
     context "Mapping exists, but the length is less" do
-      let(:local_splitter) { described_class.instance_for /\A123/ => [2,2,3]}
+      let(:local_splitter) { described_class.instance_for(/\A123/ => [2,2,3])}
       it 'returns false' do
         result.should be_false
       end
     end
 
     context 'Mapping exists and the length is equal' do
-      let(:local_splitter) { described_class.instance_for /\A123/ => [2,2,2]}
+      let(:local_splitter) { described_class.instance_for(/\A123/ => [2,2,2])}
       it 'returns true' do
         result.should be_true
       end
@@ -87,4 +87,4 @@ describe Phony::LocalSplitters::Regex do
 
   end
   
-end
+end

data/spec/lib/phony_spec.rb

@@ -6,7 +6,12 @@ describe Phony do
 
   describe 'regression' do
     it '#151' do
-      Phony.normalize('1-111-111-1111').should == '1111111111' # One 1 is removed because 1 is the trunk code.
+      described_class.normalize('1-111-111-1111').should == '1111111111' # One 1 is removed because 1 is the trunk code.
+      described_class.normalize('111-111-1111', cc: '1').should == '1111111111' # One 1 is removed because 1 is the trunk code.
+    end
+    it 'best effort #152' do
+      described_class.split('39694805123').should == ['39', '694805123', []]
+      described_class.format('39694805123').should == '+39 694805123 '
     end
   end
 
@@ -15,7 +20,7 @@ describe Phony do
       it '' do
         us = described_class['1']
         us.plausible?('4159224711').should be_true
-        us.normalize('4159224711').should == '4159224711'
+        us.normalize('4159224711').should eql '4159224711'
       end
     end
   end
@@ -35,73 +40,73 @@ describe Phony do
     end
     describe 'some examples' do
       it 'should normalize a too short number' do
-        Phony.normalize('+972').should == '972'
+        Phony.normalize('+972').should eql '972'
       end
       it 'should normalize an already normalized number' do
-        Phony.normalize('41443643533').should == '41443643533'
+        Phony.normalize('41443643533').should eql '41443643533'
       end
       it 'should normalize a format number' do
-        Phony.normalize('+41 44 364 35 33').should == '41443643533'
+        Phony.normalize('+41 44 364 35 33').should eql '41443643533'
       end
       it 'should normalize a 00 number' do
-        Phony.normalize('0041 44 364 35 33').should == '41443643533'
+        Phony.normalize('0041 44 364 35 33').should eql '41443643533'
       end
       it 'should normalize a service number' do
-        Phony.normalize('+41 800 11 22 33').should == '41800112233'
+        Phony.normalize('+41 800 11 22 33').should eql '41800112233'
       end
       it 'should remove characters from the number' do
-        Phony.normalize('John: +41 44 364 35 33').should == '41443643533'
+        Phony.normalize('John: +41 44 364 35 33').should eql '41443643533'
       end
       it 'should normalize one of these crazy american numbers' do
-        Phony.normalize('1 (703) 451-5115').should == '17034515115'
+        Phony.normalize('1 (703) 451-5115').should eql '17034515115'
       end
       it 'should normalize another one of these crazy american numbers' do
-        Phony.normalize('1-888-407-4747').should == '18884074747'
+        Phony.normalize('1-888-407-4747').should eql '18884074747'
       end
       it 'should normalize a number with colons' do
-        Phony.normalize('1.906.387.1698').should == '19063871698'
+        Phony.normalize('1.906.387.1698').should eql '19063871698'
       end
       it 'should normalize a number with optional ndc' do
-        Phony.normalize('+41 (044) 364 35 33').should == '41443643533'
+        Phony.normalize('+41 (044) 364 35 33').should eql '41443643533'
       end
       it 'should normalize a number with erroneous zero inside' do
-        Phony.normalize('+410443643533').should == '41443643533'
+        Phony.normalize('+410443643533').should eql '41443643533'
       end
       it 'should not normalize a number with a correct zero inside' do
-        Phony.normalize('+390909709511').should == '390909709511'
+        Phony.normalize('+390909709511').should eql '390909709511'
       end
 
       context 'special trunk prefixes' do
         it 'normalizes Hungary' do
-          Phony.normalize('36 0630245506').should == '3630245506'
+          Phony.normalize('36 0630245506').should eql '3630245506'
         end
         it 'normalizes Russia' do
-          Phony.normalize('7 8 342 1234567').should == '73421234567'
+          Phony.normalize('7 8 342 1234567').should eql '73421234567'
         end
         it 'normalizes Lithuania' do
-          Phony.normalize('370 8 5 1234567').should == '37051234567'
+          Phony.normalize('370 8 5 1234567').should eql '37051234567'
         end
         it 'normalizes Belarus' do
-          Phony.normalize('375 152450911').should == '375152450911'
+          Phony.normalize('375 152450911').should eql '375152450911'
         end
       end
     end
     describe 'country-based' do
       it 'normalizes the US correctly' do
-        Phony["1"].normalize("555 1234567890").should == '5551234567890'
-        Phony["1"].normalize("+1 555 1234567890").should == '5551234567890'
-        Phony["1"].normalize("+1 (0) 555 1234567890").should == '5551234567890'
+        Phony["1"].normalize("555 1234567890").should eql '5551234567890'
+        Phony["1"].normalize("+1 555 1234567890").should eql '5551234567890'
+        Phony["1"].normalize("+1 (0) 555 1234567890").should eql '5551234567890'
       end
       it 'normalizes Japan correctly' do
-        Phony["81"].normalize("80 1234 5634").should == '8012345634'
-        Phony["81"].normalize("Hello    80 1234 5634").should == '8012345634'
+        Phony["81"].normalize("80 1234 5634").should eql '8012345634'
+        Phony["81"].normalize("Hello    80 1234 5634").should eql '8012345634'
       end
     end
   end
 
   describe 'formatted' do
     it 'is an alias of format' do
-      Phony.formatted('41443643532').should == '+41 44 364 35 32'
+      Phony.formatted('41443643532').should eql '+41 44 364 35 32'
     end
   end
 
@@ -115,128 +120,128 @@ describe Phony do
     end
     describe 'default' do
       it 'should format swiss numbers' do
-        Phony.format('41443643532').should == '+41 44 364 35 32'
+        Phony.format('41443643532').should eql '+41 44 364 35 32'
       end
       # TODO
       #
       it 'should format swiss service numbers' do
-        Phony.format('41800112233').should == '+41 800 112 233'
+        Phony.format('41800112233').should eql '+41 800 112 233'
       end
       it 'should format austrian numbers' do
-        Phony.format('43198110').should == '+43 1 98110'
+        Phony.format('43198110').should eql '+43 1 98110'
       end
       it 'should format american numbers' do
-        Phony.format('18705551122').should == '+1 870 555 1122'
+        Phony.format('18705551122').should eql '+1 870 555 1122'
       end
       it 'should format New Zealand 021 mobile numbers' do
-        Phony.format('64211234567').should == '+64 21 123 4567'
+        Phony.format('64211234567').should eql '+64 21 123 4567'
       end
       it 'should format New Zealand landline numbers' do
-        Phony.format('6493791234').should == '+64 9 379 1234'
+        Phony.format('6493791234').should eql '+64 9 379 1234'
       end
       it 'should format Indian numbers' do
-        Phony.format('914433993939').should == '+91 44 339 93 939'
+        Phony.format('914433993939').should eql '+91 44 339 93 939'
       end
     end
     describe 'international' do
       it 'should format north american numbers' do
-        Phony.format('18091231234', :format => :international).should == '+1 809 123 1234'
+        Phony.format('18091231234', :format => :international).should eql '+1 809 123 1234'
       end
       it 'should format austrian numbers' do
-        Phony.format('43198110', :format => :international).should == '+43 1 98110'
+        Phony.format('43198110', :format => :international).should eql '+43 1 98110'
       end
       it 'should format austrian numbers' do
-        Phony.format('43198110', :format => :international_absolute).should == '+43 1 98110'
+        Phony.format('43198110', :format => :international_absolute).should eql '+43 1 98110'
       end
       it 'should format french numbers' do
-        Phony.format('33142278186', :format => :+).should == '+33 1 42 27 81 86'
+        Phony.format('33142278186', :format => :+).should eql '+33 1 42 27 81 86'
       end
       it 'should format austrian numbers' do
-        Phony.format('43198110', :format => :international_relative).should == '0043 1 98110'
+        Phony.format('43198110', :format => :international_relative).should eql '0043 1 98110'
       end
       it 'should format liechtensteiner numbers' do
-        Phony.format('4233841148', :format => :international_relative).should == '00423 384 11 48'
+        Phony.format('4233841148', :format => :international_relative).should eql '00423 384 11 48'
       end
       context 'with no spaces' do
         it 'should format north american numbers' do
-          Phony.format('18091231234', :format => :international, :spaces => '').should == '+18091231234'
+          Phony.format('18091231234', :format => :international, :spaces => '').should eql '+18091231234'
         end
         it 'should format austrian numbers' do
-          Phony.format('43198110', :format => :international, :spaces => '').should == '+43198110'
+          Phony.format('43198110', :format => :international, :spaces => '').should eql '+43198110'
         end
         it 'should format austrian numbers' do
-          Phony.format('43198110', :format => :international_absolute, :spaces => '').should == '+43198110'
+          Phony.format('43198110', :format => :international_absolute, :spaces => '').should eql '+43198110'
         end
         it 'should format french numbers' do
-          Phony.format('33142278186', :format => :+, :spaces => '').should == '+33142278186'
+          Phony.format('33142278186', :format => :+, :spaces => '').should eql '+33142278186'
         end
         it 'should format austrian numbers' do
-          Phony.format('43198110', :format => :international_relative, :spaces => '').should == '0043198110'
+          Phony.format('43198110', :format => :international_relative, :spaces => '').should eql '0043198110'
         end
         it 'should format liechtensteiner numbers' do
-          Phony.format('4233841148', :format => :international_relative, :spaces => '').should == '004233841148'
+          Phony.format('4233841148', :format => :international_relative, :spaces => '').should eql '004233841148'
         end
       end
       context 'with special spaces' do
         it 'should format swiss numbers' do
-          Phony.format('41443643532', :format => :international).should == '+41 44 364 35 32'
+          Phony.format('41443643532', :format => :international).should eql '+41 44 364 35 32'
         end
         it 'should format north american numbers' do
-          Phony.format('18091231234', :format => :international, :spaces => :-).should == '+1-809-123-1234'
+          Phony.format('18091231234', :format => :international, :spaces => :-).should eql '+1-809-123-1234'
         end
         it 'should format austrian numbers' do
-          Phony.format('43198110', :format => :international, :spaces => :-).should == '+43-1-98110'
+          Phony.format('43198110', :format => :international, :spaces => :-).should eql '+43-1-98110'
         end
         it 'should format austrian numbers' do
-          Phony.format('43198110', :format => :international_absolute, :spaces => :-).should == '+43-1-98110'
+          Phony.format('43198110', :format => :international_absolute, :spaces => :-).should eql '+43-1-98110'
         end
         it 'should format french numbers' do
-          Phony.format('33142278186', :format => :+, :spaces => :-).should == '+33-1-42-27-81-86'
+          Phony.format('33142278186', :format => :+, :spaces => :-).should eql '+33-1-42-27-81-86'
         end
         it 'should format austrian numbers' do
-          Phony.format('43198110', :format => :international_relative, :spaces => :-).should == '0043-1-98110'
+          Phony.format('43198110', :format => :international_relative, :spaces => :-).should eql '0043-1-98110'
         end
         it 'should format liechtensteiner numbers' do
-          Phony.format('4233841148', :format => :international_relative, :spaces => :-).should == '00423-384-11-48'
+          Phony.format('4233841148', :format => :international_relative, :spaces => :-).should eql '00423-384-11-48'
         end
       end
       describe "'unsupported' countries" do
         it 'should format as a single block' do
-          Phony.format('88132155605220').should == '+881 32155605220'
+          Phony.format('88132155605220').should eql '+881 32155605220'
         end
         it 'should format as a single block, regardless of format' do
-          Phony.format('8811819372205', :format => :international).should == '+881 1819372205'
+          Phony.format('8811819372205', :format => :international).should eql '+881 1819372205'
         end
         it 'should format as a single block, respecting custom spaces' do
-          Phony.format('8811819372205', :spaces => :-).should == '+881-1819372205'
+          Phony.format('8811819372205', :spaces => :-).should eql '+881-1819372205'
         end
         it 'should format as a single block, even without spaces' do
-          Phony.format('8811819372205', :spaces => '').should == '+8811819372205'
+          Phony.format('8811819372205', :spaces => '').should eql '+8811819372205'
         end
       end
     end
     describe 'national' do
       it 'should format swiss numbers' do
-        Phony.format('41443643532', :format => :national).should == '044 364 35 32'
+        Phony.format('41443643532', :format => :national).should eql '044 364 35 32'
       end
       # TODO
       #
       it 'should format swiss service numbers' do
-        Phony.format('41800112233', :format => :national).should == '0800 112 233'
+        Phony.format('41800112233', :format => :national).should eql '0800 112 233'
       end
       it 'should format austrian numbers' do
-        Phony.format('43198110', :format => :national).should == '01 98110'
+        Phony.format('43198110', :format => :national).should eql '01 98110'
       end
       it 'should format US numbers without a leading zero' do
-        Phony.format('14159224711', :format => :national).should == '415 922 4711'
+        Phony.format('14159224711', :format => :national).should eql '415 922 4711'
       end
     end
     describe 'local' do
       it 'should format swiss numbers' do
-        Phony.format('41443643532', :format => :local).should == '364 35 32'
+        Phony.format('41443643532', :format => :local).should eql '364 35 32'
       end
       it 'should format german numbers' do
-        Phony.format('493038625454', :format => :local).should == '386 25454'
+        Phony.format('493038625454', :format => :local).should eql '386 25454'
       end
     end
   end
@@ -244,7 +249,7 @@ describe Phony do
   context 'minimal cases' do
     context 'normalizing' do
       it "handles completely crazy 'numbers'" do
-        Phony.normalize('Hello, I am Cora, the 41th parrot, and 044 is my 364 times 35 funky number. 32.').should == '41443643532'
+        Phony.normalize('Hello, I am Cora, the 41th parrot, and 044 is my 364 times 35 funky number. 32.').should eql '41443643532'
       end
     end
     context 'splitting' do
@@ -256,32 +261,32 @@ describe Phony do
         end
       end
       it 'handles completely missing numbers well enough' do
-        Phony.split('4144').should == ['41', '44', '']
+        Phony.split('4144').should eql ['41', '44', '']
       end
       it 'handles a missing number part' do
-        Phony.split('4144364').should == ['41', '44', '364']
+        Phony.split('4144364').should eql ['41', '44', '364']
       end
       it 'handles a missing number part' do
-        Phony.split('414436435').should == ['41', '44', '364', '35']
+        Phony.split('414436435').should eql ['41', '44', '364', '35']
       end
     end
     context 'formatting' do
       it 'handles completely missing numbers well enough' do
-        Phony.format('4144').should == '+41 44 '
+        Phony.format('4144').should eql '+41 44 '
       end
       it 'handles a missing number part' do
-        Phony.format('4144364').should == '+41 44 364'
+        Phony.format('4144364').should eql '+41 44 364'
       end
       it 'handles a missing number part' do
-        Phony.format('414436435').should == '+41 44 364 35'
+        Phony.format('414436435').should eql '+41 44 364 35'
       end
     end
     context "'unsupported' countries" do
       it 'handles formatting' do
-        Phony.format('88132155605220').should == '+881 32155605220'
+        Phony.format('88132155605220').should eql '+881 32155605220'
       end
       it 'handles normalizing' do
-        Phony.normalize('+881-321 5560 5220').should == '88132155605220'
+        Phony.normalize('+881-321 5560 5220').should eql '88132155605220'
       end
     end
   end
@@ -336,11 +341,11 @@ describe Phony do
     end
 
     describe 'vanity_to_number' do
-      it {Phony.vanity_to_number('41800WEGGLI').should == '41800934454'}
-      it {Phony.vanity_to_number('41800weggli').should == '41800934454'}
-      # it {Phony.vanity_to_number('41800SUCCESSMATCH').should == '41800782237'} # Cut off according to the swiss norms.
-      it {Phony.vanity_to_number('41800SUCCESSMATCH').should == '41800782237762824'} # Allow for call-through numbers (>= 1.6.0)
-      it {Phony.vanity_to_number('4180BLA').should == '4180252'} # Does not check for validity of number.
+      it {Phony.vanity_to_number('41800WEGGLI').should eql '41800934454'}
+      it {Phony.vanity_to_number('41800weggli').should eql '41800934454'}
+      # it {Phony.vanity_to_number('41800SUCCESSMATCH').should eql '41800782237'} # Cut off according to the swiss norms.
+      it {Phony.vanity_to_number('41800SUCCESSMATCH').should eql '41800782237762824'} # Allow for call-through numbers (>= 1.6.0)
+      it {Phony.vanity_to_number('4180BLA').should eql '4180252'} # Does not check for validity of number.
     end
   end
 

metadata

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