msisdn 0.0.4 → 0.0.5

data/lib/msisdn.rb

@@ -2,7 +2,7 @@ $:.unshift(File.dirname(__FILE__)) unless
 $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module MsisdnGem
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end
 
 class Msisdn
@@ -11,6 +11,14 @@ class Msisdn
   INTERNATIONAL_COUNTRY_CODE = /^\+(1|2[1-689]\d|2[07]|3[0-469]|3[578]\d|4[0-13-9]|42\d|5[09]\d|5[1-8]|6[0-6]|6[7-9]\d|7|8[035789]\d|8[1246]|9[0-58]|9[679]\d)(\d+)/
   INTERNATIONAL_COUNTRY_CODE_NO_PREFIX =   /(1|2[1-689]\d|2[07]|3[0-469]|3[578]\d|4[0-13-9]|42\d|5[09]\d|5[1-8]|6[0-6]|6[7-9]\d|7|8[035789]\d|8[1246]|9[0-58]|9[679]\d)(\d+)/
   EXACTLY_10_DIGITS = /^(\d{10})$/
+  
+  # Some countries with trunk code requirement for local dialling
+  # See http://en.wikipedia.org/wiki/Telephone_numbering_plan
+  # TODO: Special case until I need another country which don't
+  # use trunk code and/or 10 digit number plan
+  SPECIAL_CASES = {
+    "995" => [9, '0']
+  }
 
   def initialize(msisdn, default_country_code = nil)
     msisdn.gsub!( /[\s()\-a-zA-Z]/, '')
@@ -49,7 +57,8 @@ class Msisdn
     if @msisdn =~ INTERNATIONAL_COUNTRY_CODE
       @country_code, @national_number = $1, $2
       unless @national_number =~ /^0/
-        @national_number = @national_number.rjust(10, '0')
+        params = SPECIAL_CASES[@country_code] || [10, '0']
+        @national_number = @national_number.rjust(*params)
       end
       match_local @national_number
     else
@@ -61,7 +70,8 @@ class Msisdn
     if @msisdn =~ INTERNATIONAL_COUNTRY_CODE_NO_PREFIX
       @country_code, @national_number = $1, $2
       unless @national_number =~ /^0/
-        @national_number = @national_number.rjust(10, '0')
+        params = SPECIAL_CASES[@country_code] || [10, '0']
+        @national_number = @national_number.rjust(*params)
       end
       match_local @national_number
     end

data/test/test_msisdn.rb

@@ -25,8 +25,8 @@ class MsisdnTest < Test::Unit::TestCase
   end
   
   def test_three_digit_international_code
-    msisdn = Msisdn.new('+995825559629')
-    assert_equal '995', msisdn.country_code
+    msisdn = Msisdn.new('+994825559629')
+    assert_equal '994', msisdn.country_code
     assert_equal '0825559629', msisdn.national_number
   end
   
@@ -51,6 +51,12 @@ class MsisdnTest < Test::Unit::TestCase
     assert_equal '79261234567', msisdn.international
   end
   
+  def test_georgian_international_number
+    msisdn = Msisdn.new('99577100060')
+    assert_equal '995', msisdn.country_code
+    assert_equal '077100060', msisdn.national_number
+  end
+  
   def test_valid_national_number
     msisdn = Msisdn.new '0825559629'
     assert msisdn.valid?

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: msisdn
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Armand du Plessis
@@ -9,19 +14,24 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-16 00:00:00 +02:00
+date: 2010-08-07 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.2
-    version: 
+        segments: 
+        - 2
+        - 6
+        - 1
+        version: 2.6.1
+  type: :development
+  version_requirements: *id001
 description: Basic msisdn processing and parsing
 email: 
 - armanddp@agilisto.com
@@ -58,21 +68,25 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: msisdn
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Basic msisdn processing and parsing