as_dialed_from 0.1.4 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.2.0

data/as_dialed_from.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{as_dialed_from}
-  s.version = "0.1.4"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Campbell"]

data/lib/as_dialed_from/number.rb

@@ -17,8 +17,10 @@ module AsDialedFrom
     end
     
     def as_dialed_from(from_country)
+      from_country = 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][0] if from_country.is_a? Integer or from_country.to_i.nonzero?
+      from_country = Metadata.country_code_to_region[from_country.to_s][0] if from_country.is_a? Integer or from_country.to_i.nonzero?
       
       from_metadata = Metadata.for_region(from_country)
       raise "Could not find valid metadata for from_country" unless from_metadata
@@ -33,16 +35,18 @@ module AsDialedFrom
     end
     
     def country_code
-      @country_code ||= determine_country_code
+      @country_code ||= determine_country_code(@number)
     end
     
-    def determine_country_code
-      raise "+<country_code> is required at the beginning of the number" unless @number[0,1] == "+"
+    def determine_country_code(number)
+      number = number.to_s
+      
+      number.delete! "+"
       
       # Test the leading digits to find a valid country_code
       # Country codes are not ambiguous (ex. 1 is valid, and there is no 1X or 1XX)
       (1..3).each do |length|
-        possible_country_code = @number[1,length]
+        possible_country_code = number[0,length]
         
         return possible_country_code if Metadata.country_code_to_region[possible_country_code]
       end
@@ -65,9 +69,7 @@ module AsDialedFrom
     end
     
     def determine_national_number
-      n = @number.gsub "+#{country_code}", ""
-      n.match metadata[:national_number_format] if metadata[:national_number_format]
-      n
+      @number.gsub /^(\+)?(#{country_code})/, ""
     end
     
     def leading_zero

data/test/as_dialed_from/number_test.rb

@@ -37,10 +37,6 @@ class Number < Test::Unit::TestCase
     assert AsDialedFrom::Number.new US_NUMBER
   end
   
-  test "should raise an error when no + is passed" do
-    assert_raise(RuntimeError) { AsDialedFrom::Number.new "12155551212" }
-  end
-  
   test "should determine country code from string" do
     assert_equal "1",  AsDialedFrom::Number.new(US_NUMBER ).country_code
     assert_equal "52", AsDialedFrom::Number.new(MX_NUMBER1).country_code
@@ -75,4 +71,17 @@ class Number < Test::Unit::TestCase
     assert_equal "0115491187654321", AsDialedFrom::Number.new(AR_MOBILE).as_dialed_from("US")
   end
   
+  test "as_dialed_from should accept a country code string as input" do
+    assert_equal "16502530000", AsDialedFrom::Number.new(US_NUMBER).as_dialed_from("1")
+  end
+  
+  test "as_dialed_from should accept a country code integer as input" do
+    assert_equal "16502530000", AsDialedFrom::Number.new(US_NUMBER).as_dialed_from(1)
+  end
+  
+  test "as_dialed_from should accept a caller id number as input" do
+    assert_equal "16502530000", AsDialedFrom::Number.new(US_NUMBER).as_dialed_from(US_NUMBER)
+    assert_equal "0016502530000", AsDialedFrom::Number.new(US_NUMBER).as_dialed_from(MX_NUMBER1)
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: as_dialed_from
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 4
-  version: 0.1.4
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Justin Campbell