haml-edge 2.3.72 → 2.3.73

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-2.3.72
+2.3.73

data/VERSION

@@ -1 +1 @@
-2.3.72
+2.3.73

data/lib/haml/util.rb

@@ -141,8 +141,8 @@ module Haml
     #
     # @return [String, nil]
     def rails_root
-      return Rails.root if defined?(Rails.root)
-      return RAILS_ROOT if defined?(RAILS_ROOT)
+      return Rails.root.to_s if defined?(Rails.root)
+      return RAILS_ROOT.to_s if defined?(RAILS_ROOT)
       return nil
     end
 

data/lib/sass/plugin/rails.rb

@@ -7,16 +7,24 @@ unless defined?(Sass::RAILS_LOADED)
                               :always_check      => RAILS_ENV != "production",
                               :full_exception    => RAILS_ENV != "production")
 
-  module ActionController
-    class Base
-      alias_method :sass_old_process, :process
-      def process(*args)
-        if !Sass::Plugin.checked_for_updates ||
-            Sass::Plugin.options[:always_update] || Sass::Plugin.options[:always_check]
-          Sass::Plugin.update_stylesheets
-        end
+  check = lambda do
+    if !Sass::Plugin.checked_for_updates ||
+        Sass::Plugin.options[:always_update] || Sass::Plugin.options[:always_check]
+      Sass::Plugin.update_stylesheets
+    end
+  end
 
-        sass_old_process(*args)
+  if defined?(ActionDispatch::Callbacks.to_prepare)
+    # Rails >= 3.0.0
+    ActionDispatch::Callbacks.to_prepare(&check)
+  else
+    module ActionController
+      class Base
+        alias_method :sass_old_process, :process
+        def process(*args)
+          check.call
+          sass_old_process(*args)
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml-edge
 version: !ruby/object:Gem::Version 
-  version: 2.3.72
+  version: 2.3.73
 platform: ruby
 authors: 
 - Nathan Weizenbaum