Changeset 96

Timestamp:

12/14/2006 14:52:37 (2 years ago)

Author:

tec

Message:

• lib/markaby/template.rb: rework Template so errors can include line number
  
• lib/markaby/rails.rb: hack AV::B to pass the template path to the handler
  
• test/rails_test.rb: test that a TemplateError? includes the correct line number
  
• test/rails/markaby/broken.mab: template for the above test
  

Location:

trunk

Files:

• lib/markaby/kernel_method.rb (modified) (1 diff)
• lib/markaby/rails.rb (modified) (3 diffs)
• lib/markaby/template.rb (modified) (1 diff)
• test/rails_test.rb (modified) (3 diffs)

trunk/lib/markaby/kernel_method.rb

@@ +1 @@
+# You'll need to <tt>require 'markaby/kernel_method'</tt> for this.
 module Kernel
-  def mab(*args, &block) # :nodoc:
+  # Shortcut for creating a quick block of Markaby.
+  def mab(*args, &block)
     Markaby::Builder.new(*args, &block).to_s
   end

trunk/lib/markaby/rails.rb

@@ +1 @@
+module ActionView # :nodoc:
+  class Base # :nodoc:
+    def render_template(template_extension, template, file_path = nil, local_assigns = {})
+      if handler = @@template_handlers[template_extension]
+        template ||= read_template_file(file_path, template_extension)
+        handler.new(self).render(template, local_assigns, file_path)
+      else
+        compile_and_render_template(template_extension, template, file_path, local_assigns)
+      end
+    end
+  end
+end
+
 module Markaby
 
@@ -12 +25 @@
   end
 
-  class ActionViewTemplateHandler
+  class ActionViewTemplateHandler # :nodoc:
     def initialize(action_view)
       @action_view = action_view
     end
-    def render(template, local_assigns = {})
-      Template.new(template).render(@action_view.assigns.merge(local_assigns), @action_view)
+    def render(template, local_assigns, file_path)
+      template = Template.new(template)
+      template.path = file_path
+      template.render(@action_view.assigns.merge(local_assigns), @action_view)
     end
   end
 
-  class FauxErbout < ::Builder::BlankSlate
+  class FauxErbout < ::Builder::BlankSlate # :nodoc:
     def initialize(builder)
       @builder = builder
@@ -33 +48 @@
   end
   
-  class Builder
+  class Builder # :nodoc:
     def flash(*args)
       @helpers.controller.send(:flash, *args)

trunk/lib/markaby/template.rb

@@ -1 +1 @@
 module Markaby
   class Template
-    def initialize(template)
-      @template = template      
+
+    attr_accessor :source, :path
+    
+    def initialize(source)
+      @source = source.to_s
     end
+
     def render(*args)
       output = Builder.new(*args)
-      output.instance_eval @template
+
+      if path.nil?
+        output.instance_eval source
+      else
+        output.instance_eval source, path
+      end
+      
       return output.to_s
     end
+
   end
 end

trunk/test/rails_test.rb

@@ -1 @@
-#
-# run `rake test:plugins PLUGIN=markaby` from your RAILS_ROOT
-#
 require File.join(File.dirname(__FILE__), 'rails', 'test_preamble')
 
@@ -17 +14 @@
   end
 
+  def broken
+  end
+  
   def partial_rendering
     render :partial => 'monkeys', :locals => @@locals
@@ -84 +84 @@
     assert_select 'p', 'Hello World'
   end
+  
+  def test_template_error_has_correct_line_number
+    begin
+      process :broken
+    rescue ActionView::TemplateError => error
+      assert_equal 5, error.line_number.to_i
+    end
+  end
 end