rack-geo-locale 0.0.5 → 0.0.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. data/Gemfile.lock +1 -1
  2. data/VERSION +1 -1
  3. data/lib/rack/geo_locale.rb +4 -0
  4. data/spec/lib/rack/geo_locale_spec.rb +5 -0
  5. metadata +11 -11
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- rack-geo-locale (0.0.5)
4
+ rack-geo-locale (0.0.6)
5
5
  geoip
6
6
  rack
7
7
 
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.0.5
1
+ 0.0.6
data/lib/rack/geo_locale.rb CHANGED
@@ -25,9 +25,13 @@ module Rack
25
25
  def parse_country(env)
26
26
  if database?
27
27
  if remote_addr = env["REMOTE_ADDR"]
28
+ remote_addr = env["HTTP_X_FORWARDED_FOR"] if env["HTTP_X_FORWARDED_FOR"]
29
+
28
30
  result = geoip.country(remote_addr).country_code2
29
31
 
30
32
  return result if result != "--"
33
+ else
34
+ puts "WARNING: Didn't find env['REMOTE_ADDR']"
31
35
  end
32
36
  else
33
37
  puts "WARNING: Didn't find geoip database."
data/spec/lib/rack/geo_locale_spec.rb CHANGED
@@ -24,6 +24,11 @@ describe Rack::GeoLocale do
24
24
  last_request.env["locale.country"].should == nil
25
25
  end
26
26
 
27
+ it "should take HTTP_X_FORWARDED_FOR before REMOTE_ADDR field" do
28
+ get '/', {}, {"REMOTE_ADDR" => "10.0.0.1", "HTTP_X_FORWARDED_FOR" => "10.0.0.2"}
29
+ last_request.env["locale.country"].should == "US"
30
+ end
31
+
27
32
  it "should resolve 10.0.0.1 to SE" do
28
33
  get '/', {}, {"REMOTE_ADDR" => "10.0.0.1"}
29
34
  last_request.env["locale.country"].should == "SE"
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rack-geo-locale
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.5
4
+ version: 0.0.6
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2012-04-04 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rspec
16
- requirement: &70252809903700 !ruby/object:Gem::Requirement
16
+ requirement: &70266244150660 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '0'
22
22
  type: :development
23
23
  prerelease: false
24
- version_requirements: *70252809903700
24
+ version_requirements: *70266244150660
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: rack-test
27
- requirement: &70252809903240 !ruby/object:Gem::Requirement
27
+ requirement: &70266244149120 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :development
34
34
  prerelease: false
35
- version_requirements: *70252809903240
35
+ version_requirements: *70266244149120
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: guard-rspec
38
- requirement: &70252809902800 !ruby/object:Gem::Requirement
38
+ requirement: &70266244148240 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0'
44
44
  type: :development
45
45
  prerelease: false
46
- version_requirements: *70252809902800
46
+ version_requirements: *70266244148240
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: rack
49
- requirement: &70252809902300 !ruby/object:Gem::Requirement
49
+ requirement: &70266244147720 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '0'
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *70252809902300
57
+ version_requirements: *70266244147720
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: geoip
60
- requirement: &70252809901620 !ruby/object:Gem::Requirement
60
+ requirement: &70266244147160 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
65
65
  version: '0'
66
66
  type: :runtime
67
67
  prerelease: false
68
- version_requirements: *70252809901620
68
+ version_requirements: *70266244147160
69
69
  description: Simple Rack middleware for setting the locale.country via GeoIP using
70
70
  the MaxMind GeoIP database, and setting the locale.languages based on the HTTP_ACCEPT_LANGUAGE
71
71
  header.