haml 6.0.0-java → 6.0.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4924e3e24cb0f131b9f6e5f2b89875d4aa3450bc0310a4e6705d6fb59c94ac18
-  data.tar.gz: 5cae3a510be49afaf4074676614b2348c0c08921b1f0d943d4f4a8bb74cb4498
+  metadata.gz: 68a6f34dd21649937e9a8b43f05e536ace7973921daf3db313817d3e95a92118
+  data.tar.gz: 7631ed48b303b7f2b692423f7a88b0e8cce20bf59a9adcf0eb93717492795fae
 SHA512:
-  metadata.gz: 8a8fe83e1205aa401a9b5d0bb8d84842a6f21cd4ddef02360f70cfcab94957c2bb261e80edcec1333e84b6f626dc5a9778ab2cce59bb4e0142908e9fb1fb80ef
-  data.tar.gz: 54df09a64b90d5f2b1ce69bd718a159c9b1b82a9bffd205c4558a299a0aab0e46c1021078cdff94ca3d4ae3d87c7191b2f162f675760f5a8ca04d6093f2a8306
+  metadata.gz: 7de58f9231b4ab3aae8f9d6b1a45c9d10cf2dd8ff38c393447aef23660d67b6166f4dbca6eba1da4ca3c5e684a1378b5a283932145d4db35200a381ff65ca5a9
+  data.tar.gz: cc82756deb275aad826bec55c2224523e05870f8a136bd795bd9ffc13d3c6ddbb1df3f1f671d0ca15e8d171d8c2b88bf9ae921eca5dc0d1196b04648363a9843

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: java
 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
   requirement: !ruby/object:Gem::Requirement