pact_broker 2.93.3 → 2.93.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 945a04d666baecd644bffd53da2de97fad0af2cc6c1170ed7dabaa657ef71184
-  data.tar.gz: 1eec76fd7c899f5547e3cd6c937589c0976c98642ee2d33be753cb4739e2ab61
+  metadata.gz: dd8313de32ee72fbd7202e9279130983eeccf2d5bc9c6ae589a5ed9700854cbd
+  data.tar.gz: 8f7d311c9cbec69ca70f4a2420409e6c4747fcb0d1ae0f9af4d04baaf10aa43a
 SHA512:
-  metadata.gz: 5877ebb9cf131b6c8897c39c639e279daa5d785e252184f2cffbbd5376e18ae9936f11bcb879e08745ec63f00f5c4d65b4bc77ef1f93d64c5193c3b86810534c
-  data.tar.gz: 2ed197a1ee3e6050688ed6074149210b7a8188fa3e60b68c12155f4b26eb3fe5def95ae4e13bc994f42a802b93540738240b59119b51b59bd2bfee3f9d030940
+  metadata.gz: baaf854e49a5d623279b2481933fb9e033289efba9b4d9350703d9dc9737dac367b6076938f8f309426480f0745d9fe181c8f7f296f8727e17584de498ea631e
+  data.tar.gz: ea459192ee83bce3c4fe1c307ad8f2ab3c0ed2734f40162cef0ae95033b81d0e3e7bc12d2765af52ae4a06a95ddfed8dfdca7b0c421e923aaa2ba4a172552bcf

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+<a name="v2.93.4"></a>
+### v2.93.4 (2022-02-21)
+
+#### Bug Fixes
+
+* **matrix page**
+  * set correct base URL for links when a path is specified in the base URL	 ([8305456b](/../../commit/8305456b))
+
+* handle DateTimes that come back from Sqlite as Strings	 ([1312a049](/../../commit/1312a049))
+
 <a name="v2.93.3"></a>
 ### v2.93.3 (2022-02-02)
 

data/db/migrations/migration_helper.rb

@@ -23,7 +23,7 @@ module PactBroker
     end
 
     def postgres?
-      adapter == "postgres"
+      adapter =~ /postgres/
     end
 
     def adapter

data/lib/db.rb

@@ -71,7 +71,7 @@ module DB
   end
 
   def self.postgres?
-    !!(PACT_BROKER_DB.adapter_scheme.to_s == "postgres")
+    !!(PACT_BROKER_DB.adapter_scheme.to_s =~ /postgres/)
   end
 
   PACT_BROKER_DB ||= connection_for_env ENV.fetch("RACK_ENV")

data/lib/pact_broker/api/decorators/format_date_time.rb

@@ -2,8 +2,16 @@ module PactBroker
   module Api
     module Decorators
       module FormatDateTime
+        # Keep this in sync with Sequel.datetime_class.
+        # Needs to be upgraded from DateTime to Time as Time is deprecated
+        DATE_TIME_CLASS = DateTime
+
         def self.call(date_time)
-          date_time.to_time.utc.to_datetime.xmlschema if date_time
+          if date_time.is_a?(String)
+            DATE_TIME_CLASS.strptime(date_time).to_time.utc.to_datetime.xmlschema
+          elsif date_time
+            date_time.to_time.utc.to_datetime.xmlschema if date_time
+          end
         end
 
         def format_date_time(date_time)

data/lib/pact_broker/config/runtime_configuration_database_methods.rb

@@ -72,7 +72,7 @@ module PactBroker
           end
 
           def postgres?
-            database_credentials[:adapter] == "postgres"
+            database_credentials[:adapter] =~ /postgres/
           end
           private :postgres?
 

data/lib/pact_broker/pacts/selector.rb

@@ -283,8 +283,6 @@ module PactBroker
 
       # rubocop: disable Metrics/CyclomaticComplexity
       def <=> other
-        # elsif consumer || other.consumer
-        #   consumer_comparison(other)
         if overall_latest? || other.overall_latest?
           overall_latest_comparison(other)
         elsif latest_for_branch? || other.latest_for_branch?
@@ -297,6 +295,8 @@ module PactBroker
           currently_deployed_comparison(other)
         elsif currently_supported? || other.currently_supported?
           currently_supported_comparison(other)
+        elsif consumer || other.consumer
+          consumer_comparison(other)
         else
           0
         end
@@ -358,8 +358,8 @@ module PactBroker
       end
 
       def consumer_comparison(other)
-        if consumer == other.consumer
-          0
+        if consumer && other.consumer
+          consumer <=> other.consumer
         else
           consumer ? -1 : 1
         end

data/lib/pact_broker/repositories/helpers.rb

@@ -36,7 +36,7 @@ module PactBroker
       end
 
       def postgres?
-        Sequel::Model.db.adapter_scheme.to_s == "postgres"
+        Sequel::Model.db.adapter_scheme.to_s =~ /postgres/
       end
 
       def select_all_qualified

data/lib/pact_broker/ui/controllers/matrix.rb

@@ -32,7 +32,7 @@ module PactBroker
               errors = matrix_service.validate_selectors(selectors, options)
               if errors.empty?
                 lines = matrix_service.find(selectors, options)
-                locals[:lines] = PactBroker::UI::ViewDomain::MatrixLines.new(lines)
+                locals[:lines] = PactBroker::UI::ViewDomain::MatrixLines.new(lines, base_url: base_url)
                 locals[:badge_url] = matrix_badge_url(selectors, lines, base_url)
               else
                 locals[:errors] = errors

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = "2.93.3"
+  VERSION = "2.93.4"
 end

data/lib/sequel/plugins/upsert.rb

@@ -101,7 +101,7 @@ module Sequel
         end
 
         def postgres?
-          model.db.adapter_scheme.to_s == "postgres"
+          model.db.adapter_scheme.to_s =~ /postgres/
         end
 
         def values_to_update

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.93.3
+  version: 2.93.4
 platform: ruby
 authors:
 - Bethany Skurrie
 - Sergei Matheson
 - Warner Godfrey
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-10 00:00:00.000000000 Z
+date: 2022-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -1211,7 +1211,7 @@ homepage: https://github.com/pact-foundation/pact_broker
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -1227,7 +1227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.7
-signing_key: 
+signing_key:
 specification_version: 4
 summary: See description
 test_files: []