itsi 0.1.7 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88879d13925e0738ba948eb707096da6e8b039cb317ce0975333295550725c70
-  data.tar.gz: 0eaf0dc170f15efb83428313c7b2554f1e19fe8c9dc81a8c5c4d553a03b586cd
+  metadata.gz: 1460c8777e3f299290c6d10307a4c7cb067072df254356809c0bc526651fec38
+  data.tar.gz: e281d697d91b546a2bb3fd5e86ebb24e78290adca4e6c062814abe10986ba062
 SHA512:
-  metadata.gz: e37c041ee042a7d7e69f4f577864e08890aa3bb9fe855c292fc95950c9fc682d5afa0e2e74fc4bd5fb9c5cb7f60733e6e5fcf250f205742c6caec32a23399c68
-  data.tar.gz: d7c9cdd9bcde2a58192798e601a8b5a3099a76b9e924d4b58e206c11a3f015b094a0d975f4f87fd5338e3cfd05f46cd3f4684f59fb140643be85e8452be84195
+  metadata.gz: bd2609517aa8c8f194ee98d607b417f87f07e243e8aad9fc0724479323d6799f9503c0e0fbebb6d60068a6a49b7ba2f5748e8b3957220f937f81e4e9edc968f5
+  data.tar.gz: 41be786e0b598d1030eba579d38a8ae32acee9f1caf7b3bf052cb0358ad981fcbce2e1d1247cfbdbffef6333f0186bafe67f0731bb333db0f1674b868292f305

data/Rakefile

@@ -58,6 +58,7 @@ task :sync_crates do
     Dir.chdir('crates') do
       to_sync = Dir['*'].each do |to_sync|
         system("rsync -q -av #{to_sync}/ ../#{gem_info[:dir]}/ext/#{to_sync} --delete")
+        system("cp ../Cargo.lock ../#{gem_info[:dir]}/Cargo.lock")
       end
     end
   end
@@ -74,3 +75,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"),
         }
     }
 }