[Sass] Make Rails 3 integration less hacky.

lib/haml/railtie.rb

@@ -2,28 +2,13 @@
 if defined?(ActiveSupport) && Haml::Util.has?(:public_method, ActiveSupport, :on_load)
   require 'haml/template/options'
   require 'sass/plugin/configuration'
-  ActiveSupport.on_load(:action_view) do
-    if Rails.application
+  ActiveSupport.on_load(:before_initialize) do
+    require 'sass'
+    require 'sass/plugin'
+
+    # Haml requires AV, but Sass doesn't
+    ActiveSupport.on_load(:action_view) do
       Haml.init_rails(binding)
-    else
-      # I can't believe we have to do this, but we do.
-      # Rails 3's lovely lazy-loading means that it's possible to load ActionView
-      # before the application has even begin loading.
-      # This means that Rails.root doesn't exist yet.
-      # So if the application isn't loaded, we use this arcane initializer stuff
-      # to load Haml/Sass *after* the application loads.
-      #
-      # Of course, it's also possible that the application is loaded before ActionView,
-      # so we can't *just* rely on this method of loading.
-      #
-      # Ugh.
-      module Haml
-        class Railtie < Rails::Railtie
-          initializer :haml do
-            Haml.init_rails(binding)
-          end
-        end
-      end
     end
   end
 end

lib/sass/plugin/rails.rb

@@ -21,17 +21,7 @@
   if defined?(ActionController::Metal)
     # Rails >= 3.0
     require 'sass/plugin/rack'
-    if Rails.application.instance_variable_get('@app')
-      # The application has already been built,
-      # so we need to hack the middleware in
-      Rails.application.instance_variable_set('@app',
-        Sass::Plugin::Rack.new(Rails.application.app))
-    else
-      # The application hasn't been built yet,
-      # so we can just add Sass::Plugin::Rack
-      # to the pending middleware stack.
-      Rails.configuration.middleware.use(Sass::Plugin::Rack)
-    end
+    Rails.configuration.middleware.use(Sass::Plugin::Rack)
   elsif defined?(ActionController::Dispatcher) &&
       defined?(ActionController::Dispatcher.middleware)
     # Rails >= 2.3