apia-open_api 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a45fd172c715b417ff39eca615ecf87f12b49d68a3a0b005702be43e1cce2b7
-  data.tar.gz: 0bc1c81f27016b6df2085c3968ef1262a8d2630533a6e836bd786940b5c6bb7d
+  metadata.gz: d7c3d54619c699cf9edca73ebc76e68819c2656f0259adbd6d5e411d4e415ca6
+  data.tar.gz: f31e758e511dd57af96896cd9ca956e6455c29747fc8389d5bda59a6c5938f3d
 SHA512:
-  metadata.gz: 0b0c1e241009a2cebd05ad12a654fab114634ebd3a9eb2aa29e7134cbf6c87e6b8ffae9bfa1b62e5339308475b9b610adfae3197bd56450d7bd5b1229ca119e7
-  data.tar.gz: 2650e1efa99461dd62ae0359baee53aa494d312655ead60df13ba4a4384b08461a99c0e8bef9a7ae6d60f6411a12229ff1c36fdb325a45ac168c269da430a397
+  metadata.gz: 1f96b6eca24cc4d97d4e248892adf62bce141c4d4cce4697c8141cd1b844465d7ce9ef33036daddee81bf908dd41b4cc1bcad2b4436bc2cd1aef431e8fba8602
+  data.tar.gz: 1754bd390af23a0c88658c9a58b7c367f1743df4021a2f47c186720b3b3ff8235be743adaf62d0a3613502ae22267264f6aea71ae44ab716ba5ca8b86257345d

data/README.md

@@ -2,17 +2,13 @@
 
 This gem can generate an [OpenAPI](https://www.openapis.org/) compatible schema from an API implemented using [Apia](https://github.com/krystal/apia).
 
-## Installation
+This gem is in the early phases of development and breaking changes may be introduced whilst the gem is in the 0.1.x version range.
 
-TODO: Replace `UPDATE_WITH_YOUR_GEM_NAME_PRIOR_TO_RELEASE_TO_RUBYGEMS_ORG` with your gem name right after releasing it to RubyGems.org. Please do not do it earlier due to security reasons. Alternatively, replace this section with instructions to install your gem from git if you don't plan to release to RubyGems.org.
+## Installation
 
 Install the gem and add to the application's Gemfile by executing:
 
-    $ bundle add UPDATE_WITH_YOUR_GEM_NAME_PRIOR_TO_RELEASE_TO_RUBYGEMS_ORG
-
-If bundler is not being used to manage dependencies, install the gem by executing:
-
-    $ gem install UPDATE_WITH_YOUR_GEM_NAME_PRIOR_TO_RELEASE_TO_RUBYGEMS_ORG
+    $ bundle add apia-open_api
 
 ## Usage
 
@@ -85,7 +81,7 @@ You can also run `bin/console` for an interactive prompt that will allow you to
 
 ## Releasing a new version
 
-TODO: Write instructions for releasing a new version of the gem.
+[Release Please](https://github.com/googleapis/release-please) is configured. The [convential commits](https://www.conventionalcommits.org/en/v1.0.0/) format should be used and upon merging to main, Release Please will open a new PR following semver rules. When that Release Please PR is merged, a new version will be published to RubyGems.
 
 ## Contributing
 

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

@@ -283,16 +283,31 @@ module Apia
           component_schema
         end
 
+        # We want to declare the code in the error response as an enum, with only
+        # one possible value, as this makes it explicit to the client what the
+        # value will be.
+        #
+        # However, the code field is not defined as an Enum scalar within Apia,
+        # so we generate an Enum definition "on the fly" here.
+        #
+        # This means we can add a schema for the enum and a related $ref, which
+        # helps prompt client generators to generate an explicit enum type for the code.
+        # Otherwise if we generate the enum 'inline' in the response, some client generators
+        # will not generate an enum type for the code.
         def generate_schema_properties_for_definition(definition)
-          detail = generate_schema_ref(definition, id: generate_id_from_definition(definition))
+          id = generate_id_from_definition(definition)
+          detail_ref = generate_schema_ref(definition, id: id)
+
+          code_enum_id = "#{id}Enum"
+          code_enum_field_definition = Definitions::Field.new(:enum, id: code_enum_id)
+          code_enum_field_definition.type = Class.new(Apia::Enum) { value(definition.code) }
+          code_ref = generate_schema_ref(code_enum_field_definition, id: code_enum_id)
+
           {
             properties: {
-              code: {
-                type: "string",
-                enum: [definition.code]
-              },
+              code: code_ref,
               description: { type: "string" },
-              detail: detail
+              detail: detail_ref
             }
           }
         end

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

@@ -40,7 +40,7 @@ module Apia
           @definition = definition
           @schema = schema
           @id = id
-          @endpoint = endpoint
+          @endpoint = endpoint # endpoint gets specified when we are dealing with a partial response
           @path = path
           @children = []
         end
@@ -130,6 +130,10 @@ module Apia
             schema[:properties][child.name.to_s] = generate_scalar_schema(child)
           end
 
+          if child.try(:null?)
+            schema[:properties][child.name.to_s][:nullable] = true
+          end
+
           if child.try(:required?)
             schema[:required] ||= []
             schema[:required] << child.name.to_s
@@ -141,7 +145,7 @@ module Apia
           schema[:type] = "object"
           schema[:properties] ||= {}
           if all_properties_included
-            schema[:properties][child.name.to_s] = generate_schema_ref(child)
+            ref = generate_schema_ref(child)
           else
             child_path = @path.nil? ? nil : @path + [child]
 
@@ -149,13 +153,16 @@ module Apia
             # very long IDs, so we truncate them to avoid hitting the 100 character
             # filename limit imposed by the rubygems gem builder.
             truncated_id = @id.match(/^(.*?)\d*?(Response|Part).*$/)[1]
-            schema[:properties][child.name.to_s] = generate_schema_ref(
+            ref = generate_schema_ref(
               child,
               id: "#{truncated_id}Part_#{child.name}".camelize,
               endpoint: @endpoint,
               path: child_path
             )
           end
+
+          # Using allOf is a workaround to allow us to set a ref as `nullable` in OpenAPI 3.0
+          schema[:properties][child.name.to_s] = { allOf: [ref] }
         end
 
       end

data/lib/apia/open_api/version.rb

@@ -3,7 +3,7 @@
 module Apia
   module OpenApi
 
-    VERSION = "0.1.3"
+    VERSION = "0.1.5"
 
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apia-open_api
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Paul Sturgess
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-12-13 00:00:00.000000000 Z
+date: 2024-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -70,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.19
 signing_key: 
 specification_version: 4
 summary: Apia OpenAPI spec generator