syntropy 0.9.1 → 0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac20c68dfab62e2aab24c48477bf6fb456430385e9035c21365f025b3f766881
-  data.tar.gz: 65991a442dc9b19e6f5bc3a6806de65f9fcc57cc82c4b1e20b2f4988ed76daa1
+  metadata.gz: 5a73932b30656f39aa80ecfdd0161a04bb6aff7d0895d24c092d89422bc5cebe
+  data.tar.gz: 07266a98667a5a9b45756d25a79abc0143f7f99f786fa8fde1e2a5d58f237392
 SHA512:
-  metadata.gz: a1a30fbaa0a19a74b3828f8d840eef418da25f3ac74be36e38a9f3f7d4e3f9de4cb8e14ef806a27cff08986923c07f0dc7969ac70e6cb19c7f27bb1471fa69ee
-  data.tar.gz: 91c8b4a5fe6ccef0241744163bd04294a62e50cae79e564f99b37a40c68075507436ae07c62a3539a89977a4f9980b53e140d28e51b2f4ceb5340bee925f5e1d
+  metadata.gz: e84b35bff3fd83e038488aa581710c79dd23adaa11777cdb2872fc06562f3e79e2ce000afd270677feaead75cff90a07a8e88f312b4fae4fcd4772cfa3b3c228
+  data.tar.gz: b8788e723ca3108c78e65bcd445fa91184e0835f602b1fdb46bf06add11681e61cc1429f6e9f72f415bc33b1b80e9dc7e56587881c02401e0e5ecde5d0551714

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.10 2025-08-10
+
+- Add query, execute methods to ConnectionPool
+- Switch from Papercraft to P2
+
+## 0.9.2 2025-07-24
+
+- Fix logging
+
 ## 0.9.1 2025-07-08
 
 - Update TP2

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/TODO.md

@@ -1,3 +1,5 @@
+- a way to inject cookies into the response
+
 - add support for applets
 
   - can be implemented as separate gems

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'
@@ -45,7 +45,9 @@ module Syntropy
         # we do startup stuff asynchronously, in order to first let TP2 do its
         # setup tasks
         @machine.sleep 0.15
-        @opts[:logger]&.call("Serving from #{File.expand_path(@location)}")
+        @opts[:logger]&.info(
+          message: "Serving from #{File.expand_path(@location)}"
+        )
         @router.start_file_watcher if opts[:watch_files]
       end
     end
@@ -137,15 +139,19 @@ 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]&.call("Error while loading module #{ref}: #{e.message}")
+      @opts[:logger]&.error(
+        message:  "Error while loading module #{ref}",
+        error:    e
+      )
       :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] }
@@ -160,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__
@@ -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/router.rb

@@ -26,7 +26,9 @@ module Syntropy
     end
 
     def start_file_watcher
-      @opts[:logger]&.call('Watching for file changes...', nil)
+      @opts[:logger]&.info(
+        message: 'Watching for file changes...'
+      )
       @machine.spin { file_watcher_loop }
     end
 
@@ -170,7 +172,9 @@ module Syntropy
     end
 
     def handle_changed_file(event, fn)
-      @opts[:logger]&.call("Detected changed file: #{event} #{fn}")
+      @opts[:logger]&.info(
+        message: "Detected changed file: #{event} #{fn}"
+      )
       @module_loader&.invalidate(fn)
       case event
       when :added

data/lib/syntropy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Syntropy
-  VERSION = '0.9.1'
+  VERSION = '0.10'
 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.1
+  version: '0.10'
 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: []