fix more

Author: wilsonsilva

examples/rack/app.rb

@@ -8,7 +8,7 @@ def call(env)
       result = handle_single(jsonrpc_request)
       jsonrpc_response(result)
     elsif jsonrpc_notification?
-      handle_single(jsonrpc_request)
+      handle_single(jsonrpc_notification)
       jsonrpc_notification_response
     else
       result = handle_batch(jsonrpc_batch)
@@ -18,10 +18,10 @@ def call(env)
 
   private
 
-  def handle_single(jsonrpc_request)
-    params = jsonrpc_request.params
+  def handle_single(request_or_notification)
+    params = request_or_notification.params
 
-    case jsonrpc_request.method
+    case request_or_notification.method
     when 'add'
       addends = params.is_a?(Array) ? params : params['addends'] # Handle positional and named arguments
       addends.sum

lib/jsonrpc/helpers.rb

@@ -13,14 +13,14 @@ def jsonrpc_method(method_name, &block)
       end
     end
 
-    def jsonrpc_batch? = jsonrpc_request.is_a?(JSONRPC::BatchRequest)
-    def jsonrpc_notification? = jsonrpc_request.is_a?(JSONRPC::Notification)
-    def jsonrpc_request? = jsonrpc_request.is_a?(JSONRPC::Request)
+    def jsonrpc_batch? = @env.key?('jsonrpc.batch')
+    def jsonrpc_notification? = @env.key?('jsonrpc.notification')
+    def jsonrpc_request? = @env.key?('jsonrpc.request')
 
     # Get the current JSON-RPC request object
+    def jsonrpc_batch = @env['jsonrpc.batch']
     def jsonrpc_request = @env['jsonrpc.request']
     def jsonrpc_notification = @env['jsonrpc.notification']
-    def jsonrpc_batch = @env['jsonrpc.batch']
 
     # Create a JSON-RPC response
     def jsonrpc_response(result)

lib/jsonrpc/middleware.rb

@@ -51,14 +51,16 @@ def handle_jsonrpc_request(req)
       return json_response(200, validation_errors) if validation_errors
 
       # Pass the request to the next app in the stack
-      status, headers, body = @app.call(req.env)
+      # status, headers, body = @app.call(req.env)
 
       # For notifications, ensure we return 204 No Content
-      if parsed.is_a?(Notification)
-        [204, {}, []]
-      else
-        [status, headers, body]
-      end
+      # if parsed.is_a?(Notification)
+      #   [204, {}, []]
+      # else
+      #   [status, { 'content-type' => 'application/json' }, [body.is_a?(String) ? body : JSON.generate(body)]]
+      # end
+
+      @app.call(req.env)
     end
 
     def collect_validation_errors(parsed)