rack-geo-locale 0.0.8 → 0.0.10

data/Gemfile.lock

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

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.0.10

data/lib/rack/geo_locale.rb

@@ -6,7 +6,7 @@ module Rack
     DATABASE = "tmp/geoip_database.dat"
 
     def initialize(app)
-      fetch_database
+      @geoip = fetch_database
 
       @app = app
     end
@@ -30,24 +30,27 @@ module Rack
     private
       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"]
+          if addr = env["REMOTE_ADDR"]
+            addr = env["HTTP_X_FORWARDED_FOR"] if env["HTTP_X_FORWARDED_FOR"]
+            addr = addr.split(",").first.strip
 
-            begin
-              result = geoip.country(remote_addr).country_code2
-            rescue Exception => e
-              puts "WARNING: .country raised an exception #{e}"
-            end
+            puts "INFO: Trying to lookup #{addr}"
+
+            result = @geoip.country(addr).country_code2
+
+            if result != "--"
+              puts "INFO: Found country for #{addr} #{result}"
 
-            return result if result != "--"
+              result
+            else
+              puts "INFO: Didn't find country for #{addr}"
+            end
           else
             puts "WARNING: Didn't find env['REMOTE_ADDR']"
           end
         else
           puts "WARNING: Didn't find geoip database."
         end
-
-        nil
       end
 
       def parse_locale(env)
@@ -65,7 +68,7 @@ module Rack
       end
 
       def database?
-        ::File.exist? DATABASE
+        @geoip != nil
       end
 
       def fetch_database
@@ -73,16 +76,12 @@ module Rack
           puts "-> Fetching #{ENV["GEOIP_DATABASE_URI"]}"
 
           `curl --silent -o #{DATABASE}.gz #{ENV["GEOIP_DATABASE_URI"]}`
-          `gunzip #{DATABASE}.gz`
-        else
-          puts "WARNING: Set the ENV['GEOIP_DATABASE_URI'] to the location of your .gz database file."
-        end
-      end
+          `gunzip -f #{DATABASE}.gz`
 
-      def geoip
-        if database?
           GeoIP.new(DATABASE)
         else
+          puts "WARNING: Set the ENV['GEOIP_DATABASE_URI'] to the location of your .gz database file."
+
           nil
         end
       end

data/spec/lib/rack/geo_locale_spec.rb

@@ -1,6 +1,6 @@
 require 'rack/test'
-require 'rack/geo_locale'
 require 'geoip'
+require 'rack/geo_locale'
 
 include Rack::Test::Methods
 
@@ -24,11 +24,21 @@ describe Rack::GeoLocale do
       last_request.env["locale.country"].should == nil
     end
 
+    it "should handle only passing a HTTP_X_FORWARDED_FOR field" do
+      get '/', {}, {"HTTP_X_FORWARDED_FOR" => "10.0.0.1"}
+      last_request.env["locale.country"].should == "SE"
+    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 handle several IP adresses in the REMOTE_ADDR field" do
+      get '/', {}, {"REMOTE_ADDR" => "10.0.0.1, 127.0.0.1"}
+      last_request.env["locale.country"].should == "SE"
+    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.8
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-05 00:00:00.000000000 Z
+date: 2012-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70227635909720 !ruby/object:Gem::Requirement
+  requirement: &70196899531500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70227635909720
+  version_requirements: *70196899531500
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70227635909260 !ruby/object:Gem::Requirement
+  requirement: &70196899502360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70227635909260
+  version_requirements: *70196899502360
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70227635908820 !ruby/object:Gem::Requirement
+  requirement: &70196899479180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70227635908820
+  version_requirements: *70196899479180
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70227635908320 !ruby/object:Gem::Requirement
+  requirement: &70196899415180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70227635908320
+  version_requirements: *70196899415180
 - !ruby/object:Gem::Dependency
   name: geoip
-  requirement: &70227635907640 !ruby/object:Gem::Requirement
+  requirement: &70196899414340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70227635907640
+  version_requirements: *70196899414340
 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.
@@ -81,6 +81,7 @@ files:
 - LICENSE
 - Readme.md
 - VERSION
+- fixtures/GeoIP.dat.gz
 - lib/rack/geo_locale.rb
 - rack-geo-locale.gemspec
 - spec/lib/rack/geo_locale_spec.rb