actionmcp 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a310c4bc57df9c1cd4d0fceb7b80fd9628414609bb6131e5d420584f5605f59c
-  data.tar.gz: 881fb9d39845277adcb24d42e73475dfc9aca5e25afb2b049c5ee55446aca474
+  metadata.gz: 39f50d723aa2a52bcc863de6cec116970a5595719f4f974e21a91d40e6279685
+  data.tar.gz: d5dd09cf26636b709e928c36b710a7319d4afa05e4538fe090e4a7d9f0571533
 SHA512:
-  metadata.gz: 7e4caed2e47ffb767e8c6980a07542d093cc5bb7dd1d0438c342e0ec7a9c6af56e0409b108955b229f0fa4147d263a3060ce72a2864f7dc5405aab9f28e66bf6
-  data.tar.gz: ddb5fa89098629fecd125c317d935a0d0f3e4d50d828f4cd5d3b1c4b435be648b973235961af62e566431d1f991d4f3f0e11aeb7812b6423e0e4186cb4785b73
+  metadata.gz: bec413dbeb4c8377f57f0d8a4942b0e04bc71412e8aea833730c521965e5b3e1f4803dd5f37553fa7d51d31baeefd8efde86bdb26309e698ae43546a2ad88957
+  data.tar.gz: 8790e5172337913ffc393bf1deaa4f09e689f85f9ba1bc611fcbbd261788cc625deed50fc361c3c1b8d131407777d39bf17461bf9f18893ed21597dd9edeefd1

data/lib/action_mcp/prompt.rb

@@ -57,7 +57,7 @@ module ActionMCP
       validates arg_name, presence: true if required
 
       if enum.present?
-        validates arg_name, inclusion: { in: enum }
+        validates arg_name, inclusion: { in: enum }, allow_blank: !required
       end
     end
 
@@ -109,13 +109,13 @@ module ActionMCP
       if valid?
         begin
           perform # Invoke the subclass-specific logic if valid
-        rescue => e
+        rescue
           # Handle exceptions during execution
-          render text: "Error executing prompt: #{e.message}"
+          @response.mark_as_error!(:internal_error, message: "Unhandled Error executing prompt")
         end
       else
         # Handle validation failure
-        render text: "Invalid input: #{errors.full_messages.join(', ')}"
+        @response.mark_as_error!(:invalid_params, message: "Invalid input", data: errors.full_messages)
       end
 
       @response # Return the response with collected messages

data/lib/action_mcp/prompt_response.rb

@@ -2,10 +2,16 @@
 
 module ActionMCP
   class PromptResponse
-    attr_reader :messages, :description
+    include Enumerable
+
+    attr_reader :messages
+
+    # Delegate methods to the underlying messages array
+    delegate :empty?, :size, :each, :find, :map, to: :messages
 
     def initialize
       @messages = []
+      @is_error = false
     end
 
     # Add a message to the response
@@ -20,24 +26,61 @@ module ActionMCP
       self
     end
 
+    def mark_as_error!(symbol, message: nil, data: nil)
+      @is_error = true
+      @symbol = symbol
+      @error_message = message
+      @error_data = data
+      self
+    end
+
     # Convert to hash format expected by MCP protocol
     def to_h
-      {
-        messages: @messages
-      }
+      if @is_error
+        JsonRpc::JsonRpcError.new(@symbol, message: @error_message, data: @error_data).to_h
+      else
+        {
+          messages: @messages
+        }
+      end
     end
 
-    # Alias to_h to as_json for consistency
-    alias_method :to_h, :as_json
+    # Alias as_json to to_h for consistency
+    alias_method :as_json, :to_h
 
     # Handle to_json directly
     def to_json(options = nil)
       to_h.to_json(options)
     end
 
+    # Compare with hash for easier testing
+    def ==(other)
+      case other
+      when Hash
+        # Convert both to normalized format for comparison
+        hash_self = to_h.deep_transform_keys { |key| key.to_s.underscore }
+        hash_other = other.deep_transform_keys { |key| key.to_s.underscore }
+        hash_self == hash_other
+      when PromptResponse
+        messages == other.messages
+      else
+        super
+      end
+    end
+
+    # Implement eql? for hash key comparison
+    def eql?(other)
+      self == other
+    end
+
+    # Implement hash method for hash key usage
+    def hash
+      [ messages ].hash
+    end
+
     # Pretty print for better debugging
     def inspect
-      "#<#{self.class.name} messages: #{messages.size}"
+      "#<#{self.class.name} messages: #{messages.inspect}>"
     end
   end
 end

data/lib/action_mcp/tool_response.rb

@@ -4,14 +4,12 @@ module ActionMCP
   # Manages the collection of content objects for tool results
   class ToolResponse
     include Enumerable
-
     attr_reader :contents, :is_error
-
     delegate :empty?, :size, :each, :find, :map, to: :contents
 
-    def initialize(is_error: false)
+    def initialize
       @contents = []
-      @is_error = is_error
+      @is_error = false
     end
 
     # Add content to the response
@@ -27,31 +25,30 @@ module ActionMCP
     end
 
     # Convert to hash format expected by MCP protocol
-    def as_json(options = nil)
+    def to_h(options = {})
       {
-        content: @contents.map { |c| c.as_json(options) },
+        content: @contents.map { |c| c.to_h },
         isError: @is_error
-      }.compact
+      }
     end
 
-    # Alias to_h to as_json for consistency
-    alias_method :to_h, :as_json
+    # Alias as_json to to_h for consistency
+    alias_method :as_json, :to_h
 
     # Handle to_json directly
     def to_json(options = nil)
-      as_json(options).to_json
+      to_h.to_json(options)
     end
 
-    # Compare with hash for easier testing
-    # This allows assertions like: assert_equal({content: [...], isError: false}, tool_response)
+    # Compare with hash for easier testing.
     def ==(other)
       case other
       when Hash
-        # Compare our hash representation with the other hash
-        # Use deep symbolization to handle both string and symbol keys
-        to_h.deep_symbolize_keys == other.deep_symbolize_keys
+        # Convert both to normalized format for comparison
+        hash_self = to_h.deep_transform_keys { |key| key.to_s.underscore }
+        hash_other = other.deep_transform_keys { |key| key.to_s.underscore }
+        hash_self == hash_other
       when ToolResponse
-        # Direct comparison with another ToolResponse
         contents == other.contents && is_error == other.is_error
       else
         super

data/lib/action_mcp/version.rb

@@ -2,7 +2,7 @@
 
 require_relative "gem_version"
 module ActionMCP
-  VERSION = "0.9.0"
+  VERSION = "0.10.0"
 
   class << self
     alias version gem_version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: actionmcp
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Abdelkader Boudih