haml 6.0.0 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b9bc0a9bea79d404adbf4b0eb540dd256a53c4c99a71f88a2bd25b1b313685a
-  data.tar.gz: 7d76a5280aa58671b319d08776d1c93785e3ea71f9664fc40a2602f229c3a55a
+  metadata.gz: 909d5636fba736ef06747221b4d0ff34a8c5b850f2c8d4cc60ac27843e914e94
+  data.tar.gz: 478fd2cce0e05e386690aa83fa41132da006cb02437ec43a0b4882842a2e973c
 SHA512:
-  metadata.gz: 5d44ef26e2b98dfab93bc7e825dc6f10bc5d86c35cb094fd634b127c7da86c4512ee839cd4f0944b0c4abeac577e94d5bd032aca650a1b70d9b7c97bfeca0a34
-  data.tar.gz: 5c0c3c3689ddca67701c439d96990126663cd52b97107a3ca2fc3da38bfba5614cecbacf8049a0bc751e096370bfa4733c1cd24eb9034c21082c2215617f6b29
+  metadata.gz: 268bfdc33ba76950ab553692c5ff1c45b84a3f3b4185248a19c6a3a74f4b47cd46527d279ed3782f9b7fd6bba6be889a531b7e6c133a4f00ac7e3e06d61a464c
+  data.tar.gz: 1b4f559abe65e3c39627d87b6cc2da894ca67514f62d702ff0920d9d974dda49d4ab7b49e465157622b31a9c3ad5b1925e5e4aa2b1360640d784a7a6f537178a

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Haml Changelog
 
+## 6.0.1
+
+Released on September 23, 2022
+([diff](https://github.com/haml/haml/compare/v6.0.0...v6.0.1)).
+
+* Unescape HTML-safe interpolation on Rails [#1084](https://github.com/haml/haml/issues/1084)
+* Resurrect Haml 5's `AttributeParser.available?` for syntax\_tree-haml [#1085](https://github.com/haml/haml/issues/1085)
+
 ## 6.0.0
 
 Released on September 21, 2022

data/README.md

@@ -1,7 +1,7 @@
 # Haml
 
 [![Gem Version](https://badge.fury.io/rb/haml.svg)](http://rubygems.org/gems/haml)
-[![Build Status](https://travis-ci.org/haml/haml.svg?branch=main)](http://travis-ci.org/haml/haml)
+[![test](https://github.com/haml/haml/actions/workflows/test.yml/badge.svg)](https://github.com/haml/haml/actions/workflows/test.yml)
 [![Code Climate](https://codeclimate.com/github/haml/haml/badges/gpa.svg)](https://codeclimate.com/github/haml/haml)
 [![Inline docs](http://inch-ci.org/github/haml/haml.png)](http://inch-ci.org/github/haml/haml)
 

data/lib/haml/attribute_compiler.rb

@@ -14,7 +14,7 @@ module Haml
 
     def compile(node)
       hashes = []
-      if node.value[:object_ref] != :nil || !Ripper.respond_to?(:lex) # No Ripper.lex in truffleruby
+      if node.value[:object_ref] != :nil || !AttributeParser.available?
         return runtime_compile(node)
       end
       [node.value[:dynamic_attributes].new, node.value[:dynamic_attributes].old].compact.each do |attribute_str|

data/lib/haml/attribute_parser.rb

@@ -6,13 +6,19 @@ module Haml
     class ParseSkip < StandardError
     end
 
+    # @return [TrueClass, FalseClass] - return true if AttributeParser.parse can be used.
+    def self.available?
+      # TruffleRuby doesn't have Ripper.lex
+      defined?(Ripper) && Ripper.respond_to?(:lex) && Temple::StaticAnalyzer.available?
+    end
+
     def self.parse(text)
       self.new.parse(text)
     end
 
     def parse(text)
       exp = wrap_bracket(text)
-      return if RubyExpression.syntax_error?(exp)
+      return if Temple::StaticAnalyzer.syntax_error?(exp)
 
       hash = {}
       tokens = Ripper.lex(exp)[1..-2] || []

data/lib/haml/railtie.rb

@@ -4,11 +4,6 @@ require 'rails'
 module Haml
   class Railtie < ::Rails::Railtie
     initializer :haml, before: :load_config_initializers do |app|
-      # Load haml/plugin first to override if available
-      begin
-        require 'haml/plugin'
-      rescue LoadError
-      end
       require 'haml/rails_template'
     end
   end

data/lib/haml/util.rb

@@ -26,8 +26,9 @@ module Haml
       require 'haml/haml' # Haml::Util.escape_html
     end
 
+    # TODO: Remove unescape_interpolation's workaround and get rid of `respond_to?`.
     def self.escape_html_safe(html)
-      html.html_safe? ? html : escape_html(html)
+      (html.respond_to?(:html_safe?) && html.html_safe?) ? html : escape_html(html)
     end
 
     # Silence all output to STDERR within a block.
@@ -216,7 +217,7 @@ MSG
           end
           content = eval("\"#{interpolated}\"")
           content = "#{char}#{content}" if char == '@' || char == '$'
-          content = "CGI.escapeHTML((#{content}).to_s)" if escape_html
+          content = "Haml::Util.escape_html_safe((#{content}).to_s)" if escape_html
 
           res << "\#{#{content}}"
         end

data/lib/haml/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.0.1
 platform: ruby
 authors:
 - Natalie Weizenbaum
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-21 00:00:00.000000000 Z
+date: 2022-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple