Move AD::Cascade to the bottom of the middleware stack.
This commit is contained in:
parent
4750e61bfe
commit
99b38f371a
|
@ -150,10 +150,10 @@ module Rails
|
|||
middleware.use('::ActionDispatch::Cookies')
|
||||
middleware.use(lambda { session_store }, lambda { session_options })
|
||||
middleware.use('::ActionDispatch::Flash', :if => lambda { session_store })
|
||||
middleware.use(lambda { metal_loader.build_middleware(metals) }, :if => lambda { metal_loader.metals.any? })
|
||||
middleware.use('ActionDispatch::ParamsParser')
|
||||
middleware.use('::ActionDispatch::ParamsParser')
|
||||
middleware.use('::Rack::MethodOverride')
|
||||
middleware.use('::ActionDispatch::Head')
|
||||
middleware.use(lambda { metal_loader.build_middleware(metals) }, :if => lambda { metal_loader.metals.any? })
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -5,6 +5,37 @@ require 'rails/rack'
|
|||
|
||||
module Rails
|
||||
module Configuration
|
||||
class MiddlewareStackProxy #:nodoc:
|
||||
def initialize
|
||||
@operations = []
|
||||
end
|
||||
|
||||
def insert_before(*args, &block)
|
||||
@operations << [:insert_before, args, block]
|
||||
end
|
||||
|
||||
alias :insert :insert_before
|
||||
|
||||
def insert_after(*args, &block)
|
||||
@operations << [:insert_after, args, block]
|
||||
end
|
||||
|
||||
def swap(*args, &block)
|
||||
@operations << [:swap, args, block]
|
||||
end
|
||||
|
||||
def use(*args, &block)
|
||||
@operations << [:use, args, block]
|
||||
end
|
||||
|
||||
def merge_into(other)
|
||||
@operations.each do |operation, args, block|
|
||||
other.send(operation, *args, &block)
|
||||
end
|
||||
other
|
||||
end
|
||||
end
|
||||
|
||||
class Generators #:nodoc:
|
||||
attr_accessor :aliases, :options, :templates, :fallbacks, :colorize_logging
|
||||
|
||||
|
|
|
@ -3,37 +3,6 @@ require 'rails/configuration'
|
|||
module Rails
|
||||
class Railtie
|
||||
class Configuration
|
||||
class MiddlewareStackProxy
|
||||
def initialize
|
||||
@operations = []
|
||||
end
|
||||
|
||||
def insert_before(*args, &block)
|
||||
@operations << [:insert_before, args, block]
|
||||
end
|
||||
|
||||
alias insert insert_before
|
||||
|
||||
def insert_after(*args, &block)
|
||||
@operations << [:insert_after, args, block]
|
||||
end
|
||||
|
||||
def swap(*args, &block)
|
||||
@operations << [:swap, args, block]
|
||||
end
|
||||
|
||||
def use(*args, &block)
|
||||
@operations << [:use, args, block]
|
||||
end
|
||||
|
||||
def merge_into(other)
|
||||
@operations.each do |operation, args, block|
|
||||
other.send(operation, *args, &block)
|
||||
end
|
||||
other
|
||||
end
|
||||
end
|
||||
|
||||
def initialize
|
||||
@@options ||= {}
|
||||
end
|
||||
|
@ -44,7 +13,7 @@ module Rails
|
|||
# application once it is defined and the default_middlewares are
|
||||
# created
|
||||
def app_middleware
|
||||
@@app_middleware ||= MiddlewareStackProxy.new
|
||||
@@app_middleware ||= Rails::Configuration::MiddlewareStackProxy.new
|
||||
end
|
||||
|
||||
# Holds generators configuration:
|
||||
|
|
Loading…
Reference in New Issue