diff options
author | Collin Miller <collintmiller@gmail.com> | 2010-09-12 05:30:21 +0800 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2010-09-12 07:35:54 +0800 |
commit | 96650f704a7a36097d634972484a305a639143c7 (patch) | |
tree | bcb08700c195984bb0e7a882bf42da8dcbc9588d /actionpack/lib | |
parent | 0aa66f04e4b4698718023cacb18612e04a4c5eb1 (diff) | |
download | rails-96650f704a7a36097d634972484a305a639143c7.tar.gz rails-96650f704a7a36097d634972484a305a639143c7.tar.bz2 rails-96650f704a7a36097d634972484a305a639143c7.zip |
added block arguments to ActionController::Metal#use
Useful for cases such as warden, where a block configuration is taken.
class SomeController < ApplicationController
use RailsWarden::Manager do |manager|
manager.default_strategies :facebook_oauth
manager.failure_app = SomeController.action(:authorize)
end
end
Diffstat (limited to 'actionpack/lib')
-rw-r--r-- | actionpack/lib/action_controller/metal.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/metal.rb b/actionpack/lib/action_controller/metal.rb index def28a0054..96cb5977d5 100644 --- a/actionpack/lib/action_controller/metal.rb +++ b/actionpack/lib/action_controller/metal.rb @@ -12,7 +12,7 @@ module ActionController # class MiddlewareStack < ActionDispatch::MiddlewareStack #:nodoc: class Middleware < ActionDispatch::MiddlewareStack::Middleware #:nodoc: - def initialize(klass, *args) + def initialize(klass, *args, &block) options = args.extract_options! @only = Array(options.delete(:only)).map(&:to_s) @except = Array(options.delete(:except)).map(&:to_s) @@ -149,8 +149,8 @@ module ActionController super end - def self.use(*args) - middleware_stack.use(*args) + def self.use(*args, &block) + middleware_stack.use(*args, &block) end def self.middleware |