Merge pull request #457 from koic/fix_rubocop_shopify_3_0_offenses

Fix RuboCop offenses detected with rubocop-shopify 3.0.0

.rubocop.yml

@@ -16,3 +16,7 @@ Lint/IncompatibleIoSelectWithFiberScheduler:
 
 Minitest/LiteralAsActualArgument:
   Enabled: true
+
+Naming/MethodName:
+  AllowedPatterns:
+    - '\Atest_'

lib/json_rpc_handler.rb

@@ -16,7 +16,7 @@ module JsonRpcHandler
     PARSE_ERROR = -32700
   end
 
-  DEFAULT_ALLOWED_ID_CHARACTERS = /\A[a-zA-Z0-9_-]+\z/
+  DEFAULT_ALLOWED_ID_CHARACTERS = /\A[a-zA-Z0-9_-]+\z/.freeze
 
   # Sentinel return value from a handler. When a handler returns this,
   # `process_request` emits no JSON-RPC response for the request,

lib/mcp/client/oauth/discovery.rb

@@ -37,7 +37,7 @@ module MCP
         # Matches a single `key=value` pair inside an HTTP auth-scheme challenge.
         # `value` is either a quoted string (which can contain commas and spaces)
         # or a bare token, per RFC 7235.
-        WWW_AUTH_PARAM_PATTERN = /\A([A-Za-z0-9_-]+)\s*=\s*(?:"((?:[^"\\]|\\.)*)"|([^\s,]+))/
+        WWW_AUTH_PARAM_PATTERN = /\A([A-Za-z0-9_-]+)\s*=\s*(?:"((?:[^"\\]|\\.)*)"|([^\s,]+))/.freeze
 
         class << self
           # Parses a `WWW-Authenticate` header and returns the parameters of

lib/mcp/configuration.rb

@@ -5,7 +5,7 @@ module MCP
     LATEST_STABLE_PROTOCOL_VERSION = "2025-11-25"
     SUPPORTED_STABLE_PROTOCOL_VERSIONS = [
       LATEST_STABLE_PROTOCOL_VERSION, "2025-06-18", "2025-03-26", "2024-11-05",
-    ]
+    ].freeze
     DEFAULT_NEGOTIATED_PROTOCOL_VERSION = "2025-03-26"
 
     attr_writer :exception_reporter, :around_request

lib/mcp/icon.rb

@@ -2,7 +2,7 @@
 
 module MCP
   class Icon
-    SUPPORTED_THEMES = ["light", "dark"]
+    SUPPORTED_THEMES = ["light", "dark"].freeze
 
     attr_reader :mime_type, :sizes, :src, :theme
 

lib/mcp/instrumentation.rb

@@ -14,9 +14,7 @@ module MCP
       rescue => e
         already_reported = begin
           !!exception_already_reported&.call(e)
-        # rubocop:disable Lint/RescueException
         rescue Exception
-          # rubocop:enable Lint/RescueException
           # The predicate is expected to be side-effect-free and return a boolean.
           # Any exception raised from it (including non-StandardError such as SystemExit)
           # must not shadow the original exception.

lib/mcp/resource_template.rb

@@ -8,7 +8,7 @@ module MCP
       # Applied after `Regexp.escape`, which turns `{` and `}` into `\{` and `\}`.
       # Variable names are restricted to valid Regexp named-group names,
       # so RFC 6570 operator expressions (e.g. `{?query}`) stay literal and never match.
-      VARIABLE_PATTERN = /\\\{([A-Za-z_]\w*)\\\}/
+      VARIABLE_PATTERN = /\\\{([A-Za-z_]\w*)\\\}/.freeze
 
       attr_reader :uri_template_value
       attr_reader :title_value

lib/mcp/server.rb

@@ -963,9 +963,7 @@ module MCP
     end
 
     def index_resources_by_uri(resources)
-      resources.each_with_object({}) do |resource, hash|
+      resources.to_h { |resource| [resource.uri, resource] }
-        hash[resource.uri] = resource
-      end
     end
 
     def error_tool_response(text)

test/mcp/server/transports/stdio_notification_integration_test.rb

@@ -27,7 +27,7 @@ module MCP
             nil # Simulate end of input
           end
 
-          def set_encoding(encoding) # rubocop:disable Naming/AccessorMethodName
+          def set_encoding(encoding)
             # Mock implementation
           end
 

test/mcp/server/transports/streamable_http_transport_test.rb

@@ -1925,7 +1925,10 @@ module MCP
         end
 
         test "missing MCP-Protocol-Version header falls back to default for validation" do
-          MCP::Configuration::SUPPORTED_STABLE_PROTOCOL_VERSIONS.stubs(:include?).returns(false)
+          # The constant is frozen, so swap it out instead of stubbing `include?` on it.
+          original_versions = MCP::Configuration::SUPPORTED_STABLE_PROTOCOL_VERSIONS
+          MCP::Configuration.send(:remove_const, :SUPPORTED_STABLE_PROTOCOL_VERSIONS)
+          MCP::Configuration.const_set(:SUPPORTED_STABLE_PROTOCOL_VERSIONS, [].freeze)
 
           request = Rack::Request.new(
             "REQUEST_METHOD" => "POST",
@@ -1938,6 +1941,9 @@ module MCP
 
           body = JSON.parse(response[2][0])
           assert_includes body["error"]["message"], MCP::Configuration::DEFAULT_NEGOTIATED_PROTOCOL_VERSION
+        ensure
+          MCP::Configuration.send(:remove_const, :SUPPORTED_STABLE_PROTOCOL_VERSIONS)
+          MCP::Configuration.const_set(:SUPPORTED_STABLE_PROTOCOL_VERSIONS, original_versions)
         end
 
         test "POST request with empty MCP-Protocol-Version header returns 400" do