papercraft 2.19 → 2.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe2a1a127f5ab2ce6173b2186e01ed054f9b60bb1c7226158dbfcd609fbdceeb
-  data.tar.gz: 8cc60c437b3816b77576f942c07ae54cd4a823f0ca05b5543fb2b21027465f4b
+  metadata.gz: c19544c09d7b8276b00634c3c3f018db6334d3e04ed630c8b5c6aa5b9e1fa881
+  data.tar.gz: f3ae23754232af2f87b66bebcb90aa319cb153171703e0367110c04c3e6ced26
 SHA512:
-  metadata.gz: dd9c2b03e65f07b868dfebaa6c05560ddf8368c5499d1c8d0c8a71a99e3ff8dc44cfde1c84407d75b81ab00d6c907c1df79a791a6db0991435e1b8d867ce230f
-  data.tar.gz: fe558946db2a45e8f23dc9ec7ef20962afd4728a38ec5f354ecd316048eb30861dd9ea120e6ba90be48be9226f7821e01c94cea6cee86a11c551936cbb92ec32
+  metadata.gz: 2883f9ebdfa04b818419903c2c5e37ae9cde85da0dc559b78952fa7827851d6b54da7261fc04409cbd408a8afe5dd49bf94923bd68f1e9998afe9fd3ace959c2
+  data.tar.gz: 32e2512bc5feaf58619e568d5f0c5e0a4af131ad750eb57bc6846aaa253460c652f9915a51185366c95200697bd4625e7a1cd188e73fbd68ed687f4b9d03bd06

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+# 2.21 2025-10-08
+
+- Fix `Proc#apply` parameter handling
+- Put Proc extensions in separate module, included into Proc
+
+# 2.20 2025-10-08
+
+- Raise error on void element with child nodes or inner text
+- Fix compilation of empty template
+
 # 2.19 2025-10-08
 
 - Use gem.coop in Gemfile

data/lib/papercraft/compiler/tag_translator.rb

@@ -16,6 +16,8 @@ module Papercraft
     end
 
     def self.transform(ast, root)
+      return nil if !ast
+
       ast.accept(new(root))
     end
 

data/lib/papercraft/compiler.rb

@@ -165,6 +165,10 @@ module Papercraft
       is_void = is_void_element?(tag)
       is_raw_inner_text = is_raw_inner_text_element?(tag)
 
+      if is_void && (node.block || node.inner_text)
+        raise Papercraft::Error, "Void element #{tag} cannot contain child nodes or inner text"
+      end
+
       emit_html(node.tag_location, format_html_tag_open(node.tag_location, tag, node.attributes))
       return if is_void
 

data/lib/papercraft/proc_ext.rb

@@ -2,117 +2,127 @@
 
 require_relative './compiler'
 
-# Extensions to the Proc class.
-class ::Proc
-  # Returns the compiled form code for the proc.
-  #
-  # @return [String] compiled proc code
-  def compiled_code
-    Papercraft::Compiler.compile_to_code(self).last
-  end
+module Papercraft
+  # Extensions to the Proc class.
+  module ProcExtensions
+    # Returns the compiled form code for the proc.
+    #
+    # @return [String] compiled proc code
+    def compiled_code
+      Papercraft::Compiler.compile_to_code(self).last
+    end
 
-  # Returns the source map for the compiled proc.
-  #
-  # @return [Array<String>] source map
-  def source_map
-    loc = source_location
-    fn = compiled? ? loc.first : Papercraft::Compiler.source_location_to_fn(loc)
-    Papercraft::Compiler.source_map_store[fn]
-  end
+    # Returns the source map for the compiled proc.
+    #
+    # @return [Array<String>] source map
+    def source_map
+      loc = source_location
+      fn = compiled? ? loc.first : Papercraft::Compiler.source_location_to_fn(loc)
+      Papercraft::Compiler.source_map_store[fn]
+    end
 
-  # Returns the AST for the proc.
-  #
-  # @return [Prism::Node] AST root
-  def ast
-    Sirop.to_ast(self)
-  end
+    # Returns the AST for the proc.
+    #
+    # @return [Prism::Node] AST root
+    def ast
+      Sirop.to_ast(self)
+    end
 
-  # Returns true if proc is marked as compiled.
-  #
-  # @return [bool] is the proc marked as compiled
-  def compiled?
-    @is_compiled
-  end
+    # Returns true if proc is marked as compiled.
+    #
+    # @return [bool] is the proc marked as compiled
+    def compiled?
+      @is_compiled
+    end
 
-  # Marks the proc as compiled, i.e. can render directly and takes a string
-  # buffer as first argument.
-  #
-  # @return [self]
-  def compiled!
-    @is_compiled = true
-    self
-  end
+    # Marks the proc as compiled, i.e. can render directly and takes a string
+    # buffer as first argument.
+    #
+    # @return [self]
+    def compiled!
+      @is_compiled = true
+      self
+    end
 
-  # Returns the compiled proc for the given proc. If marked as compiled, returns
-  # self.
-  #
-  # @param mode [Symbol] compilation mode (:html, :xml)
-  # @return [Proc] compiled proc or self
-  def compiled_proc(mode: :html)
-    @compiled_proc ||= @is_compiled ? self : compile(mode:)
-  end
+    # Returns the compiled proc for the given proc. If marked as compiled, returns
+    # self.
+    #
+    # @param mode [Symbol] compilation mode (:html, :xml)
+    # @return [Proc] compiled proc or self
+    def compiled_proc(mode: :html)
+      @compiled_proc ||= @is_compiled ? self : compile(mode:)
+    end
 
-  # Compiles the proc into the compiled form.
-  #
-  # @param mode [Symbol] compilation mode (:html, :xml)
-  # @return [Proc] compiled proc
-  def compile(mode: :html)
-    Papercraft::Compiler.compile(self, mode:).compiled!
-  rescue Sirop::Error
-    raise Papercraft::Error, "Dynamically defined procs cannot be compiled"
-  end
+    # Compiles the proc into the compiled form.
+    #
+    # @param mode [Symbol] compilation mode (:html, :xml)
+    # @return [Proc] compiled proc
+    def compile(mode: :html)
+      Papercraft::Compiler.compile(self, mode:).compiled!
+    rescue Sirop::Error
+      raise Papercraft::Error, "Dynamically defined procs cannot be compiled"
+    end
 
-  # Renders the proc to HTML with the given arguments.
-  #
-  # @return [String] HTML string
-  def render(*a, **b, &c)
-    compiled_proc.(+'', *a, **b, &c)
-  rescue Exception => e
-    e.is_a?(Papercraft::Error) ? raise : raise(Papercraft.translate_backtrace(e))
-  end
+    # Renders the proc to HTML with the given arguments.
+    #
+    # @return [String] HTML string
+    def render(*a, **b, &c)
+      compiled_proc.(+'', *a, **b, &c)
+    rescue Exception => e
+      e.is_a?(Papercraft::Error) ? raise : raise(Papercraft.translate_backtrace(e))
+    end
 
-  # Renders the proc to XML with the given arguments.
-  #
-  # @return [String] XML string
-  def render_xml(*a, **b, &c)
-    compiled_proc(mode: :xml).(+'', *a, **b, &c)
-  rescue Exception => e
-    e.is_a?(Papercraft::Error) ? raise : raise(Papercraft.translate_backtrace(e))
-  end
+    # Renders the proc to XML with the given arguments.
+    #
+    # @return [String] XML string
+    def render_xml(*a, **b, &c)
+      compiled_proc(mode: :xml).(+'', *a, **b, &c)
+    rescue Exception => e
+      e.is_a?(Papercraft::Error) ? raise : raise(Papercraft.translate_backtrace(e))
+    end
 
-  # Renders the proc to HTML with the given arguments into the given buffer.
-  #
-  # @param buf [String] buffer
-  # @return [String] HTML string
-  def render_to_buffer(buf, *a, **b, &c)
-    compiled_proc.(buf, *a, **b, &c)
-  rescue Exception => e
-    raise Papercraft.translate_backtrace(e)
-  end
+    # Renders the proc to HTML with the given arguments into the given buffer.
+    #
+    # @param buf [String] buffer
+    # @return [String] HTML string
+    def render_to_buffer(buf, *a, **b, &c)
+      compiled_proc.(buf, *a, **b, &c)
+    rescue Exception => e
+      raise Papercraft.translate_backtrace(e)
+    end
 
-  # Returns a proc that applies the given arguments to the original proc.
-  #
-  # @return [Proc] applied proc
-  def apply(*a, **b, &c)
-    compiled = compiled_proc
-    c_compiled = c&.compiled_proc
+    # Returns a proc that applies the given arguments to the original proc. The
+    # returned proc calls the *compiled* form of the proc, merging the
+    # positional and keywords parameters passed to `#apply` with parameters
+    # passed to the applied proc. If a block is given, it is wrapped in a proc
+    # that passed merged parameters to the block.
+    #
+    # @param *pos1 [Array<any>] applied positional parameters
+    # @param **kw1 [Hash<any, any] applied keyword parameters
+    # @return [Proc] applied proc
+    def apply(*pos1, **kw1, &block)
+      compiled = compiled_proc
+      c_compiled = block&.compiled_proc
 
-    ->(__buffer__, *x, **y, &z) {
-      c_proc = c_compiled && ->(__buffer__, *d, **e) {
-        c_compiled.(__buffer__, *a, *d, **b, **e, &z)
-      }.compiled!
+      ->(__buffer__, *pos2, **kw2, &block2) {
+        c_proc = c_compiled && ->(__buffer__, *pos3, **kw3) {
+          c_compiled.(__buffer__, *pos3, **kw3, &block2)
+        }.compiled!
 
-      compiled.(__buffer__, *a, *x, **b, **y, &c_proc)
-    }.compiled!
-  end
+        compiled.(__buffer__, *pos1, *pos2, **kw1, **kw2, &c_proc)
+      }.compiled!
+    end
 
-  # Caches and returns the rendered HTML for the template with the given
-  # arguments.
-  #
-  # @return [String] HTML string
-  def render_cached(*args, **kargs, &block)
-    @render_cache ||= {}
-    key = args.empty? && kargs.empty? && !block ? nil : [args, kargs, block&.source_location]
-    @render_cache[key] ||= render(*args, **kargs, &block)
+    # Caches and returns the rendered HTML for the template with the given
+    # arguments.
+    #
+    # @return [String] HTML string
+    def render_cached(*args, **kargs, &block)
+      @render_cache ||= {}
+      key = args.empty? && kargs.empty? && !block ? nil : [args, kargs, block&.source_location]
+      @render_cache[key] ||= render(*args, **kargs, &block)
+    end
   end
 end
+
+::Proc.include(Papercraft::ProcExtensions)

data/lib/papercraft/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Papercraft
-  VERSION = '2.19'
+  VERSION = '2.21'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: papercraft
 version: !ruby/object:Gem::Version
-  version: '2.19'
+  version: '2.21'
 platform: ruby
 authors:
 - Sharon Rosner