haml 6.3.1 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7fe81126a81cb26d93f23c930d55244ee89654bdfc188f8cf3e64b69475b5472
-  data.tar.gz: 7862cc5427e62e96ec1851f6265522b619d5f2fdf15a55ca6aef8ee2f641b0ed
+  metadata.gz: 0e24d15b93f8a8d9f856080c6fd6dbb2183b07602b2e3bd9beb43a718b4cd021
+  data.tar.gz: 5cc2496f9fdeba6950f152ffb0be8ea690f6543736d178e98da276da28706b4c
 SHA512:
-  metadata.gz: ccf3c62f1b319265ceaec6987888b17f0a2b1599d56e3f625d973ecc3c920b7efbd17e86a949c9081e82b084f554978e52c91d0452e8ef02c6e21d6d4a4e6d0e
-  data.tar.gz: 01f7a62d43f8a9929bfc42dfb8677f0641650064565c4a2f0ea6fe53a3e11da819b6f9c5c6aa79f67102a0b0197cd282feebcb9116d6bf1f242efc241f7e37f3
+  metadata.gz: 379fe2253bfe6688e41fdd16a8b007635ca3a48c688d5ba3e90ccafe4f8414959c1e800481a95fd76995615bd9af66977e74f0d4a08916ab1ff257bd7b375fbd
+  data.tar.gz: bdcecfe1f128e52e719d0005abddeb4a5fb4b049722c5db267bf1862ce54ddb69db18a7114a1e37b8db880676b513cbd8dc4d9fa02da23d5de66d4bbaa282338

data/.github/workflows/test.yml

@@ -17,17 +17,12 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-          - '2.5'
-          - '2.6'
-          - '2.7'
-          - '3.0'
-          - '3.1'
           - '3.2'
           - '3.3'
           - '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,18 @@
 # Haml Changelog
 
+## 7.0.0
+
+* Change the default `attr_quote` from `'` to `"` https://github.com/haml/haml/issues/1188
+* Bump required Ruby version to 3.2 https://github.com/haml/haml/issues/1176
+
+## 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/Gemfile

@@ -10,7 +10,9 @@ gemspec
 
 gem 'benchmark-ips', '2.3.0'
 gem 'maxitest'
-gem 'pry'
+gem 'base64'
+gem 'bigdecimal'
+gem 'mutex_m'
 
 if /java/ === RUBY_PLATFORM # JRuby
   gem 'pandoc-ruby'

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/bin/console

@@ -1,11 +1,10 @@
 #!/usr/bin/env ruby
 
 require 'bundler/setup'
-require 'hamlit'
+require 'haml'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
 
-# (If you use this, don't forget to add pry to your Gemfile!)
-require 'pry'
-Pry.start
+require 'irb'
+IRB.start

data/haml.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
 
   spec.metadata["changelog_uri"] = spec.homepage + "/blob/main/CHANGELOG.md"
 
-  spec.required_ruby_version = '>= 2.1.0'
+  spec.required_ruby_version = '>= 3.2.0'
 
   spec.add_dependency 'temple', '>= 0.8.2'
   spec.add_dependency 'thor'
@@ -33,7 +33,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'coffee-script'
   spec.add_development_dependency 'erubi'
-  spec.add_development_dependency 'haml', '>= 5'
   spec.add_development_dependency 'less'
   spec.add_development_dependency 'minitest-reporters', '~> 1.1'
   spec.add_development_dependency 'rails', '>= 4.0'

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/engine.rb

@@ -17,13 +17,13 @@ module Haml
       :buffer_class,
       generator:    Temple::Generators::StringBuffer,
       format:       :html,
-      attr_quote:   "'",
+      attr_quote:   '"',
       escape_html:  true,
       escape_attrs: true,
       autoclose:    %w(area base basefont br col command embed frame
                        hr img input isindex keygen link menuitem meta
                        param source track wbr),
-      filename:     "",
+      filename:     '',
       disable_capture: false,
       remove_whitespace: false,
     )

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 = '7.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml
 version: !ruby/object:Gem::Version
-  version: 6.3.1
+  version: 7.0.0
 platform: ruby
 authors:
 - Natalie Weizenbaum
@@ -111,20 +111,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: haml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5'
 - !ruby/object:Gem::Dependency
   name: less
   requirement: !ruby/object:Gem::Requirement
@@ -330,7 +316,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="