Index: test/haml/helper_test.rb
============================================================
=======
--- test/haml/helper_test.rb (revision 606)
+++ test/haml/helper_test.rb (working copy)
 -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'
Index: test/haml/engine_test.rb
============================================================
=======
--- test/haml/engine_test.rb (revision 606)
+++ test/haml/engine_test.rb (working copy)
-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'
Index: test/haml/runner.rb
============================================================
=======
--- test/haml/runner.rb (revision 606)
+++ test/haml/runner.rb (working copy)
-1,5
+1,6
require 'rubygems'
require 'active_support'
+require 'action_controller'
require 'action_view'
require '../../lib/haml/template'
require 'fileutils'
Index: test/profile.rb
============================================================
=======
--- test/profile.rb (revision 606)
+++ test/profile.rb (working copy)
-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 'haml/template'
require 'profiler'
require 'stringio'
Index: lib/haml/helpers/action_view_mods.rb
============================================================
=======
--- lib/haml/helpers/action_view_mods.rb (revision 606)
+++ lib/haml/helpers/action_view_mods.rb (working copy)
-1,11
+1,16
-begin
- require 'rubygems'
- require 'active_support'
- require 'action_controller'
- require 'action_view'
- action_view_included = true
-rescue LoadError
- action_view_included = false
+
+# This obviously requires that ActiveSupport be present
prior to Haml
+# being loaded.
+action_view_included = false
+if defined?(ActiveSupport)
+ begin
+ require 'rubygems'
+ require 'active_support'
+ require 'action_controller'
+ require 'action_view'
+ action_view_included = true
+ rescue LoadError
+ end
end
if action_view_included
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the
Google Groups "Haml" group.
To post to this group, send email to hamlgooglegroups.com
To unsubscribe from this group, send email to
haml-unsubscribegooglegroups.com
For more options, visit this group at http://grou
ps.google.com/group/haml?hl=en
-~----------~----~----~----~------~----~------~--~---
|
