Bugfixes and Rails Edge
Update to Rails 2.3.1. (Actually, not quite. Doesn't look like 2.3.1 will be released today, but I REALLY want to push these bugfixes out.) Removed bundled Rack (Rails 2.3.1 comes bundled with Rack 1.0). Add config.action_view.cache_template_loading = true to production environment. Fix FastCGI bug (http://rubyforge.org/tracker/index.php?func=detail&aid=24191&group_id=186&atid=783). Fix WikiWords bug (http://rubyforge.org/pipermail/instiki-users/2009-February/001181.html).
This commit is contained in:
parent
0ddef97328
commit
133c21b801
641 changed files with 20541 additions and 71675 deletions
|
@ -27,7 +27,9 @@ module ActionController
|
|||
end
|
||||
|
||||
def klass
|
||||
if @klass.is_a?(Class)
|
||||
if @klass.respond_to?(:call)
|
||||
@klass.call
|
||||
elsif @klass.is_a?(Class)
|
||||
@klass
|
||||
else
|
||||
@klass.to_s.constantize
|
||||
|
@ -37,6 +39,8 @@ module ActionController
|
|||
end
|
||||
|
||||
def active?
|
||||
return false unless klass
|
||||
|
||||
if @conditional.respond_to?(:call)
|
||||
@conditional.call
|
||||
else
|
||||
|
@ -63,11 +67,17 @@ module ActionController
|
|||
|
||||
def build(app)
|
||||
if block
|
||||
klass.new(app, *args, &block)
|
||||
klass.new(app, *build_args, &block)
|
||||
else
|
||||
klass.new(app, *args)
|
||||
klass.new(app, *build_args)
|
||||
end
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def build_args
|
||||
Array(args).map { |arg| arg.respond_to?(:call) ? arg.call : arg }
|
||||
end
|
||||
end
|
||||
|
||||
def initialize(*args, &block)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue