mcp-rb 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 610a73e9025b6400f091beeec7e0e0b9b51e917ba57b068f7132fd2dad3fa207
-  data.tar.gz: 8a5533dd1abdb1fbdde067facfe0ceeeb50d9fac332ba4ec4c4815a9b8f1a199
+  metadata.gz: 28e6b1fc53252ecd7717e71d06f0c124c61a8fbb9e389fa9514f3249b056930e
+  data.tar.gz: 454af20d33b8cbe80dad61214b0ca3680a8715bef024d4d26dd77a5b800e37ba
 SHA512:
-  metadata.gz: be76a1399e5121d0e0886489630fe7695b9fba3cea55835d6da2d67d5b74d3a714f68c354dbf447e8953f965c0c65e416e12417ee109fe4695f47cc4c940bdc6
-  data.tar.gz: d0ec9f439c4bc497c264241000269b7c5928167f0623a3a34335e6c28b597c95967b38819051a954f96323e861ea6553d218bc639df7b52697185463da1ac158
+  metadata.gz: 6aca66d612f5851304248561e0eb73402ef30d30da6fd45c35aea89b43d6499c29da58a37f6deae55931a3ede9eb56de4cf447595adaee8f227836e8923f1823
+  data.tar.gz: cde9c8f9b18b6945d5e5e478ea18e1592c372393b1263f329b35bc0510df58110feda73ae1fcd785d93af0e701fe6bfaab200296845d7b601ba33525337f654c

data/CHANGELOG.md

@@ -5,6 +5,30 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.2.0] - 2025-02-14
+
+### Breaking Changes
+- Unified DSL to block-based style for both tools and resources
+  - Example of new resource style:
+    ```ruby
+    resource "uri" do
+      name "Resource Name"
+      description "Description"
+      mime_type "text/plain"
+      call { "content" }
+    end
+    ```
+  - Example of new tool style:
+    ```ruby
+    tool "greet" do
+      description "Greet someone"
+      argument :name, String, required: true, description: "Name to greet"
+      call do |args|
+        "Hello, #{args[:name]}!"
+      end
+    end
+    ```
+
 ## [0.1.0] - 2025-02-12
 
 ### Added

data/README.md

@@ -19,26 +19,20 @@ require 'mcp'
 
 name "hello-world"
 
-# リソースの定義
-resource "hello://world",
-  name: "Hello World",
-  description: "A simple hello world message" do
-  "Hello, World!"
+# Define a resource
+resource "hello://world" do
+  name "Hello World"
+  description "A simple hello world message"
+  call { "Hello, World!" }
 end
 
-tool "greet",
-  description: "Greet someone by name",
-  input_schema: {
-    type: :object,
-    properties: {
-      name: {
-        type: :string,
-        description: "Name to greet"
-      }
-    },
-    required: [:name]
-  } do |args|
-  "Hello, #{args[:name]}!"
+# Define a tool
+tool "greet" do
+  description "Greet someone by name"
+  argument :name, String, required: true, description: "Name to greet"
+  call do |args|
+    "Hello, #{args[:name]}!"
+  end
 end
 ```
 
@@ -65,3 +59,30 @@ Find broken using `hello_world.rb`
 ```bash
 bundle exec standardrb --fix
 ```
+
+## Release
+
+To release a new version:
+
+1. Update version in `lib/mcp/version.rb`
+2. Update `CHANGELOG.md`
+3. Create a git tag
+
+```bash
+git add .
+git commit -m "Release vx.y.z"
+git tag vx.y.z
+git push --tags
+```
+
+1. Build and push to RubyGems
+
+```bash
+gem build mcp-rb.gemspec
+gem push mcp-rb-*.gem
+```
+
+## Changelog
+
+See [CHANGELOG.md](CHANGELOG.md)
+

data/lib/mcp/app/resource.rb

@@ -3,14 +3,64 @@
 module MCP
   class App
     module Resource
-      def register_resource(uri, name:, mime_type: "text/plain", description: "", &block)
-        raise ArgumentError, "Resource name cannot be nil or empty" if uri.nil? || uri.empty?
-        raise ArgumentError, "Block must be provided" unless block_given?
+      def resources
+        @resources ||= {}
+      end
 
-        resources[uri] = {
-          uri:, name:, mime_type:, description:,
-          handler: block
-        }
+      class ResourceBuilder
+        attr_reader :uri, :name, :description, :mime_type, :handler
+
+        def initialize(uri)
+          raise ArgumentError, "Resource URI cannot be nil or empty" if uri.nil? || uri.empty?
+          @uri = uri
+          @name = ""
+          @description = ""
+          @mime_type = "text/plain"
+          @handler = nil
+        end
+
+        # standard:disable Lint/DuplicateMethods,Style/TrivialAccessors
+        def name(value)
+          @name = value
+        end
+        # standard:enable Lint/DuplicateMethods,Style/TrivialAccessors
+
+        # standard:disable Lint/DuplicateMethods,Style/TrivialAccessors
+        def description(text)
+          @description = text
+        end
+        # standard:enable Lint/DuplicateMethods,Style/TrivialAccessors
+
+        # standard:disable Lint/DuplicateMethods,Style/TrivialAccessors
+        def mime_type(value)
+          @mime_type = value
+        end
+        # standard:enable Lint/DuplicateMethods,Style/TrivialAccessors
+
+        def call(&block)
+          @handler = block
+        end
+
+        def to_resource_hash
+          raise ArgumentError, "Handler must be provided" unless @handler
+          raise ArgumentError, "Name must be provided" if @name.empty?
+
+          {
+            uri: @uri,
+            name: @name,
+            mime_type: @mime_type,
+            description: @description,
+            handler: @handler
+          }
+        end
+      end
+
+      def register_resource(uri, &block)
+        builder = ResourceBuilder.new(uri)
+        builder.instance_eval(&block)
+        resource_hash = builder.to_resource_hash
+        resources[uri] = resource_hash
+        resource_hash
       end
 
       def list_resources(cursor: nil, page_size: nil)
@@ -52,10 +102,6 @@ module MCP
 
       private
 
-      def resources
-        @resources ||= {}
-      end
-
       def format_resource(resource)
         {
           uri: resource[:uri],

data/lib/mcp/app/tool.rb

@@ -3,16 +3,74 @@
 module MCP
   class App
     module Tool
-      def register_tool(name, description: "", input_schema: {}, &block)
-        raise ArgumentError, "Tool name cannot be nil or empty" if name.nil? || name.empty?
-        raise ArgumentError, "Block must be provided" unless block_given?
-
-        tools[name] = {
-          name: name,
-          description: description,
-          input_schema: input_schema,
-          handler: block
-        }
+      def tools
+        @tools ||= {}
+      end
+
+      class ToolBuilder
+        attr_reader :name, :description, :arguments, :handler
+
+        def initialize(name)
+          raise ArgumentError, "Tool name cannot be nil or empty" if name.nil? || name.empty?
+          @name = name
+          @description = ""
+          @arguments = {}
+          @required_arguments = []
+          @handler = nil
+        end
+
+        # standard:disable Lint/DuplicateMethods
+        def description(text = nil)
+          return @description if text.nil?
+          @description = text
+        end
+        # standard:enable Lint/DuplicateMethods
+
+        def argument(name, type, required: false, description: "")
+          @arguments[name] = {
+            type: ruby_type_to_schema_type(type),
+            description: description
+          }
+          @required_arguments << name if required
+        end
+
+        def call(&block)
+          @handler = block if block_given?
+        end
+
+        def to_tool_hash
+          raise ArgumentError, "Handler must be provided" unless @handler
+          {
+            name: @name,
+            description: @description,
+            input_schema: {
+              type: :object,
+              properties: @arguments,
+              required: @required_arguments
+            },
+            handler: @handler
+          }
+        end
+
+        private
+
+        def ruby_type_to_schema_type(type)
+          case type.to_s
+          when "String" then :string
+          when "Integer" then :integer
+          when "Float" then :number
+          when "TrueClass", "FalseClass", "Boolean" then :boolean
+          else :object
+          end
+        end
+      end
+
+      def register_tool(name, &block)
+        builder = ToolBuilder.new(name)
+        builder.instance_eval(&block)
+        tool_hash = builder.to_tool_hash
+        tools[name] = tool_hash
+        tool_hash
       end
 
       def list_tools(cursor: nil, page_size: 10)
@@ -32,6 +90,7 @@ module MCP
         raise ArgumentError, "Tool not found: #{name}" unless tool
 
         begin
+          validate_arguments(tool[:input_schema], arguments)
           result = tool[:handler].call(arguments)
           {
             content: [
@@ -57,8 +116,14 @@ module MCP
 
       private
 
-      def tools
-        @tools ||= {}
+      def validate_arguments(schema, arguments)
+        return unless schema[:required]
+
+        schema[:required].each do |required_arg|
+          unless arguments.key?(required_arg)
+            raise ArgumentError, "missing keyword: :#{required_arg}"
+          end
+        end
       end
 
       def format_tool(tool)

data/lib/mcp/server.rb

@@ -23,12 +23,12 @@ module MCP
       @name = value
     end
 
-    def tool(name, description: "", input_schema: {}, &block)
-      @app.register_tool(name, description: description, input_schema: input_schema, &block)
+    def tool(name, &block)
+      @app.register_tool(name, &block)
     end
 
-    def resource(uri, name:, mime_type: "text/plain", description: "", &block)
-      @app.register_resource(uri, name: name, mime_type: mime_type, description: description, &block)
+    def resource(uri, &block)
+      @app.register_resource(uri, &block)
     end
 
     def run

data/lib/mcp/version.rb

@@ -2,5 +2,5 @@
 
 module MCP
   PROTOCOL_VERSION = "2024-11-05"
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: mcp-rb
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - funwarioisii
 bindir: bin
 cert_chain: []
-date: 2025-02-12 00:00:00.000000000 Z
+date: 2025-02-14 00:00:00.000000000 Z
 dependencies: []
 description: MCP-RB is a Ruby framework that provides a Sinatra-like DSL for implementing
   Model Context Protocol servers.