apia-open_api 0.1.7 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce32b2c3d98cff03c533669e56c860dcda6b97a0deb554d423f8c208645ea87a
-  data.tar.gz: 9f9d5b952f2cc7141a0c207fa8d43c9d5d7a2a617dabb1819bb07e6a7decc691
+  metadata.gz: ab4263122239dfce8e477f4279cbe4a03743f0e6fa4c1236c0480082d517ec8c
+  data.tar.gz: 8542223956ac7fc5fc4817cc627c0d5ec96876cd1f671a4e26422deae3818387
 SHA512:
-  metadata.gz: 5b83929f1bc986f6ce7d8d736f30b76992868bd6442d72b9f8456d83537bc91b1b8d4297ad94655aaf86720d40468305215f2e28fcd61f63253ee9d24fc59874
-  data.tar.gz: 13c108fcb4596a5912781732192e4bac034c6dd7a441e951edff6b740515e188a3ee03ba73cb63c518f235bff5a57b09a0dd3a8f3dcff77f79ccfb81edfbb61c
+  metadata.gz: 05131ea1ca348bce2d637314eba336e07bb4553f71ef3fd107c23ee854f107f09b26d24c0cdfdebb259ef450421bbcdc8864b6ac8fc057e32ac8570d590f24eb
+  data.tar.gz: 95cad90b7979f85e4cc085bb25ea7f33583766f8b05ef94a8ac91a93701e27e6b757bc3e63141211a9fab5dad16f57872b98dd3ad1c5a77fefa4c25c9b4f3bb1

data/lib/apia/open_api/objects/parameters.rb

@@ -82,6 +82,10 @@ module Apia
         # refer to: https://swagger.io/docs/specification/describing-parameters/#dependencies
         def generate_argument_set_params
           @argument.type.klass.definition.arguments.each_value do |child_arg|
+            # Complex argument sets are not supported in query params (e.g. nested objects)
+            # https://github.com/apiaframework/apia-openapi/issues/66
+            next if child_arg.type.argument_set?
+
             param = {
               name: "#{@argument.name}[#{child_arg.name}]",
               in: "query",

data/lib/apia/open_api/objects/path.rb

@@ -36,20 +36,29 @@ module Apia
           @api_authenticator = api_authenticator
           @route_spec = {
             operationId: convert_route_to_id,
-            tags: [name]
+            summary: @route.endpoint.definition.name,
+            description: @route.endpoint.definition.description,
+            tags: route.group ? get_group_tags(route.group) : [name]
           }
         end
 
         def add_to_spec
+          add_scopes_description
           path = @route.path
+
           if @route.request_method == :get
             add_parameters
           else
             add_request_body
           end
 
-          @spec[:paths]["/#{path}"] ||= {}
-          @spec[:paths]["/#{path}"][@route.request_method.to_s] = @route_spec
+          path = "/#{path}"
+          # Remove the `:` from the url parameters in the path
+          # This is because some tools based on the OpenAPI spec don't like the `:` in the path
+          path = path.gsub(/:([^\/]+)/, '\1')
+
+          @spec[:paths][path] ||= {}
+          @spec[:paths][path][@route.request_method.to_s] = @route_spec
 
           add_responses
         end
@@ -79,6 +88,24 @@ module Apia
           ).add_to_spec
         end
 
+        # Adds a description of the scopes to the route specification.
+        #
+        # This method checks if the route's endpoint definition has any scopes.
+        # If there are scopes, it appends a description of the scopes to the existing route specification description.
+        # The description of the scopes is formatted as a markdown list, with each scope represented as a bullet point.
+        def add_scopes_description
+          return unless @route.endpoint.definition.scopes.any?
+
+          @route_spec[:description] =
+            <<~DESCRIPTION
+              #{@route_spec[:description]}
+              ## Scopes
+              #{@route.endpoint.definition.scopes.map do |scope|
+                "- `#{scope}`"
+              end.join("\n")}
+            DESCRIPTION
+        end
+
         # It's worth creating a 'nice' operationId for each route, as this is used as the
         # basis for the method name when calling the endpoint using a generated client.
         def convert_route_to_id
@@ -126,6 +153,22 @@ module Apia
           "#{first_part}#{last_part}"
         end
 
+        # Returns an array of tags representing the group hierarchy for a given group.
+        #
+        # @param group [Group] The group for which to retrieve the tags.
+        # @return [Array<String>] An array of tags representing the group hierarchy.
+        def get_group_tags(group)
+          tags = []
+          current_group = group
+
+          while current_group
+            tags.unshift(current_group.name)
+            current_group = current_group.parent
+          end
+
+          tags
+        end
+
       end
     end
   end

data/lib/apia/open_api/rack.rb

@@ -41,7 +41,7 @@ module Apia
         specification = Specification.new(api_class, base_url, @options[:name])
         body = specification.json
 
-        [200, { "Content-Type" => "application/json", "Content-Length" => body.bytesize.to_s }, [body]]
+        [200, { "content-type" => "application/json", "content-length" => body.bytesize.to_s }, [body]]
       end
 
     end

data/lib/apia/open_api/specification.rb

@@ -26,7 +26,9 @@ module Apia
           components: {
             schemas: {}
           },
-          security: []
+          security: [],
+          tags: [],
+          "x-tagGroups": []
         }
 
         # path_ids is used to keep track of all the IDs of all the paths we've generated, to avoid duplicates
@@ -41,11 +43,20 @@ module Apia
 
       private
 
+      def sort_hash_by_nested_tag(hash)
+        hash.sort_by do |_, nested_hash|
+          nested_hash.values.first[:tags]&.first
+        end.to_h
+      end
+
       def build_spec
         add_info
         add_servers
         add_paths
         add_security
+        add_tag_groups
+
+        @spec[:paths] = sort_hash_by_nested_tag(@spec[:paths])
       end
 
       def add_info
@@ -85,6 +96,63 @@ module Apia
         end
       end
 
+      def get_tag_group_index(tag)
+        @spec[:"x-tagGroups"].each_with_index do |group, index|
+          return index if !group.nil? && group[:name] == tag
+        end
+
+        nil
+      end
+
+      # Adds tag groups to the OpenAPI specification.
+      #
+      # This method iterates over the paths in the specification and adds tag groups
+      # based on the tags specified for each method.
+      # It ensures that each tag is included in the `tags` array of the specification,
+      # and creates tag groups based on the order of the tags.
+      # Tag groups are represented by the `x-tagGroups` property in the specification.
+      # Tag groups are nested groups and are used to group tags together in documentation.
+      # A Tag *must* be included in a tag group. So if it is not part of a group / has no parent tag,
+      # it will be added to a group with the same name as the tag.
+      #
+      # @return [void]
+      def add_tag_groups
+        @spec[:paths].each_value do |methods|
+          methods.each_value do |method_spec|
+            method_spec[:tags].each_with_index do |tag, tag_index|
+              unless @spec[:tags].any? { |t| t[:name] == tag }
+                @spec[:tags] << { name: tag }
+              end
+
+              next if tag_index.zero?
+
+              tags = method_spec[:tags]
+
+              parent_tag = tags[tag_index - 1]
+              parent_index = get_tag_group_index(parent_tag)
+
+              if parent_index.nil? && tags.size > 1
+                @spec[:"x-tagGroups"] << { name: parent_tag, tags: [parent_tag] }
+                parent_index = @spec[:"x-tagGroups"].size - 1
+              end
+
+              unless @spec[:"x-tagGroups"][parent_index][:tags].include?(tag)
+                @spec[:"x-tagGroups"][parent_index][:tags] << tag
+              end
+            end
+          end
+        end
+
+        @spec[:tags].each do |tag|
+          unless @spec[:"x-tagGroups"].any? { |group| group[:tags].include?(tag[:name]) }
+            @spec[:"x-tagGroups"] << { name: tag[:name], tags: [tag[:name]] }
+          end
+        end
+
+        @spec[:"x-tagGroups"].sort_by! { |group| group[:name] }
+        @spec[:"x-tagGroups"].each { |group| group[:tags].sort! }
+      end
+
     end
   end
 end

data/lib/apia/open_api/version.rb

@@ -3,7 +3,7 @@
 module Apia
   module OpenApi
 
-    VERSION = "0.1.7"
+    VERSION = "0.1.9"
 
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apia-open_api
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.9
 platform: ruby
 authors:
 - Paul Sturgess
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-05-22 00:00:00.000000000 Z
+date: 2024-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport