haml 6.3.1 → 6.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7fe81126a81cb26d93f23c930d55244ee89654bdfc188f8cf3e64b69475b5472
-  data.tar.gz: 7862cc5427e62e96ec1851f6265522b619d5f2fdf15a55ca6aef8ee2f641b0ed
+  metadata.gz: 313ffec5cc79d2b238173fde9769ac60d26b54bf15d3deda68adc84d0849620b
+  data.tar.gz: 143e9115612a2555a4ce34c817745e330548a7eaedf98bc819ead44b2156f8ad
 SHA512:
-  metadata.gz: ccf3c62f1b319265ceaec6987888b17f0a2b1599d56e3f625d973ecc3c920b7efbd17e86a949c9081e82b084f554978e52c91d0452e8ef02c6e21d6d4a4e6d0e
-  data.tar.gz: 01f7a62d43f8a9929bfc42dfb8677f0641650064565c4a2f0ea6fe53a3e11da819b6f9c5c6aa79f67102a0b0197cd282feebcb9116d6bf1f242efc241f7e37f3
+  metadata.gz: 117f3811b514f8abd4142cdc8022e282e5a5434c5c0f6904e7eaff7655f58894e3486c999282f0140b6011016b52b139036071792c3ba33494de73342d512d77
+  data.tar.gz: 99e76cc2438c8ba70aaf39b3ccc0df9b610e3ac06de35b8865c2f2ce5aa692f9642791b863602eef5e382d60224fdb44a143074c11f072ccad7556ae1461b261

data/.github/workflows/test.yml

@@ -27,7 +27,7 @@ jobs:
           - '3.4'
           - ruby-head
           - jruby
-          - truffleruby-head
+          - truffleruby
     steps:
       - uses: actions/checkout@v4
       - run: sudo apt-get update && sudo apt-get install -y nodejs libxslt-dev # nodejs for execjs, libxslt for TruffleRuby nokogiri

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Haml Changelog
 
+## 6.4.0
+
+* Authorize characters in attribute name for vuejs https://github.com/haml/haml/pull/1172
+* Compile new-style attributes statically https://github.com/haml/haml/pull/1165
+* Remove newlines from template annotation comments https://github.com/haml/haml/pull/1186
+* Fix line numbers within a :ruby filter https://github.com/haml/haml/pull/1166
+* Fix .class + nested class array bug https://github.com/haml/haml/pull/1191
+
 ## 6.3.1
 
 * Optimize string transformation using `String#tr` https://github.com/haml/haml/pull/1168

data/REFERENCE.md

@@ -360,13 +360,6 @@ will render as:
 
     <a data-author-id='123' data-category='7' href='/posts'>Posts By Author</a>
 
-Notice that the underscore in `author_id` was replaced with a hyphen. If you wish
-to suppress this behavior, you can set Haml's
-{Haml::Options#hyphenate_data_attrs `:hyphenate_data_attrs` option} to `false`,
-and the output will be rendered as:
-
-    <a data-author_id='123' data-category='7' href='/posts'>Posts By Author</a>
-
 This expansion of hashes is recursive – any value of the child hash that is
 itself a hash will create an attribute for each entry, with the attribute name
 prefixed with all ancestor keys. For example:

data/lib/haml/attribute_builder.rb

@@ -54,7 +54,7 @@ module Haml::AttributeBuilder
         when value.is_a?(String)
           classes += value.split(' ')
         when value.is_a?(Array)
-          classes += value.select { |v| v }
+          classes += value.flatten.select { |v| v }
         when value
           classes << value.to_s
         end

data/lib/haml/attribute_compiler.rb

@@ -98,7 +98,7 @@ module Haml
     def compile_boolean!(temple, key, values)
       exp = literal_for(values.last)
 
-      if Temple::StaticAnalyzer.static?(exp)
+      if values.last.first == :static || Temple::StaticAnalyzer.static?(exp)
         value = eval(exp)
         case value
         when true then temple << [:html, :attr, key, @format == :xhtml ? [:static, key] : [:multi]]

data/lib/haml/filters/plain.rb

@@ -7,7 +7,7 @@ module Haml
       def compile(node)
         text = node.value[:text]
         text = text.rstrip unless ::Haml::Util.contains_interpolation?(text) # for compatibility
-        [:multi, *compile_plain(text)]
+        [:multi, [:newline], *compile_plain(text)]
       end
 
       private

data/lib/haml/filters/ruby.rb

@@ -3,7 +3,7 @@ module Haml
   class Filters
     class Ruby < Base
       def compile(node)
-        [:code, node.value[:text]]
+        [:multi, [:newline], [:code, node.value[:text]]]
       end
     end
   end

data/lib/haml/parser.rb

@@ -749,7 +749,7 @@ module Haml
     end
 
     def parse_new_attribute(scanner)
-      unless (name = scanner.scan(/[-:\w]+/))
+      unless (name = scanner.scan(/[-:@#\w\.]+/))
         return if scanner.scan(/\)/)
         return false
       end

data/lib/haml/rails_template.rb

@@ -40,8 +40,8 @@ module Haml
 
       if ActionView::Base.try(:annotate_rendered_view_with_filenames) && template.format == :html
         options = options.merge(
-          preamble: "<!-- BEGIN #{template.short_identifier} -->\n",
-          postamble: "<!-- END #{template.short_identifier} -->\n",
+          preamble: "<!-- BEGIN #{template.short_identifier} -->",
+          postamble: "<!-- END #{template.short_identifier} -->",
         )
       end
 

data/lib/haml/version.rb

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

metadata

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