rack-twitter-auth 0.1.5 → 0.2.0

data/Rakefile

@@ -3,7 +3,7 @@ require 'rubygems'
 require 'rake/rdoctask'
 require 'spec/rake/spectask'
 
-puts "\nGem: rack-oauth\n\n"
+puts "\nGem: rack-twitter-auth\n\n"
 
 begin
   require 'jeweler'
@@ -13,7 +13,7 @@ begin
     s.email       = ['remi@remitaylor.com', 'brianthecoder@gmail.com']
     s.homepage    = 'http://github.com/remi/rack-twitter-auth'
     s.description = 'Rack Middleware for OAuth Authorization and Authentication via/twitter'
-    s.authors     = %w( remi brianthecoder)
+    s.authors     = %w(remi brianthecoder)
     s.files       = FileList['[A-Z]*', '{lib,spec,bin,examples}/**/*'] 
     s.add_dependency 'oauth'
     s.add_dependency 'rack'

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.2.0

data/lib/rack-oauth.rb

@@ -64,7 +64,7 @@ module Rack #:nodoc:
 
       # Returns the instance of Rack::OAuth given a name (defaults to the default Rack::OAuth name)
       def oauth_instance name = nil
-        oauth = Rack::OAuth.get(oauth_request_env, nil)
+        oauth = Rack::OAuth.get(oauth_request_env, name)
         raise "Couldn't find Rack::OAuth instance with name #{ name }" unless oauth
         oauth
       end
@@ -122,9 +122,14 @@ module Rack #:nodoc:
     def callback_path
       ::File.join *[@callback_path.to_s, name_unless_default].compact
     end
+    
     attr_writer :callback_path
     alias callback  callback_path
     alias callback= callback_path=
+    
+    def redirect_path
+      ::File.join *[@redirect_to.to_s, name_unless_default].compact
+    end
 
     # the URL that Rack::OAuth should redirect to after the OAuth has been completed (part of your app)
     attr_accessor :redirect_to
@@ -156,6 +161,7 @@ module Rack #:nodoc:
     def name
       @name.to_s
     end
+    
     attr_writer :name
 
     def initialize app, *args
@@ -183,13 +189,11 @@ module Rack #:nodoc:
       # the provider will redirect back to our application's callback path
       when login_path
         do_login(env)
-
       # the oauth provider has redirected back to us!  we should have a 
       # verifier now that we can use, in combination with out token and 
       # secret, to get an access token for this user
       when callback_path
         do_callback(env)
-
       else
         @app.call(env)
       end
@@ -222,7 +226,7 @@ module Rack #:nodoc:
       session(env).delete(:secret)
 
       # we have an access token now ... redirect back to the user's application
-      [ 302, { 'Content-Type' => 'text/html', 'Location' => redirect_to }, [] ]
+      [ 302, { 'Content-Type' => 'text/html', 'Location' => redirect_path }, [] ]
     end
 
     # Stores the access token in this env's session in a way that we can get it back out via #get_access_token(env)
@@ -286,4 +290,4 @@ module Rack #:nodoc:
 
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rack-twitter-auth
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors: 
 - remi
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-22 00:00:00 -06:00
+date: 2010-03-05 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency