Skip to content

Commit 0954ac0

Browse files
committed
chore: upgrade to reform 2.3.1
1 parent 7fe0aa9 commit 0954ac0

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

lib/pact_broker/api/contracts/webhook_contract.rb

+6-4
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,13 @@ def validate(*)
1414
# I just cannot seem to get the validation to stop on the first error.
1515
# If one rule fails, they all come back failed, and it's driving me nuts.
1616
# Why on earth would I want that behaviour?
17-
new_errors = Reform::Contract::Errors.new
18-
errors.messages.each do | key, value |
19-
new_errors.add(key, value.first)
17+
# I cannot believe I have to do this shit.
18+
@first_errors = errors
19+
@first_errors.messages.keys.each do | key |
20+
@first_errors.messages[key] = @first_errors.messages[key][0...1]
2021
end
21-
@errors = new_errors
22+
23+
def self.errors; @first_errors end
2224
result
2325
end
2426

lib/pact_broker/webhooks/service.rb

+4-3
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,13 @@ def self.next_uuid
4040
def self.errors webhook, uuid = nil
4141
contract = PactBroker::Api::Contracts::WebhookContract.new(webhook)
4242
contract.validate(webhook.attributes)
43-
errors = contract.errors
43+
messages = contract.errors.messages
4444

4545
if uuid && !valid_uuid_format?(uuid)
46-
errors.add("uuid", message("errors.validation.invalid_webhook_uuid"))
46+
messages["uuid"] = [message("errors.validation.invalid_webhook_uuid")]
4747
end
48-
errors
48+
49+
OpenStruct.new(messages: messages, empty?: messages.empty?, any?: messages.any?)
4950
end
5051

5152
def self.create uuid, webhook, consumer, provider

pact_broker.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Gem::Specification.new do |gem|
4646
gem.add_runtime_dependency 'httparty', '~> 0.14'
4747
gem.add_runtime_dependency 'json', '~> 2.3'
4848
gem.add_runtime_dependency 'roar', '~> 1.1'
49-
gem.add_runtime_dependency 'reform', '~> 2.2'
49+
gem.add_runtime_dependency 'reform', '~> 2.3','>= 2.3.1'
5050
gem.add_runtime_dependency 'dry-validation', '~> 0.10.5'
5151
gem.add_runtime_dependency 'sequel', '~> 5.28'
5252
gem.add_runtime_dependency 'webmachine', '1.5.0'

0 commit comments

Comments
 (0)