registrar 0.2.1 → 0.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/lib/registrar/auth_builder/omni_auth.rb +10 -1
  3. data/lib/registrar/version.rb +1 -1
  4. data/registrar.gemspec +1 -0
  5. data/spec/omni_auth_adapter_spec.rb +4 -3
  6. data/vendor/GeoIP.dat +0 -0
  7. metadata +17 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: c42c94b554def62ab747598964f081c49058bcbd
4
- data.tar.gz: 93c3fe1057524effbd211c02a9536a65fbbd86ea
3
+ metadata.gz: 1f3074d0784be7cc10979a6612c784711c4ff40b
4
+ data.tar.gz: 46547137f27f3f73fc87072c36250714b4c8ef9d
5
5
  SHA512:
6
- metadata.gz: 1ffaf6089c43ca3377606446f535c66f3df8ea4a00bdb728d9a21e4465766aab29a4c310abcd4d741991a34033cc13a53d2035c0badfae41c59a97a819a99c50
7
- data.tar.gz: b5b8d8e2727461d8c7d62eca15e9b4ee9f553850569a6380c7bab03336acd5fd514adcaa0fa99e6ac2d48a7d9e3f767be1b002bce5db4cb96f8e3b3a9a21b26f
6
+ metadata.gz: 279cf9a93f0f491a4417d17ac3957d190a31f4ba907de9897a037a5a545ffd513c882de5d97066e87d0d75d74a0fb7b5530d184a157bbcbd3d94b5da912e56a7
7
+ data.tar.gz: 142a5702630d7f69ea71929d770c722001cbe21629f4bcd845482e5520a955e78469c995f13f626294cf491bf185ef54f0e29c42b6e53277aadecfdf8513553e
data/lib/registrar/auth_builder/omni_auth.rb CHANGED
@@ -94,7 +94,8 @@ module Registrar
94
94
  'user_agent' => user_agent,
95
95
  'timestamp' => now,
96
96
  'platform' => platform,
97
- 'locale' => locale
97
+ 'locale' => locale,
98
+ 'country' => country
98
99
  }
99
100
  end
100
101
 
@@ -141,6 +142,14 @@ module Registrar
141
142
  env['X-Locale']
142
143
  end
143
144
 
145
+ require 'geoip'
146
+ GEOIP_DATA = File.expand_path("../../../../vendor/GeoIP.dat", __FILE__)
147
+ GEOIP = GeoIP.new(GEOIP_DATA, :preload => true)
148
+
149
+ def country
150
+ GEOIP.country(ip).country_code2
151
+ end
152
+
144
153
  def auth
145
154
  @auth ||= env['omniauth.auth']
146
155
  end
data/lib/registrar/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Registrar
2
- VERSION = "0.2.1"
2
+ VERSION = "0.3"
3
3
  end
data/registrar.gemspec CHANGED
@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
19
19
  spec.require_paths = ["lib"]
20
20
 
21
21
  spec.add_dependency "omniauth"
22
+ spec.add_dependency "geoip"
22
23
 
23
24
  spec.add_development_dependency "bundler", "~> 1.7"
24
25
  spec.add_development_dependency "rake", "~> 10.0"
data/spec/omni_auth_adapter_spec.rb CHANGED
@@ -6,7 +6,7 @@ class OmniAuthAuthBuilderSpec < Spec
6
6
 
7
7
  it 'normalizes OmniAuth Auth Hash Schema 1.0 and later' do
8
8
  passed_env['HTTP_USER_AGENT'] = "Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7"
9
- passed_env['REMOTE_ADDR'] = "127.0.0.2"
9
+ passed_env['REMOTE_ADDR'] = "87.139.102.24"
10
10
  passed_env['X-Locale'] = 'fr'
11
11
 
12
12
  get '/', nil, passed_env
@@ -71,11 +71,12 @@ class OmniAuthAuthBuilderSpec < Spec
71
71
  def assert_adds_trace(env)
72
72
  assert_equal(
73
73
  {
74
- "ip" => "127.0.0.2",
74
+ "ip" => "87.139.102.24",
75
75
  "user_agent" => "Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7",
76
76
  "timestamp" => "1427789796",
77
77
  "platform" => "mobile",
78
- "locale" => "fr"
78
+ "locale" => "fr",
79
+ "country" => "DE"
79
80
  }, env['registrar.auth']['trace'])
80
81
  end
81
82
 
data/vendor/GeoIP.dat ADDED
Binary file
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: registrar
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.1
4
+ version: '0.3'
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jan Owiesniak
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-02-19 00:00:00.000000000 Z
11
+ date: 2016-03-01 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: omniauth
@@ -24,6 +24,20 @@ dependencies:
24
24
  - - ">="
25
25
  - !ruby/object:Gem::Version
26
26
  version: '0'
27
+ - !ruby/object:Gem::Dependency
28
+ name: geoip
29
+ requirement: !ruby/object:Gem::Requirement
30
+ requirements:
31
+ - - ">="
32
+ - !ruby/object:Gem::Version
33
+ version: '0'
34
+ type: :runtime
35
+ prerelease: false
36
+ version_requirements: !ruby/object:Gem::Requirement
37
+ requirements:
38
+ - - ">="
39
+ - !ruby/object:Gem::Version
40
+ version: '0'
27
41
  - !ruby/object:Gem::Dependency
28
42
  name: bundler
29
43
  requirement: !ruby/object:Gem::Requirement
@@ -123,6 +137,7 @@ files:
123
137
  - spec/params_mapper_spec.rb
124
138
  - spec/profile_builder_spec.rb
125
139
  - spec/spec_helper.rb
140
+ - vendor/GeoIP.dat
126
141
  homepage: ''
127
142
  licenses:
128
143
  - MIT