+ support for 1.8.7, proxy headers

niko · Jun 6, 2011 · 656015a · 656015a
1 parent cefe46c
commit 656015a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/lib/mm_geoip.rb b/lib/mm_geoip.rb
@@ -16,7 +16,7 @@ class NoIpGiven < StandardError; end
 
   def initialize(env)
     @env = env # may be a Rack @env or any hash containing initial data
-    @env[:ip] ||= @env["REMOTE_ADDR"] # :ip or "REMOTE_ADDR" should be present
+    @env[:ip] ||= @env["HTTP_X_REAL_IP"] || @env["HTTP_X_FORWARDED_FOR"] || @env["REMOTE_ADDR"]
 
     raise NoIpGiven.new unless @env[:ip]
 
@@ -60,7 +60,7 @@ def lookup
 
     return @lookup = {} unless looked_up_fields
 
-    @lookup = Hash[FIELDS.zip looked_up_fields]
+    @lookup = Hash[FIELDS.zip looked_up_fields.to_a]
     @lookup[:region_name] = region_name
     @lookup
   end

diff --git a/spec/mm_geoip_spec.rb b/spec/mm_geoip_spec.rb
@@ -32,6 +32,12 @@
     it "works with the IP as 'REMOTE_ADDR' field" do
       MMGeoip.new 'REMOTE_ADDR' => '134.34.3.2'
     end
+    it "works with the IP as 'HTTP_X_REAL_IP' field" do
+      MMGeoip.new 'HTTP_X_REAL_IP' => '134.34.3.2'
+    end
+    it "works with the IP as 'HTTP_X_FORWARDED_FOR' field" do
+      MMGeoip.new 'HTTP_X_FORWARDED_FOR' => '134.34.3.2'
+    end
     it "raises, if not :ip or 'REMOTE_ADDR' is given" do
       lambda{ MMGeoip.new :whatelse => 'something' }.should raise_error(MMGeoip::NoIpGiven)
     end