mm_geoip 0.0.2 → 0.0.3

data/lib/mm_geoip/version.rb

@@ -1,3 +1,3 @@
 class MMGeoip
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/lib/mm_geoip.rb

@@ -42,23 +42,27 @@ class MMGeoip
     # 
     # Here, we look for both forms and the plain version.
     # 
-    @env[field] || @env["GEOIP_#{field.upcase}"] || @env["X_GEOIP_#{field.upcase}"]
+    @env[field] || @env["GEOIP_#{field.to_s.upcase}"] || @env["X_GEOIP_#{field.to_s.upcase}"]
   end
   
   def region_name
-    MMGeoip::Regions[country_code.to_sym] && MMGeoip::Regions[country_code.to_sym][region]
+    country_code && MMGeoip::Regions[country_code.to_sym] && MMGeoip::Regions[country_code.to_sym][region]
   end
   
   def looked_up?
     !!@lookup
   end
   
-  def lookup                                                                                                                     
-    return @lookup if @lookup                                                                                                    
+  def lookup
+    return @lookup if @lookup
     
-    @lookup = Hash[FIELDS.zip @geodb.city(@env[:ip])]                                                                            
-    @lookup[:region_name] = region_name                                                                                          
-    @lookup                                                                                                                      
+    looked_up_fields = @geodb.city @env[:ip]
+    
+    return @lookup = {} unless looked_up_fields
+    
+    @lookup = Hash[FIELDS.zip looked_up_fields]
+    @lookup[:region_name] = region_name
+    @lookup
   end
   
   def self.data_path

metadata

@@ -2,7 +2,7 @@
 name: mm_geoip
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Niko Dittmann
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-04 00:00:00 Z
+date: 2011-06-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: geoip