itsi-server 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09f3db1a1f234effca0f069532c406269afd5d97fd94f2bd84e0897794111c94'
-  data.tar.gz: 9b58b1c27aa1be97ffbcda9f58d7d10773c34ec17ed2f8266f7b4515a1916866
+  metadata.gz: e905bf6be508587ee73d0f537d422cb9dac5649529784b9009d7b206f4e1f338
+  data.tar.gz: 850add0021ebbace5ff48a990ddbef13154355cc9009d09275d9ebf3d11064dd
 SHA512:
-  metadata.gz: 4b0adee39683e6aa6d8fde02c7caeb448924090c85db779cd210ddc01a6b1ded6944604e16b17a9e18cf8833a8565c6473d3761c0015ab13af56570f0b769850
-  data.tar.gz: 2733bfcbb217c88fb2c49f577eb764952551c2c0f6f0be6435505eb55334276367d3ef854bb3aed054f33c192c4c7b5ee02a2ca90d0abf2249b991b1d9a531fd
+  metadata.gz: a0569596062fafb1a7613e6dad2db993c99b9e0bec881eedb068938cba60a4646d0b8cd91ff9b74e2bbb25fb2ec6698e58f566265cb6a89a65d088cffbc66b3d
+  data.tar.gz: 8f0d9a03c1997da8c03752453af45b7732c13dcf44e6c939b7ad010b919052851f411269c6a0b7427ec53c4a1cbf2fd73f0d8a778e5e1ddc715e4c287c009d92

data/Cargo.lock

@@ -1644,7 +1644,7 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "itsi-server"
-version = "0.2.4"
+version = "0.2.5"
 dependencies = [
  "argon2",
  "async-channel",

data/ext/itsi_rb_helpers/src/lib.rs

@@ -159,7 +159,6 @@ where
             eprintln!("Thread killed");
             break;
         }
-        eprintln!("Killing thread {:?}", thr.as_value());
         thr.funcall::<_, _, Value>("terminate", ())
             .expect("Failed to kill thread");
     }

data/ext/itsi_scheduler/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "itsi-scheduler"
-version = "0.2.4"
+version = "0.2.5"
 edition = "2021"
 authors = ["Wouter Coppieters <wc@pico.net.nz>"]
 license = "MIT"

data/ext/itsi_server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "itsi-server"
-version = "0.2.4"
+version = "0.2.5"
 edition = "2021"
 authors = ["Wouter Coppieters <wc@pico.net.nz>"]
 license = "MIT"

data/lib/itsi/server/config/middleware/auth_api_key.rb

@@ -33,12 +33,12 @@ module Itsi
             @params[:key_id_source] = nil
           end
 
-          if File.exist?(".itsi-credentials") && !@params[:credential_file]
-            @params[:credential_file] = ".itsi-credentials"
+          if File.exist?(".itsi-credentials") && !@params[:credentials_file]
+            @params[:credentials_file] = ".itsi-credentials"
           end
 
-          if @params[:credential_file] && File.exist?(@params[:credential_file])
-            @params[:valid_keys] = Passfile.load(@params[:credential_file])
+          if @params[:credentials_file] && File.exist?(@params[:credentials_file])
+            @params[:valid_keys] = Passfile.load(@params[:credentials_file])
           end
 
           unless @params[:valid_keys]&.any?

data/lib/itsi/server/config/middleware/auth_basic.rb

@@ -21,16 +21,18 @@ module Itsi
 
         def initialize(location, params={})
           super
+
           unless @params[:credential_pairs]&.any?
-            if File.exist?(".itsi-credentials") && !@params[:credential_file]
-              @params[:credential_file] = ".itsi-credentials"
+            if File.exist?(".itsi-credentials") && !@params[:credentials_file]
+              @params[:credentials_file] = ".itsi-credentials"
             end
 
-            if @params[:credential_file] && File.exist?(@params[:credential_file])
-              @params[:credential_pairs] = Passfile.load(@params[:credential_file])
+            if @params[:credentials_file] && File.exist?(@params[:credentials_file])
+              @params[:credential_pairs] = Passfile.load(@params[:credentials_file])
             end
           end
 
+          raise "No credentials provided" unless @params[:credential_pairs]
           @params[:credential_pairs].compact!
 
           unless @params[:credential_pairs]&.any?

data/lib/itsi/server/config/middleware/static_assets.rb

@@ -63,9 +63,9 @@ module Itsi
           root_dir = @params[:root_dir] || "."
 
           if !File.exist?(root_dir)
-            warn "Warning: static_assets root_dir '#{root_dir}' does not exist!"
+            raise "Warning: static_assets root_dir '#{root_dir}' does not exist!"
           elsif !File.directory?(root_dir)
-            warn "Warning: static_assets root_dir '#{root_dir}' is not a directory!"
+            raise "Warning: static_assets root_dir '#{root_dir}' is not a directory!"
           end
 
           @params[:relative_path] = true unless @params.key?(:relative_path)

data/lib/itsi/server/config/options/_index.md

@@ -18,20 +18,24 @@ For the best development experience, be sure to use [RubyLSP](https://shopify.gi
 
 ```ruby {filename="Itsi.rb"}
 workers 2
+
 threads 2
-scheduler_threads 3
 
 fiber_scheduler true
 
-rate_limiter requests: 100, seconds: 10
+auth_basic realm: "Restricted Area", credentials_file: "./credentials.txt"
+
+auto_reload_config! # Auto-reload the server configuration each time it changes.
 
-auth_basic realm: "Restricted Area", credentials_file: "credentials.txt"
+location "/app*" do
+  rate_limit requests: 3, seconds: 5
+  rackup_file "config.ru"
+end
 
-location "/app" do
+location "/inline*" do
   get "/" do |req|
     req.ok "Hello, World!"
   end
 end
-
 ```
 {{< /details >}}

data/lib/itsi/server/version.rb

@@ -2,6 +2,6 @@
 
 module Itsi
   class Server
-    VERSION = "0.2.4"
+    VERSION = "0.2.5"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: itsi-server
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Wouter Coppieters