modern 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98b75246df0cf5705be087b807c14450b9c91e663729df7d0886ba4428287348
-  data.tar.gz: 59c973339a53b0d1d10157132cecbf5f46beb88901af2db6833f59ea19e4d6a3
+  metadata.gz: acd2d0084d17c885739efdb6c43b4bb92b063fcc97926797096f669f92e5ff62
+  data.tar.gz: 3108fb860bc3d119c66d7f86ec8e200e1c3f5be6abfe2ceeafa62ffc11fdbcf5
 SHA512:
-  metadata.gz: 833d34b65a46ec471edbbc12ce949477bfeef93c80e04f15c53dec67600f60f7c77f7d375ceae70803c4f47a019301e35d4bccaf8adcbdfe69fc197a4f521422
-  data.tar.gz: 53c57c0440bdbff95b26267124b95a6da80d75514eaa0bd2840bff93ff010b4152bc8c5c534b6ef4d829c6159adbbbe0d380a0f74278464be478979b3635595f
+  metadata.gz: 86f097562f5e6506f5ae6fb49261065d5a05120aafc0dfdcc3c996f7d14007a16eaabe34b753e09cfdef335cc752cd36e7bb6e888a7952c62533bcac6e1897c9
+  data.tar.gz: 82ab10dacaed0357ba80395a1ad0745085925a9cc4d0f010e1f081bedd8ae738710aebdfefb8ffd5a95c65177bb892023d230a4d3e8a9aa8c9d37f64abaea8de

data/lib/modern/doc_generator/open_api3/schemas.rb

@@ -31,12 +31,19 @@ module Modern
           ret = {}
           name_to_class = {}
 
-          descriptor.root_schemas \
-                    .select { |type_or_structclass| type_or_structclass.is_a?(Class) } \
-                    .each do |structclass|
+          schema_entries =
+            descriptor.root_schemas.partition do |type_or_structclass|
+              type_or_structclass.is_a?(Class)
+            end
+
+          schema_entries.first.each do |structclass|
             _build_struct(ret, name_to_class, structclass)
           end
 
+          schema_entries.last.each do |dt|
+            _build_schema_value(ret, name_to_class, dt)
+          end
+
           ret
         end
 
@@ -84,11 +91,17 @@ module Modern
           if !registered_type.nil?
             registered_type
           elsif entry.is_a?(Class) && entry < Dry::Struct
+            _build_struct(ret, name_to_class, entry)
             _struct_ref(entry)
-          elsif entry.is_a?(Dry::Types::Sum::Constrained)
+          elsif entry.is_a?(Dry::Types::Array::Member) && entry.options.key?(:member)
+            _build_schema_value(ret, name_to_class, entry.options[:member])
+          elsif entry.is_a?(Dry::Types::Sum)
             if entry.left.type.primitive == NilClass
               # it's a nullable field
               _build_schema_value(ret, name_to_class, entry.right).merge(nullable: true)
+            elsif entry.right.type.primitive == NilClass
+              # it's a backwards nullable field
+              _build_schema_value(ret, name_to_class, entry.left).merge(nullable: true)
             else
               {
                 anyOf: _flatten_any_of(
@@ -108,6 +121,8 @@ module Modern
           elsif entry.is_a?(Dry::Types::Default) || entry.is_a?(Dry::Struct::Constructor) || entry.is_a?(Dry::Types::Constructor)
             # this just unwraps the underlying value
             _build_schema_value(ret, name_to_class, entry.type)
+          elsif entry.is_a?(Dry::Types::Enum)
+            _build_schema_value(ret, name_to_class, entry.type).merge(enum: entry.values)
           elsif entry.is_a?(Dry::Types::Definition)
             primitive = entry.primitive
 
@@ -122,9 +137,9 @@ module Modern
                   _struct_ref(primitive)
                 ]
               }
-            elsif primitive < Hash
+            elsif primitive <= Hash
               _build_object_from_schema(ret, name_to_class, entry.member_types)
-            elsif primitive < Array
+            elsif primitive <= Array
               {
                 type: "array",
                 items: _build_schema_value(ret, name_to_class, entry.member)

data/lib/modern/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Modern
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
   OPENAPI_VERSION = "3.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: modern
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Ed Ropple
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-23 00:00:00.000000000 Z
+date: 2018-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler