oauth2 0.6.0 → 0.6.1

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.
data/.gitignore CHANGED
@@ -1,9 +1,6 @@
1
1
  .rvmrc
2
2
  /live
3
3
 
4
- ## MAC OS
5
- .DS_Store
6
-
7
4
  ## TEXTMATE
8
5
  *.tmproj
9
6
  tmtags
@@ -48,7 +48,7 @@ module OAuth2
48
48
  # Procs that, when called, will parse a response body according
49
49
  # to the specified format.
50
50
  PARSERS = {
51
- :json => lambda{|body| MultiJson.decode(body) rescue body },
51
+ :json => lambda{|body| MultiJson.load(body) rescue body },
52
52
  :query => lambda{|body| Rack::Utils.parse_query(body) },
53
53
  :text => lambda{|body| body}
54
54
  }
@@ -1,3 +1,3 @@
1
1
  module OAuth2
2
- VERSION = "0.6.0"
2
+ VERSION = "0.6.1"
3
3
  end
data/oauth2.gemspec CHANGED
@@ -3,7 +3,7 @@ require File.expand_path('../lib/oauth2/version', __FILE__)
3
3
 
4
4
  Gem::Specification.new do |gem|
5
5
  gem.add_dependency 'faraday', '~> 0.7'
6
- gem.add_dependency 'multi_json', '~> 1.0'
6
+ gem.add_dependency 'multi_json', '~> 1.3'
7
7
  gem.add_dependency 'httpauth', '~> 0.1'
8
8
  gem.add_development_dependency 'multi_xml'
9
9
  gem.add_development_dependency 'rake'
@@ -4,8 +4,8 @@ VERBS = [:get, :post, :put, :delete]
4
4
 
5
5
  describe AccessToken do
6
6
  let(:token) {'monkey'}
7
- let(:token_body) {MultiJson.encode(:access_token => 'foo', :expires_in => 600, :refresh_token => 'bar')}
8
- let(:refresh_body) {MultiJson.encode(:access_token => 'refreshed_foo', :expires_in => 600, :refresh_token => 'refresh_bar')}
7
+ let(:token_body) {MultiJson.dump(:access_token => 'foo', :expires_in => 600, :refresh_token => 'bar')}
8
+ let(:refresh_body) {MultiJson.dump(:access_token => 'refreshed_foo', :expires_in => 600, :refresh_token => 'refresh_bar')}
9
9
  let(:client) do
10
10
  Client.new('abc', 'def', :site => 'https://api.example.com') do |builder|
11
11
  builder.request :url_encoded
@@ -10,7 +10,7 @@ describe OAuth2::Client do
10
10
  stub.get('/success') {|env| [200, {'Content-Type' => 'text/awesome'}, 'yay']}
11
11
  stub.get('/reflect') {|env| [200, {}, env[:body]]}
12
12
  stub.post('/reflect') {|env| [200, {}, env[:body]]}
13
- stub.get('/unauthorized') {|env| [401, {'Content-Type' => 'application/json'}, MultiJson.encode(:error => error_value, :error_description => error_description_value)]}
13
+ stub.get('/unauthorized') {|env| [401, {'Content-Type' => 'application/json'}, MultiJson.dump(:error => error_value, :error_description => error_description_value)]}
14
14
  stub.get('/conflict') {|env| [409, {'Content-Type' => 'text/plain'}, 'not authorized']}
15
15
  stub.get('/redirect') {|env| [302, {'Content-Type' => 'text/plain', 'location' => '/success' }, '']}
16
16
  stub.post('/redirect') {|env| [303, {'Content-Type' => 'text/plain', 'location' => '/reflect' }, '']}
@@ -52,7 +52,7 @@ describe OAuth2::Response do
52
52
 
53
53
  it "parses application/json body" do
54
54
  headers = {'Content-Type' => 'application/json'}
55
- body = MultiJson.encode(:foo => 'bar', :answer => 42)
55
+ body = MultiJson.dump(:foo => 'bar', :answer => 42)
56
56
  response = double('response', :headers => headers, :body => body)
57
57
  subject = Response.new(response)
58
58
  subject.parsed.keys.size.should == 2
@@ -4,7 +4,7 @@ describe OAuth2::Strategy::AuthCode do
4
4
  let(:code) {'sushi'}
5
5
  let(:kvform_token) {'expires_in=600&access_token=salmon&refresh_token=trout&extra_param=steve'}
6
6
  let(:facebook_token) {kvform_token.gsub('_in', '')}
7
- let(:json_token) {MultiJson.encode(:expires_in => 600, :access_token => 'salmon', :refresh_token => 'trout', :extra_param => 'steve')}
7
+ let(:json_token) {MultiJson.dump(:expires_in => 600, :access_token => 'salmon', :refresh_token => 'trout', :extra_param => 'steve')}
8
8
 
9
9
  let(:client) do
10
10
  OAuth2::Client.new('abc', 'def', :site => 'http://api.example.com') do |builder|
metadata CHANGED
@@ -1,150 +1,154 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: oauth2
3
- version: !ruby/object:Gem::Version
4
- hash: 7
3
+ version: !ruby/object:Gem::Version
4
+ version: 0.6.1
5
5
  prerelease:
6
- segments:
7
- - 0
8
- - 6
9
- - 0
10
- version: 0.6.0
11
6
  platform: ruby
12
- authors:
7
+ authors:
13
8
  - Michael Bleigh
14
9
  - Erik Michaels-Ober
15
10
  autorequire:
16
11
  bindir: bin
17
12
  cert_chain: []
18
-
19
- date: 2012-04-12 00:00:00 -07:00
20
- default_executable:
21
- dependencies:
22
- - !ruby/object:Gem::Dependency
13
+ date: 2012-04-18 00:00:00.000000000 Z
14
+ dependencies:
15
+ - !ruby/object:Gem::Dependency
23
16
  name: faraday
24
- prerelease: false
25
- requirement: &id001 !ruby/object:Gem::Requirement
17
+ requirement: !ruby/object:Gem::Requirement
26
18
  none: false
27
- requirements:
19
+ requirements:
28
20
  - - ~>
29
- - !ruby/object:Gem::Version
30
- hash: 5
31
- segments:
32
- - 0
33
- - 7
34
- version: "0.7"
21
+ - !ruby/object:Gem::Version
22
+ version: '0.7'
35
23
  type: :runtime
36
- version_requirements: *id001
37
- - !ruby/object:Gem::Dependency
38
- name: multi_json
39
24
  prerelease: false
40
- requirement: &id002 !ruby/object:Gem::Requirement
25
+ version_requirements: !ruby/object:Gem::Requirement
26
+ none: false
27
+ requirements:
28
+ - - ~>
29
+ - !ruby/object:Gem::Version
30
+ version: '0.7'
31
+ - !ruby/object:Gem::Dependency
32
+ name: multi_json
33
+ requirement: !ruby/object:Gem::Requirement
41
34
  none: false
42
- requirements:
35
+ requirements:
43
36
  - - ~>
44
- - !ruby/object:Gem::Version
45
- hash: 15
46
- segments:
47
- - 1
48
- - 0
49
- version: "1.0"
37
+ - !ruby/object:Gem::Version
38
+ version: '1.3'
50
39
  type: :runtime
51
- version_requirements: *id002
52
- - !ruby/object:Gem::Dependency
53
- name: httpauth
54
40
  prerelease: false
55
- requirement: &id003 !ruby/object:Gem::Requirement
41
+ version_requirements: !ruby/object:Gem::Requirement
42
+ none: false
43
+ requirements:
44
+ - - ~>
45
+ - !ruby/object:Gem::Version
46
+ version: '1.3'
47
+ - !ruby/object:Gem::Dependency
48
+ name: httpauth
49
+ requirement: !ruby/object:Gem::Requirement
56
50
  none: false
57
- requirements:
51
+ requirements:
58
52
  - - ~>
59
- - !ruby/object:Gem::Version
60
- hash: 9
61
- segments:
62
- - 0
63
- - 1
64
- version: "0.1"
53
+ - !ruby/object:Gem::Version
54
+ version: '0.1'
65
55
  type: :runtime
66
- version_requirements: *id003
67
- - !ruby/object:Gem::Dependency
68
- name: multi_xml
69
56
  prerelease: false
70
- requirement: &id004 !ruby/object:Gem::Requirement
71
- none: false
72
- requirements:
73
- - - ">="
74
- - !ruby/object:Gem::Version
75
- hash: 3
76
- segments:
77
- - 0
78
- version: "0"
57
+ version_requirements: !ruby/object:Gem::Requirement
58
+ none: false
59
+ requirements:
60
+ - - ~>
61
+ - !ruby/object:Gem::Version
62
+ version: '0.1'
63
+ - !ruby/object:Gem::Dependency
64
+ name: multi_xml
65
+ requirement: !ruby/object:Gem::Requirement
66
+ none: false
67
+ requirements:
68
+ - - ! '>='
69
+ - !ruby/object:Gem::Version
70
+ version: '0'
79
71
  type: :development
80
- version_requirements: *id004
81
- - !ruby/object:Gem::Dependency
82
- name: rake
83
72
  prerelease: false
84
- requirement: &id005 !ruby/object:Gem::Requirement
85
- none: false
86
- requirements:
87
- - - ">="
88
- - !ruby/object:Gem::Version
89
- hash: 3
90
- segments:
91
- - 0
92
- version: "0"
73
+ version_requirements: !ruby/object:Gem::Requirement
74
+ none: false
75
+ requirements:
76
+ - - ! '>='
77
+ - !ruby/object:Gem::Version
78
+ version: '0'
79
+ - !ruby/object:Gem::Dependency
80
+ name: rake
81
+ requirement: !ruby/object:Gem::Requirement
82
+ none: false
83
+ requirements:
84
+ - - ! '>='
85
+ - !ruby/object:Gem::Version
86
+ version: '0'
93
87
  type: :development
94
- version_requirements: *id005
95
- - !ruby/object:Gem::Dependency
96
- name: rdoc
97
88
  prerelease: false
98
- requirement: &id006 !ruby/object:Gem::Requirement
99
- none: false
100
- requirements:
101
- - - ">="
102
- - !ruby/object:Gem::Version
103
- hash: 3
104
- segments:
105
- - 0
106
- version: "0"
89
+ version_requirements: !ruby/object:Gem::Requirement
90
+ none: false
91
+ requirements:
92
+ - - ! '>='
93
+ - !ruby/object:Gem::Version
94
+ version: '0'
95
+ - !ruby/object:Gem::Dependency
96
+ name: rdoc
97
+ requirement: !ruby/object:Gem::Requirement
98
+ none: false
99
+ requirements:
100
+ - - ! '>='
101
+ - !ruby/object:Gem::Version
102
+ version: '0'
107
103
  type: :development
108
- version_requirements: *id006
109
- - !ruby/object:Gem::Dependency
110
- name: rspec
111
104
  prerelease: false
112
- requirement: &id007 !ruby/object:Gem::Requirement
113
- none: false
114
- requirements:
115
- - - ">="
116
- - !ruby/object:Gem::Version
117
- hash: 3
118
- segments:
119
- - 0
120
- version: "0"
105
+ version_requirements: !ruby/object:Gem::Requirement
106
+ none: false
107
+ requirements:
108
+ - - ! '>='
109
+ - !ruby/object:Gem::Version
110
+ version: '0'
111
+ - !ruby/object:Gem::Dependency
112
+ name: rspec
113
+ requirement: !ruby/object:Gem::Requirement
114
+ none: false
115
+ requirements:
116
+ - - ! '>='
117
+ - !ruby/object:Gem::Version
118
+ version: '0'
121
119
  type: :development
122
- version_requirements: *id007
123
- - !ruby/object:Gem::Dependency
124
- name: simplecov
125
120
  prerelease: false
126
- requirement: &id008 !ruby/object:Gem::Requirement
127
- none: false
128
- requirements:
129
- - - ">="
130
- - !ruby/object:Gem::Version
131
- hash: 3
132
- segments:
133
- - 0
134
- version: "0"
121
+ version_requirements: !ruby/object:Gem::Requirement
122
+ none: false
123
+ requirements:
124
+ - - ! '>='
125
+ - !ruby/object:Gem::Version
126
+ version: '0'
127
+ - !ruby/object:Gem::Dependency
128
+ name: simplecov
129
+ requirement: !ruby/object:Gem::Requirement
130
+ none: false
131
+ requirements:
132
+ - - ! '>='
133
+ - !ruby/object:Gem::Version
134
+ version: '0'
135
135
  type: :development
136
- version_requirements: *id008
137
- description: A Ruby wrapper for the OAuth 2.0 protocol built with a similar style to the original OAuth gem.
138
- email:
136
+ prerelease: false
137
+ version_requirements: !ruby/object:Gem::Requirement
138
+ none: false
139
+ requirements:
140
+ - - ! '>='
141
+ - !ruby/object:Gem::Version
142
+ version: '0'
143
+ description: A Ruby wrapper for the OAuth 2.0 protocol built with a similar style
144
+ to the original OAuth gem.
145
+ email:
139
146
  - michael@intridea.com
140
147
  - sferik@gmail.com
141
148
  executables: []
142
-
143
149
  extensions: []
144
-
145
150
  extra_rdoc_files: []
146
-
147
- files:
151
+ files:
148
152
  - .document
149
153
  - .gemtest
150
154
  - .gitignore
@@ -173,43 +177,34 @@ files:
173
177
  - spec/oauth2/strategy/base_spec.rb
174
178
  - spec/oauth2/strategy/client_credentials_spec.rb
175
179
  - spec/oauth2/strategy/password_spec.rb
176
- has_rdoc: true
177
180
  homepage: http://github.com/intridea/oauth2
178
181
  licenses: []
179
-
180
182
  post_install_message:
181
183
  rdoc_options: []
182
-
183
- require_paths:
184
+ require_paths:
184
185
  - lib
185
- required_ruby_version: !ruby/object:Gem::Requirement
186
+ required_ruby_version: !ruby/object:Gem::Requirement
186
187
  none: false
187
- requirements:
188
- - - ">="
189
- - !ruby/object:Gem::Version
190
- hash: 3
191
- segments:
188
+ requirements:
189
+ - - ! '>='
190
+ - !ruby/object:Gem::Version
191
+ version: '0'
192
+ segments:
192
193
  - 0
193
- version: "0"
194
- required_rubygems_version: !ruby/object:Gem::Requirement
194
+ hash: -2511748181783733839
195
+ required_rubygems_version: !ruby/object:Gem::Requirement
195
196
  none: false
196
- requirements:
197
- - - ">="
198
- - !ruby/object:Gem::Version
199
- hash: 23
200
- segments:
201
- - 1
202
- - 3
203
- - 6
197
+ requirements:
198
+ - - ! '>='
199
+ - !ruby/object:Gem::Version
204
200
  version: 1.3.6
205
201
  requirements: []
206
-
207
202
  rubyforge_project:
208
- rubygems_version: 1.6.2
203
+ rubygems_version: 1.8.22
209
204
  signing_key:
210
205
  specification_version: 3
211
206
  summary: A Ruby wrapper for the OAuth 2.0 protocol.
212
- test_files:
207
+ test_files:
213
208
  - spec/helper.rb
214
209
  - spec/oauth2/access_token_spec.rb
215
210
  - spec/oauth2/client_spec.rb