ActionPack stuff isn't loaded unless it's needed. Thanks to Bob Aman for the original patch.

git-svn-id: svn://hamptoncatlin.com/haml/trunk@624 7063305b-7217-0410-af8c-cdc13e5119b9

lib/haml/helpers/action_view_mods.rb

@@ -1,15 +1,4 @@
-begin
-  raise LoadError if defined?(Merb::Plugins)
-  require 'rubygems'
-  require 'active_support'
-  require 'action_controller'
-  require 'action_view'
-  action_view_included = true
-rescue LoadError
-  action_view_included = false
-end
-
-if action_view_included  
+if defined?(ActionView) and not defined?(Merb::Plugins)
   module ActionView
     class Base # :nodoc:
       def render_with_haml(*args, &block)

test/benchmark.rb

@@ -1,9 +1,12 @@
+require 'rubygems'
+require 'active_support'
+require 'action_controller'
+require 'action_view'
+
 require File.dirname(__FILE__) + '/../lib/haml'
 require 'haml/template'
 require 'sass/engine'
-require 'rubygems'
-require 'active_support'
-require 'action_view'
+
 require 'benchmark'
 require 'markaby'
 require 'stringio'

test/haml/engine_test.rb

@@ -1,5 +1,10 @@
 #!/usr/bin/env ruby
 
+require 'rubygems'
+require 'active_support'
+require 'action_controller'
+require 'action_view'
+
 require 'test/unit'
 require File.dirname(__FILE__) + '/../../lib/haml'
 require 'haml/engine'

test/haml/helper_test.rb

@@ -1,5 +1,10 @@
 #!/usr/bin/env ruby
 
+require 'rubygems'
+require 'active_support'
+require 'action_controller'
+require 'action_view'
+
 require 'test/unit'
 require File.dirname(__FILE__) + '/../../lib/haml'
 require 'haml/template'
@@ -74,23 +79,6 @@ class HelperTest < Test::Unit::TestCase
     assert(Haml::Helpers.action_view?)
   end
   
-  def test_action_view_not_included
-    #This is for 100% rcov, rather than any real testing purposes.
-    Kernel.module_eval do
-      alias_method :old_require, :require
-      def require(string)
-        raise LoadError if string == "action_view"
-        old_require string
-      end
-    end
-
-    load File.dirname(__FILE__) + '/../../lib/haml/helpers/action_view_mods.rb'
-
-    Kernel.module_eval do
-      alias_method :require, :old_require
-    end
-  end
-  
   def test_form_tag
     result = render("- form_tag 'foo' do\n  %p bar\n  %strong baz", :action_view)
     should_be = "<form action=\"foo\" method=\"post\">\n  <p>bar</p>\n  <strong>baz</strong>\n</form>\n"

test/haml/runner.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'active_support'
+require 'action_controller'
 require 'action_view'
 require '../../lib/haml/template'
 require 'fileutils'

test/profile.rb

@@ -1,8 +1,11 @@
-require File.dirname(__FILE__) + '/../lib/haml'
-require 'haml/template'
 require 'rubygems'
 require 'active_support'
+require 'action_controller'
 require 'action_view'
+
+require File.dirname(__FILE__) + '/../lib/haml'
+require 'haml/template'
+
 require 'profiler'
 require 'stringio'