haml-edge 2.3.222 → 2.3.223

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-2.3.222
+2.3.223

data/VERSION

@@ -1 +1 @@
-2.3.222
+2.3.223

data/lib/haml/railtie.rb

@@ -3,16 +3,7 @@
 # Yehuda promises there will be soon,
 # and once there is we should switch to that.
 
+# Rails 3.0.0.beta.2+
 if defined?(ActiveSupport) && Haml::Util.has?(:public_method, ActiveSupport, :on_load)
-  # Rails 3.0.0.beta.2+
   ActiveSupport.on_load(:action_view) {Haml.init_rails(binding)}
-elsif defined?(Rails::Railtie)
-  # Rails 3.0.0.beta1
-  module Haml
-    class Railtie < Rails::Railtie
-      ActiveSupport.on_load(:action_view) do
-        Haml.init_rails(binding)
-      end
-    end
-  end
 end

data/lib/haml/template.rb

@@ -19,7 +19,11 @@ module Haml
     #
     # @return [Boolean] Whether the XSS integration was enabled.
     def try_enabling_xss_integration
-      return false unless ActionView::Base.respond_to?(:xss_safe?) && ActionView::Base.xss_safe?
+      return false unless (ActionView::Base.respond_to?(:xss_safe?) && ActionView::Base.xss_safe?) ||
+        # We check for ActiveSupport#on_load here because if we're loading Haml that way, it means:
+        # A) we're in Rails 3 so XSS support is always on, and
+        # B) we might be in Rails 3 beta 3 where the load order is broken and xss_safe? is undefined
+        (defined?(ActiveSupport) && Haml::Util.has?(:public_method, ActiveSupport, :on_load))
 
       Haml::Template.options[:escape_html] = true
 
@@ -55,10 +59,14 @@ else
   require 'haml/template/patch'
 end
 
-# Enable XSS integration. Use Rails' after_initialize method if possible
+# Enable XSS integration. Use Rails' after_initialize method
 # so that integration will be checked after the rails_xss plugin is loaded
 # (for Rails 2.3.* where it's not enabled by default).
-if defined?(Rails.configuration.after_initialize)
+#
+# If we're running under Rails 3, though, we don't want to use after_intialize,
+# since Haml loading has already been deferred via ActiveSupport.on_load.
+if defined?(Rails.configuration.after_initialize) &&
+    !(defined?(ActiveSupport) && Haml::Util.has?(:public_method, ActiveSupport, :on_load))
   Rails.configuration.after_initialize {Haml::Template.try_enabling_xss_integration}
 else
   Haml::Template.try_enabling_xss_integration

data/lib/haml/util.rb

@@ -274,13 +274,7 @@ module Haml
           ActionPack::VERSION::Major
         end
 
-      # 3.0.0.beta1 acts more like ActionPack 2
-      # for purposes of this method
-      # (checking whether block helpers require = or -).
-      # This extra check can be removed when beta2 is out.
-      version >= 3 &&
-        !(defined?(ActionPack::VERSION::TINY) &&
-          ActionPack::VERSION::TINY == "0.beta")
+      version >= 3
     end
 
     # Returns whether this environment is using ActionPack

metadata

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