spikard 0.2.5 → 0.3.1

data/lib/spikard/converters.rb

@@ -1,85 +1,13 @@
-# frozen_string_literal: true
-
-require_relative 'upload_file'
-
-module Spikard
-  # Type conversion utilities for handler parameters
-  #
-  # This module handles converting validated JSON data from Rust into Ruby types,
-  # particularly for UploadFile instances.
-  module Converters
-    module_function
-
-    # Check if a value looks like file metadata from Rust
-    #
-    # @param value [Object] Value to check
-    # @return [Boolean]
-    def file_metadata?(value)
-      value.is_a?(Hash) && value.key?('filename') && value.key?('content')
-    end
-
-    # Convert file metadata hash to UploadFile instance
-    #
-    # @param file_data [Hash] File metadata from Rust (filename, content, size, content_type)
-    # @return [UploadFile] UploadFile instance
-    def convert_file_metadata_to_upload_file(file_data)
-      UploadFile.new(
-        file_data['filename'],
-        file_data['content'],
-        content_type: file_data['content_type'],
-        size: file_data['size'],
-        headers: file_data['headers'],
-        content_encoding: file_data['content_encoding']
-      )
-    end
-
-    # Process handler parameters, converting file metadata to UploadFile instances
-    #
-    # This method recursively processes the body parameter, looking for file metadata
-    # structures and converting them to UploadFile instances.
-    #
-    # @param value [Object] The value to process (can be Hash, Array, or primitive)
-    # @return [Object] Processed value with UploadFile instances
-    def process_upload_file_fields(value)
-      # Handle nil
-      return value if value.nil?
-
-      # Handle primitives (String, Numeric, Boolean)
-      return value unless value.is_a?(Hash) || value.is_a?(Array)
-
-      # Handle arrays - recursively process each element
-      if value.is_a?(Array)
-        return value.map do |item|
-          # Check if this array item is file metadata
-          if file_metadata?(item)
-            convert_file_metadata_to_upload_file(item)
-          else
-            # Recursively process nested arrays/hashes
-            process_upload_file_fields(item)
-          end
-        end
-      end
-
-      # Handle hashes - check if it's file metadata first
-      return convert_file_metadata_to_upload_file(value) if file_metadata?(value)
-
-      # Otherwise, recursively process hash values
-      value.transform_values { |v| process_upload_file_fields(v) }
-    end
-
-    # Process handler body parameter, handling UploadFile conversion
-    #
-    # This is the main entry point for converting Rust-provided request data
-    # into Ruby types. It handles:
-    # - Single UploadFile
-    # - Arrays of UploadFile
-    # - Hashes with UploadFile fields
-    # - Nested structures
-    #
-    # @param body [Object] The body parameter from Rust (already JSON-parsed)
-    # @return [Object] Processed body with UploadFile instances
-    def convert_handler_body(body)
-      process_upload_file_fields(body)
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Spikard
+  # Conversion helpers between native Rust values and Ruby types.
+  module Converters
+    module_function
+
+    # No-op conversion now that Rust materialises UploadFile.
+    def convert_handler_body(body)
+      body
+    end
+  end
+end

data/lib/spikard/handler_wrapper.rb

@@ -1,116 +1,113 @@
-# frozen_string_literal: true
-
-require_relative 'converters'
-
-module Spikard
-  # Handler wrapper utilities for automatic file metadata conversion
-  #
-  # Provides ergonomic handler patterns that automatically convert
-  # file metadata to UploadFile instances, eliminating boilerplate.
-  #
-  # @example Basic usage with body only
-  #   app.post('/upload', &wrap_body_handler do |body|
-  #     {
-  #       filename: body[:file].filename,
-  #       content: body[:file].read
-  #     }
-  #   end)
-  #
-  # @example With all parameters
-  #   app.post('/upload', &wrap_handler do |params, query, body|
-  #     {
-  #       id: params[:id],
-  #       search: query[:q],
-  #       file: body[:file].filename
-  #     }
-  #   end)
-  module HandlerWrapper
-    module_function
-
-    # Wrap a handler that receives only the request body
-    #
-    # Automatically converts file metadata in the body to UploadFile instances.
-    #
-    # @yield [body] Handler block that receives converted body
-    # @yieldparam body [Hash] Request body with file metadata converted to UploadFile
-    # @yieldreturn [Hash, Spikard::Response] Response data or Response object
-    # @return [Proc] Wrapped handler proc
-    #
-    # @example
-    #   app.post('/upload', &wrap_body_handler do |body|
-    #     { filename: body[:file].filename }
-    #   end)
-    def wrap_body_handler(&handler)
-      raise ArgumentError, 'block required for wrap_body_handler' unless handler
-
-      # Return a proc that matches the signature expected by Spikard::App
-      # The actual handler receives path params, query params, and body from Rust
-      lambda do |_params, _query, body|
-        converted_body = Converters.convert_handler_body(body)
-        handler.call(converted_body)
-      end
-    end
-
-    # Wrap a handler that receives path params, query params, and body
-    #
-    # Automatically converts file metadata in the body to UploadFile instances.
-    #
-    # @yield [params, query, body] Handler block that receives all request data
-    # @yieldparam params [Hash] Path parameters
-    # @yieldparam query [Hash] Query parameters
-    # @yieldparam body [Hash] Request body with file metadata converted to UploadFile
-    # @yieldreturn [Hash, Spikard::Response] Response data or Response object
-    # @return [Proc] Wrapped handler proc
-    #
-    # @example
-    #   app.post('/users/{id}/upload', &wrap_handler do |params, query, body|
-    #     {
-    #       user_id: params[:id],
-    #       description: query[:desc],
-    #       file: body[:file].filename
-    #     }
-    #   end)
-    def wrap_handler(&handler)
-      raise ArgumentError, 'block required for wrap_handler' unless handler
-
-      lambda do |params, query, body|
-        converted_body = Converters.convert_handler_body(body)
-        handler.call(params, query, converted_body)
-      end
-    end
-
-    # Wrap a handler that receives a context hash with all request data
-    #
-    # Automatically converts file metadata in the body to UploadFile instances.
-    # Useful when you want all request data in a single hash.
-    #
-    # @yield [context] Handler block that receives context hash
-    # @yieldparam context [Hash] Request context with:
-    #   - :params [Hash] Path parameters
-    #   - :query [Hash] Query parameters
-    #   - :body [Hash] Request body with file metadata converted to UploadFile
-    # @yieldreturn [Hash, Spikard::Response] Response data or Response object
-    # @return [Proc] Wrapped handler proc
-    #
-    # @example
-    #   app.post('/upload', &wrap_handler_with_context do |ctx|
-    #     {
-    #       file: ctx[:body][:file].filename,
-    #       query_params: ctx[:query]
-    #     }
-    #   end)
-    def wrap_handler_with_context(&handler)
-      raise ArgumentError, 'block required for wrap_handler_with_context' unless handler
-
-      lambda do |params, query, body|
-        converted_body = Converters.convert_handler_body(body)
-        context = {
-          params: params,
-          query: query,
-          body: converted_body
-        }
-        handler.call(context)
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+require_relative 'converters'
+
+module Spikard
+  # Handler wrapper utilities.
+  #
+  # UploadFile conversion now happens in the Rust binding, so these wrappers
+  # simply forward the already-converted body/params.
+  #
+  # @example Basic usage with body only
+  #   app.post('/upload', &wrap_body_handler do |body|
+  #     {
+  #       filename: body[:file].filename,
+  #       content: body[:file].read
+  #     }
+  #   end)
+  #
+  # @example With all parameters
+  #   app.post('/upload', &wrap_handler do |params, query, body|
+  #     {
+  #       id: params[:id],
+  #       search: query[:q],
+  #       file: body[:file].filename
+  #     }
+  #   end)
+  module HandlerWrapper
+    module_function
+
+    # Wrap a handler that receives only the request body
+    #
+    # Automatically converts file metadata in the body to UploadFile instances.
+    #
+    # @yield [body] Handler block that receives converted body
+    # @yieldparam body [Hash] Request body with file metadata converted to UploadFile
+    # @yieldreturn [Hash, Spikard::Response] Response data or Response object
+    # @return [Proc] Wrapped handler proc
+    #
+    # @example
+    #   app.post('/upload', &wrap_body_handler do |body|
+    #     { filename: body[:file].filename }
+    #   end)
+    def wrap_body_handler(&handler)
+      raise ArgumentError, 'block required for wrap_body_handler' unless handler
+
+      # Return a proc that matches the signature expected by Spikard::App
+      # The actual handler receives path params, query params, and body from Rust
+      lambda do |_params, _query, body|
+        handler.call(body)
+      end
+    end
+
+    # Wrap a handler that receives path params, query params, and body
+    #
+    # Automatically converts file metadata in the body to UploadFile instances.
+    #
+    # @yield [params, query, body] Handler block that receives all request data
+    # @yieldparam params [Hash] Path parameters
+    # @yieldparam query [Hash] Query parameters
+    # @yieldparam body [Hash] Request body with file metadata converted to UploadFile
+    # @yieldreturn [Hash, Spikard::Response] Response data or Response object
+    # @return [Proc] Wrapped handler proc
+    #
+    # @example
+    #   app.post('/users/{id}/upload', &wrap_handler do |params, query, body|
+    #     {
+    #       user_id: params[:id],
+    #       description: query[:desc],
+    #       file: body[:file].filename
+    #     }
+    #   end)
+    def wrap_handler(&handler)
+      raise ArgumentError, 'block required for wrap_handler' unless handler
+
+      lambda do |params, query, body|
+        handler.call(params, query, body)
+      end
+    end
+
+    # Wrap a handler that receives a context hash with all request data
+    #
+    # Automatically converts file metadata in the body to UploadFile instances.
+    # Useful when you want all request data in a single hash.
+    #
+    # @yield [context] Handler block that receives context hash
+    # @yieldparam context [Hash] Request context with:
+    #   - :params [Hash] Path parameters
+    #   - :query [Hash] Query parameters
+    #   - :body [Hash] Request body with file metadata converted to UploadFile
+    # @yieldreturn [Hash, Spikard::Response] Response data or Response object
+    # @return [Proc] Wrapped handler proc
+    #
+    # @example
+    #   app.post('/upload', &wrap_handler_with_context do |ctx|
+    #     {
+    #       file: ctx[:body][:file].filename,
+    #       query_params: ctx[:query]
+    #     }
+    #   end)
+    def wrap_handler_with_context(&handler)
+      raise ArgumentError, 'block required for wrap_handler_with_context' unless handler
+
+      lambda do |params, query, body|
+        context = {
+          params: params,
+          query: query,
+          body: body
+        }
+        handler.call(context)
+      end
+    end
+  end
+end