zapp 0.2.3 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6376583c1f6aa2986cd05bde3acb428b17e1eda1a7ef5a9e4369f8cc36edbb49
-  data.tar.gz: d291eb685e58724ec9a0f60805cab4dde979c602eff5666cb566cae894b91d44
+  metadata.gz: 6e94e39ad73864691347e3eac33c5e28b4d08e62fdbc18bfa9f1c5fa72000ef3
+  data.tar.gz: f78eadb3fe3f7368121082a5d3fc4449de5d39fba61a3ddb6e39f638c6baded9
 SHA512:
-  metadata.gz: 83e9d90b28c8bd661609e6f13e0bbb38ee7d96ae22482ac7490aaa1ccd752581770ad6a07963696c296b8c5ab02d3d4eafc748d1e58bce3d02817df9a4fd1f57
-  data.tar.gz: 1695771a852412c68aee27843d3d74fb2cd081da8897c0d2b09eb4d19a0aedb77f308271d07ca1dc0cc2561885eec046609fb06ef70febb20ea361fa4d19b4e9
+  metadata.gz: 625301dd7456472bb96afc272bdff5e5d7295e95b8e6e17bf5a1d91dc82eda8af0d96bd009d42407e957b27a84a6ee49c319a3b1b273dfe8c92bea4c42a9fe82
+  data.tar.gz: 43e2b8ad39bc78660d94b5ef1ca09258f8fdf076a6cd571793225e9dd3880831eb50ab8a0c036068220dfe83bb061ce0da08a9ceb2a6244fcba218520e99dde2

data/lib/zapp/http_context/request.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require("webrick")
-
 module Zapp
   module HTTPContext
     # Represents an HTTP Request to be processed by a worker

data/lib/zapp/pipe.rb

@@ -2,9 +2,23 @@
 
 module Zapp
   # Light wrapper around a Ractor for piping messages CSP style
-  module Pipe
+  class Pipe < Ractor
+    def self.for(*klasses, null: true)
+      Ractor.new(klasses, null) do |klasses, null|
+        loop do
+          Ractor.yield(
+            Ractor.receive_if do |msg|
+              return true if null && msg.nil?
+
+              klasses.any? { |klass| msg.is_a?(klass) }
+            end
+          )
+        end
+      end
+    end
+
     def self.new
-      Ractor.new do
+      super do
         loop do
           Ractor.yield(Ractor.receive)
         end

data/lib/zapp/server.rb

@@ -6,8 +6,11 @@ module Zapp
     attr_reader(:worker_pool, :socket_pipe_receiver)
 
     def initialize
-      @socket_pipe = Zapp::Pipe.new
-      @context_pipe = Zapp::Pipe.new
+      # Ensure config.ru file is loaded just once by main ractor
+      Zapp.config.app
+
+      @socket_pipe = Zapp::Pipe.for(TCPSocket)
+      @context_pipe = Zapp::Pipe.for(Zapp::HTTPContext::Context, Symbol)
 
       @socket_pipe_receiver = Zapp::SocketPipe::Receiver.new(pipe: @socket_pipe)
 

data/lib/zapp/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Zapp
-  VERSION = "0.2.3"
+  VERSION = "0.2.6"
 end

data/lib/zapp/worker/request_processor.rb

@@ -13,11 +13,16 @@ module Zapp
 
       def loop
         while (context = context_pipe.take)
-          if context == Zapp::WorkerPool::SIGNALS[:EXIT]
-            Zapp::Logger.trace("Received exit signal, shutting down")
-            shutdown
-            break
+          if context.is_a?(Symbol)
+            if context == Zapp::WorkerPool::SIGNALS[:EXIT]
+              Zapp::Logger.trace("Received exit signal, shutting down")
+              shutdown
+              break
+            else
+              next
+            end
           end
+          
 
           process = lambda {
             process(context: context)

data/lib/zapp/worker.rb

@@ -15,6 +15,8 @@ module Zapp
         ) do |context_pipe, socket_pipe, config|
           Ractor.current[Zapp::RACTOR_CONFIG_KEY] = config
 
+          Zapp.config.app.prepare if Zapp.config.app.respond_to?(:prepare)
+
           processor = Zapp::Worker::RequestProcessor.new(
             socket_pipe: socket_pipe,
             context_pipe: context_pipe

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zapp
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.6
 platform: ruby
 authors:
 - Mathias H Steffensen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-11 00:00:00.000000000 Z
+date: 2022-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack