From 6093d88ed8b50647c1ca235cd4c167ee78955e56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 29 Nov 2011 10:17:25 +0100
Subject: [PATCH] Fixes for using action view template in isolation.

---
 actionpack/lib/action_view.rb                         |  1 +
 .../lib/action_view/template/handlers/builder.rb      | 11 ++++++++++-
 actionpack/lib/action_view/template/handlers/erb.rb   |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/actionpack/lib/action_view.rb b/actionpack/lib/action_view.rb
index d7229419a9..c24109a547 100644
--- a/actionpack/lib/action_view.rb
+++ b/actionpack/lib/action_view.rb
@@ -33,6 +33,7 @@ module ActionView
     autoload :AssetPaths
     autoload :Base
     autoload :Context
+    autoload :CompiledTemplates, "action_view/context"
     autoload :Helpers
     autoload :LookupContext
     autoload :PathSet
diff --git a/actionpack/lib/action_view/template/handlers/builder.rb b/actionpack/lib/action_view/template/handlers/builder.rb
index 2c52cfd90e..34397c3bcf 100644
--- a/actionpack/lib/action_view/template/handlers/builder.rb
+++ b/actionpack/lib/action_view/template/handlers/builder.rb
@@ -6,12 +6,21 @@ module ActionView
       self.default_format = Mime::XML
 
       def call(template)
-        require 'builder'
+        require_engine
         "xml = ::Builder::XmlMarkup.new(:indent => 2);" +
           "self.output_buffer = xml.target!;" +
           template.source +
           ";xml.target!;"
       end
+
+      protected
+
+      def require_engine
+        @required ||= begin
+          require "builder"
+          true
+        end
+      end
     end
   end
 end
diff --git a/actionpack/lib/action_view/template/handlers/erb.rb b/actionpack/lib/action_view/template/handlers/erb.rb
index 77720e2bc8..25f26dd609 100644
--- a/actionpack/lib/action_view/template/handlers/erb.rb
+++ b/actionpack/lib/action_view/template/handlers/erb.rb
@@ -1,5 +1,5 @@
 require 'action_dispatch/http/mime_type'
-require 'active_support/core_ext/class/attribute_accessors'
+require 'active_support/core_ext/class/attribute'
 require 'erubis'
 
 module ActionView