fast-mcp 1.4.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50141727429ea7f39887b8a0f6ec2da8515cc3c35803a1c3e328287931bebcae
-  data.tar.gz: 518a481ba94b59f339b4e4957c54971866a76835e54833fd408efdb12e97c0e8
+  metadata.gz: 37917d61ab02f9d3a42e8980b9007bdb0003f2b91847b5cfe6e6a5f0043550cd
+  data.tar.gz: 476fa4ea8a2c022c255edcf3e5b3d101748fddaa8643569d2bc999ef8ec74eee
 SHA512:
-  metadata.gz: 76f1f6136bc4f1041021f5a3522f230ae1f044bb19e2e0d8f0871249aac222740b3907229db4b7d482812396f03d492cd6ea414206008f3737361e4346cbb5ca
-  data.tar.gz: 1ac14395b264d76b826feb2612a0ceae18933c8b37695ba8e5c673c6c5b29045f241617a2196409267f1c4c58b1fef0b3ff9865d92fae759306a6b17e2795db2
+  metadata.gz: f12f0d7bf4a4f36b4a5d6c642160c01ccf40d5b799020cbc2c16646c7332b51083bc525c867f38cd2d5a68b3757f51f2fb0f632c35e004c7fcd7a8cb0f571cdf
+  data.tar.gz: 559edc8f334fcf49c16b001c8e36e4ea7aa664b2f53e2fa5f83edd171442dfe927cdd42cbbfaeb5572a174347729b193ec6b000f6b43ffd6850021365967f913

data/CHANGELOG.md

@@ -5,50 +5,109 @@ 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).
 
+## [1.6.0] - 2025-09-28
+
+### Added
+
+- Tool annotations support for providing hints about tool behavior (readOnlyHint, destructiveHint, etc.) [#96 @pauloarruda](https://github.com/yjacquin/fast-mcp/pull/96)
+- GitHub Discussions link in README [#139 @jeznicholson](https://github.com/yjacquin/fast-mcp/pull/139)
+- GitHub Sponsors funding configuration [#3d5a7e5 @yjacquin](https://github.com/yjacquin/fast-mcp/commit/3d5a7e5)
+- Server hook `on_error_result` for handling tool execution errors [#129 @yannickutard](https://github.com/yjacquin/fast-mcp/pull/129)
+- Support for transport option in rack_middleware [#149 @josevalim](https://github.com/yjacquin/fast-mcp/pull/149)
+
+### Fixed
+
+- Tool name validation and override for invalid names [#100 @abdelrahmanothman](https://github.com/yjacquin/fast-mcp/pull/100)
+- Typo fixes in sinatra_integration.md [#131 @ilyakamenko](https://github.com/yjacquin/fast-mcp/pull/131) [#102 @anton](https://github.com/yjacquin/fast-mcp/pull/102)
+- Add trailing comma to generated initializer template for better Ruby style [#123 @zachhaitz](https://github.com/yjacquin/fast-mcp/pull/123)
+- Fix missing commas for params hash [#121 @FanaHOVA](https://github.com/yjacquin/fast-mcp/pull/121)
+- RuboCop linting issues resolution [fa6af0b @yjacquin](https://github.com/yjacquin/fast-mcp/commit/fa6af0b)
+
+### Changed
+
+- Updated GitHub Actions dependencies: checkout v4→v5, download-artifact v4→v5 [#141 #142 @dependabot](https://github.com/yjacquin/fast-mcp/pull/141)
+- Relax Rack version requirements for better compatibility (>= 2.0, < 4.0) [#133 @eproulx](https://github.com/yjacquin/fast-mcp/pull/133)
+- Load generators only when necessary for improved performance [#153 @josevalim](https://github.com/yjacquin/fast-mcp/pull/153)
+- Drop schema compiler to use Dry's built-in functionality [#152 @yjacquin](https://github.com/yjacquin/fast-mcp/pull/152), thanks @redox for the help !
+
+## [1.5.0] - 2025-06-01
+
+### Added
+
+- Handle filtering tools and resources [#85 @yjacquin](https://github.com/yjacquin/fast-mcp/pull/85)
+- Support for resource templates 🥳 Big thanks to @danielcooper for the contribution [#84 co-authored by @danielcooper and @yjacquin](https://github.com/yjacquin/fast-mcp/pull/84)
+- Possibility to authorize requests before tool calls [#79 @EuanEdgar](https://github.com/yjacquin/fast-mcp/pull/79)
+- Possibility to read request headers in tool calls [#78 @EuanEdgar](https://github.com/yjacquin/fast-mcp/pull/78)
+
+### Changed
+
+- Bump Dependencies [#86 @aothelal](https://github.com/yjacquin/fast-mcp/pull/86)
+- ⚠️ Resources are now stateless, meaning that in-memory resources won't work anymore, they require an external data source such as database, file to read and write too, etc. This was needed for a refactoring of the resource class for the [resource template PR](https://github.com/yjacquin/fast-mcp/pull/84)
+
+### Fixed
+
+- Stop overriding log level to info [#91 @yjacquin](https://github.com/yjacquin/fast-mcp/pull/91)
+- Properly handle ping request responses from clients [#89 @yjacquin](https://github.com/yjacquin/fast-mcp/pull/89)
+- Add Thread Safety to RackTransport sse_clients [#82 @Kevin-K](https://github.com/yjacquin/fast-mcp/pull/82)
+
 ## [1.4.0] - 2025-05-10
+
 ### Added
+
 - Conditionnally hidden properties for tool calls (#70) [#70 @yjacquin](https://github.com/yjacquin/fast-mcp/pull/70)
 - Metadata to tool call results (#69) [#69 @yjacquin](https://github.com/yjacquin/fast-mcp/pull/69)
 - Link to official Discord Server in README.md
 
 ## [1.3.2] - 2025-05-08
+
 ### Changed
+
 - Logs are now less verbose by default [#64 @yjacquin](https://github.com/yjacquin/fast-mcp/pull/64)
+
 ### Fixed
+
 - Fix undefined method `call' for an instance of String error log [#61 @radwo](https://github.com/yjacquin/fast-mcp/pull/61)
 
 ## [1.3.1] - 2025-04-30
+
 ### Fixed
--  Allow ipv4 mapped to ipv6 (#56) [#56 @josevalim](https://github.com/yjacquin/fast-mcp/pull/56)
--  Add items to array (#55) [#55 @josevalim](https://github.com/yjacquin/fast-mcp/pull/56)
--  Ping is a regular message event (#54) [#56 @josevalim](https://github.com/yjacquin/fast-mcp/pull/56)
+
+- Allow ipv4 mapped to ipv6 (#56) [#56 @josevalim](https://github.com/yjacquin/fast-mcp/pull/56)
+- Add items to array (#55) [#55 @josevalim](https://github.com/yjacquin/fast-mcp/pull/56)
+- Ping is a regular message event (#54) [#56 @josevalim](https://github.com/yjacquin/fast-mcp/pull/56)
 
 ## [1.3.0] - 2025-04-28
+
 ### Added
+
 - Added automatic forwarding of query params from to the messages endpoint [@yjacquin](https://github.com/yjacquin/fast-mcp/commit/011d968ac982d0b0084f7753dcac5789f66339ee)
 
 ### Fixed
+
 - Declare rack as an explicit dependency [#49 @subelsky](https://github.com/yjacquin/fast-mcp/pull/49)
 - Fix notifications/initialized response [#51 @yjacquin](https://github.com/yjacquin/fast-mcp/pull/51)
 
 ## [1.2.0] - 2025-04-21
+
 ### Added
+
 - Security enhancement: Bing only to localhost by default [#44 @yjacquin](https://github.com/yjacquin/fast-mcp/pull/44)
 - Prevent AuthenticatedRackMiddleware from blocking other rails routes[#35 @JulianPasquale](https://github.com/yjacquin/fast-mcp/pull/35)
 - Stop Forcing reconnections after 30 pings [#42 @zoedsoupe](https://github.com/yjacquin/fast-mcp/pull/42)
 
-
 ## [1.1.0] - 2025-04-13
+
 ### Added
+
 - Security enhancement: Added DNS rebinding protection by validating Origin headers [#32 @yjacquin](https://github.com/yjacquin/fast-mcp/pull/32/files)
 - Added configuration options for allowed origins in rack middleware [#32 @yjacquin](https://github.com/yjacquin/fast-mcp/pull/32/files)
 - Allow to change the SSE and Messages route [#23 @pedrofurtado](https://github.com/yjacquin/fast-mcp/pull/23)
 - Fix invalid return value when processing notifications/initialized request [#31 @abMatGit](https://github.com/yjacquin/fast-mcp/pull/31)
 
-
 ## [1.0.0] - 2025-03-30
 
 ### Added
+
 - Rails integration improvements via enhanced Railtie support
 - Automatic tool and resource registration in Rails applications
 - Extended Rails autoload paths for tools and resources directories
@@ -59,6 +118,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Automated Github Releases through Github Workflow
 
 ### Fixed
+
 - Fixed bug with Rack middlewares not being initialized properly.
 - Fixed bug with STDIO logging preventing a proper connection with clients [# 11 @cs3b](https://github.com/yjacquin/fast-mcp/issues/11)
 - Fixed Rails SSE streaming detection and handling
@@ -66,9 +126,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Namespace consistency correction (FastMCP -> FastMcp) throughout the codebase
 
 ### Improved
+
 - ⚠️ [Breaking] Resource content declaration changes
+
   - Now resources implement `content` over `default_content`
   - `content` is dynamically called when calling a resource, this implies we can declare dynamic resource contents like:
+
   ```ruby
   class HighestScoringUsersResource < FastMcp::Resource
   ...
@@ -77,6 +140,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
     end
   end
   ```
+
 - More robust SSE connection lifecycle management
 - Optimized test suite with faster execution times
 - Better logging for debugging connection issues

data/README.md

@@ -10,10 +10,10 @@
   <a href="https://github.com/yjacquin/fast-mcp/workflows/CI/badge.svg"><img src="https://github.com/yjacquin/fast-mcp/workflows/CI/badge.svg" alt="CI Status" /></a>
   <a href="https://opensource.org/licenses/MIT"><img src="https://img.shields.io/badge/License-MIT-yellow.svg" alt="License: MIT" /></a>
   <a href="code_of_conduct.md"><img src="https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg" alt="Contributor Covenant" /></a>
-  <a href="https://discord.gg/ayu8ZKvz"><img src = "https://dcbadge.limes.pink/api/server/https://discord.gg/ayu8ZKvz?style=flat" alt="Discord invite link" /></a>
+  <a href="https://discord.gg/9HHfAtY3HF"><img src = "https://dcbadge.limes.pink/api/server/https://discord.gg/9HHfAtY3HF?style=flat" alt="Discord invite link" /></a>
 </p>
 
-## 🌟 Interface your Servers with LLMs in minutes !
+## 🌟 Interface your Servers with LLMs in minutes
 
 AI models are powerful, but they need to interact with your applications to be truly useful. Traditional approaches mean wrestling with:
 
@@ -32,9 +32,10 @@ Fast MCP solves all these problems by providing a clean, Ruby-focused implementa
 - 🧩 **Framework Integration** - Works seamlessly with Rails, Sinatra or any Rack app.
 - 🔒 **Authentication Support** - Secure your AI-powered endpoints with ease
 - 🚀 **Real-time Updates** - Subscribe to changes for interactive applications
-
+- 🎯 **Dynamic Filtering** - Control tool/resource access based on request context (permissions, API versions, etc.)
 
 ## 💎 What Makes FastMCP Great
+
 ```ruby
 # Define tools for AI models to use
 server = FastMcp::Server.new(name: 'popular-users', version: '1.0.0')
@@ -48,10 +49,10 @@ class CreateUserTool < FastMcp::Tool
   arguments do
     required(:first_name).filled(:string).description("First name of the user")
     optional(:age).filled(:integer).description("Age of the user")
-    required(:address).hash do
-      optional(:street).filled(:string)
-      optional(:city).filled(:string)
-      optional(:zipcode).filled(:string)
+    required(:address).description("The shipping address").hash do
+      required(:street).filled(:string).description("Street address")
+      optional(:city).filled(:string).description("City name")
+      optional(:zipcode).maybe(:string).description("Postal code")
     end
   end
 
@@ -65,7 +66,7 @@ server.register_tool(CreateUserTool)
 
 # Share data resources with AI models by inheriting from FastMcp::Resource
 class PopularUsers < FastMcp::Resource
-  uri "file://popular_users.json"
+  uri "myapp:///users/popular"
   resource_name "Popular Users"
   mime_type "application/json"
 
@@ -74,17 +75,63 @@ class PopularUsers < FastMcp::Resource
   end
 end
 
+class User < FastMcp::Resource
+  uri "myapp:///users/{id}" # This is a resource template
+  resource_name "user"
+  mime_type "application/json"
+
+  def content
+    id = params[:id] # params are computed from the uri pattern
+
+    JSON.generate(User.find(id).as_json)
+  end
+end
+
 # Register the resource with the server
-server.register_resource(PopularUsers)
+server.register_resources(PopularUsers, User)
 
 # Accessing the resource through the server
 server.read_resource(PopularUsers.uri)
 
 # Notify the resource content has been updated to clients
-server.notify_resource_updated(PopularUsers.uri)
+server.notify_resource_updated(PopularUsers.variabilized_uri)
+
+# Notifiy the content of a resource from a template has been updated to clients
+server.notify_resource_updated(User.variabilized_uri(id: 1))
+```
+
+### 🎯 Dynamic Tool Filtering
+
+Control which tools and resources are available based on request context:
+
+```ruby
+# Tag your tools for easy filtering
+class AdminTool < FastMcp::Tool
+  tags :admin, :dangerous
+  description "Perform admin operations"
+
+  def call
+    # Admin only functionality
+  end
+end
+
+# Filter tools based on user permissions
+server.filter_tools do |request, tools|
+  user_role = request.params['role']
+
+  case user_role
+  when 'admin'
+    tools # Admins see all tools
+  when 'user'
+    tools.reject { |t| t.tags.include?(:admin) }
+  else
+    tools.select { |t| t.tags.include?(:public) }
+  end
+end
 ```
 
 ### 🚂 Fast Ruby on Rails implementation
+
 ```shell
 bundle add fast-mcp
 bin/rails generate fast_mcp:install
@@ -122,7 +169,9 @@ FastMcp.mount_in_rails(
   end
 end
 ```
+
 The install script will also:
+
 - add app/resources folder
 - add app/tools folder
 - add app/tools/sample_tool.rb
@@ -174,6 +223,7 @@ end
 ```
 
 ### Easy Sinatra setup
+
 I'll let you check out the dedicated [sinatra integration docs](./docs/sinatra_integration.md).
 
 ## 🚀 Quick Start
@@ -236,17 +286,21 @@ Clone this project, then give it a go !
 ```shell
 npx @modelcontextprotocol/inspector examples/server_with_stdio_transport.rb
 ```
+
 Or to test with an SSE transport using a rack middleware:
+
 ```shell
 npx @modelcontextprotocol/inspector examples/rack_middleware.rb
 ```
 
 Or to test over SSE with an authenticated rack middleware:
+
 ```shell
 npx @modelcontextprotocol/inspector examples/authenticated_rack_middleware.rb
 ```
 
 You can test your custom implementation with the official MCP inspector by using:
+
 ```shell
 # Test with a stdio transport:
 npx @modelcontextprotocol/inspector path/to/your_ruby_file.rb
@@ -275,6 +329,7 @@ end
 ### Integrating with Claude Desktop
 
 Add your server to your Claude Desktop configuration at:
+
 - macOS: `~/Library/Application Support/Claude/claude_desktop_config.json`
 - Windows: `%APPDATA%\Claude\claude_desktop_config.json`
 
@@ -283,28 +338,27 @@ Add your server to your Claude Desktop configuration at:
   "mcpServers": {
     "my-great-server": {
       "command": "ruby",
-      "args": [
-        "/Users/path/to/your/awesome/fast-mcp/server.rb"
-      ]
+      "args": ["/Users/path/to/your/awesome/fast-mcp/server.rb"]
     }
   }
 }
 ```
 
 ## How to add a MCP server to Claude, Cursor, or other MCP clients?
+
 Please refer to [configuring_mcp_clients](docs/configuring_mcp_clients.md)
 
 ## 📊 Supported Specifications
 
-| Feature | Status |
-|---------|--------|
-| ✅ **JSON-RPC 2.0** | Full implementation for communication |
-| ✅ **Tool Definition & Calling** | Define and call tools with rich argument types |
-| ✅ **Resource Management** | Create, read, update, and subscribe to resources |
-| ✅ **Transport Options** | STDIO, HTTP, and SSE for flexible integration |
-| ✅ **Framework Integration** | Rails, Sinatra, Hanami, and any Rack-compatible framework |
-| ✅ **Authentication** | Secure your AI endpoints with token authentication |
-| ✅ **Schema Support** | Full JSON Schema for tool arguments with validation |
+| Feature                                         | Status                                                    |
+| ----------------------------------------------- | --------------------------------------------------------- |
+| ✅ **JSON-RPC 2.0**                             | Full implementation for communication                     |
+| ✅ **Tool Definition & Calling**                | Define and call tools with rich argument types            |
+| ✅ **Resource & Resource Templates Management** | Create, read, update, and subscribe to resources          |
+| ✅ **Transport Options**                        | STDIO, HTTP, and SSE for flexible integration             |
+| ✅ **Framework Integration**                    | Rails, Sinatra, Hanami, and any Rack-compatible framework |
+| ✅ **Authentication**                           | Secure your AI endpoints with token authentication        |
+| ✅ **Schema Support**                           | Full JSON Schema for tool arguments with validation       |
 
 ## 🗺️ Use Cases
 
@@ -353,12 +407,14 @@ FastMcp.authenticated_rack_middleware(app,
 - [📚 Resources](docs/resources.md)
 - [🛠️ Tools](docs/tools.md)
 - [🔒 Security](docs/security.md)
+- [🎯 Dynamic Filtering](docs/filtering.md)
 
 ## 💻 Examples
 
 Check out the [examples directory](examples) for more detailed examples:
 
 - **🔨 Basic Examples**:
+
   - [Simple Server](examples/server_with_stdio_transport.rb)
   - [Tool Examples](examples/tool_examples.rb)
 

data/lib/fast_mcp.rb

@@ -16,9 +16,6 @@ require_relative 'mcp/server'
 require_relative 'mcp/resource'
 require_relative 'mcp/railtie' if defined?(Rails::Railtie)
 
-# Load generators if Rails is available
-require_relative 'generators/fast_mcp/install/install_generator' if defined?(Rails::Generators)
-
 # Require all transport files
 require_relative 'mcp/transports/base_transport'
 Dir[File.join(File.dirname(__FILE__), 'mcp/transports', '*.rb')].each do |file|
@@ -39,6 +36,7 @@ module FastMcp
   # @option options [String] :messages_route The route for the messages endpoint
   # @option options [String] :sse_route The route for the SSE endpoint
   # @option options [Logger] :logger The logger to use
+  # @option options [Class] :transport The transport class to use
   # @option options [Array<String,Regexp>] :allowed_origins List of allowed origins for DNS rebinding protection
   # @yield [server] A block to configure the server
   # @yieldparam server [FastMcp::Server] The server to configure
@@ -71,17 +69,8 @@ module FastMcp
   # @yieldparam server [FastMcp::Server] The server to configure
   # @return [#call] The Rack middleware
   def self.authenticated_rack_middleware(app, options = {})
-    name = options.delete(:name) || 'mcp-server'
-    version = options.delete(:version) || '1.0.0'
-    logger = options.delete(:logger) || Logger.new
-
-    server = FastMcp::Server.new(name: name, version: version, logger: logger)
-    yield server if block_given?
-
-    # Store the server in the FastMcp module
-    self.server = server
-
-    server.start_authenticated_rack(app, options)
+    options[:transport] ||= FastMcp::Transports::AuthenticatedRackTransport
+    rack_middleware(app, options)
   end
 
   # Register a tool with the MCP server

data/lib/generators/fast_mcp/install/templates/fast_mcp_initializer.rb

@@ -20,12 +20,12 @@ FastMcp.mount_in_rails(
   version: '1.0.0',
   path_prefix: '/mcp', # This is the default path prefix
   messages_route: 'messages', # This is the default route for the messages endpoint
-  sse_route: 'sse' # This is the default route for the SSE endpoint
+  sse_route: 'sse', # This is the default route for the SSE endpoint
   # Add allowed origins below, it defaults to Rails.application.config.hosts
   # allowed_origins: ['localhost', '127.0.0.1', '[::1]', 'example.com', /.*\.example\.com/],
   # localhost_only: true, # Set to false to allow connections from other hosts
   # whitelist specific ips to if you want to run on localhost and allow connections from other IPs
-  # allowed_ips: ['127.0.0.1', '::1']
+  # allowed_ips: ['127.0.0.1', '::1'],
   # authenticate: true,       # Uncomment to enable authentication
   # auth_token: 'your-token', # Required if authenticate: true
 ) do |server|

data/lib/generators/fast_mcp/install/templates/sample_tool.rb

@@ -3,6 +3,13 @@
 class SampleTool < ApplicationTool
   description 'Greet a user'
 
+  # Optional: Add annotations to provide hints about the tool's behavior
+  # annotations(
+  #   title: 'User Greeting',
+  #   read_only_hint: true,      # This tool only reads data
+  #   open_world_hint: false     # This tool only accesses the local database
+  # )
+
   arguments do
     required(:id).filled(:integer).description('ID of the user to greet')
     optional(:prefix).filled(:string).description('Prefix to add to the greeting')

data/lib/mcp/railtie.rb

@@ -41,5 +41,9 @@ module FastMcp
       path = File.expand_path('../tasks', __dir__)
       Dir.glob("#{path}/**/*.rake").each { |f| load f }
     end
+
+    generators do
+      require 'generators/fast_mcp/install/install_generator'
+    end
   end
 end

data/lib/mcp/resource.rb

@@ -3,7 +3,7 @@
 require 'json'
 require 'base64'
 require 'mime/types'
-require 'singleton'
+require 'addressable/template'
 
 module FastMcp
   # Resource class for MCP Resources feature
@@ -17,9 +17,62 @@ module FastMcp
       # @return [String] The URI for this resource
       def uri(value = nil)
         @uri = value if value
+
         @uri || (superclass.respond_to?(:uri) ? superclass.uri : nil)
       end
 
+      # Variabilize the URI with the given params
+      # @param params [Hash] The parameters to variabilize the URI with
+      # @return [String] The variabilized URI
+      def variabilized_uri(params = {})
+        addressable_template.partial_expand(params).pattern
+      end
+
+      # Get the Addressable::Template for this resource
+      # @return [Addressable::Template] The Addressable::Template for this resource
+      def addressable_template
+        @addressable_template ||= Addressable::Template.new(uri)
+      end
+
+      # Get the template variables for this resource
+      # @return [Array] The template variables for this resource
+      def template_variables
+        addressable_template.variables
+      end
+
+      # Check if this resource has a templated URI
+      # @return [Boolean] true if the URI contains template parameters
+      def templated?
+        template_variables.any?
+      end
+
+      # Check if this resource has a non-templated URI
+      # @return [Boolean] true if the URI does not contain template parameters
+      def non_templated?
+        !templated?
+      end
+
+      # Match the given URI against the resource's addressable template
+      # @param uri [String] The URI to match
+      # @return [Addressable::Template::MatchData, nil] The match data if the URI matches, nil otherwise
+      def match(uri)
+        addressable_template.match(uri)
+      end
+
+      # Initialize a new instance from the given URI
+      # @param uri [String] The URI to initialize from
+      # @return [Resource] A new resource instance
+      def initialize_from_uri(uri)
+        new(params_from_uri(uri))
+      end
+
+      # Get the parameters from the given URI
+      # @param uri [String] The URI to get the parameters from
+      # @return [Hash] The parameters from the URI
+      def params_from_uri(uri)
+        match(uri).mapping.transform_keys(&:to_sym)
+      end
+
       # Define name for this resource
       # @param value [String, nil] The name for this resource
       # @return [String] The name for this resource
@@ -28,6 +81,13 @@ module FastMcp
         @name || (superclass.respond_to?(:resource_name) ? superclass.resource_name : nil)
       end
 
+      alias original_name name
+      def name
+        return resource_name if resource_name
+
+        original_name
+      end
+
       # Define description for this resource
       # @param value [String, nil] The description for this resource
       # @return [String] The description for this resource
@@ -47,12 +107,21 @@ module FastMcp
       # Get the resource metadata (without content)
       # @return [Hash] Resource metadata
       def metadata
-        {
-          uri: uri,
-          name: resource_name,
-          description: description,
-          mimeType: mime_type
-        }.compact
+        if templated?
+          {
+            uriTemplate: uri,
+            name: resource_name,
+            description: description,
+            mimeType: mime_type
+          }.compact
+        else
+          {
+            uri: uri,
+            name: resource_name,
+            description: description,
+            mimeType: mime_type
+          }.compact
+        end
       end
 
       # Load content from a file (class method)
@@ -87,7 +156,11 @@ module FastMcp
       end
     end
 
-    include Singleton
+    # Initialize with instance variables
+    # @param params [Hash] The parameters for this resource instance
+    def initialize(params = {})
+      @params = params
+    end
 
     # URI of the resource - delegates to class method
     # @return [String, nil] The URI for this resource
@@ -98,7 +171,7 @@ module FastMcp
     # Name of the resource - delegates to class method
     # @return [String, nil] The name for this resource
     def name
-      self.class.name
+      self.class.resource_name
     end
 
     # Description of the resource - delegates to class method
@@ -113,6 +186,10 @@ module FastMcp
       self.class.mime_type
     end
 
+    # Get parameters from the URI template
+    # @return [Hash] The parameters extracted from the URI
+    attr_reader :params
+
     # Method to be overridden by subclasses to dynamically generate content
     # @return [String, nil] Generated content for this resource
     def content
@@ -129,25 +206,5 @@ module FastMcp
         mime_type == 'application/xml' ||
         mime_type == 'application/javascript')
     end
-
-    # Get the resource contents
-    # @return [Hash] Resource contents
-    def contents
-      result = {
-        uri: uri,
-        mimeType: mime_type
-      }
-
-      content_value = content
-      if content_value
-        if binary?
-          result[:blob] = Base64.strict_encode64(content_value)
-        else
-          result[:text] = content_value
-        end
-      end
-
-      result
-    end
   end
 end