haml-edge 3.1.19 → 3.1.20

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-3.1.19
+3.1.20

data/VERSION

@@ -1 +1 @@
-3.1.19
+3.1.20

data/lib/haml/filters.rb

@@ -308,10 +308,16 @@ END
       # @see Base#compile
       def compile(precompiler, text)
         return if precompiler.options[:suppress_eval]
-        src = ::ERB.new(text).src.sub(/^#coding:.*?\n/, '').
+        src = RealERB.new(text).src.sub(/^#coding:.*?\n/, '').
           sub(/^_erbout = '';/, "")
         precompiler.send(:push_silent, src)
       end
+
+      # This is a dummy ERB subclass
+      # that's used to work around Rails 2.3.6's
+      # incompatible monkeypatches of ERB.
+      # It's modified in `haml/template.rb` if need be.
+      class RealERB < ::ERB; end
     end
 
     # Parses the filtered text with [Textile](http://www.textism.com/tools/textile).

data/lib/haml/helpers/action_view_mods.rb

@@ -97,6 +97,22 @@ module ActionView
       end
     end
 
+    # For some reason, Rails 2.3.6 uses #safe_concat in #capture
+    # even when XSS support is disabled.
+    if Haml::Util.ap_2_3_6?
+      module TextHelper
+        def concat_with_haml(string, binding = nil)
+          if is_haml?
+            haml_buffer.buffer.concat(string)
+          else
+            concat_without_haml(string, binding)
+          end
+        end
+        alias_method :concat_without_haml, :concat
+        alias_method :concat, :concat_with_haml
+      end
+    end
+
     module TagHelper
       def content_tag_with_haml(name, *args, &block)
         return content_tag_without_haml(name, *args, &block) unless is_haml?
@@ -238,3 +254,24 @@ module ActionView
     end
   end
 end
+
+# Rails 2.3.6 uses #safe_concat in #fragment_for
+# rather than using #concat with an #html_safe string.
+# This fixes that issue.
+if Haml::Util.ap_2_3_6?
+  module ActionController::Caching::Fragments
+    def fragment_for(buffer, name = {}, options = nil, &block) #:nodoc:
+      if perform_caching
+        if cache = read_fragment(name, options)
+          buffer.concat(cache.html_safe)
+        else
+          pos = buffer.length
+          block.call
+          write_fragment(name, buffer[pos..-1], options)
+        end
+      else
+        block.call
+      end
+    end
+  end
+end

data/lib/haml/template.rb

@@ -64,6 +64,28 @@ else
   Haml::Template.try_enabling_xss_integration
 end
 
+# Rails 2.3.6 monkeypatches ERB in incompatible ways.
+# We fix our own subclass of ERB here so the Haml ERB filter
+# will continue to work.
+if Haml::Util.ap_2_3_6?
+  class Haml::Filters::ERB::RealERB
+    def set_eoutvar(compiler, eoutvar = '_erbout')
+      compiler.put_cmd = "#{eoutvar}.concat"
+      compiler.insert_cmd = "#{eoutvar}.concat"
+
+      cmd = []
+      cmd.push "#{eoutvar} = ''"
+
+      compiler.pre_cmd = cmd
+
+      cmd = []
+      cmd.push(eoutvar)
+
+      compiler.post_cmd = cmd
+    end
+  end
+end
+
 if Haml::Util.rails_root
   # Update init.rb to the current version
   # if it's out of date.

data/lib/haml/util.rb

@@ -324,6 +324,20 @@ module Haml
           $1.to_i >= 3))
     end
 
+    # Returns whether this environment is using ActionPack
+    # version 2.3.6 (or greater, up until 3.0.0).
+    #
+    # @return [Boolean]
+    def ap_2_3_6?
+      # Hopefully Rails 2.3.7 will fix the issues that this method hacks around,
+      # but for now we'll assume it won't
+      require 'action_pack'
+      defined?(ActionPack::VERSION::MAJOR) &&
+        ActionPack::VERSION::MAJOR == 2 &&
+        ActionPack::VERSION::MINOR == 3 &&
+        ActionPack::VERSION::TINY >= 6
+    end
+
     # Returns an ActionView::Template* class.
     # In pre-3.0 versions of Rails, most of these classes
     # were of the form `ActionView::TemplateFoo`,
@@ -374,8 +388,11 @@ module Haml
     #
     # @return [Class]
     def rails_safe_buffer_class
-      return ActionView::SafeBuffer if defined?(ActionView::SafeBuffer)
-      ActiveSupport::SafeBuffer
+      # It's important that we check ActiveSupport first,
+      # because in Rails 2.3.6 ActionView::SafeBuffer exists
+      # but is a deprecated proxy object.
+      return ActiveSupport::SafeBuffer if defined?(ActiveSupport::SafeBuffer)
+      return ActionView::SafeBuffer
     end
 
     ## Cross-Ruby-Version Compatibility

metadata

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