1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00

Revert "Moved TemplateHandlers to Base"

This reverts commit 42d215a925.

Conflicts:

	actionpack/lib/action_view/inline_template.rb
	actionpack/lib/action_view/template.rb
This commit is contained in:
Joshua Peek 2008-07-03 21:08:27 -05:00
parent bad1eac91d
commit 01637796d7
6 changed files with 9 additions and 14 deletions
actionpack

View file

@ -151,7 +151,6 @@ module ActionView #:nodoc:
#
# See the ActionView::Helpers::PrototypeHelper::GeneratorMethods documentation for more details.
class Base
extend TemplateHandlers
include ERB::Util
attr_accessor :base_path, :assigns, :template_extension, :first_render

View file

@ -32,7 +32,7 @@ module ActionView
# <i>Topics listed alphabetically</i>
# <% end %>
def cache(name = {}, options = nil, &block)
handler = Base.handler_class_for_extension(current_render_extension.to_sym)
handler = Template.handler_class_for_extension(current_render_extension.to_sym)
handler.new(@controller).cache_fragment(block, name, options)
end
end

View file

@ -10,7 +10,7 @@ module ActionView #:nodoc:
@locals = locals || {}
@method_key = @source
@handler = Base.handler_class_for_extension(@extension).new(@view)
@handler = Template.handler_class_for_extension(@extension).new(@view)
end
end
end

View file

@ -1,12 +1,8 @@
module ActionView #:nodoc:
class Template #:nodoc:
extend TemplateHandlers
include Renderer
class << self
# TODO: Deprecate
delegate :register_template_handler, :to => 'ActionView::Base'
end
attr_reader :path, :extension
def initialize(view, path, use_full_path = nil, locals = {})
@ -25,7 +21,7 @@ module ActionView #:nodoc:
@method_key = @filename
@locals = locals || {}
@handler = Base.handler_class_for_extension(@extension).new(@view)
@handler = self.class.handler_class_for_extension(@extension).new(@view)
end
def render_template

View file

@ -40,7 +40,7 @@ class MabView < ActionView::TemplateHandler
end
end
ActionView::Base.register_template_handler :mab, MabView
ActionView::Template::register_template_handler :mab, MabView
class LayoutAutoDiscoveryTest < Test::Unit::TestCase
def setup

View file

@ -101,12 +101,12 @@ class ViewRenderTest < Test::Unit::TestCase
end
def test_render_inline_with_custom_type
ActionView::Base.register_template_handler :foo, CustomHandler
ActionView::Template.register_template_handler :foo, CustomHandler
assert_equal '["Hello, World!", {}]', @view.render(:inline => "Hello, World!", :type => :foo)
end
def test_render_inline_with_locals_and_custom_type
ActionView::Base.register_template_handler :foo, CustomHandler
ActionView::Template.register_template_handler :foo, CustomHandler
assert_equal '["Hello, <%= name %>!", {:name=>"Josh"}]', @view.render(:inline => "Hello, <%= name %>!", :locals => { :name => "Josh" }, :type => :foo)
end
@ -121,12 +121,12 @@ class ViewRenderTest < Test::Unit::TestCase
end
def test_render_inline_with_compilable_custom_type
ActionView::Base.register_template_handler :foo, CompilableCustomHandler
ActionView::Template.register_template_handler :foo, CompilableCustomHandler
assert_equal 'locals: {}, source: "Hello, World!"', @view.render(:inline => "Hello, World!", :type => :foo)
end
def test_render_inline_with_locals_and_compilable_custom_type
ActionView::Base.register_template_handler :foo, CompilableCustomHandler
ActionView::Template.register_template_handler :foo, CompilableCustomHandler
assert_equal 'locals: {:name=>"Josh"}, source: "Hello, <%= name %>!"', @view.render(:inline => "Hello, <%= name %>!", :locals => { :name => "Josh" }, :type => :foo)
end
end