Refactor ActionView::Template

  ActionView::Template is now completely independent from template
  storage, which allows different back ends such as the database.
  ActionView::Template's only responsibility is to take in the
  template source (passed in from ActionView::Path), compile it,
  and render it.

2 files changed, 8 insertions, 42 deletions

diff --git a/actionpack/test/template/compiled_templates_test.rb b/actionpack/test/template/compiled_templates_test.rb
index c75e29ed9a..b29b03f99d 100644
--- a/actionpack/test/template/compiled_templates_test.rb
+++ b/actionpack/test/template/compiled_templates_test.rb
@@ -5,37 +5,13 @@ class CompiledTemplatesTest < Test::Unit::TestCase
   def setup
     @compiled_templates = ActionView::Base::CompiledTemplates
     @compiled_templates.instance_methods.each do |m|
-      @compiled_templates.send(:remove_method, m) if m =~ /^_run_/
+      @compiled_templates.send(:remove_method, m) if m =~ /^_render_template_/
     end
   end
-
-  def test_template_gets_compiled
-    assert_equal 0, @compiled_templates.instance_methods.size
-    assert_equal "Hello world!", render(:file => "test/hello_world.erb")
-    assert_equal 1, @compiled_templates.instance_methods.size
-  end
-
+  
   def test_template_gets_recompiled_when_using_different_keys_in_local_assigns
-    assert_equal 0, @compiled_templates.instance_methods.size
-    assert_equal "Hello world!", render(:file => "test/hello_world.erb")
-    assert_equal "Hello world!", render(:file => "test/hello_world.erb", :locals => {:foo => "bar"})
-    assert_equal 2, @compiled_templates.instance_methods.size
-  end
-
-  def test_compiled_template_will_not_be_recompiled_when_rendered_with_identical_local_assigns
-    assert_equal 0, @compiled_templates.instance_methods.size
-    assert_equal "Hello world!", render(:file => "test/hello_world.erb")
-    ActionView::Template.any_instance.expects(:compile!).never
-    assert_equal "Hello world!", render(:file => "test/hello_world.erb")
-  end
-
-  def test_compiled_template_will_always_be_recompiled_when_template_is_not_cached
-    ActionView::Template.any_instance.expects(:recompile?).times(3).returns(true)
-    assert_equal 0, @compiled_templates.instance_methods.size
-    assert_equal "Hello world!", render(:file => "#{FIXTURE_LOAD_PATH}/test/hello_world.erb")
-    ActionView::Template.any_instance.expects(:compile!).times(3)
-    3.times { assert_equal "Hello world!", render(:file => "#{FIXTURE_LOAD_PATH}/test/hello_world.erb") }
-    assert_equal 1, @compiled_templates.instance_methods.size
+    assert_equal "one", render(:file => "test/render_file_with_locals_and_default.erb")
+    assert_equal "two", render(:file => "test/render_file_with_locals_and_default.erb", :locals => { :secret => "two" })
   end
 
   def test_template_changes_are_not_reflected_with_cached_templates
@@ -61,14 +37,12 @@ class CompiledTemplatesTest < Test::Unit::TestCase
 
     def render_with_cache(*args)
       view_paths = ActionController::Base.view_paths
-      assert_equal ActionView::Template::FileSystemPath, view_paths.first.class
       ActionView::Base.new(view_paths, {}).render(*args)
     end
 
     def render_without_cache(*args)
-      path = ActionView::Template::FileSystemPath.new(FIXTURE_LOAD_PATH)
+      path = ActionView::Template::FileSystemPathWithFallback.new(FIXTURE_LOAD_PATH)
       view_paths = ActionView::Base.process_view_paths(path)
-      assert_equal ActionView::Template::FileSystemPath, view_paths.first.class
       ActionView::Base.new(view_paths, {}).render(*args)
     end
 
diff --git a/actionpack/test/template/render_test.rb b/actionpack/test/template/render_test.rb
index 7191df0dfd..71291f009c 100644
--- a/actionpack/test/template/render_test.rb
+++ b/actionpack/test/template/render_test.rb
@@ -91,10 +91,6 @@ module RenderTestCases
     assert_equal "The secret is in the sauce\n", @view.render(:file => "test/dot.directory/render_file_with_ivar")
   end
 
-  def test_render_has_access_current_template
-    assert_equal "test/template.erb", @view.render(:file => "test/template.erb")
-  end
-
   def test_render_update
     # TODO: You should not have to stub out template because template is self!
     @view.instance_variable_set(:@template, @view)
@@ -240,10 +236,6 @@ module RenderTestCases
     end
   end
 
-  def test_template_with_malformed_template_handler_is_reachable_through_its_exact_filename
-    assert_equal "Don't render me!", @view.render(:file => 'test/malformed/malformed.html.erb~')
-  end
-
   def test_render_with_layout
     assert_equal %(<title></title>\nHello world!\n),
       @view.render(:file => "test/hello_world.erb", :layout => "layouts/yield")
@@ -269,7 +261,7 @@ class CachedViewRenderTest < ActiveSupport::TestCase
   # Ensure view path cache is primed
   def setup
     view_paths = ActionController::Base.view_paths
-    assert_equal ActionView::Template::FileSystemPath, view_paths.first.class
+    assert_equal ActionView::Template::FileSystemPathWithFallback, view_paths.first.class
     setup_view(view_paths)
   end
 end
@@ -280,9 +272,9 @@ class LazyViewRenderTest < ActiveSupport::TestCase
   # Test the same thing as above, but make sure the view path
   # is not eager loaded
   def setup
-    path = ActionView::Template::FileSystemPath.new(FIXTURE_LOAD_PATH)
+    path = ActionView::Template::FileSystemPathWithFallback.new(FIXTURE_LOAD_PATH)
     view_paths = ActionView::Base.process_view_paths(path)
-    assert_equal ActionView::Template::FileSystemPath, view_paths.first.class
+    assert_equal ActionView::Template::FileSystemPathWithFallback, view_paths.first.class
     setup_view(view_paths)
   end
 end