adelnor 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd3a506fee52615e09d8aed4c85bea4a9dfdc58567a373b40b5960d903dc621f
-  data.tar.gz: b69d40e33b17d24932f6feee996116c785660e9519b9062a95de258bca85d0b7
+  metadata.gz: 5bbe7f5e96936b78536738d717ea5babeb525aec4ecc202774e6564095d21663
+  data.tar.gz: 8da6cf7523a6d8f5d520fe6eb1c8e02320b53e79f631b0e36d0401a29f093f47
 SHA512:
-  metadata.gz: f2f5ea6b2e64cdb6f9f5447a7590d73fa5bcb1b251b3e438b56bd9bc44a8112a9dc95bbf8492a871f29c61c4dc15b6604673517a3d06035d1234fbcedbfec8e0
-  data.tar.gz: 99c4805e7b08d6948021d03fdee3c5c9dd311485e2d2bfde2c773241cfb900ce548fe8a5297044ecd9fbc43a3abc06faca0862fc626af620278740a16874a8ec
+  metadata.gz: b46502cfb371089998df7cf3d98221224df23ebb77cfd6f368d9d3b21df8ef8244a8cde14207c8b511146011fcd6766498483288ade45f263fdb00b4c7ed3927
+  data.tar.gz: d7fdfbe381e3c56c4c6bfdc7109afdd10ee9bd05c7d95d5da012fe671f3b547763a3bb916e519c2228038a1a6be7c473236c5bb623662e0ff7b8f7672209349b

data/README.md

@@ -7,12 +7,13 @@
 ![Build](https://github.com/leandronsp/adelnor/actions/workflows/build.yml/badge.svg)
 [![Ruby Style Guide](https://img.shields.io/badge/code_style-rubocop-brightgreen.svg)](https://github.com/rubocop/rubocop)
 [![Ruby Style Guide](https://img.shields.io/badge/code_style-community-brightgreen.svg)](https://rubystyle.guide)
-```            .___     .__
-_____     __| _/____ |  |   ____   ___________
-\__  \   / __ |/ __ \|  |  /    \ /  _ \_  __ \
- / __ \_/ /_/ \  ___/|  |_|   |  (  <_> )  | \/
-(____  /\____ |\___  >____/___|  /\____/|__|
-     \/      \/    \/          \/
+```
+     ___       _______   _______  __      .__   __.   ______   .______      
+    /   \     |       \ |   ____||  |     |  \ |  |  /  __  \  |   _  \     
+   /  ^  \    |  .--.  ||  |__   |  |     |   \|  | |  |  |  | |  |_)  |    
+  /  /_\  \   |  |  |  ||   __|  |  |     |  . `  | |  |  |  | |      /     
+ /  _____  \  |  '--'  ||  |____ |  `----.|  |\   | |  `--'  | |  |\  \----.
+/__/     \__\ |_______/ |_______||_______||__| \__|  \______/  | _| `._____|
 ```
 
 [adelnor](https://rubygems.org/gems/adelnor) is a dead simple, yet Rack-compatible, HTTP server written in Ruby.
@@ -56,4 +57,16 @@ $ make bundle.install
 $ make sample.server
 ```
 
+## Using Thread Pool
+
+```ruby
+require './lib/adelnor/server'
+
+app = -> (env) do
+  [200, { 'Content-Type' => 'text/html' }, 'Hello world!']
+end
+
+Adelnor::Server.run app, 3000, thread_pool: 5
+```
+
 Open `http://localhost:3000`

data/adelnor.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name        = 'adelnor'
-  spec.version     = '0.0.6'
+  spec.version     = '0.0.7'
   spec.summary     = 'Adelnor HTTP server'
   spec.description = 'A dead simple, yet Rack-compatible, HTTP server written in Ruby'
   spec.authors     = ['Leandro Proença']

data/lib/adelnor/request.rb

@@ -21,6 +21,8 @@ module Adelnor
       lines    = @message.split(/\r\n/)
       headline = lines.shift
 
+      return self unless headline
+
       parse_headline!(headline)
       parse_headers!(lines)
 

data/lib/adelnor/response.rb

@@ -19,6 +19,6 @@ module Adelnor
     private
 
     def headers_as_string                    = @headers.reduce('', &method(:acc_header_string))
-    def acc_header_string(acc, (key, value)) = acc += "#{key}: #{value}\r\n"
+    def acc_header_string(acc, (key, value)) = acc + "#{key}: #{value}\r\n"
   end
 end

data/lib/adelnor/server.rb

@@ -9,15 +9,17 @@ require_relative './response'
 
 module Adelnor
   class Server
-    def initialize(rack_app, port)
+    def initialize(rack_app, port, options = {})
       @rack_app = rack_app
       @port     = port
+      @options  = options
       @socket   = Socket.new(:INET, :STREAM)
       addr      = Socket.sockaddr_in(@port, '0.0.0.0')
 
       @socket.bind(addr)
       @socket.listen(2)
 
+      @thread_queue = Queue.new if @options[:thread_pool]
       puts welcome_message
     end
 
@@ -39,15 +41,44 @@ module Adelnor
     end
 
     def run
+      if (pool_size = @options[:thread_pool])
+        return run_with_thread_pool(pool_size)
+      end
+
       loop do
         client, = @socket.accept
 
         handle(client)
-
         client.close
       end
     end
 
+    def run_with_thread_pool(pool_size)
+      pool_size.times do
+        handle_request_in_thread
+      end
+
+      loop do
+        client, = @socket.accept
+
+        @thread_queue.push(client)
+      end
+    end
+
+    def handle_request_in_thread
+      Thread.new do
+        tid = Thread.current.object_id
+
+        puts "[#{tid}] Thread started"
+        loop do
+          client = @thread_queue.pop
+
+          handle(client)
+          client.close
+        end
+      end
+    end
+
     def handle(client)
       read_request_message(client)
         .then { |message|  Request.build(message) }
@@ -61,9 +92,11 @@ module Adelnor
     def read_request_message(client)
       message = ''
 
-      message += client.gets
-      puts
-      puts "[#{Time.now}] #{message}"
+      if (line = client.gets)
+        message += line
+      end
+
+      puts "\n[#{Time.now}] #{message}"
 
       while (line = client.gets)
         break if line == "\r\n"
@@ -75,6 +108,8 @@ module Adelnor
     end
 
     def welcome_message
+      thread_pool_message = "Running with thread pool of #{@options[:thread_pool]} threads" if @options[:thread_pool]
+
       <<~WELCOME
         |\---/|
         | o_o |
@@ -86,6 +121,8 @@ module Adelnor
 
         Adelnor is running at http://0.0.0.0:#{@port}
         Listening to HTTP connections
+
+        #{thread_pool_message}
       WELCOME
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adelnor
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Leandro Proença
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-22 00:00:00.000000000 Z
+date: 2023-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -43,7 +43,7 @@ homepage: https://github.com/leandronsp/adelnor
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -58,8 +58,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: Adelnor HTTP server
 test_files: []