area 0.5.1 → 0.6.0

data/lib/area/integer.rb

@@ -7,18 +7,8 @@ class Integer
           return row.last
         end
       end
-    else # more than 3 digits, assume a zipcode
-      Area::ZIP_CODES.each do |row|
-        if row.first == self.to_s
-          if options[:city]
-            return row[1]
-          elsif options[:state]
-            return row[2]
-          else
-            return row[1] + ', ' + row[2]
-          end
-        end
-      end
+    else
+      # puts "not an area code"
     end
   end
 

data/lib/area/string.rb

@@ -1,4 +1,5 @@
 class String
+
   def to_area
     @area_codes = []
     Area::AREA_CODES.each do |row|
@@ -13,6 +14,28 @@ class String
     end
   end
 
+  def to_region(options = {})
+    if self.to_s.length == 3 # an area code
+      Area::AREA_CODES.each do |row|
+        if row.first == self.to_s
+          return row.last
+        end
+      end
+    else # more than 3 digits, assume a zipcode
+      Area::ZIP_CODES.each do |row|
+        if row.first == self.to_s
+          if options[:city]
+            return row[1]
+          elsif options[:state]
+            return row[2]
+          else
+            return row[1] + ', ' + row[2]
+          end
+        end
+      end
+    end
+  end
+
   def to_zip
     @zip_codes = []
 

data/lib/area/version.rb

@@ -1,3 +1,3 @@
 module Area
-  VERSION = "0.5.1"
+  VERSION = "0.6.0"
 end

data/test/unit/area_test.rb

@@ -2,20 +2,12 @@ require 'minitest/autorun'
 require 'area'
 
 class TestInteger < MiniTest::Unit::TestCase
-  
+
+
   def test_that_it_converts_area_code_to_region
     assert_equal "NY", 646.to_region    
   end
   
-  def test_that_it_converts_zip_code_to_region
-    assert_equal "Brooklyn, NY", 11211.to_region
-  end
-
-  def test_that_it_supports_options
-    assert_equal "Brooklyn", 11211.to_region(:city => true)
-    assert_equal "NY", 11211.to_region(:state => true)
-  end
-
   def test_that_it_converts_zip_code_to_latlon
     assert_equal "40.71209, -73.95427", 11211.to_latlon
   end
@@ -36,6 +28,19 @@ end
 
 class TestString < MiniTest::Unit::TestCase
 
+  def test_that_it_converts_area_code_to_region
+    assert_equal "NY", "646".to_region    
+  end
+  
+  def test_that_it_converts_zip_code_to_region
+    assert_equal "Brooklyn, NY", "11211".to_region
+  end
+
+  def test_that_it_supports_options
+    assert_equal "Brooklyn", "11211".to_region(:city => true)
+    assert_equal "NY", "11211".to_region(:state => true)
+  end
+
   def test_that_it_converts_to_area_code
     assert_equal "907", "AK".to_area
     assert_equal ["203", "860"], "CT".to_area

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: area
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-27 00:00:00.000000000 Z
+date: 2012-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastercsv