uzuuzu-core 0.1.7 → 0.1.8

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.1.8

data/lib/uzuuzu-core/application.rb

@@ -253,6 +253,7 @@ module UzuUzu
           end
         end
         request_paths.each_with_index do |request_path, index|
+          break if _c.nil?
           next if request_path.blank?
           c_str = request_path.camel_case
           route = "#{request_paths[0...index].join('/')}"
@@ -273,8 +274,13 @@ module UzuUzu
           if map && map[:controller].kind_of?(::Class)
             classies << map
           end
-          _c = map[:controller] if map
+          if map
+            _c = map[:controller]
+          else
+            _c = nil
+          end
           unless _c.kind_of?(::Class) || _c.kind_of?(::Module)
+            _c = nil
             break
           end
         end

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

@@ -0,0 +1,90 @@
+# coding: utf-8
+require 'oauth'
+
+module UzuUzu
+  module Controller
+    module Login
+      #
+      #
+      #
+      class Oauth
+        
+        #
+        #
+        #
+        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
+          )
+          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}"
+          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
+          )
+          request_token = ::OAuth::RequestToken.new(
+            twitter_consumer,
+            session[:twitter_request_token],
+            session[:twitter_request_token_secret]
+          )
+          access_token = request_token.get_access_token(
+            {},
+            :oauth_token => request.params[:oauth_token],
+            :oauth_verifier => request.params[:oauth_verifier]
+          )
+          session[:twitter_access_token] = access_token.token
+          session[:twitter_access_token_secret] = access_token.secret
+          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_name] = access_token.params[:screen_name]
+          session[:login_domain] = name
+          referrer = session[:referer] || '/'
+          session.delete(:referer)
+          response.redirect referrer || '/'
+        rescue => e
+          logger.debug "oauth_callback_error #{e}"
+          response.server_error
+        end # callback
+        
+        private
+        #
+        #
+        #
+        def get_config(name)
+          @oauth_config = Environments.current.config['oauth']
+          response.server_error if @oauth_config.blank?
+          @config = @oauth_config[name]
+          response.server_error if @config.blank?
+        end # get_config
+        
+      end # Oauth
+    end # Login
+  end # Controller
+end # UzuUzu

data/lib/uzuuzu-core/controller.rb

@@ -5,7 +5,7 @@ module UzuUzu
     include ::UzuUzu::Helper::Controller
     require 'uzuuzu-core/controller/index'
     module Login
-      require 'uzuuzu-core/controller/login/twitter'
+      require 'uzuuzu-core/controller/login/oauth'
     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.7"
+  s.version = "0.1.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Takuya Kondo"]
-  s.date = %q{2011-12-25}
+  s.date = %q{2012-01-01}
   s.description = %q{uzuuzu core library}
   s.email = %q{takuya_v_v@uzuuzu.jp}
   s.extra_rdoc_files = [
@@ -29,7 +29,7 @@ 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/twitter.rb",
+    "lib/uzuuzu-core/controller/login/oauth.rb",
     "lib/uzuuzu-core/controller/view/error/404.rhtml",
     "lib/uzuuzu-core/controller/view/error/500.rhtml",
     "lib/uzuuzu-core/environments.rb",

metadata

@@ -2,7 +2,7 @@
 name: uzuuzu-core
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors: 
 - Takuya Kondo
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-25 00:00:00 +09:00
+date: 2012-01-01 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -145,7 +145,7 @@ files:
 - lib/uzuuzu-core/application.rb
 - lib/uzuuzu-core/controller.rb
 - lib/uzuuzu-core/controller/index.rb
-- lib/uzuuzu-core/controller/login/twitter.rb
+- lib/uzuuzu-core/controller/login/oauth.rb
 - lib/uzuuzu-core/controller/view/error/404.rhtml
 - lib/uzuuzu-core/controller/view/error/500.rhtml
 - lib/uzuuzu-core/environments.rb
@@ -196,7 +196,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4358867638685412053
+      hash: -4458084607244374049
       segments: 
       - 0
       version: "0"

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

@@ -1,78 +0,0 @@
-# coding: utf-8
-require 'oauth'
-
-module UzuUzu
-  module Controller
-    module Login
-      #
-      #
-      #
-      class Twitter
-        
-        def index
-          @config = Environments.current.config['twitter']
-          response.server_error if @config.blank?
-          if session[:login_user_id]
-            response.redirect request.referrer || '/'
-          end
-          if session[:twitter_request_token].blank?
-            request_token
-          end
-          access_token
-          response.redirect session[:referer] || '/'
-        end # index
-        
-        private
-        def request_token
-          session[:referer] = request.referrer || '/'
-          twitter_consumer = OAuth::Consumer.new(
-             @config['consumer_key'],
-             @config['consumer_secret'],
-             :site => "http://twitter.com",
-             :request_token_url => 'https://api.twitter.com/oauth/request_token',
-             :autorize_url => 'https://api.twitter.com/oauth/authorize',
-             :access_token_url => 'https://api.twitter.com/oauth/access_token',
-             :oauth_callback => "#{helper.root_uri}#{helper.r}"
-          )
-          request_token = twitter_consumer.get_request_token()
-          session[:twitter_request_token] = request_token.token
-          
-          response.redirect request_token.authorize_url(:oauth_callback => "#{helper.root_uri}#{helper.r}")
-        rescue
-          response.server_error
-        end # request_token
-        
-        def access_token
-          twitter_consumer = OAuth::Consumer.new(
-            @config['consumer_key'],
-            @config['consumer_secret'],
-            :site => "http://twitter.com",
-            :request_token_url => 'https://api.twitter.com/oauth/request_token',
-            :autorize_url => 'https://api.twitter.com/oauth/authorize',
-            :access_token_url => 'https://api.twitter.com/oauth/access_token',
-          )
-          request_token = OAuth::RequestToken.new(
-            twitter_consumer,
-            session[:twitter_request_token]
-          )
-          access_token = request_token.get_access_token(
-            {},
-            :oauth_token => request.params[:oauth_token],
-            :oauth_verifier => request.params[:oauth_verifier]
-          )
-          session[:twitter_access_token] = access_token.token
-          session[:twitter_access_token_secret] = access_token.secret
-          session.delete(:twitter_request_token)
-          
-          session[:twitter_user_id] = access_token.params[:user_id]
-          session[:login_user_id] = access_token.params[:screen_name]
-          session[:login_name] = access_token.params[:screen_name]
-          session[:login_domain] = 'twitter'
-        rescue => e
-          response.server_error
-        end # access_token
-        
-      end # Twitter
-    end # Login
-  end # Controller
-end # UzuUzu