jsonrpc-rails 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a329937c7fecde34677567a8df15dab630b5062b30c01f1fcb825b25789e590
-  data.tar.gz: e7d7de880e9adc77839bb29feafdff54a35f56de555a68aa7e9d62413bf2d3fa
+  metadata.gz: 441449ded5e2318b8781addfbef037112f6db49595a3cb4ae3cddb35826ee02f
+  data.tar.gz: 0a4729694ca406fb564b9dbe5ba715f37d072f68a20a9f1e509121849050f18a
 SHA512:
-  metadata.gz: e98d92b3ea32b21fc6b1fafa766a0a9b3a60f9cd0475424753c486e62c872945dd105c0e64f91c9d0eba291918ec5bab6f5d3310d4039ed2b807c9c53d3f6291
-  data.tar.gz: b724be97e378604ede9244d90b76d93f07c0070a1e142ed0d3787c5d81e4df1dd8f1848a3d84fdd28096d6ae6cb7102e86780fe6c2b2fbabbf8a8e1fc8f0615b
+  metadata.gz: dcc63ff788dc3952db0974ae8acde6c363d6d61ce358e645b736ea53c709000f47ae3af11ba4ba9ae344a5b03bc7d9382fef229e58bbfe92925dbf790ea134f9
+  data.tar.gz: edbaaea3853e4f24bc63fe6c6261bf0386494b553f3559dafe722a9ab4ee02903b4004dbfc4874cdf310aa8a1e50ddc54d20db2ce0be8cbd050f835a030f8d1b

data/lib/jsonrpc_rails/middleware/validator.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "json"
+require "active_support/json" # Add this require
 
 module JSON_RPC_Rails
   module Middleware
@@ -37,20 +38,36 @@ module JSON_RPC_Rails
         payload = parse_json(body)
 
         # Handle JSON parsing errors
-        return jsonrpc_error_response(:parse_error) unless payload
-
-        # Only attempt JSON-RPC validation if payload is a Hash or Array
-        unless payload.is_a?(Hash) || payload.is_a?(Array)
-          # Pass through other valid JSON types (string, number, boolean, null)
-          return @app.call(env)
+        # If parsing fails (returns nil), pass through
+        return @app.call(env) unless payload
+
+        # Determine if we should proceed with strict validation based on payload type and content
+        should_validate = false
+        is_batch = false
+
+        case payload
+        when Hash
+          # Validate single Hash only if 'jsonrpc' key is present
+          should_validate = payload.key?("jsonrpc")
+          is_batch = false
+        when Array
+          # Validate Array only if ALL elements are Hashes AND at least one has 'jsonrpc' key
+          all_hashes = payload.all? { |el| el.is_a?(Hash) }
+          any_jsonrpc = payload.any? { |el| el.is_a?(Hash) && el.key?("jsonrpc") }
+          if all_hashes && any_jsonrpc
+            should_validate = true
+            is_batch = true
+          end
+          # Note: Empty arrays or arrays not meeting the criteria will pass through
         end
 
-        # Payload is Hash or Array, proceed with JSON-RPC validation
-        is_batch = payload.is_a?(Array)
-        # validate_batch handles the empty array case internally now
+        # If conditions for validation are not met, pass through
+        return @app.call(env) unless should_validate
+
+        # --- Proceed with strict validation ---
         validation_result, _ = is_batch ? validate_batch(payload) : validate_single(payload)
 
-        # If validation failed, return the generated error response
+        # If strict validation failed (e.g., wrong version, missing method, invalid batch element), return the error
         return validation_result unless validation_result == :valid
 
         # Store the validated payload (original structure) in env for the controller
@@ -62,14 +79,13 @@ module JSON_RPC_Rails
 
       private
 
-      # Removed jsonrpc_payload? method
-
-      # Parses the JSON body string. Returns parsed data or nil on failure.
+      # Parses the JSON body string using ActiveSupport::JSON. Returns parsed data or nil on failure.
       def parse_json(body)
         return nil if body.nil? || body.strip.empty?
 
-        JSON.parse(body)
-      rescue JSON::ParserError
+        ActiveSupport::JSON.decode(body)
+      rescue ActiveSupport::JSON.parse_error
+        # Return nil if parsing fails, allowing the request to pass through
         nil
       end
 
@@ -152,11 +168,10 @@ module JSON_RPC_Rails
                       JSON_RPC::JsonRpcError.new(error_type)
         end
 
-        response_body = {
-          jsonrpc: "2.0",
+        response_body = JSON_RPC::Response.new(
+          id: nil, # Middleware errors have null id
           error: error_obj.to_h,
-          id: nil # Middleware errors have null id
-        }.to_json
+        ).to_json
 
         [
           status,

data/lib/jsonrpc_rails/version.rb

@@ -1,3 +1,3 @@
 module JSON_RPC_Rails
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: jsonrpc-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Abdelkader Boudih
 bindir: bin
 cert_chain: []
-date: 2025-03-27 00:00:00.000000000 Z
+date: 2025-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties