syntropy 0.10 → 0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a73932b30656f39aa80ecfdd0161a04bb6aff7d0895d24c092d89422bc5cebe
-  data.tar.gz: 07266a98667a5a9b45756d25a79abc0143f7f99f786fa8fde1e2a5d58f237392
+  metadata.gz: 6f33d7721410d70a9d5b86977c73b36f6a410a6534c253269df5f2d47123a54f
+  data.tar.gz: 6f961a74dd9fa299296d6699244076dfc09fa3697faad7c28cc6c2db81f5fb46
 SHA512:
-  metadata.gz: e84b35bff3fd83e038488aa581710c79dd23adaa11777cdb2872fc06562f3e79e2ce000afd270677feaead75cff90a07a8e88f312b4fae4fcd4772cfa3b3c228
-  data.tar.gz: b8788e723ca3108c78e65bcd445fa91184e0835f602b1fdb46bf06add11681e61cc1429f6e9f72f415bc33b1b80e9dc7e56587881c02401e0e5ecde5d0551714
+  metadata.gz: 158e46fd1e09da1af72a5ffd50a1ccde7699ce52f9a9d7a317903e3aa29234a5f924371712571b4d0188bcc5e7484b7bced4be7ee7440140ba5cfb07b492bccf
+  data.tar.gz: 6a45ef64e1ef65cf5c86c15dd5858a3f028343c55f68be253d07626800c4f534782898e4e7d83697fb324b4169050ce913a911575d31936c5a852e12f0eb4be0

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.11 2025-08-17
+
+- Upgrade to P2 2.8
+
+## 0.10.1 2025-08-10
+
+- Fix ModuleLoader.wrap_module to work correctly with P2::Template
+
 ## 0.10 2025-08-10
 
 - Add query, execute methods to ConnectionPool

data/README.md

@@ -164,7 +164,7 @@ export template { |**props|
     h1 'Foo'
   }
   content {
-    emit_yield(**props)
+    render_yield(**props)
   }
 }
 

data/cmd/setup/template/site/site/_layout/default.rb

@@ -5,7 +5,7 @@ export templ { |*a, **b|
       link rel: 'stylesheet', type: 'text/css', href: '/assets/css/style.css'
     }
     body {
-      emit_yield(*a, **b)
+      render_yield(*a, **b)
     }
   }
 }

data/lib/syntropy/app.rb

@@ -116,7 +116,7 @@ module Syntropy
       headers = { 'Content-Type' => entry[:mime_type] }
       req.respond_by_http_method(
         'head'  => [nil, headers],
-        'get'   => -> { [render_markdown(entry[:fn]), headers] }
+        'get'   => -> { [render_markdown(entry), headers] }
       )
     end
 
@@ -139,7 +139,7 @@ module Syntropy
     def load_module(entry)
       ref = entry[:fn].gsub(%r{^#{@location}/}, '').gsub(/\.rb$/, '')
       o = @module_loader.load(ref)
-      o.is_a?(P2::Template) ? wrap_template(o) : o
+      wrap_module(o)
     rescue Exception => e
       @opts[:logger]&.error(
         message:  "Error while loading module #{ref}",
@@ -148,7 +148,18 @@ module Syntropy
       :invalid
     end
 
-    def wrap_template(wrapper)
+    def wrap_module(mod)
+      case mod
+      when P2::Template
+        wrap_p2_template(mod)
+      when Papercraft::Template
+        wrap_papercraft_template(mod)
+      else
+        mod
+      end
+    end
+
+    def wrap_p2_template(wrapper)
       template = wrapper.proc
       lambda { |req|
         headers = { 'Content-Type' => 'text/html' }
@@ -159,16 +170,36 @@ module Syntropy
       }
     end
 
-    def render_markdown(fn)
-      atts, md = Syntropy.parse_markdown_file(fn, @opts)
+    def wrap_papercraft_template(template)
+      lambda { |req|
+        headers = { 'Content-Type' => template.mime_type }
+        req.respond_by_http_method(
+          'head'  => [nil, headers],
+          'get'   => -> { [template.render, headers] }
+        )
+      }
+      
+    end
+
+    def render_markdown(entry)
+      atts, md = Syntropy.parse_markdown_file(entry[:fn], @opts)
 
-      if atts[:layout]
-        layout = @module_loader.load("_layout/#{atts[:layout]}")
-        html = layout.apply(**atts) { emit_markdown(md) }.render
+      if (layout = atts[:layout])
+        entry[:applied_layouts] ||= {}
+        proc = entry[:applied_layouts][layout] ||= markdown_layout_proc(layout)
+        html = proc.render(md: md, **atts)
       else
         html = P2.markdown(md)
       end
       html
     end
+
+    def markdown_layout_proc(layout)
+      layout = @module_loader.load("_layout/#{layout}")
+      puts '*' * 40
+      puts layout.proc.compiled_code
+      puts
+      layout.apply { |md:, **atts| markdown(md) }
+    end
   end
 end

data/lib/syntropy/module.rb

@@ -50,10 +50,10 @@ module Syntropy
         ->(req) { o.send(export_value, req) }
       when String
         ->(req) { req.respond(export_value) }
-      when Proc
-        export_value
-      else
+      when Class
         export_value.new(@env)
+      else
+        export_value
       end
     end
   end

data/lib/syntropy/version.rb

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

data/lib/syntropy.rb

@@ -3,6 +3,8 @@
 require 'qeweney'
 require 'uringmachine'
 require 'tp2'
+require 'p2'
+require 'papercraft'
 
 require 'syntropy/app'
 require 'syntropy/connection_pool'

data/syntropy.gemspec

@@ -23,7 +23,8 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'extralite',     '2.13'
   s.add_dependency 'json',          '2.13.2'
-  s.add_dependency 'p2',            '2.4'
+  s.add_dependency 'p2',            '2.8'
+  s.add_dependency 'papercraft',    '1.4'
   s.add_dependency 'qeweney',       '0.21'
   s.add_dependency 'tp2',           '0.14.1'
   s.add_dependency 'uringmachine',  '0.16'

data/test/app/_layout/default.rb

@@ -3,6 +3,6 @@ export template { |**props|
     h1 'Foo'
   }
   content {
-    emit_yield(**props)
+    render_yield(**props)
   }
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: syntropy
 version: !ruby/object:Gem::Version
-  version: '0.10'
+  version: '0.11'
 platform: ruby
 authors:
 - Sharon Rosner
@@ -43,14 +43,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.8'
+- !ruby/object:Gem::Dependency
+  name: papercraft
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: qeweney
   requirement: !ruby/object:Gem::Requirement