elasticgraph-schema_definition 1.0.0 → 1.0.1

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.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +0 -3
  3. data/lib/elastic_graph/schema_definition/indexing/derived_fields/min_or_max_value.rb +18 -2
  4. data/lib/elastic_graph/schema_definition/mixins/has_type_info.rb +2 -2
  5. metadata +20 -34
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: c5f0173872296489fdc329b0a44657194e497acdba7abc49eb64173c8a10d0ca
4
- data.tar.gz: 724259a4adbb18b3f3c993729ab8ea19c14c78242d06669556dd34cca112d88c
3
+ metadata.gz: a17658df238a4aa9a7e736a04af8a2a5997785d4dc21a18424ed2f257082dfd5
4
+ data.tar.gz: 2244f3f1fb2df109800b3a6952321a5b9ec472a010f7254e06ee40f23fdd49e0
5
5
  SHA512:
6
- metadata.gz: eaa7a83413f59158d5b1b9a5a308a7d63aa2dfee32518d4786e6339f6a96704d5859082547fb07cd647aae64414223207770d421c7de293d4f5ca2647b9b5060
7
- data.tar.gz: 7c8680c5685824c49fddffbeb2776613f9037d58f0cc471cf38b695a8309c05d538228d293570ab89e2d67b07fb3599ee66bc167a641e94070de4d1067292ac5
6
+ metadata.gz: 44ba82a6ad8c34b8d1ec5fca695fb9a07a0f39f247352a4d6f83d9330af641c364ff89a566e2526868ff5a125637846ecc65a4de1ff431d0f33f0c2e0cd81810
7
+ data.tar.gz: 544671f6f6e1d62fac830d5d343c9295993b3f93e42f803463c47ad143628c675fcf4f9786098c266639dd8a45cda77481d237e89d005f34ab4ee704bce45d39
data/README.md CHANGED
@@ -21,9 +21,6 @@ graph LR;
21
21
  elasticgraph-indexer["elasticgraph-indexer"];
22
22
  elasticgraph-schema_definition --> elasticgraph-indexer;
23
23
  class elasticgraph-indexer otherEgGemStyle;
24
- elasticgraph-json_schema["elasticgraph-json_schema"];
25
- elasticgraph-schema_definition --> elasticgraph-json_schema;
26
- class elasticgraph-json_schema otherEgGemStyle;
27
24
  elasticgraph-schema_artifacts["elasticgraph-schema_artifacts"];
28
25
  elasticgraph-schema_definition --> elasticgraph-schema_artifacts;
29
26
  class elasticgraph-schema_artifacts otherEgGemStyle;
data/lib/elastic_graph/schema_definition/indexing/derived_fields/min_or_max_value.rb CHANGED
@@ -44,9 +44,25 @@ module ElasticGraph
44
44
  <<~EOS
45
45
  boolean #{min_or_max}Value_idempotentlyUpdateValue(List values, def parentObject, String fieldName) {
46
46
  def currentFieldValue = parentObject[fieldName];
47
- def #{min_or_max}NewValue = values.isEmpty() ? null : Collections.#{min_or_max}(values);
47
+ // Normalize incoming list numerics to long to avoid Integer/Long class cast issues
48
+ List coercedValues = new ArrayList();
49
+ for (def v : values) {
50
+ if (v != null) {
51
+ if (v instanceof Number) {
52
+ coercedValues.add(((Number)v).longValue());
53
+ } else {
54
+ coercedValues.add(v);
55
+ }
56
+ }
57
+ }
58
+ def #{min_or_max}NewValue = coercedValues.isEmpty() ? null : Collections.#{min_or_max}(coercedValues);
59
+
60
+ def coercedCurrentFieldValue = null;
61
+ if (currentFieldValue != null) {
62
+ coercedCurrentFieldValue = (currentFieldValue instanceof Number) ? ((Number)currentFieldValue).longValue() : currentFieldValue;
63
+ }
48
64
 
49
- if (currentFieldValue == null || (#{min_or_max}NewValue != null && #{min_or_max}NewValue.compareTo(currentFieldValue) #{operator} 0)) {
65
+ if (coercedCurrentFieldValue == null || (#{min_or_max}NewValue != null && #{min_or_max}NewValue.compareTo(coercedCurrentFieldValue) #{operator} 0)) {
50
66
  parentObject[fieldName] = #{min_or_max}NewValue;
51
67
  return true;
52
68
  }
data/lib/elastic_graph/schema_definition/mixins/has_type_info.rb CHANGED
@@ -6,7 +6,7 @@
6
6
  #
7
7
  # frozen_string_literal: true
8
8
 
9
- require "elastic_graph/json_schema/meta_schema_validator"
9
+ require "elastic_graph/support/json_schema/meta_schema_validator"
10
10
 
11
11
  module ElasticGraph
12
12
  module SchemaDefinition
@@ -169,7 +169,7 @@ module ElasticGraph
169
169
  def json_schema(**options)
170
170
  validatable_json_schema = Support::HashUtil.stringify_keys(options)
171
171
 
172
- if (error_msg = JSONSchema.strict_meta_schema_validator.validate_with_error_message(validatable_json_schema))
172
+ if (error_msg = Support::JSONSchema.strict_meta_schema_validator.validate_with_error_message(validatable_json_schema))
173
173
  raise Errors::SchemaError, "Invalid JSON schema options set on #{self}:\n\n#{error_msg}"
174
174
  end
175
175
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: elasticgraph-schema_definition
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.0
4
+ version: 1.0.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Myron Marston
@@ -17,70 +17,56 @@ dependencies:
17
17
  requirements:
18
18
  - - '='
19
19
  - !ruby/object:Gem::Version
20
- version: 1.0.0
20
+ version: 1.0.1
21
21
  type: :runtime
22
22
  prerelease: false
23
23
  version_requirements: !ruby/object:Gem::Requirement
24
24
  requirements:
25
25
  - - '='
26
26
  - !ruby/object:Gem::Version
27
- version: 1.0.0
27
+ version: 1.0.1
28
28
  - !ruby/object:Gem::Dependency
29
29
  name: elasticgraph-indexer
30
30
  requirement: !ruby/object:Gem::Requirement
31
31
  requirements:
32
32
  - - '='
33
33
  - !ruby/object:Gem::Version
34
- version: 1.0.0
34
+ version: 1.0.1
35
35
  type: :runtime
36
36
  prerelease: false
37
37
  version_requirements: !ruby/object:Gem::Requirement
38
38
  requirements:
39
39
  - - '='
40
40
  - !ruby/object:Gem::Version
41
- version: 1.0.0
42
- - !ruby/object:Gem::Dependency
43
- name: elasticgraph-json_schema
44
- requirement: !ruby/object:Gem::Requirement
45
- requirements:
46
- - - '='
47
- - !ruby/object:Gem::Version
48
- version: 1.0.0
49
- type: :runtime
50
- prerelease: false
51
- version_requirements: !ruby/object:Gem::Requirement
52
- requirements:
53
- - - '='
54
- - !ruby/object:Gem::Version
55
- version: 1.0.0
41
+ version: 1.0.1
56
42
  - !ruby/object:Gem::Dependency
57
43
  name: elasticgraph-schema_artifacts
58
44
  requirement: !ruby/object:Gem::Requirement
59
45
  requirements:
60
46
  - - '='
61
47
  - !ruby/object:Gem::Version
62
- version: 1.0.0
48
+ version: 1.0.1
63
49
  type: :runtime
64
50
  prerelease: false
65
51
  version_requirements: !ruby/object:Gem::Requirement
66
52
  requirements:
67
53
  - - '='
68
54
  - !ruby/object:Gem::Version
69
- version: 1.0.0
55
+ version: 1.0.1
70
56
  - !ruby/object:Gem::Dependency
71
57
  name: elasticgraph-support
72
58
  requirement: !ruby/object:Gem::Requirement
73
59
  requirements:
74
60
  - - '='
75
61
  - !ruby/object:Gem::Version
76
- version: 1.0.0
62
+ version: 1.0.1
77
63
  type: :runtime
78
64
  prerelease: false
79
65
  version_requirements: !ruby/object:Gem::Requirement
80
66
  requirements:
81
67
  - - '='
82
68
  - !ruby/object:Gem::Version
83
- version: 1.0.0
69
+ version: 1.0.1
84
70
  - !ruby/object:Gem::Dependency
85
71
  name: graphql
86
72
  requirement: !ruby/object:Gem::Requirement
@@ -135,56 +121,56 @@ dependencies:
135
121
  requirements:
136
122
  - - '='
137
123
  - !ruby/object:Gem::Version
138
- version: 1.0.0
124
+ version: 1.0.1
139
125
  type: :development
140
126
  prerelease: false
141
127
  version_requirements: !ruby/object:Gem::Requirement
142
128
  requirements:
143
129
  - - '='
144
130
  - !ruby/object:Gem::Version
145
- version: 1.0.0
131
+ version: 1.0.1
146
132
  - !ruby/object:Gem::Dependency
147
133
  name: elasticgraph-datastore_core
148
134
  requirement: !ruby/object:Gem::Requirement
149
135
  requirements:
150
136
  - - '='
151
137
  - !ruby/object:Gem::Version
152
- version: 1.0.0
138
+ version: 1.0.1
153
139
  type: :development
154
140
  prerelease: false
155
141
  version_requirements: !ruby/object:Gem::Requirement
156
142
  requirements:
157
143
  - - '='
158
144
  - !ruby/object:Gem::Version
159
- version: 1.0.0
145
+ version: 1.0.1
160
146
  - !ruby/object:Gem::Dependency
161
147
  name: elasticgraph-elasticsearch
162
148
  requirement: !ruby/object:Gem::Requirement
163
149
  requirements:
164
150
  - - '='
165
151
  - !ruby/object:Gem::Version
166
- version: 1.0.0
152
+ version: 1.0.1
167
153
  type: :development
168
154
  prerelease: false
169
155
  version_requirements: !ruby/object:Gem::Requirement
170
156
  requirements:
171
157
  - - '='
172
158
  - !ruby/object:Gem::Version
173
- version: 1.0.0
159
+ version: 1.0.1
174
160
  - !ruby/object:Gem::Dependency
175
161
  name: elasticgraph-opensearch
176
162
  requirement: !ruby/object:Gem::Requirement
177
163
  requirements:
178
164
  - - '='
179
165
  - !ruby/object:Gem::Version
180
- version: 1.0.0
166
+ version: 1.0.1
181
167
  type: :development
182
168
  prerelease: false
183
169
  version_requirements: !ruby/object:Gem::Requirement
184
170
  requirements:
185
171
  - - '='
186
172
  - !ruby/object:Gem::Version
187
- version: 1.0.0
173
+ version: 1.0.1
188
174
  email:
189
175
  - myron@squareup.com
190
176
  executables: []
@@ -269,10 +255,10 @@ licenses:
269
255
  - MIT
270
256
  metadata:
271
257
  bug_tracker_uri: https://github.com/block/elasticgraph/issues
272
- changelog_uri: https://github.com/block/elasticgraph/releases/tag/v1.0.0
273
- documentation_uri: https://block.github.io/elasticgraph/api-docs/v1.0.0/
258
+ changelog_uri: https://github.com/block/elasticgraph/releases/tag/v1.0.1
259
+ documentation_uri: https://block.github.io/elasticgraph/api-docs/v1.0.1/
274
260
  homepage_uri: https://block.github.io/elasticgraph/
275
- source_code_uri: https://github.com/block/elasticgraph/tree/v1.0.0/elasticgraph-schema_definition
261
+ source_code_uri: https://github.com/block/elasticgraph/tree/v1.0.1/elasticgraph-schema_definition
276
262
  gem_category: local
277
263
  rdoc_options: []
278
264
  require_paths: