omniauth_china 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.
@@ -48,7 +48,25 @@ module OmniAuth
48
48
  }
49
49
  }
50
50
  end
51
+
52
+ # MonkeyPatch session['oauth']['tsina']['callback_confirmed'] to true
53
+ def request_phase
54
+ request_token = consumer.get_request_token(:oauth_callback => callback_url)
55
+ session['oauth'] ||= {}
56
+ session['oauth'][name.to_s] = {'callback_confirmed' => true, 'request_token' => request_token.token, 'request_secret' => request_token.secret}
57
+ r = Rack::Response.new
58
+
59
+ if request_token.callback_confirmed?
60
+ r.redirect(request_token.authorize_url)
61
+ else
62
+ r.redirect(request_token.authorize_url(:oauth_callback => callback_url))
63
+ end
51
64
 
65
+ r.finish
66
+ rescue ::Timeout::Error => e
67
+ fail!(:timeout, e)
68
+ end
69
+
52
70
  def user_hash
53
71
  # http://api.t.sina.com.cn/users/show/:id.json?source=appkey
54
72
  # @access_token.params[:user_id] is the UID
@@ -1,3 +1,3 @@
1
1
  module OmniauthChina
2
- VERSION = "0.0.5"
2
+ VERSION = "0.0.6"
3
3
  end
@@ -14,12 +14,8 @@ Gem::Specification.new do |s|
14
14
 
15
15
  s.rubyforge_project = "omniauth_china"
16
16
 
17
- s.add_dependency 'oa-core', '~> 0.2.0.beta1'
18
- s.add_dependency 'oa-oauth', '~> 0.2.0.beta1'
19
- s.add_dependency 'multi_json', '~> 0.0.2'
20
- s.add_dependency 'nokogiri', '~> 1.4.2'
21
- s.add_dependency 'oauth', '~> 0.4.0'
22
- s.add_dependency 'oauth2', '~> 0.1.0'
17
+ s.add_dependency 'oa-core', '~> 0.2.0'
18
+ s.add_dependency 'oa-oauth', '~> 0.2.0'
23
19
 
24
20
  s.files = `git ls-files`.split("\n")
25
21
  s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
metadata CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
5
5
  segments:
6
6
  - 0
7
7
  - 0
8
- - 5
9
- version: 0.0.5
8
+ - 6
9
+ version: 0.0.6
10
10
  platform: ruby
11
11
  authors:
12
12
  - Qi He
@@ -14,7 +14,7 @@ autorequire:
14
14
  bindir: bin
15
15
  cert_chain: []
16
16
 
17
- date: 2011-03-30 00:00:00 -07:00
17
+ date: 2011-03-31 00:00:00 -07:00
18
18
  default_executable:
19
19
  dependencies:
20
20
  - !ruby/object:Gem::Dependency
@@ -29,8 +29,7 @@ dependencies:
29
29
  - 0
30
30
  - 2
31
31
  - 0
32
- - beta1
33
- version: 0.2.0.beta1
32
+ version: 0.2.0
34
33
  type: :runtime
35
34
  version_requirements: *id001
36
35
  - !ruby/object:Gem::Dependency
@@ -45,70 +44,9 @@ dependencies:
45
44
  - 0
46
45
  - 2
47
46
  - 0
48
- - beta1
49
- version: 0.2.0.beta1
47
+ version: 0.2.0
50
48
  type: :runtime
51
49
  version_requirements: *id002
52
- - !ruby/object:Gem::Dependency
53
- name: multi_json
54
- prerelease: false
55
- requirement: &id003 !ruby/object:Gem::Requirement
56
- none: false
57
- requirements:
58
- - - ~>
59
- - !ruby/object:Gem::Version
60
- segments:
61
- - 0
62
- - 0
63
- - 2
64
- version: 0.0.2
65
- type: :runtime
66
- version_requirements: *id003
67
- - !ruby/object:Gem::Dependency
68
- name: nokogiri
69
- prerelease: false
70
- requirement: &id004 !ruby/object:Gem::Requirement
71
- none: false
72
- requirements:
73
- - - ~>
74
- - !ruby/object:Gem::Version
75
- segments:
76
- - 1
77
- - 4
78
- - 2
79
- version: 1.4.2
80
- type: :runtime
81
- version_requirements: *id004
82
- - !ruby/object:Gem::Dependency
83
- name: oauth
84
- prerelease: false
85
- requirement: &id005 !ruby/object:Gem::Requirement
86
- none: false
87
- requirements:
88
- - - ~>
89
- - !ruby/object:Gem::Version
90
- segments:
91
- - 0
92
- - 4
93
- - 0
94
- version: 0.4.0
95
- type: :runtime
96
- version_requirements: *id005
97
- - !ruby/object:Gem::Dependency
98
- name: oauth2
99
- prerelease: false
100
- requirement: &id006 !ruby/object:Gem::Requirement
101
- none: false
102
- requirements:
103
- - - ~>
104
- - !ruby/object:Gem::Version
105
- segments:
106
- - 0
107
- - 1
108
- - 0
109
- version: 0.1.0
110
- type: :runtime
111
- version_requirements: *id006
112
50
  description: This is an extention of OmniAuth, it addes Open ID providers in China such as Douban, Sina, Sohu, 163, Tencent, Renren, etc.
113
51
  email:
114
52
  - qihe229@gmail.com