haml 6.0.8-java → 6.0.10-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01a86624d7d9895e643653201ad1037e85e87d9548a23afb43513753064b9f58
-  data.tar.gz: e8ea717795a781b4a4553b37727eb741844c69a80b67a5bff7ad478d068fdcfe
+  metadata.gz: 44554f3aa7da10cf2fe950258a176343ad27560a0569b722543640e81eb61fb7
+  data.tar.gz: 9f43b1fcb6441016d93dbb0f2800d2bb54e645882468e20f2d69a1fefdc41e20
 SHA512:
-  metadata.gz: eb1195a84e4a2469ca99c7137dc1aa58e8a91cac275c3c17fad82a7bfe82a218765147b8504a13261438c1515840087dc712e30116e92b7760f72f3c7424ba56
-  data.tar.gz: b362361d2176778e5c85ea597395da7949ed744c925340002c5f695611d3b8d98924da8fd6d37ebfed71a9f02494939c2af7f2a8cebde95a378df269574786da
+  metadata.gz: 808daff72a629634ff341be63fd4dde6a99c3e782004d9118a53f043cfd358fd1cf54ab3319780e9e247f38288b5be5b0cd551a1f0fbbd070360858c5823dc54
+  data.tar.gz: 3c4789806d1386544a5fb17e56b396ce77da1f65582a824dde1c2b2c9940c7fd50e64dcbeadccfdfbdc54dc7f3c2f344b1fe3b1474b75d86e1bbaa88011e18f4

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Haml Changelog
 
+## 6.0.10
+
+* Evaluate :erb filter in the template context
+
+## 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 +71,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,6 +88,8 @@ 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.

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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml
 version: !ruby/object:Gem::Version
-  version: 6.0.8
+  version: 6.0.10
 platform: java
 authors:
 - Natalie Weizenbaum
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-29 00:00:00.000000000 Z
+date: 2022-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement