DRYML - template handler updated for Rails 2.1

hobo/Manifest

@@ -1,7 +1,6 @@
 bin/hobo
 CHANGES.txt
 init.rb
-lib/action_view_extensions/base.rb
 lib/active_record/association_proxy.rb
 lib/active_record/association_reflection.rb
 lib/active_record/has_many_association.rb

hobo/lib/hobo.rb

@@ -386,12 +386,8 @@ def enable
       require 'active_record/has_many_through_association'
       require 'active_record/association_proxy'
       require 'active_record/association_reflection'
-      require 'action_view_extensions/base'
-
-      ActionView::Base.register_template_handler("dryml", Hobo::Dryml::TemplateHandler)
-      # TODO - Rails 2.1 requires ActionView::Template
-      # ActionView::Template.register_template_handler("dryml", Hobo::Dryml::TemplateHandler)
 
+      ActionView::Template.register_template_handler("dryml", Hobo::Dryml::TemplateHandler)
 
       Hobo.developer_features = RAILS_ENV.in?(["development", "test"]) if Hobo.developer_features?.nil?
 

hobo/lib/hobo/dryml.rb

@@ -53,12 +53,16 @@ def empty_page_renderer(view)
     end
 
 
+    def page_renderer_for_template(view, template)
+      page_renderer(view, template.locals.keys, template.path_without_extension)
+    end
+
+
     def page_renderer(view, local_names=[], page=nil)
       if RAILS_ENV == "development"
         clear_cache
         Taglib.clear_cache
       end
-      page ||= view.instance_variable_get('@hobo_template_path')
 
       prepare_view!(view)
       included_taglibs = ([subsite_taglib(page)] + controller_taglibs(view.controller.class)).compact

hobo/lib/hobo/dryml/template_environment.rb

@@ -127,11 +127,6 @@ def scope
     end
 
 
-    def attr_extension(s)
-      AttributeExtensionString.new(s)
-    end
-
-
     def dom_id(object=nil, attribute=nil)
       if object.nil?
         # nothing passed -- use context

hobo/lib/hobo/dryml/template_handler.rb

@@ -2,14 +2,10 @@ module Hobo::Dryml
 
   class TemplateHandler < ActionView::TemplateHandler
 
-    def initialize(view)
-      @view = view
-    end
-
-    def render(src, local_assigns)
-      renderer = Hobo::Dryml.page_renderer(@view, local_assigns.keys)
-      this = @view.instance_variable_set("@this", @view.controller.send(:dryml_context) || local_assigns[:this])
-      s = renderer.render_page(this, local_assigns)
+    def render(template)
+      renderer = Hobo::Dryml.page_renderer_for_template(@view, template)
+      this = @view.instance_variable_set("@this", @view.controller.send(:dryml_context) || template.locals[:this])
+      s = renderer.render_page(this, template.locals)
 
       # Important to strip whitespace, or the browser hangs around for ages (FF2)
       s = s.strip