dialy 0.2.1 → 0.3.0

data/README.rdoc

@@ -9,17 +9,17 @@ Because the area codes in Germany, Austria and Switzerland have different length
 
 == Examples
 
-    Dialy.format('+49 (0221) 12 34 56')
+    Dialy::Number.new('+49 (0221) 12 34 56').to_s
     # => '+49 221 1234567'
     
-    Dialy.format('+49 (0)221 12 34 56')
+    Dialy::Number.new('+49 (0)221 12 34 56').to_s
     # => '+49 221 1234567'
     
-    Dialy.format('0049221123456')
+    Dialy::Number.new('0049221123456').to_s
     # => '+49 221 1234567'
 
     Dialy::Config[:default_country_code] = 49
-    Dialy.format('0221/123456')
+    Dialy::Number.new('0221/123456').to_s
     # => '+49 221 1234567'
 
 

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/dialy.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dialy}
-  s.version = "0.2.1"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Georg Ledermann"]
-  s.date = %q{2010-09-10}
+  s.date = %q{2010-10-05}
   s.description = %q{Knows all area codes from Germany, Austria and Switzerland}
   s.email = %q{mail@georg-ledermann.de}
   s.extra_rdoc_files = [

data/lib/dialy/formatter.rb

@@ -1,59 +1,74 @@
 module Dialy
-  def self.format(value)
-    # Remove all but digits and +
-    plain = value.gsub(/[^+0-9]/, '')
+  class UnknownCountryCode < ArgumentError; end
+  class UnknownAreaCode < ArgumentError; end
+  class WrongFormatting < ArgumentError; end
     
-    # Error check: Plus (+) is only allowed as first character
-    raise ArgumentError if plain.count('+') > 1
-    raise ArgumentError if plain.index('+').to_i > 0
-
-    # Step 1: Find country code
-    country_code = nil
-    if match = plain.match(/^(\+|00)(\d{1,3})/)
-      plain.slice!(0,match[1].length)
+  class Number  
+    def initialize(value)
+      raise ArgumentError unless value.is_a?(String)
       
-      # 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.
-      CC_RANGE.each do |len|
-        part = match[2][0,len].to_i
+      # Remove all but digits and +
+      @number = value.gsub(/[^+0-9]/, '')
+    
+      # Plus (+) is only allowed as first character
+      raise WrongFormatting if @number.count('+') > 1
+      raise WrongFormatting if @number.index('+').to_i > 0
+
+      # Main work
+      @country_code = extract_country_code! || Config[:default_country_code]
+      @area_code = extract_area_code!
+    end
+    
+    # String representation in E.123 format
+    def to_s
+      "+#{@country_code} #{[ @area_code, @number ].compact.join(' ')}"
+    end
+  
+  private
+    def extract_country_code!
+      if match = @number.match(/^(\+|00)(\d{1,3})/)
+        # 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.
+        CC_RANGE.each do |len|
+          part = match[2][0,len].to_i
         
-        if COUNTRY_CODES.include?(part)
-          country_code = part
-          plain.slice!(0,len)
-          break
+          if COUNTRY_CODES.include?(part)
+            # Remove "+" or leading "00"
+            @number.slice!(0,match[1].length)
+          
+            # Strip country code 
+            @number.slice!(0,part.to_s.length)
+          
+            return part
+          end
         end
-      end
       
-      raise ArgumentError.new("Unknown country code: #{match[2]}") unless country_code
-    else
-      country_code = Config[:default_country_code]
+        raise UnknownCountryCode.new("Unknown country code: #{match[2]}") 
+      end
     end
+  
+    def extract_area_code!
+      # Delete leading "0"
+      @number.slice!(0,1) if @number.match /^0/
     
-    # Delete leading "0"
-    plain.slice!(0,1) if plain.match /^0/
-
-    # Step 2: Find area code
-    area_code = nil
-    if AREA_CODES[country_code]
-      
-      # 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]
+        # 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 = @number[0,len].to_i
       
-        if AREA_CODES[country_code].include?(part)
-          area_code = part
-          plain.slice!(0,len)
-          break
+          if AREA_CODES[@country_code].include?(part)
+            # Strip area_code
+            @number.slice!(0,part.to_s.length)
+          
+            return part 
+          end
         end
-      end
       
-      raise ArgumentError.new("Area code not found") unless area_code
+        raise UnknownAreaCode.new('Unknown area code')
+      end
     end
-    
-    # Finished. Build result
-    "+#{country_code} #{[ area_code, plain ].compact.join(' ')}"
   end
 end

data/spec/dialy_spec.rb

@@ -26,7 +26,7 @@ describe "Dialy" do
   describe "options" do
     it "should use default_country_code" do
       Dialy::Config[:default_country_code] = 41
-      Dialy.format('030-12345678').should == '+41 30 12345678'
+      Dialy::Number.new('030-12345678').to_s.should == '+41 30 12345678'
     end
   end
   
@@ -37,23 +37,23 @@ describe "Dialy" do
     end
     
     it "should format plain number" do
-      Dialy.format('02406-12345678').should == @expected
+      Dialy::Number.new('02406-12345678').to_s.should == @expected
     end
     
     it "should format with +49" do
-      Dialy.format('+49240612345678').should == @expected
+      Dialy::Number.new('+49240612345678').to_s.should == @expected
     end
     
     it "should format with +49(0)" do
-      Dialy.format('+49(0)2406-123456-78').should == @expected
+      Dialy::Number.new('+49(0)2406-123456-78').to_s.should == @expected
     end
 
     it "should format with 0049" do
-      Dialy.format('0049240612345678').should == @expected
+      Dialy::Number.new('0049240612345678').to_s.should == @expected
     end
     
     it "should format with missing 0" do
-      Dialy.format('240612345678').should == @expected
+      Dialy::Number.new('240612345678').to_s.should == @expected
     end
   end
 
@@ -63,8 +63,8 @@ describe "Dialy" do
     end
     
     it "should format" do
-      Dialy.format('0163-1234567').should == '+49 163 1234567'
-      Dialy.format('0171-1234567').should == '+49 171 1234567'
+      Dialy::Number.new('0163-1234567').to_s.should == '+49 163 1234567'
+      Dialy::Number.new('0171-1234567').to_s.should == '+49 171 1234567'
     end
   end
   
@@ -74,9 +74,9 @@ describe "Dialy" do
     end
     
     it "should format" do
-      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'
+      Dialy::Number.new('(+49) (08541) 123456').to_s.should == '+49 8541 123456'
+      Dialy::Number.new('0 08 00-1 23 45 67').to_s.should == '+800 1234567'
+      Dialy::Number.new('[0351] 1 23 45 6').to_s.should == '+49 351 123456'
     end
   end
   
@@ -86,23 +86,27 @@ describe "Dialy" do
     end
     
     it "should format" do
-      Dialy.format('0041-71-123 45 67').should == '+41 71 1234567'
-      Dialy.format('71-123 45 67').should == '+41 71 1234567'
+      Dialy::Number.new('0041-71-123 45 67').to_s.should == '+41 71 1234567'
+      Dialy::Number.new('71-123 45 67').to_s.should == '+41 71 1234567'
     end
   end
   
   describe "Wrong formatting" do
     it "should fail with +" do
-      lambda { Dialy.format('++49') }.should raise_error(ArgumentError)
-      lambda { Dialy.format('0+49 221') }.should raise_error(ArgumentError)
+      lambda { Dialy::Number.new('++49') }.should raise_error(Dialy::WrongFormatting)
+      lambda { Dialy::Number.new('0+49 221') }.should raise_error(Dialy::WrongFormatting)
     end
     
     it "should fail for non existing area_code" do
-      lambda { Dialy.format('+49 2396 1234567') }.should raise_error(ArgumentError)
+      lambda { Dialy::Number.new('+49 2396 1234567') }.should raise_error(Dialy::UnknownAreaCode)
     end
     
-    it "should fail for non existing country_code" do
-      lambda { Dialy.format('+429 1234 1234567') }.should raise_error(ArgumentError)
+    it "should fail for non existing (+) country_code" do
+      lambda { Dialy::Number.new('+429 1234 1234567') }.should raise_error(Dialy::UnknownCountryCode)
+    end
+    
+    it "should fail for nun existing (00) country_code" do
+      lambda { Dialy::Number.new('003834-123456') }.should raise_error(Dialy::UnknownCountryCode)
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dialy
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Georg Ledermann
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-10 00:00:00 +02:00
+date: 2010-10-05 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency