haml 6.0.8 → 6.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ff76f0fdc08205d557aad04a3701f7aad3df7badb119afe88c3a538fad318e8
-  data.tar.gz: a9bae0ed0aab397b6718df223ae9d093c94b349ecf1a0c0306d7faa446c53e3f
+  metadata.gz: 0b1a2e9891d05d2723574950d4f2e8239234c0a59587dd4eb453554b2b597f75
+  data.tar.gz: a66cb9a12b12700bf815425feaae73fa840cae26ae630a1aaee188066be09429
 SHA512:
-  metadata.gz: bdd2458541e841265ae99d5825a5d76fab8b977d8fd38ae110e19b73dbd1059616de97e6963d5feb42f15cc5b7648887646f4f6a17ec4fbe6aec883ef61865a6
-  data.tar.gz: c3dd71673d91323183695d6d734102422caabad995b76574a7a11ec59703cfc31302df250f6a679e974c7f4f6be50eff6b44c06a0ad45a2d47257a259de07af8
+  metadata.gz: b05af5eefbaeeb3440d5e8c8e5389fef759d76a4641b8e678e5fe14404a98f84acadf2187ed192472fa05ece0d19cb528c427e00cadec6ec7cb9cf6314fb5609
+  data.tar.gz: 27d504c0129637c4bb06601af899d6f11bd5668abdcd9b0034484c1a57c8537bf3da5d5c552de712368ef0c213d713fa7e38b4b10f2e16e467d19e1d3e929d2c

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: 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-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple