warden_omniauth-jonrowe 0.2.0 → 0.2.1

data/lib/warden_omniauth.rb

@@ -44,20 +44,12 @@ class WardenOmniAuth
   # The base omniauth warden strategy.  This is inherited for each
   # omniauth strategy
   class Strategy < Warden::Strategies::Base
-    # make a specific callback for this strategy
-    def self.on_callback(&blk)
-      @on_callback = blk if blk
-      @on_callback || WardenOmniAuth.on_callback
-    end
-
-    # The name of the OmniAuth strategy to map to
-    def self.omni_name=(name)
-      @omni_name = name
-    end
-
-    # The name of the OmniAuth strategy to map to
-    def self.omni_name
-      @omni_name
+    class << self
+      def on_callback(&blk)
+        @on_callback = blk if blk
+        @on_callback || WardenOmniAuth.on_callback
+      end
+      attr_accessor :omni_name
     end
 
     def authenticate!
@@ -104,12 +96,14 @@ class WardenOmniAuth
 
   # redirect after a callback
   def redirect_after_callback=(path)
-    @redirect_after_callback_path = path
+    @generate_path_to_redirect_after_callback = proc { path }
+  end
+  def redirect_after_callback(&block)
+    @generate_path_to_redirect_after_callback = block
   end
 
-
-  def redirect_after_callback_path
-    @redirect_after_callback_path ||= "/"
+  def redirect_after_callback_path(env={})
+    (@generate_path_to_redirect_after_callback || proc { "/" } ).call(env)
   end
 
   def call(env)
@@ -131,7 +125,7 @@ class WardenOmniAuth
           args << {:scope => scope.to_sym} if scope
           response = Rack::Response.new
           if env['warden'].authenticate? *args
-            response.redirect(redirect_after_callback_path)
+            response.redirect(redirect_after_callback_path(env))
             response.finish
           else
             auth_path = request.path.gsub(/\/callback$/, "")

data/lib/warden_omniauth/version.rb

@@ -1,3 +1,3 @@
 module WardenOmniauth
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/test/test_warden_omniauth.rb

@@ -96,6 +96,18 @@ context do
       assert("should have made it into the app") { $captures.size == 1 }
       assert("should have captured the user"){ $captures.first[:info] == 'fred' }
     end
+    test do
+      session = { WardenOmniAuth::SCOPE_KEY => "user" }
+      $omni_auth.redirect_after_callback do |env|
+        assert('enviromnent passed to block') { env.fetch('omniauth.auth',{})['info'] == 'fred' }
+        '/my/dynamic/path'
+      end
+
+      response = get("/auth/twitter/callback", {}, {'rack.session' => session, 'omniauth.auth' => {'info' => "fred"}})
+
+      assert("should be redirected")                   { response.status == 302 }
+      assert("should go to the dynamic redirect path") { response.headers['Location'] == '/my/dynamic/path' }
+    end
 
     # should give me different handlers for different callbacks
     test do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: warden_omniauth-jonrowe
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-17 00:00:00.000000000 Z
+date: 2012-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -92,7 +92,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -999869407491389986
+      hash: -1914201548067094911
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: