mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
deprecating process_view_paths
This commit is contained in:
parent
3ad26c8e48
commit
f9f423fa18
5 changed files with 6 additions and 4 deletions
|
@ -87,7 +87,7 @@ module AbstractController
|
||||||
# * <tt>paths</tt> - If a PathSet is provided, use that;
|
# * <tt>paths</tt> - If a PathSet is provided, use that;
|
||||||
# otherwise, process the parameter into a PathSet.
|
# otherwise, process the parameter into a PathSet.
|
||||||
def view_paths=(paths)
|
def view_paths=(paths)
|
||||||
self._view_paths = ActionView::Base.process_view_paths(paths)
|
self._view_paths = ActionView::PathSet.new(Array.wrap(paths))
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -4,6 +4,7 @@ require 'active_support/core_ext/class/attribute'
|
||||||
require 'active_support/core_ext/array/wrap'
|
require 'active_support/core_ext/array/wrap'
|
||||||
require 'active_support/ordered_options'
|
require 'active_support/ordered_options'
|
||||||
require 'action_view/log_subscriber'
|
require 'action_view/log_subscriber'
|
||||||
|
require 'active_support/core_ext/module/deprecation'
|
||||||
|
|
||||||
module ActionView #:nodoc:
|
module ActionView #:nodoc:
|
||||||
# = Action View Base
|
# = Action View Base
|
||||||
|
@ -161,6 +162,7 @@ module ActionView #:nodoc:
|
||||||
value.is_a?(PathSet) ?
|
value.is_a?(PathSet) ?
|
||||||
value.dup : ActionView::PathSet.new(Array.wrap(value))
|
value.dup : ActionView::PathSet.new(Array.wrap(value))
|
||||||
end
|
end
|
||||||
|
deprecate :process_view_paths
|
||||||
|
|
||||||
def xss_safe? #:nodoc:
|
def xss_safe? #:nodoc:
|
||||||
true
|
true
|
||||||
|
|
|
@ -78,7 +78,7 @@ module ActionView
|
||||||
# Whenever setting view paths, makes a copy so we can manipulate then in
|
# Whenever setting view paths, makes a copy so we can manipulate then in
|
||||||
# instance objects as we wish.
|
# instance objects as we wish.
|
||||||
def view_paths=(paths)
|
def view_paths=(paths)
|
||||||
@view_paths = ActionView::Base.process_view_paths(paths)
|
@view_paths = ActionView::PathSet.new(Array.wrap(paths))
|
||||||
end
|
end
|
||||||
|
|
||||||
def find(name, prefixes = [], partial = false, keys = [])
|
def find(name, prefixes = [], partial = false, keys = [])
|
||||||
|
|
|
@ -42,7 +42,7 @@ class CompiledTemplatesTest < Test::Unit::TestCase
|
||||||
|
|
||||||
def render_without_cache(*args)
|
def render_without_cache(*args)
|
||||||
path = ActionView::FileSystemResolver.new(FIXTURE_LOAD_PATH)
|
path = ActionView::FileSystemResolver.new(FIXTURE_LOAD_PATH)
|
||||||
view_paths = ActionView::Base.process_view_paths(path)
|
view_paths = ActionView::PathSet.new([path])
|
||||||
ActionView::Base.new(view_paths, {}).render(*args)
|
ActionView::Base.new(view_paths, {}).render(*args)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -380,7 +380,7 @@ class LazyViewRenderTest < ActiveSupport::TestCase
|
||||||
# is not eager loaded
|
# is not eager loaded
|
||||||
def setup
|
def setup
|
||||||
path = ActionView::FileSystemResolver.new(FIXTURE_LOAD_PATH)
|
path = ActionView::FileSystemResolver.new(FIXTURE_LOAD_PATH)
|
||||||
view_paths = ActionView::Base.process_view_paths(path)
|
view_paths = ActionView::PathSet.new([path])
|
||||||
assert_equal ActionView::FileSystemResolver.new(FIXTURE_LOAD_PATH), view_paths.first
|
assert_equal ActionView::FileSystemResolver.new(FIXTURE_LOAD_PATH), view_paths.first
|
||||||
setup_view(view_paths)
|
setup_view(view_paths)
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue