area 0.6.0 → 0.6.1

data/lib/area/array.rb

@@ -4,14 +4,15 @@ class Array
     Area::ZIP_CODES.each do |row|
       if row[3] == self[0].to_s and row[4] == self[1].to_s
         if options[:city]
-          return row[1]
+          @area =  row[1]
         elsif options[:state]
-          return row[2]
+          @area = row[2]
         else
-          return row[1] + ', ' + row[2]
+          @area =row[1] + ', ' + row[2]
         end
       end
     end
+    @area || nil
   end
 
   def to_zip
@@ -34,8 +35,10 @@ class Array
   def to_gmt_offset
     Area::ZIP_CODES.each do |row|
       if row[3] == self[0].to_s and row[4] == self[1].to_s
-        return row[5]
+        @offset = row[5]
       end
     end
+    @offset || nil
   end
+
 end

data/lib/area/integer.rb

@@ -3,45 +3,40 @@ class Integer
   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
+        @region = row.last if row.first == self.to_s
       end
     else
-      # puts "not an area code"
+      #  puts "not an area code"
     end
+    @region || nil
   end
 
   def to_latlon
     Area::ZIP_CODES.each do |row|
-      if row.first == self.to_s
-        return row[3] + ', ' + row[4]
-      end
+      @coordinates = row[3] + ', ' + row[4] if row.first == self.to_s
     end
+    @coordinates || nil
   end
 
   def to_lat
     Area::ZIP_CODES.each do |row|
-      if row.first == self.to_s
-        return row[3]
-      end
+      @lat = row[3] if row.first == self.to_s
     end
+    @lat || nil
   end
 
   def to_lon
     Area::ZIP_CODES.each do |row|
-      if row.first == self.to_s
-        return row[4]
-      end
+      @lon = row[4] if row.first == self.to_s
     end
+    @lon || nil
   end
 
   def to_gmt_offset
     Area::ZIP_CODES.each do |row|
-      if row.first == self.to_s
-        return row[5]
-      end
+      @offset = row[5] if row.first == self.to_s
     end
+    @offset || nil
   end
 
 end

data/lib/area/string.rb

@@ -3,37 +3,30 @@ class String
   def to_area
     @area_codes = []
     Area::AREA_CODES.each do |row|
-      if row[1].upcase == self        
-        @area_codes.push(row.first)
-      end
-    end
-    if @area_codes.length == 1
-      return @area_codes.first
-    else
-      return @area_codes
+      @area_codes.push(row.first) if row[1].upcase == self
     end
+    @area_codes.length == 1 ? @area_codes.first : @area_codes
   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
+        @region = row.last if row.first == self.to_s
       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]
+            @region = row[1]
           elsif options[:state]
-            return row[2]
+            @region = row[2]
           else
-            return row[1] + ', ' + row[2]
+            @region = row[1] + ', ' + row[2]
           end
         end
       end
     end
+    @region || nil
   end
 
   def to_zip
@@ -44,30 +37,21 @@ class String
       @area.collect! { |a| a.strip }
 
       Area::ZIP_CODES.each do |row|
-        if row[1] && row[1].downcase == @area[0].downcase && row[2].downcase == @area[1].downcase
-          @zip_codes.push(row[0])
-        end
+        @zip_codes.push(row[0]) if row[1] && row[1].downcase == @area[0].downcase and row[2].downcase == @area[1].downcase
       end
     else
       Area::ZIP_CODES.each do |row|
-        if row[1] and row[1].downcase == self.downcase
-          @zip_codes.push(row[0])
-        end
+        @zip_codes.push(row[0]) if row[1] and row[1].downcase == self.downcase
       end
     end
-
-    if @zip_codes.length == 1
-      return @zip_codes.first
-    else
-      return @zip_codes
-    end
+    @zip_codes.length == 1 ? @zip_codes.first : @zip_codes
   end
 
   def to_gmt_offset
     Area::ZIP_CODES.each do |row|
-      if row[2].upcase == self.to_s.upcase
-        return row[5]
-      end      
+      @offset = row[5] if row[2] != nil and row[2].upcase == self.to_s.upcase
     end
+    @offset || nil
   end
+
 end

data/lib/area/version.rb

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

data/test/unit/area_test.rb

@@ -5,9 +5,9 @@ class TestInteger < MiniTest::Unit::TestCase
 
 
   def test_that_it_converts_area_code_to_region
-    assert_equal "NY", 646.to_region    
+    assert_equal "NY", 646.to_region
   end
-  
+
   def test_that_it_converts_zip_code_to_latlon
     assert_equal "40.71209, -73.95427", 11211.to_latlon
   end
@@ -24,14 +24,22 @@ class TestInteger < MiniTest::Unit::TestCase
     assert_equal "-5", 11211.to_gmt_offset
   end
 
+  def test_that_it_handles_bad_area_codes
+    assert_nil(1234.to_region)
+    assert_nil(1234.to_latlon)
+    assert_nil(1234.to_lat)
+    assert_nil(1234.to_lon)
+    assert_nil(1234.to_gmt_offset)
+  end
+
 end
 
 class TestString < MiniTest::Unit::TestCase
 
   def test_that_it_converts_area_code_to_region
-    assert_equal "NY", "646".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
@@ -59,6 +67,13 @@ class TestString < MiniTest::Unit::TestCase
     assert_equal "-5", "ny".to_gmt_offset
   end
 
+  def test_that_it_handles_incorrect_zips
+    assert_equal [], "9888".to_zip
+    assert_nil "9888".to_region
+    assert_equal [], "9888".to_area
+    assert_nil "9888".to_gmt_offset
+  end
+
 end
 
 class TestArray < MiniTest::Unit::TestCase
@@ -83,4 +98,10 @@ class TestArray < MiniTest::Unit::TestCase
     assert_equal "11211", [40.71209123228157, -73.95488409019887].to_zip
   end
 
+  def test_that_it_handles_incorrect_values
+    assert_nil [12.12345, -40.23423].to_zip
+    assert_nil [12.12345, -40.23423].to_region
+    assert_nil [12.12345, -40.23423].to_gmt_offset
+  end
+
 end

metadata

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