hamlit 2.14.6 → 2.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eaa5616456f4832b624f5739bce6f281235a2a758e4189d454ef080684c96452
-  data.tar.gz: 40315c6d81b7129a7f3810378618d277a82e47596e2a6b4b615bbd31c96c2840
+  metadata.gz: de464e04c0b09e109a52ccae59ad85ee2a07875eaf903d8d0208d8b4d24b3d7d
+  data.tar.gz: a495ef4fc7e65d0e51a3538146a099d3c313b987fe11a03ef4da2468e2cabe5c
 SHA512:
-  metadata.gz: fc4ac5b8673f3dfc68eb048f896caa239d91af799318e2037896631bb287d92cc14f10b65b5fe2a5f5fee2c5eec45d4543c9b8f4ff6b5829c8ddb379ea528f44
-  data.tar.gz: 5874679be120e5a5e9ca359dfffe91c3ef7ce1f936984457494bebf11df3007f4c135d7be083aaca3e0f09f126aefa91f7d6270c4a0dbf038fe7fac628a6fe14
+  metadata.gz: 22f7bd667c39909360a6405768b71b30769d5ea3aeff02e067f48a05ee89c07dda6e2d5467eafb4f000233ece666704483e31e325bda0cb16e53cb88beb97668
+  data.tar.gz: 83d3434d5953eebc388eeebddbf10f76d07dece448cacb00f96bfe0da80b8488fbc311002f81cc455ccdb5586ad70a21fd76497927fe656b586e2bcfde2b3bc1

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,7 +4,36 @@ 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.14.6](https://github.com/k0kubun/hamlit/compare/v2.14.4...v2.14.5) - 2021-03-23
+## [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
+
+- Always use Hamlit when both haml.gem and hamlit.gem are installed in Rails
+  *Thanks to @igor-drozdov*
+
+## [2.14.6](https://github.com/k0kubun/hamlit/compare/v2.14.5...v2.14.6) - 2021-03-23
 
 ### Fixed
 

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/engine.rb

@@ -21,6 +21,7 @@ module Hamlit
                        hr img input isindex keygen link menuitem meta
                        param source track wbr),
       filename:     "",
+      check_syntax: false,
     )
 
     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/railtie.rb

@@ -4,6 +4,11 @@ require 'rails'
 module Hamlit
   class Railtie < ::Rails::Railtie
     initializer :hamlit, before: :load_config_initializers do |app|
+      # Load haml/plugin first to override if available
+      begin
+        require 'haml/plugin'
+      rescue LoadError
+      end
       require 'hamlit/rails_template'
     end
   end

data/lib/hamlit/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hamlit
 version: !ruby/object:Gem::Version
-  version: 2.14.6
+  version: 2.16.0
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-24 00:00:00.000000000 Z
+date: 2022-02-03 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.2.22
 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