diff options
-rw-r--r-- | actionpack/lib/action_dispatch/middleware/stack.rb | 3 | ||||
-rw-r--r-- | activesupport/lib/active_support/dependencies.rb | 7 |
2 files changed, 4 insertions, 6 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/stack.rb b/actionpack/lib/action_dispatch/middleware/stack.rb index fe87abb4d0..d9bfd3d573 100644 --- a/actionpack/lib/action_dispatch/middleware/stack.rb +++ b/actionpack/lib/action_dispatch/middleware/stack.rb @@ -8,11 +8,12 @@ module ActionDispatch def initialize(klass_or_name, *args, &block) @klass = nil - @name = klass_or_name if klass_or_name.respond_to?(:name) @klass = klass_or_name @name = @klass.name + else + @name = klass_or_name.to_s end @args, @block = args, block diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb index 94a8608aeb..d5c51ca417 100644 --- a/activesupport/lib/active_support/dependencies.rb +++ b/activesupport/lib/active_support/dependencies.rb @@ -47,9 +47,6 @@ module ActiveSupport #:nodoc: mattr_accessor :autoloaded_constants self.autoloaded_constants = [] - mattr_accessor :references - self.references = {} - # An array of constant names that need to be unloaded on every request. Used # to allow arbitrary constants to be marked for unloading. mattr_accessor :explicitly_unloadable_constants @@ -565,11 +562,11 @@ module ActiveSupport #:nodoc: Reference = ClassCache.new def ref(name) - references[name] ||= Reference.new(name) + Reference.new(name) end def constantize(name) - ref(name).get(name) + Reference.get(name) end # Determine if the given constant has been automatically loaded. |