sober_swag 0.15.0 → 0.20.0

data/lib/sober_swag/compiler/paths.rb

@@ -2,15 +2,28 @@ module SoberSwag
   class Compiler
     ##
     # Compile multiple routes into a paths set.
+    # This basically just aggregates {SoberSwag::Controller::Route} objects.
     class Paths
+      ##
+      # Set up a new paths compiler with no routes in it.
       def initialize
         @routes = []
       end
 
+      ##
+      # Add on a new {SoberSwag::Controller::Route}
+      #
+      # @param route [SoberSwag::Controller::Route] the route description to add to compilation
+      # @return [SoberSwag::Compiler::Paths] self
       def add_route(route)
         @routes << route
+
+        self
       end
 
+      ##
+      # In the OpenAPI V3 spec, we group action definitions by their path.
+      # This helps us do that.
       def grouped_paths
         routes.group_by(&:path)
       end
@@ -20,6 +33,9 @@ module SoberSwag
       # paths list. Since this is only a compiler for paths,
       # it has *no idea* how to handle types. So, it takes a compiler
       # which it will use to do that for it.
+      #
+      # @param compiler [SoberSwag::Compiler::Type] the type compiler to use
+      # @return [Hash] a schema for all contained routes.
       def paths_list(compiler)
         grouped_paths.transform_values do |values|
           values.map { |route|
@@ -31,6 +47,8 @@ module SoberSwag
       ##
       # Get a list of all types we discovered when compiling
       # the paths.
+      #
+      # @yield [Class] all the types found in all the routes described in here.
       def found_types
         return enum_for(:found_types) unless block_given?
 
@@ -41,6 +59,8 @@ module SoberSwag
         end
       end
 
+      ##
+      # @return [Array<SoberSwag::Controller::Route>] the routes to document
       attr_reader :routes
 
       private

data/lib/sober_swag/compiler/primitive.rb

@@ -4,7 +4,11 @@ module SoberSwag
     # Compiles a primitive type.
     # Almost always constructed with the values from
     # {SoberSwag::Nodes::Primitive}.
+    #
+    # This works by either generating a swagger primitive definition, *or* a `$ref` to one with a given identifier.
     class Primitive
+      ##
+      # @param type [Class] the swagger-able class to document.
       def initialize(type)
         @type = type
 
@@ -13,6 +17,8 @@ module SoberSwag
 
       attr_reader :type
 
+      ##
+      # Is this documenting one of the build-in swagger types?
       def swagger_primitive?
         SWAGGER_PRIMITIVE_DEFS.include?(type)
       end
@@ -25,6 +31,9 @@ module SoberSwag
 
       ##
       # Turn this type into a swagger hash with a proper type key.
+      # This is suitable for use as the value of a `schema` key in a definition.
+      #
+      # @return [Hash] the schema.
       def type_hash
         if swagger_primitive?
           SWAGGER_PRIMITIVE_DEFS.fetch(type)
@@ -37,9 +46,16 @@ module SoberSwag
         end
       end
 
+      ##
+      # Primitive schema used for ruby `Date` values.
       DATE_PRIMITIVE = { type: :string, format: :date }.freeze
+      ##
+      # Primitive schema used for ruby `DateTime` values.
       DATE_TIME_PRIMITIVE = { type: :string, format: :'date-time' }.freeze
+      HASH_PRIMITIVE = { type: :object, additionalProperties: true }.freeze
 
+      ##
+      # Map of types that are considered "primitive types" in the OpenAPI V3 spec.
       SWAGGER_PRIMITIVE_DEFS =
         {
           NilClass => :null,
@@ -52,9 +68,12 @@ module SoberSwag
         .to_h.merge(
           Date => DATE_PRIMITIVE,
           DateTime => DATE_TIME_PRIMITIVE,
-          Time => DATE_TIME_PRIMITIVE
+          Time => DATE_TIME_PRIMITIVE,
+          Hash => HASH_PRIMITIVE
         ).transform_values(&:freeze).freeze
 
+      ##
+      # @return [String] the schema reference
       def ref_name
         raise Error, 'is not a type that is named!' if swagger_primitive?
 

data/lib/sober_swag/compiler/type.rb

@@ -1,45 +1,95 @@
 module SoberSwag
   class Compiler
     ##
-    # A compiler for DRY-Struct data types, essentially.
-    # It only consumes one type at a time.
+    # A compiler for swagger-able types.
+    #
+    # This class turns Swagger-able types into a *schema*.
+    # This Schema may be:
+    # - a [schema object](https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.3.md#schemaObject) with {#object_schema}
+    # - a [path schema](https://swagger.io/docs/specification/describing-parameters/#path-parameters) with {#path_schema}
+    # - a [query schema](https://swagger.io/docs/specification/describing-parameters/#query-parameters) with {#query_schema}
+    #
+    # As such, it compiles all types to all applicable schemas.
+    #
+    # While this class compiles *one* type at a time, it *keeps track* of the other types needed to describe this schema.
+    # It stores these types in a set, available at {#found_types}.
+    #
+    # For example, with a schema like:
+    #
+    # ```ruby
+    # class Bar < SoberSwag::InputObject
+    #   attribute :baz, primitive(:String)
+    # end
+    #
+    # class Foo < SoberSwag::InputObject
+    #   attribute :bar, Bar
+    # end
+    # ```
+    #
+    # If you compile `Foo` with this class, {#found_types} will include `Bar`.
+    #
     class Type # rubocop:disable Metrics/ClassLength
+      ##
+      # An error raised when a type is too complicated for a given schema.
+      # This may be due to containing too many layers of nesting.
       class TooComplicatedError < ::SoberSwag::Compiler::Error; end
+      ##
+      # An error raised when a type is too complicated to transform into a *path* schema.
       class TooComplicatedForPathError < TooComplicatedError; end
+      ##
+      # An error raised when a type is too complicated to transform into a *query* schema.
       class TooComplicatedForQueryError < TooComplicatedError; end
 
+      ##
+      # A list of acceptable keys to use as metadata for an object schema.
+      # All other metadata keys defined on a type with {SoberSwag::InputObject.meta} will be ignored.
+      #
+      # @return [Array<Symbol>] valid keys.
       METADATA_KEYS = %i[description deprecated].freeze
 
+      ##
+      # Create a new compiler for a swagger-able type.
+      # @param type [Class] the type to compile
       def initialize(type)
         @type = type
       end
 
+      ##
+      # @return [Class] the type we are compiling.
       attr_reader :type
 
       ##
       # Is this type standalone, IE, worth serializing on its own
       # in the schemas section of our schema?
+      # @return [true,false]
       def standalone?
         type.is_a?(Class)
       end
 
+      ##
+      # Get back the [schema object](https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.3.md#schemaObject)
+      # for the type described.
+      #
+      # @return [Hash]
       def object_schema
         @object_schema ||=
           make_object_schema
       end
 
-      def object_schema_meta
-        return {} unless standalone? && type <= SoberSwag::Type::Named
-
-        {
-          description: type.description
-        }.reject { |_, v| v.nil? }
-      end
-
+      ##
+      # Give a "stub type" for this schema.
+      # This is suitable to use as the schema for attributes of other schemas.
+      # Almost always generates a ref object.
+      # @return [Hash] the OpenAPI V3 schema stub
       def schema_stub
         @schema_stub ||= generate_schema_stub
       end
 
+      ##
+      # The schema for this type when it is path of the path.
+      #
+      # @raise [TooComplicatedForPathError] when the compiled type is too complicated to use in a path
+      # @return [Hash] a [path parameters hash](https://swagger.io/docs/specification/describing-parameters/#path-parameters) for this type.
       def path_schema
         path_schema_stub.map do |e|
           ensure_uncomplicated(e[:name], e[:schema])
@@ -51,16 +101,30 @@ module SoberSwag
 
       DEFAULT_QUERY_SCHEMA_ATTRS = { in: :query, style: :deepObject, explode: true }.freeze
 
+      ##
+      # The schema for this type when it is part of the query.
+      # @raise [TooComplicatedForQueryError] when this type is too complicated to use in a query schema
+      # @return [Hash] a [query parameters hash](https://swagger.io/docs/specification/describing-parameters/#query-parameters) for this type.
       def query_schema
         path_schema_stub.map { |e| DEFAULT_QUERY_SCHEMA_ATTRS.merge(e) }
       rescue TooComplicatedError => e
         raise TooComplicatedForQueryError, e.message
       end
 
+      ##
+      # Get the name of this type if it is to be used in a `$ref` key.
+      # This is useful if we are going to use this type compiler to compile an *attribute* of another object.
+      #
+      # @return [String] a reference specifier for this type
       def ref_name
         SoberSwag::Compiler::Primitive.new(type).ref_name
       end
 
+      ##
+      # Get a set of all other types needed to compile this type.
+      # This set will *not* include the type being compiled.
+      #
+      # @return [Set<Class>]
       def found_types
         @found_types ||=
           begin
@@ -69,32 +133,51 @@ module SoberSwag
           end
       end
 
-      def mapped_type
-        @mapped_type ||= parsed_type.map { |v| SoberSwag::Compiler::Primitive.new(v).type_hash }
-      end
-
-      def parsed_type
-        @parsed_type ||=
-          begin
-            (parsed,) = parsed_result
-            parsed
-          end
-      end
-
+      ##
+      # This type, parsed into an AST.
       def parsed_result
         @parsed_result ||= Parser.new(type_for_parser).run_parser
       end
 
+      ##
+      # Standard ruby equality.
       def eql?(other)
         other.class == self.class && other.type == type
       end
 
+      ##
+      # Standard ruby hashing method.
+      # Compilers hash to the same value if they are compiling the same type.
       def hash
         [self.class, type].hash
       end
 
       private
 
+      ##
+      # Get metadata attributes to be used if compiling an object schema.
+      #
+      # @return [Hash]
+      def object_schema_meta
+        return {} unless standalone? && type <= SoberSwag::Type::Named
+
+        {
+          description: type.description
+        }.reject { |_, v| v.nil? }
+      end
+
+      def parsed_type
+        @parsed_type ||=
+          begin
+            (parsed,) = parsed_result
+            parsed
+          end
+      end
+
+      def mapped_type
+        @mapped_type ||= parsed_type.map { |v| SoberSwag::Compiler::Primitive.new(v).type_hash }
+      end
+
       def generate_schema_stub
         if type.is_a?(Class)
           SoberSwag::Compiler::Primitive.new(type).type_hash

data/lib/sober_swag/controller.rb

@@ -2,7 +2,8 @@ require 'active_support/concern'
 
 module SoberSwag
   ##
-  # Controller concern
+  # This module can be included in any subclass of `ActionController` or `ActionController::API` to make it `SoberSwag`-able.
+  # This means that you can use the mechanics of SoberSwag to define a type-safe API, with generated Swagger documentation!
   module Controller
     extend ActiveSupport::Concern
 
@@ -17,14 +18,18 @@ module SoberSwag
       include ::Dry::Types()
     end
 
-    class_methods do
+    ##
+    # Module containing class methods.
+    # Any class that `include`s {SoberSwag::Controller} will also `extend` {SoberSwag::Controller::ClassMethods}.
+    module ClassMethods
       ##
       # Define a new action with the given HTTP method, action name, and path.
-      # This will eventaully delegate to making an actual method on your controller,
+      # This will eventually delegate to making an actual method on your controller,
       # so you can use controllers as you wish with no harm.
       #
       # This method takes a block, evaluated in the context of a {SoberSwag::Controller::Route}.
       # Used like:
+      #
       #     define(:get, :show, '/posts/{id}') do
       #       path_params do
       #         attribute :id, Types::Integer
@@ -36,32 +41,46 @@ module SoberSwag
       #     end
       #
       # This will define an "action module" on this class to contain the generated types.
-      # In the above example, the following constants will be deifned on the controller:
-      #     PostsController::Show # the container module for everything in this action
-      #     PostsController::Show::PathParams # the dry-struct type for the path attribute.
+      # In the above example, the following constants will be defined on the controller:
+      #
+      # - `PostsController::Show` - the container module for everything in this action
+      # - `PostsController::Show::PathParams` - the dry-struct type for the path attribute.
+      #
       # So, in the same controller, you can refer to Show::PathParams to get the type created by the 'path_params' block above.
+      #
+      # The block given evaluates in the context of `SoberSwag::Controller::Route`.
+      #
+      # @todo Explore parsing the `path` parameter from rails routes so we can avoid forcing the duplicate boilerplate.
+      #
+      # @param method [Symbol] the HTTP method of this route
+      # @param action [Symbol] the name of the controller method this maps onto
+      # @param path [String] an OpenAPI v3 Path Specifier
       def define(method, action, path, &block)
         r = Route.new(method, action, path)
         r.instance_eval(&block)
         const_set(r.action_module_name, r.action_module)
         defined_routes << r
-        define_method(action, r.action) if r.action
       end
 
       ##
       # All the routes that this controller knows about.
+      # @return [Array<SoberSwag::Controller::Route>
       def defined_routes
         @defined_routes ||= []
       end
 
       ##
       # Find a route with the given name.
+      # @param name [Symbol] the name
+      # @return [SoberSwag::Controller::Route]
       def find_route(name)
         defined_routes.find { |r| r.action_name.to_s == name.to_s }
       end
 
       ##
-      # A swagger definition for *this controller only*.
+      # Get the OpenAPI v3 definition for this controller.
+      #
+      # @return [Hash]
       def swagger_info
         @swagger_info ||=
           begin
@@ -74,14 +93,19 @@ module SoberSwag
       end
     end
 
+    included do |base|
+      base.extend ClassMethods
+    end
+
     ##
-    # Action to get the singular swagger for this entire API.
+    # ActiveController action to get the swagger definition for this API.
+    # It renders a JSON of the OpenAPI v3 schema for this API.
     def swagger
       render json: self.class.swagger_info
     end
 
     ##
-    # Get the path parameters, parsed into the type you defined with {SoberSwag::Controller.define}
+    # Get the path parameters, parsed into the type you defined with {SoberSwag::Controller::ClassMethods#define}
     # @raise [UndefinedPathError] if there's no path params defined for this route
     # @raise [Dry::Struct::Error] if we cannot convert the path params to the defined type.
     def parsed_path
@@ -90,12 +114,12 @@ module SoberSwag
           r = current_action_def
           raise UndefinedPathError unless r&.path_params_class
 
-          r.path_params_class.new(request.path_parameters)
+          r.path_params_class.call(request.path_parameters)
         end
     end
 
     ##
-    # Get the request body, parsed into the type you defined with {SoberSwag::Controller.define}.
+    # Get the request body, parsed into the type you defined with {SoberSwag::Controller::ClassMethods#define}.
     # @raise [UndefinedBodyError] if there's no request body defined for this route
     # @raise [Dry::Struct::Error] if we cannot convert the path params to the defined type.
     def parsed_body
@@ -104,12 +128,12 @@ module SoberSwag
           r = current_action_def
           raise UndefinedBodyError unless r&.request_body_class
 
-          r.request_body_class.new(body_params)
+          r.request_body_class.call(body_params)
         end
     end
 
     ##
-    # Get the query params, parsed into the type you defined with {SoberSwag::Controller.define}
+    # Get the query params, parsed into the type you defined with {SoberSwag::Controller::ClassMethods#define}
     # @raise [UndefinedQueryError] if there's no query params defined for this route
     # @raise [Dry::Struct::Error] if we cannot convert the path params to the defined type.
     def parsed_query
@@ -118,7 +142,7 @@ module SoberSwag
           r = current_action_def
           raise UndefinedQueryError unless r&.query_params_class
 
-          r.query_params_class.new(request.query_parameters)
+          r.query_params_class.call(request.query_parameters)
         end
     end
 
@@ -140,6 +164,8 @@ module SoberSwag
     # This kinda violates the "be liberal in what you accept" principle,
     # but it keeps the docs honest: parameters sent in the body *must* be
     # in the body.
+    #
+    # @return [Hash]
     def body_params
       request.request_parameters
     end
@@ -147,6 +173,7 @@ module SoberSwag
     ##
     # Get the action-definition for the current action.
     # Under the hood, delegates to the `:action` key of rails params.
+    # @return [SoberSwag::Controller::Route]
     def current_action_def
       self.class.find_route(params[:action])
     end