haml 6.0.7-java → 6.0.8-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8981d672a497d7d98e613a835b92f2bd782ea01600ecd92a9174a1dfb332f23c
-  data.tar.gz: d745d24fe528a5d381d95ebcab2b223e301dc82a60b2104ce490a319539f373f
+  metadata.gz: 01a86624d7d9895e643653201ad1037e85e87d9548a23afb43513753064b9f58
+  data.tar.gz: e8ea717795a781b4a4553b37727eb741844c69a80b67a5bff7ad478d068fdcfe
 SHA512:
-  metadata.gz: '022597284501bfaeaa2187691fec500030cae3a998ad6bcf75986666dcb2e69277b60e1f2e8f14f166755e5ec0cb4c657188c70ac08ce7c1acbb4227f2efddb0'
-  data.tar.gz: 76f1123db08c324156f88d810e22f4f633fea18aaae2c7cc9d2d95317addbaa5afab602ccd2c98d3e999be3fb2541c080adb94089185e99f4eddb60a071ff1d3
+  metadata.gz: eb1195a84e4a2469ca99c7137dc1aa58e8a91cac275c3c17fad82a7bfe82a218765147b8504a13261438c1515840087dc712e30116e92b7760f72f3c7424ba56
+  data.tar.gz: b362361d2176778e5c85ea597395da7949ed744c925340002c5f695611d3b8d98924da8fd6d37ebfed71a9f02494939c2af7f2a8cebde95a378df269574786da

data/.github/workflows/test.yml

@@ -25,16 +25,10 @@ jobs:
           - truffleruby-head
     steps:
       - uses: actions/checkout@v2
+      - run: sudo apt-get update && sudo apt-get install -y nodejs libxslt-dev # nodejs for execjs, libxslt for TruffleRuby nokogiri
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-      - uses: actions/cache@v2
-        with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-${{ matrix.ruby }}-gems-${{ hashFiles('**/Gemfile.lock') }}
-          restore-keys: ${{ runner.os }}-gems-
-      - run: sudo apt-get update && sudo apt-get install -y nodejs libxslt-dev # nodejs for execjs, libxslt for TruffleRuby nokogiri
-      - name: bundle install
-        run: bundle config path vendor/bundle && bundle install -j$(nproc) --retry 3
+          bundler-cache: true
       - run: bundle exec rake test

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Haml Changelog
 
+## 6.0.8
+
+* Support interpolation in HTML comments, which has not been working since 6.0.0
+  [#1107](https://github.com/haml/haml/issues/1107)
+
 ## 6.0.7
 
 * `Haml::Engine` and `Haml::Template` use StringBuffer instead of ArrayBuffer
@@ -68,9 +73,16 @@ Released on September 21, 2022
          * Removed: `block_is_haml?`, `capture_haml`, `escape_once`, `find_and_preserve`, `flatten`, `haml_concat`,
            `haml_indent`, `haml_tag`, `haml_tag_if`, `html_attrs`, `html_escape`, `init_haml_helpers`, `is_haml?`,
            `list_of`, `non_haml`, `precede`, `succeed`, `surround`, `tab_down`, `tab_up`, `with_tabs`
-  * Only the attributes in [`Haml::AttributeBuilder::BOOLEAN_ATTRIBUTES`](lib/haml/attribute_builder.rb)
-    are handled as boolean attributes.
+  * Only the following attributes and `aria`/`data` attributes are considered boolean attributes:
+     * `allowfullscreen`, `async`, `autobuffer`, `autofocus`, `autoplay`, `checked`, `controls`, `default`,
+       `defer`, `disabled`, `download`, `formnovalidate`, `hidden`, `inert`, `ismap`, `itemscope`, `loop`,
+       `multiple`, `muted`, `novalidate`, `open`, `pubdate`, `readonly`, `required`, `reversed`, `scoped`,
+       `seamless`, `selected`, `sortable`, `truespeed`, `typemustmatch`
   * 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)
 
 ## 5.2.2
 

data/lib/haml/compiler/comment_compiler.rb

@@ -14,7 +14,7 @@ module Haml
 
       def compile_html_comment(node, &block)
         if node.children.empty?
-          [:html, :comment, [:static, " #{node.value[:text]} "]]
+          [:html, :comment, compile_text(node)]
         else
           [:html, :comment, yield(node)]
         end
@@ -28,12 +28,24 @@ module Haml
 
         content =
           if node.children.empty?
-            [:static, " #{node.value[:text]} "]
+            compile_text(node)
           else
             yield(node)
           end
         [:html, :condcomment, condition, content, node.value[:revealed]]
       end
+
+      def compile_text(node)
+        text =
+          if node.value[:parse]
+            # Just always escaping the result for safety. We could respect
+            # escape_html, but I don't see any use case for it.
+            [:escape, true, [:dynamic, node.value[:text]]]
+          else
+            [:static, node.value[:text]]
+          end
+        [:multi, [:static, ' '], text, [:static, ' ']]
+      end
     end
   end
 end

data/lib/haml/version.rb

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

metadata

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