modern 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f483d74d2aa71c07344b8ab689d473b52255fe52e93c45116f8f898887989f70
-  data.tar.gz: 81a87980bb858c2839c779f98364f699c4126a908cd4a6b732812dd749956262
+  metadata.gz: 98b75246df0cf5705be087b807c14450b9c91e663729df7d0886ba4428287348
+  data.tar.gz: 59c973339a53b0d1d10157132cecbf5f46beb88901af2db6833f59ea19e4d6a3
 SHA512:
-  metadata.gz: b168abd8e525ab5f8ab193debbc99b94b61b42eb7dab708825d89be5cb0a804c6b15697036db70619c360cf779c1a95847a956e843adad4ca67bf4c71507b958
-  data.tar.gz: 0a0407e5e6c50609c8ecf7ae2d791c33a76fe1a0eebeb28ad0515e196a32ab235db4cb70f701f845d9f1b22c478a7443b24f497e3eb2dbbeb446d295c6cf50e2
+  metadata.gz: 833d34b65a46ec471edbbc12ce949477bfeef93c80e04f15c53dec67600f60f7c77f7d375ceae70803c4f47a019301e35d4bccaf8adcbdfe69fc197a4f521422
+  data.tar.gz: 53c57c0440bdbff95b26267124b95a6da80d75514eaa0bd2840bff93ff010b4152bc8c5c534b6ef4d829c6159adbbbe0d380a0f74278464be478979b3635595f

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

@@ -83,6 +83,8 @@ module Modern
 
           if !registered_type.nil?
             registered_type
+          elsif entry.is_a?(Class) && entry < Dry::Struct
+            _struct_ref(entry)
           elsif entry.is_a?(Dry::Types::Sum::Constrained)
             if entry.left.type.primitive == NilClass
               # it's a nullable field
@@ -103,13 +105,13 @@ module Modern
             #       http://dry-rb.org/gems/dry-types/constraints/
 
             _build_schema_value(ret, name_to_class, entry.type)
-          elsif entry.is_a?(Dry::Types::Default)
-            # this just unwraps the default value
+          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::Definition)
             primitive = entry.primitive
 
-            if primitive.ancestors.include?(Dry::Struct)
+            if primitive < Dry::Struct
               # TODO: make sure I'm understanding this correctly
               #       It feels weird to have to oneOf a $ref, but I can't figure out a
               #       syntax that doesn't require it.
@@ -120,9 +122,9 @@ module Modern
                   _struct_ref(primitive)
                 ]
               }
-            elsif primitive.ancestors.include?(Hash)
+            elsif primitive < Hash
               _build_object_from_schema(ret, name_to_class, entry.member_types)
-            elsif primitive.ancestors.include?(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.3"
+  VERSION = "0.4.4"
   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.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Ed Ropple
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-06 00:00:00.000000000 Z
+date: 2018-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler