rack-geo-locale 0.0.5 → 0.0.6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rack-geo-locale (0.0.5)
+    rack-geo-locale (0.0.6)
       geoip
       rack
 

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/lib/rack/geo_locale.rb

@@ -25,9 +25,13 @@ module Rack
       def parse_country(env)
         if database?
           if remote_addr = env["REMOTE_ADDR"]
+            remote_addr = env["HTTP_X_FORWARDED_FOR"] if env["HTTP_X_FORWARDED_FOR"]
+
             result = geoip.country(remote_addr).country_code2
 
             return result if result != "--"
+          else
+            puts "WARNING: Didn't find env['REMOTE_ADDR']"
           end
         else
           puts "WARNING: Didn't find geoip database."

data/spec/lib/rack/geo_locale_spec.rb

@@ -24,6 +24,11 @@ describe Rack::GeoLocale do
       last_request.env["locale.country"].should == nil
     end
 
+    it "should take HTTP_X_FORWARDED_FOR before REMOTE_ADDR field" do
+      get '/', {}, {"REMOTE_ADDR" => "10.0.0.1", "HTTP_X_FORWARDED_FOR" => "10.0.0.2"}
+      last_request.env["locale.country"].should == "US"
+    end
+
     it "should resolve 10.0.0.1 to SE" do
       get '/', {}, {"REMOTE_ADDR" => "10.0.0.1"}
       last_request.env["locale.country"].should == "SE"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-geo-locale
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70252809903700 !ruby/object:Gem::Requirement
+  requirement: &70266244150660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70252809903700
+  version_requirements: *70266244150660
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70252809903240 !ruby/object:Gem::Requirement
+  requirement: &70266244149120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70252809903240
+  version_requirements: *70266244149120
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70252809902800 !ruby/object:Gem::Requirement
+  requirement: &70266244148240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70252809902800
+  version_requirements: *70266244148240
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70252809902300 !ruby/object:Gem::Requirement
+  requirement: &70266244147720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70252809902300
+  version_requirements: *70266244147720
 - !ruby/object:Gem::Dependency
   name: geoip
-  requirement: &70252809901620 !ruby/object:Gem::Requirement
+  requirement: &70266244147160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70252809901620
+  version_requirements: *70266244147160
 description: Simple Rack middleware for setting the locale.country via GeoIP using
   the MaxMind GeoIP database, and setting the locale.languages based on the HTTP_ACCEPT_LANGUAGE
   header.