spikard 0.8.3 → 0.10.2

data/vendor/crates/spikard-rb/src/server.rs

@@ -119,17 +119,26 @@ pub fn run_server(
             }
         };
 
-        let ruby_handler = RubyHandler::new_for_server(
-            ruby,
-            handler_value,
-            route_meta.handler_name.clone(),
-            route_meta.method.clone(),
-            route_meta.path.clone(),
-            json_module,
-            &route,
-        )?;
-
-        routes_with_handlers.push((route, Arc::new(ruby_handler) as Arc<dyn Handler>));
+        // Fast-path: if the route metadata declares a static_response, use StaticResponseHandler
+        if let Some(ref sr_value) = route_meta.static_response {
+            let status = sr_value.get("status").and_then(|v| v.as_u64()).unwrap_or(200) as u16;
+            let body = sr_value.get("body").and_then(|v| v.as_str()).unwrap_or("").to_string();
+            let content_type = sr_value.get("content_type").and_then(|v| v.as_str());
+            let static_handler = spikard_http::StaticResponseHandler::from_parts(status, body, content_type, vec![]);
+            routes_with_handlers.push((route, Arc::new(static_handler) as Arc<dyn Handler>));
+        } else {
+            let ruby_handler = RubyHandler::new_for_server(
+                ruby,
+                handler_value,
+                route_meta.handler_name.clone(),
+                route_meta.method.clone(),
+                route_meta.path.clone(),
+                json_module,
+                &route,
+            )?;
+
+            routes_with_handlers.push((route, Arc::new(ruby_handler) as Arc<dyn Handler>));
+        }
     }
 
     let lifecycle_hooks = if !hooks_value.is_nil() {
@@ -204,9 +213,9 @@ pub fn run_server(
             .ok_or_else(|| Error::new(ruby.exception_arg_error(), "WebSocket handlers must be a Hash"))?;
 
         ws_hash.foreach(|path: String, factory: Value| -> Result<ForEach, Error> {
-            let ws_state = crate::websocket::create_websocket_state(ruby, factory)?;
-
-            ws_endpoints.push((path, ws_state));
+            if let Some(ws_state) = crate::websocket::create_websocket_state(ruby, factory)? {
+                ws_endpoints.push((path, ws_state));
+            }
 
             Ok(ForEach::Continue)
         })?;

data/vendor/crates/spikard-rb/src/testing/client.rs

@@ -127,9 +127,10 @@ impl NativeTestClient {
         let mut route_metadata_vec = Vec::with_capacity(metadata.len());
 
         for meta in metadata.clone() {
-            let handler_value = crate::conversion::fetch_handler(ruby, &handlers_hash, &meta.handler_name)?;
+            crate::validate_route_metadata(ruby, &meta)?;
             let route = Route::from_metadata(meta.clone(), &schema_registry)
                 .map_err(|err| Error::new(ruby.exception_runtime_error(), format!("Failed to build route: {err}")))?;
+            let handler_value = crate::conversion::fetch_handler(ruby, &handlers_hash, &meta.handler_name)?;
 
             let handler = RubyHandler::new(&route, handler_value, json_module)?;
             prepared_routes.push((route, Arc::new(handler.clone()) as Arc<dyn spikard_http::Handler>));
@@ -153,9 +154,9 @@ impl NativeTestClient {
 
             ws_hash.foreach(
                 |path: String, factory: Value| -> Result<magnus::r_hash::ForEach, Error> {
-                    let ws_state = crate::websocket::create_websocket_state(ruby, factory)?;
-
-                    ws_endpoints.push((path, ws_state));
+                    if let Some(ws_state) = crate::websocket::create_websocket_state(ruby, factory)? {
+                        ws_endpoints.push((path, ws_state));
+                    }
 
                     Ok(magnus::r_hash::ForEach::Continue)
                 },

data/vendor/crates/spikard-rb/src/testing/sse.rs

@@ -88,42 +88,7 @@ pub fn sse_stream_from_response(ruby: &Ruby, response: &ResponseSnapshot) -> Res
 
 /// Helper to convert JSON to Ruby object
 fn json_to_ruby(ruby: &Ruby, value: &JsonValue) -> Result<Value, Error> {
-    match value {
-        JsonValue::Null => Ok(ruby.qnil().as_value()),
-        JsonValue::Bool(b) => Ok(if *b {
-            ruby.qtrue().as_value()
-        } else {
-            ruby.qfalse().as_value()
-        }),
-        JsonValue::Number(n) => {
-            if let Some(i) = n.as_i64() {
-                Ok(ruby.integer_from_i64(i).as_value())
-            } else if let Some(u) = n.as_u64() {
-                Ok(ruby.integer_from_i64(u as i64).as_value())
-            } else if let Some(f) = n.as_f64() {
-                Ok(ruby.float_from_f64(f).as_value())
-            } else {
-                Ok(ruby.qnil().as_value())
-            }
-        }
-        JsonValue::String(s) => Ok(ruby.str_new(s).as_value()),
-        JsonValue::Array(arr) => {
-            let ruby_arr = ruby.ary_new();
-            for item in arr {
-                let ruby_val = json_to_ruby(ruby, item)?;
-                ruby_arr.push(ruby_val)?;
-            }
-            Ok(ruby_arr.as_value())
-        }
-        JsonValue::Object(obj) => {
-            let ruby_hash = ruby.hash_new();
-            for (key, val) in obj {
-                let ruby_val = json_to_ruby(ruby, val)?;
-                ruby_hash.aset(ruby.str_new(key), ruby_val)?;
-            }
-            Ok(ruby_hash.as_value())
-        }
-    }
+    crate::conversion::json_to_ruby(ruby, value)
 }
 
 /// Initialize SSE test client bindings

data/vendor/crates/spikard-rb/src/testing/websocket.rs

@@ -11,14 +11,14 @@ use tungstenite::{Message, WebSocket};
 use url::Url;
 
 #[derive(Debug)]
-pub(crate) enum WebSocketIoError {
+pub enum WebSocketIoError {
     Timeout,
     Closed,
     Other(String),
 }
 
 #[derive(Debug)]
-pub(crate) struct WebSocketConnection {
+pub struct WebSocketConnection {
     stream: WebSocket<MaybeTlsStream<TcpStream>>,
 }
 
@@ -547,42 +547,7 @@ fn ruby_to_json(ruby: &Ruby, value: Value) -> Result<JsonValue, Error> {
 
 /// Helper to convert JSON to Ruby object
 fn json_to_ruby(ruby: &Ruby, value: &JsonValue) -> Result<Value, Error> {
-    match value {
-        JsonValue::Null => Ok(ruby.qnil().as_value()),
-        JsonValue::Bool(b) => Ok(if *b {
-            ruby.qtrue().as_value()
-        } else {
-            ruby.qfalse().as_value()
-        }),
-        JsonValue::Number(n) => {
-            if let Some(i) = n.as_i64() {
-                Ok(ruby.integer_from_i64(i).as_value())
-            } else if let Some(u) = n.as_u64() {
-                Ok(ruby.integer_from_i64(u as i64).as_value())
-            } else if let Some(f) = n.as_f64() {
-                Ok(ruby.float_from_f64(f).as_value())
-            } else {
-                Ok(ruby.qnil().as_value())
-            }
-        }
-        JsonValue::String(s) => Ok(ruby.str_new(s).as_value()),
-        JsonValue::Array(arr) => {
-            let ruby_arr = ruby.ary_new();
-            for item in arr {
-                let ruby_val = json_to_ruby(ruby, item)?;
-                ruby_arr.push(ruby_val)?;
-            }
-            Ok(ruby_arr.as_value())
-        }
-        JsonValue::Object(obj) => {
-            let ruby_hash = ruby.hash_new();
-            for (key, val) in obj {
-                let ruby_val = json_to_ruby(ruby, val)?;
-                ruby_hash.aset(ruby.str_new(key), ruby_val)?;
-            }
-            Ok(ruby_hash.as_value())
-        }
-    }
+    crate::conversion::json_to_ruby(ruby, value)
 }
 
 /// Initialize WebSocket test client bindings

data/vendor/crates/spikard-rb/src/websocket.rs

@@ -189,12 +189,11 @@ impl WebSocketHandler for RubyWebSocketHandler {
             return None;
         }
 
-        let result = match reply_rx.await {
-            Ok(result) => result,
-            Err(_) => {
-                error!("Ruby WebSocket handler '{}' response channel closed", self.name);
-                return None;
-            }
+        let result = if let Ok(result) = reply_rx.await {
+            result
+        } else {
+            error!("Ruby WebSocket handler '{}' response channel closed", self.name);
+            return None;
         };
 
         match result {
@@ -220,12 +219,11 @@ impl WebSocketHandler for RubyWebSocketHandler {
                 return;
             }
 
-            let result = match reply_rx.await {
-                Ok(result) => result,
-                Err(_) => {
-                    error!("Ruby WebSocket handler '{}' on_connect channel closed", self.name);
-                    return;
-                }
+            let result = if let Ok(result) = reply_rx.await {
+                result
+            } else {
+                error!("Ruby WebSocket handler '{}' on_connect channel closed", self.name);
+                return;
             };
 
             if let Err(e) = result {
@@ -250,12 +248,11 @@ impl WebSocketHandler for RubyWebSocketHandler {
                 return;
             }
 
-            let result = match reply_rx.await {
-                Ok(result) => result,
-                Err(_) => {
-                    error!("Ruby WebSocket handler '{}' on_disconnect channel closed", self.name);
-                    return;
-                }
+            let result = if let Ok(result) = reply_rx.await {
+                result
+            } else {
+                error!("Ruby WebSocket handler '{}' on_disconnect channel closed", self.name);
+                return;
             };
 
             if let Err(e) = result {
@@ -349,11 +346,13 @@ unsafe impl Sync for RubyWebSocketHandler {}
 /// Create WebSocketState from Ruby handler object
 ///
 /// This function is designed to be called from Ruby to register WebSocket handlers.
+/// Returns None if the factory returns nil (no handler for this endpoint).
 #[allow(dead_code)]
 pub fn create_websocket_state(
     ruby: &magnus::Ruby,
     handler_factory: Value,
-) -> Result<spikard_http::WebSocketState<RubyWebSocketHandler>, magnus::Error> {
+) -> Result<Option<spikard_http::WebSocketState<RubyWebSocketHandler>>, magnus::Error> {
+    // Test the factory with an initial call to check if it returns nil
     let handler_instance: Value = handler_factory.funcall("call", ()).map_err(|e| {
         magnus::Error::new(
             ruby.exception_runtime_error(),
@@ -361,6 +360,11 @@ pub fn create_websocket_state(
         )
     })?;
 
+    // If factory returns nil, skip creating a handler (return None)
+    if handler_instance.is_nil() {
+        return Ok(None);
+    }
+
     let message_schema = handler_instance
         .funcall::<_, _, Value>("instance_variable_get", (ruby.to_symbol("@_message_schema"),))
         .ok()
@@ -383,6 +387,8 @@ pub fn create_websocket_state(
             }
         });
 
+    let (message_schema, response_schema) = (message_schema, response_schema);
+
     let handler_factory = Opaque::from(handler_factory);
     let (factory_tx, factory_rx) = mpsc::channel();
 
@@ -415,13 +421,15 @@ pub fn create_websocket_state(
         }
     };
 
-    if message_schema.is_some() || response_schema.is_some() {
+    let ws_state = if message_schema.is_some() || response_schema.is_some() {
         spikard_http::WebSocketState::with_factory(handler_builder, message_schema, response_schema)
-            .map_err(|e| magnus::Error::new(ruby.exception_runtime_error(), e))
+            .map_err(|e| magnus::Error::new(ruby.exception_runtime_error(), e))?
     } else {
         spikard_http::WebSocketState::with_factory(handler_builder, None, None)
-            .map_err(|e| magnus::Error::new(ruby.exception_runtime_error(), e))
-    }
+            .map_err(|e| magnus::Error::new(ruby.exception_runtime_error(), e))?
+    };
+
+    Ok(Some(ws_state))
 }
 
 fn websocket_factory_worker_loop(
@@ -447,6 +455,7 @@ fn websocket_factory_worker_loop(
                     let handler_instance: Value = factory_value
                         .funcall("call", ())
                         .map_err(|e| format!("Failed to create WebSocket handler: {}", e))?;
+
                     RubyWebSocketHandler::from_handler(ruby, handler_instance).map_err(|e| e.to_string())
                 })();
                 let _ = reply.send(result);

data/vendor/crates/spikard-rb-macros/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "spikard-rb-macros"
-version = "0.8.3"
+version = "0.10.2"
 edition = "2024"
 license = "MIT"
 publish = false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spikard
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.10.2
 platform: ruby
 authors:
 - Na'aman Hirschfeld
@@ -83,8 +83,6 @@ files:
 - lib/spikard/version.rb
 - lib/spikard/websocket.rb
 - sig/spikard.rbs
-- vendor/bundle/ruby/3.4.0/gems/diff-lcs-1.6.2/mise.toml
-- vendor/bundle/ruby/3.4.0/gems/rake-compiler-dock-1.10.0/build/buildkitd.toml
 - vendor/crates/spikard-bindings-shared/Cargo.toml
 - vendor/crates/spikard-bindings-shared/examples/config_extraction.rs
 - vendor/crates/spikard-bindings-shared/src/config_extractor.rs
@@ -93,16 +91,20 @@ files:
 - vendor/crates/spikard-bindings-shared/src/error_response.rs
 - vendor/crates/spikard-bindings-shared/src/grpc_metadata.rs
 - vendor/crates/spikard-bindings-shared/src/handler_base.rs
+- vendor/crates/spikard-bindings-shared/src/json_conversion.rs
+- vendor/crates/spikard-bindings-shared/src/lazy_cache.rs
 - vendor/crates/spikard-bindings-shared/src/lib.rs
 - vendor/crates/spikard-bindings-shared/src/lifecycle_base.rs
 - vendor/crates/spikard-bindings-shared/src/lifecycle_executor.rs
 - vendor/crates/spikard-bindings-shared/src/response_builder.rs
+- vendor/crates/spikard-bindings-shared/src/response_interpreter.rs
 - vendor/crates/spikard-bindings-shared/src/test_client_base.rs
 - vendor/crates/spikard-bindings-shared/src/validation_helpers.rs
-- vendor/crates/spikard-bindings-shared/tests/comprehensive_coverage.rs
 - vendor/crates/spikard-bindings-shared/tests/config_extractor_behavior.rs
 - vendor/crates/spikard-bindings-shared/tests/error_response_edge_cases.rs
+- vendor/crates/spikard-bindings-shared/tests/full_coverage.rs
 - vendor/crates/spikard-bindings-shared/tests/handler_base_integration.rs
+- vendor/crates/spikard-bindings-shared/tests/integration_tests.rs
 - vendor/crates/spikard-core/Cargo.toml
 - vendor/crates/spikard-core/src/bindings/mod.rs
 - vendor/crates/spikard-core/src/bindings/response.rs
@@ -148,6 +150,7 @@ files:
 - vendor/crates/spikard-http/src/cors.rs
 - vendor/crates/spikard-http/src/debug.rs
 - vendor/crates/spikard-http/src/di_handler.rs
+- vendor/crates/spikard-http/src/grpc/framing.rs
 - vendor/crates/spikard-http/src/grpc/handler.rs
 - vendor/crates/spikard-http/src/grpc/mod.rs
 - vendor/crates/spikard-http/src/grpc/service.rs
@@ -173,6 +176,7 @@ files:
 - vendor/crates/spikard-http/src/openapi/spec_generation.rs
 - vendor/crates/spikard-http/src/query_parser.rs
 - vendor/crates/spikard-http/src/response.rs
+- vendor/crates/spikard-http/src/server/fast_router.rs
 - vendor/crates/spikard-http/src/server/grpc_routing.rs
 - vendor/crates/spikard-http/src/server/handler.rs
 - vendor/crates/spikard-http/src/server/lifecycle_execution.rs
@@ -194,10 +198,13 @@ files:
 - vendor/crates/spikard-http/tests/di_handler_error_responses.rs
 - vendor/crates/spikard-http/tests/di_integration.rs
 - vendor/crates/spikard-http/tests/doc_snippets.rs
+- vendor/crates/spikard-http/tests/grpc_bidirectional_streaming.rs
+- vendor/crates/spikard-http/tests/grpc_client_streaming.rs
 - vendor/crates/spikard-http/tests/grpc_error_handling_test.rs
 - vendor/crates/spikard-http/tests/grpc_integration_test.rs
 - vendor/crates/spikard-http/tests/grpc_metadata_test.rs
 - vendor/crates/spikard-http/tests/grpc_server_integration.rs
+- vendor/crates/spikard-http/tests/grpc_server_streaming.rs
 - vendor/crates/spikard-http/tests/lifecycle_execution.rs
 - vendor/crates/spikard-http/tests/middleware_stack_integration.rs
 - vendor/crates/spikard-http/tests/multipart_behavior.rs
@@ -271,6 +278,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version
       version: 3.2.0
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '5.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/vendor/bundle/ruby/3.4.0/gems/diff-lcs-1.6.2/mise.toml

@@ -1,5 +0,0 @@
-[tools]
-ruby = "3.4"
-
-[env]
-MAINTENANCE = "true"

data/vendor/bundle/ruby/3.4.0/gems/rake-compiler-dock-1.10.0/build/buildkitd.toml

@@ -1,2 +0,0 @@
-[worker.oci]
-  gc = false