json_model_rb 0.1.22 → 0.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d90d48751d60c7659e5307e712510a9f93b283df371b5a5f844932f81e5b521c
-  data.tar.gz: 49452ae911f59bab15249b804889bfe48636a74de9fedae4f658e37e99b00500
+  metadata.gz: 8e523a1baeb8b4df65376a0a0faf3c51c9d759c41baea7b3a963ec06dff69dd6
+  data.tar.gz: 76e9f892bd2c2999ae3710b397a83d713e582bb2d032782f707cf0c7195dc323
 SHA512:
-  metadata.gz: 25a33e3c1dce3c63aa18a1e5e8c258fd34d59d6fd84b69ae681cf7d8aa1dc38f09af92e898b4403d4d376398f13af11db5eb43f9738c9bb3efca00999240a631
-  data.tar.gz: bdf75c96f987a150b4c09aecb20469768c45886278e0c6087b5fc467ef129a029de604f79515bb783fc299a0ed0fba0357ff185539949aa3881d60278cfad6bd
+  metadata.gz: 7a8dc6b87e9d56f3c513cced01ce02435cc590d67ceef494b244902cb5acae3836c12d70aafb9cf2dec78e45a4fb9ad0ecfa68d6c098ad7ba4ca337bfa7fdbeb
+  data.tar.gz: 74aee7bc7e7bf1ed5ef0274398a200f47ea56bcdcf908697aa9569d94de3e3a5b6178ed35c8cf41ce374b1514be1789f65b321fbf2ba06bb969db48bdb431a4d

data/lib/json_model/schema.rb

@@ -16,9 +16,11 @@ module JsonModel
         new(attributes)
       end
 
+      # @param [Symbol] key
+      # @return [Symbol]
       def invert_alias(key)
-        builder = builders.find { |b| b.alias.to_s == key.to_s }
-        builder&.type&.name
+        builder = local_builders.find { |b| b.alias.to_s == key.to_s }
+        builder&.type&.name || key
       end
 
       # @return [Hash]
@@ -35,8 +37,8 @@ module JsonModel
 
       # @return [Hash, nil]
       def properties_as_schema
-        if builders.any?
-          builders
+        if local_builders.any?
+          local_builders
             .sort_by(&:alias)
             .map(&:as_schema)
             .inject({}, &:merge)
@@ -45,8 +47,8 @@ module JsonModel
 
       # @return [Array, nil]
       def required_properties_as_schema
-        if builders.any?
-          builders
+        if local_builders.any?
+          local_builders
             .reject(&:optional?)
             .map(&:alias)
             .sort
@@ -55,7 +57,7 @@ module JsonModel
 
       # @return [Hash, nil]
       def defs_as_schema
-        referenced_schemas = builders
+        referenced_schemas = local_builders
                                .flat_map(&:referenced_schemas)
                                .uniq
 
@@ -64,12 +66,20 @@ module JsonModel
         end
       end
 
+      # @return [Array<Builder>]
+      def local_builders
+        @local_builders ||= @schema
+                              .type
+                              .reject { |type| parent_keys.include?(type) }
+                              .map { |type| Builder.for(type) }
+      end
+
       # @return [Array<Builder>]
       def builders
-        @builders ||= @schema
-                        .type
-                        .reject { |type| parent_keys.include?(type) }
-                        .map { |type| Builder.for(type) }
+        @builders ||= @local_builders + @schema
+                                          .type
+                                          .select { |type| parent_keys.include?(type) }
+                                          .map { |type| Builder.for(type) }
       end
 
       # @return [Array<Class>]

data/lib/json_model/types/any_of.rb

@@ -46,7 +46,7 @@ module JsonModel
 
         # @return [AnyOf]
         def build
-          AnyOf.new(mapping.values.uniq.reduce(&:|), tag_key: tag_key, mapping: mapping) do |input|
+          AnyOf.new(mapping.values.map(&:type).uniq.reduce(&:|), tag_key: tag_key, mapping: mapping) do |input|
             tag = input[tag_key]
             type = mapping[tag]
             raise(Dry::Types::ConstraintError, "Unknown tag #{tag.inspect}") unless type

data/lib/json_model/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JsonModel
-  VERSION = '0.1.22'
+  VERSION = '0.1.23'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json_model_rb
 version: !ruby/object:Gem::Version
-  version: 0.1.22
+  version: 0.1.23
 platform: ruby
 authors:
 - Paul Gillesberger