pact_broker 2.118.0 → 2.120.0

data/lib/sequel/plugins/upsert.rb

@@ -68,6 +68,7 @@ module Sequel
         end
 
         def manual_upsert(opts)
+          sync_deserialized_values_to_values
           # Can use slice when we drop support for Ruby 2.4
           query = values.select{ |k, _| self.class.upsert_plugin_identifying_columns.include?(k) }
           existing_record = model.where(query).single_record
@@ -79,6 +80,12 @@ module Sequel
           end
         end
 
+        def sync_deserialized_values_to_values
+          if respond_to?(:deserialized_values) && deserialized_values.is_a?(Hash)
+            deserialized_values.each { |k, v| values[k] = v }
+          end
+        end
+
         # naughty override of Sequel private method to
         # avoid having to rewrite the whole save method logic
         def _insert_dataset

data/pact_broker.gemspec

@@ -49,17 +49,17 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.license       = "MIT"
 
-  gem.add_runtime_dependency "json", "~> 2.3"
+  gem.add_runtime_dependency "json", ">= 2.19.9"
   gem.add_runtime_dependency "psych", "~> 5.0"
   gem.add_runtime_dependency "roar", "~> 1.1"
   gem.add_runtime_dependency "dry-validation", "~> 1.8"
   gem.add_runtime_dependency "reform", "~> 2.6"
   gem.add_runtime_dependency "sequel", "~> 5.90"
-  gem.add_runtime_dependency "webmachine", ">= 2.0.0.beta", "< 3.0"
+  gem.add_runtime_dependency "webmachine", "~> 2.0"
   gem.add_runtime_dependency "semver2", "~> 3.4.2"
   gem.add_runtime_dependency "rack", "~> 3.2"
-  gem.add_runtime_dependency "redcarpet", ">= 3.5.1", "~>3.5"
-  gem.add_runtime_dependency "pact-support" , ">= 1.21.2", "~> 1.21"
+  gem.add_runtime_dependency "redcarpet", "~> 3.5"
+  gem.add_runtime_dependency "pact-support", "~> 1.21"
   gem.add_runtime_dependency "haml", "~>5.0"
   gem.add_runtime_dependency "sucker_punch", "~>3.0"
   gem.add_runtime_dependency "rack-protection", "~> 4.1"
@@ -74,6 +74,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "mutex_m", "~> 0.3" # until as-notifications -> webmachine requires it
   gem.add_runtime_dependency "csv", "~> 3.0" # lib/pact_broker/api/decorators/relationships_csv_decorator.rb
   # dropped in ruby 3.5 stdlib
-  gem.add_runtime_dependency "ostruct", "~> 0.5" 
+  gem.add_runtime_dependency "ostruct", "~> 0.5"
+  gem.add_runtime_dependency "json_schemer", "~> 2.5"
   gem.add_development_dependency "pstore", "~> 0.1" # until webmachine requires it
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.118.0
+  version: 2.120.0
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -15,16 +15,16 @@ dependencies:
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: 2.19.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: 2.19.9
 - !ruby/object:Gem::Dependency
   name: psych
   requirement: !ruby/object:Gem::Requirement
@@ -99,22 +99,16 @@ dependencies:
   name: webmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0.beta
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0.beta
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: semver2
   requirement: !ruby/object:Gem::Requirement
@@ -147,9 +141,6 @@ dependencies:
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.5.1
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
@@ -157,9 +148,6 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.5.1
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
@@ -167,9 +155,6 @@ dependencies:
   name: pact-support
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.21.2
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.21'
@@ -177,9 +162,6 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.21.2
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.21'
@@ -365,6 +347,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: json_schemer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: pstore
   requirement: !ruby/object:Gem::Requirement
@@ -579,8 +575,13 @@ files:
 - db/migrations/20231002_add_version_id_index_to_released_version.rb
 - db/migrations/20231003_add_version_id_index_to_deployed_version.rb
 - db/migrations/20240112_add_client_language_verified_by_to_verification.rb
+- db/migrations/20251106_add_branch_versions_version_id_branch_name_index.rb
 - db/migrations/20251202_add_has_messages_column_to_pact_versions.rb
 - db/migrations/20251202_populate_has_messages_in_pact_versions.rb
+- db/migrations/20260119_add_index_on_consumer_id_provider_id_to_pact_versions.rb
+- db/migrations/20260123_drop_branch_versions_branch_name_index.rb
+- db/migrations/20260210_add_index_on_pact_version_id_to_latest_pact_publication.rb
+- db/migrations/20260217_add_wip_query_optimization_indexes.rb
 - db/migrations/migration_helper.rb
 - docs/CONFIGURATION.md
 - docs/api/PACTICIPANTS.md
@@ -831,6 +832,7 @@ files:
 - lib/pact_broker/db.rb
 - lib/pact_broker/db/advisory_lock.rb
 - lib/pact_broker/db/clean.rb
+- lib/pact_broker/db/clean/branch_selector.rb
 - lib/pact_broker/db/clean/selector.rb
 - lib/pact_broker/db/clean_incremental.rb
 - lib/pact_broker/db/data_migrations/create_branches.rb
@@ -1290,7 +1292,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.16
 specification_version: 4
 summary: See description
 test_files: []