[Sass] Use Rack on Merb by default.

brandondrew · Apr 28, 2010 · b37af7d · b37af7d
1 parent 39ad0af
commit b37af7d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 23 deletions.
diff --git a/doc-src/SASS_CHANGELOG.md b/doc-src/SASS_CHANGELOG.md
@@ -12,6 +12,10 @@
 
 * Properly insert the Rack middleware so that stylesheets are updated on each request.
 
+### Merb Rack Support
+
+The Sass Rails plugin now works using Rack middleware by default.
+
 ## 3.0.0.rc.2
 
 [Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.0.rc.2).

diff --git a/lib/sass/plugin/merb.rb b/lib/sass/plugin/merb.rb
@@ -24,27 +24,6 @@
 
   Sass::Plugin.options.merge!(config)
 
-  if version[0] > 0 || version[1] >= 9
-
-    class Merb::Rack::Application
-      def call_with_sass(env)
-        Sass::Plugin.check_for_updates
-        call_without_sass(env)
-      end
-      alias_method :call_without_sass, :call
-      alias_method :call, :call_with_sass
-    end
-
-  else
-
-    class MerbHandler
-      def process_with_sass(request, response)
-        Sass::Plugin.check_for_updates
-        process_without_sass(request, response)
-      end
-      alias_method :process_without_sass, :process
-      alias_method :process, :process_with_sass
-    end
-
-  end
+  require 'sass/plugin/rack'
+  Merb::Config[:app].use Sass::Plugin::Rack
 end