warden-github 0.13.1 → 0.13.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. data/.gitignore +1 -0
  2. data/Gemfile +1 -1
  3. data/lib/warden/github/config.rb +1 -0
  4. data/lib/warden/github/version.rb +1 -1
  5. data/spec/unit/config_spec.rb +13 -1
  6. metadata +168 -175
data/.gitignore CHANGED
@@ -8,3 +8,4 @@ vendor/gems
8
8
  .rbenv-version
9
9
  bin/
10
10
  tags
11
+ .ruby-version
data/Gemfile CHANGED
@@ -1,6 +1,6 @@
1
1
  source :rubygems
2
2
 
3
- gem 'debugger', :platforms => :ruby_19, :require => false
3
+ #gem 'debugger', :platforms => :ruby_19, :require => false
4
4
  gem 'ruby-debug', :platforms => :ruby_18, :require => false
5
5
 
6
6
  # Specify your gem's dependencies in warden-github.gemspec
data/lib/warden/github/config.rb CHANGED
@@ -133,6 +133,7 @@ module Warden
133
133
 
134
134
  def correct_scheme(uri)
135
135
  if uri.scheme != 'https' && env['HTTP_X_FORWARDED_PROTO'] == 'https'
136
+ uri.port = nil if uri.port == 80
136
137
  uri.scheme = 'https'
137
138
  # Reparsing will use a different URI subclass, namely URI::HTTPS which
138
139
  # knows the default port for https and strips it if present.
data/lib/warden/github/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Warden
2
2
  module GitHub
3
- VERSION = "0.13.1"
3
+ VERSION = "0.13.2"
4
4
  end
5
5
  end
data/spec/unit/config_spec.rb CHANGED
@@ -129,11 +129,23 @@ describe Warden::GitHub::Config do
129
129
  end
130
130
 
131
131
  context 'when HTTP_X_FORWARDED_PROTO is set to https' do
132
- it 'returns the expanded redirect uri with adjusted scheme' do
132
+ it 'returns the expanded redirect uri(with port) with adjusted scheme' do
133
133
  env['HTTP_X_FORWARDED_PROTO'] = 'https'
134
134
  request.stub(:url => 'http://example.com:443/the/path')
135
135
  config.redirect_uri.should eq 'https://example.com/the/path'
136
136
  end
137
+
138
+ it 'returns the expanded redirect uri with adjusted scheme including port 80' do
139
+ env['HTTP_X_FORWARDED_PROTO'] = 'https'
140
+ request.stub(:url => 'http://example.com:80/the/path')
141
+ config.redirect_uri.should eq 'https://example.com/the/path'
142
+ end
143
+
144
+ it 'returns the expanded redirect uri(without port) with adjusted scheme' do
145
+ env['HTTP_X_FORWARDED_PROTO'] = 'https'
146
+ request.stub(:url => 'http://example.com/the/path')
147
+ config.redirect_uri.should eq 'https://example.com/the/path'
148
+ end
137
149
  end
138
150
  end
139
151
 
metadata CHANGED
@@ -1,212 +1,215 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: warden-github
3
- version: !ruby/object:Gem::Version
4
- hash: 41
3
+ version: !ruby/object:Gem::Version
4
+ version: 0.13.2
5
5
  prerelease:
6
- segments:
7
- - 0
8
- - 13
9
- - 1
10
- version: 0.13.1
11
6
  platform: ruby
12
- authors:
7
+ authors:
13
8
  - Corey Donohoe
14
9
  autorequire:
15
10
  bindir: bin
16
11
  cert_chain: []
17
-
18
- date: 2013-02-18 00:00:00 -08:00
19
- default_executable:
20
- dependencies:
21
- - !ruby/object:Gem::Dependency
12
+ date: 2013-02-19 00:00:00.000000000 Z
13
+ dependencies:
14
+ - !ruby/object:Gem::Dependency
22
15
  name: warden
23
- prerelease: false
24
- requirement: &id001 !ruby/object:Gem::Requirement
16
+ requirement: !ruby/object:Gem::Requirement
25
17
  none: false
26
- requirements:
27
- - - ">"
28
- - !ruby/object:Gem::Version
29
- hash: 15
30
- segments:
31
- - 1
32
- - 0
33
- version: "1.0"
18
+ requirements:
19
+ - - ! '>'
20
+ - !ruby/object:Gem::Version
21
+ version: '1.0'
34
22
  type: :runtime
35
- version_requirements: *id001
36
- - !ruby/object:Gem::Dependency
37
- name: octokit
38
23
  prerelease: false
39
- requirement: &id002 !ruby/object:Gem::Requirement
24
+ version_requirements: !ruby/object:Gem::Requirement
25
+ none: false
26
+ requirements:
27
+ - - ! '>'
28
+ - !ruby/object:Gem::Version
29
+ version: '1.0'
30
+ - !ruby/object:Gem::Dependency
31
+ name: octokit
32
+ requirement: !ruby/object:Gem::Requirement
40
33
  none: false
41
- requirements:
42
- - - ">="
43
- - !ruby/object:Gem::Version
44
- hash: 79
45
- segments:
46
- - 1
47
- - 22
48
- - 0
34
+ requirements:
35
+ - - ! '>='
36
+ - !ruby/object:Gem::Version
49
37
  version: 1.22.0
50
38
  type: :runtime
51
- version_requirements: *id002
52
- - !ruby/object:Gem::Dependency
53
- name: rack
54
39
  prerelease: false
55
- requirement: &id003 !ruby/object:Gem::Requirement
40
+ version_requirements: !ruby/object:Gem::Requirement
41
+ none: false
42
+ requirements:
43
+ - - ! '>='
44
+ - !ruby/object:Gem::Version
45
+ version: 1.22.0
46
+ - !ruby/object:Gem::Dependency
47
+ name: rack
48
+ requirement: !ruby/object:Gem::Requirement
56
49
  none: false
57
- requirements:
50
+ requirements:
58
51
  - - ~>
59
- - !ruby/object:Gem::Version
60
- hash: 5
61
- segments:
62
- - 1
63
- - 4
64
- - 1
52
+ - !ruby/object:Gem::Version
65
53
  version: 1.4.1
66
54
  type: :development
67
- version_requirements: *id003
68
- - !ruby/object:Gem::Dependency
69
- name: rake
70
55
  prerelease: false
71
- requirement: &id004 !ruby/object:Gem::Requirement
56
+ version_requirements: !ruby/object:Gem::Requirement
72
57
  none: false
73
- requirements:
74
- - - ">="
75
- - !ruby/object:Gem::Version
76
- hash: 3
77
- segments:
78
- - 0
79
- version: "0"
58
+ requirements:
59
+ - - ~>
60
+ - !ruby/object:Gem::Version
61
+ version: 1.4.1
62
+ - !ruby/object:Gem::Dependency
63
+ name: rake
64
+ requirement: !ruby/object:Gem::Requirement
65
+ none: false
66
+ requirements:
67
+ - - ! '>='
68
+ - !ruby/object:Gem::Version
69
+ version: '0'
80
70
  type: :development
81
- version_requirements: *id004
82
- - !ruby/object:Gem::Dependency
83
- name: rspec
84
71
  prerelease: false
85
- requirement: &id005 !ruby/object:Gem::Requirement
72
+ version_requirements: !ruby/object:Gem::Requirement
73
+ none: false
74
+ requirements:
75
+ - - ! '>='
76
+ - !ruby/object:Gem::Version
77
+ version: '0'
78
+ - !ruby/object:Gem::Dependency
79
+ name: rspec
80
+ requirement: !ruby/object:Gem::Requirement
86
81
  none: false
87
- requirements:
82
+ requirements:
88
83
  - - ~>
89
- - !ruby/object:Gem::Version
90
- hash: 19
91
- segments:
92
- - 2
93
- - 8
94
- version: "2.8"
84
+ - !ruby/object:Gem::Version
85
+ version: '2.8'
95
86
  type: :development
96
- version_requirements: *id005
97
- - !ruby/object:Gem::Dependency
98
- name: simplecov
99
87
  prerelease: false
100
- requirement: &id006 !ruby/object:Gem::Requirement
88
+ version_requirements: !ruby/object:Gem::Requirement
101
89
  none: false
102
- requirements:
103
- - - ">="
104
- - !ruby/object:Gem::Version
105
- hash: 3
106
- segments:
107
- - 0
108
- version: "0"
90
+ requirements:
91
+ - - ~>
92
+ - !ruby/object:Gem::Version
93
+ version: '2.8'
94
+ - !ruby/object:Gem::Dependency
95
+ name: simplecov
96
+ requirement: !ruby/object:Gem::Requirement
97
+ none: false
98
+ requirements:
99
+ - - ! '>='
100
+ - !ruby/object:Gem::Version
101
+ version: '0'
109
102
  type: :development
110
- version_requirements: *id006
111
- - !ruby/object:Gem::Dependency
112
- name: webmock
113
103
  prerelease: false
114
- requirement: &id007 !ruby/object:Gem::Requirement
104
+ version_requirements: !ruby/object:Gem::Requirement
105
+ none: false
106
+ requirements:
107
+ - - ! '>='
108
+ - !ruby/object:Gem::Version
109
+ version: '0'
110
+ - !ruby/object:Gem::Dependency
111
+ name: webmock
112
+ requirement: !ruby/object:Gem::Requirement
115
113
  none: false
116
- requirements:
114
+ requirements:
117
115
  - - ~>
118
- - !ruby/object:Gem::Version
119
- hash: 29
120
- segments:
121
- - 1
122
- - 9
123
- version: "1.9"
116
+ - !ruby/object:Gem::Version
117
+ version: '1.9'
124
118
  type: :development
125
- version_requirements: *id007
126
- - !ruby/object:Gem::Dependency
127
- name: sinatra
128
119
  prerelease: false
129
- requirement: &id008 !ruby/object:Gem::Requirement
120
+ version_requirements: !ruby/object:Gem::Requirement
121
+ none: false
122
+ requirements:
123
+ - - ~>
124
+ - !ruby/object:Gem::Version
125
+ version: '1.9'
126
+ - !ruby/object:Gem::Dependency
127
+ name: sinatra
128
+ requirement: !ruby/object:Gem::Requirement
130
129
  none: false
131
- requirements:
132
- - - ">="
133
- - !ruby/object:Gem::Version
134
- hash: 3
135
- segments:
136
- - 0
137
- version: "0"
130
+ requirements:
131
+ - - ! '>='
132
+ - !ruby/object:Gem::Version
133
+ version: '0'
138
134
  type: :development
139
- version_requirements: *id008
140
- - !ruby/object:Gem::Dependency
141
- name: shotgun
142
135
  prerelease: false
143
- requirement: &id009 !ruby/object:Gem::Requirement
136
+ version_requirements: !ruby/object:Gem::Requirement
144
137
  none: false
145
- requirements:
146
- - - ">="
147
- - !ruby/object:Gem::Version
148
- hash: 3
149
- segments:
150
- - 0
151
- version: "0"
138
+ requirements:
139
+ - - ! '>='
140
+ - !ruby/object:Gem::Version
141
+ version: '0'
142
+ - !ruby/object:Gem::Dependency
143
+ name: shotgun
144
+ requirement: !ruby/object:Gem::Requirement
145
+ none: false
146
+ requirements:
147
+ - - ! '>='
148
+ - !ruby/object:Gem::Version
149
+ version: '0'
152
150
  type: :development
153
- version_requirements: *id009
154
- - !ruby/object:Gem::Dependency
155
- name: addressable
156
151
  prerelease: false
157
- requirement: &id010 !ruby/object:Gem::Requirement
152
+ version_requirements: !ruby/object:Gem::Requirement
158
153
  none: false
159
- requirements:
154
+ requirements:
155
+ - - ! '>='
156
+ - !ruby/object:Gem::Version
157
+ version: '0'
158
+ - !ruby/object:Gem::Dependency
159
+ name: addressable
160
+ requirement: !ruby/object:Gem::Requirement
161
+ none: false
162
+ requirements:
160
163
  - - ~>
161
- - !ruby/object:Gem::Version
162
- hash: 7
163
- segments:
164
- - 2
165
- - 2
166
- - 0
164
+ - !ruby/object:Gem::Version
167
165
  version: 2.2.0
168
166
  type: :development
169
- version_requirements: *id010
170
- - !ruby/object:Gem::Dependency
171
- name: rack-test
172
167
  prerelease: false
173
- requirement: &id011 !ruby/object:Gem::Requirement
168
+ version_requirements: !ruby/object:Gem::Requirement
174
169
  none: false
175
- requirements:
170
+ requirements:
176
171
  - - ~>
177
- - !ruby/object:Gem::Version
178
- hash: 13
179
- segments:
180
- - 0
181
- - 5
182
- - 3
172
+ - !ruby/object:Gem::Version
173
+ version: 2.2.0
174
+ - !ruby/object:Gem::Dependency
175
+ name: rack-test
176
+ requirement: !ruby/object:Gem::Requirement
177
+ none: false
178
+ requirements:
179
+ - - ~>
180
+ - !ruby/object:Gem::Version
183
181
  version: 0.5.3
184
182
  type: :development
185
- version_requirements: *id011
186
- - !ruby/object:Gem::Dependency
187
- name: yajl-ruby
188
183
  prerelease: false
189
- requirement: &id012 !ruby/object:Gem::Requirement
184
+ version_requirements: !ruby/object:Gem::Requirement
190
185
  none: false
191
- requirements:
192
- - - ">="
193
- - !ruby/object:Gem::Version
194
- hash: 3
195
- segments:
196
- - 0
197
- version: "0"
186
+ requirements:
187
+ - - ~>
188
+ - !ruby/object:Gem::Version
189
+ version: 0.5.3
190
+ - !ruby/object:Gem::Dependency
191
+ name: yajl-ruby
192
+ requirement: !ruby/object:Gem::Requirement
193
+ none: false
194
+ requirements:
195
+ - - ! '>='
196
+ - !ruby/object:Gem::Version
197
+ version: '0'
198
198
  type: :development
199
- version_requirements: *id012
199
+ prerelease: false
200
+ version_requirements: !ruby/object:Gem::Requirement
201
+ none: false
202
+ requirements:
203
+ - - ! '>='
204
+ - !ruby/object:Gem::Version
205
+ version: '0'
200
206
  description: A warden strategy for easy oauth integration with github
201
- email:
207
+ email:
202
208
  - atmos@atmos.org
203
209
  executables: []
204
-
205
210
  extensions: []
206
-
207
211
  extra_rdoc_files: []
208
-
209
- files:
212
+ files:
210
213
  - .gitignore
211
214
  - .rspec
212
215
  - .travis.yml
@@ -234,41 +237,31 @@ files:
234
237
  - spec/unit/oauth_spec.rb
235
238
  - spec/unit/user_spec.rb
236
239
  - warden-github.gemspec
237
- has_rdoc: true
238
240
  homepage: http://github.com/atmos/warden-github
239
241
  licenses: []
240
-
241
242
  post_install_message:
242
243
  rdoc_options: []
243
-
244
- require_paths:
244
+ require_paths:
245
245
  - lib
246
- required_ruby_version: !ruby/object:Gem::Requirement
246
+ required_ruby_version: !ruby/object:Gem::Requirement
247
247
  none: false
248
- requirements:
249
- - - ">="
250
- - !ruby/object:Gem::Version
251
- hash: 3
252
- segments:
253
- - 0
254
- version: "0"
255
- required_rubygems_version: !ruby/object:Gem::Requirement
248
+ requirements:
249
+ - - ! '>='
250
+ - !ruby/object:Gem::Version
251
+ version: '0'
252
+ required_rubygems_version: !ruby/object:Gem::Requirement
256
253
  none: false
257
- requirements:
258
- - - ">="
259
- - !ruby/object:Gem::Version
260
- hash: 3
261
- segments:
262
- - 0
263
- version: "0"
254
+ requirements:
255
+ - - ! '>='
256
+ - !ruby/object:Gem::Version
257
+ version: '0'
264
258
  requirements: []
265
-
266
259
  rubyforge_project: warden-github
267
- rubygems_version: 1.6.2
260
+ rubygems_version: 1.8.23
268
261
  signing_key:
269
262
  specification_version: 3
270
263
  summary: A warden strategy for easy oauth integration with github
271
- test_files:
264
+ test_files:
272
265
  - spec/fixtures/user.json
273
266
  - spec/integration/oauth_spec.rb
274
267
  - spec/spec_helper.rb