dialy 0.1.0 → 0.2.0

data/lib/dialy/formatter.rb

@@ -1,5 +1,5 @@
 module Dialy
-  def self.format_number(value)
+  def self.format(value)
     # Remove all but digits and +
     plain = value.gsub(/[^+0-9]/, '')
     
@@ -12,8 +12,11 @@ module Dialy
     if match = plain.match(/^(\+|00)(\d{1,3})/)
       plain.slice!(0,match[1].length)
       
+      # Because the length of a country code is not fixed, we have to do
+      # multiple searches. Start with the minimum length and go to the 
+      # maxium until an area code is found.
       (1..3).each do |len|
-        part = match[2][0,len]
+        part = match[2][0,len].to_i
         
         if COUNTRY_CODES.include?(part)
           country_code = part
@@ -22,7 +25,7 @@ module Dialy
         end
       end
       
-      raise ArgumentError("Unknown country code: #{match[2]}") unless country_code
+      raise ArgumentError.new("Unknown country code: #{match[2]}") unless country_code
     else
       country_code = Config[:default_country_code]
     end
@@ -33,8 +36,12 @@ module Dialy
     # Step 2: Find area code
     area_code = nil
     if AREA_CODES[country_code]
-      (2..5).each do |len|
-        part = plain[0,len]
+      
+      # Because the length of an area code is not fixed, we have to do
+      # multiple searches. Start with the minimum length and go to the 
+      # maxium until an area code is found.
+      AC_RANGE[country_code].each do |len|
+        part = plain[0,len].to_i
       
         if AREA_CODES[country_code].include?(part)
           area_code = part
@@ -43,7 +50,7 @@ module Dialy
         end
       end
       
-      raise ArgumentError("Area code not found") unless area_code
+      raise ArgumentError.new("Area code not found") unless area_code
     end
     
     # Finished. Build result

data/spec/dialy_spec.rb

@@ -2,100 +2,106 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Dialy" do
   it "should find area codes" do
-    Dialy::AREA_CODES['49'].should be_include('221')
-    Dialy::AREA_CODES['49'].should be_include('2233')
-    Dialy::AREA_CODES['49'].should be_include('2235')
-    Dialy::AREA_CODES['49'].should be_include('2406')
-    Dialy::AREA_CODES['49'].should be_include('30')
-    Dialy::AREA_CODES['49'].should be_include('241')
-    Dialy::AREA_CODES['49'].should be_include('39291')
-    Dialy::AREA_CODES['49'].should be_include('163')
+    Dialy::AREA_CODES[49].should be_include(221)
+    Dialy::AREA_CODES[49].should be_include(2233)
+    Dialy::AREA_CODES[49].should be_include(2235)
+    Dialy::AREA_CODES[49].should be_include(2406)
+    Dialy::AREA_CODES[49].should be_include(30)
+    Dialy::AREA_CODES[49].should be_include(241)
+    Dialy::AREA_CODES[49].should be_include(39291)
+    Dialy::AREA_CODES[49].should be_include(163)
     
-    Dialy::AREA_CODES['43'].should be_include('1')
+    Dialy::AREA_CODES[43].should be_include(1)
     
-    Dialy::AREA_CODES['41'].should be_include('44')
+    Dialy::AREA_CODES[41].should be_include(44)
+  end
+  
+  it "should calc min and max length" do
+    Dialy::AC_RANGE[41].should == (2..3)
+    Dialy::AC_RANGE[43].should == (1..4)
+    Dialy::AC_RANGE[49].should == (2..5)
   end
   
   describe "options" do
     it "should use default_country_code" do
-      Dialy::Config[:default_country_code] = '41'
-      Dialy.format_number('030-12345678').should == '+41 30 12345678'
+      Dialy::Config[:default_country_code] = 41
+      Dialy.format('030-12345678').should == '+41 30 12345678'
     end
   end
   
   describe "Germany" do
     before :each do
-      Dialy::Config[:default_country_code] = '49'
+      Dialy::Config[:default_country_code] = 49
       @expected = '+49 2406 12345678'
     end
     
     it "should format plain number" do
-      Dialy.format_number('02406-12345678').should == @expected
+      Dialy.format('02406-12345678').should == @expected
     end
     
     it "should format with +49" do
-      Dialy.format_number('+49240612345678').should == @expected
+      Dialy.format('+49240612345678').should == @expected
     end
     
     it "should format with +49(0)" do
-      Dialy.format_number('+49(0)2406-123456-78').should == @expected
+      Dialy.format('+49(0)2406-123456-78').should == @expected
     end
 
     it "should format with 0049" do
-      Dialy.format_number('0049240612345678').should == @expected
+      Dialy.format('0049240612345678').should == @expected
     end
     
     it "should format with missing 0" do
-      Dialy.format_number('240612345678').should == @expected
+      Dialy.format('240612345678').should == @expected
     end
   end
 
   describe "German mobile" do
     before :each do
-      Dialy::Config[:default_country_code] = '49'
+      Dialy::Config[:default_country_code] = 49
     end
     
     it "should format" do
-      Dialy.format_number('0163-1234567').should == '+49 163 1234567'
-      Dialy.format_number('0171-1234567').should == '+49 171 1234567'
+      Dialy.format('0163-1234567').should == '+49 163 1234567'
+      Dialy.format('0171-1234567').should == '+49 171 1234567'
     end
   end
   
-  describe "obsure input" do
+  describe "obscure input" do
     before :each do
-      Dialy::Config[:default_country_code] = '49'
+      Dialy::Config[:default_country_code] = 49
     end
     
     it "should format" do
-      Dialy.format_number('(+49) (08541) 123456').should == '+49 8541 123456'
-      Dialy.format_number('0 08 00-1 23 45 67').should == '+800 1234567'
-      Dialy.format_number('[0351] 1 23 45 6').should == '+49 351 123456'
+      Dialy.format('(+49) (08541) 123456').should == '+49 8541 123456'
+      Dialy.format('0 08 00-1 23 45 67').should == '+800 1234567'
+      Dialy.format('[0351] 1 23 45 6').should == '+49 351 123456'
     end
   end
   
   describe "Switzerland" do
     before :each do
-      Dialy::Config[:default_country_code] = '41'
+      Dialy::Config[:default_country_code] = 41
     end
     
     it "should format" do
-      Dialy.format_number('0041-71-123 45 67').should == '+41 71 1234567'
-      Dialy.format_number('71-123 45 67').should == '+41 71 1234567'
+      Dialy.format('0041-71-123 45 67').should == '+41 71 1234567'
+      Dialy.format('71-123 45 67').should == '+41 71 1234567'
     end
   end
   
   describe "Wrong formatting" do
     it "should fail with +" do
-      lambda { Dialy.format_number('++49') }.should raise_error(ArgumentError)
-      lambda { Dialy.format_number('0+49 221') }.should raise_error(ArgumentError)
+      lambda { Dialy.format('++49') }.should raise_error(ArgumentError)
+      lambda { Dialy.format('0+49 221') }.should raise_error(ArgumentError)
     end
     
     it "should fail for non existing area_code" do
-      lambda { Dialy.format_number('+49 2396 1234567') }.should raise_error
+      lambda { Dialy.format('+49 2396 1234567') }.should raise_error(ArgumentError)
     end
     
     it "should fail for non existing country_code" do
-      lambda { Dialy.format_number('+429 1234 1234567') }.should raise_error
+      lambda { Dialy.format('+429 1234 1234567') }.should raise_error(ArgumentError)
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dialy
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Georg Ledermann
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-09 00:00:00 +02:00
+date: 2010-09-10 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,6 +54,10 @@ files:
 - lib/dialy.rb
 - lib/dialy/config.rb
 - lib/dialy/data.rb
+- lib/dialy/data/at.rb
+- lib/dialy/data/ch.rb
+- lib/dialy/data/countries.rb
+- lib/dialy/data/de.rb
 - lib/dialy/formatter.rb
 - spec/dialy_spec.rb
 - spec/spec.opts