haml 1.8.0 → 2.0.3

data/lib/haml/template/patch.rb

@@ -26,7 +26,7 @@ module ActionView
     def compile_haml(template, file_name, local_assigns)
       render_symbol = assign_method_name(:haml, template, file_name)
       locals = local_assigns.keys
-      
+
       @@template_args[render_symbol] ||= {}
       locals_keys = @@template_args[render_symbol].keys | locals
       @@template_args[render_symbol] = locals_keys.inject({}) { |h, k| h[k] = true; h }
@@ -35,14 +35,21 @@ module ActionView
       options[:filename] = file_name || 'compiled-template'
 
       begin
-        Haml::Engine.new(template, options).def_method(CompiledTemplates, render_symbol, *locals)
+        Haml::Engine.new(template, options).def_method(CompiledTemplates, render_symbol, *locals_keys)
       rescue Exception => e
         if logger
           logger.debug "ERROR: compiling #{render_symbol} RAISED #{e}"
           logger.debug "Backtrace: #{e.backtrace.join("\n")}"
         end
 
-        raise TemplateError.new(@base_path, file_name || template, @assigns, template, e)
+        base_path = if defined?(extract_base_path_from)
+                      # Rails 2.0.x
+                      extract_base_path_from(file_name) || view_paths.first
+                    else
+                      # Rails <=1.2.6
+                      @base_path
+                    end
+        raise ActionView::TemplateError.new(base_path, file_name || template, @assigns, template, e)
       end
 
       @@compile_time[render_symbol] = Time.now

data/lib/haml/template/plugin.rb

@@ -1,21 +1,72 @@
+# :stopdoc:
 # This file makes Haml work with Rails
 # using the > 2.0.1 template handler API.
 
 module Haml
-  class Template
-    def self.line_offset
-      1
-    end
-
-    def initialize(view)
-      @view = view
-    end
+  class Plugin < ActionView::TemplateHandler
+    include ActionView::TemplateHandlers::Compilable if defined?(ActionView::TemplateHandlers::Compilable)
 
     def compile(template)
       options = Haml::Template.options.dup
-      Haml::Engine.new(template, options).send(:precompiled_with_ambles, [])
+
+      # template is a template object in Rails >=2.1.0,
+      # a source string previously
+      if template.respond_to? :source
+        options[:filename] = template.filename
+        source = template.source
+      else
+        source = template
+      end
+
+      Haml::Engine.new(source, options).send(:precompiled_with_ambles, [])
+    end
+
+    def cache_fragment(block, name = {}, options = nil)
+      @view.fragment_for(block, name, options) do
+        eval("_hamlout.buffer", block.binding)
+      end
     end
   end
 end
 
-ActionView::Base.register_template_handler(:haml, Haml::Template)
+if defined? ActionView::Template and ActionView::Template.respond_to? :register_template_handler
+  ActionView::Template
+else
+  ActionView::Base
+end.register_template_handler(:haml, Haml::Plugin)
+
+# In Rails 2.0.2, ActionView::TemplateError took arguments
+# that we can't fill in from the Haml::Plugin context.
+# Thus, we've got to monkeypatch ActionView::Base to catch the error.
+if ActionView::TemplateError.instance_method(:initialize).arity == 5
+  class ActionView::Base
+    def compile_template(handler, template, file_name, local_assigns)
+      render_symbol = assign_method_name(handler, template, file_name)
+
+      # Move begin up two lines so it captures compilation exceptions.
+      begin
+        render_source = create_template_source(handler, template, render_symbol, local_assigns.keys)
+        line_offset = @@template_args[render_symbol].size + handler.line_offset
+      
+        file_name = 'compiled-template' if file_name.blank?
+        CompiledTemplates.module_eval(render_source, file_name, -line_offset)
+      rescue Exception => e # errors from template code
+        if logger
+          logger.debug "ERROR: compiling #{render_symbol} RAISED #{e}"
+          logger.debug "Function body: #{render_source}"
+          logger.debug "Backtrace: #{e.backtrace.join("\n")}"
+        end
+
+        # There's no way to tell Haml about the filename,
+        # so we've got to insert it ourselves.
+        e.backtrace[0].gsub!('(haml)', file_name) if e.is_a?(Haml::Error)
+        
+        raise ActionView::TemplateError.new(extract_base_path_from(file_name) || view_paths.first, file_name || template, @assigns, template, e)
+      end
+      
+      @@compile_time[render_symbol] = Time.now
+      # logger.debug "Compiled template #{file_name || template}\n ==> #{render_symbol}" if logger
+    end
+  end
+end
+# :startdoc:

data/lib/haml/template.rb

@@ -1,19 +1,16 @@
 require 'haml/engine'
-require 'rubygems'
-require 'active_support'
-require 'action_view'
 
 module Haml
   class Template
     class << self
       @@options = {}
 
-      # Gets various options for Haml. See README for details.
+      # Gets various options for Haml. See README.rdoc for details.
       def options
         @@options
       end
 
-      # Sets various options for Haml. See README for details.
+      # Sets various options for Haml. See README.rdoc for details.
       def options=(value)
         @@options = value
       end
@@ -38,9 +35,17 @@ if defined?(RAILS_ROOT)
   # because the new init file is sufficiently flexible
   # to not need updating.
   rails_init_file = File.join(RAILS_ROOT, 'vendor', 'plugins', 'haml', 'init.rb')
-  haml_init_file = File.join(File.dirname(__FILE__), '..', '..', 'init.rb')
-  if File.exists?(rails_init_file)
-    require 'fileutils'
-    FileUtils.cp(haml_init_file, rails_init_file) unless FileUtils.cmp(rails_init_file, haml_init_file)
+  haml_init_file = Haml.scope('init.rb')
+  begin
+    if File.exists?(rails_init_file)
+      require 'fileutils'
+      FileUtils.cp(haml_init_file, rails_init_file) unless FileUtils.cmp(rails_init_file, haml_init_file)
+    end
+  rescue SystemCallError
+    warn <<END
+HAML WARNING:
+#{rails_init_file} is out of date and couldn't be automatically updated.
+Please run `haml --rails #{File.expand_path(RAILS_ROOT)}' to update it.
+END
   end
 end