hamlit 2.16.0-java → 3.0.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f45ed8390632fee817387fbacaabc24a1a85771a180c437a7c436f67cb5f1b3
-  data.tar.gz: c81a493e1be9f4c5ca073abab20178c04dfd6533cf10cb0cb27afadd5c3424ab
+  metadata.gz: 12be429a8481d86e0dee762af8fa98eb8ef7ed5b131092f5cb47acc47655f5a0
+  data.tar.gz: 55fad897b3938e57bb9986e3b0c2c6cb449634889fa0563e46cef0176358c280
 SHA512:
-  metadata.gz: a9a7be2565941bfd691c8804c18770255d08b97eeedcad6e891c1b2ba0642f3a8e22965152a7c9c8fa910ab6544b501dd55f4dbae27dc3783418b334d0d8d9ba
-  data.tar.gz: 63e8718f2d759ad585920d87a614c240c81f14bfe692adeb1fe4b5cd4d3a1741c5ac1def031810496db7378213d2842685704db32c6f11607e170fe0fd5577ce
+  metadata.gz: e89257b48ceebde299b037ef204f29d9f017c6f49c5687f38f31a5182c8b0eb6b53802dc5a1fdc7980163f2aad1b8a89c88e072ddde7d63294cf63638d9f7634
+  data.tar.gz: 51da64cfc88e0a9625c1c60b7913099bec59f73bdc5e2b602383c9a4c685e887b74c8cb8445fd8e2c774397751f86f28fdfbe226d9d5fca9497ccd89f8d9adb8

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: java
 authors:
 - Takashi Kokubun
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-03 00:00:00.000000000 Z
+date: 2022-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement