Upgrade Papercraft to version 3.0

Author: noteflakes

CHANGELOG.md

@@ -1,3 +1,5 @@
+- Fix tests
+
 # 0.24 2025-10-08
 
 - Use gem.coop in Gemfile

cmd/setup/template/site/site/articles/cage.rb

@@ -13,7 +13,7 @@
   '              sile', 'N', 'ce?',
 ]
 
-export layout.apply {
+export Papercraft.apply(layout) {
   article(class: 'mesostic') {
     h2 'For William McN. who studied with Ezra Pound'
 

cmd/setup/template/site/site/index.rb

@@ -1,6 +1,6 @@
 layout = import('_layout/default')
 
-export layout.apply {
+export Papercraft.apply(layout) {
   h1 'Hello from Syntropy'
   p {
     span "Here's an "

lib/syntropy/app.rb

@@ -250,14 +250,17 @@ def markdown_route_proc(route)
     def render_markdown(route)
       atts, md = Syntropy.parse_markdown_file(route[:target][:fn], @env)
 
+      layout = compute_markdown_layout(route, atts)
+      Papercraft.html(layout, md:, **atts)
+    end
+
+    def compute_markdown_layout(route, atts)
       if (layout = atts[:layout])
         route[:applied_layouts] ||= {}
-        proc = route[:applied_layouts][layout] ||= markdown_layout_template(layout)
-        html = proc.render(md:, **atts)
+        route[:applied_layouts][layout] ||= markdown_layout_template(layout)
       else
-        html = default_markdown_layout_template.render(md:, **atts)
+        default_markdown_layout_template
       end
-      html
     end
 
     # Returns a markdown template based on the given layout.
@@ -267,7 +270,7 @@ def render_markdown(route)
     def markdown_layout_template(layout)
       @layouts ||= {}
       template = @module_loader.load("_layout/#{layout}")
-      @layouts[layout] = template.apply { |md:, **| markdown(md) }
+      @layouts[layout] = Papercraft.apply(template) { |md:, **| markdown(md) }
     end
 
     # Returns the default markdown layout, which renders to HTML and includes a
@@ -324,7 +327,9 @@ def papercraft_template_proc(template)
       mime_type = xml_mode ? 'text/xml; charset=UTF-8' : 'text/html; charset=UTF-8'
       headers = { 'Content-Type' => mime_type }
 
-      get_proc = xml_mode ? -> { [template.render_xml, headers] } : -> { [template.render, headers] }
+      get_proc = xml_mode ?
+        -> { [Papercraft.xml(template), headers] } :
+        -> { [Papercraft.html(template), headers] }
 
       ->(req) {
         req.respond_by_http_method(

syntropy.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'extralite',     '2.13'
   s.add_dependency 'json',          '2.13.2'
-  s.add_dependency 'papercraft',    '2.19'
+  s.add_dependency 'papercraft',    '3.0'
   s.add_dependency 'qeweney',       '0.24'
   s.add_dependency 'tp2',           '0.19'
   s.add_dependency 'uringmachine',  '0.18'