Permalink
Browse files

Merge remote branch 'apotonick/presentation'

  • Loading branch information...
2 parents bff3740 + eb327c1 commit 4758d37044ac7a938c8b1dbd90470410a0566491 @josevalim josevalim committed May 4, 2011
@@ -104,7 +104,7 @@ def view_context
# Returns an object that is able to render templates.
def view_renderer
- @view_renderer ||= ActionView::Renderer.new(lookup_context, self)
+ @view_renderer ||= ActionView::Renderer.new(lookup_context)
end
# Normalize arguments, options and then delegates render_to_body and
@@ -15,7 +15,10 @@ module ViewPaths
# templates, i.e. view paths and details. Check ActionView::LookupContext for more
# information.
def lookup_context
- @lookup_context ||= ActionView::LookupContext.new(self.class._view_paths, details_for_lookup)
+ @lookup_context ||=
+ ActionView::LookupContext.new(self.class._view_paths, details_for_lookup).tap do |ctx|
+ ctx.prefixes = _prefixes
+ end
end
def details_for_lookup
@@ -67,4 +70,4 @@ def view_paths=(paths)
end
end
end
-end
+end
@@ -199,8 +199,9 @@ def initialize(context = nil, assigns_for_first_render = {}, controller = nil, f
elsif
lookup_context = context.is_a?(ActionView::LookupContext) ?
context : ActionView::LookupContext.new(context)
- lookup_context.formats = formats if formats
- @view_renderer = ActionView::Renderer.new(lookup_context, controller)
+ lookup_context.formats = formats if formats
+ lookup_context.prefixes = controller._prefixes if controller
+ @view_renderer = ActionView::Renderer.new(lookup_context)
end
_prepare_context
@@ -9,6 +9,8 @@ module ActionView
# generate a key, given to view paths, used in the resolver cache lookup. Since
# this key is generated just once during the request, it speeds up all cache accesses.
class LookupContext #:nodoc:
+ attr_accessor :prefixes
+
mattr_accessor :fallbacks
@@fallbacks = FallbackFileSystemResolver.instances
@@ -62,6 +64,7 @@ def initialize(view_paths, details = {})
@details, @details_key = { :handlers => default_handlers }, nil
@frozen_formats, @skip_default_locale = false, false
@cache = true
+ @prefixes = []
self.view_paths = view_paths
self.registered_detail_setters.each do |key, setter|
@@ -3,9 +3,8 @@ class AbstractRenderer #:nodoc:
delegate :find_template, :template_exists?, :with_fallbacks, :update_details,
:with_layout_format, :formats, :freeze_formats, :to => :@lookup_context
- def initialize(lookup_context, controller)
+ def initialize(lookup_context)
@lookup_context = lookup_context
- @controller = controller
end
def render
@@ -219,7 +219,7 @@ class PartialRenderer < AbstractRenderer #:nodoc:
def initialize(*)
super
- @partial_names = PARTIAL_NAMES[@controller.class.name]
+ @partial_names = PARTIAL_NAMES[@lookup_context.prefixes.first]
end
def render(context, options, block)
@@ -304,10 +304,6 @@ def setup(context, options, block)
self
end
- def controller_prefixes
- @controller_prefixes ||= @controller && @controller._prefixes
- end
-
def collection
if @options.key?(:collection)
collection = @options[:collection]
@@ -331,7 +327,7 @@ def find_partial
end
def find_template(path=@path, locals=@locals.keys)
- prefixes = path.include?(?/) ? [] : controller_prefixes
+ prefixes = path.include?(?/) ? [] : @lookup_context.prefixes
@lookup_context.find_template(path, prefixes, true, locals)
end
@@ -372,7 +368,7 @@ def partial_path(object = @object)
object = object.to_model if object.respond_to?(:to_model)
object.class.model_name.partial_path.dup.tap do |partial|
- path = controller_prefixes.first
+ path = @lookup_context.prefixes.first
partial.insert(0, "#{File.dirname(path)}/") if partial.include?(?/) && path.include?(?/)
end
end
@@ -3,11 +3,10 @@ module ActionView
# to other objects like TemplateRenderer and PartialRenderer which
# actually renders the template.
class Renderer
- attr_accessor :lookup_context, :controller
+ attr_accessor :lookup_context
- def initialize(lookup_context, controller)
+ def initialize(lookup_context)
@lookup_context = lookup_context
- @controller = controller
end
# Main render entry point shared by AV and AC.
@@ -28,7 +27,7 @@ def render_body(context, options)
if options.key?(:partial)
[render_partial(context, options)]
else
- StreamingTemplateRenderer.new(@lookup_context, @controller).render(context, options)
+ StreamingTemplateRenderer.new(@lookup_context).render(context, options)
end
end
@@ -45,11 +44,11 @@ def render_partial(context, options, &block) #:nodoc:
private
def _template_renderer #:nodoc:
- @_template_renderer ||= TemplateRenderer.new(@lookup_context, @controller)
+ @_template_renderer ||= TemplateRenderer.new(@lookup_context)
end
def _partial_renderer #:nodoc:
- @_partial_renderer ||= PartialRenderer.new(@lookup_context, @controller)
+ @_partial_renderer ||= PartialRenderer.new(@lookup_context)
end
end
-end
+end
@@ -179,4 +179,8 @@ class C < ActionController::Base; end
assert_nothing_raised { C.append_view_path 'c/path' }
assert_paths C, "c/path"
end
+
+ def test_lookup_context_accessor
+ assert_equal ["test"], TestController.new.lookup_context.prefixes
+ end
end
@@ -180,6 +180,12 @@ def teardown
assert_not_equal template, old_template
end
+
+ test "responds to #prefixes" do
+ assert_equal [], @lookup_context.prefixes
+ @lookup_context.prefixes = ["foo"]
+ assert_equal ["foo"], @lookup_context.prefixes
+ end
end
class LookupContextWithFalseCaching < ActiveSupport::TestCase

0 comments on commit 4758d37

Please sign in to comment.