tilt 0.6 → 0.9

data/test/tilt_buildertemplate_test.rb

@@ -9,7 +9,7 @@ begin
       assert_equal Tilt::BuilderTemplate, Tilt['test.xml.builder']
     end
 
-    test "compiling and evaluating the template on #render" do
+    test "preparing and evaluating the template on #render" do
       template = Tilt::BuilderTemplate.new { |t| "xml.em 'Hello World!'" }
       assert_equal "<em>Hello World!</em>\n", template.render
     end

data/test/tilt_compilesite_test.rb

@@ -0,0 +1,86 @@
+require 'contest'
+require 'tilt'
+require 'thread'
+
+class CompileSiteTest < Test::Unit::TestCase
+  def setup
+    GC.start
+  end
+
+  class CompilingTemplate < Tilt::Template
+    def prepare
+    end
+
+    def precompiled_template(locals)
+      @data.inspect
+    end
+  end
+
+  class Scope
+    include Tilt::CompileSite
+  end
+
+  test "compiling template source to a method" do
+    template = CompilingTemplate.new { |t| "Hello World!" }
+    template.render(Scope.new)
+    method_name = template.send(:compiled_method_name, [])
+    method_name = method_name.to_sym if Symbol === Kernel.methods.first
+    assert Tilt::CompileSite.instance_methods.include?(method_name),
+      "CompileSite.instance_methods.include?(#{method_name.inspect})"
+    assert Scope.new.respond_to?(method_name),
+      "scope.respond_to?(#{method_name.inspect})"
+  end
+
+  test 'garbage collecting compiled methods' do
+    template = CompilingTemplate.new { '' }
+    method_name = template.send(:compiled_method_name, [])
+    template.render(Scope.new)
+    assert Scope.new.respond_to?(method_name)
+    Tilt::Template.send(
+      :garbage_collect_compiled_template_method,
+      Tilt::CompileSite,
+      method_name
+    )
+    assert !Scope.new.respond_to?(method_name), "compiled method not removed"
+  end
+
+  def self.create_and_destroy_template
+    template = CompilingTemplate.new { 'Hello World' }
+    template.render(Scope.new)
+    method_name = template.send(:compiled_method_name, [])
+    method_name = method_name.to_sym if Symbol === Kernel.methods.first
+    [template.object_id, method_name]
+  end
+
+  finalized_object_id, finalized_method_name = create_and_destroy_template
+
+  test "triggering compiled method gc finalizer" do
+    assert !Tilt::CompileSite.instance_methods.include?(finalized_method_name),
+      "CompileSite.instance_methods.include?(#{finalized_method_name.inspect})"
+    assert !Scope.new.respond_to?(finalized_method_name),
+      "Scope.new.respond_to?(#{finalized_method_name.inspect})"
+  end
+
+  # This test attempts to surface issues with compiling templates from
+  # multiple threads.
+  test "using compiled templates from multiple threads" do
+    template = CompilingTemplate.new { 'template' }
+    main_thread = Thread.current
+    10.times do |i|
+      threads =
+        (1..50).map do |j|
+          Thread.new {
+            begin
+              locals = { "local#{i}" => 'value' }
+              res = template.render(self, locals)
+              thread_id = Thread.current.object_id
+              res = template.render(self, "local#{thread_id.to_s}" => 'value')
+            rescue => boom
+              main_thread.raise(boom)
+            end
+          }
+        end
+      threads.each { |t| t.join }
+    end
+  end
+end

data/test/tilt_erbtemplate_test.rb

@@ -12,7 +12,7 @@ class ERBTemplateTest < Test::Unit::TestCase
     assert_equal Tilt::ERBTemplate, Tilt['test.rhtml']
   end
 
-  test "compiling and evaluating templates on #render" do
+  test "loading and evaluating templates on #render" do
     template = Tilt::ERBTemplate.new { |t| "Hello World!" }
     assert_equal "Hello World!", template.render
   end
@@ -77,9 +77,111 @@ class ERBTemplateTest < Test::Unit::TestCase
   end
 
   test "shorthand whole line syntax trim mode" do
-    template = Tilt.new('test.erb', 1, :trim => '%') { "\n% if true\nhello\n%end\n" }
+    template = Tilt.new('test.erb', :trim => '%') { "\n% if true\nhello\n%end\n" }
     assert_equal "\nhello\n", template.render
   end
+
+  test "using an instance variable as the outvar" do
+    template = Tilt::ERBTemplate.new(nil, :outvar => '@buf') { "<%= 1 + 1 %>" }
+    scope = Object.new
+    scope.instance_variable_set(:@buf, 'original value')
+    assert_equal '2', template.render(scope)
+    assert_equal 'original value', scope.instance_variable_get(:@buf)
+  end
+end
+
+class CompiledERBTemplateTest < Test::Unit::TestCase
+  def teardown
+    GC.start
+  end
+
+  class Scope
+    include Tilt::CompileSite
+  end
+
+  test "compiling template source to a method" do
+    template = Tilt::ERBTemplate.new { |t| "Hello World!" }
+    template.render(Scope.new)
+    method_name = template.send(:compiled_method_name, [])
+    method_name = method_name.to_sym if Symbol === Kernel.methods.first
+    assert Tilt::CompileSite.instance_methods.include?(method_name),
+      "CompileSite.instance_methods.include?(#{method_name.inspect})"
+    assert Scope.new.respond_to?(method_name),
+      "scope.respond_to?(#{method_name.inspect})"
+  end
+
+  test "loading and evaluating templates on #render" do
+    template = Tilt::ERBTemplate.new { |t| "Hello World!" }
+    assert_equal "Hello World!", template.render(Scope.new)
+    assert_equal "Hello World!", template.render(Scope.new)
+  end
+
+  test "passing locals" do
+    template = Tilt::ERBTemplate.new { 'Hey <%= name %>!' }
+    assert_equal "Hey Joe!", template.render(Scope.new, :name => 'Joe')
+  end
+
+  test "evaluating in an object scope" do
+    template = Tilt::ERBTemplate.new { 'Hey <%= @name %>!' }
+    scope = Scope.new
+    scope.instance_variable_set :@name, 'Joe'
+    assert_equal "Hey Joe!", template.render(scope)
+    scope.instance_variable_set :@name, 'Jane'
+    assert_equal "Hey Jane!", template.render(scope)
+  end
+
+  test "passing a block for yield" do
+    template = Tilt::ERBTemplate.new { 'Hey <%= yield %>!' }
+    assert_equal "Hey Joe!", template.render(Scope.new) { 'Joe' }
+    assert_equal "Hey Jane!", template.render(Scope.new) { 'Jane' }
+  end
+
+  test "backtrace file and line reporting without locals" do
+    data = File.read(__FILE__).split("\n__END__\n").last
+    fail unless data[0] == ?<
+    template = Tilt::ERBTemplate.new('test.erb', 11) { data }
+    begin
+      template.render(Scope.new)
+      fail 'should have raised an exception'
+    rescue => boom
+      assert_kind_of NameError, boom
+      line = boom.backtrace.first
+      file, line, meth = line.split(":")
+      assert_equal 'test.erb', file
+      assert_equal '13', line
+    end
+  end
+
+  test "backtrace file and line reporting with locals" do
+    data = File.read(__FILE__).split("\n__END__\n").last
+    fail unless data[0] == ?<
+    template = Tilt::ERBTemplate.new('test.erb') { data }
+    begin
+      template.render(Scope.new, :name => 'Joe', :foo => 'bar')
+      fail 'should have raised an exception'
+    rescue => boom
+      assert_kind_of RuntimeError, boom
+      line = boom.backtrace.first
+      file, line, meth = line.split(":")
+      assert_equal 'test.erb', file
+      assert_equal '6', line
+    end
+  end
+
+  test "default non-stripping trim mode" do
+    template = Tilt.new('test.erb') { "\n<%= 1 + 1 %>\n" }
+    assert_equal "\n2\n", template.render(Scope.new)
+  end
+
+  test "stripping trim mode" do
+    template = Tilt.new('test.erb', :trim => '-') { "\n<%= 1 + 1 -%>\n" }
+    assert_equal "\n2", template.render(Scope.new)
+  end
+
+  test "shorthand whole line syntax trim mode" do
+    template = Tilt.new('test.erb', :trim => '%') { "\n% if true\nhello\n%end\n" }
+    assert_equal "\nhello\n", template.render(Scope.new)
+  end
 end
 
 __END__

data/test/tilt_erubistemplate_test.rb

@@ -9,7 +9,7 @@ begin
       assert_equal Tilt::ErubisTemplate, Tilt['test.html.erubis']
     end
 
-    test "compiling and evaluating templates on #render" do
+    test "preparing and evaluating templates on #render" do
       template = Tilt::ErubisTemplate.new { |t| "Hello World!" }
       assert_equal "Hello World!", template.render
     end
@@ -69,6 +69,40 @@ begin
       scope.instance_variable_set :@name, 'Joe'
       assert_equal "Hey Joe!", template.render(scope)
     end
+
+    test "using an instance variable as the outvar" do
+      template = Tilt::ErubisTemplate.new(nil, :outvar => '@buf') { "<%= 1 + 1 %>" }
+      scope = Object.new
+      scope.instance_variable_set(:@buf, 'original value')
+      assert_equal '2', template.render(scope)
+      assert_equal 'original value', scope.instance_variable_get(:@buf)
+    end
+
+    test "using Erubis::EscapedEruby subclass via :engine_class option" do
+      template = Tilt::ErubisTemplate.new(nil, :engine_class => ::Erubis::EscapedEruby) { |t| %(<%= "<p>Hello World!</p>" %>) }
+      assert_equal "&lt;p&gt;Hello World!&lt;/p&gt;", template.render
+    end
+
+    test "using :escape_html => true option" do
+      template = Tilt::ErubisTemplate.new(nil, :escape_html => true) { |t| %(<%= "<p>Hello World!</p>" %>) }
+      assert_equal "&lt;p&gt;Hello World!&lt;/p&gt;", template.render
+    end
+
+    test "using :escape_html => false option" do
+      template = Tilt::ErubisTemplate.new(nil, :escape_html => false) { |t| %(<%= "<p>Hello World!</p>" %>) }
+      assert_equal "<p>Hello World!</p>", template.render
+    end
+
+    test "erubis default does not escape html" do
+      template = Tilt::ErubisTemplate.new { |t| %(<%= "<p>Hello World!</p>" %>) }
+      assert_equal "<p>Hello World!</p>", template.render
+    end
+
+    test "does not modify options argument" do
+      options_hash = {:escape_html => true}
+      template = Tilt::ErubisTemplate.new(nil, options_hash) { |t| "Hello World!" }
+      assert_equal({:escape_html => true}, options_hash)
+    end
   end
 rescue LoadError => boom
   warn "Tilt::ErubisTemplate (disabled)\n"

data/test/tilt_hamltemplate_test.rb

@@ -12,7 +12,7 @@ begin
       assert_equal Tilt::HamlTemplate, Tilt['test.haml']
     end
 
-    test "compiling and evaluating templates on #render" do
+    test "preparing and evaluating templates on #render" do
       template = Tilt::HamlTemplate.new { |t| "%p Hello World!" }
       assert_equal "<p>Hello World!</p>\n", template.render
     end
@@ -66,6 +66,70 @@ begin
     end
   end
 
+  class CompiledHamlTemplateTest < Test::Unit::TestCase
+    class Scope
+      include Tilt::CompileSite
+    end
+
+    test "compiling template source to a method" do
+      template = Tilt::HamlTemplate.new { |t| "Hello World!" }
+      template.render(Scope.new)
+      method_name = template.send(:compiled_method_name, [])
+      method_name = method_name.to_sym if Symbol === Kernel.methods.first
+      assert Tilt::CompileSite.instance_methods.include?(method_name),
+        "CompileSite.instance_methods.include?(#{method_name.inspect})"
+      assert Scope.new.respond_to?(method_name),
+        "scope.respond_to?(#{method_name.inspect})"
+    end
+
+    test "passing locals" do
+      template = Tilt::HamlTemplate.new { "%p= 'Hey ' + name + '!'" }
+      assert_equal "<p>Hey Joe!</p>\n", template.render(Scope.new, :name => 'Joe')
+    end
+
+    test "evaluating in an object scope" do
+      template = Tilt::HamlTemplate.new { "%p= 'Hey ' + @name + '!'" }
+      scope = Scope.new
+      scope.instance_variable_set :@name, 'Joe'
+      assert_equal "<p>Hey Joe!</p>\n", template.render(scope)
+    end
+
+    test "passing a block for yield" do
+      template = Tilt::HamlTemplate.new { "%p= 'Hey ' + yield + '!'" }
+      assert_equal "<p>Hey Joe!</p>\n", template.render(Scope.new) { 'Joe' }
+    end
+
+    test "backtrace file and line reporting without locals" do
+      data = File.read(__FILE__).split("\n__END__\n").last
+      fail unless data[0] == ?%
+      template = Tilt::HamlTemplate.new('test.haml', 10) { data }
+      begin
+        template.render(Scope.new)
+        fail 'should have raised an exception'
+      rescue => boom
+        assert_kind_of NameError, boom
+        line = boom.backtrace.first
+        file, line, meth = line.split(":")
+        assert_equal 'test.haml', file
+        assert_equal '12', line
+      end
+    end
+
+    test "backtrace file and line reporting with locals" do
+      data = File.read(__FILE__).split("\n__END__\n").last
+      fail unless data[0] == ?%
+      template = Tilt::HamlTemplate.new('test.haml') { data }
+      begin
+        res = template.render(Scope.new, :name => 'Joe', :foo => 'bar')
+      rescue => boom
+        assert_kind_of MockError, boom
+        line = boom.backtrace.first
+        file, line, meth = line.split(":")
+        assert_equal 'test.haml', file
+        assert_equal '5', line
+      end
+    end
+  end
 rescue LoadError => boom
   warn "Tilt::HamlTemplate (disabled)\n"
 end

data/test/tilt_liquidtemplate_test.rb

@@ -9,7 +9,7 @@ begin
       assert_equal Tilt::LiquidTemplate, Tilt['test.liquid']
     end
 
-    test "compiling and evaluating templates on #render" do
+    test "preparing and evaluating templates on #render" do
       template = Tilt::LiquidTemplate.new { |t| "Hello World!" }
       assert_equal "Hello World!", template.render
     end

data/test/tilt_mustachetemplate_test.rb

@@ -16,7 +16,7 @@ begin
       assert_equal Tilt::MustacheTemplate, Tilt['test.mustache']
     end
 
-    test "compiling and evaluating templates on #render" do
+    test "preparing and evaluating templates on #render" do
       template = Tilt::MustacheTemplate.new { |t| "Hello World!" }
       assert_equal "Hello World!", template.render
     end
@@ -33,7 +33,6 @@ begin
 
     test "locating views defined at the top-level" do
       template = Tilt::MustacheTemplate.new('foo.mustache') { "<p>Hey {{foo}}!</p>" }
-      template.compile
       assert_equal Views::Foo, template.engine
     end
 
@@ -46,7 +45,6 @@ begin
 
     test "locating views defined in a custom namespace" do
       template = Tilt::MustacheTemplate.new('bizzle.mustache', :namespace => Bar) { "<p>Hello World!</p>" }
-      template.compile
       assert_equal Bar::Views::Bizzle, template.engine
       assert_equal "<p>Hello World!</p>", template.render
     end
@@ -54,7 +52,6 @@ begin
     test "locating views in files" do
       view_path = File.expand_path('../tilt_mustache_views', __FILE__)
       template = Tilt::MustacheTemplate.new('external.mustache', :view_path => view_path) { "<p>{{hello}}!</p>" }
-      template.compile
       assert defined?(Views::External), "external.rb should have been required"
       assert_equal Views::External, template.engine
       assert_equal "<p>Stached!</p>", template.render

data/test/tilt_rdiscounttemplate_test.rb

@@ -17,20 +17,20 @@ begin
       assert_equal Tilt::RDiscountTemplate, Tilt['test.mkd']
     end
 
-    test "compiling and evaluating templates on #render" do
+    test "preparing and evaluating templates on #render" do
       template = Tilt::RDiscountTemplate.new { |t| "# Hello World!" }
       assert_equal "<h1>Hello World!</h1>\n", template.render
     end
 
     test "smartypants when :smart is set" do
-      template = Tilt::RDiscountTemplate.new(nil, :smart => true) { |t|
+      template = Tilt::RDiscountTemplate.new(:smart => true) { |t|
         "OKAY -- 'Smarty Pants'" }
       assert_equal "<p>OKAY &mdash; &lsquo;Smarty Pants&rsquo;</p>\n",
         template.render
     end
 
     test "stripping HTML when :filter_html is set" do
-      template = Tilt::RDiscountTemplate.new(nil, :filter_html => true) { |t|
+      template = Tilt::RDiscountTemplate.new(:filter_html => true) { |t|
         "HELLO <blink>WORLD</blink>" }
       assert_equal "<p>HELLO &lt;blink>WORLD&lt;/blink></p>\n", template.render
     end

data/test/tilt_rdoctemplate_test.rb

@@ -9,7 +9,7 @@ begin
       assert_equal Tilt::RDocTemplate, Tilt['test.rdoc']
     end
 
-    test "compiling and evaluating the template with #render" do
+    test "preparing and evaluating the template with #render" do
       template = Tilt::RDocTemplate.new { |t| "= Hello World!" }
       assert_equal "<h1>Hello World!</h1>\n", template.render
     end

data/test/tilt_stringtemplate_test.rb

@@ -6,7 +6,7 @@ class StringTemplateTest < Test::Unit::TestCase
     assert_equal Tilt::StringTemplate, Tilt['test.str']
   end
 
-  test "compiling and evaluating templates on #render" do
+  test "loading and evaluating templates on #render" do
     template = Tilt::StringTemplate.new { |t| "Hello World!" }
     assert_equal "Hello World!", template.render
   end
@@ -26,6 +26,7 @@ class StringTemplateTest < Test::Unit::TestCase
   test "passing a block for yield" do
     template = Tilt::StringTemplate.new { 'Hey #{yield}!' }
     assert_equal "Hey Joe!", template.render { 'Joe' }
+    assert_equal "Hey Moe!", template.render { 'Moe' }
   end
 
   test "multiline templates" do
@@ -66,6 +67,91 @@ class StringTemplateTest < Test::Unit::TestCase
   end
 end
 
+
+class CompiledStringTemplateTest < Test::Unit::TestCase
+  def teardown
+    GC.start
+  end
+
+  class Scope
+    include Tilt::CompileSite
+  end
+
+  test "compiling template source to a method" do
+    template = Tilt::StringTemplate.new { |t| "Hello World!" }
+    template.render(Scope.new)
+    method_name = template.send(:compiled_method_name, [])
+    method_name = method_name.to_sym if Symbol === Kernel.methods.first
+    assert Tilt::CompileSite.instance_methods.include?(method_name),
+      "CompileSite.instance_methods.include?(#{method_name.inspect})"
+    assert Scope.new.respond_to?(method_name),
+      "scope.respond_to?(#{method_name.inspect})"
+  end
+
+  test "loading and evaluating templates on #render" do
+    template = Tilt::StringTemplate.new { |t| "Hello World!" }
+    assert_equal "Hello World!", template.render(Scope.new)
+  end
+
+  test "passing locals" do
+    template = Tilt::StringTemplate.new { 'Hey #{name}!' }
+    assert_equal "Hey Joe!", template.render(Scope.new, :name => 'Joe')
+    assert_equal "Hey Moe!", template.render(Scope.new, :name => 'Moe')
+  end
+
+  test "evaluating in an object scope" do
+    template = Tilt::StringTemplate.new { 'Hey #{@name}!' }
+    scope = Scope.new
+    scope.instance_variable_set :@name, 'Joe'
+    assert_equal "Hey Joe!", template.render(scope)
+    scope.instance_variable_set :@name, 'Moe'
+    assert_equal "Hey Moe!", template.render(scope)
+  end
+
+  test "passing a block for yield" do
+    template = Tilt::StringTemplate.new { 'Hey #{yield}!' }
+    assert_equal "Hey Joe!", template.render(Scope.new) { 'Joe' }
+    assert_equal "Hey Moe!", template.render(Scope.new) { 'Moe' }
+  end
+
+  test "multiline templates" do
+    template = Tilt::StringTemplate.new { "Hello\nWorld!\n" }
+    assert_equal "Hello\nWorld!\n", template.render(Scope.new)
+  end
+
+  test "backtrace file and line reporting without locals" do
+    data = File.read(__FILE__).split("\n__END__\n").last
+    fail unless data[0] == ?<
+    template = Tilt::StringTemplate.new('test.str', 11) { data }
+    begin
+      template.render(Scope.new)
+      fail 'should have raised an exception'
+    rescue => boom
+      assert_kind_of NameError, boom
+      line = boom.backtrace.first
+      file, line, meth = line.split(":")
+      assert_equal 'test.str', file
+      assert_equal '13', line
+    end
+  end
+
+  test "backtrace file and line reporting with locals" do
+    data = File.read(__FILE__).split("\n__END__\n").last
+    fail unless data[0] == ?<
+    template = Tilt::StringTemplate.new('test.str') { data }
+    begin
+      template.render(Scope.new, :name => 'Joe', :foo => 'bar')
+      fail 'should have raised an exception'
+    rescue => boom
+      assert_kind_of RuntimeError, boom
+      line = boom.backtrace.first
+      file, line, meth = line.split(":")
+      assert_equal 'test.str', file
+      assert_equal '6', line
+    end
+  end
+end
+
 __END__
 <html>
 <body>

data/test/tilt_template_test.rb

@@ -2,44 +2,50 @@ require 'contest'
 require 'tilt'
 
 class TiltTemplateTest < Test::Unit::TestCase
+
+  class MockTemplate < Tilt::Template
+    def prepare
+    end
+  end
+
   test "needs a file or block" do
     assert_raise(ArgumentError) { Tilt::Template.new }
   end
 
   test "initializing with a file" do
-    inst = Tilt::Template.new('foo.erb')
+    inst = MockTemplate.new('foo.erb') {}
     assert_equal 'foo.erb', inst.file
   end
 
   test "initializing with a file and line" do
-    inst = Tilt::Template.new('foo.erb', 55)
+    inst = MockTemplate.new('foo.erb', 55) {}
     assert_equal 'foo.erb', inst.file
     assert_equal 55, inst.line
   end
 
   test "uses correct eval_file" do
-    inst = Tilt::Template.new('foo.erb', 55)
+    inst = MockTemplate.new('foo.erb', 55) {}
     assert_equal 'foo.erb', inst.eval_file
   end
 
   test "uses a default filename for #eval_file when no file provided" do
-    inst = Tilt::Template.new { 'Hi' }
+    inst = MockTemplate.new { 'Hi' }
     assert_not_nil inst.eval_file
     assert !inst.eval_file.include?("\n")
   end
 
   test "calculating template's #basename" do
-    inst = Tilt::Template.new('/tmp/templates/foo.html.erb')
+    inst = MockTemplate.new('/tmp/templates/foo.html.erb') {}
     assert_equal 'foo.html.erb', inst.basename
   end
 
   test "calculating the template's #name" do
-    inst = Tilt::Template.new('/tmp/templates/foo.html.erb')
+    inst = MockTemplate.new('/tmp/templates/foo.html.erb') {}
     assert_equal 'foo', inst.name
   end
 
   test "initializing with a data loading block" do
-    Tilt::Template.new { |template| "Hello World!" }
+    MockTemplate.new { |template| "Hello World!" }
   end
 
   class InitializingMockTemplate < Tilt::Template
@@ -52,7 +58,7 @@ class TiltTemplateTest < Test::Unit::TestCase
       @@initialized_count += 1
     end
 
-    def compile!
+    def prepare
     end
   end
 
@@ -68,44 +74,43 @@ class TiltTemplateTest < Test::Unit::TestCase
     assert_equal 1, InitializingMockTemplate.initialized_count
   end
 
-  class CompilingMockTemplate < Tilt::Template
+  class PreparingMockTemplate < Tilt::Template
     include Test::Unit::Assertions
-    def compile!
+    def prepare
       assert !data.nil?
-      @compiled = true
+      @prepared = true
     end
-    def compiled? ; @compiled ; end
+    def prepared? ; @prepared ; end
   end
 
-  test "raises NotImplementedError when #compile! not defined" do
-    inst = Tilt::Template.new { |template| "Hello World!" }
-    assert_raise(NotImplementedError) { inst.render }
+  test "raises NotImplementedError when #prepare not defined" do
+    assert_raise(NotImplementedError) { Tilt::Template.new { |template| "Hello World!" } }
   end
 
   test "raises NotImplementedError when #evaluate or #template_source not defined" do
-    inst = CompilingMockTemplate.new { |t| "Hello World!" }
+    inst = PreparingMockTemplate.new { |t| "Hello World!" }
     assert_raise(NotImplementedError) { inst.render }
-    assert inst.compiled?
+    assert inst.prepared?
   end
 
-  class SimpleMockTemplate < CompilingMockTemplate
+  class SimpleMockTemplate < PreparingMockTemplate
     include Test::Unit::Assertions
     def evaluate(scope, locals, &block)
-      assert compiled?
+      assert prepared?
       assert !scope.nil?
       assert !locals.nil?
       "<em>#{@data}</em>"
     end
   end
 
-  test "compiles and evaluates the template on #render" do
+  test "prepares and evaluates the template on #render" do
     inst = SimpleMockTemplate.new { |t| "Hello World!" }
     assert_equal "<em>Hello World!</em>", inst.render
-    assert inst.compiled?
+    assert inst.prepared?
   end
 
-  class SourceGeneratingMockTemplate < CompilingMockTemplate
-    def template_source
+  class SourceGeneratingMockTemplate < PreparingMockTemplate
+    def precompiled_template(locals)
       "foo = [] ; foo << %Q{#{data}} ; foo.join"
     end
   end
@@ -113,7 +118,7 @@ class TiltTemplateTest < Test::Unit::TestCase
   test "template_source with locals" do
     inst = SourceGeneratingMockTemplate.new { |t| 'Hey #{name}!' }
     assert_equal "Hey Joe!", inst.render(Object.new, :name => 'Joe')
-    assert inst.compiled?
+    assert inst.prepared?
   end
 
   class Person