praxis 2.0.pre.20 → 2.0.pre.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ade185970597f7537bf75a761bb1e1a01739f2e696ad006f8421037320051c3
-  data.tar.gz: fd9e948ba2f7d48c0abc94f70bec9cad3f594b41d82f9ce9445df28be010fe14
+  metadata.gz: 22211954ff9fa77a0667e1daf3ae00b30d1d599cd5a25b65547321295e5a2fcb
+  data.tar.gz: 3ec2f9c7f2cd9d261f09675a25ca5211131c65d58cc088a539f60f273d5ac207
 SHA512:
-  metadata.gz: 66e64aafead42894ca61670c3a1ec3411d274d8d6cd80111d28088efd33f4c9641ed88d031cb308d0f0a7896264d877d4aa38a33a7f4944abc56aeb86dac2b81
-  data.tar.gz: e98a655a44a2e0d43b384e14d03ede406ace7ac79a41805e5b31178a07c902ac118e70e8ea8ef26d3cbfb70eca7404e53dd5a636f98b543c91dd90b1385926f0
+  metadata.gz: d46f5cd5b91786467262f2baf3e2e60d27431f3b01ac7d674508f66b33046cb26b6489541eb55324354762964f017dc0e448f69d895dfc7804149e87f57b3b0b
+  data.tar.gz: 957d3f7d32a54f8990e1697a6e6c8182042f15879ef0f8689298ca751b5e0fc5eb64a9f530064066d8722f41b57ddf014889736c5959097c013759ba911beddd

data/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## next
 
+## 2.0.pre.21
+  * Fix nullable attribute in OpenApi generation
 ## 2.0.pre.20
 * Changed the behavior of dev-mode when validate_responses. Now they return a 500 status code (instead of a 400) but with the same validation error format body.
   * validate_responses is meant to catch the application returning non-compliant responses for development only. As such, a 500 is much more appropriate and clear, as the validation is done on the behavior of the server, and not on the information sent by the client (i.e., it is a server problem, not reacting the way the API is defined)

data/lib/praxis/docs/open_api/schema_object.rb

@@ -37,33 +37,33 @@ module Praxis
               h = @attribute_options[:description] ? { 'description' => @attribute_options[:description] } : {}
 
               Praxis::Docs::OpenApiGenerator.instance.register_seen_component(type)
-              h.merge('$ref' => "#/components/schemas/#{type.id}")
+              h.merge!('$ref' => "#/components/schemas/#{type.id}")
             elsif @collection
               items = OpenApi::SchemaObject.new(info: type.member_type).dump_schema(allow_ref: allow_ref, shallow: false)
               h = @attribute_options[:description] ? { 'description' => @attribute_options[:description] } : {}
-              h.merge(type: 'array', items: items)
-            else
-              # Object
+              h.merge!(type: 'array', items: items)
+            else # Attributor::Struct, etc
               props = type.attributes.transform_values do |definition|
                 OpenApi::SchemaObject.new(info: definition).dump_schema(allow_ref: true, shallow: shallow)
               end
-              { type: :object, properties: props } # TODO: Example?
+              h = { type: :object, properties: props } # TODO: Example?
             end
           else
             # OpenApi::SchemaObject.new(info:target).dump_schema(allow_ref: allow_ref, shallow: shallow)
             # TODO...we need to make sure we can use refs in the underlying components after the first level...
             # ... maybe we need to loop over the attributes if it's an object/struct?...
             h = type.as_json_schema(shallow: shallow, example: nil, attribute_options: @attribute_options)
+          end
 
-            # Tag on OpenAPI specific requirements that aren't already added in the underlying JSON schema model
-            # Nullable: (it seems we need to ensure there is a null option to the enum, if there is one)
-            if @attribute_options[:null]
-              h[:nullable] = @attribute_options[:null]
-              h[:enum] = h[:enum] + [nil] if h[:enum] && !h[:enum].include?(nil)
-            end
-            h
+          # Tag on OpenAPI specific requirements that aren't already added in the underlying JSON schema model
+          # Nullable: (it seems we need to ensure there is a null option to the enum, if there is one)
+          if @attribute_options[:null]
+            h[:nullable] = @attribute_options[:null]
+            h[:enum] = h[:enum] + [nil] if h[:enum] && !h[:enum].include?(nil)
           end
 
+          h
+
           # # TODO: FIXME: return a generic object type if the passed info was weird.
           # return { type: :object } unless info
 

data/lib/praxis/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Praxis
-  VERSION = '2.0.pre.20'
+  VERSION = '2.0.pre.21'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: praxis
 version: !ruby/object:Gem::Version
-  version: 2.0.pre.20
+  version: 2.0.pre.21
 platform: ruby
 authors:
 - Josep M. Blanquer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-07 00:00:00.000000000 Z
+date: 2022-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport