hamlit 2.15.2-java → 2.16.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f965a5e90ebe0386f30191817e1e863539eb6ed308ac54dc86889fd6e405f40
-  data.tar.gz: 976c904d82d5e8fd67046c631b3b8a0372a2b3cdd9f74745f62b2a2f8c0f2d37
+  metadata.gz: 82b1954dd2f447f3351274d1eb8b7aab0cc3e241c137bf0af1bad3a6c0224884
+  data.tar.gz: 3a80f13f9c16722bf9b492a7666741ba235d732eb906724729b8cde5e257f81f
 SHA512:
-  metadata.gz: 9802c20f7102db16aa338f57d268ee8305d502812d6a24e5ad92ff17d94347d5018f84e6d93137f6efbab4cebbe7608573bab318a9c2064915f849720361a03d
-  data.tar.gz: 7d00e40daaf4f9b4c3f2e167f7cbe22e99badc1a37971fd4d8df788a6842c3b9dc643b10e2d048e719b3ac2f49302719c3994cdc7a2324f319c2aa54028873da
+  metadata.gz: 9aeda4f739eeb2b18dd029a4727fe1b6325f9f80c2483ab607211994651e3f1d219738df7ed75cb1d638423e65c3d999ecfd63586e26d3f022f190ae9b72d8bb
+  data.tar.gz: beae99e9412e203580ed8a2610acee46ed3da1316e0a6530533dd372e73d9fd7c10d114d4ac512174beb84f32b4f372ea74d355acbb3a9580eb13851ca23db95

data/CHANGELOG.md

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

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.2'
+  VERSION = '2.16.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hamlit
 version: !ruby/object:Gem::Version
-  version: 2.15.2
+  version: 2.16.2
 platform: java
 authors:
 - Takashi Kokubun
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-05 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