haml 5.2.2 → 6.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec6cbb2e4023f397f1d7b6d84f06d78ab492a61e88c3f16496f39d0baeb47a83
-  data.tar.gz: 004c2dd34697cb61a8c12854bf4b99abb3cab5195f28922b813ee299225e7663
+  metadata.gz: 1c6e33698052b2d1823959741be8219446b8b3257f5124449daa8cd8deb70e4a
+  data.tar.gz: d2a168766babc32a3f83b065e6d158e5b937995cdd5a46552fb95d4035ad5924
 SHA512:
-  metadata.gz: a7430b4e42cf809f847448a9e04623b4b58878e44facedef5e43714820e8068f0bb853772564d5545936cdad8346f0c33abfc11642a3737d91c9a1f6242b3e41
-  data.tar.gz: 8a91df0cb185014512ee473a21755ba41edb06e835b29740e8e46c76287a81405b2706d8a10ea148893a9429de306c67584ac1c286637c0812a5562cf149431b
+  metadata.gz: c6d71bcdb86f5281b34c9f56684263db88e947b17c8d79eb764b6ecb8f17945ad7fc374b2ad8032066b0c7ae52e3c0045de3658b76fc073e5ee8ab73e3c7eae3
+  data.tar.gz: 408d9dd0b14378515d175778a9d9b472b70819c2371189aa145d2e787590213f453bba60e6dec2aee5aadf9e7bc0fd6c4b077f96676c9b6e899896ce60eb07cc

data/.github/FUNDING.yml

@@ -0,0 +1,3 @@
+github:
+  - haml
+  - k0kubun

data/.github/workflows/test.yml

@@ -8,29 +8,28 @@ on:
       - opened
       - synchronize
       - reopened
+  schedule:
+    - cron: "00 15 * * *"
 jobs:
   test:
-    name: 'Ruby: ${{ matrix.ruby }}, Rails: ${{ matrix.rails }}'
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        ruby: [2.6, 2.7, 3.0, jruby-9.2]
-        rails: [5.2.x, 6.0.x, 6.1.x, rails-edge]
+        ruby:
+          - '2.5'
+          - '2.6'
+          - '2.7'
+          - '3.0'
+          - '3.1'
+          - jruby
+          - truffleruby-head
     steps:
       - uses: actions/checkout@v2
+      - 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
         with:
           ruby-version: ${{ matrix.ruby }}
-      - uses: actions/cache@v2
-        with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-${{ matrix.ruby }}-gems-${{ hashFiles('**/Gemfile.lock') }}
-          restore-keys: ${{ runner.os }}-gems-
-      - name: bundle install --gemfile=test/gemfiles/Gemfile.rails-${{matrix.rails}}.x
-        run: bundle config path vendor/bundle && bundle install -j$(nproc) --retry 3
-      - name: rake test
-        run: bundle exec rake test submodules
-        env:
-          RUBYOPT: "--enable-frozen-string-literal"
+          bundler-cache: true
+      - run: bundle exec rake test

data/.gitignore

@@ -1,19 +1,19 @@
-/.idea
+/.bundle/
 /.yardoc
-/coverage
-/doc
-/log
-/pkg
-/test/rails
-/test/gemfiles/*.lock
-/.haml
-/site
-*.rbc
+/Gemfile.lock
+/_yardoc/
+/.idea
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/
+/haml/
 .sass-cache
-.rbenv-version
-.rbx
 .ruby-version
-.rvmrc
-Gemfile.lock
-tmp
-.bundle/
+*.bundle
+*.so
+*.su
+*.a
+*.o
+*.swp

data/.yardopts

@@ -7,10 +7,7 @@
 --title            "Haml Documentation"
 --query            'object.type != :classvariable'
 --query            'object.type != :constant || @api && @api.text == "public"'
---exclude          lib/haml/plugin.rb
 --exclude          lib/haml/railtie.rb
---exclude          lib/haml/helpers/action_view_mods.rb
---exclude          lib/haml/helpers/xss_mods.rb
 --hide-void-return
 --protected
 --no-private

data/CHANGELOG.md

@@ -1,12 +1,125 @@
 # Haml Changelog
 
+## 6.1.1
+
+* Fix an empty output of Ruby 3.1's Hash shorthand syntax [#1083](https://github.com/haml/haml/issues/1083)
+
+## 6.1.0
+
+* Optimize away a `to_s` call on `=` scripts
+* Fix escaping for objects that return an `html_safe` string on `to_s` [#1117](https://github.com/haml/haml/issues/1117)
+
+## 6.0.12
+
+* Fix a whitespace removal with `>` and an `if`-`else` statement [#1114](https://github.com/haml/haml/issues/1114)
+
+## 6.0.11
+
+* Fix a whitespace removal with `>` and an `if` statement [#1114](https://github.com/haml/haml/issues/1114)
+
+## 6.0.10
+
+* Evaluate :erb filter in the template context like Haml 5
+
+## 6.0.9
+
+* Support sass-embedded [#1112](https://github.com/haml/haml/issues/1112)
+
+## 6.0.8
+
+* Support interpolation in HTML comments, which has not been working since 6.0.0
+  [#1107](https://github.com/haml/haml/issues/1107)
+
+## 6.0.7
+
+* `Haml::Engine` and `Haml::Template` use StringBuffer instead of ArrayBuffer
+  * It seems more performant in many cases with recent Ruby versions.
+  * `Haml::RailsTemplate` is not affected.
+
+## 6.0.6
+
+* Prevent CRuby from accidentally using the Ruby implementation fallback
+  * Reversing what v6.0.3 and v6.0.4 did, but still supporting Wasm.
+
+## 6.0.5
+
+* Resurrect `#haml_object_ref` support in an object reference [#1097](https://github.com/haml/haml/issues/1097)
+  * This was removed in 6.0.0, and added back in this version.
+* Stop warning `remove_whitespace: true` option.
+
+## 6.0.4
+
+Released on October 2, 2022
+([diff](https://github.com/haml/haml/compare/v6.0.3...v6.0.4)).
+
+* Fix a parse failure of `%` in attributes [#1096](https://github.com/haml/haml/issues/1096)
+* Add another fallback from C to Ruby for Wasm.
+
+## 6.0.3
+
+Released on September 28, 2022
+([diff](https://github.com/haml/haml/compare/v6.0.2...v6.0.3)).
+
+* For Wasm, fallback to Ruby when C extension is not available.
+
+## 6.0.2
+
+Released on September 28, 2022
+([diff](https://github.com/haml/haml/compare/v6.0.1...v6.0.2)).
+
+* Unescape HTML-safe arguments for `surround`, `succeed`, and `precede` on Rails
+  [#1088](https://github.com/haml/haml/issues/1088)
+
+## 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
+([diff](https://github.com/haml/haml/compare/v5.2.2...v6.0.0)).
+
+* Replace the implementation with Hamlit
+  * Haml 6 is about 1.7x faster than Haml 5 in [this benchmark](benchmark/slim/run-benchmarks.rb).
+  * The parser is kept as is, but everything else is replaced.
+  * The `haml` CLI interface was also replaced.
+  * The interface of `Haml::Engine` is changed. `Haml::Template` is most likely what you need now.
+     * before: `Haml::Engine.new("%p Haml code!").render`
+     * after: `Haml::Template.new { "%p Haml code!" }.render`
+  * Most Haml helpers are removed.
+     * Rails:
+         * Kept: `find_and_reserve`, `preserve`, `surround`, `precede`, `succeed`, `capture_haml`
+         * Removed: `block_is_haml?`, `flatten`, `haml_concat`, `haml_indent`, `haml_tag`, `haml_tag_if`, `html_attrs`,
+           `html_escape`, `init_haml_helpers`, `is_haml?`, `list_of`, `non_haml`, `tab_down`, `tab_up`, `with_tabs`
+     * Tilt:
+         * Kept: `preserve`
+         * Removed: `block_is_haml?`, `capture_haml`, `escape_once`, `find_and_preserve`, `flatten`, `haml_concat`,
+           `haml_indent`, `haml_tag`, `haml_tag_if`, `html_attrs`, `html_escape`, `init_haml_helpers`, `is_haml?`,
+           `list_of`, `non_haml`, `precede`, `succeed`, `surround`, `tab_down`, `tab_up`, `with_tabs`
+  * Only the following attributes and `aria`/`data` attributes are considered boolean attributes:
+     * `allowfullscreen`, `async`, `autobuffer`, `autofocus`, `autoplay`, `checked`, `controls`, `default`,
+       `defer`, `disabled`, `download`, `formnovalidate`, `hidden`, `inert`, `ismap`, `itemscope`, `loop`,
+       `multiple`, `muted`, `novalidate`, `open`, `pubdate`, `readonly`, `required`, `reversed`, `scoped`,
+       `seamless`, `selected`, `sortable`, `truespeed`, `typemustmatch`
+  * Only `data` and `aria` attributes support using a nested Hash to render hyphenated attributes, e.g.
+    `data: { foo: 'bar' }` becomes `data-foo="bar"`, but this no longer works for non-`data`/`aria` attributes.
+  * Some legacy Rails integration is removed.
+  * The default value of `escape_html` option became true.
+  * `-` script lines no longer support capturing. Only `=` lines are supported to yield a nested block.
+  * Overriding `data` attributes with another falsy `data-*` attribute that has the same name
+    is no longer supported. [#1105](https://github.com/haml/haml/issues/1105)
+  * :erb filter is not executed in the template context (fixed in 6.0.10)
+
 ## 5.2.2
+
 Released on July 27, 2021
 ([diff](https://github.com/haml/haml/compare/v5.2.1...v5.2.2)).
 
-* Support for adding Annotations to Haml output (a Rails feature 6.1+)
-* Expanded test matrix to include Ruby 3.0 and Rails 6.1
-* Only testing Ruby 2.7+ and Rails 5.2+
+* Support `config.action_view.annotate_rendered_view_with_filenames = true` of Rails 6.1
 
 ## 5.2.1
 

data/Gemfile

@@ -1,16 +1,23 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
+
+git_source(:github) do |repo_name|
+  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
+  "https://github.com/#{repo_name}.git"
+end
+
+# Specify your gem's dependencies in haml.gemspec
 gemspec
 
-gem "m"
-gem "pry"
-gem "simplecov"
+gem 'benchmark-ips', '2.3.0'
+gem 'maxitest'
+gem 'pry'
 
-group :docs do
-  gem "yard"
-  gem "kramdown"
-  gem "sass"
-end
+if /java/ === RUBY_PLATFORM # JRuby
+  gem 'pandoc-ruby'
+else
+  gem 'redcarpet'
 
-platform :mri do
-  gem "ruby-prof"
+  if RUBY_PLATFORM !~ /mswin|mingw/ && RUBY_ENGINE != 'truffleruby'
+    gem 'stackprof'
+  end
 end

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2006-2019 Hampton Catlin and Natalie Weizenbaum
+Copyright (c) 2006-2021 Hampton Catlin, Natalie Weizenbaum and Takashi Kokubun
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

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)
 
@@ -10,13 +10,6 @@ more pleasant to write HTML documents, by eliminating redundancy, reflecting the
 underlying structure that the document represents, and providing an elegant syntax
 that's both powerful and easy to understand.
 
-### Supported Versions
-
-* Ruby 2.6+
-* Rails 5.1+
-
-Other versions may likely work, but we don't test against them.
-
 ## Basic Usage
 
 Haml can be used from the command line or as part of a Ruby web framework. The
@@ -29,7 +22,7 @@ gem install haml
 After you write some Haml, you can run
 
 ~~~sh
-haml document.haml
+haml render document.haml
 ~~~
 
 to compile it to HTML. For more information on these commands, check out
@@ -48,8 +41,8 @@ To use Haml with Rails, simply add Haml to your Gemfile and run `bundle`.
 gem 'haml'
 ~~~
 
-If you'd like to replace Rails's Erb-based generators with Haml, add
-[haml-rails](https://github.com/indirect/haml-rails) to your Gemfile as well.
+If you'd like to replace Rails's ERB-based generators with Haml, add
+[haml-rails](https://github.com/haml/haml-rails) to your Gemfile as well.
 
 ## Formatting
 
@@ -169,34 +162,35 @@ on a specific area:
 ruby -Itest test/helper_test.rb -n test_buffer_access
 ~~~
 
-Haml currently supports Ruby 2.7.0 and higher, so please make sure your changes run on 2.7+.
+Haml currently supports Ruby 2.0.0 and higher, so please make sure your changes run on 2.0+.
 
 ## Team
 
 ### Current Maintainers
 
-* [Hampton Catlin](https://github.com/hcatlin)
-* [Takashi Kokubun](https://github.com/k0kubun)
 * [Akira Matsuda](https://github.com/amatsuda)
+* [Matt Wildig](https://github.com/mattwildig)
+* [Tee Parham](https://github.com/teeparham)
+* [Takashi Kokubun](https://github.com/k0kubun)
 
 ### Alumni
 
 Haml was created by [Hampton Catlin](http://hamptoncatlin.com), the author of
-the original implementation.
+the original implementation. Hampton is no longer involved in day-to-day coding,
+but still consults on language issues.
 
-[Natalie Weizenbaum](https://github.com/nex3) was for many years the primary developer
+[Natalie Weizenbaum](http://nex-3.com) was for many years the primary developer
 and architect of the "modern" Ruby implementation of Haml.
 
-This project's been around for many years, and we have many amazing people who kept the project 
-alive! as former maintainers like:
-
-[Norman Clarke](http://github.com/norman)
-[Matt Wildig](https://github.com/mattwildig)
-[Tee Parham](https://github.com/teeparham)
+[Norman Clarke](http://github.com/norman) was the primary maintainer of Haml from 2012 to 2016.
 
 ## License
 
-Copyright (c) 2006-2021 Hampton Catlin, Natalie Weizenbaum and the Haml team
+Some of Natalie's work on Haml was supported by Unspace Interactive.
+
+Beyond that, the implementation is licensed under the MIT License.
+
+Copyright (c) 2006-2019 Hampton Catlin, Natalie Weizenbaum and the Haml team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in