hamlit 2.16.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de464e04c0b09e109a52ccae59ad85ee2a07875eaf903d8d0208d8b4d24b3d7d
-  data.tar.gz: a495ef4fc7e65d0e51a3538146a099d3c313b987fe11a03ef4da2468e2cabe5c
+  metadata.gz: 2cf74e46f5999bab46297a1c7b888f874168f87974787886920ef24f9b780414
+  data.tar.gz: 1938f6a98474683f4a988c04c7b9ab0499aaf0a523a2da71a938461b8dd24cbc
 SHA512:
-  metadata.gz: 22f7bd667c39909360a6405768b71b30769d5ea3aeff02e067f48a05ee89c07dda6e2d5467eafb4f000233ece666704483e31e325bda0cb16e53cb88beb97668
-  data.tar.gz: 83d3434d5953eebc388eeebddbf10f76d07dece448cacb00f96bfe0da80b8488fbc311002f81cc455ccdb5586ad70a21fd76497927fe656b586e2bcfde2b3bc1
+  metadata.gz: dfca98fe481d6fd7aabd7d2a5c7c154f8039051b51233645ced615fa69a0eb156da1414a9fd8e4a2519df93e7fd8ace2bb1fe69e5b693da651afc20678b6cde4
+  data.tar.gz: 40b4560839f50d074d8aa8a294074e360d652d88ed80a8dd26b411367c08b44e51b58eb8fcda81216b9ad33326b5d4d5f0495cef25701dc080675ba0e3471fc3

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).
 
+## [3.0.0](https://github.com/k0kubun/hamlit/compare/v2.16.2...v3.0.0) - 2022-08-07
+
+### Changed
+
+- [**breaking**] Use `disable_capture: false` for non-Rails environments
+  - `:disable_capture` is an option introduced in v2.16.1. See its release notes for details.
+  - If you use Rails, it continues to use `disable_capture: true`, so you're not impacted by this change.
+
+## [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,
+    scripts starting with `=` (e.g. `= render do ...`) capture a block content.
+     - Scripts starting with `-` (e.g. `- users.each do`) are not impacted.
+
 ## [2.16.0](https://github.com/k0kubun/hamlit/compare/v2.15.2...v2.16.0) - 2022-02-03
 
 ### Added

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

@@ -22,6 +22,7 @@ module Hamlit
                        param source track wbr),
       filename:     "",
       check_syntax: false,
+      disable_capture: false,
     )
 
     use Parser

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.16.0'
+  VERSION = '3.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hamlit
 version: !ruby/object:Gem::Version
-  version: 2.16.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-03 00:00:00.000000000 Z
+date: 2022-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
@@ -360,7 +360,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: High Performance Haml Implementation