servactory 2.12.0.rc4 → 2.13.0

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 (7) hide show
  1. checksums.yaml +4 -4
  2. data/lib/servactory/context/workspace/inputs.rb +0 -3
  3. data/lib/servactory/result.rb +2 -5
  4. data/lib/servactory/test_kit/rspec/matchers/have_service_attribute_matchers/schema_matcher.rb +13 -4
  5. data/lib/servactory/tool_kit/dynamic_options/schema.rb +11 -7
  6. data/lib/servactory/version.rb +2 -2
  7. metadata +36 -36
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 0eeedc0bdb210dc43654a350e337b9e5ba40e6f69b91f37c5443d482d5d58bab
4
- data.tar.gz: 74c2289271ea87d31960ecd619a58e38dfe623810e6db94664a3f0a1b59c6504
3
+ metadata.gz: effe21494947a824c5ee5f49b022a92157a69906a6b5f41cdf96a02b08bedc55
4
+ data.tar.gz: 7d52a8e143393e05824426f6c62e2d767191cee35b106fc159f3c2d72bfab50e
5
5
  SHA512:
6
- metadata.gz: 7948c4bf0fc55a38670915580532ac09c5be55ed4192b768be8eb2e594dcd2f56bd2fa30d4c4fe4802f2e9c32a98288b048877576871234b0eb86320fb36561a
7
- data.tar.gz: 7c945cefc19c640ad66dbf67beab4b5abb9a8f4de5c7de9fcfdb5172c81021fb538f26c2a1c971f4080dfeef33fc30d083d094222e391a9b75105032bf615be6
6
+ metadata.gz: e10b019ae010c04a64fe28fc0e06b7e10d756ad7f6217e45c9241cc81c421fdbae8e36944de03b3de035aa307ed0b93a73a77e375fa218bfe198ed2a24a3e37a
7
+ data.tar.gz: 511d7cb765402d1a3b1ce41d30d7abf1964a0070191a10aaa3eb0109089b8a5ad49dde6e6904e539c8a1cc4bfe5343e48a10f13df378b0ab8472ed02d6d584ef
data/lib/servactory/context/workspace/inputs.rb CHANGED
@@ -4,9 +4,6 @@ module Servactory
4
4
  module Context
5
5
  module Workspace
6
6
  class Inputs
7
- RESERVED_ATTRIBUTES = %i[type required default].freeze
8
- private_constant :RESERVED_ATTRIBUTES
9
-
10
7
  def initialize(context:, collection_of_inputs:)
11
8
  @context = context
12
9
  @collection_of_inputs = collection_of_inputs
data/lib/servactory/result.rb CHANGED
@@ -117,11 +117,8 @@ module Servactory
117
117
  def outputs
118
118
  @outputs ||= Outputs.new(
119
119
  outputs: @context.send(:servactory_service_warehouse).outputs,
120
- predicate_methods_enabled: if @context.is_a?(Servactory::TestKit::Result)
121
- true
122
- else
123
- @context.class.config.predicate_methods_enabled?
124
- end
120
+ predicate_methods_enabled:
121
+ @context.is_a?(Servactory::TestKit::Result) || @context.class.config.predicate_methods_enabled?
125
122
  )
126
123
  end
127
124
 
data/lib/servactory/test_kit/rspec/matchers/have_service_attribute_matchers/schema_matcher.rb CHANGED
@@ -29,8 +29,7 @@ module Servactory
29
29
  end
30
30
 
31
31
  def description
32
- result = "schema: "
33
- result + schema_data
32
+ "schema: #{schema_data}"
34
33
  end
35
34
 
36
35
  def matches?(subject)
@@ -58,10 +57,20 @@ module Servactory
58
57
  schema_data_equal?
59
58
  end
60
59
 
61
- def schema_data_equal?
60
+ def schema_data_equal? # rubocop:disable Metrics/MethodLength
61
+ matcher_result =
62
+ RSpec::Expectations::ExpectationHelper
63
+ .with_matcher(
64
+ RSpec::Expectations::PositiveExpectationHandler,
65
+ RSpec::Matchers::BuiltIn::Match.new(schema_data),
66
+ nil
67
+ ) do |matcher|
68
+ matcher.matches?(attribute_schema_is)
69
+ end
70
+
62
71
  @schema_data_equal ||=
63
72
  (
64
- schema_data.present? && schema_data == attribute_schema_is
73
+ schema_data.present? && matcher_result
65
74
  ) || schema_data.blank?
66
75
  end
67
76
 
data/lib/servactory/tool_kit/dynamic_options/schema.rb CHANGED
@@ -4,8 +4,8 @@ module Servactory
4
4
  module ToolKit
5
5
  module DynamicOptions
6
6
  class Schema < Must # rubocop:disable Metrics/ClassLength
7
- RESERVED_ATTRIBUTES = %i[type required default].freeze
8
- private_constant :RESERVED_ATTRIBUTES
7
+ RESERVED_OPTIONS = %i[type required default payload].freeze
8
+ private_constant :RESERVED_OPTIONS
9
9
 
10
10
  def self.use(option_name = :schema, default_hash_mode_class_names:)
11
11
  instance = new(option_name, :is, false)
@@ -65,7 +65,7 @@ module Servactory
65
65
  if attribute_type == Hash
66
66
  validate_for!(
67
67
  object: object.fetch(schema_key, {}),
68
- schema: schema_value.except(*RESERVED_ATTRIBUTES),
68
+ schema: schema_value.except(*RESERVED_OPTIONS),
69
69
  root_schema_key: schema_key
70
70
  )
71
71
  else
@@ -134,14 +134,18 @@ module Servactory
134
134
  if attribute_type == Hash
135
135
  prepare_object_with!(
136
136
  object: object.fetch(schema_key, {}),
137
- schema: schema_value.except(*RESERVED_ATTRIBUTES)
137
+ schema: schema_value.except(*RESERVED_OPTIONS)
138
138
  )
139
139
  else
140
- next object unless object[schema_key].nil?
140
+ unless (default = schema_value.fetch(:default, nil)).nil?
141
+ object[schema_key] = default
142
+ end
141
143
 
142
- next object if (default = schema_value.fetch(:default, nil)).nil?
144
+ unless (input_prepare = schema_value.fetch(:prepare, nil)).nil?
145
+ object[schema_key] = input_prepare.call(value: object[schema_key])
146
+ end
143
147
 
144
- object[schema_key] = default
148
+ object
145
149
  end
146
150
  end
147
151
  end
data/lib/servactory/version.rb CHANGED
@@ -3,9 +3,9 @@
3
3
  module Servactory
4
4
  module VERSION
5
5
  MAJOR = 2
6
- MINOR = 12
6
+ MINOR = 13
7
7
  PATCH = 0
8
- PRE = "rc4"
8
+ PRE = nil
9
9
 
10
10
  STRING = [MAJOR, MINOR, PATCH, PRE].compact.join(".")
11
11
  end
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: servactory
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.12.0.rc4
4
+ version: 2.13.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Anton Sokolov
8
8
  bindir: bin
9
9
  cert_chain: []
10
- date: 2025-03-01 00:00:00.000000000 Z
10
+ date: 2025-03-06 00:00:00.000000000 Z
11
11
  dependencies:
12
12
  - !ruby/object:Gem::Dependency
13
13
  name: activesupport
@@ -33,70 +33,70 @@ dependencies:
33
33
  name: base64
34
34
  requirement: !ruby/object:Gem::Requirement
35
35
  requirements:
36
- - - "~>"
36
+ - - ">="
37
37
  - !ruby/object:Gem::Version
38
38
  version: '0.2'
39
39
  type: :runtime
40
40
  prerelease: false
41
41
  version_requirements: !ruby/object:Gem::Requirement
42
42
  requirements:
43
- - - "~>"
43
+ - - ">="
44
44
  - !ruby/object:Gem::Version
45
45
  version: '0.2'
46
46
  - !ruby/object:Gem::Dependency
47
47
  name: bigdecimal
48
48
  requirement: !ruby/object:Gem::Requirement
49
49
  requirements:
50
- - - "~>"
50
+ - - ">="
51
51
  - !ruby/object:Gem::Version
52
- version: '3.0'
52
+ version: '3.1'
53
53
  type: :runtime
54
54
  prerelease: false
55
55
  version_requirements: !ruby/object:Gem::Requirement
56
56
  requirements:
57
- - - "~>"
57
+ - - ">="
58
58
  - !ruby/object:Gem::Version
59
- version: '3.0'
59
+ version: '3.1'
60
60
  - !ruby/object:Gem::Dependency
61
61
  name: i18n
62
62
  requirement: !ruby/object:Gem::Requirement
63
63
  requirements:
64
- - - "~>"
64
+ - - ">="
65
65
  - !ruby/object:Gem::Version
66
66
  version: '1.14'
67
67
  type: :runtime
68
68
  prerelease: false
69
69
  version_requirements: !ruby/object:Gem::Requirement
70
70
  requirements:
71
- - - "~>"
71
+ - - ">="
72
72
  - !ruby/object:Gem::Version
73
73
  version: '1.14'
74
74
  - !ruby/object:Gem::Dependency
75
75
  name: mutex_m
76
76
  requirement: !ruby/object:Gem::Requirement
77
77
  requirements:
78
- - - "~>"
78
+ - - ">="
79
79
  - !ruby/object:Gem::Version
80
- version: '0.2'
80
+ version: '0.3'
81
81
  type: :runtime
82
82
  prerelease: false
83
83
  version_requirements: !ruby/object:Gem::Requirement
84
84
  requirements:
85
- - - "~>"
85
+ - - ">="
86
86
  - !ruby/object:Gem::Version
87
- version: '0.2'
87
+ version: '0.3'
88
88
  - !ruby/object:Gem::Dependency
89
89
  name: zeitwerk
90
90
  requirement: !ruby/object:Gem::Requirement
91
91
  requirements:
92
- - - "~>"
92
+ - - ">="
93
93
  - !ruby/object:Gem::Version
94
94
  version: '2.6'
95
95
  type: :runtime
96
96
  prerelease: false
97
97
  version_requirements: !ruby/object:Gem::Requirement
98
98
  requirements:
99
- - - "~>"
99
+ - - ">="
100
100
  - !ruby/object:Gem::Version
101
101
  version: '2.6'
102
102
  - !ruby/object:Gem::Dependency
@@ -119,98 +119,98 @@ dependencies:
119
119
  requirements:
120
120
  - - ">="
121
121
  - !ruby/object:Gem::Version
122
- version: '1.31'
122
+ version: '2.23'
123
123
  type: :development
124
124
  prerelease: false
125
125
  version_requirements: !ruby/object:Gem::Requirement
126
126
  requirements:
127
127
  - - ">="
128
128
  - !ruby/object:Gem::Version
129
- version: '1.31'
129
+ version: '2.23'
130
130
  - !ruby/object:Gem::Dependency
131
131
  name: datory
132
132
  requirement: !ruby/object:Gem::Requirement
133
133
  requirements:
134
134
  - - ">="
135
135
  - !ruby/object:Gem::Version
136
- version: 2.1.0
136
+ version: 2.2.0
137
137
  type: :development
138
138
  prerelease: false
139
139
  version_requirements: !ruby/object:Gem::Requirement
140
140
  requirements:
141
141
  - - ">="
142
142
  - !ruby/object:Gem::Version
143
- version: 2.1.0
143
+ version: 2.2.0
144
144
  - !ruby/object:Gem::Dependency
145
145
  name: rake
146
146
  requirement: !ruby/object:Gem::Requirement
147
147
  requirements:
148
- - - "~>"
148
+ - - ">="
149
149
  - !ruby/object:Gem::Version
150
- version: '13.0'
150
+ version: '13.2'
151
151
  type: :development
152
152
  prerelease: false
153
153
  version_requirements: !ruby/object:Gem::Requirement
154
154
  requirements:
155
- - - "~>"
155
+ - - ">="
156
156
  - !ruby/object:Gem::Version
157
- version: '13.0'
157
+ version: '13.2'
158
158
  - !ruby/object:Gem::Dependency
159
159
  name: rbs
160
160
  requirement: !ruby/object:Gem::Requirement
161
161
  requirements:
162
162
  - - ">="
163
163
  - !ruby/object:Gem::Version
164
- version: 3.1.3
164
+ version: '3.8'
165
165
  type: :development
166
166
  prerelease: false
167
167
  version_requirements: !ruby/object:Gem::Requirement
168
168
  requirements:
169
169
  - - ">="
170
170
  - !ruby/object:Gem::Version
171
- version: 3.1.3
171
+ version: '3.8'
172
172
  - !ruby/object:Gem::Dependency
173
173
  name: rspec
174
174
  requirement: !ruby/object:Gem::Requirement
175
175
  requirements:
176
- - - "~>"
176
+ - - ">="
177
177
  - !ruby/object:Gem::Version
178
- version: '3.12'
178
+ version: '3.13'
179
179
  type: :development
180
180
  prerelease: false
181
181
  version_requirements: !ruby/object:Gem::Requirement
182
182
  requirements:
183
- - - "~>"
183
+ - - ">="
184
184
  - !ruby/object:Gem::Version
185
- version: '3.12'
185
+ version: '3.13'
186
186
  - !ruby/object:Gem::Dependency
187
187
  name: servactory-rubocop
188
188
  requirement: !ruby/object:Gem::Requirement
189
189
  requirements:
190
190
  - - ">="
191
191
  - !ruby/object:Gem::Version
192
- version: '0.5'
192
+ version: '0.7'
193
193
  type: :development
194
194
  prerelease: false
195
195
  version_requirements: !ruby/object:Gem::Requirement
196
196
  requirements:
197
197
  - - ">="
198
198
  - !ruby/object:Gem::Version
199
- version: '0.5'
199
+ version: '0.7'
200
200
  - !ruby/object:Gem::Dependency
201
201
  name: steep
202
202
  requirement: !ruby/object:Gem::Requirement
203
203
  requirements:
204
- - - "~>"
204
+ - - ">="
205
205
  - !ruby/object:Gem::Version
206
- version: '1.5'
206
+ version: '1.9'
207
207
  type: :development
208
208
  prerelease: false
209
209
  version_requirements: !ruby/object:Gem::Requirement
210
210
  requirements:
211
- - - "~>"
211
+ - - ">="
212
212
  - !ruby/object:Gem::Version
213
- version: '1.5'
213
+ version: '1.9'
214
214
  description: A set of tools for building reliable services of any complexity
215
215
  email:
216
216
  - profox.rus@gmail.com