jsonrpc-rails 0.5.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93b8692cfb780990697a06219f80c323096bd5b12d21b95ec0a70e83dcbe555c
-  data.tar.gz: a3a15cc185bfb704d6a11cd2085be7beb291c20e727ef9cce317d4b993d5efc4
+  metadata.gz: 16369528b9adcf6bc2b66b42365e475be375d330312694626d8244f2205e9df3
+  data.tar.gz: 4eeda34cff81e732d5aac37d684c81eba9c7a66de1729a7f1f2c1c8097de21fb
 SHA512:
-  metadata.gz: 305bde8d1013629a31736c9da2de66a90e6d0e860311b784cbac65615646a24ae6460b1cb21699c8c79141027b65c8a988b6f20fbcdbad6d7e1425125fe458df
-  data.tar.gz: 232740f9c3756071955993b87f7f8ae4832d6159dd6273cd71a6b944003dbc1d68f32692addab5b3ea90d04bfc32908f4572da0791b778e7fdd8f4394abe640d
+  metadata.gz: ebefd2f90219d0dd655a9e7fc21023aa38b26de412e52102bdb6d2014a75f1975c284a417d2f353989e09360c34b56c07e42af89643e99bb3fe990db886a1039
+  data.tar.gz: 2c447976bc3b1dc7a8e9c2ffc695278bd7ec0e44bbad864f5810c16adefb901ec1212145a8d56865e4f7a59eba36b760db71e69addac2b70422f2b8276b53a7f

data/lib/json_rpc/response.rb

@@ -9,14 +9,25 @@ module JSON_RPC
     # @param result [Object, nil] The result data (if successful).
     # @param error [Hash, JSON_RPC::JsonRpcError, Symbol, nil] The error object/symbol (if failed).
     # @raise [ArgumentError] if both result and error are provided, or neither is provided for non-null id.
-    def initialize(id:, result: nil, error: nil)
-      validate_response(id, result, error)
+    def initialize(id:, **kwargs)
+      # Check which parameters were actually provided
+      has_result = kwargs.key?(:result)
+      has_error = kwargs.key?(:error)
+
+      result = kwargs[:result]
+      error = kwargs[:error]
+
+      validate_response(id, has_result, has_error, result, error)
       error_obj = process_error(error)
+
       super(id: id, result: result, error: error_obj)
     end
 
     def self.from_h(h)
-      new(id: h["id"], result: h["result"], error: h["error"])
+      args = { id: h["id"] }
+      args[:result] = h["result"] if h.key?("result")
+      args[:error] = h["error"] if h.key?("error")
+      new(**args)
     end
 
     # Returns a hash representation of the response, ready for JSON serialization.
@@ -40,22 +51,21 @@ module JSON_RPC
     # Validates the response structure according to JSON-RPC 2.0 spec.
     #
     # @param id [Object] The request ID.
+    # @param has_result [Boolean] Whether result was provided.
+    # @param has_error [Boolean] Whether error was provided.
     # @param result [Object] The result data.
     # @param error_input [Object] The error data/object/symbol.
     # @raise [ArgumentError] for invalid combinations.
-    def validate_response(id, result, error_input)
-      # ID must be present (can be null) in a response matching a request.
-
-      raise ArgumentError, "Response cannot contain both 'result' and 'error'" if !error_input.nil? && !result.nil?
-
-      # If id is not null, either result or error MUST be present.
-      return unless !id.nil? && error_input.nil? && result.nil?
+    def validate_response(id, has_result, has_error, result, error_input)
+      # Cannot have both result and error
+      if has_result && has_error
+        raise ArgumentError, "Response cannot contain both 'result' and 'error'"
+      end
 
-      # This check assumes if both are nil, it's invalid for non-null id.
-      # `result: nil` is a valid success response. The check should ideally know
-      # if `result` was explicitly passed as nil vs not passed at all.
-      # Data.define might make this tricky. Let's keep the original logic for now.
-      raise ArgumentError, "Response with non-null ID must contain either 'result' or 'error'"
+      # If id is not null, either result or error MUST be present
+      if !id.nil? && !has_result && !has_error
+        raise ArgumentError, "Response with non-null ID must contain either 'result' or 'error'"
+      end
     end
 
     # Processes the error input into a standard error hash.
@@ -72,11 +82,11 @@ module JSON_RPC
         # Assume it's already a valid JSON-RPC error object hash
         error_input
       when Symbol
-        # Build from a standard error symbol
+        # Build from a standard error symbol (build returns a hash)
         JSON_RPC::JsonRpcError.build(error_input)
       else
         # Fallback to internal error if the format is unexpected
-        JSON_RPC::JsonRpcError.build(:internal_error, message: "Invalid error format provided").to_h
+        JSON_RPC::JsonRpcError.build(:internal_error, message: "Invalid error format provided")
       end
     end
   end

data/lib/jsonrpc_rails/middleware/validator.rb

@@ -35,7 +35,10 @@ module JSONRPC_Rails
 
         raw_payload = parse_json(body)
 
-        return jsonrpc_error_response(:invalid_request) unless raw_payload.is_a?(Hash) || raw_payload.is_a?(Array)
+        unless raw_payload.is_a?(Hash) || raw_payload.is_a?(Array)
+          id = extract_id_from_raw_payload(raw_payload)
+          return jsonrpc_error_response(:invalid_request, id: id)
+        end
 
         validity, = if raw_payload.is_a?(Array)
                       validate_batch(raw_payload)
@@ -89,9 +92,10 @@ module JSONRPC_Rails
 
       def validate_single(obj)
         if validate_single_structure(obj)
-          [ :valid, nil ]
+          [ :valid, obj["id"] ]
         else
-          [ jsonrpc_error_response(:invalid_request), nil ]
+          id = obj.is_a?(Hash) ? obj["id"] : nil
+          [ jsonrpc_error_response(:invalid_request, id: id), id ]
         end
       end
 
@@ -119,13 +123,22 @@ module JSONRPC_Rails
 
       # @param error_sym [Symbol]
       # @param status    [Integer]
+      # @param id       [String, Integer, nil]
       # @return [Array] Rack triplet
-      def jsonrpc_error_response(error_sym, status: 400)
+      def jsonrpc_error_response(error_sym, status: 400, id: nil)
         error_obj = JSON_RPC::JsonRpcError.build(error_sym)
-        payload   = JSON_RPC::Response.new(id: nil, error: error_obj).to_json
+        payload   = JSON_RPC::Response.new(id: id, error: error_obj).to_json
 
         [ status, { "Content-Type" => CONTENT_TYPE }, [ payload ] ]
       end
+
+      # Extract ID from raw payload if possible
+      def extract_id_from_raw_payload(raw)
+        return nil unless raw.is_a?(Hash)
+        raw["id"]
+      rescue
+        nil
+      end
     end
   end
 end

data/lib/jsonrpc_rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JSONRPC_Rails
-  VERSION = "0.5.1"
+  VERSION = "0.5.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonrpc-rails
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.3
 platform: ruby
 authors:
 - Abdelkader Boudih
@@ -67,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.9
 specification_version: 4
 summary: A Railtie-based gem that brings JSON-RPC 2.0 support to your Rails application.
 test_files: []