itsi 0.1.7 → 0.1.8

data/gems/server/Cargo.toml

@@ -0,0 +1,7 @@
+# This Cargo.toml is here to let externals tools (IDEs, etc.) know that this is
+# a Rust project. Your extensions dependencies should be added to the Cargo.toml
+# in the ext/ directory.
+
+[workspace]
+members = ["./ext/itsi_server"]
+resolver = "2"

data/gems/server/ext/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"),
         }
     }
 }