uzuuzu-core 0.1.8 → 0.1.10
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/Gemfile +1 -1
- data/Gemfile.lock +11 -2
- data/VERSION +1 -1
- data/lib/uzuuzu-core/controller/login/facebook.rb +78 -0
- data/lib/uzuuzu-core/controller/login/google.rb +81 -0
- data/lib/uzuuzu-core/controller/login/{oauth.rb → twitter.rb} +29 -34
- data/lib/uzuuzu-core/controller.rb +3 -1
- data/uzuuzu-core.gemspec +8 -6
- metadata +8 -6
data/Gemfile
CHANGED
data/Gemfile.lock
CHANGED
|
@@ -1,15 +1,25 @@
|
|
|
1
1
|
GEM
|
|
2
2
|
remote: http://rubygems.org/
|
|
3
3
|
specs:
|
|
4
|
+
addressable (2.2.6)
|
|
4
5
|
diff-lcs (1.1.3)
|
|
5
6
|
erubis (2.7.0)
|
|
6
7
|
extlib (0.9.15)
|
|
8
|
+
faraday (0.7.5)
|
|
9
|
+
addressable (~> 2.2.6)
|
|
10
|
+
multipart-post (~> 1.1.3)
|
|
11
|
+
rack (>= 1.1.0, < 2)
|
|
7
12
|
git (1.2.5)
|
|
8
13
|
jeweler (1.6.4)
|
|
9
14
|
bundler (~> 1.0)
|
|
10
15
|
git (>= 1.2.5)
|
|
11
16
|
rake
|
|
17
|
+
multi_json (1.0.4)
|
|
18
|
+
multipart-post (1.1.4)
|
|
12
19
|
oauth (0.4.5)
|
|
20
|
+
oauth2 (0.5.1)
|
|
21
|
+
faraday (~> 0.7.4)
|
|
22
|
+
multi_json (~> 1.0.3)
|
|
13
23
|
rack (1.3.5)
|
|
14
24
|
rake (0.8.7)
|
|
15
25
|
rcov (0.9.11)
|
|
@@ -21,7 +31,6 @@ GEM
|
|
|
21
31
|
rspec-expectations (2.7.0)
|
|
22
32
|
diff-lcs (~> 1.1.2)
|
|
23
33
|
rspec-mocks (2.7.0)
|
|
24
|
-
ruby-openid (2.1.8)
|
|
25
34
|
tilt (1.3.3)
|
|
26
35
|
|
|
27
36
|
PLATFORMS
|
|
@@ -33,8 +42,8 @@ DEPENDENCIES
|
|
|
33
42
|
extlib
|
|
34
43
|
jeweler
|
|
35
44
|
oauth
|
|
45
|
+
oauth2
|
|
36
46
|
rack
|
|
37
47
|
rcov
|
|
38
48
|
rspec
|
|
39
|
-
ruby-openid
|
|
40
49
|
tilt
|
data/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
0.1.
|
|
1
|
+
0.1.10
|
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
# coding: utf-8
|
|
2
|
+
require 'oauth2'
|
|
3
|
+
|
|
4
|
+
module UzuUzu
|
|
5
|
+
module Controller
|
|
6
|
+
module Login
|
|
7
|
+
#
|
|
8
|
+
#
|
|
9
|
+
#
|
|
10
|
+
class Facebook
|
|
11
|
+
|
|
12
|
+
#
|
|
13
|
+
#
|
|
14
|
+
#
|
|
15
|
+
def index
|
|
16
|
+
get_config
|
|
17
|
+
session[:referer] = session[:referer] || request.referrer || '/'
|
|
18
|
+
|
|
19
|
+
response.redirect @facebook_client.auth_code.authorize_url(
|
|
20
|
+
@auth_param
|
|
21
|
+
)
|
|
22
|
+
rescue => e
|
|
23
|
+
logger.debug "facebook_request_error #{e}"
|
|
24
|
+
response.server_error
|
|
25
|
+
end # index
|
|
26
|
+
|
|
27
|
+
#
|
|
28
|
+
#
|
|
29
|
+
#
|
|
30
|
+
def callback
|
|
31
|
+
get_config
|
|
32
|
+
|
|
33
|
+
access_token = @facebook_client.auth_code.get_token(
|
|
34
|
+
request.params[:code],
|
|
35
|
+
@auth_param
|
|
36
|
+
)
|
|
37
|
+
session[:facebook_access_token] = access_token.token
|
|
38
|
+
logger.debug access_token
|
|
39
|
+
|
|
40
|
+
#session[:login_user_id] = access_token.params[:user_id]
|
|
41
|
+
#session[:login_name] = access_token.params[:screen_name]
|
|
42
|
+
#session[:login_domain] = 'facebook'
|
|
43
|
+
referrer = session[:referer] || '/'
|
|
44
|
+
#session.delete(:referer)
|
|
45
|
+
response.redirect referrer || '/'
|
|
46
|
+
rescue => e
|
|
47
|
+
logger.debug "facebook_callback_error #{e}"
|
|
48
|
+
response.server_error
|
|
49
|
+
end # callback
|
|
50
|
+
|
|
51
|
+
private
|
|
52
|
+
#
|
|
53
|
+
#
|
|
54
|
+
#
|
|
55
|
+
def get_config
|
|
56
|
+
@config = Environments.current.config['facebook']
|
|
57
|
+
response.server_error if @config.blank?
|
|
58
|
+
if session[:login_user_id]
|
|
59
|
+
referrer = session[:referer] || request.referrer || '/'
|
|
60
|
+
session.delete(:referer)
|
|
61
|
+
response.redirect referrer
|
|
62
|
+
end
|
|
63
|
+
@facebook_client = OAuth2::Client.new(
|
|
64
|
+
@config['client_id'],
|
|
65
|
+
@config['client_secret'],
|
|
66
|
+
:site => 'https://graph.facebook.com'
|
|
67
|
+
)
|
|
68
|
+
@auth_param = {
|
|
69
|
+
# :redirect_uri => "#{helper.root_uri}#{helper.r(:callback)}"
|
|
70
|
+
:redirect_uri => "http://www.uzuuzu.jp"
|
|
71
|
+
}
|
|
72
|
+
@auth_param[:scope] = @config['scope'] if @config['scope']
|
|
73
|
+
end # get_config
|
|
74
|
+
|
|
75
|
+
end # Facebook
|
|
76
|
+
end # Login
|
|
77
|
+
end # Controller
|
|
78
|
+
end # UzuUzu
|
|
@@ -0,0 +1,81 @@
|
|
|
1
|
+
# coding: utf-8
|
|
2
|
+
require 'oauth2'
|
|
3
|
+
|
|
4
|
+
module UzuUzu
|
|
5
|
+
module Controller
|
|
6
|
+
module Login
|
|
7
|
+
#
|
|
8
|
+
#
|
|
9
|
+
#
|
|
10
|
+
class Google
|
|
11
|
+
|
|
12
|
+
#
|
|
13
|
+
#
|
|
14
|
+
#
|
|
15
|
+
def index
|
|
16
|
+
get_config
|
|
17
|
+
session[:referer] = session[:referer] || request.referrer || '/'
|
|
18
|
+
|
|
19
|
+
response.redirect @google_client.auth_code.authorize_url(
|
|
20
|
+
@auth_param
|
|
21
|
+
)
|
|
22
|
+
rescue => e
|
|
23
|
+
logger.debug "google_request_error #{e}"
|
|
24
|
+
response.server_error
|
|
25
|
+
end # index
|
|
26
|
+
|
|
27
|
+
#
|
|
28
|
+
#
|
|
29
|
+
#
|
|
30
|
+
def callback
|
|
31
|
+
get_config
|
|
32
|
+
|
|
33
|
+
access_token = @google_client.auth_code.get_token(
|
|
34
|
+
request.params[:code],
|
|
35
|
+
@auth_param
|
|
36
|
+
)
|
|
37
|
+
session[:google_access_token] = access_token.token
|
|
38
|
+
logger.debug access_token
|
|
39
|
+
|
|
40
|
+
#session[:login_user_id] = access_token.params[:user_id]
|
|
41
|
+
#session[:login_name] = access_token.params[:screen_name]
|
|
42
|
+
#session[:login_domain] = 'google'
|
|
43
|
+
referrer = session[:referer] || '/'
|
|
44
|
+
#session.delete(:referer)
|
|
45
|
+
response.redirect referrer || '/'
|
|
46
|
+
rescue => e
|
|
47
|
+
logger.debug "google_callback_error #{e}"
|
|
48
|
+
response.server_error
|
|
49
|
+
end # callback
|
|
50
|
+
|
|
51
|
+
private
|
|
52
|
+
#
|
|
53
|
+
#
|
|
54
|
+
#
|
|
55
|
+
def get_config
|
|
56
|
+
@config = Environments.current.config['google']
|
|
57
|
+
response.server_error if @config.blank?
|
|
58
|
+
if session[:login_user_id]
|
|
59
|
+
referrer = session[:referer] || request.referrer || '/'
|
|
60
|
+
session.delete(:referer)
|
|
61
|
+
response.redirect referrer
|
|
62
|
+
end
|
|
63
|
+
@google_client = OAuth2::Client.new(
|
|
64
|
+
@config['client_id'],
|
|
65
|
+
@config['client_secret'],
|
|
66
|
+
:site => 'https://accounts.google.com',
|
|
67
|
+
:authorize_url => '/o/oauth2/auth',
|
|
68
|
+
:token_url => '/o/oauth2/token'
|
|
69
|
+
)
|
|
70
|
+
@auth_param = {
|
|
71
|
+
:redirect_uri => "#{helper.root_uri}#{helper.r(:callback)}"
|
|
72
|
+
# :redirect_uri => "http://www.uzuuzu.jp"
|
|
73
|
+
}
|
|
74
|
+
@auth_param[:scope] = @config['scope'] if @config['scope']
|
|
75
|
+
@auth_param[:response_type] = @config['response_type'] if @config['response_type']
|
|
76
|
+
end # get_config
|
|
77
|
+
|
|
78
|
+
end # Google
|
|
79
|
+
end # Login
|
|
80
|
+
end # Controller
|
|
81
|
+
end # UzuUzu
|
|
@@ -7,47 +7,34 @@ module UzuUzu
|
|
|
7
7
|
#
|
|
8
8
|
#
|
|
9
9
|
#
|
|
10
|
-
class
|
|
10
|
+
class Twitter
|
|
11
11
|
|
|
12
12
|
#
|
|
13
13
|
#
|
|
14
14
|
#
|
|
15
|
-
def index
|
|
16
|
-
get_config
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
twitter_consumer = ::OAuth::Consumer.new(
|
|
22
|
-
@config['consumer_key'],
|
|
23
|
-
@config['consumer_secret'],
|
|
24
|
-
@config
|
|
15
|
+
def index
|
|
16
|
+
get_config
|
|
17
|
+
session[:referer] = session[:referer] || request.referrer || '/'
|
|
18
|
+
|
|
19
|
+
request_token = @twitter_consumer.get_request_token(
|
|
20
|
+
:oauth_callback => "#{helper.root_uri}#{helper.r(:callback)}"
|
|
25
21
|
)
|
|
26
|
-
request_token = twitter_consumer.get_request_token(:oauth_callback => "#{helper.root_uri}#{helper.r(:callback)}/#{name}")
|
|
27
22
|
session[:twitter_request_token] = request_token.token
|
|
28
23
|
session[:twitter_request_token_secret] = request_token.secret
|
|
29
24
|
|
|
30
25
|
response.redirect request_token.authorize_url
|
|
31
26
|
rescue => e
|
|
32
|
-
logger.debug "
|
|
27
|
+
logger.debug "twitter_request_error #{e}"
|
|
33
28
|
response.server_error
|
|
34
29
|
end # index
|
|
35
30
|
|
|
36
31
|
#
|
|
37
32
|
#
|
|
38
33
|
#
|
|
39
|
-
def callback
|
|
40
|
-
get_config
|
|
41
|
-
if session[:login_user_id]
|
|
42
|
-
response.redirect request.referrer || '/'
|
|
43
|
-
end
|
|
44
|
-
twitter_consumer = ::OAuth::Consumer.new(
|
|
45
|
-
@config['consumer_key'],
|
|
46
|
-
@config['consumer_secret'],
|
|
47
|
-
@config
|
|
48
|
-
)
|
|
34
|
+
def callback
|
|
35
|
+
get_config
|
|
49
36
|
request_token = ::OAuth::RequestToken.new(
|
|
50
|
-
twitter_consumer,
|
|
37
|
+
@twitter_consumer,
|
|
51
38
|
session[:twitter_request_token],
|
|
52
39
|
session[:twitter_request_token_secret]
|
|
53
40
|
)
|
|
@@ -61,15 +48,15 @@ module UzuUzu
|
|
|
61
48
|
session.delete(:twitter_request_token)
|
|
62
49
|
session.delete(:twitter_request_token_secret)
|
|
63
50
|
|
|
64
|
-
session[:
|
|
65
|
-
session[:login_user_id] = access_token.params[:screen_name]
|
|
51
|
+
session[:login_user_id] = access_token.params[:user_id]
|
|
66
52
|
session[:login_name] = access_token.params[:screen_name]
|
|
67
|
-
session[:login_domain] =
|
|
53
|
+
session[:login_domain] = 'twitter'
|
|
54
|
+
|
|
68
55
|
referrer = session[:referer] || '/'
|
|
69
56
|
session.delete(:referer)
|
|
70
|
-
response.redirect referrer
|
|
57
|
+
response.redirect referrer
|
|
71
58
|
rescue => e
|
|
72
|
-
logger.debug "
|
|
59
|
+
logger.debug "twitter_callback_error #{e}"
|
|
73
60
|
response.server_error
|
|
74
61
|
end # callback
|
|
75
62
|
|
|
@@ -77,14 +64,22 @@ module UzuUzu
|
|
|
77
64
|
#
|
|
78
65
|
#
|
|
79
66
|
#
|
|
80
|
-
def get_config
|
|
81
|
-
@
|
|
82
|
-
response.server_error if @oauth_config.blank?
|
|
83
|
-
@config = @oauth_config[name]
|
|
67
|
+
def get_config
|
|
68
|
+
@config = Environments.current.config['twitter']
|
|
84
69
|
response.server_error if @config.blank?
|
|
70
|
+
if session[:login_user_id]
|
|
71
|
+
referrer = session[:referer] || request.referrer || '/'
|
|
72
|
+
session.delete(:referer)
|
|
73
|
+
response.redirect referrer
|
|
74
|
+
end
|
|
75
|
+
@twitter_consumer = ::OAuth::Consumer.new(
|
|
76
|
+
@config['consumer_key'],
|
|
77
|
+
@config['consumer_secret'],
|
|
78
|
+
:site => 'http://twitter.com'
|
|
79
|
+
)
|
|
85
80
|
end # get_config
|
|
86
81
|
|
|
87
|
-
end #
|
|
82
|
+
end # Twitter
|
|
88
83
|
end # Login
|
|
89
84
|
end # Controller
|
|
90
85
|
end # UzuUzu
|
|
@@ -5,7 +5,9 @@ module UzuUzu
|
|
|
5
5
|
include ::UzuUzu::Helper::Controller
|
|
6
6
|
require 'uzuuzu-core/controller/index'
|
|
7
7
|
module Login
|
|
8
|
-
require 'uzuuzu-core/controller/login/
|
|
8
|
+
require 'uzuuzu-core/controller/login/facebook'
|
|
9
|
+
require 'uzuuzu-core/controller/login/google'
|
|
10
|
+
require 'uzuuzu-core/controller/login/twitter'
|
|
9
11
|
end
|
|
10
12
|
|
|
11
13
|
def self.current
|
data/uzuuzu-core.gemspec
CHANGED
|
@@ -5,11 +5,11 @@
|
|
|
5
5
|
|
|
6
6
|
Gem::Specification.new do |s|
|
|
7
7
|
s.name = %q{uzuuzu-core}
|
|
8
|
-
s.version = "0.1.
|
|
8
|
+
s.version = "0.1.10"
|
|
9
9
|
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
|
11
11
|
s.authors = ["Takuya Kondo"]
|
|
12
|
-
s.date = %q{2012-01-
|
|
12
|
+
s.date = %q{2012-01-03}
|
|
13
13
|
s.description = %q{uzuuzu core library}
|
|
14
14
|
s.email = %q{takuya_v_v@uzuuzu.jp}
|
|
15
15
|
s.extra_rdoc_files = [
|
|
@@ -29,7 +29,9 @@ Gem::Specification.new do |s|
|
|
|
29
29
|
"lib/uzuuzu-core/application.rb",
|
|
30
30
|
"lib/uzuuzu-core/controller.rb",
|
|
31
31
|
"lib/uzuuzu-core/controller/index.rb",
|
|
32
|
-
"lib/uzuuzu-core/controller/login/
|
|
32
|
+
"lib/uzuuzu-core/controller/login/facebook.rb",
|
|
33
|
+
"lib/uzuuzu-core/controller/login/google.rb",
|
|
34
|
+
"lib/uzuuzu-core/controller/login/twitter.rb",
|
|
33
35
|
"lib/uzuuzu-core/controller/view/error/404.rhtml",
|
|
34
36
|
"lib/uzuuzu-core/controller/view/error/500.rhtml",
|
|
35
37
|
"lib/uzuuzu-core/environments.rb",
|
|
@@ -79,8 +81,8 @@ Gem::Specification.new do |s|
|
|
|
79
81
|
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
|
|
80
82
|
s.add_runtime_dependency(%q<rack>, [">= 0"])
|
|
81
83
|
s.add_runtime_dependency(%q<extlib>, [">= 0"])
|
|
82
|
-
s.add_runtime_dependency(%q<ruby-openid>, [">= 0"])
|
|
83
84
|
s.add_runtime_dependency(%q<oauth>, [">= 0"])
|
|
85
|
+
s.add_runtime_dependency(%q<oauth2>, [">= 0"])
|
|
84
86
|
s.add_runtime_dependency(%q<tilt>, [">= 0"])
|
|
85
87
|
s.add_runtime_dependency(%q<erubis>, [">= 0"])
|
|
86
88
|
s.add_development_dependency(%q<rspec>, [">= 0"])
|
|
@@ -90,8 +92,8 @@ Gem::Specification.new do |s|
|
|
|
90
92
|
else
|
|
91
93
|
s.add_dependency(%q<rack>, [">= 0"])
|
|
92
94
|
s.add_dependency(%q<extlib>, [">= 0"])
|
|
93
|
-
s.add_dependency(%q<ruby-openid>, [">= 0"])
|
|
94
95
|
s.add_dependency(%q<oauth>, [">= 0"])
|
|
96
|
+
s.add_dependency(%q<oauth2>, [">= 0"])
|
|
95
97
|
s.add_dependency(%q<tilt>, [">= 0"])
|
|
96
98
|
s.add_dependency(%q<erubis>, [">= 0"])
|
|
97
99
|
s.add_dependency(%q<rspec>, [">= 0"])
|
|
@@ -102,8 +104,8 @@ Gem::Specification.new do |s|
|
|
|
102
104
|
else
|
|
103
105
|
s.add_dependency(%q<rack>, [">= 0"])
|
|
104
106
|
s.add_dependency(%q<extlib>, [">= 0"])
|
|
105
|
-
s.add_dependency(%q<ruby-openid>, [">= 0"])
|
|
106
107
|
s.add_dependency(%q<oauth>, [">= 0"])
|
|
108
|
+
s.add_dependency(%q<oauth2>, [">= 0"])
|
|
107
109
|
s.add_dependency(%q<tilt>, [">= 0"])
|
|
108
110
|
s.add_dependency(%q<erubis>, [">= 0"])
|
|
109
111
|
s.add_dependency(%q<rspec>, [">= 0"])
|
metadata
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
name: uzuuzu-core
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
4
|
prerelease:
|
|
5
|
-
version: 0.1.
|
|
5
|
+
version: 0.1.10
|
|
6
6
|
platform: ruby
|
|
7
7
|
authors:
|
|
8
8
|
- Takuya Kondo
|
|
@@ -10,7 +10,7 @@ autorequire:
|
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
12
|
|
|
13
|
-
date: 2012-01-
|
|
13
|
+
date: 2012-01-03 00:00:00 +09:00
|
|
14
14
|
default_executable:
|
|
15
15
|
dependencies:
|
|
16
16
|
- !ruby/object:Gem::Dependency
|
|
@@ -36,7 +36,7 @@ dependencies:
|
|
|
36
36
|
prerelease: false
|
|
37
37
|
version_requirements: *id002
|
|
38
38
|
- !ruby/object:Gem::Dependency
|
|
39
|
-
name:
|
|
39
|
+
name: oauth
|
|
40
40
|
requirement: &id003 !ruby/object:Gem::Requirement
|
|
41
41
|
none: false
|
|
42
42
|
requirements:
|
|
@@ -47,7 +47,7 @@ dependencies:
|
|
|
47
47
|
prerelease: false
|
|
48
48
|
version_requirements: *id003
|
|
49
49
|
- !ruby/object:Gem::Dependency
|
|
50
|
-
name:
|
|
50
|
+
name: oauth2
|
|
51
51
|
requirement: &id004 !ruby/object:Gem::Requirement
|
|
52
52
|
none: false
|
|
53
53
|
requirements:
|
|
@@ -145,7 +145,9 @@ files:
|
|
|
145
145
|
- lib/uzuuzu-core/application.rb
|
|
146
146
|
- lib/uzuuzu-core/controller.rb
|
|
147
147
|
- lib/uzuuzu-core/controller/index.rb
|
|
148
|
-
- lib/uzuuzu-core/controller/login/
|
|
148
|
+
- lib/uzuuzu-core/controller/login/facebook.rb
|
|
149
|
+
- lib/uzuuzu-core/controller/login/google.rb
|
|
150
|
+
- lib/uzuuzu-core/controller/login/twitter.rb
|
|
149
151
|
- lib/uzuuzu-core/controller/view/error/404.rhtml
|
|
150
152
|
- lib/uzuuzu-core/controller/view/error/500.rhtml
|
|
151
153
|
- lib/uzuuzu-core/environments.rb
|
|
@@ -196,7 +198,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
|
196
198
|
requirements:
|
|
197
199
|
- - ">="
|
|
198
200
|
- !ruby/object:Gem::Version
|
|
199
|
-
hash:
|
|
201
|
+
hash: 2546083607633769446
|
|
200
202
|
segments:
|
|
201
203
|
- 0
|
|
202
204
|
version: "0"
|