phony 1.2.0 → 1.2.1

data/lib/phony/countries/all_other.rb

@@ -118,9 +118,11 @@ module Phony
           '84' => fixed(2), # TODO Viet Nam (Socialist Republic of)
           '86' => fixed(2), # TODO China (People's Republic of)
 
-          '90' => fixed(2), # TODO Turkey
+          '90' => fixed(3,  # Turkey, http://en.wikipedia.org/wiki/Telephone_numbers_in_Turkey
+                        :local_format => [3, 4] # Wiki says 7, but the examples say 3, 4.
+          ),
           '91' => fixed(2), # TODO India (Republic of)
-          '92' => fixed(2), # TODO Pakistan (Islamic Republic of)
+          '92' => fixed(2), # TODO Pakistan (Islamic Republic of), http://en.wikipedia.org/wiki/Telephone_numbers_in_Pakistan, NDC 2-5
           '93' => fixed(2,  # Afghanistan
                         :local_format => [7] # Actually, the document says 6, but the examples use 7.
           ), # http://www.wtng.info/wtng-93-af.html

data/lib/phony/countries/chile.rb

@@ -3,7 +3,7 @@
 # http://en.wikipedia.org/wiki/Telephone_numbers_in_Chile
 # http://www.wtng.info/wtng-56-cl.html
 #
-# TODO Totally unsure about this one, as I get contradicting infos.
+# Note: Totally unsure about this one, as I get contradicting infos (see links above).
 #      As usual, best effort.
 #
 Phony::Countries::Chile = Phony::Country.configured :local_format => [8],

data/lib/phony/countries/netherlands.rb

@@ -39,10 +39,10 @@ Phony::Countries::Netherlands = Phony::Country.configured :local_format => [8],
                                                                           '78', # Dordrecht
                                                                           '79', # Zoetermeer
                                                                          ],
-                                                            :mobile => [ # TODO Check.
+                                                            :mobile => [
                                                                         '6' # Mobiele nummers en Semafoondiensten
                                                                        ],
-                                                            :service => [ # TODO Check.
+                                                            :service => [
                                                                          '84',  # Persoonlijke-assistentdiensten, zoals voicemail en faxmail
                                                                          '85',  # Plaatsonafhankelijk netnummer
                                                                          '87',  # Both of the above.

data/lib/phony/country_codes.rb

@@ -26,9 +26,7 @@ module Phony
     def format_cc_ndc_local format, space, cc, ndc, *parts
       "#{format_cc_ndc(format, space, cc, ndc)}#{format_local(space, parts)}"
     end
-    # TODO = '' needed? Specs say no.
-    #
-    def format_cc_ndc format, space, cc, ndc = ''
+    def format_cc_ndc format, space, cc, ndc
       format, split_phone_number = case format
       when nil, :international_absolute, :international, :+
         [ndc.empty? ? '+%s%s' : '+%s%s%s%s', [cc, space, ndc, space]]
@@ -45,8 +43,6 @@ module Phony
       parts_ary.join space.to_s
     end
     
-    # TODO Speed these methods up.
-    #
     def service? number
       national_handler, cc, rest = split_cc number
       national_handler.service? rest
@@ -80,7 +76,7 @@ module Phony
         national_code_handler = mapping[i][presumed_cc]
         return [national_code_handler, presumed_cc, rest] if national_code_handler
       end
-      # TODO raise
+      # This line is never reached as CCs are in prefix code.
     end
     
     # Removes 0s from partially normalized numbers
@@ -88,6 +84,7 @@ module Phony
     # 
     # Example:
     #   410443643533 -> 41443643533
+    #
     def remove_relative_zeros! phone_number
       _, cc, rest = split_cc phone_number
       '%s%s' % [cc, rest].collect! { |code| code.gsub(/^0+/, '') }

data/spec/lib/phony/local_splitter_spec.rb

@@ -26,7 +26,7 @@ describe Phony::LocalSplitter do
         @splitter.split('3643532111').should == ['364','35','32']
       end
       it 'splits correctly even when the number is too short' do
-        @splitter.split('364353').should == ['364','35','3'] # TODO Redo correctly.
+        @splitter.split('364353').should == ['364','35','3']
       end
     end
     context "with format" do
@@ -40,7 +40,7 @@ describe Phony::LocalSplitter do
         @splitter.split('3643532111').should == ['364','35','32']
       end
       it 'splits correctly even when the number is too short' do
-        @splitter.split('364353').should == ['364','35','3'] # TODO Redo correctly.
+        @splitter.split('364353').should == ['364','35','3']
       end
     end
   end

data/spec/lib/phony_spec.rb

@@ -73,6 +73,9 @@ describe Phony do
     it "should handle swiss numbers" do
       Phony.split('41443643532').should == ['41', '44', '364', '35', '32']
     end
+    it 'handles turkish numbers' do
+      Phony.split('903121234567').should == ['90', '312', '123', '4567'] # Ankara
+    end
     it "should handle US numbers" do
       Phony.split('15551115511').should == ['1', '555', '111', '5511']
     end
@@ -229,6 +232,36 @@ describe Phony do
     end
   end
   
+  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'
+      end
+    end
+    context 'splitting' do
+      it 'handles completely missing numbers well enough' do
+        Phony.split('4144').should == ['41', '44', '']
+      end
+      it 'handles a missing number part' do
+        Phony.split('4144364').should == ['41', '44', '364']
+      end
+      it 'handles a missing number part' do
+        Phony.split('414436435').should == ['41', '44', '364', '35']
+      end
+    end
+    context 'formatting' do
+      it 'handles completely missing numbers well enough' do
+        Phony.formatted('4144').should == '+41 44 '
+      end
+      it 'handles a missing number part' do
+        Phony.formatted('4144364').should == '+41 44 364'
+      end
+      it 'handles a missing number part' do
+        Phony.formatted('414436435').should == '+41 44 364 35'
+      end
+    end
+  end
+  
   context "speed" do
     before(:each) do
       @phone_numbers = [
@@ -268,20 +301,6 @@ describe Phony do
     end
   end
   
-  # describe "service?" do
-  # 
-  # end
-  # describe "mobile?" do
-  #   # TODO Test dirty numbers.
-  #   #
-  #   it 'is correct' do
-  #     Phony.mobile?('49172123456').should == true
-  #   end
-  #   it 'is correct' do
-  #     Phony.mobile?('12172123456').should == false
-  #   end
-  # end
-  
   describe 'vanity' do
     describe 'vanity_number?' do
       it {Phony.vanity?('41800 WEGGLI').should be_true}

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 2
-  - 0
-  version: 1.2.0
+  - 1
+  version: 1.2.1
 platform: ruby
 authors: 
 - Florian Hanke