itsi 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43c8c15592c8e8e749938e5c5c4b5e481ba3ea88d82bac63059a612e35bf2213
-  data.tar.gz: e57ab7eacc32f7a0ac702be2e15ac9a36d48aff27aaa3705f77c428df2acf0f8
+  metadata.gz: 6963234dfc04b727baa4c6c9bbb2760040091de0f685e0b5412ff272a27463fc
+  data.tar.gz: 78a28fb8d43775141e8d27e05aec9ee345493065e6820b3a4301509712e21007
 SHA512:
-  metadata.gz: 1ea20d0e8d9d82cb4b095674192ead9837334c5472761cce1dc093d43d829c2d71ecb74d06a667f4c8274607791bd1cd1ad12f005bf1bc8a3fa5179499a61d8f
-  data.tar.gz: c1aa8a84ebd694f3f39d287fd67e320c69f89dd35315af3203e09259c500404825790e925abd8b9a6ee26d5a97638a1d7442a9bb369653398922a42a08742498
+  metadata.gz: 2a003e7e28a989c2566b53b03d5289267fcbf8038899d89edf8909dec50367fd62682a820b0825368b8a017f24330ecc9d1e75e24ce746750feddc54763e6e1f
+  data.tar.gz: efd97ee4f193fd8303b382b03d0bde8f60456b4f722c925cf8178af35e847af5d4fe01f5f44f89c3dcfbd5e68082f25210d90cac408ff3d7e41c4fec805837be

data/Cargo.lock

@@ -398,6 +398,27 @@ dependencies = [
  "unicode-xid",
 ]
 
+[[package]]
+name = "dirs"
+version = "6.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e"
+dependencies = [
+ "dirs-sys",
+]
+
+[[package]]
+name = "dirs-sys"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab"
+dependencies = [
+ "libc",
+ "option-ext",
+ "redox_users",
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "displaydoc"
 version = "0.2.5"
@@ -989,6 +1010,7 @@ dependencies = [
  "bytes",
  "crossbeam",
  "derive_more",
+ "dirs",
  "fs2",
  "futures",
  "http",
@@ -1106,6 +1128,16 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "libredox"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+dependencies = [
+ "bitflags",
+ "libc",
+]
+
 [[package]]
 name = "linux-raw-sys"
 version = "0.4.15"
@@ -1321,6 +1353,12 @@ version = "1.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e"
 
+[[package]]
+name = "option-ext"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
+
 [[package]]
 name = "overload"
 version = "0.1.1"
@@ -1608,6 +1646,17 @@ dependencies = [
  "bitflags",
 ]
 
+[[package]]
+name = "redox_users"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd6f9d3d47bdd2ad6945c5015a226ec6155d0bcdfd8f7cd29f86b71f8de99d2b"
+dependencies = [
+ "getrandom 0.2.15",
+ "libredox",
+ "thiserror 2.0.11",
+]
+
 [[package]]
 name = "regex"
 version = "1.11.1"

data/Rakefile

@@ -74,3 +74,23 @@ task :build_all do
     end
   end
 end
+
+task :test_env_up do
+  system("terraform -chdir=sandbox/deploy apply")
+end
+
+task :test_env_down do
+  system("terraform -chdir=sandbox/deploy destroy")
+end
+
+%i[itsi puma iodine falcon unicorn].each do |server|
+  namespace server do
+    %i[hanami roda async rack rack_lint rails sinatra].each do |sandbox|
+      namespace sandbox do
+        task :serve do |args|
+          sh "(cd sandbox/itsi_sandbox_#{sandbox} && bundle exec #{server} #{ARGV[2..]&.join(" ")} )"
+        end
+      end
+    end
+  end
+end

data/crates/itsi_error/src/from.rs

@@ -1,5 +1,12 @@
+use magnus::{
+    Error,
+    error::ErrorType,
+    exception::{self, arg_error, exception},
+};
+use nix::errno::Errno;
+
 use crate::ItsiError;
-use std::ffi::NulError;
+use std::{ffi::NulError, io};
 
 pub static CLIENT_CONNECTION_CLOSED: &str = "Client disconnected";
 
@@ -9,14 +16,14 @@ impl From<httparse::Error> for ItsiError {
     }
 }
 
-impl From<nix::errno::Errno> for ItsiError {
-    fn from(err: nix::errno::Errno) -> Self {
+impl From<Errno> for ItsiError {
+    fn from(err: Errno) -> Self {
         ItsiError::ArgumentError(err.to_string())
     }
 }
 
-impl From<std::io::Error> for ItsiError {
-    fn from(err: std::io::Error) -> Self {
+impl From<io::Error> for ItsiError {
+    fn from(err: io::Error) -> Self {
         ItsiError::ArgumentError(err.to_string())
     }
 }
@@ -33,39 +40,29 @@ impl From<NulError> for ItsiError {
     }
 }
 
-impl From<magnus::Error> for ItsiError {
-    fn from(err: magnus::Error) -> Self {
+impl From<Error> for ItsiError {
+    fn from(err: Error) -> Self {
         match err.error_type() {
-            magnus::error::ErrorType::Jump(tag) => ItsiError::Jump(tag.to_string()),
-            magnus::error::ErrorType::Error(_exception_class, cow) => {
-                ItsiError::ArgumentError(cow.to_string())
-            }
-            magnus::error::ErrorType::Exception(exception) => {
-                ItsiError::ArgumentError(exception.to_string())
-            }
+            ErrorType::Jump(tag) => ItsiError::Jump(tag.to_string()),
+            ErrorType::Error(_exception_class, cow) => ItsiError::ArgumentError(cow.to_string()),
+            ErrorType::Exception(exception) => ItsiError::ArgumentError(exception.to_string()),
         }
     }
 }
 
-impl From<ItsiError> for magnus::Error {
+impl From<ItsiError> for Error {
     fn from(err: ItsiError) -> Self {
         match err {
-            ItsiError::InvalidInput(msg) => magnus::Error::new(magnus::exception::arg_error(), msg),
-            ItsiError::InternalServerError(msg) => {
-                magnus::Error::new(magnus::exception::exception(), msg)
-            }
-            ItsiError::UnsupportedProtocol(msg) => {
-                magnus::Error::new(magnus::exception::arg_error(), msg)
-            }
-            ItsiError::ArgumentError(msg) => {
-                magnus::Error::new(magnus::exception::arg_error(), msg)
-            }
-            ItsiError::Jump(msg) => magnus::Error::new(magnus::exception::local_jump_error(), msg),
-            ItsiError::Break() => magnus::Error::new(magnus::exception::interrupt(), "Break"),
+            ItsiError::InvalidInput(msg) => Error::new(arg_error(), msg),
+            ItsiError::InternalServerError(msg) => Error::new(exception(), msg),
+            ItsiError::UnsupportedProtocol(msg) => Error::new(arg_error(), msg),
+            ItsiError::ArgumentError(msg) => Error::new(arg_error(), msg),
+            ItsiError::Jump(msg) => Error::new(exception::local_jump_error(), msg),
+            ItsiError::Break() => Error::new(exception::interrupt(), "Break"),
             ItsiError::ClientConnectionClosed => {
-                magnus::Error::new(magnus::exception::eof_error(), CLIENT_CONNECTION_CLOSED)
+                Error::new(exception::eof_error(), CLIENT_CONNECTION_CLOSED)
             }
-            ItsiError::Pass() => magnus::Error::new(magnus::exception::interrupt(), "Pass"),
+            ItsiError::Pass() => Error::new(exception::interrupt(), "Pass"),
         }
     }
 }

data/crates/itsi_error/src/lib.rs

@@ -3,7 +3,7 @@ use thiserror::Error;
 
 pub type Result<T> = std::result::Result<T, ItsiError>;
 
-#[derive(Error, Debug)]
+#[derive(Error, Debug, Clone)]
 pub enum ItsiError {
     #[error("Invalid input {0}")]
     InvalidInput(String),