haml 7.2.0 → 7.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 666a9c4513f3c1450ac36b92fefcff06d9a69aae9cc60840eb0182dbe53e2995
-  data.tar.gz: 709a5f0d8ad693be7bb7b2750d84fb1025d77ada780f045071e69bf16abfa76a
+  metadata.gz: f4665a2a3c561765d35c0eeec78fdc87d2574cd640249089ace5035cc672e46f
+  data.tar.gz: 02146e70c4ace1a58a1598ccfe25b08a22f06d0aa0554244806b1593cce85caa
 SHA512:
-  metadata.gz: 5baeb23700d275b2a6c678b807756ff3536d638b782c4a26f44236fd3b9e9037d6b46c5c09b76b87e19f3cffaa668c5f221a395b8f2ba37a9a026c17ebc2fccc
-  data.tar.gz: cd428da5241f00f831080af924ef7fd2a066699c9805272727dbe32eb7672c90d6fbd1bbf6d3cae8dffc99f472d8dfb721b6558d78e64808b2a1319b7a78aa01
+  metadata.gz: 3b24e11afe577f0b175fca4ae8fe5bdc45ae245e2f654a6d832ac2c619e25f2aeefb700e5ba51742f22ad5e849cc06d8831ef2a2c30083aab7a2bab727fcfe01
+  data.tar.gz: ad77cc1be2d2831de2cbac2568efbc368fb1627626c19138e7059b120fb2e85c88057b8f9fb705c22f82b7d910497018e156acbc61691ce52db4de5d39a0e764

data/.github/workflows/test.yml

@@ -20,6 +20,7 @@ jobs:
           - '3.2'
           - '3.3'
           - '3.4'
+          - '4.0'
           - ruby-head
           - jruby
           - truffleruby

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Haml Changelog
 
+## 7.2.1
+
+* Do not rely on Ripper quirk in parsing old-style Haml attributes https://github.com/haml/haml/pull/1212
+
 ## 7.2.0
 
 * Do not require rails when haml is required https://github.com/haml/haml/pull/1201

data/Gemfile

@@ -16,6 +16,7 @@ gem 'mutex_m'
 
 if /java/.match?(RUBY_PLATFORM) # JRuby
   gem 'pandoc-ruby'
+  gem 'rdoc', '< 8' # rdoc 8 depends on rbs, whose native extension doesn't build on JRuby
 else
   gem 'redcarpet'
 

data/lib/haml/parser.rb

@@ -688,8 +688,17 @@ module Haml
         #
         # To scan such code correctly, this scans `a( hash, foo: bar }` instead, stops when there is
         # 1 more :on_embexpr_end (the last '}') than :on_embexpr_beg, and resurrects '{' afterwards.
-        balanced, rest = balance_tokens(text.sub(?{, METHOD_CALL_PREFIX), :on_embexpr_beg, :on_embexpr_end, count: 1)
-        attributes_hash = balanced.sub(METHOD_CALL_PREFIX, ?{)
+        #
+        # Old attributes allow invalid Hash constructs (e.g., `{ hash, foo: bar }`).
+        # Replacing the opening `{` with `a(` makes the syntax look like a method call so
+        # Ripper can lex it reliably.
+
+        attributes_hash, rest = balance_tokens(
+          text.sub(?{, METHOD_CALL_PREFIX),
+          [:on_lbrace, :on_tlambeg, :on_embexpr_beg],
+          [:on_rbrace, :on_embexpr_end],
+          count: 1)
+        attributes_hash = attributes_hash.sub(METHOD_CALL_PREFIX, ?{)
       rescue SyntaxError => e
         if e.message == Error.message(:unbalanced_brackets) && !@template.empty?
           text << "\n#{@next_line.text}"
@@ -850,10 +859,9 @@ module Haml
       text = ''.dup
       Ripper.lex(buf).each do |_, token, str|
         text << str
-        case token
-        when start
+        if start.include?(token)
           count += 1
-        when finish
+        elsif finish.include?(token)
           count -= 1
         end
 

data/lib/haml/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml
 version: !ruby/object:Gem::Version
-  version: 7.2.0
+  version: 7.2.1
 platform: ruby
 authors:
 - Natalie Weizenbaum