tp2 0.12.1 → 0.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3910c008920d3d999004eb2f745eb9e253d9f889b69f4f3ef4e089b8586ded9
-  data.tar.gz: f1fc92d720aee80f162abddab2f242c767c051a1b322ec5c6fa89636529ea09a
+  metadata.gz: c777bde9e52cf4fe6c2c9e8a211c2dac8ad25b27af708c8fc1d8164dd93726f6
+  data.tar.gz: a02ccf0474c33ab05d0f28e5cc4207be87f1f31f7b497bacc8e5bd9850ad0f9c
 SHA512:
-  metadata.gz: bfd04d4b191866edfc90261eca88496f3a55d2031929fa098711c15d62ea5cf2be439641b90a1c64363a529ec81e2cfe800bf61cc4633a8743e5e5ad272bf1ea
-  data.tar.gz: f8776527a61fab01336450aa9daf868459158399af9987819b3deeec13eea8db573e5492685e87348414d6856cc016ad5ae9ca7f966bcf2d8212799e27f78d33
+  metadata.gz: 8ed620d060ee68cad93b03f9953ad5272544b9a4901291e7becb807c3997e3993f4df06629c4b9314797286a97be7e40aa9d8a64f77cd8ed87c7ab50e485a76c
+  data.tar.gz: 7b589adc0f17a09d5fa8ee99f81c52a66521704a4cdfbbad6e9dbf1b8ba4be51a83b2a1a842cadea7082ff3c6157ff6557816e9506eb2af0bd1bea361dddd8fa

data/.rubocop.yml

@@ -61,10 +61,8 @@ Layout/HashAlignment:
   EnforcedColonStyle: table
   EnforcedHashRocketStyle: table
 
-# Naming/AccessorMethodName:
-#   Exclude:
-#     - lib/polyphony/extensions/fiber.rb
-#     - examples/**/*.rb
+Naming/AccessorMethodName:
+  Enabled: false
 
 # Naming/MethodName:
 #   Exclude:

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# Version 0.12.3 2025-06-25
+
+- Fix logging of simple strings
+
+# Version 0.12.2 2025-06-24
+
+- Make banner pluggable
+
 # Version 0.12.1 2025-06-24
 
 - Allow passing machine to `TP2.run`

data/bin/tp2

@@ -5,7 +5,7 @@ require 'tp2'
 require 'optparse'
 
 opts = {
-  banner: true,
+  banner: TP2::BANNER,
   logger: true
 }
 

data/lib/tp2/logger.rb

@@ -17,14 +17,25 @@ module TP2
       @machine.write_async(@fd, str)
     end
 
-    def call(request, _response_headers)
-      if request.is_a?(Exception)
-        e = request
-        log("Error: #{e.inspect}: #{e.backtrace.inspect}")
-        return
+    def call(o, _response_headers = nil)
+      log(format_log_line(o))
+    end
+
+    def format_log_line(o)
+      case o
+      when Exception
+        format_error_log_line(o)
+      when Qeweney::Request
+        format_request_log_line(o)
+      when String
+        o
+      else
+        o.to_s
       end
+    end
 
-      log(format_request_log_line(request))
+    def format_error_log_line(err)
+      "Error: #{err.inspect}: #{err.backtrace.inspect}"
     end
 
     def format_request_log_line(request)

data/lib/tp2/server.rb

@@ -10,14 +10,14 @@ module TP2
     PENDING_REQUESTS_TIMEOUT_PERIOD = 5
 
     def self.rack_app(opts)
-      raise "Missing app location" if !opts[:app_location]
+      raise 'Missing app location' if !opts[:app_location]
 
       TP2::RackAdapter.load(opts[:app_location])
     end
 
-    def self.tp2_app(machine, opts)
+    def self.tp2_app(_machine, opts)
       if opts[:app_location]
-        opts[:log]&.log("Loading app at #{opts[:app_location]}")
+        opts[:logger]&.call("Loading app at #{opts[:app_location]}")
         require opts[:app_location]
 
         opts.merge!(TP2.config)
@@ -25,9 +25,7 @@ module TP2
       opts[:app]
     end
 
-    def self.static_app(opts)
-    end
-
+    def self.static_app(opts); end
 
     def initialize(machine, opts, &app)
       @machine = machine
@@ -49,7 +47,7 @@ module TP2
         raise "Invalid app type #{@opts[:app_type].inspect}"
       end
     end
-  
+
     def run
       setup
       @machine.join(*@accept_fibers)
@@ -66,9 +64,9 @@ module TP2
         @server_fds << fd
         @accept_fibers << @machine.spin { accept_incoming(fd) }
       end
-      bind_string = bind_info.map { it.join(':') }.join(", ")
-      @opts[:log]&.log("Listening on #{bind_string}")
-      
+      bind_string = bind_info.map { it.join(':') }.join(', ')
+      @opts[:logger]&.call("Listening on #{bind_string}")
+
       # map fibers
       @connection_fiber_map = {}
     end
@@ -123,7 +121,7 @@ module TP2
     end
 
     def graceful_shutdown
-      @opts[:log]&.log("Shutting down gracefully...")
+      @opts[:logger]&.call('Shutting down gracefully...')
 
       # stop listening
       close_all_server_fds
@@ -142,7 +140,7 @@ module TP2
 
       @machine.timeout(PENDING_REQUESTS_TIMEOUT_PERIOD, UM::Terminate) do
         @machine.join(*@connection_fiber_map.keys)
-    rescue UM::Terminate
+      rescue UM::Terminate
         # timeout on waiting for adapters to finish running, do nothing
       end
     end

data/lib/tp2/version.rb

@@ -1,3 +1,3 @@
 module TP2
-  VERSION = '0.12.1'
+  VERSION = '0.12.3'
 end

data/lib/tp2.rb

@@ -36,7 +36,7 @@ module TP2
         @in_run = true
         machine = opts[:machine] || UM.new
 
-        machine.puts(TP2::BANNER) if opts[:banner]
+        machine.puts(opts[:banner]) if opts[:banner]
         opts[:logger] = opts[:logger] && TP2::Logger.new(machine, **opts)
 
         server = Server.new(machine, opts, &app)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tp2
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.12.3
 platform: ruby
 authors:
 - Sharon Rosner