rack-geo-locale 0.0.2 → 0.0.3

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 (4) hide show
  1. data/Gemfile.lock +1 -1
  2. data/VERSION +1 -1
  3. data/lib/rack/geo_locale.rb +7 -9
  4. 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.1)
4
+ rack-geo-locale (0.0.3)
5
5
  geoip
6
6
  rack
7
7
 
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.0.2
1
+ 0.0.3
@@ -18,17 +18,15 @@ module Rack
18
18
 
19
19
  private
20
20
  def parse_country(env)
21
- remote_addr = env["REMOTE_ADDR"]
22
-
23
- return nil unless remote_addr
24
-
25
- result = geoip.country(remote_addr).country_code2
21
+ if database?
22
+ if remote_addr = env["REMOTE_ADDR"]
23
+ result = geoip.country(remote_addr).country_code2
26
24
 
27
- if result != "--"
28
- result
29
- else
30
- nil
25
+ return result if result != "--"
26
+ end
31
27
  end
28
+
29
+ nil
32
30
  end
33
31
 
34
32
  def parse_locale(env)
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.2
4
+ version: 0.0.3
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2012-04-03 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rspec
16
- requirement: &70157091906880 !ruby/object:Gem::Requirement
16
+ requirement: &70266768450060 !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: *70157091906880
24
+ version_requirements: *70266768450060
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: rack-test
27
- requirement: &70157091905180 !ruby/object:Gem::Requirement
27
+ requirement: &70266768449520 !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: *70157091905180
35
+ version_requirements: *70266768449520
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: guard-rspec
38
- requirement: &70157091903000 !ruby/object:Gem::Requirement
38
+ requirement: &70266768449060 !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: *70157091903000
46
+ version_requirements: *70266768449060
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: rack
49
- requirement: &70157091900900 !ruby/object:Gem::Requirement
49
+ requirement: &70266768448540 !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: *70157091900900
57
+ version_requirements: *70266768448540
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: geoip
60
- requirement: &70157091899860 !ruby/object:Gem::Requirement
60
+ requirement: &70266768448120 !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: *70157091899860
68
+ version_requirements: *70266768448120
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.