hamlit 2.15.1-java → 2.16.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ad29f71336e1e71fab1716562eb6e17dc21ab89536318f7be91e56991c42a76
-  data.tar.gz: 19592da7e2ab8cf613933dcd838ecea68c9b843cfd06d9ac67f31c6eec1a71a1
+  metadata.gz: a7cdfbe8eb95f4bbef4250c9bbee1ac1b4a020b41a94bca2dbe7cb9f8c564a08
+  data.tar.gz: 3ea649ea9397fd0a7c6f1c93b0f28aecf8fe1480c34a1c2378347ef3bd9d15dd
 SHA512:
-  metadata.gz: 34de923109facf23d50039433576861f6ae669b4b37771be879bd9a11ae94f190456435256c20d3ff5ca3d47e5f97e31ecbcc4c9df3e16b53e635ae8a435e4c1
-  data.tar.gz: f0a89c63f0c777b1b236260d43d8e077c948dcddc477341abedd91d03f3d20d9a296a3c62de39548cc878739f65b57ccbe4196b9f6b52443e99b70c0fcb38841
+  metadata.gz: 03c7de215cba2311fa46b5da5a7077c1ebcb4649e7615b5ceb755591e5248877e5120125404f5488f4990682eb3fb43592854f77707b3b797b667df27b0e83dd
+  data.tar.gz: b4c5ec81e8382ce355040bbb17712f3a8b7d072d58c474621006007886544a954b5e1dde449f3fa7dab207a722a64146f459bc65ec7e8ef1c685fcbcc6d80c34

data/.github/workflows/bench.yml

@@ -30,7 +30,7 @@ jobs:
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.0
+          ruby-version: '3.0'
       - uses: actions/cache@v2
         with:
           path: vendor/bundle

data/CHANGELOG.md

@@ -4,6 +4,31 @@ 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.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

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)
@@ -77,9 +78,10 @@ module Hamlit
            [:code, ')'],
           ]
         else
+          content = [:multi, [:newline], yield(node)]
           [:multi,
            [:block, "#{var} = #{node.value[:text]}",
-            [:multi, [:newline], yield(node)],
+            @disable_capture ? content : [:capture, Temple::Utils.unique_name, content],
            ],
           ]
         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.1'
+  VERSION = '2.16.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hamlit
 version: !ruby/object:Gem::Version
-  version: 2.15.1
+  version: 2.16.1
 platform: java
 authors:
 - Takashi Kokubun
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-23 00:00:00.000000000 Z
+date: 2022-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -359,7 +359,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.29
 signing_key:
 specification_version: 4
 summary: High Performance Haml Implementation