syntropy 0.9.2 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87551109e0882665af35d16b21a6cd12d1fc3bff3d8fbae1a24c8856a54ada08
-  data.tar.gz: 3c9cf454a3489ca3b578f1574cf7c216b5b873ee6568ef7bcedfda1c369ba8e4
+  metadata.gz: 24c519f5104a14a69acf3cf847068682158609321964e4d53f4fe9a28f747bd3
+  data.tar.gz: 6bfac0527f800ff4106639ef25931759af06ab20cf4742abd46eb3d2996437e1
 SHA512:
-  metadata.gz: b96d96be5114528ab81ec1b385e7cf8d0562e916fedc8e984cbaddf72ab4e5c4ae490a951abe21dc0028d1222f2cdba2240e1128ce3fa0f93d1ba5f893f3b965
-  data.tar.gz: 22cb63958b159665caa8132ae2f03c33afb2f4248c797852a0c2d66a460247fea98a769a5cf649a42a0c8b476cf0ae727ca9f35426c0342bf4dd7b1ac1959520
+  metadata.gz: 42e9062d2ab5f18a14deaa61e2a6b33a1cbff5d9e5ee4e7f07fbbf7e57d67c680ef3b9b243234b4dea89470eeb74cfdbe254a3552515b8fa0ed3434aa543f72d
+  data.tar.gz: bf0046c2b6df44a4d48ae5ece3201695bfd871ecfdac49d201f478abb6c3927584a1590ca46d52af6024210f179baf94a7e644a9971c37d4fc598d7582c85f2f

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 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
+- Switch from Papercraft to P2
+
 ## 0.9.2 2025-07-24
 
 - Fix logging

data/README.md

@@ -42,8 +42,7 @@ Syntropy is based on:
   concurrent Ruby apps.
 - [Qeweney](https://github.com/digital-fabric/qeweney) a uniform interface for
   working with HTTP requests and responses.
-- [Papercraft](https://github.com/digital-fabric/papercraft) HTML templating
-  with plain Ruby.
+- [P2](https://github.com/digital-fabric/p2) HTML templating with plain Ruby.
 - [Extralite](https://github.com/digital-fabric/extralite) a fast and innovative
   SQLite wrapper for Ruby.
 

data/lib/syntropy/app.rb

@@ -4,7 +4,7 @@ require 'json'
 require 'yaml'
 
 require 'qeweney'
-require 'papercraft'
+require 'p2'
 
 require 'syntropy/errors'
 require 'syntropy/file_watch'
@@ -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?(Papercraft::Template) ? wrap_template(o) : o
+      o.is_a?(P2::Template) ? wrap_template(o) : o
     rescue Exception => e
       @opts[:logger]&.error(
         message:  "Error while loading module #{ref}",
@@ -148,9 +148,10 @@ module Syntropy
       :invalid
     end
 
-    def wrap_template(template)
+    def wrap_template(wrapper)
+      template = wrapper.proc
       lambda { |req|
-        headers = { 'Content-Type' => template.mime_type }
+        headers = { 'Content-Type' => 'text/html' }
         req.respond_by_http_method(
           'head'  => [nil, headers],
           'get'   => -> { [template.render, headers] }
@@ -165,7 +166,7 @@ module Syntropy
         layout = @module_loader.load("_layout/#{atts[:layout]}")
         html = layout.apply(**atts) { emit_markdown(md) }.render
       else
-        html = Papercraft.markdown(md)
+        html = P2.markdown(md)
       end
       html
     end

data/lib/syntropy/connection_pool.rb

@@ -31,6 +31,14 @@ module Syntropy
       end
     end
 
+    def query(sql, *, **, &)
+      with_db { it.query(sql, *, **, &) }
+    end
+
+    def execute(sql, *, **)
+      with_db { it.execute(sql, *, **) }
+    end
+
     private
 
     def checkout

data/lib/syntropy/module.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'papercraft'
+require 'p2'
 
 module Syntropy
   class ModuleLoader
@@ -32,7 +32,7 @@ module Syntropy
 
       mod_body = IO.read(fn)
       mod_ctx = Class.new(Syntropy::Module)
-      mod_ctx.prepare(loader: self, env: @env)
+      mod_ctx.prepare(loader: self, env: @env, ref: ref)
       mod_ctx.module_eval(mod_body, fn, 1)
 
       export_value = mod_ctx.__export_value__
@@ -50,7 +50,7 @@ module Syntropy
         ->(req) { o.send(export_value, req) }
       when String
         ->(req) { req.respond(export_value) }
-      when Proc
+      when Proc, P2::Template
         export_value
       else
         export_value.new(@env)
@@ -64,10 +64,11 @@ module Syntropy
     end
 
     class << self
-      def prepare(loader:, env:)
+      def prepare(loader:, env:, ref:)
         @loader = loader
         @env = env
         @machine = env[:machine]
+        @ref = ref
         const_set(:MODULE, self)
       end
 
@@ -81,9 +82,13 @@ module Syntropy
         @__export_value__ = ref
       end
 
-      def template(&block)
-        Papercraft.html(&block)
+      def template(proc = nil, &block)
+        proc ||= block
+        raise "No template block/proc given" if !proc
+        
+        P2::Template.new(proc)
       end
+      alias_method :html, :template
 
       def route_by_host(map = nil)
         root = @env[:location]

data/lib/syntropy/version.rb

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

data/syntropy.gemspec

@@ -21,9 +21,9 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 3.4'
   s.executables = ['syntropy']
 
-  s.add_dependency 'extralite',     '2.12'
-  s.add_dependency 'json',          '2.12.2'
-  s.add_dependency 'papercraft',    '1.4'
+  s.add_dependency 'extralite',     '2.13'
+  s.add_dependency 'json',          '2.13.2'
+  s.add_dependency 'p2',            '2.4'
   s.add_dependency 'qeweney',       '0.21'
   s.add_dependency 'tp2',           '0.14.1'
   s.add_dependency 'uringmachine',  '0.16'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: syntropy
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.10.1
 platform: ruby
 authors:
 - Sharon Rosner
@@ -15,42 +15,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '2.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '2.13'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.12.2
+        version: 2.13.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.12.2
+        version: 2.13.2
 - !ruby/object:Gem::Dependency
-  name: papercraft
+  name: p2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: qeweney
   requirement: !ruby/object:Gem::Requirement
@@ -258,7 +258,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.8
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Syntropic Web Framework
 test_files: []