haml 6.0.11 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1775ac3d762a6136ef378f69b5522a73b98dfe5ce5a4727c06a061e3d6ceb989
-  data.tar.gz: '06938ad9c4452c051d39dbc1d03bd352fa260a4f3768afb3bcce66f3f3b81b70'
+  metadata.gz: 85f9ebef95ef0ad6c4eece471031137c6ed9fe0eea2d487c66c2aa7416ed6a1f
+  data.tar.gz: bfda96ada6de5a9cecb466ddc1cc9246406df4395e6f06e362980e89dfb4b929
 SHA512:
-  metadata.gz: ac77e8fd0f76d1bdec1092f34e95b438ce0e85477d7eb5a9a973f8ab1d95327be035eac8b70589cb043d99a7ab5bb9d112136ca21c022d2f157239d99aea62a7
-  data.tar.gz: c76565dda6a32822dfb98a8c808b7dfe8c0b640cc59516bf2c69cb6b51aa1605aafbe506d747a67c26c35f46e09f342bf4493191cd8cfb71f100c146ea74c935
+  metadata.gz: 8b2809a903761ad6e2049b77fbe0d7fa56100c3e0b0e0b0a4aa8d56d5970d52cb3b1b1e31c04ba9f75bd55b7140bc6945042e85ac7f328bc197be510b8703233
+  data.tar.gz: 13e703e2c67ea7ab3e8846b85b1fa656230b7d2015e8c9f3c08ea83a4e5771c20ced4e8d9ae317c0e3e381a60992ef38cfdc63d3fc1e14caa0d0d0206cc92562

data/.github/workflows/test.yml

@@ -14,6 +14,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         ruby:
           - '2.5'

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Haml Changelog
 
+## 6.1.0
+
+* Optimize away a `to_s` call on `=` scripts
+* Fix escaping for objects that return an `html_safe` string on `to_s` [#1117](https://github.com/haml/haml/issues/1117)
+
+## 6.0.12
+
+* Fix a whitespace removal with `>` and an `if`-`else` statement [#1114](https://github.com/haml/haml/issues/1114)
+
 ## 6.0.11
 
 * Fix a whitespace removal with `>` and an `if` statement [#1114](https://github.com/haml/haml/issues/1114)

data/lib/haml/compiler/children_compiler.rb

@@ -6,6 +6,7 @@ module Haml
     class ChildrenCompiler
       def initialize
         @lineno = 1
+        @multi_flattener = Temple::Filters::MultiFlattener.new
       end
 
       def compile(node, &block)
@@ -89,15 +90,48 @@ module Haml
       end
 
       def rstrip_whitespace!(temple)
+        return if temple.size == 1
+
         case temple[0]
-        when :multi, :block
+        when :multi
           case temple[-1][0]
-          when :multi, :block
-            rstrip_whitespace!(temple[-1])
           when :whitespace
             temple.delete_at(-1)
+          when :multi, :block
+            rstrip_whitespace!(temple[-1])
+          end
+        when :block
+          _block, code, exp = temple
+          if code.start_with?(/\s*if\s/)
+            # Remove [:whitespace] before `end`
+            exp.replace(@multi_flattener.call(exp))
+            rstrip_whitespace!(exp)
+
+            # Remove [:whitespace] before `else` if exists
+            else_index = find_else_index(exp)
+            if else_index
+              whitespace_index = else_index - 1
+              while exp[whitespace_index] == [:newline]
+                whitespace_index -= 1
+              end
+              if exp[whitespace_index] == [:whitespace]
+                exp.delete_at(whitespace_index)
+              end
+            end
+          end
+        end
+      end
+
+      def find_else_index(temple)
+        multi, *args = temple
+        return nil if multi != :multi
+
+        args.each_with_index do |arg, index|
+          if arg[0] == :code && arg[1].match?(/\A\s*else\s*\z/)
+            return index + 1
           end
         end
+        nil
       end
 
       def insert_whitespace?(node)

data/lib/haml/compiler/script_compiler.rb

@@ -98,10 +98,8 @@ module Haml
       def compile_script_result(result, node)
         if !node.value[:escape_html] && node.value[:preserve]
           result = find_and_preserve(result)
-        else
-          result = "(#{result}).to_s"
         end
-        [:escape, node.value[:escape_html], [:dynamic, result]]
+        [:escapeany, node.value[:escape_html], [:dynamic, result]]
       end
 
       def find_and_preserve(code)

data/lib/haml/engine.rb

@@ -4,8 +4,9 @@ require 'haml/parser'
 require 'haml/compiler'
 require 'haml/html'
 require 'haml/string_splitter'
-require 'haml/escapable'
-require 'haml/force_escapable'
+require 'haml/escape'
+require 'haml/escape_any'
+require 'haml/force_escape'
 require 'haml/dynamic_merger'
 require 'haml/ambles'
 require 'haml/whitespace'
@@ -32,8 +33,9 @@ module Haml
     use HTML
     use StringSplitter
     filter :StaticAnalyzer
-    use Escapable
-    use ForceEscapable
+    use Escape
+    use EscapeAny
+    use ForceEscape
     filter :ControlFlow
     use Ambles
     filter :MultiFlattener

data/lib/haml/{escapable.rb → escape.rb}

@@ -2,7 +2,7 @@
 require 'haml/util'
 
 module Haml
-  class Escapable < Temple::Filters::Escapable
+  class Escape < Temple::Filters::Escapable
     def initialize(opts = {})
       super
       @escape_code = options[:escape_code] ||

data/lib/haml/escape_any.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+require 'haml/escape'
+
+module Haml
+  # This module allows Temple::Filter to dispatch :fescape on `#compile`.
+  module EscapeanyDispathcer
+    def on_escapeany(flag, exp)
+      [:escapeany, flag, compile(exp)]
+    end
+  end
+  ::Temple::Filter.include EscapeanyDispathcer
+
+  # Unlike Haml::Escape, this calls to_s when not escaped.
+  class EscapeAny < Escape
+    alias_method :on_escapeany, :on_escape
+
+    def on_dynamic(value)
+      [:dynamic, @escape ? @escape_code % value : "(#{value}).to_s"]
+    end
+  end
+end

data/lib/haml/{force_escapable.rb → force_escape.rb}

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require 'haml/escapable'
+require 'haml/escape'
 
 module Haml
   # This module allows Temple::Filter to dispatch :fescape on `#compile`.
@@ -10,8 +10,8 @@ module Haml
   end
   ::Temple::Filter.include FescapeDispathcer
 
-  # Unlike Haml::Escapable, this escapes value even if it's html_safe.
-  class ForceEscapable < Escapable
+  # Unlike Haml::Escape, this escapes value even if it's html_safe.
+  class ForceEscape < Escape
     def initialize(opts = {})
       super
       @escape_code = options[:escape_code] || "::Haml::Util.escape_html((%s))"
@@ -20,8 +20,8 @@ module Haml
 
     alias_method :on_fescape, :on_escape
 
-    # ForceEscapable doesn't touch :escape expression.
-    # This method is not used if it's inserted after Haml::Escapable.
+    # ForceEscape doesn't touch :escape expression.
+    # This method is not used if it's inserted after Haml::Escape.
     def on_escape(flag, exp)
       [:escape, flag, compile(exp)]
     end

data/lib/haml/rails_template.rb

@@ -52,4 +52,6 @@ end
 
 # Haml extends Haml::Helpers in ActionView each time.
 # It costs much, so Haml includes a compatible module at first.
-ActionView::Base.send :include, Haml::RailsHelpers
+ActiveSupport.on_load(:action_view) do
+  include Haml::RailsHelpers
+end

data/lib/haml/util.rb

@@ -27,6 +27,7 @@ module Haml
 
     # TODO: Remove unescape_interpolation's workaround and get rid of `respond_to?`.
     def self.escape_html_safe(html)
+      html = html.to_s
       (html.respond_to?(:html_safe?) && html.html_safe?) ? html : escape_html(html)
     end
 

data/lib/haml/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Haml
-  VERSION = '6.0.11'
+  VERSION = '6.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml
 version: !ruby/object:Gem::Version
-  version: 6.0.11
+  version: 6.1.0
 platform: ruby
 authors:
 - Natalie Weizenbaum
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-11-26 00:00:00.000000000 Z
+date: 2022-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
@@ -301,7 +301,8 @@ files:
 - lib/haml/dynamic_merger.rb
 - lib/haml/engine.rb
 - lib/haml/error.rb
-- lib/haml/escapable.rb
+- lib/haml/escape.rb
+- lib/haml/escape_any.rb
 - lib/haml/filters.rb
 - lib/haml/filters/base.rb
 - lib/haml/filters/cdata.rb
@@ -319,7 +320,7 @@ files:
 - lib/haml/filters/scss.rb
 - lib/haml/filters/text_base.rb
 - lib/haml/filters/tilt_base.rb
-- lib/haml/force_escapable.rb
+- lib/haml/force_escape.rb
 - lib/haml/helpers.rb
 - lib/haml/html.rb
 - lib/haml/identity.rb