lib/action_dispatch/middleware/stack.rb in actionpack-5.0.7.2 vs lib/action_dispatch/middleware/stack.rb in actionpack-5.1.0.beta1
- old
+ new
@@ -86,11 +86,10 @@
insert(index, *args, &block)
middlewares.delete_at(index + 1)
end
def delete(target)
- target = get_class target
middlewares.delete_if { |m| m.klass == target }
end
def use(klass, *args, &block)
middlewares.push(build_middleware(klass, args, block))
@@ -100,34 +99,16 @@
middlewares.freeze.reverse.inject(app) { |a, e| e.build(a) }
end
private
- def assert_index(index, where)
- index = get_class index
- i = index.is_a?(Integer) ? index : middlewares.index { |m| m.klass == index }
- raise "No such middleware to insert #{where}: #{index.inspect}" unless i
- i
- end
-
- def get_class(klass)
- if klass.is_a?(String) || klass.is_a?(Symbol)
- classcache = ActiveSupport::Dependencies::Reference
- converted_klass = classcache[klass.to_s]
- ActiveSupport::Deprecation.warn <<-eowarn
-Passing strings or symbols to the middleware builder is deprecated, please change
-them to actual class references. For example:
-
- "#{klass}" => #{converted_klass}
-
- eowarn
- converted_klass
- else
- klass
+ def assert_index(index, where)
+ i = index.is_a?(Integer) ? index : middlewares.index { |m| m.klass == index }
+ raise "No such middleware to insert #{where}: #{index.inspect}" unless i
+ i
end
- end
- def build_middleware(klass, args, block)
- Middleware.new(get_class(klass), args, block)
- end
+ def build_middleware(klass, args, block)
+ Middleware.new(klass, args, block)
+ end
end
end