[Haml] Separate out Haml::Template.options and load it early under Ra…

…ils 3.

Closes sassgh-148

doc-src/HAML_CHANGELOG.md

@@ -3,6 +3,13 @@
 * Table of contents
 {:toc}
 
+## 3.0.0.rc.4 (Unreleased)
+
+### Rails Beta Support
+
+* Setting options via `Haml::Template.options` in the initializer
+  now works without using `ActiveSupport.on_load(:action_view)`.
+
 ## 3.0.0.rc.3
 
 [Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.0.rc.3).

lib/haml/railtie.rb

@@ -5,5 +5,6 @@
 
 # Rails 3.0.0.beta.2+
 if defined?(ActiveSupport) && Haml::Util.has?(:public_method, ActiveSupport, :on_load)
+  require 'haml/template/options'
   ActiveSupport.on_load(:action_view) {Haml.init_rails(binding)}
 end

lib/haml/template.rb

@@ -1,19 +1,11 @@
+require 'haml/template/options'
 require 'haml/engine'
 require 'haml/helpers/action_view_mods'
 require 'haml/helpers/action_view_extensions'
 
 module Haml
   # The class that keeps track of the global options for Haml within Rails.
   module Template
-    extend self
-
-    @options = {}
-    # The options hash for Haml when used within Rails.
-    # See {file:HAML_REFERENCE.md#haml_options the Haml options documentation}.
-    #
-    # @return [{Symbol => Object}]
-    attr_accessor :options
-
     # Enables integration with the Rails 2.2.5+ XSS protection,
     # if it's available and enabled.
     #

lib/haml/template/options.rb

@@ -0,0 +1,16 @@
+# We keep options in its own self-contained file
+# so that we can load it independently in Rails 3,
+# where the full template stuff is lazy-loaded.
+
+module Haml
+  module Template
+    extend self
+
+    @options = {}
+    # The options hash for Haml when used within Rails.
+    # See {file:HAML_REFERENCE.md#haml_options the Haml options documentation}.
+    #
+    # @return [{Symbol => Object}]
+    attr_accessor :options
+  end
+end