json_model_rb 0.1.22 → 0.1.24
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/json_model/schema.rb +20 -10
- data/lib/json_model/types/any_of.rb +1 -1
- data/lib/json_model/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 9de086a259003cabd719e1d136f8849943f7ddbe03dc159e8b222a9fad906e16
|
|
4
|
+
data.tar.gz: f56d53d6c70c97545a12a7dab8426a0a19afb1a26c53508a1f029def5ff5bf94
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: d1eb31d9a5459f2fc18a9b066712c7eec233da44c34b4f7370fb801c5dd8995ff8387e312acd5d66e63b7b8a48c233760b8ad99d94a277a9d794cbdc10065170
|
|
7
|
+
data.tar.gz: 894d35b00daef15e54c823f0889d940746df5bff569042d25e9c070973c2b6d59804058b7515da2752db3d57ef364cb1ca0d2a15022b1ed6e2ed291b8607b45f
|
data/lib/json_model/schema.rb
CHANGED
|
@@ -16,9 +16,11 @@ module JsonModel
|
|
|
16
16
|
new(attributes)
|
|
17
17
|
end
|
|
18
18
|
|
|
19
|
+
# @param [Symbol] key
|
|
20
|
+
# @return [Symbol]
|
|
19
21
|
def invert_alias(key)
|
|
20
22
|
builder = builders.find { |b| b.alias.to_s == key.to_s }
|
|
21
|
-
builder&.type&.name
|
|
23
|
+
builder&.type&.name || key
|
|
22
24
|
end
|
|
23
25
|
|
|
24
26
|
# @return [Hash]
|
|
@@ -35,8 +37,8 @@ module JsonModel
|
|
|
35
37
|
|
|
36
38
|
# @return [Hash, nil]
|
|
37
39
|
def properties_as_schema
|
|
38
|
-
if
|
|
39
|
-
|
|
40
|
+
if local_builders.any?
|
|
41
|
+
local_builders
|
|
40
42
|
.sort_by(&:alias)
|
|
41
43
|
.map(&:as_schema)
|
|
42
44
|
.inject({}, &:merge)
|
|
@@ -45,8 +47,8 @@ module JsonModel
|
|
|
45
47
|
|
|
46
48
|
# @return [Array, nil]
|
|
47
49
|
def required_properties_as_schema
|
|
48
|
-
if
|
|
49
|
-
|
|
50
|
+
if local_builders.any?
|
|
51
|
+
local_builders
|
|
50
52
|
.reject(&:optional?)
|
|
51
53
|
.map(&:alias)
|
|
52
54
|
.sort
|
|
@@ -55,7 +57,7 @@ module JsonModel
|
|
|
55
57
|
|
|
56
58
|
# @return [Hash, nil]
|
|
57
59
|
def defs_as_schema
|
|
58
|
-
referenced_schemas =
|
|
60
|
+
referenced_schemas = local_builders
|
|
59
61
|
.flat_map(&:referenced_schemas)
|
|
60
62
|
.uniq
|
|
61
63
|
|
|
@@ -64,12 +66,20 @@ module JsonModel
|
|
|
64
66
|
end
|
|
65
67
|
end
|
|
66
68
|
|
|
69
|
+
# @return [Array<Builder>]
|
|
70
|
+
def local_builders
|
|
71
|
+
@local_builders ||= @schema
|
|
72
|
+
.type
|
|
73
|
+
.reject { |type| parent_keys.include?(type) }
|
|
74
|
+
.map { |type| Builder.for(type) }
|
|
75
|
+
end
|
|
76
|
+
|
|
67
77
|
# @return [Array<Builder>]
|
|
68
78
|
def builders
|
|
69
|
-
@builders ||= @schema
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
79
|
+
@builders ||= @local_builders + @schema
|
|
80
|
+
.type
|
|
81
|
+
.select { |type| parent_keys.include?(type) }
|
|
82
|
+
.map { |type| Builder.for(type) }
|
|
73
83
|
end
|
|
74
84
|
|
|
75
85
|
# @return [Array<Class>]
|
|
@@ -46,7 +46,7 @@ module JsonModel
|
|
|
46
46
|
|
|
47
47
|
# @return [AnyOf]
|
|
48
48
|
def build
|
|
49
|
-
AnyOf.new(mapping.values.uniq.reduce(&:|), tag_key: tag_key, mapping: mapping) do |input|
|
|
49
|
+
AnyOf.new(mapping.values.map(&:type).uniq.reduce(&:|), tag_key: tag_key, mapping: mapping) do |input|
|
|
50
50
|
tag = input[tag_key]
|
|
51
51
|
type = mapping[tag]
|
|
52
52
|
raise(Dry::Types::ConstraintError, "Unknown tag #{tag.inspect}") unless type
|
data/lib/json_model/version.rb
CHANGED