pact-support 1.16.9 → 1.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46ec9f6e6642bfc067b5327994f844ecd15afaa81ab23b9c4fc4fa55ceae83fe
-  data.tar.gz: ef772e9256e18df3164c834aa55e21fb7742484a19fbc9dccdc17b11fc391d7d
+  metadata.gz: ff89b1f300df93010c7b5820db53c8433fb8793ed895e8671c59b594f28008e4
+  data.tar.gz: 192212e7600f9c1be43e3817b479d59293582ad324e32262513a8db4982d850d
 SHA512:
-  metadata.gz: 0a6f386eb4fcb8f3b49832e58564ed56e4a1e56a8da6ecea776f211ee0850a78ba9adb6677571053d943ef717204f17b513a2347bfcd43757a03ce2018a35d94
-  data.tar.gz: 60d0cbcc25b2b10937c2bea9501ae540b0a5aaf7946676414ea01da95829ef36a2c0f19a558883367631cb894bf9ccbcce32200d09f8a907050b763b731bf68b
+  metadata.gz: b9335620e66ea4d6227973a7c2ca94f10bded7f05f9cdc8621715960619fcbde63e8d02d84c418027a4bde925d02dbc547641f8a73a34cb4269611016c0044f7
+  data.tar.gz: db26dea284a359a2c0b8a4e7db2a1dac2c488f228de11e2277ca4d154b342bf1338a5b574bab9326e46e05b8a0f6c21c19f2ef1899b62811f23b057ba4d57808

data/CHANGELOG.md

@@ -1,3 +1,79 @@
+<a name="v1.21.0"></a>
+### v1.21.0 (2024-11-28)
+
+#### Features
+
+* add like_integer / like_decimal helpers	 ([75a36cd](/../../commit/75a36cd))
+* add v3/v4 generators (thanks @slt)	 ([fe04975](/../../commit/fe04975))
+
+#### Bug Fixes
+
+* add blank lines to empty hashs - json 2.8.x regression	 ([66910bd](/../../commit/66910bd))
+
+<a name="v1.20.2"></a>
+### v1.20.2 (2024-10-23)
+
+#### Bug Fixes
+
+* **test**
+  * explicitly require ostruct as non stdlib in ruby 3.5.x	 ([e06a057](/../../commit/e06a057))
+
+* use single quotes for pact term creation err msg	 ([d770791](/../../commit/d770791))
+
+<a name="v1.20.1"></a>
+### v1.20.1 (2024-08-08)
+
+#### Bug Fixes
+
+* enable color on non-tty if color_enabled	 ([0585424](/../../commit/0585424))
+
+<a name="v1.20.0"></a>
+### v1.20.0 (2023-10-19)
+
+#### Features
+
+* handle x509 certs in HTTP Client (#99)	 ([6a36a48](/../../commit/6a36a48))
+
+<a name="v1.19.0"></a>
+### v1.19.0 (2022-11-15)
+
+#### Features
+
+* **generators**
+  * add generators to a consumer contract request (#97)	 ([fbce4cb](/../../commit/fbce4cb))
+
+<a name="v1.18.1"></a>
+### v1.18.1 (2022-08-17)
+
+#### Bug Fixes
+
+* use send to invoke remove_method when removing as_json from Regexp	 ([cb29cdd](/../../commit/cb29cdd))
+
+<a name="v1.18.0"></a>
+### v1.18.0 (2022-03-28)
+
+#### Features
+
+* replace term-ansicolor with rainbow	 ([e8b6ada](/../../commit/e8b6ada))
+
+#### Bug Fixes
+
+* Fixup ruby warnings (#96)	 ([cee7113](/../../commit/cee7113))
+
+<a name="v1.17.0"></a>
+### v1.17.0 (2021-10-01)
+
+#### Features
+
+* allow SSL verification to be disabled by setting environment variable PACT_DISABLE_SSL_VERIFICATION=true	 ([dd39c04](/../../commit/dd39c04))
+
+<a name="v1.16.10"></a>
+### v1.16.10 (2021-10-01)
+
+#### Bug Fixes
+
+* change expgen to a runtime dependency	 ([da81634](/../../commit/da81634))
+
 <a name="v1.16.9"></a>
 ### v1.16.9 (2021-09-30)
 

data/README.md

@@ -1,5 +1,72 @@
 # Pact Support
-
+[![Gem Version](https://badge.fury.io/rb/pact-support.svg)](http://badge.fury.io/rb/pact-support)
 ![Build status](https://github.com/pact-foundation/pact-support/workflows/Test/badge.svg)
+[![Join the chat at https://pact-foundation.slack.com/](https://img.shields.io/badge/chat-on%20slack-blue.svg?logo=slack)](https://slack.pact.io)
 
 Provides shared code for the Pact gems
+
+## Compatibility
+
+<details><summary>Specification Compatibility</summary>
+
+| Version  | Stable | [Spec] Compatibility | 
+| -------  | ------ | -------------------- |
+| 1.x.x    | Yes    | 2, 3\*               |
+
+_\*_ v3 support is limited to the subset of functionality required to enable language inter-operable [Message support].
+
+- See V3 tracking [issue](https://github.com/pact-foundation/pact-ruby/issues/318).
+- See V4 tracking [issue](https://github.com/pact-foundation/pact-ruby/issues/319).
+
+Want V3/V4 support now? See the new standalone [pact-verifier](https://github.com/pact-foundation/pact-reference/tree/master/rust/pact_verifier_cli#standalone-pact-verifier)
+
+[message support]: https://github.com/pact-foundation/pact-specification/tree/version-3#introduces-messages-for-services-that-communicate-via-event-streams-and-message-queues
+
+</details>
+
+### Supported matching rules
+
+| matcher       | Spec Version | Implemented | Usage|
+|---------------|--------------|-------------|-------------|
+| Equality      | V1           |   |    |
+| Regex         | V2           | ✅  | `Pact.term(generate, matcher)` |
+| Type          | V2           | ✅  | `Pact.like(generate)` |
+| MinType       | V2           | ✅  | `Pact.each_like(generate, min: <val>)` |
+| MaxType       | V2           |   |    |
+| MinMaxType    | V2           |   |    |
+| Include       | V3           |   |    |
+| Integer       | V3           |   |    |
+| Decimal       | V3           |   |    |
+| Number        | V3           |   |    |
+| Timestamp     | V3           |   |    |
+| Time          | V3           |   |    |
+| Date          | V3           |   |    |
+| Null          | V3           |   |    |
+| Boolean       | V3           |   |    |
+| ContentType   | V3           |   |    |
+| Values        | V3           |   |    |
+| ArrayContains | V4           |   |    |
+| StatusCode    | V4           |   |    |
+| NotEmpty      | V4           |   |    |
+| Semver        | V4           |   |    |
+| EachKey       | V4           |   |    |
+| EachValue     | V4           |   |    |
+
+### Supported generators
+
+Currently limited to provider verification only. No current way to set in consumer tests.
+
+| Generator                | Spec Version | Implemented |
+|------------------------|--------------|----|
+| RandomInt              | V3           | ✅ |
+| RandomDecimal          | V3           | ✅ |
+| RandomHexadecimal      | V3           | ✅ |
+| RandomString           | V3           | ✅ |
+| Regex                  | V3           | ✅ |
+| Uuid                   | V3/V4        | ✅ |
+| Date                   | V3           | ✅ |
+| Time                   | V3           | ✅ |
+| DateTime               | V3           | ✅ |
+| RandomBoolean          | V3           | ✅ |
+| ProviderState          | V4           | ✅ |
+| MockServerURL          | V4           | 🚧 |

data/lib/pact/configuration.rb

@@ -6,6 +6,7 @@ require 'pact/shared/json_differ'
 require 'pact/shared/text_differ'
 require 'pact/shared/form_differ'
 require 'pact/shared/multipart_form_differ'
+require 'rainbow'
 
 
 module Pact
@@ -114,7 +115,9 @@ module Pact
 
     def color_enabled
       # Can't use ||= when the variable might be false, it will execute the expression if it's false
-      defined?(@color_enabled) ? @color_enabled : true
+      color_enabled = defined?(@color_enabled) ? @color_enabled : true
+      Rainbow.enabled = true if color_enabled
+      color_enabled
     end
 
     def color_enabled= color_enabled

data/lib/pact/consumer_contract/interaction_v2_parser.rb

@@ -38,7 +38,7 @@ module Pact
       if query_is_string
         request_hash['query'] = Pact::QueryHash.new(request_hash['query'], original_query_string, Pact::Query.parsed_as_nested?(request_hash['query']))
       end
-      request = Pact::Request::Expected.from_hash(request_hash)
+      Pact::Request::Expected.from_hash(request_hash)
     end
 
     def self.parse_response response_hash, options

data/lib/pact/consumer_contract/pact_file.rb

@@ -35,7 +35,7 @@ module Pact
     def save_pactfile_to_tmp pact, name
       ::FileUtils.mkdir_p Pact.configuration.tmp_dir
       ::File.open(Pact.configuration.tmp_dir + "/#{name}", "w") { |file|  file << pact}
-    rescue Errno::EROFS => e
+    rescue Errno::EROFS
       # do nothing, probably on RunKit
     end
 
@@ -56,9 +56,9 @@ module Pact
     def get_remote_with_retry(uri_string, options)
       uri = URI(uri_string)
       if uri.userinfo
-		options[:username] = uri.user unless options[:username]
-		options[:password] = uri.password unless options[:password]
-	  end
+        options[:username] = uri.user unless options[:username]
+        options[:password] = uri.password unless options[:password]
+      end
       ((options[:retry_limit] || RETRY_LIMIT) + 1).times do |i|
         begin
           response = get_remote(uri, options)
@@ -108,7 +108,19 @@ module Pact
       http.use_ssl = (uri.scheme == 'https')
       http.ca_file = ENV['SSL_CERT_FILE'] if ENV['SSL_CERT_FILE'] && ENV['SSL_CERT_FILE'] != ''
       http.ca_path = ENV['SSL_CERT_DIR'] if ENV['SSL_CERT_DIR'] && ENV['SSL_CERT_DIR'] != ''
-      http.set_debug_output(Pact::Http::AuthorizationHeaderRedactor.new(Pact.configuration.output_stream)) if options[:verbose]
+      http.set_debug_output(Pact::Http::AuthorizationHeaderRedactor.new(Pact.configuration.output_stream)) if verbose?(options)
+
+      if x509_certificate?
+        http.cert = OpenSSL::X509::Certificate.new(x509_client_cert_file)
+        http.key = OpenSSL::PKey::RSA.new(x509_client_key_file)
+      end
+
+      if disable_ssl_verification?
+        if verbose?(options)
+          Pact.configuration.output_stream.puts("SSL verification is disabled")
+        end
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      end
       http
     end
 
@@ -139,5 +151,26 @@ module Pact
     def windows_safe(uri)
       uri.start_with?("http") ? uri : uri.gsub("\\", File::SEPARATOR)
     end
+
+    def verbose?(options)
+      options[:verbose] || ENV['VERBOSE'] == 'true'
+    end
+
+    def x509_certificate?
+      ENV['X509_CLIENT_CERT_FILE'] && ENV['X509_CLIENT_CERT_FILE'] != '' &&
+        ENV['X509_CLIENT_KEY_FILE'] && ENV['X509_CLIENT_KEY_FILE'] != ''
+    end
+
+    def x509_client_cert_file
+      File.read(ENV['X509_CLIENT_CERT_FILE'])
+    end
+
+    def x509_client_key_file
+      File.read(ENV['X509_CLIENT_KEY_FILE'])
+    end
+
+    def disable_ssl_verification?
+      ENV['PACT_DISABLE_SSL_VERIFICATION'] == 'true' || ENV['PACT_BROKER_DISABLE_SSL_VERIFICATION'] == 'true'
+    end
   end
 end

data/lib/pact/consumer_contract/request.rb

@@ -6,7 +6,7 @@ module Pact
     class Expected < Pact::Request::Base
 
       DEFAULT_OPTIONS = {:allow_unexpected_keys => false}.freeze
-      attr_accessor :options #Temporary hack
+      attr_accessor :options, :generators
 
       def self.from_hash(hash)
         sym_hash = symbolize_keys hash
@@ -16,11 +16,13 @@ module Pact
         headers = sym_hash.fetch(:headers, key_not_found)
         body = sym_hash.fetch(:body, key_not_found)
         options = sym_hash.fetch(:options, {})
-        new(method, path, headers, body, query, options)
+        generators = sym_hash.fetch(:generators, {})
+        new(method, path, headers, body, query, options, generators)
       end
 
-      def initialize(method, path, headers, body, query, options = {})
+      def initialize(method, path, headers, body, query, options = {}, generators = {})
         super(method, path, headers, body, query)
+        @generators = generators
         @options = options
       end
 

data/lib/pact/generator/date.rb

@@ -0,0 +1,62 @@
+require 'date'
+
+module Pact
+  module Generator
+    # Date provides the time generator which will give the current date in the defined format
+    class Date
+      def can_generate?(hash)
+        hash.key?('type') && hash['type'] == type
+      end
+
+      def call(hash, _params = nil, _example_value = nil)
+        format = hash['format'] || default_format
+        ::Time.now.strftime(convert_from_java_simple_date_format(format))
+      end
+
+      def type
+        'Date'
+      end
+
+      def default_format
+        'yyyy-MM-dd'
+      end
+
+      # Format for the pact specficiation should be the Java DateTimeFormmater
+      # This tries to convert to something Ruby can format.
+      def convert_from_java_simple_date_format(format)
+        # Year
+        format.sub!(/(?<!%)y{4,}/, '%Y')
+        format.sub!(/(?<!%)y{1,}/, '%y')
+
+        # Month
+        format.sub!(/(?<!%)M{4,}/, '%B')
+        format.sub!(/(?<!%)M{3}/, '%b')
+        format.sub!(/(?<!%)M{1,2}/, '%m')
+
+        # Week
+        format.sub!(/(?<!%)M{1,}/, '%W')
+
+        # Day
+        format.sub!(/(?<!%)D{1,}/, '%j')
+        format.sub!(/(?<!%)d{1,}/, '%d')
+        format.sub!(/(?<!%)E{4,}/, '%A')
+        format.sub!(/(?<!%)D{1,}/, '%a')
+        format.sub!(/(?<!%)u{1,}/, '%u')
+
+        # Time
+        format.sub!(/(?<!%)a{1,}/, '%p')
+        format.sub!(/(?<!%)k{1,}/, '%H')
+        format.sub!(/(?<!%)n{1,}/, '%M')
+        format.sub!(/(?<!%)s{1,}/, '%S')
+        format.sub!(/(?<!%)S{1,}/, '%L')
+
+        # Timezone
+        format.sub!(/(?<!%)z{1,}/, '%z')
+        format.sub!(/(?<!%)Z{1,}/, '%z')
+        format.sub!(/(?<!%)X{1,}/, '%Z')
+
+        format
+      end
+    end
+  end
+end

data/lib/pact/generator/datetime.rb

@@ -0,0 +1,16 @@
+require 'date'
+
+module Pact
+  module Generator
+    # DateTime provides the time generator which will give the current date time in the defined format
+    class DateTime < Date
+      def type
+        'DateTime'
+      end
+
+      def default_format
+        'yyyy-MM-dd HH:mm'
+      end
+    end
+  end
+end

data/lib/pact/generator/provider_state.rb

@@ -0,0 +1,53 @@
+require 'pact/logging'
+
+module Pact
+  module Generator
+    # ProviderState provides the provider state generator which will inject
+    # values provided by the provider state setup url.
+    class ProviderState
+      include Pact::Logging
+
+      # rewrite of https://github.com/DiUS/pact-jvm/blob/master/core/support/src/main/kotlin/au/com/dius/pact/core/support/expressions/ExpressionParser.kt#L27
+      VALUES_SEPARATOR = ','
+      START_EXPRESSION = "\${"
+      END_EXPRESSION = '}'
+
+      def can_generate?(hash)
+        hash.key?('type') && hash['type'] == 'ProviderState'
+      end
+
+      def call(hash, params = nil, _example_value = nil)
+        params ||= {}
+        parse_expression hash['expression'], params
+      end
+
+      def parse_expression(expression, params)
+        return_string = []
+        buffer = expression
+        # initial value
+        position = buffer.index(START_EXPRESSION)
+
+        while position && position >= 0
+          if position.positive?
+            # add string
+            return_string.push(buffer[0...position])
+          end
+          end_position = buffer.index(END_EXPRESSION, position)
+          raise 'Missing closing brace in expression string' if !end_position || end_position.negative?
+
+          variable = buffer[position + 2...end_position]
+
+          logger.info "Could not subsitute provider state key #{variable}, have #{params}" unless params[variable]
+
+          expression = params[variable] || ''
+          return_string.push(expression)
+
+          buffer = buffer[end_position + 1...-1]
+          position = buffer.index(START_EXPRESSION)
+        end
+
+        return_string.join('')
+      end
+    end
+  end
+end

data/lib/pact/generator/random_boolean.rb

@@ -0,0 +1,14 @@
+module Pact
+  module Generator
+    # Boolean provides the boolean generator which will give a true or false value
+    class RandomBoolean
+      def can_generate?(hash)
+        hash.key?('type') && hash['type'] == 'RandomBoolean'
+      end
+
+      def call(_hash, _params = nil, _example_value = nil)
+        [true, false].sample
+      end
+    end
+  end
+end

data/lib/pact/generator/random_decimal.rb

@@ -0,0 +1,37 @@
+require 'bigdecimal'
+
+module Pact
+  module Generator
+    # RandomDecimal provides the random decimal generator which will generate a decimal value of digits length
+    class RandomDecimal
+      def can_generate?(hash)
+        hash.key?('type') && hash['type'] == 'RandomDecimal'
+      end
+
+      def call(hash, _params = nil, _example_value = nil)
+        digits = hash['digits'] || 6
+
+        raise 'RandomDecimalGenerator digits must be > 0, got $digits' if digits < 1
+
+        return rand(0..9) if digits == 1
+
+        return rand(0..9) + rand(1..9) / 10 if digits == 2
+
+        pos = rand(1..digits - 1)
+        precision = digits - pos
+        integers = ''
+        decimals = ''
+        while pos.positive?
+          integers += String(rand(1..9))
+          pos -= 1
+        end
+        while precision.positive?
+          decimals += String(rand(1..9))
+          precision -= 1
+        end
+
+        Float("#{integers}.#{decimals}")
+      end
+    end
+  end
+end

data/lib/pact/generator/random_hexadecimal.rb

@@ -0,0 +1,19 @@
+require 'securerandom'
+
+module Pact
+  module Generator
+    # RandomHexadecimal provides the random hexadecimal generator which will generate a hexadecimal
+    class RandomHexadecimal
+      def can_generate?(hash)
+        hash.key?('type') && hash['type'] == 'RandomHexadecimal'
+      end
+
+      def call(hash, _params = nil, _example_value = nil)
+        digits = hash['digits'] || 8
+        bytes = (digits / 2).ceil
+        string = SecureRandom.hex(bytes)
+        string[0, digits]
+      end
+    end
+  end
+end

data/lib/pact/generator/random_int.rb

@@ -0,0 +1,16 @@
+module Pact
+  module Generator
+    # RandomInt provides the random int generator which generate a random integer, with a min/max
+    class RandomInt
+      def can_generate?(hash)
+        hash.key?('type') && hash['type'] == 'RandomInt'
+      end
+
+      def call(hash, _params = nil, _example_value = nil)
+        min = hash['min'] || 0
+        max = hash['max'] || 2_147_483_647
+        rand(min..max)
+      end
+    end
+  end
+end

data/lib/pact/generator/random_string.rb

@@ -0,0 +1,16 @@
+module Pact
+  module Generator
+    # RandomString provides the random string generator which generate a random string of size length
+    class RandomString
+      def can_generate?(hash)
+        hash.key?('type') && hash['type'] == 'RandomString'
+      end
+
+      def call(hash, _params = nil, _example_value = nil)
+        size = hash['size'] || 20
+        string = rand(36**(size + 2)).to_s(36)
+        string[0, size]
+      end
+    end
+  end
+end

data/lib/pact/generator/regex.rb

@@ -0,0 +1,17 @@
+require 'string_pattern'
+
+module Pact
+  module Generator
+    # Regex provides the regex generator which will generate a value based on the regex pattern provided
+    class Regex
+      def can_generate?(hash)
+        hash.key?('type') && hash['type'] == 'Regex'
+      end
+
+      def call(hash, _params = nil, _example_value = nil)
+        pattern = hash['pattern'] || ''
+        StringPattern.generate(Regexp.new(pattern))
+      end
+    end
+  end
+end

data/lib/pact/generator/time.rb

@@ -0,0 +1,16 @@
+require 'date'
+
+module Pact
+  module Generator
+    # Time provides the time generator which will give the current time in the defined format
+    class Time < Date
+      def type
+        'Time'
+      end
+
+      def default_format
+        'HH:mm'
+      end
+    end
+  end
+end

data/lib/pact/generator/uuid.rb

@@ -0,0 +1,19 @@
+require 'securerandom'
+
+module Pact
+  module Generator
+    # Uuid provides the uuid generator
+    class Uuid
+      def can_generate?(hash)
+        hash.key?('type') && hash['type'] == 'Uuid'
+      end
+
+      # If we had the example value, we could determine what type of uuid
+      # to send, this is what pact-jvm does
+      # See https://github.com/pact-foundation/pact-jvm/blob/master/core/model/src/main/kotlin/au/com/dius/pact/core/model/generators/Generator.kt
+      def call(_hash, _params = nil, _example_value = nil)
+        SecureRandom.uuid
+      end
+    end
+  end
+end

data/lib/pact/generators.rb

@@ -0,0 +1,64 @@
+require 'pact/generator/random_boolean'
+require 'pact/generator/date'
+require 'pact/generator/datetime'
+require 'pact/generator/provider_state'
+require 'pact/generator/random_decimal'
+require 'pact/generator/random_hexadecimal'
+require 'pact/generator/random_int'
+require 'pact/generator/random_string'
+require 'pact/generator/regex'
+require 'pact/generator/time'
+require 'pact/generator/uuid'
+require 'pact/matching_rules/jsonpath'
+require 'pact/matching_rules/v3/extract'
+require 'jsonpath'
+
+module Pact
+    class Generators
+      def self.add_generator(generator)
+        generators.unshift(generator)
+      end
+
+      def self.generators
+        @generators ||= []
+      end
+
+      def self.execute_generators(object, state_params = nil, example_value = nil)
+        generators.each do |parser|
+          return parser.call(object, state_params, example_value) if parser.can_generate?(object)
+        end
+
+        raise Pact::UnrecognizePactFormatError, "This document does not use a recognised Pact generator: #{object}"
+      end
+
+      def self.apply_generators(expected_request, component, example_value, state_params)
+        # Latest pact-support is required to have generators exposed
+        if expected_request.methods.include?(:generators) && expected_request.generators[component]
+          # Some component will have single generator without selectors, i.e. path
+          generators = expected_request.generators[component]
+          if generators.is_a?(Hash) && generators.key?('type')
+            return execute_generators(generators, state_params, example_value)
+          end
+
+          generators.each do |selector, generator|
+            val = JsonPath.new(selector).on(example_value)
+            replace = execute_generators(generator, state_params, val)
+            example_value = JsonPath.for(example_value).gsub(selector) { |_v| replace }.to_hash
+          end
+        end
+        example_value
+      end
+
+      add_generator(Generator::RandomBoolean.new)
+      add_generator(Generator::Date.new)
+      add_generator(Generator::DateTime.new)
+      add_generator(Generator::ProviderState.new)
+      add_generator(Generator::RandomDecimal.new)
+      add_generator(Generator::RandomHexadecimal.new)
+      add_generator(Generator::RandomInt.new)
+      add_generator(Generator::RandomString.new)
+      add_generator(Generator::Regex.new)
+      add_generator(Generator::Time.new)
+      add_generator(Generator::Uuid.new)
+    end
+end

data/lib/pact/helpers.rb

@@ -47,6 +47,16 @@ module Pact
       Pact::Term.new(generate: date, matcher: /^\d{4}-[01]\d-[0-3]\d$/)
     end
 
+    # regex matched with pact-jvm 
+    # https://github.com/pact-foundation/pact-jvm/blob/00442e6df51e5be906ed470b19859246312e5c83/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/MatcherExecutor.kt#L56-L59
+    def like_integer int
+      Pact::Term.new(generate: int, matcher: /^-?\d+$/)
+    end
+
+    def like_decimal float
+      Pact::Term.new(generate: float, matcher: /^0|-?\d+\.\d*$/)
+    end
+
     def like_datetime_rfc822 datetime
       Pact::Term.new(
         generate: datetime,

data/lib/pact/matchers/embedded_diff_formatter.rb

@@ -1,13 +1,11 @@
 require 'pact/shared/active_support_support'
-require 'term/ansicolor'
+require 'rainbow'
 
 module Pact
   module Matchers
     class EmbeddedDiffFormatter
 
       include Pact::ActiveSupportSupport
-      C = ::Term::ANSIColor
-
 
       EXPECTED = /"EXPECTED([A-Z_]*)":/
 
@@ -53,7 +51,7 @@ module Pact
       end
 
       def coloured_key match, colour
-        '"' + C.color(colour, match.downcase.gsub(/^"|":$/,'')) + '":'
+        '"' + Rainbow(match.downcase.gsub(/^"|":$/,'')).send(colour) + '":'
       end
 
     end

data/lib/pact/matchers/matchers.rb

@@ -61,6 +61,12 @@ module Pact
     alias_method :structure_diff, :type_diff # Backwards compatibility
 
     def term_diff term, actual, options
+      if actual.is_a?(Float) || actual.is_a?(Integer)
+        options[:original] = actual
+        options[:was_float] = actual.is_a?(Float)
+        options[:was_int] = actual.is_a?(Integer)
+        actual = actual.to_s
+      end
       if actual.is_a?(String)
         actual_term_diff term, actual, options
       else
@@ -72,7 +78,7 @@ module Pact
       if term.matcher.match(actual)
         NO_DIFF
       else
-        RegexpDifference.new term.matcher, actual, "Expected a String matching #{term.matcher.inspect} (like #{term.generate.inspect}) but got #{actual.inspect} at <path>"
+        RegexpDifference.new term.matcher, options[:original] ||= actual, "Expected a Value matching #{term.matcher.inspect} (like #{term.generate.inspect}) but got #{options[:was_float] || options[:was_int] ? class_name_with_value_in_brackets(options[:original]) : actual.inspect} at <path>"
       end
     end
 

data/lib/pact/matchers/unix_diff_formatter.rb

@@ -62,6 +62,8 @@ module Pact
         begin
           # Can't think of an elegant way to check if we can pretty generate other than to try it and maybe fail
           json = fix_blank_lines_in_empty_hashes JSON.pretty_generate(comparable)
+          json = add_blank_lines_in_empty_hashes json
+          json = add_blank_lines_in_empty_arrays json
           add_comma_to_end_of_arrays json
         rescue JSON::GeneratorError
           comparable.to_s

data/lib/pact/matching_rules/merge.rb

@@ -42,7 +42,7 @@ module Pact
       end
 
       def recurse_hash hash, path
-        recursed =  hash.each_with_object({}) do | (k, v), new_hash |
+        hash.each_with_object({}) do | (k, v), new_hash |
           new_path = path + "['#{k}']"
           new_hash[k] = recurse(v, new_path)
         end

data/lib/pact/shared/jruby_support.rb

@@ -14,5 +14,14 @@ module Pact
       json.gsub(/({\n)\n(\s*})/,'\1\2')
     end
 
+    # preserve pre json 2.8.x behaviour
+    # https://github.com/ruby/json/pull/626
+    def add_blank_lines_in_empty_hashes(json)
+      json.gsub(/({\s*})/, "{\n  }")
+    end
+
+    def add_blank_lines_in_empty_arrays(json)
+      json.gsub(/\[\s*\]/, "[\n  ]")
+    end
   end
 end

data/lib/pact/support/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module Support
-    VERSION = "1.16.9"
+    VERSION = "1.21.0"
   end
 end

data/lib/pact/term.rb

@@ -1,4 +1,5 @@
 require 'pact/shared/active_support_support'
+Regexp.send(:remove_method, :as_json) if Regexp.method_defined?(:as_json)
 require 'json/add/regexp'
 require 'pact/errors'
 
@@ -28,7 +29,11 @@ module Pact
       @matcher = attributes[:matcher]
       raise Pact::Error.new("Please specify a matcher for the Term") unless @matcher != nil
       raise Pact::Error.new("Please specify a value to generate for the Term") unless @generate != nil
-      raise Pact::Error.new("Value to generate \"#{@generate}\" does not match regular expression #{@matcher.inspect}") unless @generate =~ @matcher
+      if @generate.is_a?(Float) || @generate.is_a?(Integer)
+        raise Pact::Error.new("#{@generate.is_a?(Float) ? "Float" : "Integer"} Value to generate '#{@generate}' does not match regular expression #{@matcher.inspect} when converted to string") unless @generate.to_s =~ @matcher
+      else
+        raise Pact::Error.new("Value to generate '#{@generate}' does not match regular expression #{@matcher.inspect}") unless @generate =~ @matcher
+      end
     end
 
     def to_hash

data/lib/tasks/pact.rake

@@ -15,12 +15,12 @@ namespace :pact do
 
   desc "Verifies the pact at the given URI against this service provider."
   task 'verify:at', :pact_uri do | t, args |
-    require 'term/ansicolor'
+    require 'rainbow'
     require 'pact/tasks/task_helper'
 
     include Pact::TaskHelper
 
-    abort(::Term::ANSIColor.red("Please provide a pact URI. eg. rake pact:verify:at[../my-consumer/spec/pacts/my_consumer-my_provider.json]")) unless args[:pact_uri]
+    abort(Rainbow("Please provide a pact URI. eg. rake pact:verify:at[../my-consumer/spec/pacts/my_consumer-my_provider.json]").red) unless args[:pact_uri]
     handle_verification_failure do
       execute_pact_verify args[:pact_uri]
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-support
 version: !ruby/object:Gem::Version
-  version: 1.16.9
+  version: 1.21.0
 platform: ruby
 authors:
 - James Fraser
@@ -9,25 +9,25 @@ authors:
 - Brent Snook
 - Ronald Holshausen
 - Beth Skurrie
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-30 00:00:00.000000000 Z
+date: 2024-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: term-ansicolor
+  name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 3.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 3.1.1
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
@@ -48,28 +48,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: expgen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
-  type: :development
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: string_pattern
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: jsonpath
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -110,14 +138,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: 3.18.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: 3.18.1
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -138,28 +166,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 2.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -216,7 +244,35 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
-description: 
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description:
 email:
 - james.fraser@alumni.swinburne.edu
 - sergei.matheson@gmail.com
@@ -253,6 +309,18 @@ files:
 - lib/pact/consumer_contract/service_provider.rb
 - lib/pact/consumer_contract/string_with_matching_rules.rb
 - lib/pact/errors.rb
+- lib/pact/generator/date.rb
+- lib/pact/generator/datetime.rb
+- lib/pact/generator/provider_state.rb
+- lib/pact/generator/random_boolean.rb
+- lib/pact/generator/random_decimal.rb
+- lib/pact/generator/random_hexadecimal.rb
+- lib/pact/generator/random_int.rb
+- lib/pact/generator/random_string.rb
+- lib/pact/generator/regex.rb
+- lib/pact/generator/time.rb
+- lib/pact/generator/uuid.rb
+- lib/pact/generators.rb
 - lib/pact/helpers.rb
 - lib/pact/http/authorization_header_redactor.rb
 - lib/pact/logging.rb
@@ -304,7 +372,7 @@ homepage: https://github.com/pact-foundation/pact-support
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -319,8 +387,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.28
-signing_key: 
+rubygems_version: 3.5.23
+signing_key:
 specification_version: 4
 summary: Shared code for Pact gems
 test_files: []