dry-types-json-schema 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3c596c245aad8cb72bc10fbe904078ac01c7522d14c135b4a6645a7b7f5c769
-  data.tar.gz: 5fc2b32368fdcb1135b32fdb7d3db27c2104966ff371f020eea750df08588b4f
+  metadata.gz: 67e63d34a8b81578fef86941bd3f448062ddf6357f5ea66751882f424a52bd28
+  data.tar.gz: 732938510bbdfa5490421cebfff6de06b57108819bdc0f7f7806f03ad4c8131b
 SHA512:
-  metadata.gz: 50ed4c3ca20040b4d88ae5ecf107c6ccfad7ae7242a724f1c3afd9f015f63a7b203966571af8699614881f7848a657d322554bbb541ff48244194662a73c40e1
-  data.tar.gz: 4810a8578cfecb91df93f66b4a9ad6748db42ef0ebd219c1dfce4eeb52c9fd6992027925579dea2f545b57b38f851eca600ef1eb898ba0a5f114e8d42c14537f
+  metadata.gz: a0133a959fe532c4f5c75a5084c674a2e83553af6e6abb6580a1809fba8f5dd15c748640c786f4d22cd04a00303582ddc3ef957b707ec00d17281621bf4e6ad7
+  data.tar.gz: 05b90642aa10bce11add57b7591fa466a0102f9c5d62e4fa29b8a2f0a1318908d0a10baf9c36531fadf5584764d740b0beb3a7e21b540be63eb03a4b23f03ba0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dry-types-json-schema (0.0.3)
+    dry-types-json-schema (0.0.4)
       dry-types (~> 1.7.2)
 
 GEM

data/dry-types-json-schema.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name              = "dry-types-json-schema"
-  s.version           = "0.0.3"
+  s.version           = "0.0.4"
   s.summary           = "Generate JSON Schema from dry-types"
   s.authors           = ["elcuervo"]
   s.licenses          = %w[MIT]

data/lib/dry/types/extensions/json_schema.rb

@@ -17,7 +17,7 @@ module Dry
       IDENTITY = ->(v, _) { v }.freeze
       INSPECT = ->(v, _) { v.inspect }.freeze
       TO_INTEGER = ->(v, _) { v.to_i }.freeze
-      TO_ARRAY = ->(v, _) { v.to_a }.freeze
+      TO_ARRAY = ->(v, _) { Array(v) }.freeze
       TO_TYPE = ->(v, _) { CLASS_TO_TYPE.fetch(v.to_s.to_sym) }.freeze
 
       # Metadata annotations and allowed types overrides for schema generation.
@@ -161,14 +161,18 @@ module Dry
 
         definition.transform_values! { |v| v.call(type, ctx) }
 
-        return unless definition.any? && ctx
+        return unless definition.any?
 
         if (extra = EXTRA_PROPS_FOR_TYPE[type.to_s.to_sym])
           definition = definition.merge(extra)
         end
 
-        @keys[ctx] ||= {}
-        @keys[ctx].merge!(definition)
+        if ctx.nil?
+          @keys.merge!(definition)
+        else
+          @keys[ctx] ||= {}
+          @keys[ctx].merge!(definition)
+        end
       end
 
       def visit_intersection(node, opts = EMPTY_HASH)

data/spec/extensions/json_schema_spec.rb

@@ -16,6 +16,14 @@ describe Dry::Types::JSONSchema do
         { type: :string, format: :email, title: title }
       end
     end
+
+    it_conforms_definition do
+      let(:type) { Dry::Types["string"].enum(*%w[a b]) }
+
+      let(:definition) do
+        { type: :string, enum: %w[a b] }
+      end
+    end
   end
 
   describe "hash" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dry-types-json-schema
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - elcuervo