rack-geo-locale 0.0.2 → 0.0.3

data/Gemfile.lock

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

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/rack/geo_locale.rb

@@ -18,17 +18,15 @@ module Rack
 
     private
       def parse_country(env)
-        remote_addr = env["REMOTE_ADDR"]
-
-        return nil unless remote_addr
-
-        result = geoip.country(remote_addr).country_code2
+        if database?
+          if remote_addr = env["REMOTE_ADDR"]
+            result = geoip.country(remote_addr).country_code2
 
-        if result != "--"
-          result
-        else
-          nil
+            return result if result != "--"
+          end
         end
+
+        nil
       end
 
       def parse_locale(env)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-geo-locale
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70157091906880 !ruby/object:Gem::Requirement
+  requirement: &70266768450060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70157091906880
+  version_requirements: *70266768450060
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70157091905180 !ruby/object:Gem::Requirement
+  requirement: &70266768449520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70157091905180
+  version_requirements: *70266768449520
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70157091903000 !ruby/object:Gem::Requirement
+  requirement: &70266768449060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70157091903000
+  version_requirements: *70266768449060
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70157091900900 !ruby/object:Gem::Requirement
+  requirement: &70266768448540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70157091900900
+  version_requirements: *70266768448540
 - !ruby/object:Gem::Dependency
   name: geoip
-  requirement: &70157091899860 !ruby/object:Gem::Requirement
+  requirement: &70266768448120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70157091899860
+  version_requirements: *70266768448120
 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.