haml 6.3.0 → 6.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8754d03da194f9c74e620887cbc29d3aa95d93651129ca33aa60dc72be08dd1
-  data.tar.gz: f4d26ea914200ac345926641d0d0d8ba36fb4b62a47600f63015d5c2d1dc8a11
+  metadata.gz: 313ffec5cc79d2b238173fde9769ac60d26b54bf15d3deda68adc84d0849620b
+  data.tar.gz: 143e9115612a2555a4ce34c817745e330548a7eaedf98bc819ead44b2156f8ad
 SHA512:
-  metadata.gz: eccf9fb6676267281b3c918425e93f07e8771c2f41e8481a08f327cb2ddbd5b53e07f3c9025f37c1abc977ad732d3b2f67d3023c4e1f356897bed03e3572ca20
-  data.tar.gz: 5ecd4d17716d5b0b4be7b57ebcfd28457f1b803cd376e37d4bcece2f30632e4e46d988eba1048e0c303a3599db5049b464e31854dda7f538bfe30565169769e9
+  metadata.gz: 117f3811b514f8abd4142cdc8022e282e5a5434c5c0f6904e7eaff7655f58894e3486c999282f0140b6011016b52b139036071792c3ba33494de73342d512d77
+  data.tar.gz: 99e76cc2438c8ba70aaf39b3ccc0df9b610e3ac06de35b8865c2f2ce5aa692f9642791b863602eef5e382d60224fdb44a143074c11f072ccad7556ae1461b261

data/.github/workflows/release.yml

@@ -0,0 +1,46 @@
+name: Release
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+permissions:
+  contents: read
+
+jobs:
+  push:
+    if: github.repository_owner == 'haml'
+    runs-on: ubuntu-latest
+
+    environment:
+      name: rubygems.org
+      url: https://rubygems.org/gems/haml
+
+    permissions:
+      contents: write
+      id-token: write
+
+    steps:
+      - name: Harden Runner
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        with:
+          egress-policy: audit
+
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@eaecf785f6a34567a6d97f686bbb7bccc1ac1e5c # v1.237.0
+        with:
+          bundler-cache: true
+          ruby-version: ruby
+
+      - name: Publish to RubyGems
+        uses: rubygems/release-gem@a25424ba2ba8b387abc8ef40807c2c85b96cbe32 # v1.1.1
+
+      - name: Create GitHub release
+        run: |
+          tag_name="$(git describe --tags --abbrev=0)"
+          gh release create "${tag_name}" --verify-tag --generate-notes
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

data/.github/workflows/test.yml

@@ -23,10 +23,13 @@ jobs:
           - '3.0'
           - '3.1'
           - '3.2'
+          - '3.3'
+          - '3.4'
+          - ruby-head
           - jruby
-          - truffleruby-head
+          - truffleruby
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: sudo apt-get update && sudo apt-get install -y nodejs libxslt-dev # nodejs for execjs, libxslt for TruffleRuby nokogiri
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # 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
+* Provide a Changelog link on rubygems.org https://github.com/haml/haml/pull/1157
+
 ## 6.3.0
 
 * Remove `Haml::RailsTemplate#default_format` that was added in v6.1.3 for Turbo [#1152](https://github.com/haml/haml/issues/1152), [#1154](https://github.com/haml/haml/issues/1154) ([discussion](https://github.com/haml/haml/pull/1144#issuecomment-1755088572))
@@ -8,7 +21,6 @@
 ## 6.2.5
 
 * Deprecate `Haml::RailsTemplate#default_format` that was added in v6.1.3 for Turbo ([discussion](https://github.com/haml/haml/pull/1144#issuecomment-1755088572))
-  * See [the reference](https://github.com/haml/haml/blob/v6.2.5/REFERENCE.md#turbo) for suggested alternatives.
 
 ## 6.2.4
 

data/Gemfile

@@ -25,3 +25,10 @@ end
 if RUBY_VERSION < '2.6'
   gem 'rake-compiler', '< 1.2.4'
 end
+
+# Temporary workaround to ensure Ruby 2.5 and 2.6 can pass tests with Rails 6.1
+# Reference: https://github.com/rails/rails/issues/54260
+# TODO: Remove this workaround when dropping support for Rails versions below 7.1
+if RUBY_VERSION < '2.7'
+  gem 'concurrent-ruby', '< 1.3.5'
+end

data/README.md

@@ -4,6 +4,7 @@
 [![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](https://inch-ci.org/github/haml/haml.svg)](https://inch-ci.org/github/haml/haml)
+[![Discord Server](https://dcbadge.limes.pink/api/server/https://discord.gg/G8dEAwvV2Y)](https://discord.gg/G8dEAwvV2Y)
 
 Haml is a templating engine for HTML. It's designed to make it both easier and
 more pleasant to write HTML documents, by eliminating redundancy, reflecting the

data/REFERENCE.md

@@ -105,7 +105,7 @@ set :haml, { escape_html: false }
 ```
 
 Finally, you can also set them by passing an options hash to `Haml::Engine.new` or `Haml::Template.new`.
-For the complete list of available options, please see `Haml::Engine`.
+For the complete list of available options, please see [`Haml::Engine`](https://github.com/haml/haml/blob/main/lib/haml/engine.rb).
 
 ## Plain Text
 
@@ -320,7 +320,7 @@ or using `true` and `false`:
     %input(selected=true)
 
 This feature works only for attributes that are included in
-[`Haml::AttributeBuilder::BOOLEAN_ATTRIBUTES`](https://github.com/haml/haml/blob/main/lib/haml/attribute_builder.rb#L5),
+[`Haml::BOOLEAN_ATTRIBUTES`](https://github.com/haml/haml/blob/main/lib/haml/attribute_compiler.rb#L8),
 as well as `data-` and `aria-` attributes.
 
     %input{'data-hidden' => false}
@@ -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:
@@ -568,7 +561,7 @@ prefix for both the id and class attributes. For example:
     # file: app/controllers/users_controller.rb
 
     def show
-      @user = CrazyUser.find(15)
+      @user = FriendlyUser.find(15)
     end
 
     -# file: app/views/users/show.haml
@@ -579,7 +572,7 @@ prefix for both the id and class attributes. For example:
 
 is compiled to:
 
-    <div class='greeting_crazy_user' id='greeting_crazy_user_15'>
+    <div class='greeting_friendly_user' id='greeting_friendly_user_15'>
       <bar class='fixnum' id='fixnum_581' />
       Hello!
     </div>
@@ -587,11 +580,11 @@ is compiled to:
 If you require that the class be something other than the underscored object's
 class, you can implement the `haml_object_ref` method on the object.
 
-    # file: app/models/crazy_user.rb
+    # file: app/models/friendly_user.rb
 
-    class CrazyUser < ActiveRecord::Base
+    class FriendlyUser < ActiveRecord::Base
       def haml_object_ref
-        "a_crazy_user"
+        "a_friendly_user"
       end
     end
 
@@ -602,7 +595,7 @@ class, you can implement the `haml_object_ref` method on the object.
 
 is compiled to:
 
-    <div class='a_crazy_user' id='a_crazy_user_15'>
+    <div class='a_friendly_user' id='a_friendly_user_15'>
       Hello!
     </div>
 
@@ -1298,7 +1291,7 @@ Blocks of literal text can be preserved using the [`:preserve` filter](#preserve
 
 ## Turbo
 
-For people using Turbo-rails and Haml 6+ need to either:
+For people using Turbo-rails need to either:
 *  follow the naming convention with the html format (ie. ensure any `.haml` files end `.html.haml`), or
 *  add a monkey patch as follows:
 

data/haml.gemspec

@@ -21,6 +21,8 @@ Gem::Specification.new do |spec|
 
   spec.metadata      = { 'rubygems_mfa_required' => 'true' }
 
+  spec.metadata["changelog_uri"] = spec.homepage + "/blob/main/CHANGELOG.md"
+
   spec.required_ruby_version = '>= 2.1.0'
 
   spec.add_dependency 'temple', '>= 0.8.2'

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
@@ -105,7 +105,7 @@ module Haml::AttributeBuilder
             if k.nil?
               flattened[key] = v
             else
-              flattened["#{key}-#{k.to_s.gsub(/_/, '-')}"] = v
+              flattened["#{key}-#{k.to_s.tr('_', '-')}"] = v
             end
           end
         else

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.0'
+  VERSION = '6.4.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml
 version: !ruby/object:Gem::Version
-  version: 6.3.0
+  version: 6.4.0
 platform: ruby
 authors:
 - Natalie Weizenbaum
@@ -9,10 +9,9 @@ authors:
 - Norman Clarke
 - Akira Matsuda
 - Takashi Kokubun
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-12-10 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
@@ -248,6 +247,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/FUNDING.yml"
+- ".github/workflows/release.yml"
 - ".github/workflows/test.yml"
 - ".gitignore"
 - ".yardopts"
@@ -322,7 +322,7 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
+  changelog_uri: https://haml.info/blob/main/CHANGELOG.md
 rdoc_options: []
 require_paths:
 - lib
@@ -337,8 +337,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: An elegant, structured (X)HTML/XML templating engine.
 test_files: []