hamlit 2.15.0 → 2.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46fb5b844211b5c8bc782ee88d23eca02b16f9285609e76447a493aa10ee442c
-  data.tar.gz: b1069d514efd9b06b534ec82b3d524fbfde98e87b7b660af6041b60132b7324e
+  metadata.gz: fcce9bd99678dbe36651b82eff53e60d3c36e518f05e6a6dba18856ce6d16bc0
+  data.tar.gz: 3264ed62419fdf42e1fb05452c58e6b2cc5f6575f33b13b8322cbef650a70a9a
 SHA512:
-  metadata.gz: 52c0df95e9916faa1abecd927019d4429e28607fc4096157f6386f981cb2f5e6249e8aaabab0693942f7f31c01d0babcaf4dabea1b4cc92ea0d40b2d2cdf531c
-  data.tar.gz: 5241185ed6759415eaf9a263142a6b937fe316c550a59490964e6d10668e26529d730996fd3443d953216fe2a2d30e9af0f5ad241eea92c9e64cf68af55f82bb
+  metadata.gz: 9a78f921253b5512072adccb7ba02bd28987f9c9f84b7bd0dc468a040249bb567c0432bc994a763a1516d09a6fde04a5eb50dbbf3f0a0dd835a442bca05f5838
+  data.tar.gz: fba0599895195d4cb4c82c3a2d213d451d88bb5c82fa338093674c9416d57ad88436547d50131777fc7f0c1dc17f79f4c91d08a72a839d8d22e3f5d1b2f33507

data/.github/workflows/bench.yml

@@ -0,0 +1,46 @@
+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
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - slim: 1
+          - template: 'benchmark/boolean_attribute.haml,benchmark/class_attribute.haml,benchmark/id_attribute.haml,benchmark/data_attribute.haml,benchmark/common_attribute.haml'
+          - 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'
+          - template: 'benchmark/etc/attribute_builder.haml'
+          - template: 'benchmark/etc/static_analyzer.haml'
+          - template: 'benchmark/etc/string_interpolation.haml'
+          - template: 'test/haml/templates/standard.haml'
+            compile: 1
+    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
+        env:
+          SLIM_BENCH: ${{ matrix.slim }}
+          TEMPLATE: ${{ matrix.template }}
+          COMPILE: ${{ matrix.compile }}

data/CHANGELOG.md

@@ -4,6 +4,44 @@ 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.16.2](https://github.com/k0kubun/hamlit/compare/v2.16.1...v2.16.2) - 2022-08-07
+
+### Fixed
+
+- Fix an issue when `disable_capture: false` is set and a Ruby comment is put after `do`
+
+## [2.16.1](https://github.com/k0kubun/hamlit/compare/v2.16.0...v2.16.1) - 2022-08-07
+
+### Added
+
+- Introduce `:disable_capture` option to capture a block 
+  - Default: `disable_capture: true` (backward-compatible)
+     - For Rails, this must be `true` anyway to use Rails-native capturing.
+  - If you override the option like `disable_capture: false` in Hamlit::Template,
+    you can capture a block content like `= render do ...`.
+
+## [2.16.0](https://github.com/k0kubun/hamlit/compare/v2.15.2...v2.16.0) - 2022-02-03
+
+### Added
+
+- Raise an exception on a Haml-level syntax error with `hamlit compile -c`
+  [#189](https://github.com/k0kubun/hamlit/issues/189)
+  *Thanks to @dlwr*
+
+## [2.15.2](https://github.com/k0kubun/hamlit/compare/v2.15.1...v2.15.2) - 2022-01-04
+
+### Fixed
+
+- Consider `playsinline` a boolean attribute [#187](https://github.com/k0kubun/hamlit/issues/187)
+  *Thanks to @ghiculescu*
+
+## [2.15.1](https://github.com/k0kubun/hamlit/compare/v2.15.0...v2.15.1) - 2021-07-23
+
+### Fixed
+
+- Remove `benchmark` from the gem package to reduce its size [#186](https://github.com/k0kubun/hamlit/issues/186)
+  *Thanks to @pocke*
+
 ## [2.15.0](https://github.com/k0kubun/hamlit/compare/v2.14.6...v2.15.0) - 2021-04-12
 
 ### Added

data/hamlit.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/k0kubun/hamlit'
   spec.license       = 'MIT'
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|sample)/}) }
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|sample|benchmark)/}) }
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']

data/lib/hamlit/attribute_builder.rb

@@ -7,7 +7,7 @@ module Hamlit::AttributeBuilder
                        defer reversed ismap seamless muted required
                        autofocus novalidate formnovalidate open pubdate
                        itemscope allowfullscreen default inert sortable
-                       truespeed typemustmatch download].freeze
+                       truespeed typemustmatch download playsinline].freeze
 
   # Java extension is not implemented for JRuby yet.
   # TruffleRuby does not implement `rb_ary_sort_bang`, etc.

data/lib/hamlit/cli.rb

@@ -106,6 +106,7 @@ module Hamlit
       Hamlit::Engine.options.to_h.merge(
         escape_attrs: options[:escape_attrs],
         escape_html:  options[:escape_html],
+        check_syntax: options[:check],
       )
     end
 

data/lib/hamlit/compiler/script_compiler.rb

@@ -6,8 +6,9 @@ require 'hamlit/string_splitter'
 module Hamlit
   class Compiler
     class ScriptCompiler
-      def initialize(identity)
+      def initialize(identity, options)
         @identity = identity
+        @disable_capture = options[:disable_capture]
       end
 
       def compile(node, &block)
@@ -79,7 +80,7 @@ module Hamlit
         else
           [:multi,
            [:block, "#{var} = #{node.value[:text]}",
-            [:multi, [:newline], yield(node)],
+            [:multi, [:newline], @disable_capture ? yield(node) : [:capture, Temple::Utils.unique_name, yield(node)]]
            ],
           ]
         end

data/lib/hamlit/compiler.rb

@@ -16,7 +16,7 @@ module Hamlit
       @comment_compiler       = CommentCompiler.new
       @doctype_compiler       = DoctypeCompiler.new(options)
       @filter_compiler        = Filters.new(options)
-      @script_compiler        = ScriptCompiler.new(identity)
+      @script_compiler        = ScriptCompiler.new(identity, options)
       @silent_script_compiler = SilentScriptCompiler.new
       @tag_compiler           = TagCompiler.new(identity, options)
     end

data/lib/hamlit/engine.rb

@@ -21,6 +21,8 @@ module Hamlit
                        hr img input isindex keygen link menuitem meta
                        param source track wbr),
       filename:     "",
+      check_syntax: false,
+      disable_capture: true,
     )
 
     use Parser

data/lib/hamlit/parser.rb

@@ -20,6 +20,7 @@ module Hamlit
       autoclose
       escape_html
       escape_attrs
+      check_syntax
     ].freeze
 
     def initialize(options = {})
@@ -35,6 +36,7 @@ module Hamlit
       end
       HamlParser.new(HamlOptions.new(@options)).call(template)
     rescue ::Hamlit::HamlError => e
+      raise e if @options[:check_syntax]
       error_with_lineno(e)
     end
 

data/lib/hamlit/rails_template.rb

@@ -15,6 +15,7 @@ module Hamlit
           use_html_safe: true,
           streaming:     true,
           buffer_class:  'ActionView::OutputBuffer',
+          disable_capture: true,
         }
       end
 
@@ -34,8 +35,10 @@ module Hamlit
       end
 
       if ActionView::Base.try(:annotate_rendered_view_with_filenames) && template.format == :html
-        options[:preamble] = "<!-- BEGIN #{template.short_identifier} -->\n"
-        options[:postamble] = "<!-- END #{template.short_identifier} -->\n"
+        options = options.merge(
+          preamble: "<!-- BEGIN #{template.short_identifier} -->\n",
+          postamble: "<!-- END #{template.short_identifier} -->\n",
+        )
       end
 
       Engine.new(options).call(source)

data/lib/hamlit/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hamlit
 version: !ruby/object:Gem::Version
-  version: 2.15.0
+  version: 2.16.2
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-13 00:00:00.000000000 Z
+date: 2022-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
@@ -258,6 +258,7 @@ extensions:
 extra_rdoc_files: []
 files:
 - ".github/FUNDING.yml"
+- ".github/workflows/bench.yml"
 - ".github/workflows/test.yml"
 - ".gitignore"
 - CHANGELOG.md
@@ -266,40 +267,6 @@ files:
 - README.md
 - REFERENCE.md
 - Rakefile
-- benchmark/boolean_attribute.haml
-- benchmark/class_attribute.haml
-- benchmark/common_attribute.haml
-- benchmark/data_attribute.haml
-- benchmark/dynamic_attributes/boolean_attribute.haml
-- benchmark/dynamic_attributes/class_attribute.haml
-- benchmark/dynamic_attributes/common_attribute.haml
-- benchmark/dynamic_attributes/data_attribute.haml
-- benchmark/dynamic_attributes/id_attribute.haml
-- benchmark/dynamic_boolean_attribute.haml
-- benchmark/dynamic_merger/benchmark.rb
-- benchmark/dynamic_merger/hello.haml
-- benchmark/dynamic_merger/hello.string
-- benchmark/etc/attribute_builder.haml
-- benchmark/etc/real_sample.haml
-- benchmark/etc/real_sample.rb
-- benchmark/etc/static_analyzer.haml
-- benchmark/etc/string_interpolation.haml
-- benchmark/etc/tags.haml
-- 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
-- benchmark/slim/LICENSE
-- benchmark/slim/context.rb
-- benchmark/slim/run-benchmarks.rb
-- benchmark/slim/view.erb
-- benchmark/slim/view.haml
-- benchmark/slim/view.slim
-- benchmark/utils/benchmark_ips_extension.rb
 - bin/bench
 - bin/console
 - bin/ruby
@@ -393,7 +360,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: High Performance Haml Implementation

data/benchmark/boolean_attribute.haml

@@ -1,6 +0,0 @@
-%input{ disabled: false }
-%input{ disabled: true }
-- disabled = false
-%input{ disabled: disabled }
-- disabled = true
-%input{ disabled: disabled }

data/benchmark/class_attribute.haml

@@ -1,5 +0,0 @@
-.book{ class: 'content active' }
-.book(class='content active')
-
-- klass = %w[content active]
-.book{ class: klass }

data/benchmark/common_attribute.haml

@@ -1,3 +0,0 @@
-%a{ href: '&"\'<>' }
-- href = '&"\'<>'
-%a{ href: href }

data/benchmark/data_attribute.haml

@@ -1,4 +0,0 @@
-%div{ data: { disabled: false } }
-%div{ data: { disabled: true } }
-- hash = { 'user' => { id: 1234, name: 'k0kubun' }, book_id: 5432 }
-%div{ data: hash } data

data/benchmark/dynamic_attributes/boolean_attribute.haml

@@ -1,4 +0,0 @@
-- hash = { disabled: false }
-%input{ hash }
-- hash = { disabled: true }
-%input{ hash }

data/benchmark/dynamic_attributes/class_attribute.haml

@@ -1,4 +0,0 @@
-- hash = { class: %w[content active] }
-.book{ hash }
-- arr = %w[foo bar]
-.book(class=arr){ hash }

data/benchmark/dynamic_attributes/common_attribute.haml

@@ -1,2 +0,0 @@
-- hash = { href: '&"\'<>' }
-%a{ hash }

data/benchmark/dynamic_attributes/data_attribute.haml

@@ -1,2 +0,0 @@
-- hash = { data: { 'user' => { id: 1234, name: 'k0kubun' }, book_id: 5432 } }
-%div{ hash } data

data/benchmark/dynamic_attributes/id_attribute.haml

@@ -1,2 +0,0 @@
-- hash = { id: %w[content active] }
-#book{ hash }

data/benchmark/dynamic_boolean_attribute.haml

@@ -1,4 +0,0 @@
-- disabled = false
-%input{ disabled: disabled }
-- disabled = true
-%input{ disabled: disabled }

data/benchmark/dynamic_merger/benchmark.rb

@@ -1,25 +0,0 @@
-# Original: https://github.com/amatsuda/string_template/blob/master/benchmark.rb
-require 'benchmark_driver'
-
-Benchmark.driver(repeat_count: 8) do |x|
-  x.prelude %{
-    require 'rails'
-    require 'action_view'
-    require 'string_template'
-    StringTemplate::Railtie.run_initializers
-    require 'hamlit'
-    Hamlit::Railtie.run_initializers
-    Hamlit::RailsTemplate.set_options(escape_html: false, generator: Temple::Generators::ArrayBuffer)
-    require 'action_view/base'
-
-    (view = Class.new(ActionView::Base).new(ActionView::LookupContext.new(''))).instance_variable_set(:@world, 'world!')
-
-    # compile template
-    hello = 'benchmark/dynamic_merger/hello'
-    view.render(template: hello, handlers: 'string')
-    view.render(template: hello, handlers: 'haml')
-  }
-  x.report 'string', %{ view.render(template: hello, handlers: 'string') }
-  x.report 'hamlit', %{ view.render(template: hello, handlers: 'haml') }
-  x.loop_count 100_000
-end

data/benchmark/dynamic_merger/hello.haml

@@ -1,50 +0,0 @@
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }

data/benchmark/dynamic_merger/hello.string

@@ -1,50 +0,0 @@
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }
-hello, #{ @world }

data/benchmark/etc/attribute_builder.haml

@@ -1,5 +0,0 @@
-- h = { 'user' => { id: 1234, name: 'eagletmt' }, book_id: 5432 }
-- c = %w[content active]
-
-%span.book{data: h, class: c}
-  Book