hamlit 2.13.0 → 2.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b080bac2aef1f473d967c016e0610d319cd43b89fbaea3a113949ed6dacfd04
-  data.tar.gz: be1115f4778772e95102c2ab995abd7ff7f3f6c9e86ab8eefac26a38b1a20bd2
+  metadata.gz: 49336d834649a0b858580664e658063bdc7286d2a1daac3f669da539fff775a1
+  data.tar.gz: 7606a4faf12c5ef04146fe336c827c518277fb4db9391167fba38a16b33ebfc5
 SHA512:
-  metadata.gz: 2b5a640a456b34d551d4e65df868d59c027f4566ff357643f2b42458417356599f6d2cb3a9413ff17e431c69d782f2b9e5a603de147e1a6947f646910d8c3bf4
-  data.tar.gz: d13cb779bc02e9914f754054a7b8ab6b2ff6721259b15c87638fbbb2b6a528323b407e22ce4fcdd0a1e91ab1c7f05c5cd7d26e19b96016efaf91b1a188ac6579
+  metadata.gz: 5f69bcd2ded91a2dd610fb0ec270a623a8abd4ffcec5c5df94b9779cacbec10228bceb71fbf480aa076261b5b2d5448d52b38adf6df203a1a5661aea8ff640c0
+  data.tar.gz: fbd9a6ee757236f8b02b670ca781669fc24f1d81644210bfa40a7d611a2b4b040cdd7694a8a6fb8c711409f2ff42fada31c6693d60de9c246b5d2ffd74c34d9d

data/.github/workflows/test.yml

@@ -0,0 +1,30 @@
+name: test
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
+  schedule:
+    - cron: "00 15 * * *" # 7:00 PST (-8), 8:00 PDT (-7)
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    container: ${{ matrix.ruby }}
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - ruby:2.5
+          - ruby:2.6
+          - ruby:2.7
+          # TODO: add jruby and truffleruby
+    steps:
+      - uses: actions/checkout@v2
+      - run: apt-get update && apt-get install -y nodejs # For execjs
+      - name: bundle install
+        run: bundle install -j$(nproc) --retry 3
+      - run: bundle exec rake test

data/CHANGELOG.md

@@ -4,7 +4,13 @@ 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).
 
-## [2.13.0](https://github.com/k0kubun/hamlit/compare/v2.12.0...v2.13.0) - 2020-10-2
+## [2.13.1](https://github.com/k0kubun/hamlit/compare/v2.13.0...v2.13.1) - 2020-12-27
+
+### Added
+
+- Support [multiline attributes](https://github.com/haml/haml/pull/1043) of Haml 5.2.1.
+
+## [2.13.0](https://github.com/k0kubun/hamlit/compare/v2.12.0...v2.13.0) - 2020-10-02
 
 ### Added
 
@@ -16,6 +22,7 @@ project adheres to [Semantic Versioning](http://semver.org/). This change log is
 - Upgrade the Haml parser from Haml 4.0 to 5.2 [#163](https://github.com/k0kubun/hamlit/issues/163).
   - Allow `@` as tag's class name.
   - Fix NameError on an `InvalidAttributeNameError` reference introduced at Hamlit v2.12.0.
+  - You can no longer specify `ugly` option, which has had no effect.
 
 ## [2.12.0](https://github.com/k0kubun/hamlit/compare/v2.11.1...v2.12.0) - 2020-09-30
 

data/README.md

@@ -10,17 +10,17 @@ Hamlit is a high performance [Haml](https://github.com/haml/haml) implementation
 ### What is Hamlit?
 Hamlit is another implementation of [Haml](https://github.com/haml/haml).
 With some [limitations](REFERENCE.md#limitations) by design for performance,
-Hamlit is **2.39x times faster** than original haml gem in [this benchmark](benchmark/slim/run-benchmarks.rb),
-which is an HTML-escaped version of [slim-template/slim's one](https://github.com/slim-template/slim/blob/v3.0.8/benchmarks/run-benchmarks.rb) for fairness. ([Result on Travis](https://travis-ci.org/k0kubun/hamlit/jobs/236567391))
+Hamlit is **1.94x times faster** than original haml gem in [this benchmark](benchmark/slim/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))
 
-<img src="https://i.gyazo.com/0f0c0362b6bd69f82715bec1d8caa191.png" width="600px" alt="Hamlit Benchmark"/>
+<img src="https://raw.githubusercontent.com/k0kubun/hamlit/afcc2b36c4861c2f764baa09afd9530ca25eeafa/benchmark/graph/graph.png" width="600x" alt="Hamlit Benchmark" />
 
 ```
-       hamlit v2.8.1:   131048.9 i/s
-        erubi v1.6.0:   125445.4 i/s - 1.04x slower
-         slim v3.0.8:   121390.4 i/s - 1.08x slower
-         faml v0.8.1:   100750.5 i/s - 1.30x slower
-         haml v5.0.1:    54882.6 i/s - 2.39x slower
+      hamlit v2.13.0:   247404.4 i/s
+        erubi v1.9.0:   244356.4 i/s - 1.01x slower
+         slim v4.1.0:   238254.3 i/s - 1.04x slower
+         faml v0.8.1:   197293.2 i/s - 1.25x slower
+         haml v5.2.0:   127834.4 i/s - 1.94x slower
 ```
 
 ### Why is Hamlit faster?

data/bin/update-haml

@@ -3,7 +3,7 @@ require 'fileutils'
 require 'tmpdir'
 
 HAML_REPO    = 'haml/haml'
-HAML_VERSION = 'v5.2.0'
+HAML_VERSION = '5.2.1'
 
 module GitHubFetcher
   def self.fetch(repo, tag:, path:)
@@ -76,7 +76,7 @@ class HamlitParserBuilder
 
     DUMMY_CLASSES.each do |file, klass|
       dest_path = File.join(@hamlit_parser, "haml_#{file}")
-      src = "class Hamlit::Haml#{klass}; end"
+      src = "class Hamlit::Haml#{klass}; end\n"
       File.write(dest_path, src)
     end
   end

data/hamlit.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   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.0'
+  spec.add_development_dependency 'rails', '>= 4.0'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rake-compiler'
   spec.add_development_dependency 'sass'

data/lib/hamlit/parser/haml_compiler.rb

@@ -1 +1 @@
-class Hamlit::HamlCompiler; end
+class Hamlit::HamlCompiler; end

data/lib/hamlit/parser/haml_escapable.rb

@@ -1 +1 @@
-class Hamlit::HamlEscapable; end
+class Hamlit::HamlEscapable; end

data/lib/hamlit/parser/haml_generator.rb

@@ -1 +1 @@
-class Hamlit::HamlGenerator; end
+class Hamlit::HamlGenerator; end

data/lib/hamlit/parser/haml_parser.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'ripper'
 require 'strscan'
 
 module Hamlit
@@ -90,6 +91,9 @@ module Hamlit
     ID_KEY    = 'id'.freeze
     CLASS_KEY = 'class'.freeze
 
+    # Used for scanning old attributes, substituting the first '{'
+    METHOD_CALL_PREFIX = 'a('
+
     def initialize(options)
       @options = HamlOptions.wrap(options)
       # Record the indent levels of "if" statements to validate the subsequent
@@ -655,13 +659,18 @@ module Hamlit
     # @return [String] rest
     # @return [Integer] last_line
     def parse_old_attributes(text)
-      text = text.dup
       last_line = @line.index + 1
 
       begin
-        attributes_hash, rest = balance(text, ?{, ?})
+        # Old attributes often look like a valid Hash literal, but it sometimes allow code like
+        # `{ hash, foo: bar }`, which is compiled to `_hamlout.attributes({}, nil, hash, foo: bar)`.
+        #
+        # To scan such code correctly, this scans `a( hash, foo: bar }` instead, stops when there is
+        # 1 more :on_embexpr_end (the last '}') than :on_embexpr_beg, and resurrects '{' afterwards.
+        balanced, rest = balance_tokens(text.sub(?{, METHOD_CALL_PREFIX), :on_embexpr_beg, :on_embexpr_end, count: 1)
+        attributes_hash = balanced.sub(METHOD_CALL_PREFIX, ?{)
       rescue HamlSyntaxError => e
-        if text.strip[-1] == ?, && e.message == HamlError.message(:unbalanced_brackets)
+        if e.message == HamlError.message(:unbalanced_brackets) && !@template.empty?
           text << "\n#{@next_line.text}"
           last_line += 1
           next_line
@@ -815,6 +824,25 @@ module Hamlit
       Hamlit::HamlUtil.balance(*args) or raise(HamlSyntaxError.new(HamlError.message(:unbalanced_brackets)))
     end
 
+    # Unlike #balance, this balances Ripper tokens to balance something like `{ a: "}" }` correctly.
+    def balance_tokens(buf, start, finish, count: 0)
+      text = ''.dup
+      Ripper.lex(buf).each do |_, token, str|
+        text << str
+        case token
+        when start
+          count += 1
+        when finish
+          count -= 1
+        end
+
+        if count == 0
+          return text, buf.sub(text, '')
+        end
+      end
+      raise HamlSyntaxError.new(HamlError.message(:unbalanced_brackets))
+    end
+
     def block_opened?
       @next_line.tabs > @line.tabs
     end

data/lib/hamlit/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hamlit
 version: !ruby/object:Gem::Version
-  version: 2.13.0
+  version: 2.13.1
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-02 00:00:00.000000000 Z
+date: 2020-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -257,8 +257,8 @@ extensions:
 - ext/hamlit/extconf.rb
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -287,6 +287,8 @@ files:
 - benchmark/etc/tags_loop.haml
 - benchmark/ext/build_data.rb
 - benchmark/ext/build_id.rb
+- benchmark/graph/graph.key
+- benchmark/graph/graph.png
 - benchmark/id_attribute.haml
 - benchmark/plain.haml
 - benchmark/script.haml
@@ -389,7 +391,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: High Performance Haml Implementation

data/.travis.yml

@@ -1,53 +0,0 @@
-language: ruby
-cache: bundler
-branches:
-  only:
-    - master
-script:
-  - bundle exec rake $TASK
-env:
-  - RUBYOPT='-w'
-matrix:
-  include:
-    - rvm: 2.3.8
-      env: TASK=test
-    - rvm: 2.4.9
-      env: TASK=test
-    - rvm: 2.5.7
-      env: TASK=test
-    - rvm: 2.6.5
-      env: TASK=test
-    - rvm: 2.7.0
-      env: TASK=test
-    - rvm: 2.7.0
-      env: TASK=test RUBYOPT='-w --enable-frozen-string-literal'
-    - rvm: ruby-head
-      env: TASK=test
-    - rvm: jruby-9.2.8.0
-      env: TASK=test
-    - rvm: truffleruby
-      env: TASK=test
-    - rvm: 2.7.0
-      env: TASK=bench TEMPLATE=benchmark/boolean_attribute.haml,benchmark/class_attribute.haml,benchmark/id_attribute.haml,benchmark/data_attribute.haml,benchmark/common_attribute.haml
-    - rvm: 2.7.0
-      env: TASK=bench TEMPLATE=benchmark/dynamic_attributes/boolean_attribute.haml,benchmark/dynamic_attributes/class_attribute.haml,benchmark/dynamic_attributes/id_attribute.haml,benchmark/dynamic_attributes/data_attribute.haml,benchmark/dynamic_attributes/common_attribute.haml
-    - rvm: 2.7.0
-      env: TASK=bench SLIM_BENCH=1
-    - rvm: 2.7.0
-      env: TASK=bench TEMPLATE=benchmark/etc/attribute_builder.haml
-    - rvm: 2.7.0
-      env: TASK=bench TEMPLATE=benchmark/etc/static_analyzer.haml
-    - rvm: 2.7.0
-      env: TASK=bench TEMPLATE=benchmark/etc/string_interpolation.haml
-    - rvm: 2.7.0
-      env: TASK=bench TEMPLATE=test/haml/templates/standard.haml COMPILE=1
-  allow_failures:
-    - rvm: ruby-head
-      env: TASK=test
-    - env: TASK=bench TEMPLATE=benchmark/boolean_attribute.haml,benchmark/class_attribute.haml,benchmark/id_attribute.haml,benchmark/data_attribute.haml,benchmark/common_attribute.haml
-    - env: TASK=bench TEMPLATE=benchmark/dynamic_attributes/boolean_attribute.haml,benchmark/dynamic_attributes/class_attribute.haml,benchmark/dynamic_attributes/id_attribute.haml,benchmark/dynamic_attributes/data_attribute.haml,benchmark/dynamic_attributes/common_attribute.haml
-    - env: TASK=bench SLIM_BENCH=1
-    - env: TASK=bench TEMPLATE=benchmark/etc/attribute_builder.haml
-    - env: TASK=bench TEMPLATE=benchmark/etc/static_analyzer.haml
-    - env: TASK=bench TEMPLATE=benchmark/etc/string_interpolation.haml
-    - env: TASK=bench TEMPLATE=test/haml/templates/standard.haml COMPILE=1