active_mcp 0.4.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acd47906160af7e22cbfa3fe974288e7d16639898b026ef6288ab91444e799be
-  data.tar.gz: 0bc89e6d457537dbe75450f1ad9ec525ed37b9168df48f08c10adbbcb2aebc5f
+  metadata.gz: 6663bc950db47a5719e93db048f5601acb9dd58b87421fe0eb94e2c78cec2333
+  data.tar.gz: ffacf7506cc82ad8fc680dd57f3f74ee50875e8bb7053ff460dc28e59c232cfa
 SHA512:
-  metadata.gz: ea4c71409b27eb65027b33fa0e43ddbaf4e3924768625d28788a2d23e9604099fc14eb6de3c962066a260a96bac8415605066ad05c4cc3ff63f31a33a47fbbc3
-  data.tar.gz: 4960bc1dee62aa05245159e0d53cf618583739e63aecbbdaf581db3cbed6133317a2537ec9f1d12313956c5e00facb24a6f1fefa32899d685061671fe529adfc
+  metadata.gz: 6631c864d9b2fbf566f5202eb31c16a4cb0154a0bcac33b23165c365adab03a01b7ee54da8996dd87660c78046457d2baa6c23f1e1e4dd5a57ea6c06601d84ca
+  data.tar.gz: b3f85f31d012218cafba456a4ebe9b50de9261686aec9b40d1f48a783e74bf6dba9506e113fb0d4372f8e5f82b6000911ec40016151063759d1b2865b68c7abe

data/README.md

@@ -314,21 +314,35 @@ MCP Resources allow you to share data and files with AI assistants. Resources ha
 Resources are Ruby classes that inherit from `ActiveMcp::Resource`:
 
 ```ruby
-class UserResource < ActiveMcp::Resource
-  uri "data://localhost/user"
-  mime_type "application/json"
-  description "User profile data"
+class UserResource
+  def initialize(id:, auth_info: nil)
+    @user = User.find(id)
+    @auth_info = auth_info
+  end
+
+  def name
+    @user.name
+  end
+
+  def uri
+    "data://localhost/users/#{@user.id}"
+  end
+
+  def mime_type
+    "application/json"
+  end
 
-  def text(auth_info: nil)
-    # Authenticate if needed
-    user = User.find_by(id: 1)
+  def description
+    @user.profile
+  end
 
+  def text
     # Return JSON data
     {
-      id: user.id,
-      name: user.name,
-      email: user.email,
-      created_at: user.created_at
+      id: @user.id,
+      name: @user.name,
+      email: @user.email,
+      created_at: @user.created_at
     }
   end
 end
@@ -341,7 +355,7 @@ Resources can return two types of content:
 1. **Text Content** - Use the `text` method to return structured data:
 
 ```ruby
-def text(auth_info: nil)
+def text
   # Return strings, arrays, hashes, or any JSON-serializable object
   { items: Product.all.map(&:attributes) }
 end
@@ -350,12 +364,24 @@ end
 2. **Binary Content** - Use the `blob` method to return binary files:
 
 ```ruby
-class ImageResource < ActiveMcp::Resource
-  uri "data://localhost/image"
-  mime_type "image/png"
-  description "Profile image"
+class ImageResource
+  def name
+    "image"
+  end
+
+  def uri
+    "data://localhost/image"
+  end
+
+  def mime_type
+    "image/png"
+  end
+
+  def description
+    "Profile image"
+  end
 
-  def blob(auth_info: nil)
+  def blob
     # Return binary file content
     File.read(Rails.root.join("public", "profile.png"))
   end
@@ -365,7 +391,7 @@ end
 Resources can be protected using the same authorization mechanism as tools:
 
 ```ruby
-def self.visible?(auth_info)
+def visible?
   return false unless auth_info
   return false unless auth_info[:type] == :bearer
 

data/app/controllers/active_mcp/base_controller.rb

@@ -2,6 +2,8 @@
 
 module ActiveMcp
   class BaseController < ActionController::Base
-    include RequestHandler
+    include RequestHandlable
+    include ResourceReadable
+    include ToolExecutable
   end
 end

data/app/controllers/concerns/active_mcp/{request_handler.rb → request_handlable.rb}

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module ActiveMcp
-  module RequestHandler
+  module RequestHandlable
     extend ActiveSupport::Concern
 
     included do
@@ -36,11 +36,11 @@ module ActiveMcp
       when Method::CANCELLED
         render 'active_mcp/cancelled', formats: :json
       when Method::RESOURCES_LIST
-        @resources = ActiveMcp::Resource.authorized_resources(auth_info)
+        @resources = resources_list
         @format = :jsonrpc
         render 'active_mcp/resources_list', formats: :json
       when Method::RESOURCES_READ
-        @resource = ActiveMcp::ResourceReader.read(params:, auth_info:)
+        @resource = read_resource(params:, auth_info:)
         @format = :jsonrpc
         render 'active_mcp/resources_read', formats: :json
       when Method::TOOLS_LIST
@@ -48,7 +48,7 @@ module ActiveMcp
         @format = :jsonrpc
         render 'active_mcp/tools_list', formats: :json
       when Method::TOOLS_CALL
-        @tool_result = ActiveMcp::ToolExecutor.execute(params: params, auth_info: auth_info)
+        @tool_result = execute_tool(params: params, auth_info: auth_info)
         @format = :jsonrpc
         render 'active_mcp/tools_call', formats: :json
       else
@@ -62,11 +62,11 @@ module ActiveMcp
       
       case params[:method]
       when Method::RESOURCES_LIST
-        @resources = ActiveMcp::Resource.authorized_resources(auth_info)
+        @resources = resources_list
         @format = :json
         render 'active_mcp/resources_list', formats: :json
       when Method::RESOURCES_READ
-        @resource = ActiveMcp::ResourceReader.read(params:, auth_info:)
+        @resource = read_resource(params:, auth_info:)
         @format = :json
         render 'active_mcp/resources_read', formats: :json
       when Method::TOOLS_LIST
@@ -74,7 +74,7 @@ module ActiveMcp
         @format = :json
         render 'active_mcp/tools_list', formats: :json
       when Method::TOOLS_CALL
-        @tool_result = ActiveMcp::ToolExecutor.execute(params: params, auth_info: auth_info)
+        @tool_result = execute_tool(params: params, auth_info: auth_info)
         @format = :json
         render 'active_mcp/tools_call', formats: :json
       else

data/app/{models/active_mcp/resource_reader.rb → controllers/concerns/active_mcp/resource_readable.rb}

@@ -1,12 +1,20 @@
 module ActiveMcp
-  class ResourceReader
-    def self.read(params:, auth_info:)
+  module ResourceReadable
+    extend ActiveSupport::Concern
+
+    private
+
+    def resources_list
+      []
+    end
+
+    def read_resource(params:, auth_info:)
       if params[:jsonrpc].present?
         uri = params[:params][:uri]
       else
         uri = params[:uri]
       end
-      
+
       unless uri
         return {
           isError: true,
@@ -14,43 +22,41 @@ module ActiveMcp
         }
       end
 
-      resource_class = Resource.registered_resources.find do |r|
-        r._uri == uri
+      resource = resources_list.find do |r|
+        r.uri == uri
       end
-      
-      unless resource_class
+
+      unless resource
         return {
           isError: true,
           contents: []
         }
       end
-      
-      unless resource_class.visible?(auth_info)
+
+      if resource.respond_to?(:visible?) && !resource.visible?
         return {
           isError: true,
           contents: []
         }
       end
 
-      resource = resource_class.new
-
       begin
-        if content = resource.text(auth_info:)
+        if resource.respond_to?(:text) && content = resource.text
           return {
             contents: [
               {
                 uri:,
-                mimeType: resource_class._mime_type,
+                mimeType: resource.mime_type,
                 text: formatted(content)
               }
             ]
           }
-        elsif content = resource.blob(auth_info:)
+        elsif content = resource.blob
           return {
             contents: [
               {
                 uri:,
-                mimeType: resource_class._mime_type,
+                mimeType: resource.mime_type,
                 blob: Base64.strict_encode64(content)
               }
             ]
@@ -64,7 +70,7 @@ module ActiveMcp
       end
     end
     
-    def self.formatted(object)
+    def formatted(object)
       case object
       when String
         object

data/app/{models/active_mcp/tool_executor.rb → controllers/concerns/active_mcp/tool_executable.rb}

@@ -1,6 +1,10 @@
 module ActiveMcp
-  class ToolExecutor
-    def self.execute(params:, auth_info:)
+  module ToolExecutable
+    extend ActiveSupport::Concern
+
+    private
+
+    def execute_tool(params:, auth_info:)
       if params[:jsonrpc].present?
         tool_name = params[:params][:name]
         tool_params = params[:params][:arguments]
@@ -105,7 +109,7 @@ module ActiveMcp
       end
     end
     
-    def self.formatted(object)
+    def formatted(object)
       case object
       when String
         object

data/app/views/active_mcp/resources_list.json.jbuilder

@@ -3,8 +3,22 @@ json.id @id if @format == :jsonrpc && @id.present?
 
 if @format == :jsonrpc
   json.result do
-    json.resources @resources
+    json.resources do
+      json.array!(@resources) do |resource|
+        json.name resource.name
+        json.uri resource.uri
+        json.mimeType resource.mime_type
+        json.description resource.description
+      end
+    end
   end
 else
-  json.result @resources
+  json.result do
+    json.array!(@resources) do |resource|
+      json.name resource.name
+      json.uri resource.uri
+      json.mimeType resource.mime_type
+      json.description resource.description
+    end
+  end
 end

data/app/views/active_mcp/tools_list.json.jbuilder

@@ -7,4 +7,4 @@ if @format == :jsonrpc
   end
 else
   json.result @tools
-end
+end

data/lib/active_mcp/version.rb

@@ -1,3 +1,3 @@
 module ActiveMcp
-  VERSION = "0.4.0"
+  VERSION = "0.5.1"
 end

data/lib/active_mcp.rb

@@ -4,7 +4,6 @@ require "jbuilder"
 require_relative "active_mcp/version"
 require_relative "active_mcp/configuration"
 require_relative "active_mcp/tool"
-require_relative "active_mcp/resource"
 require_relative "active_mcp/server"
 
 if defined? ::Rails

data/lib/generators/active_mcp/resource/templates/resource.rb.erb

@@ -1,37 +1,51 @@
-class <%= class_name %> < ActiveMcp::Resource
-  uri "data://localhost/<%= file_name %>"
-  mime_type "application/json"
-  description "<%= file_name.humanize %>"
+class <%= class_name %>
+  def initialize(auth_info:)
+    @auth_info = auth_info
+
+    # Authentication information can be accessed via @auth_info parameter
+    # @auth_info = { type: :bearer, token: "xxx", header: "Bearer xxx" }
+    # or { type: :basic, token: "base64encoded", header: "Basic base64encoded" }
+  end
+
+  def name
+    "<%= file_name %>"
+  end
+
+  def uri
+    "data://localhost/<%= file_name %>"
+  end
+
+  def mime_type
+    "application/json"
+  end
+  
+  def description
+    "<%= file_name.humanize %>"
+  end
 
   # Uncomment and modify this method to implement authorization control
   # This controls who can see and use this tool
-  # def self.visible?(auth_info)
+  # def visible?
   #   # Example: require authentication
-  #   # return false unless auth_info
+  #   # return false unless @auth_info
   #   
   #   # Example: require a specific authentication type
-  #   # return false unless auth_info[:type] == :bearer
+  #   # return false unless @auth_info[:type] == :bearer
   #   
   #   # Example: check for admin permissions
   #   # admin_tokens = ["admin-token"]
-  #   # return admin_tokens.include?(auth_info[:token])
+  #   # return admin_tokens.include?(@auth_info[:token])
   #   
   #   # Default: allow all access
   #   true
   # end
   
-  def text(auth_info: nil)
-    # Authentication information can be accessed via _auth_info parameter
-    # auth_info = { type: :bearer, token: "xxx", header: "Bearer xxx" }
-    # or { type: :basic, token: "base64encoded", header: "Basic base64encoded" }
-
-    # Implement tool logic here
-
+  def text
     # Return a string, hash, or any JSON-serializable object
     { foo: "bar" }
   end
 
-  # def blob(auth_info: nil)
+  # def blob
   #   File.read("/path/to/file")
   # end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: active_mcp
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Moeki Kawakami
 bindir: exe
 cert_chain: []
-date: 2025-04-06 00:00:00.000000000 Z
+date: 2025-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -68,9 +68,9 @@ files:
 - README.md
 - Rakefile
 - app/controllers/active_mcp/base_controller.rb
-- app/controllers/concerns/active_mcp/request_handler.rb
-- app/models/active_mcp/resource_reader.rb
-- app/models/active_mcp/tool_executor.rb
+- app/controllers/concerns/active_mcp/request_handlable.rb
+- app/controllers/concerns/active_mcp/resource_readable.rb
+- app/controllers/concerns/active_mcp/tool_executable.rb
 - app/views/active_mcp/cancelled.json.jbuilder
 - app/views/active_mcp/initialize.json.jbuilder
 - app/views/active_mcp/initialized.json.jbuilder
@@ -83,7 +83,6 @@ files:
 - lib/active_mcp.rb
 - lib/active_mcp/configuration.rb
 - lib/active_mcp/engine.rb
-- lib/active_mcp/resource.rb
 - lib/active_mcp/server.rb
 - lib/active_mcp/server/error_codes.rb
 - lib/active_mcp/server/method.rb

data/lib/active_mcp/resource.rb

@@ -1,64 +0,0 @@
-require "json-schema"
-
-module ActiveMcp
-  class Resource
-    class << self
-      attr_reader :_description, :schema, :_uri, :_mime_type
-
-      def resource_name
-        name ? name.underscore.sub(/_resource$/, "") : ""
-      end
-
-      def uri(value)
-        @_uri = value
-      end
-
-      def description(value)
-        @_description = value
-      end
-
-      def mime_type(value)
-        @_mime_type = value
-      end
-
-      def registered_resources
-        @registered_resources ||= []
-      end
-
-      attr_writer :registered_resources
-
-      def inherited(subclass)
-        registered_resources << subclass
-      end
-
-      def visible?(auth_info)
-        if respond_to?(:authorized?)
-          authorized?(auth_info)
-        else
-          true
-        end
-      end
-
-      def authorized_resources(auth_info = nil)
-        registered_resources.select do |tool_class|
-          tool_class.visible?(auth_info)
-        end.map do |tool_class|
-          {
-            uri: tool_class._uri,
-            name: tool_class.resource_name,
-            mimeType: tool_class._mime_type,
-            description: tool_class._description
-          }
-        end
-      end
-    end
-
-    def text(auth_info:)
-      nil
-    end
-
-    def blob(auth_info:)
-      nil
-    end
-  end
-end