diff options
author | Yehuda Katz <wycats@gmail.com> | 2009-01-04 00:56:52 -0800 |
---|---|---|
committer | Yehuda Katz <wycats@gmail.com> | 2009-01-04 00:56:52 -0800 |
commit | ca54cc5df72a8bd7660d5be8333dcee2b6949257 (patch) | |
tree | 187c326c4e305ac1207878274fa523d8a3852298 /actionpack/lib/action_controller/middleware_stack.rb | |
parent | a38c749d8b5fd020d7294ffb4d597d4ab3fb30db (diff) | |
download | rails-ca54cc5df72a8bd7660d5be8333dcee2b6949257.tar.gz rails-ca54cc5df72a8bd7660d5be8333dcee2b6949257.tar.bz2 rails-ca54cc5df72a8bd7660d5be8333dcee2b6949257.zip |
Sync 'rails/rails/master'
Diffstat (limited to 'actionpack/lib/action_controller/middleware_stack.rb')
-rw-r--r-- | actionpack/lib/action_controller/middleware_stack.rb | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/middleware_stack.rb b/actionpack/lib/action_controller/middleware_stack.rb index 74f28565c0..2bccba2ba1 100644 --- a/actionpack/lib/action_controller/middleware_stack.rb +++ b/actionpack/lib/action_controller/middleware_stack.rb @@ -1,6 +1,14 @@ module ActionController class MiddlewareStack < Array class Middleware + def self.new(klass, *args, &block) + if klass.is_a?(self) + klass + else + super + end + end + attr_reader :args, :block def initialize(klass, *args, &block) @@ -65,6 +73,19 @@ module ActionController block.call(self) if block_given? end + def insert(index, *objs) + index = self.index(index) unless index.is_a?(Integer) + objs = objs.map { |obj| Middleware.new(obj) } + super(index, *objs) + end + + alias_method :insert_before, :insert + + def insert_after(index, *objs) + index = self.index(index) unless index.is_a?(Integer) + insert(index + 1, *objs) + end + def use(*args, &block) middleware = Middleware.new(*args, &block) push(middleware) |