area 0.6.2 → 0.7.0

data/lib/area/array.rb

@@ -4,15 +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]
-          @area =  row[1]
+          return row[1]
         elsif options[:state]
-          @area = row[2]
+          return row[2]
         else
-          @area =row[1] + ', ' + row[2]
+          return row[1] + ', ' + row[2]
         end
       end
     end
-    @area || nil
+    nil
   end
 
   def to_zip
@@ -25,20 +25,20 @@ class Array
         db_lat = "%.#{db_lat_len}f" % row[3].to_f
         db_lon = "%.#{db_lon_len}f" % row[4].to_f
         if db_lat.to_s == lat.to_s and db_lon.to_s == lon.to_s
-          @zip = row[0]
+          return row[0]
         end
       end
     end
-    @zip || nil
+    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
-        @offset = row[5]
+        return row[5]
       end
     end
-    @offset || nil
+    nil
   end
 
 end

data/lib/area/integer.rb

@@ -3,40 +3,40 @@ class Integer
   def to_region(options = {})
     if self.to_s.length == 3 # an area code
       Area::AREA_CODES.each do |row|
-        @region = row.last if row.first == self.to_s
+        return row.last if row.first == self.to_s
       end
     else
       #  puts "not an area code"
     end
-    @region || nil
+    nil
   end
 
   def to_latlon
     Area::ZIP_CODES.each do |row|
-      @coordinates = row[3] + ', ' + row[4] if row.first == self.to_s
+      return row[3] + ', ' + row[4] if row.first == self.to_s
     end
-    @coordinates || nil
+    nil
   end
 
   def to_lat
     Area::ZIP_CODES.each do |row|
-      @lat = row[3] if row.first == self.to_s
+      return row[3] if row.first == self.to_s
     end
-    @lat || nil
+    nil
   end
 
   def to_lon
     Area::ZIP_CODES.each do |row|
-      @lon = row[4] if row.first == self.to_s
+      return row[4] if row.first == self.to_s
     end
-    @lon || nil
+    nil
   end
 
   def to_gmt_offset
     Area::ZIP_CODES.each do |row|
-      @offset = row[5] if row.first == self.to_s
+      return row[5] if row.first == self.to_s
     end
-    @offset || nil
+    nil
   end
 
 end

data/lib/area/string.rb

@@ -11,22 +11,22 @@ class String
   def to_region(options = {})
     if self.to_s.length == 3 # an area code
       Area::AREA_CODES.each do |row|
-        @region = row.last if row.first == self.to_s
+        return 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]
-            @region = row[1]
+            return row[1]
           elsif options[:state]
-            @region = row[2]
+            return row[2]
           else
-            @region = row[1] + ', ' + row[2]
+            return row[1] + ', ' + row[2]
           end
         end
       end
     end
-    @region || nil
+    nil
   end
 
   def to_zip
@@ -49,10 +49,10 @@ class String
 
   def to_gmt_offset
     Area::ZIP_CODES.each do |row|
-      @offset = row[5] if row[2] != nil and
+      return row[5] if row[2] != nil and
                           (row[2].upcase == self.to_s.upcase or row[0] == self.to_s)
     end
-    @offset || nil
+     nil
   end
 
 end

data/lib/area/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: area
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors: