uzuuzu-core 0.1.8 → 0.1.10

data/Gemfile

@@ -14,7 +14,7 @@ end
 
 gem 'rack'
 gem 'extlib'
-gem 'ruby-openid'
 gem 'oauth'
+gem 'oauth2'
 gem 'tilt'
 gem 'erubis'

data/Gemfile.lock

@@ -1,15 +1,25 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    addressable (2.2.6)
     diff-lcs (1.1.3)
     erubis (2.7.0)
     extlib (0.9.15)
+    faraday (0.7.5)
+      addressable (~> 2.2.6)
+      multipart-post (~> 1.1.3)
+      rack (>= 1.1.0, < 2)
     git (1.2.5)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
+    multi_json (1.0.4)
+    multipart-post (1.1.4)
     oauth (0.4.5)
+    oauth2 (0.5.1)
+      faraday (~> 0.7.4)
+      multi_json (~> 1.0.3)
     rack (1.3.5)
     rake (0.8.7)
     rcov (0.9.11)
@@ -21,7 +31,6 @@ GEM
     rspec-expectations (2.7.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.7.0)
-    ruby-openid (2.1.8)
     tilt (1.3.3)
 
 PLATFORMS
@@ -33,8 +42,8 @@ DEPENDENCIES
   extlib
   jeweler
   oauth
+  oauth2
   rack
   rcov
   rspec
-  ruby-openid
   tilt

data/VERSION

@@ -1 +1 @@
-0.1.8
+0.1.10

data/lib/uzuuzu-core/controller/login/facebook.rb

@@ -0,0 +1,78 @@
+# coding: utf-8
+require 'oauth2'
+
+module UzuUzu
+  module Controller
+    module Login
+      #
+      #
+      #
+      class Facebook
+        
+        #
+        #
+        #
+        def index
+          get_config
+          session[:referer] = session[:referer] || request.referrer || '/'
+
+          response.redirect @facebook_client.auth_code.authorize_url(
+            @auth_param
+          )
+        rescue => e
+          logger.debug "facebook_request_error #{e}"
+          response.server_error
+        end # index
+        
+        #
+        #
+        #
+        def callback
+          get_config
+          
+          access_token = @facebook_client.auth_code.get_token(
+            request.params[:code],
+            @auth_param
+          )
+          session[:facebook_access_token] = access_token.token
+          logger.debug access_token
+          
+          #session[:login_user_id] = access_token.params[:user_id]
+          #session[:login_name] = access_token.params[:screen_name]
+          #session[:login_domain] = 'facebook'
+          referrer = session[:referer] || '/'
+          #session.delete(:referer)
+          response.redirect referrer || '/'
+        rescue => e
+          logger.debug "facebook_callback_error #{e}"
+          response.server_error
+        end # callback
+        
+        private
+        #
+        #
+        #
+        def get_config
+          @config = Environments.current.config['facebook']
+          response.server_error if @config.blank?
+          if session[:login_user_id]
+            referrer = session[:referer] || request.referrer || '/'
+            session.delete(:referer)
+            response.redirect referrer
+          end
+          @facebook_client = OAuth2::Client.new(
+            @config['client_id'],
+            @config['client_secret'],
+            :site => 'https://graph.facebook.com'
+          )
+          @auth_param = {
+#            :redirect_uri => "#{helper.root_uri}#{helper.r(:callback)}"
+             :redirect_uri => "http://www.uzuuzu.jp"
+          }
+          @auth_param[:scope] = @config['scope'] if @config['scope']
+        end # get_config
+        
+      end # Facebook
+    end # Login
+  end # Controller
+end # UzuUzu

data/lib/uzuuzu-core/controller/login/google.rb

@@ -0,0 +1,81 @@
+# coding: utf-8
+require 'oauth2'
+
+module UzuUzu
+  module Controller
+    module Login
+      #
+      #
+      #
+      class Google
+        
+        #
+        #
+        #
+        def index
+          get_config
+          session[:referer] = session[:referer] || request.referrer || '/'
+
+          response.redirect @google_client.auth_code.authorize_url(
+            @auth_param
+          )
+        rescue => e
+          logger.debug "google_request_error #{e}"
+          response.server_error
+        end # index
+        
+        #
+        #
+        #
+        def callback
+          get_config
+          
+          access_token = @google_client.auth_code.get_token(
+            request.params[:code],
+            @auth_param
+          )
+          session[:google_access_token] = access_token.token
+          logger.debug access_token
+          
+          #session[:login_user_id] = access_token.params[:user_id]
+          #session[:login_name] = access_token.params[:screen_name]
+          #session[:login_domain] = 'google'
+          referrer = session[:referer] || '/'
+          #session.delete(:referer)
+          response.redirect referrer || '/'
+        rescue => e
+          logger.debug "google_callback_error #{e}"
+          response.server_error
+        end # callback
+        
+        private
+        #
+        #
+        #
+        def get_config
+          @config = Environments.current.config['google']
+          response.server_error if @config.blank?
+          if session[:login_user_id]
+            referrer = session[:referer] || request.referrer || '/'
+            session.delete(:referer)
+            response.redirect referrer
+          end
+          @google_client = OAuth2::Client.new(
+            @config['client_id'],
+            @config['client_secret'],
+            :site => 'https://accounts.google.com',
+            :authorize_url => '/o/oauth2/auth',
+            :token_url => '/o/oauth2/token'
+          )
+          @auth_param = {
+            :redirect_uri => "#{helper.root_uri}#{helper.r(:callback)}"
+#             :redirect_uri => "http://www.uzuuzu.jp"
+          }
+          @auth_param[:scope] = @config['scope'] if @config['scope']
+          @auth_param[:response_type] = @config['response_type'] if @config['response_type']
+        end # get_config
+        
+      end # Google
+    end # Login
+  end # Controller
+end # UzuUzu

data/lib/uzuuzu-core/controller/login/{oauth.rb → twitter.rb}

@@ -7,47 +7,34 @@ module UzuUzu
       #
       #
       #
-      class Oauth
+      class Twitter
         
         #
         #
         #
-        def index(name)
-          get_config(name)
-          if session[:login_user_id]
-            response.redirect request.referrer || '/'
-          end
-          session[:referer] = request.referrer || '/'
-          twitter_consumer = ::OAuth::Consumer.new(
-            @config['consumer_key'],
-            @config['consumer_secret'],
-            @config
+        def index
+          get_config
+          session[:referer] = session[:referer] || request.referrer || '/'
+          
+          request_token = @twitter_consumer.get_request_token(
+            :oauth_callback => "#{helper.root_uri}#{helper.r(:callback)}"
           )
-          request_token = twitter_consumer.get_request_token(:oauth_callback => "#{helper.root_uri}#{helper.r(:callback)}/#{name}")
           session[:twitter_request_token] = request_token.token
           session[:twitter_request_token_secret] = request_token.secret
           
           response.redirect request_token.authorize_url
         rescue => e
-          logger.debug "oauth_request_error #{e}"
+          logger.debug "twitter_request_error #{e}"
           response.server_error
         end # index
         
         #
         #
         #
-        def callback(name)
-          get_config(name)
-          if session[:login_user_id]
-            response.redirect request.referrer || '/'
-          end
-          twitter_consumer = ::OAuth::Consumer.new(
-            @config['consumer_key'],
-            @config['consumer_secret'],
-            @config
-          )
+        def callback
+          get_config
           request_token = ::OAuth::RequestToken.new(
-            twitter_consumer,
+            @twitter_consumer,
             session[:twitter_request_token],
             session[:twitter_request_token_secret]
           )
@@ -61,15 +48,15 @@ module UzuUzu
           session.delete(:twitter_request_token)
           session.delete(:twitter_request_token_secret)
           
-          session[:twitter_user_id] = access_token.params[:user_id]
-          session[:login_user_id] = access_token.params[:screen_name]
+          session[:login_user_id] = access_token.params[:user_id]
           session[:login_name] = access_token.params[:screen_name]
-          session[:login_domain] = name
+          session[:login_domain] = 'twitter'
+          
           referrer = session[:referer] || '/'
           session.delete(:referer)
-          response.redirect referrer || '/'
+          response.redirect referrer
         rescue => e
-          logger.debug "oauth_callback_error #{e}"
+          logger.debug "twitter_callback_error #{e}"
           response.server_error
         end # callback
         
@@ -77,14 +64,22 @@ module UzuUzu
         #
         #
         #
-        def get_config(name)
-          @oauth_config = Environments.current.config['oauth']
-          response.server_error if @oauth_config.blank?
-          @config = @oauth_config[name]
+        def get_config
+          @config = Environments.current.config['twitter']
           response.server_error if @config.blank?
+          if session[:login_user_id]
+            referrer = session[:referer] || request.referrer || '/'
+            session.delete(:referer)
+            response.redirect referrer
+          end
+          @twitter_consumer = ::OAuth::Consumer.new(
+            @config['consumer_key'],
+            @config['consumer_secret'],
+            :site => 'http://twitter.com'
+          )
         end # get_config
         
-      end # Oauth
+      end # Twitter
     end # Login
   end # Controller
 end # UzuUzu

data/lib/uzuuzu-core/controller.rb

@@ -5,7 +5,9 @@ module UzuUzu
     include ::UzuUzu::Helper::Controller
     require 'uzuuzu-core/controller/index'
     module Login
-      require 'uzuuzu-core/controller/login/oauth'
+      require 'uzuuzu-core/controller/login/facebook'
+      require 'uzuuzu-core/controller/login/google'
+      require 'uzuuzu-core/controller/login/twitter'
     end
     
     def self.current

data/uzuuzu-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{uzuuzu-core}
-  s.version = "0.1.8"
+  s.version = "0.1.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Takuya Kondo"]
-  s.date = %q{2012-01-01}
+  s.date = %q{2012-01-03}
   s.description = %q{uzuuzu core library}
   s.email = %q{takuya_v_v@uzuuzu.jp}
   s.extra_rdoc_files = [
@@ -29,7 +29,9 @@ Gem::Specification.new do |s|
     "lib/uzuuzu-core/application.rb",
     "lib/uzuuzu-core/controller.rb",
     "lib/uzuuzu-core/controller/index.rb",
-    "lib/uzuuzu-core/controller/login/oauth.rb",
+    "lib/uzuuzu-core/controller/login/facebook.rb",
+    "lib/uzuuzu-core/controller/login/google.rb",
+    "lib/uzuuzu-core/controller/login/twitter.rb",
     "lib/uzuuzu-core/controller/view/error/404.rhtml",
     "lib/uzuuzu-core/controller/view/error/500.rhtml",
     "lib/uzuuzu-core/environments.rb",
@@ -79,8 +81,8 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rack>, [">= 0"])
       s.add_runtime_dependency(%q<extlib>, [">= 0"])
-      s.add_runtime_dependency(%q<ruby-openid>, [">= 0"])
       s.add_runtime_dependency(%q<oauth>, [">= 0"])
+      s.add_runtime_dependency(%q<oauth2>, [">= 0"])
       s.add_runtime_dependency(%q<tilt>, [">= 0"])
       s.add_runtime_dependency(%q<erubis>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
@@ -90,8 +92,8 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<rack>, [">= 0"])
       s.add_dependency(%q<extlib>, [">= 0"])
-      s.add_dependency(%q<ruby-openid>, [">= 0"])
       s.add_dependency(%q<oauth>, [">= 0"])
+      s.add_dependency(%q<oauth2>, [">= 0"])
       s.add_dependency(%q<tilt>, [">= 0"])
       s.add_dependency(%q<erubis>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
@@ -102,8 +104,8 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<rack>, [">= 0"])
     s.add_dependency(%q<extlib>, [">= 0"])
-    s.add_dependency(%q<ruby-openid>, [">= 0"])
     s.add_dependency(%q<oauth>, [">= 0"])
+    s.add_dependency(%q<oauth2>, [">= 0"])
     s.add_dependency(%q<tilt>, [">= 0"])
     s.add_dependency(%q<erubis>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])

metadata

@@ -2,7 +2,7 @@
 name: uzuuzu-core
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.8
+  version: 0.1.10
 platform: ruby
 authors: 
 - Takuya Kondo
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-01 00:00:00 +09:00
+date: 2012-01-03 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -36,7 +36,7 @@ dependencies:
   prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: ruby-openid
+  name: oauth
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -47,7 +47,7 @@ dependencies:
   prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: oauth
+  name: oauth2
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -145,7 +145,9 @@ files:
 - lib/uzuuzu-core/application.rb
 - lib/uzuuzu-core/controller.rb
 - lib/uzuuzu-core/controller/index.rb
-- lib/uzuuzu-core/controller/login/oauth.rb
+- lib/uzuuzu-core/controller/login/facebook.rb
+- lib/uzuuzu-core/controller/login/google.rb
+- lib/uzuuzu-core/controller/login/twitter.rb
 - lib/uzuuzu-core/controller/view/error/404.rhtml
 - lib/uzuuzu-core/controller/view/error/500.rhtml
 - lib/uzuuzu-core/environments.rb
@@ -196,7 +198,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4458084607244374049
+      hash: 2546083607633769446
       segments: 
       - 0
       version: "0"