Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump haml from 5.2.2 to 6.0.1 #388

Closed
wants to merge 1 commit into from

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Sep 26, 2022

Bumps haml from 5.2.2 to 6.0.1.

Release notes

Sourced from haml's releases.

6.0.1

  • Unescape HTML-safe interpolation on Rails #1084
  • Resurrect Haml 5's AttributeParser.available? for syntax_tree-haml #1085

6.0.0

Haml 6 became 1.7x faster than Haml 5, and it's now faster than Slim and Erubi in this benchmark that was originally written by Slim developers.

$ bundle exec ruby benchmark/slim/run-benchmarks.rb
Calculating -------------------------------------
       erubi v1.11.0    34.595k i/100ms
         slim v4.1.0    30.931k i/100ms
  haml v6.0.0.beta.1    35.621k i/100ms
-------------------------------------------------
       erubi v1.11.0    411.827k (± 0.4%) i/s -      2.076M
         slim v4.1.0    361.660k (± 0.4%) i/s -      1.825M
  haml v6.0.0.beta.1    427.207k (± 0.6%) i/s -      2.137M

Comparison: haml v6.0.0.beta.1: 427206.9 i/s erubi v1.11.0: 411826.6 i/s - 1.04x slower slim v4.1.0: 361659.8 i/s - 1.18x slower

Changes

  • Replace the implementation with Hamlit
    • The parser is kept as is, but everything else is replaced.
    • All Haml helpers except for preserve are removed.
    • Some legacy Rails integration is removed.

6.0.0.beta.1

Haml 6 became 1.7x faster than Haml 5, and it's now faster than Slim and Erubi in this benchmark that was originally written by Slim developers.

$ bundle exec ruby benchmark/slim/run-benchmarks.rb
Calculating -------------------------------------
       erubi v1.11.0    34.595k i/100ms
         slim v4.1.0    30.931k i/100ms
  haml v6.0.0.beta.1    35.621k i/100ms
-------------------------------------------------
       erubi v1.11.0    411.827k (± 0.4%) i/s -      2.076M
         slim v4.1.0    361.660k (± 0.4%) i/s -      1.825M
  haml v6.0.0.beta.1    427.207k (± 0.6%) i/s -      2.137M

Comparison: haml v6.0.0.beta.1: 427206.9 i/s erubi v1.11.0: 411826.6 i/s - 1.04x slower slim v4.1.0: 361659.8 i/s - 1.18x slower

... (truncated)

Changelog

Sourced from haml's changelog.

6.0.1

Released on September 23, 2022 (diff).

  • Unescape HTML-safe interpolation on Rails #1084
  • Resurrect Haml 5's AttributeParser.available? for syntax_tree-haml #1085

6.0.0

Released on September 21, 2022 (diff).

  • Replace the implementation with Hamlit
    • Haml 6 is about 1.7x faster than Haml 5 in this benchmark.
    • The parser is kept as is, but everything else is replaced.
    • The haml CLI interface was also replaced.
    • All Haml helpers except for preserve are removed.
    • Some legacy Rails integration is removed.
Commits
  • 481ee29 Version 6.0.1
  • 1a1ca00 Haml doesn't need to override Haml itself
  • 08098f1 Unescape HTML-safe interpolation on Rails
  • b3cdafd Resurrect AttributeParser.available?
  • aeba1f0 Merge pull request #1086 from mishina2228/update-ci-status-badge
  • 6ecf37b Update CI status badge
  • 3a6f147 Version 6.0.0
  • 1bed4fc Version 6.0.0.beta.2
  • 16e6f9a Throw exceptions from Haml::Parser like Haml 5
  • 23554f7 Unify Error and HamlError
  • Additional commits viewable in compare view

Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

@dependabot dependabot bot added dependencies ruby Pull requests that update Ruby code labels Sep 26, 2022
@github-actions
Copy link

gem compare haml 5.2.2 6.0.1

Compared versions: ["5.2.2", "6.0.1"]
  DIFFERENT authors:
    5.2.2: ["Natalie Weizenbaum", "Hampton Catlin", "Norman Clarke", "Akira Matsuda"]
    6.0.1: ["Natalie Weizenbaum", "Hampton Catlin", "Norman Clarke", "Akira Matsuda", "Takashi Kokubun"]
  DIFFERENT bindir:
    5.2.2: bin
    6.0.1: exe
  DIFFERENT date:
    5.2.2: 2021-07-27 00:00:00 UTC
    6.0.1: 2022-09-23 00:00:00 UTC
  DIFFERENT description:
    5.2.2: Haml (HTML Abstraction Markup Language) is a layer on top of HTML or XML that's
designed to express the structure of documents in a non-repetitive, elegant, and
easy way by using indentation rather than closing tags and allowing Ruby to be
embedded with ease. It was originally envisioned as a plugin for Ruby on Rails,
but it can function as a stand-alone templating engine.
    6.0.1: An elegant, structured (X)HTML/XML templating engine.
  DIFFERENT extensions:
    5.2.2: []
    6.0.1: ["ext/haml/extconf.rb"]
  DIFFERENT homepage:
    5.2.2: http://haml.info/
    6.0.1: https://haml.info
  DIFFERENT metadata:
    5.2.2: {"bug_tracker_uri"=>"https://github.com/haml/haml/issues", "changelog_uri"=>"https://github.com/haml/haml/blob/main/CHANGELOG.md", "documentation_uri"=>"http://haml.info/docs.html", "homepage_uri"=>"http://haml.info", "mailing_list_uri"=>"https://groups.google.com/forum/?fromgroups#!forum/haml", "source_code_uri"=>"https://github.com/haml/haml"}
    6.0.1: {}
  DIFFERENT require_paths:
    5.2.2: ["lib"]
    6.0.1: ["/opt/hostedtoolcache/Ruby/3.1.2/x64/lib/ruby/gems/3.1.0/extensions/x86_64-linux/3.1.0/haml-6.0.1", "lib"]
  DIFFERENT required_ruby_version:
    5.2.2: >= 2.0.0
    6.0.1: >= 2.1.0
  DIFFERENT rubygems_version:
    5.2.2: 3.1.4
    6.0.1: 3.3.7
  DIFFERENT version:
    5.2.2: 5.2.2
    6.0.1: 6.0.1
  DIFFERENT files:
    5.2.2->6.0.1:
      * Deleted:
            .gitmodules
            .yardopts
            TODO
            benchmark.rb
            bin/haml
            lib/haml/.gitattributes
            lib/haml/buffer.rb
            lib/haml/exec.rb
            lib/haml/generator.rb
            lib/haml/helpers/action_view_extensions.rb
            lib/haml/helpers/action_view_mods.rb
            lib/haml/helpers/action_view_xss_mods.rb
            lib/haml/helpers/safe_erubi_template.rb
            lib/haml/helpers/safe_erubis_template.rb
            lib/haml/helpers/xss_mods.rb
            lib/haml/options.rb
            lib/haml/plugin.rb
            lib/haml/sass_rails_filter.rb
            lib/haml/template/options.rb
            lib/haml/temple_engine.rb
            yard/default/.gitignore
            yard/default/fulldoc/html/css/common.sass
            yard/default/layout/html/footer.erb
      * Added:
            .github/FUNDING.yml +1/-0
            bin/bench +66/-0
              (!) Shebang found: #!/usr/bin/env ruby
            bin/console +11/-0
              (!) Shebang found: #!/usr/bin/env ruby
            bin/ruby +3/-0
              (!) Shebang found: #!/bin/bash
            bin/setup +7/-0
              (!) Shebang found: #!/bin/bash
            bin/stackprof +27/-0
              (!) Shebang found: #!/usr/bin/env ruby
            bin/test +24/-0
              (!) Shebang found: #!/bin/bash
            exe/haml +6/-0
              (!) Unexpected permissions: 100755
              (!) File is executable
              (!) Shebang found: #!/usr/bin/env ruby
            ext/haml/extconf.rb +10/-0
            ext/haml/haml.c +537/-0
            ext/haml/hescape.c +108/-0
            ext/haml/hescape.h +20/-0
            lib/haml/ambles.rb +20/-0
            lib/haml/cli.rb +154/-0
            lib/haml/compiler/children_compiler.rb +126/-0
            lib/haml/compiler/comment_compiler.rb +39/-0
            lib/haml/compiler/doctype_compiler.rb +46/-0
            lib/haml/compiler/script_compiler.rb +116/-0
            lib/haml/compiler/silent_script_compiler.rb +24/-0
            lib/haml/compiler/tag_compiler.rb +76/-0
            lib/haml/dynamic_merger.rb +67/-0
            lib/haml/filters/base.rb +12/-0
            lib/haml/filters/cdata.rb +20/-0
            lib/haml/filters/coffee.rb +17/-0
            lib/haml/filters/css.rb +33/-0
            lib/haml/filters/erb.rb +10/-0
            lib/haml/filters/escaped.rb +22/-0
            lib/haml/filters/javascript.rb +33/-0
            lib/haml/filters/less.rb +20/-0
            lib/haml/filters/markdown.rb +11/-0
            lib/haml/filters/plain.rb +29/-0
            lib/haml/filters/preserve.rb +22/-0
            lib/haml/filters/ruby.rb +10/-0
            lib/haml/filters/sass.rb +15/-0
            lib/haml/filters/scss.rb +15/-0
            lib/haml/filters/text_base.rb +25/-0
            lib/haml/filters/tilt_base.rb +49/-0
            lib/haml/force_escapable.rb +29/-0
            lib/haml/html.rb +22/-0
            lib/haml/identity.rb +13/-0
            lib/haml/object_ref.rb +30/-0
            lib/haml/rails_helpers.rb +51/-0
            lib/haml/rails_template.rb +55/-0
            lib/haml/ruby_expression.rb +32/-0
            lib/haml/string_splitter.rb +20/-0
      * Changed:
            .github/workflows/test.yml +13/-9
            .gitignore +16/-16
            CHANGELOG.md +22/-3
            Gemfile +18/-11
            MIT-LICENSE +1/-1
            README.md +14/-20
            Rakefile +95/-94
            haml.gemspec +40/-38
            lib/haml.rb +8/-20
            lib/haml/attribute_builder.rb +138/-182
            lib/haml/attribute_compiler.rb +86/-195
            lib/haml/attribute_parser.rb +104/-138
            lib/haml/compiler.rb +65/-298
            lib/haml/engine.rb +43/-228
            lib/haml/error.rb +5/-4
            lib/haml/escapable.rb +6/-70
            lib/haml/filters.rb +53/-377
            lib/haml/helpers.rb +3/-697
            lib/haml/parser.rb +157/-22
            lib/haml/railtie.rb +3/-46
            lib/haml/template.rb +15/-34
            lib/haml/temple_line_counter.rb +2/-1
            lib/haml/util.rb +18/-15
            lib/haml/version.rb +1/-2
  DIFFERENT runtime dependencies:
    5.2.2->6.0.1:
      * Added:
            thor [">= 0"] (runtime)
      * Updated:
            temple from: [">= 0.8.0"] to: [">= 0.8.2"]
  DIFFERENT development dependencies:
    5.2.2->6.0.1:
      * Deleted:
            rbench [">= 0"] (development)
            minitest [">= 4.0"] (development)
            nokogiri [">= 0"] (development)
            simplecov [">= 0"] (development)
      * Added:
            benchmark_driver [">= 0"] (development)
            bundler [">= 0"] (development)
            coffee-script [">= 0"] (development)
            erubi [">= 0"] (development)
            haml [">= 5"] (development)
            less [">= 0"] (development)
            minitest-reporters ["~> 1.1"] (development)
            rake [">= 0"] (development)
            rake-compiler [">= 0"] (development)
            sass [">= 0"] (development)
            slim [">= 0"] (development)
            string_template [">= 0"] (development)
            unindent [">= 0"] (development)
  DIFFERENT Gemfile dependencies
    5.2.2->6.0.1:
      * Added:
            benchmark-ips ["= 2.3.0"] (runtime)
            maxitest [">= 0"] (runtime)
            pandoc-ruby [">= 0"] (runtime)
            redcarpet [">= 0"] (runtime)
            stackprof [">= 0"] (runtime)
      * Deleted
            m [">= 0"] (runtime)
            simplecov [">= 0"] (runtime)
            yard [">= 0"] (development)
            kramdown [">= 0"] (development)
            sass [">= 0"] (development)
            ruby-prof [">= 0"] (runtime)

@dependabot dependabot bot force-pushed the dependabot/bundler/haml-6.0.1 branch 2 times, most recently from 621a511 to 17e7744 Compare September 26, 2022 22:19
Bumps [haml](https://github.com/haml/haml) from 5.2.2 to 6.0.1.
- [Release notes](https://github.com/haml/haml/releases)
- [Changelog](https://github.com/haml/haml/blob/main/CHANGELOG.md)
- [Commits](haml/haml@v5.2.2...v6.0.1)

---
updated-dependencies:
- dependency-name: haml
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot dependabot bot force-pushed the dependabot/bundler/haml-6.0.1 branch from 17e7744 to 1f26ee7 Compare September 26, 2022 22:22
@dentarg
Copy link
Member

dentarg commented Sep 26, 2022

No support in Sinatra yet: sinatra/sinatra#1820

@dependabot @github
Copy link
Contributor Author

dependabot bot commented on behalf of github Sep 28, 2022

Superseded by #390.

@dependabot dependabot bot closed this Sep 28, 2022
@dependabot dependabot bot deleted the dependabot/bundler/haml-6.0.1 branch September 28, 2022 02:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies ruby Pull requests that update Ruby code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant