active_mcp 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 051dd51506aaadb0c6bf460f1f001049b5d70dc950a060a663d2256050224de7
-  data.tar.gz: e70d63d1618f882dd9d459de896a5ba086e29cbef9acbdf897f800a76266850e
+  metadata.gz: 791510bf59750086b139e1688d8cfd7367c635a359f2dfe2678756e612a20816
+  data.tar.gz: 320cb00fa8a75622a667260477c479fd1c9df653e54af85238dc77384923b0a9
 SHA512:
-  metadata.gz: 7b5c6aaa00d5f9138d2186f2ea4c988f621f5f231674f4c01eeda64418187e0502999b1385c9417824bd99b888a9252f2833c5f5f42026e8943ce07d8a8952a4
-  data.tar.gz: 31d7ea0b9f9cd7b6385a30ced3a9caf14d2105f366d614c1ae8fc5c227f617c547f1f86c63084e4816265cb838ed8e089a4997e9cd1d3e757f8304cd197717a7
+  metadata.gz: d65ba7458c1718d59d8b718eb8422192a1b520e72f877427feb4bdcb9057f9350718ebc8e4687eb7cc05f447962d728949cef94ed2c90937d82deb5ea3fc0727
+  data.tar.gz: 54ed82f6c351d9e91e4e4108ed27767564c84d7d0bfc65a101598c0cdc5b879c70aa1b926d2e5c60a8181372a88ad6e9049a7232242726607ae65f58b9585816

data/README.md

@@ -72,7 +72,7 @@ end
 
 #### with streamable HTTP
 
-Set MCP destination as `https:your-app.example.com/mcp`
+Set MCP destination to `https:your-app.example.com/mcp`
 
 #### with independent MCP Server
 

data/app/controllers/active_mcp/base_controller.rb

@@ -9,58 +9,32 @@ module ActiveMcp
     def index
       case params[:method]
       when Method::INITIALIZE
-        render_initialize
+        result = Response::Initialize.call(id: params[:id])
       when Method::INITIALIZED
-        render json: {
-          jsonrpc: "2.0",
-          method: "notifications/initialized"
-        }
+        result = Response::Initialized.call
       when Method::CANCELLED
-        render json: {
-          jsonrpc: "2.0",
-          method: "notifications/cancelled"
-        }
+        result = Response::Cancelled.call
       when Method::TOOLS_LIST
+        tools = Response::Tools.to_hash(auth_info: @auth_info)
         if params[:jsonrpc]
-          render_tools_list_as_jsonrpc
+          result = Response::ToolsList::Jsonrpc.call(id: params[:id], tools:)
         else
-          render_tools_list
+          result = Response::ToolsList::Json.call(tools:)
         end
       when Method::TOOLS_CALL
         if params[:jsonrpc]
-          call_tool_as_jsonrpc
+          result = Response::ToolsCall::Jsonrpc.call(id: params[:id], params:, auth_info: @auth_info)
         else
-          render json: call_tool(params)
+          result = Response::ToolsCall::Json.call(params:, auth_info: @auth_info)
         end
       else
-        render json: {error: "Method not found: #{params[:method]}"}, status: 404
+        result = Response::NoMethod.call
       end
-    end
-
-    private
 
-    def render_tools_list_as_jsonrpc
-      render json: {
-        jsonrpc: "2.0",
-        id: params[:id],
-        result: {tools:}
-      }
+      render json: result[:body], status: result[:status]
     end
 
-    def call_tool_as_jsonrpc
-      render json: {
-        jsonrpc: "2.0",
-        id: params[:id],
-        result: {
-          content: [
-            {
-              type: "text",
-              text: call_tool(params[:params])[:result]
-            }
-          ]
-        }
-      }
-    end
+    private
 
     def process_authentication
       auth_header = request.headers["Authorization"]
@@ -78,90 +52,5 @@ module ActiveMcp
         }
       end
     end
-
-    def render_initialize
-      render json: {
-          jsonrpc: "2.0",
-          id: params[:id],
-          result: {
-            protocolVersion: "2024-11-05",
-            capabilities: {
-              logging: {},
-              capabilities: {
-                resources: {
-                  subscribe: false,
-                  listChanged: false
-                },
-                tools: {
-                  listChanged: false
-                }
-              },
-            },
-            serverInfo: {
-              name: ActiveMcp::Configuration.config.server_name,
-              version: ActiveMcp::Configuration.config.server_version
-            }
-          }
-        }
-    end
-
-    def render_tools_list
-      render json: {result: tools}
-    end
-
-    def tools
-      Tool.registered_tools.select do |tool_class|
-        tool_class.authorized?(@auth_info)
-      end.map do |tool_class|
-        {
-          name: tool_class.tool_name,
-          description: tool_class.desc,
-          inputSchema: tool_class.schema
-        }
-      end
-    end
-
-    def call_tool(params)
-      tool_name = params[:name]
-
-      unless tool_name
-        return {error: "Invalid params: missing tool name"}
-      end
-
-      tool_class = Tool.registered_tools.find do |tc|
-        tc.tool_name == tool_name
-      end
-
-      unless tool_class
-        return {error: "Tool not found: #{tool_name}"}
-      end
-
-      unless tool_class.authorized?(@auth_info)
-        return {error: "Unauthorized: Access to tool '#{tool_name}' denied"}
-      end
-
-      if params[:arguments].is_a?(Hash)
-        arguments = params[:arguments].symbolize_keys
-      else
-        arguments = params[:arguments].permit!.to_hash.symbolize_keys.transform_values { _1.match(/^\d+$/) ? _1.to_i : _1 }
-      end
-
-      tool = tool_class.new
-      validation_result = tool.validate_arguments(arguments)
-
-      if validation_result.is_a?(Hash) && validation_result[:error]
-        return {result: validation_result[:error]}
-      end
-
-      begin
-        arguments[:auth_info] = @auth_info if @auth_info.present?
-
-        result = tool.call(**arguments.symbolize_keys)
-
-        return {result: result}
-      rescue => e
-        return {error: "Error: #{e.message}"}
-      end
-    end
   end
 end

data/app/models/active_mcp/response/cancelled.rb

@@ -0,0 +1,12 @@
+module ActiveMcp
+  module Response
+    class Cancelled
+      def self.call
+        {
+          jsonrpc: JSON_RPC_VERSION,
+          method: Method::CANCELLED
+        }
+      end
+    end
+  end
+end

data/app/models/active_mcp/response/initialize.rb

@@ -0,0 +1,34 @@
+module ActiveMcp
+  module Response
+    class Initialize
+      def self.to_hash(id:, name:, version:)
+        {
+          body: {
+            jsonrpc: JSON_RPC_VERSION,
+            id:,
+            result: {
+              protocolVersion: PROTOCOL_VERSION,
+              capabilities: {
+                logging: {},
+                capabilities: {
+                  resources: {
+                    subscribe: false,
+                    listChanged: false
+                  },
+                  tools: {
+                    listChanged: false
+                  }
+                },
+              },
+              serverInfo: {
+                name: ActiveMcp.config.server_name,
+                version: ActiveMcp.config.server_version
+              }
+            }
+          },
+          status: 200
+        }
+      end
+    end
+  end
+end

data/app/models/active_mcp/response/initialized.rb

@@ -0,0 +1,15 @@
+module ActiveMcp
+  module Response
+    class Initialized
+      def self.to_hash
+        {
+          body: {
+            jsonrpc: JSON_RPC_VERSION,
+            method: Method::INITIALIZED
+          },
+          status: 200
+        }
+      end
+    end
+  end
+end

data/app/models/active_mcp/response/no_method.rb

@@ -0,0 +1,12 @@
+module ActiveMcp
+  module Response
+    class NoMethod
+      def self.call
+        {
+          body: { error: "Method not found" },
+          status: 404
+        }
+      end
+    end
+  end
+end

data/app/models/active_mcp/response/tools.rb

@@ -0,0 +1,17 @@
+module ActiveMcp
+  module Response
+    class Tools
+      def self.to_hash(auth_info:)
+        Tool.registered_tools.select do |tool_class|
+          tool_class.authorized?(auth_info)
+        end.map do |tool_class|
+          {
+            name: tool_class.tool_name,
+            description: tool_class.desc,
+            inputSchema: tool_class.schema
+          }
+        end
+      end
+    end
+  end
+end

data/app/models/active_mcp/response/tools_call/json.rb

@@ -0,0 +1,66 @@
+module ActiveMcp
+  module Response
+    module ToolsCall
+      class Json
+        def self.call(params:, auth_info:)
+          tool_name = params[:name]
+
+          unless tool_name
+            return {
+              body: {error: "Invalid params: missing tool name"},
+              status: 400
+            }
+          end
+
+          tool_class = Tool.registered_tools.find do |tc|
+            tc.tool_name == tool_name
+          end
+
+          unless tool_class
+            return {
+              body: {error: "Tool not found: #{tool_name}"},
+              status: 404
+            }
+          end
+
+          unless tool_class.authorized?(auth_info)
+            return {
+              body: {error: "Unauthorized: Access to tool '#{tool_name}' denied"},
+              status: 401
+            }
+          end
+
+          arguments = params[:arguments].permit!.to_hash.symbolize_keys.transform_values { _1.match(/^\d+$/) ? _1.to_i : _1 }
+
+          p arguments
+
+          tool = tool_class.new
+          validation_result = tool.validate_arguments(arguments)
+
+          if validation_result.is_a?(Hash) && validation_result[:error]
+            return {
+              body: {result: validation_result[:error]},
+              status: 400
+            }
+          end
+
+          begin
+            arguments[:auth_info] = auth_info if auth_info.present?
+
+            result = tool.call(**arguments.symbolize_keys)
+
+            return {
+              body: {result: result},
+              status: 200,
+            }
+          rescue => e
+            return {
+              body: {error: "Error: #{e.message}"},
+              status: 500
+            }
+          end
+        end
+      end
+    end
+  end
+end

data/app/models/active_mcp/response/tools_call/jsonrpc.rb

@@ -0,0 +1,26 @@
+module ActiveMcp
+  module Response
+    module ToolsCall
+      class Jsonrpc
+        def self.call(id:, params:, auth_info:)
+          result = Json.call(params: params[:params], auth_info:)
+          {
+            body: {
+              jsonrpc: JSON_RPC_VERSION,
+              id:,
+              result: {
+                content: [
+                  {
+                    type: "text",
+                    text: result[:body][:result]
+                  }
+                ]
+              },
+            },
+            status: result[:status]
+          }
+        end
+      end
+    end
+  end
+end

data/app/models/active_mcp/response/tools_list/json.rb

@@ -0,0 +1,14 @@
+module ActiveMcp
+  module Response
+    module ToolsList
+      class Json
+        def self.call(tools:)
+          {
+            body: { result: tools},
+            status: 200
+          }
+        end
+      end
+    end
+  end
+end

data/app/models/active_mcp/response/tools_list/jsonrpc.rb

@@ -0,0 +1,18 @@
+module ActiveMcp
+  module Response
+    module ToolsList
+      class Jsonrpc
+        def self.call(id:, tools:)
+          {
+            body: {
+              jsonrpc: JSON_RPC_VERSION,
+              id:,
+              result: {tools:}
+            },
+            status: 200
+          }
+        end
+      end
+    end
+  end
+end

data/lib/active_mcp/version.rb

@@ -1,3 +1,3 @@
 module ActiveMcp
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/lib/active_mcp.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "active_mcp/version"
-require_relative "active_mcp/config"
+require_relative "active_mcp/configuration"
 require_relative "active_mcp/tool"
 require_relative "active_mcp/server"
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: active_mcp
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Your Name
 bindir: exe
 cert_chain: []
-date: 2025-04-05 00:00:00.000000000 Z
+date: 2025-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -54,9 +54,18 @@ files:
 - README.md
 - Rakefile
 - app/controllers/active_mcp/base_controller.rb
+- app/models/active_mcp/response/cancelled.rb
+- app/models/active_mcp/response/initialize.rb
+- app/models/active_mcp/response/initialized.rb
+- app/models/active_mcp/response/no_method.rb
+- app/models/active_mcp/response/tools.rb
+- app/models/active_mcp/response/tools_call/json.rb
+- app/models/active_mcp/response/tools_call/jsonrpc.rb
+- app/models/active_mcp/response/tools_list/json.rb
+- app/models/active_mcp/response/tools_list/jsonrpc.rb
 - config/routes.rb
 - lib/active_mcp.rb
-- lib/active_mcp/config.rb
+- lib/active_mcp/configuration.rb
 - lib/active_mcp/engine.rb
 - lib/active_mcp/server.rb
 - lib/active_mcp/server/error_codes.rb