dialy 0.3.0 → 0.4.0

data/README.rdoc

@@ -21,6 +21,10 @@ Because the area codes in Germany, Austria and Switzerland have different length
     Dialy::Config[:default_country_code] = 49
     Dialy::Number.new('0221/123456').to_s
     # => '+49 221 1234567'
+    
+    # Display national number without country code
+    Dialy::Number.new('0221/123456').to_s(:short)
+    # => '(0221) 1234567'
 
 
 == Install

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/dialy.gemspec

@@ -1,53 +1,50 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{dialy}
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Georg Ledermann"]
-  s.date = %q{2010-10-05}
+  s.date = %q{2011-03-25}
   s.description = %q{Knows all area codes from Germany, Austria and Switzerland}
   s.email = %q{mail@georg-ledermann.de}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "dialy.gemspec",
-     "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",
-     "spec/spec_helper.rb"
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "dialy.gemspec",
+    "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",
+    "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/ledermann/dialy}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Formatting phone numbers in E.123}
   s.test_files = [
     "spec/dialy_spec.rb",
-     "spec/spec_helper.rb"
+    "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/dialy/formatter.rb

@@ -20,8 +20,19 @@ module Dialy
     end
     
     # String representation in E.123 format
-    def to_s
-      "+#{@country_code} #{[ @area_code, @number ].compact.join(' ')}"
+    def to_s(format=:international)
+      case format
+        when :international
+          "+#{@country_code} #{[ @area_code, @number ].compact.join(' ')}"
+        when :short
+          if @country_code == Config[:default_country_code]
+            "(0#{@area_code}) #{@number}"
+          else
+            to_s(:international)
+          end
+        else
+          raise ArgumentError
+      end
     end
   
   private

data/spec/dialy_spec.rb

@@ -55,6 +55,15 @@ describe "Dialy" do
     it "should format with missing 0" do
       Dialy::Number.new('240612345678').to_s.should == @expected
     end
+    
+    it "should format german number in short format" do
+      Dialy::Number.new('+49 2406 12345678').to_s(:short).should == '(02406) 12345678'
+    end
+    
+    it "should format number from other country always in long format" do
+      Dialy::Number.new('+41 71 1234567').to_s.should         == '+41 71 1234567'
+      Dialy::Number.new('+41 71 1234567').to_s(:short).should == '+41 71 1234567'
+    end
   end
 
   describe "German mobile" do

data/spec/spec_helper.rb

@@ -1,9 +1,3 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'dialy'
-require 'spec'
-require 'spec/autorun'
-
-Spec::Runner.configure do |config|
-  
-end
+require 'dialy'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dialy
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
+  hash: 15
+  prerelease: 
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Georg Ledermann
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-05 00:00:00 +02:00
+date: 2011-03-25 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,7 +45,6 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -67,8 +66,8 @@ homepage: http://github.com/ledermann/dialy
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -92,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Formatting phone numbers in E.123

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC