haml 6.0.8 → 6.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ff76f0fdc08205d557aad04a3701f7aad3df7badb119afe88c3a538fad318e8
-  data.tar.gz: a9bae0ed0aab397b6718df223ae9d093c94b349ecf1a0c0306d7faa446c53e3f
+  metadata.gz: 1c6e33698052b2d1823959741be8219446b8b3257f5124449daa8cd8deb70e4a
+  data.tar.gz: d2a168766babc32a3f83b065e6d158e5b937995cdd5a46552fb95d4035ad5924
 SHA512:
-  metadata.gz: bdd2458541e841265ae99d5825a5d76fab8b977d8fd38ae110e19b73dbd1059616de97e6963d5feb42f15cc5b7648887646f4f6a17ec4fbe6aec883ef61865a6
-  data.tar.gz: c3dd71673d91323183695d6d734102422caabad995b76574a7a11ec59703cfc31302df250f6a679e974c7f4f6be50eff6b44c06a0ad45a2d47257a259de07af8
+  metadata.gz: c6d71bcdb86f5281b34c9f56684263db88e947b17c8d79eb764b6ecb8f17945ad7fc374b2ad8032066b0c7ae52e3c0045de3658b76fc073e5ee8ab73e3c7eae3
+  data.tar.gz: 408d9dd0b14378515d175778a9d9b472b70819c2371189aa145d2e787590213f453bba60e6dec2aee5aadf9e7bc0fd6c4b077f96676c9b6e899896ce60eb07cc

data/.github/FUNDING.yml

@@ -1 +1,3 @@
-github: haml
+github:
+  - haml
+  - k0kubun

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,30 @@
 # Haml Changelog
 
+## 6.1.1
+
+* Fix an empty output of Ruby 3.1's Hash shorthand syntax [#1083](https://github.com/haml/haml/issues/1083)
+
+## 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)
+
+## 6.0.10
+
+* Evaluate :erb filter in the template context like Haml 5
+
+## 6.0.9
+
+* Support sass-embedded [#1112](https://github.com/haml/haml/issues/1112)
+
 ## 6.0.8
 
 * Support interpolation in HTML comments, which has not been working since 6.0.0
@@ -63,6 +88,8 @@ Released on September 21, 2022
   * The parser is kept as is, but everything else is replaced.
   * The `haml` CLI interface was also replaced.
   * The interface of `Haml::Engine` is changed. `Haml::Template` is most likely what you need now.
+     * before: `Haml::Engine.new("%p Haml code!").render`
+     * after: `Haml::Template.new { "%p Haml code!" }.render`
   * Most Haml helpers are removed.
      * Rails:
          * Kept: `find_and_reserve`, `preserve`, `surround`, `precede`, `succeed`, `capture_haml`
@@ -78,11 +105,14 @@ Released on September 21, 2022
        `defer`, `disabled`, `download`, `formnovalidate`, `hidden`, `inert`, `ismap`, `itemscope`, `loop`,
        `multiple`, `muted`, `novalidate`, `open`, `pubdate`, `readonly`, `required`, `reversed`, `scoped`,
        `seamless`, `selected`, `sortable`, `truespeed`, `typemustmatch`
+  * Only `data` and `aria` attributes support using a nested Hash to render hyphenated attributes, e.g.
+    `data: { foo: 'bar' }` becomes `data-foo="bar"`, but this no longer works for non-`data`/`aria` attributes.
   * Some legacy Rails integration is removed.
   * The default value of `escape_html` option became true.
   * `-` script lines no longer support capturing. Only `=` lines are supported to yield a nested block.
   * Overriding `data` attributes with another falsy `data-*` attribute that has the same name
     is no longer supported. [#1105](https://github.com/haml/haml/issues/1105)
+  * :erb filter is not executed in the template context (fixed in 6.0.10)
 
 ## 5.2.2
 

data/REFERENCE.md

@@ -338,20 +338,19 @@ will render as:
 <a> tag is so old links to here still work. -->
 <a id="html5_custom_data_attributes" style="border:0;"></a>
 
-#### Prefixed Attributes
+#### Data Attributes
 
 HTML5 allows for adding
 [custom non-visible data attributes](http://www.whatwg.org/specs/web-apps/current-work/multipage/elements.html#embedding-custom-non-visible-data-with-the-data-*-attributes)
 to elements using attribute names beginning with `data-`. The
 [Accessible Rich Internet Applications](http://www.w3.org/WAI/intro/aria)
-specification makes use of attributes beginning with `aria-`. There are also
-frameworks that use non-standard attributes with a common prefix.
+specification makes use of attributes beginning with `aria-`.
 
 Haml can help generate collections of attributes that share a prefix like
-these. Any entry in an attribute hash that has a Hash as its value is expanded
-into a series of attributes, one for each key/value pair in the hash, with the
-attribute name formed by joining the “parent” key name to the key name with a
-hyphen.
+these. Any entry in an `data` or `aria` attribute hash that has a Hash as its
+value is expanded into a series of attributes, one for each key/value pair in
+the hash, with the attribute name formed by joining the “parent” key name to
+the key name with a hyphen. This works only for `data` or `aria`.
 
 For example:
 

data/lib/haml/attribute_compiler.rb

@@ -19,7 +19,7 @@ module Haml
       end
       [node.value[:dynamic_attributes].new, node.value[:dynamic_attributes].old].compact.each do |attribute_str|
         hash = AttributeParser.parse(attribute_str)
-        return runtime_compile(node) unless hash
+        return runtime_compile(node) if hash.nil? || hash.any? { |_key, value| value.empty? }
         hashes << hash
       end
       static_compile(node.value[:attributes], hashes)

data/lib/haml/compiler/children_compiler.rb

@@ -6,21 +6,22 @@ module Haml
     class ChildrenCompiler
       def initialize
         @lineno = 1
+        @multi_flattener = Temple::Filters::MultiFlattener.new
       end
 
       def compile(node, &block)
         temple = [:multi]
         return temple if node.children.empty?
 
-        temple << :whitespace if prepend_whitespace?(node)
+        temple << [:whitespace] if prepend_whitespace?(node)
         node.children.each do |n|
           rstrip_whitespace!(temple) if nuke_prev_whitespace?(n)
           insert_newlines!(temple, n)
           temple << moving_lineno(n) { block.call(n) }
-          temple << :whitespace if insert_whitespace?(n)
+          temple << [:whitespace] if insert_whitespace?(n)
         end
         rstrip_whitespace!(temple) if nuke_inner_whitespace?(node)
-        confirm_whitespace(temple)
+        temple
       end
 
       private
@@ -56,17 +57,6 @@ module Haml
         temple
       end
 
-      def confirm_whitespace(temple)
-        temple.map do |exp|
-          case exp
-          when :whitespace
-            [:static, "\n"]
-          else
-            exp
-          end
-        end
-      end
-
       def prepend_whitespace?(node)
         return false unless %i[comment tag].include?(node.type)
         !nuke_inner_whitespace?(node)
@@ -100,9 +90,48 @@ module Haml
       end
 
       def rstrip_whitespace!(temple)
-        if temple[-1] == :whitespace
-          temple.delete_at(-1)
+        return if temple.size == 1
+
+        case temple[0]
+        when :multi
+          case temple[-1][0]
+          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,10 +4,12 @@ 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'
 
 module Haml
   class Engine < Temple::Engine
@@ -31,11 +33,13 @@ module Haml
     use HTML
     use StringSplitter
     filter :StaticAnalyzer
-    use Escapable
-    use ForceEscapable
+    use Escape
+    use EscapeAny
+    use ForceEscape
     filter :ControlFlow
     use Ambles
     filter :MultiFlattener
+    use Whitespace
     filter :StaticMerger
     use DynamicMerger
     use :Generator, -> { options[:generator] }

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/filters/erb.rb

@@ -3,7 +3,7 @@ module Haml
   class Filters
     class Erb < TiltBase
       def compile(node)
-        compile_with_tilt(node, 'erb')
+        precompiled_with_tilt(node, 'erb')
       end
     end
   end

data/lib/haml/filters/tilt_base.rb

@@ -7,7 +7,11 @@ module Haml
       def self.render(name, source, indent_width: 0)
         text = ::Tilt["t.#{name}"].new { source }.render
         return text if indent_width == 0
-        text.gsub!(/^/, ' ' * indent_width)
+        if text.frozen?
+          text.gsub(/^/, ' ' * indent_width)
+        else
+          text.gsub!(/^/, ' ' * indent_width)
+        end
       end
 
       def explicit_require?(needed_registration)
@@ -17,6 +21,12 @@ module Haml
 
       private
 
+      # TODO: support interpolation
+      def precompiled_with_tilt(node, name)
+        src = ::Tilt["t.#{name}"].new { node.value[:text] }.send(:precompiled, {}).first
+        [:dynamic, src]
+      end
+
       def compile_with_tilt(node, name, indent_width: 0)
         if ::Haml::Util.contains_interpolation?(node.value[:text])
           dynamic_compile(node, name, indent_width: indent_width)

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.8'
+  VERSION = '6.1.1'
 end

data/lib/haml/whitespace.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+module Haml
+  class Whitespace < Temple::Filter
+    def on_whitespace
+      [:static, "\n"]
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml
 version: !ruby/object:Gem::Version
-  version: 6.0.8
+  version: 6.1.1
 platform: ruby
 authors:
 - Natalie Weizenbaum
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-29 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
@@ -334,6 +335,7 @@ files:
 - lib/haml/temple_line_counter.rb
 - lib/haml/util.rb
 - lib/haml/version.rb
+- lib/haml/whitespace.rb
 homepage: https://haml.info
 licenses:
 - MIT
@@ -353,7 +355,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.0.dev
 signing_key: 
 specification_version: 4
 summary: An elegant, structured (X)HTML/XML templating engine.