hamlit 3.0.2 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2630e3f6654fd5d8810fdc99d6396fe75de14389c213593fba8df5f49fa9de9
-  data.tar.gz: aff43e55f4f7d211a2437e258f94b0ffb5338908b31761ee7f36cdabbd68a473
+  metadata.gz: 270c4930bb7c770a986b5e60edeb7608af33aab66927bd4b415e75591cd738a4
+  data.tar.gz: e9b8422cb06c0e427650c40e28774805e543cbcf291dbe37ba4327f34b7336fb
 SHA512:
-  metadata.gz: cdbed489a25180e8eac72da2941d54f643c88a678582bc3ca5d54945803b2ad954af516e74f6ebbda5b9b88ac05d51a6771e67ddf99eeec2fe2b98db3506073a
-  data.tar.gz: 6f6d9168fd3f2d0de56b7b78ba99396f7ab79e6a728a55ea2807292da5e6fe33d19bf78d779e1eefc926d96e7287304d29391adedaaa70c05f83862013f13777
+  metadata.gz: 48e1d888420f14f434f9dde73d925bfbbd6727dc4ac2954b017bbd7f871b75225652ae4e8ac2f4163f17c2826fa7948a8d1a258b9adc0dbcec95fe6ea7cd577b
+  data.tar.gz: b2203d0c8c97956a5d3bf90b018aa5cda042d7621e56b3e6e7a2b122941bc8ec45a1dfed0826789aa77fb610bc2c407653226a704e3023b28523d2cca175333a

data/.github/workflows/release.yml

@@ -0,0 +1,50 @@
+name: Release
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+permissions:
+  contents: read
+
+jobs:
+  push:
+    if: github.repository_owner == 'k0kubun'
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [ruby, jruby]
+      fail-fast: false
+
+    environment:
+      name: rubygems.org
+      url: https://rubygems.org/gems/hamlit
+
+    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: ${{ matrix.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

@@ -17,24 +17,17 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-          - '2.5'
-          - '2.6'
-          - '2.7'
-          - '3.0'
+          - '3.2'
+          - '3.3'
+          - '3.4'
           - jruby
-          - truffleruby-head
+          - truffleruby
     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-
-      - run: sudo apt-get update && sudo apt-get install -y nodejs libxslt-dev # nodejs for execjs, libxslt for TruffleRuby nokogiri
-      - name: bundle install
-        run: bundle config path vendor/bundle && bundle install -j$(nproc) --retry 3
+          bundler-cache: true
       - run: bundle exec rake test

data/CHANGELOG.md

@@ -1,8 +1,16 @@
 # Change Log
 
-All notable changes to this project will be documented in this file. This
-project adheres to [Semantic Versioning](http://semver.org/). This change log is based upon
-[keep-a-changelog](https://github.com/olivierlacan/keep-a-changelog).
+## 4.0.0
+
+- Change default `attr_quote` from `'` to `"`
+- Bump required Ruby version to 3.2
+
+## [3.0.3](https://github.com/k0kubun/hamlit/compare/v3.0.2...v3.0.3) - 2022-11-07
+
+### Added
+
+- Support sass-embedded [#196](https://github.com/k0kubun/hamlit/issues/196)
+  *Thanks to @ntkme*
 
 ## [3.0.2](https://github.com/k0kubun/hamlit/compare/v3.0.1...v3.0.2) - 2022-10-13
 

data/Gemfile

@@ -11,6 +11,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/README.md

@@ -10,7 +10,7 @@ Hamlit is a high performance [Haml](https://github.com/haml/haml) implementation
 **Hamlit's implementation was copied to Haml 6.**
 From Haml 6, you don't need to switch to Hamlit.
 
-Both Haml 6 and Hamlit are still maintained by [@k0kubun](https://github.com/k0kubun).
+Both Haml 6 and Hamlit are still maintained by [k0kubun](https://github.com/k0kubun).
 While you don't need to immediately deprecate Hamlit, Haml 6 has more maintainers
 and you'd better start a new project with Haml rather than Hamlit,
 given no performance difference between them.
@@ -21,7 +21,7 @@ given no performance difference between them.
 Hamlit is another implementation of [Haml](https://github.com/haml/haml).
 With some [Hamlit's characteristics](REFERENCE.md#hamlits-characteristics) for performance,
 Hamlit is **1.94x times faster** than the original Haml 5 in [this benchmark](benchmark/run-benchmarks.rb),
-which is an HTML-escaped version of [slim-template/slim's one](https://github.com/slim-template/slim/blob/4.1.0/benchmarks/run-benchmarks.rb) for fairness. ([Result on Travis](https://travis-ci.org/github/k0kubun/hamlit/jobs/732178446))
+which is an HTML-escaped version of [slim-template/slim's one](https://github.com/slim-template/slim/blob/4.1.0/benchmarks/run-benchmarks.rb) for fairness.
 
 <img src="https://raw.githubusercontent.com/k0kubun/hamlit/afcc2b36c4861c2f764baa09afd9530ca25eeafa/benchmark/graph/graph.png" width="600x" alt="Hamlit Benchmark" />
 

data/hamlit.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
     spec.platform = 'java'
   else
     spec.extensions = ['ext/hamlit/extconf.rb']
-    spec.required_ruby_version = '>= 2.1.0'
+    spec.required_ruby_version = '>= 3.2.0'
   end
 
   spec.add_dependency 'temple', '>= 0.8.2'

data/lib/hamlit/attribute_builder.rb

@@ -62,7 +62,7 @@ module Hamlit::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/hamlit/engine.rb

@@ -14,13 +14,13 @@ module Hamlit
       :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:     '',
       check_syntax: false,
       disable_capture: false,
     )

data/lib/hamlit/filters/tilt_base.rb

@@ -7,7 +7,11 @@ module Hamlit
       def self.render(name, source, indent_width: 0)
         text = ::Tilt["t.#{name}"].new { source }.render
         return text if indent_width == 0
-        text.gsub!(/^/, ' ' * indent_width)
+        if text.frozen?
+          text.gsub(/^/, ' ' * indent_width)
+        else
+          text.gsub!(/^/, ' ' * indent_width)
+        end
       end
 
       def explicit_require?(needed_registration)

data/lib/hamlit/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Hamlit
-  VERSION = '3.0.2'
+  VERSION = '4.0.0'
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: hamlit
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 4.0.0
 platform: ruby
 authors:
 - Takashi Kokubun
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-14 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
@@ -244,7 +243,7 @@ extensions:
 extra_rdoc_files: []
 files:
 - ".github/FUNDING.yml"
-- ".github/workflows/bench.yml"
+- ".github/workflows/release.yml"
 - ".github/workflows/test.yml"
 - ".gitignore"
 - CHANGELOG.md
@@ -331,7 +330,6 @@ homepage: https://github.com/k0kubun/hamlit
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -339,15 +337,14 @@ 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:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key: 
+rubygems_version: 3.6.7
 specification_version: 4
 summary: High Performance Haml Implementation
 test_files: []

data/.github/workflows/bench.yml

@@ -1,30 +0,0 @@
-name: bench
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    types:
-      - opened
-      - synchronize
-      - reopened
-  schedule:
-    - cron: "00 15 * * *" # 7:00 PST (-8), 8:00 PDT (-7)
-jobs:
-  bench:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: '3.0'
-      - uses: actions/cache@v2
-        with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-${{ matrix.ruby }}-gems-${{ hashFiles('**/Gemfile.lock') }}
-          restore-keys: ${{ runner.os }}-gems-
-      - run: sudo apt-get update && sudo apt-get install -y nodejs libxslt-dev # nodejs for execjs, libxslt for TruffleRuby nokogiri
-      - name: bundle install
-        run: bundle config path vendor/bundle && bundle install -j$(nproc) --retry 3
-      - run: bundle exec rake bench