From efaf59dd221c0fa40189f091d61807b2c8e8610c Mon Sep 17 00:00:00 2001 From: Anil Wadghule Date: Tue, 8 Jun 2010 22:02:40 +0530 Subject: [PATCH] Fix failing of Sinatra as middleware [#4367 state:resolved] --- .../lib/action_controller/middleware_stack.rb | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/actionpack/lib/action_controller/middleware_stack.rb b/actionpack/lib/action_controller/middleware_stack.rb index b739a6d..74ac518 100644 --- a/actionpack/lib/action_controller/middleware_stack.rb +++ b/actionpack/lib/action_controller/middleware_stack.rb @@ -27,12 +27,14 @@ module ActionController end def klass - if @klass.respond_to?(:call) + if @klass.respond_to?(:new) + @klass + elsif @klass.respond_to?(:call) @klass.call elsif @klass.is_a?(Class) @klass else - @klass.to_s.constantize + ActiveSupport::Inflector.constantize(@klass.to_s) end rescue NameError @klass -- 1.7.0.4