syntropy 0.24 → 0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52a80f457dde966b40228b1bea495b854f3f5c65e6f7b252675ac23ceca15589
-  data.tar.gz: a3f1e230ec1980c511f2069f89346a37588e65d6f6a93511b8fff2e353e9e347
+  metadata.gz: d8e03dfbaf126674e740e0ef3819967a181499962a2940dbcbb075c005d91f87
+  data.tar.gz: aa26e63ce7f99be78e8a70b879a27ac039674947b833122533afb23a34bbdda2
 SHA512:
-  metadata.gz: cb40516e940cb7be29d184f78aa192c58ac879b1ee9adb1f8cf0aedfa225f98d70ef5385e975eb737cadac8c758d456a8817604844a5dcc6a4d20f9124343500
-  data.tar.gz: 86fc05e3300fe76fa3f0cf7dc96d032bf32a15dd727ec134595b2bf86e9a62ec83cbf82c861173dd304cedf994a9df76dc4bff3e067ef812febf06c8af09e1a9
+  metadata.gz: d2eac9d510c3d449fc507a7bcd457ac448d857121915b030730714a6fcaeadecc36f52c4b5b77becc1bbe6760d71ab59bb8d10e3ff0edcece136f55e4fe503f8
+  data.tar.gz: a05435e23baa3b6d0ba34c7bc24ae0fc6652931e53313c63652ad84be955b1b15467e3d0abb0b4ce4eb152a72b5f20b2664392a7b4ea8bd4c61478f48d7e6903

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.25 2025-10-19
+
+- Upgrade Papercraft to version 3.0
+- Fix tests
+
 # 0.24 2025-10-08
 
 - Use gem.coop in Gemfile

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

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

data/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 "

data/lib/syntropy/app.rb

@@ -250,14 +250,17 @@ module Syntropy
     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 @@ module Syntropy
     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 @@ module Syntropy
       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(

data/lib/syntropy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Syntropy
-  VERSION = '0.24'
+  VERSION = '0.25'
 end

data/syntropy.gemspec

@@ -23,8 +23,8 @@ 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 'qeweney',       '0.23'
+  s.add_dependency 'papercraft',    '3.0'
+  s.add_dependency 'qeweney',       '0.24'
   s.add_dependency 'tp2',           '0.19'
   s.add_dependency 'uringmachine',  '0.18'
 

data/test/helper.rb

@@ -93,7 +93,7 @@ end
 # Extensions to be used in conjunction with `Qeweney::TestAdapter`
 class Qeweney::Request
   def response_headers
-    adapter.headers
+    adapter.response_headers
   end
 
   def response_status
@@ -101,7 +101,7 @@ class Qeweney::Request
   end
 
   def response_body
-    adapter.body
+    adapter.response_body
   end
 
   def response_json

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: syntropy
 version: !ruby/object:Gem::Version
-  version: '0.24'
+  version: '0.25'
 platform: ruby
 authors:
 - Sharon Rosner
@@ -43,28 +43,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '2.19'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '2.19'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: qeweney
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '0.23'
+        version: '0.24'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '0.23'
+        version: '0.24'
 - !ruby/object:Gem::Dependency
   name: tp2
   requirement: !ruby/object:Gem::Requirement