area 0.7.0 → 0.8.0

data/lib/area.rb

@@ -14,12 +14,37 @@ module Area
   zip_path = File.open(File.join(File.dirname(__FILE__), '..', 'data', 'zipcodes.csv'))
   area_path = File.open(File.join(File.dirname(__FILE__), '..', 'data', 'areacodes.csv'))
 
-  # there is probably a better way to do this...
+    # there is probably a better way to do this...
   if RUBY_VERSION.to_f >= 1.9
-    AREA_CODES = CSV.read(area_path)
-    ZIP_CODES = CSV.read(zip_path)
+    @area_codes = CSV.read(area_path)
+    @zip_codes = CSV.read(zip_path)
   else
-    AREA_CODES = FasterCSV.parse(area_path)
-    ZIP_CODES = FasterCSV.parse(zip_path)
+    @area_codes = FasterCSV.parse(area_path)
+    @zip_codes = FasterCSV.parse(zip_path)
   end
+
+  def self.area_codes
+    @area_codes
+  end
+
+  def self.zip_codes
+    @zip_codes
+  end
+
+  def self.code?(code)
+    if code.to_s.length == 3
+      return code
+    else
+      raise ArgumentError, "You must provide a valid area code", caller
+    end
+  end
+
+  def self.code_or_zip?(code)
+    if code.to_s.length == 3 or code.to_s.length == 5
+      return code
+    else
+      raise ArgumentError, "You must provide a valid area or zip code", caller
+    end
+  end
+
 end

data/lib/area/array.rb

@@ -1,22 +1,19 @@
 class Array
 
   def to_region(options = {})
-    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]
-        elsif options[:state]
-          return row[2]
-        else
-          return row[1] + ', ' + row[2]
-        end
+    if row = Area.zip_codes.find {|row| row[3] == self[0].to_s and row[4] == self[1].to_s }
+      if options[:city]
+        return row[1]
+      elsif options[:state]
+        return row[2]
+      else
+        return row[1] + ', ' + row[2]
       end
     end
-    nil
   end
 
   def to_zip
-    Area::ZIP_CODES.each do |row|
+    Area.zip_codes.find do |row|
       if row[3] and row[4]
         db_lat_len = row[3].split('.').length
         db_lon_len = row[4].split('.').length
@@ -29,16 +26,11 @@ class Array
         end
       end
     end
-    nil
   end
 
   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]
-      end
-    end
-    nil
+    row = Area.zip_codes.find {|row| row[3] == self[0].to_s and row[4] == self[1].to_s }
+    row[5] if row
   end
 
 end

data/lib/area/integer.rb

@@ -1,42 +1,38 @@
 class Integer
 
   def to_region(options = {})
-    if self.to_s.length == 3 # an area code
-      Area::AREA_CODES.each do |row|
-        return row.last if row.first == self.to_s
-      end
-    else
-      #  puts "not an area code"
+    if Area.code?(self) # presume an area code
+      row = Area.area_codes.find{|row| row.first == self.to_s }
+      row.last if row
     end
-    nil
   end
 
   def to_latlon
-    Area::ZIP_CODES.each do |row|
-      return row[3] + ', ' + row[4] if row.first == self.to_s
+    if Area.code_or_zip?(self)
+      row = Area.zip_codes.find {|row| row.first == self.to_s }
+      row[3] + ', ' + row[4] if row
     end
-    nil
   end
 
   def to_lat
-    Area::ZIP_CODES.each do |row|
-      return row[3] if row.first == self.to_s
+    if Area.code_or_zip?(self)
+      row = Area.zip_codes.find {|row| row.first == self.to_s }
+      row[3] if row
     end
-    nil
   end
 
   def to_lon
-    Area::ZIP_CODES.each do |row|
-      return row[4] if row.first == self.to_s
+    if Area.code_or_zip?(self)
+      row = Area.zip_codes.find {|row| row.first == self.to_s }
+      row[4] if row
     end
-    nil
   end
 
   def to_gmt_offset
-    Area::ZIP_CODES.each do |row|
-      return row[5] if row.first == self.to_s
+    if Area.code_or_zip?(self)
+      row = Area.zip_codes.find {|row| row.first == self.to_s }
+      row[5] if row
     end
-    nil
   end
 
 end

data/lib/area/string.rb

@@ -1,20 +1,16 @@
 class String
 
   def to_area
-    @area_codes = []
-    Area::AREA_CODES.each do |row|
-      @area_codes.push(row.first) if row[1].upcase == self
-    end
+    @area_codes = Area.area_codes.find_all {|row| row[1].upcase == self }.map {|a| a.first }
     @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|
-        return row.last if row.first == self.to_s
-      end
-    else # more than 3 digits, assume a zipcode
-      Area::ZIP_CODES.each do |row|
+      row = Area.area_codes.find {|row| row.first == self.to_s }
+      return row.last if row
+    elsif self.to_s.length == 5
+      if row = Area.zip_codes.find {|row| row.first == self.to_s }
         if row.first == self.to_s
           if options[:city]
             return row[1]
@@ -25,34 +21,26 @@ class String
           end
         end
       end
+    else
+      raise ArgumentError, "You must provide a valid area or zip code", caller
     end
-    nil
   end
 
   def to_zip
-    @zip_codes = []
-
     if self.match(',')
       @area = self.split(',')
       @area.collect! { |a| a.strip }
 
-      Area::ZIP_CODES.each do |row|
-        @zip_codes.push(row[0]) if row[1] && row[1].downcase == @area[0].downcase and row[2].downcase == @area[1].downcase
-      end
+      @zip_codes = Area.zip_codes.find_all {|row| row[1] && row[1].downcase == @area[0].downcase and row[2].downcase == @area[1].downcase }.map {|a| a.first }
     else
-      Area::ZIP_CODES.each do |row|
-        @zip_codes.push(row[0]) if row[1] and row[1].downcase == self.downcase
-      end
+      @zip_codes = Area.zip_codes.find_all {|row| row[1] != nil and row[1].downcase == self.downcase }.map {|a| a.first }
     end
     @zip_codes.length == 1 ? @zip_codes.first : @zip_codes
   end
 
   def to_gmt_offset
-    Area::ZIP_CODES.each do |row|
-      return row[5] if row[2] != nil and
-                          (row[2].upcase == self.to_s.upcase or row[0] == self.to_s)
-    end
-     nil
+    row = Area.zip_codes.find {|row| row[2] != nil and (row[2].upcase == self.to_s.upcase or row[0] == self.to_s) }
+    row[5] if row
   end
 
 end

data/lib/area/version.rb

@@ -1,3 +1,3 @@
 module Area
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

data/test/unit/area_test.rb

@@ -3,7 +3,6 @@ require 'area'
 
 class TestInteger < MiniTest::Unit::TestCase
 
-
   def test_that_it_converts_area_code_to_region
     assert_equal "NY", 646.to_region
   end
@@ -29,11 +28,11 @@ class TestInteger < MiniTest::Unit::TestCase
   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)
+    assert_raises(ArgumentError) { 1234.to_region }
+    assert_raises(ArgumentError) { 1234.to_latlon }
+    assert_raises(ArgumentError) { 1234.to_lat }
+    assert_raises(ArgumentError) { 1234.to_lon }
+    assert_raises(ArgumentError) { 1234.to_gmt_offset }
   end
 
 end
@@ -73,7 +72,7 @@ class TestString < MiniTest::Unit::TestCase
 
   def test_that_it_handles_incorrect_zips
     assert_equal [], "9888".to_zip
-    assert_nil "9888".to_region
+    assert_raises(ArgumentError) { "9888".to_region }
     assert_equal [], "9888".to_area
     assert_nil "9888".to_gmt_offset
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: area
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-27 00:00:00.000000000 Z
+date: 2013-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastercsv