haml 3.0.11 → 3.0.12

data/VERSION

@@ -1 +1 @@
-3.0.11
+3.0.12

data/lib/sass/plugin/rails.rb

@@ -1,4 +1,13 @@
 unless defined?(Sass::RAILS_LOADED)
+  if Haml::Util.ap_geq_3? && !Haml::Util.ap_geq?("3.0.0.beta4")
+    Haml::Util.haml_warn(<<WARNING)
+DEPRECATION WARNING:
+Haml/Sass support for Rails 3 versions before beta 4 is deprecated,
+  and will be removed in Haml/Sass 3.0.13.
+  Please upgrade to Rails 3.0.0.beta4 or later.
+WARNING
+  end
+
   Sass::RAILS_LOADED = true
 
   # Reverse-merging (we're in Rails, anyway) so we dont' clobber what's already been defined further up-stream
@@ -12,8 +21,17 @@ unless defined?(Sass::RAILS_LOADED)
   if defined?(ActionController::Metal)
     # Rails >= 3.0
     require 'sass/plugin/rack'
-    Rails.application.instance_variable_set('@app',
-      Sass::Plugin::Rack.new(Rails.application.app))
+    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
   elsif defined?(ActionController::Dispatcher) &&
       defined?(ActionController::Dispatcher.middleware)
     # Rails >= 2.3

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 3
   - 0
-  - 11
-  version: 3.0.11
+  - 12
+  version: 3.0.12
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-09 00:00:00 -07:00
+date: 2010-06-10 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency