as_dialed_from 0.2.0 → 0.2.1

data/README.md

@@ -3,11 +3,17 @@
 Figure out how a number should be dialed from another country.
 A fork of a port of Google's libphonenumber.
 
+## Warning
+
+Not all country combinations work correctly. Contributions welcome.
+
 ## Examples
 
 as_dialed_from prototypes the String class with an `as_dialed_from` method.
 
 ```rb
+require 'as_dialed_from'
+
 "+12155551212".as_dialed_from "US"
  => "12155551212"
 

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/as_dialed_from.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{as_dialed_from}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Campbell"]
-  s.date = %q{2011-07-21}
+  s.date = %q{2011-08-04}
   s.description = %q{Figure out how a number should be dialed from another country. A fork of a port of Google's libphonenumber.}
   s.email = %q{jcampbell@movitas.com}
   s.extra_rdoc_files = [

data/lib/as_dialed_from/number.rb

@@ -17,7 +17,7 @@ module AsDialedFrom
     end
     
     def as_dialed_from(from_country)
-      from_country = determine_country_code(from_country) if from_country.size > 3
+      from_country = self.class.determine_country_code(from_country) if from_country.size > 3
       
       # Convert numeric country code to region id
       from_country = Metadata.country_code_to_region[from_country.to_s][0] if from_country.is_a? Integer or from_country.to_i.nonzero?
@@ -30,15 +30,25 @@ module AsDialedFrom
         "#{leading_zero}#{metadata[:national_prefix]}#{national_number}"
       else
         # If we're calling out of country, we need to dial the exit code and the destination country code before the number
-        "#{exit_code(from_metadata[:international_prefix])}#{country_code}#{leading_zero}#{national_number}"
+        "#{self.class.exit_code(from_metadata[:international_prefix])}#{country_code}#{leading_zero}#{national_number}"
       end
     end
     
     def country_code
-      @country_code ||= determine_country_code(@number)
+      @country_code ||= self.class.determine_country_code(@number)
     end
     
-    def determine_country_code(number)
+    def national_number
+      @number.gsub /^(\+)?(#{country_code})/, ""
+    end
+    
+    def leading_zero
+      "0" if metadata[:leading_zero_possible]
+    end
+    
+    private
+    
+    def self.determine_country_code(number)
       number = number.to_s
       
       number.delete! "+"
@@ -54,7 +64,7 @@ module AsDialedFrom
       raise "No valid country code was present"
     end
     
-    def exit_code(international_prefix)
+    def self.exit_code(international_prefix)
       international_prefix.delete("[]").match international_prefix
     end
     
@@ -64,18 +74,6 @@ module AsDialedFrom
       @metadata
     end
     
-    def national_number
-      @national_number ||= determine_national_number
-    end
-    
-    def determine_national_number
-      @number.gsub /^(\+)?(#{country_code})/, ""
-    end
-    
-    def leading_zero
-      "0" if metadata[:leading_zero_possible]
-    end
-    
   end
   
 end

data/test/as_dialed_from/number_test.rb

@@ -48,18 +48,26 @@ class Number < Test::Unit::TestCase
   end
   
   test "should return national number" do
-    assert_equal "6502530000", AsDialedFrom::Number.new(US_NUMBER).national_number
+    assert_equal "6502530000", AsDialedFrom::Number.new(US_NUMBER).send(:national_number)
   end
   
   test "should return a number to dial using as_dialed_from" do
+    # Intra-country calls
     assert_equal "16502530000", AsDialedFrom::Number.new(US_NUMBER).as_dialed_from("US")
+    assert_equal "013312345678", AsDialedFrom::Number.new(MX_NUMBER1).as_dialed_from("MX")
     
+    # MX cell numbers
+    assert_equal "0112345678900", AsDialedFrom::Number.new(MX_MOBILE1).as_dialed_from("MX")
+    assert_equal "0115212345678900", AsDialedFrom::Number.new(MX_MOBILE1).as_dialed_from("US")
+    
+    # US <-> MX
     assert_equal "0016502530000", AsDialedFrom::Number.new(US_NUMBER).as_dialed_from("MX")
     assert_equal "011523312345678", AsDialedFrom::Number.new(MX_NUMBER1).as_dialed_from("US")
     
     assert_equal "0019002530000", AsDialedFrom::Number.new(US_PREMIUM).as_dialed_from("DE")
     # assert_equal "16502530000", AsDialedFrom::Number.new(US_NUMBER).as_dialed_from("BS")
-    # assert_equal "0~016502530000", AsDialedFrom::Number.new(US_NUMBER).as_dialed_from("PL")
+    assert_equal "0016502530000", AsDialedFrom::Number.new(US_NUMBER).as_dialed_from("PL")
+    assert_equal "8~1016502530000", AsDialedFrom::Number.new(US_NUMBER).as_dialed_from("RU")
     assert_equal "011447912345678", AsDialedFrom::Number.new(GB_MOBILE).as_dialed_from("US")
     assert_equal "00491234", AsDialedFrom::Number.new(DE_SHORT_NUMBER).as_dialed_from("GB")
     

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: as_dialed_from
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Justin Campbell
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-21 00:00:00 -04:00
+date: 2011-08-04 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency