pact-support 1.9.0 → 1.15.0

data/lib/pact/matching_rules/v3/merge.rb

@@ -108,8 +108,10 @@ module Pact
         def log_ignored_rules
           @matching_rules.each do | jsonpath, rules_hash |
             rules_array = rules_hash["matchers"]
-            ((rules_array.length - 1)..0).each do | index |
-              rules_array.delete_at(index) if rules_array[index].empty?
+            if rules_array
+              ((rules_array.length - 1)..0).each do | index |
+                rules_array.delete_at(index) if rules_array[index].empty?
+              end
             end
           end
 

data/lib/pact/shared/multipart_form_differ.rb

@@ -9,6 +9,8 @@ module Pact
       actual_boundary = actual.split.first
       actual_with_hardcoded_boundary = actual.gsub(actual_boundary, expected_boundary)
       TextDiffer.call(expected, actual_with_hardcoded_boundary, options)
+    rescue StandardError
+      TextDiffer.call(expected, actual, options)
     end
   end
 end

data/lib/pact/support/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module Support
-    VERSION = "1.9.0"
+    VERSION = "1.15.0"
   end
 end

data/lib/pact/term.rb

@@ -80,6 +80,5 @@ module Pact
         destination[key] = unpack_regexps source[key]
       end
     end
-
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-support
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.15.0
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-21 00:00:00.000000000 Z
+date: 2020-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: randexp
@@ -42,20 +42,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.14'
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
@@ -70,34 +56,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: find_a_port
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.1
-- !ruby/object:Gem::Dependency
-  name: thor
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
@@ -249,18 +207,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
-- Appraisals
 - CHANGELOG.md
-- Gemfile
 - LICENSE.txt
 - README.md
-- RELEASING.md
-- Rakefile
-- gemfiles/default.gemfile
-- gemfiles/ruby_under_22.gemfile
 - lib/pact/array_like.rb
 - lib/pact/configuration.rb
 - lib/pact/consumer/request.rb
@@ -330,95 +279,7 @@ files:
 - lib/pact/symbolize_keys.rb
 - lib/pact/term.rb
 - lib/tasks/pact.rake
-- pact-support.gemspec
-- script/release.sh
-- script/update-pact-specification-v2
-- spec/fixtures/interaction-with-matching-rules.json
-- spec/fixtures/multipart-form-diff.txt
-- spec/fixtures/not-a-pact.json
-- spec/fixtures/pact-http-v2.json
-- spec/fixtures/pact-http-v3.json
-- spec/integration/matching_rules_extract_and_merge_spec.rb
-- spec/lib/pact/array_like_spec.rb
-- spec/lib/pact/configuration_spec.rb
-- spec/lib/pact/consumer/request_spec.rb
-- spec/lib/pact/consumer_contract/active_support_support_spec.rb
-- spec/lib/pact/consumer_contract/consumer_contract_spec.rb
-- spec/lib/pact/consumer_contract/file_name_spec.rb
-- spec/lib/pact/consumer_contract/headers_spec.rb
-- spec/lib/pact/consumer_contract/http_consumer_contract_parser_spec.rb
-- spec/lib/pact/consumer_contract/interaction_parser_spec.rb
-- spec/lib/pact/consumer_contract/interaction_spec.rb
-- spec/lib/pact/consumer_contract/interaction_v2_parser_spec.rb
-- spec/lib/pact/consumer_contract/interaction_v3_parser_spec.rb
-- spec/lib/pact/consumer_contract/pact_file_spec.rb
-- spec/lib/pact/consumer_contract/query_hash_spec.rb
-- spec/lib/pact/consumer_contract/query_string_spec.rb
-- spec/lib/pact/consumer_contract/request_spec.rb
-- spec/lib/pact/consumer_contract/response_spec.rb
-- spec/lib/pact/helpers_spec.rb
-- spec/lib/pact/matchers/differ_spec.rb
-- spec/lib/pact/matchers/difference_spec.rb
-- spec/lib/pact/matchers/embedded_diff_formatter_spec.rb
-- spec/lib/pact/matchers/extract_diff_messages_spec.rb
-- spec/lib/pact/matchers/index_not_found_spec.rb
-- spec/lib/pact/matchers/list_diff_formatter_spec.rb
-- spec/lib/pact/matchers/matchers_array_like_spec.rb
-- spec/lib/pact/matchers/matchers_messages_hash_and_array_spec.rb
-- spec/lib/pact/matchers/matchers_messages_mismatched_value_spec.rb
-- spec/lib/pact/matchers/matchers_messages_regexp_spec.rb
-- spec/lib/pact/matchers/matchers_spec.rb
-- spec/lib/pact/matchers/multipart_form_diff_formatter_spec.rb
-- spec/lib/pact/matchers/no_diff_at_index_spec.rb
-- spec/lib/pact/matchers/regexp_difference_spec.rb
-- spec/lib/pact/matchers/type_difference_spec.rb
-- spec/lib/pact/matchers/unexpected_index_spec.rb
-- spec/lib/pact/matchers/unexpected_key_spec.rb
-- spec/lib/pact/matchers/unix_diff_formatter_spec.rb
-- spec/lib/pact/matching_rules/extract_spec.rb
-- spec/lib/pact/matching_rules/merge_spec.rb
-- spec/lib/pact/matching_rules/v3/extract_spec.rb
-- spec/lib/pact/matching_rules/v3/merge_spec.rb
-- spec/lib/pact/matching_rules_spec.rb
-- spec/lib/pact/reification_spec.rb
-- spec/lib/pact/shared/dsl_spec.rb
-- spec/lib/pact/shared/form_differ_spec.rb
-- spec/lib/pact/shared/json_differ_spec.rb
-- spec/lib/pact/shared/key_not_found_spec.rb
-- spec/lib/pact/shared/multipart_form_differ_spec.rb
-- spec/lib/pact/shared/request_spec.rb
-- spec/lib/pact/shared/text_differ_spec.rb
-- spec/lib/pact/something_like_spec.rb
-- spec/lib/pact/support_spec.rb
-- spec/lib/pact/symbolize_keys_spec.rb
-- spec/lib/pact/term_spec.rb
-- spec/pact_specification/compliance-2.0.rb
-- spec/spec_helper.rb
-- spec/support/a_consumer-a_producer.json
-- spec/support/a_consumer-a_provider.json
-- spec/support/active_support_if_configured.rb
-- spec/support/case-insensitive-response-header-matching.json
-- spec/support/consumer_contract_template.json
-- spec/support/dsl_spec_support.rb
-- spec/support/factories.rb
-- spec/support/generated_index.md
-- spec/support/generated_markdown.md
-- spec/support/interaction_view_model.json
-- spec/support/interaction_view_model_with_terms.json
-- spec/support/markdown_pact.json
-- spec/support/missing_provider_states_output.txt
-- spec/support/options.json
-- spec/support/ruby_version_helpers.rb
-- spec/support/shared_examples_for_request.rb
-- spec/support/spec_support.rb
-- spec/support/stubbing.json
-- spec/support/term.json
-- spec/support/test_app_fail.json
-- spec/support/test_app_pass.json
-- spec/support/test_app_with_right_content_type_differ.json
-- tasks/release.rake
-- tasks/spec.rake
-homepage: https://github.com/bethesque/pact-support
+homepage: https://github.com/pact-foundation/pact-support
 licenses:
 - MIT
 metadata: {}
@@ -437,92 +298,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Shared code for Pact gems
-test_files:
-- spec/fixtures/interaction-with-matching-rules.json
-- spec/fixtures/multipart-form-diff.txt
-- spec/fixtures/not-a-pact.json
-- spec/fixtures/pact-http-v2.json
-- spec/fixtures/pact-http-v3.json
-- spec/integration/matching_rules_extract_and_merge_spec.rb
-- spec/lib/pact/array_like_spec.rb
-- spec/lib/pact/configuration_spec.rb
-- spec/lib/pact/consumer/request_spec.rb
-- spec/lib/pact/consumer_contract/active_support_support_spec.rb
-- spec/lib/pact/consumer_contract/consumer_contract_spec.rb
-- spec/lib/pact/consumer_contract/file_name_spec.rb
-- spec/lib/pact/consumer_contract/headers_spec.rb
-- spec/lib/pact/consumer_contract/http_consumer_contract_parser_spec.rb
-- spec/lib/pact/consumer_contract/interaction_parser_spec.rb
-- spec/lib/pact/consumer_contract/interaction_spec.rb
-- spec/lib/pact/consumer_contract/interaction_v2_parser_spec.rb
-- spec/lib/pact/consumer_contract/interaction_v3_parser_spec.rb
-- spec/lib/pact/consumer_contract/pact_file_spec.rb
-- spec/lib/pact/consumer_contract/query_hash_spec.rb
-- spec/lib/pact/consumer_contract/query_string_spec.rb
-- spec/lib/pact/consumer_contract/request_spec.rb
-- spec/lib/pact/consumer_contract/response_spec.rb
-- spec/lib/pact/helpers_spec.rb
-- spec/lib/pact/matchers/differ_spec.rb
-- spec/lib/pact/matchers/difference_spec.rb
-- spec/lib/pact/matchers/embedded_diff_formatter_spec.rb
-- spec/lib/pact/matchers/extract_diff_messages_spec.rb
-- spec/lib/pact/matchers/index_not_found_spec.rb
-- spec/lib/pact/matchers/list_diff_formatter_spec.rb
-- spec/lib/pact/matchers/matchers_array_like_spec.rb
-- spec/lib/pact/matchers/matchers_messages_hash_and_array_spec.rb
-- spec/lib/pact/matchers/matchers_messages_mismatched_value_spec.rb
-- spec/lib/pact/matchers/matchers_messages_regexp_spec.rb
-- spec/lib/pact/matchers/matchers_spec.rb
-- spec/lib/pact/matchers/multipart_form_diff_formatter_spec.rb
-- spec/lib/pact/matchers/no_diff_at_index_spec.rb
-- spec/lib/pact/matchers/regexp_difference_spec.rb
-- spec/lib/pact/matchers/type_difference_spec.rb
-- spec/lib/pact/matchers/unexpected_index_spec.rb
-- spec/lib/pact/matchers/unexpected_key_spec.rb
-- spec/lib/pact/matchers/unix_diff_formatter_spec.rb
-- spec/lib/pact/matching_rules/extract_spec.rb
-- spec/lib/pact/matching_rules/merge_spec.rb
-- spec/lib/pact/matching_rules/v3/extract_spec.rb
-- spec/lib/pact/matching_rules/v3/merge_spec.rb
-- spec/lib/pact/matching_rules_spec.rb
-- spec/lib/pact/reification_spec.rb
-- spec/lib/pact/shared/dsl_spec.rb
-- spec/lib/pact/shared/form_differ_spec.rb
-- spec/lib/pact/shared/json_differ_spec.rb
-- spec/lib/pact/shared/key_not_found_spec.rb
-- spec/lib/pact/shared/multipart_form_differ_spec.rb
-- spec/lib/pact/shared/request_spec.rb
-- spec/lib/pact/shared/text_differ_spec.rb
-- spec/lib/pact/something_like_spec.rb
-- spec/lib/pact/support_spec.rb
-- spec/lib/pact/symbolize_keys_spec.rb
-- spec/lib/pact/term_spec.rb
-- spec/pact_specification/compliance-2.0.rb
-- spec/spec_helper.rb
-- spec/support/a_consumer-a_producer.json
-- spec/support/a_consumer-a_provider.json
-- spec/support/active_support_if_configured.rb
-- spec/support/case-insensitive-response-header-matching.json
-- spec/support/consumer_contract_template.json
-- spec/support/dsl_spec_support.rb
-- spec/support/factories.rb
-- spec/support/generated_index.md
-- spec/support/generated_markdown.md
-- spec/support/interaction_view_model.json
-- spec/support/interaction_view_model_with_terms.json
-- spec/support/markdown_pact.json
-- spec/support/missing_provider_states_output.txt
-- spec/support/options.json
-- spec/support/ruby_version_helpers.rb
-- spec/support/shared_examples_for_request.rb
-- spec/support/spec_support.rb
-- spec/support/stubbing.json
-- spec/support/term.json
-- spec/support/test_app_fail.json
-- spec/support/test_app_pass.json
-- spec/support/test_app_with_right_content_type_differ.json
+test_files: []

data/.gitignore

@@ -1,32 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-InstalledFiles
-_yardoc
-coverage
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-*.swp
-.bin
-tags
-.rbenv-version
-spec/pacts
-.rvmrc
-*.iml
-.rakeTasks
-*~
-.ruby-gemset
-.ruby-version
-log
-.idea
-reports
-Gemfile.lock
-gemfiles/*.lock
-spec/examples.txt

data/.rspec

@@ -1,3 +0,0 @@
---color
---format documentation
---require spec_helper

data/.travis.yml

@@ -1,29 +0,0 @@
-language: ruby
-rvm:
-  - 2.0.0
-  - 2.1.8
-  - 2.2.4
-  - 2.3.1
-  - 2.4.3
-  - 2.5.0
-  - jruby-9.1.13.0
-gemfile:
-  - gemfiles/default.gemfile
-  - gemfiles/ruby_under_22.gemfile
-matrix:
-  exclude:
-    # rack 2.0 and activesupport 5.0 no longer support ruby under 2.2.
-    - rvm: 2.0.0
-      gemfile: gemfiles/default.gemfile
-    - rvm: 2.1.8
-      gemfile: gemfiles/default.gemfile
-    - rvm: 2.2.4
-      gemfile: gemfiles/ruby_under_22.gemfile
-    - rvm: 2.3.1
-      gemfile: gemfiles/ruby_under_22.gemfile
-    - rvm: 2.4.3
-      gemfile: gemfiles/ruby_under_22.gemfile
-    - rvm: 2.5.0
-      gemfile: gemfiles/ruby_under_22.gemfile
-    - rvm: jruby-9.1.13.0
-      gemfile: gemfiles/ruby_under_22.gemfile

data/Appraisals

@@ -1,7 +0,0 @@
-appraise "default" do
-end
-
-appraise "ruby-under-22" do
-  gem "rack", "< 2.0"
-  gem "activesupport", "< 5.0.0"
-end

data/Gemfile

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in pact.gemspec
-gemspec

data/RELEASING.md

@@ -1,5 +0,0 @@
-# Releasing
-
-Run
-
-    script/release.sh [major|minor|patch] # default is minor

data/Rakefile

@@ -1,4 +0,0 @@
-require "bundler/gem_tasks"
-
-Dir.glob('./lib/tasks/**/*.rake').each { |task| load task }
-Dir.glob('./tasks/**/*.rake').each { |task| load task }

data/gemfiles/default.gemfile

@@ -1,5 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gemspec :path => "../"

data/gemfiles/ruby_under_22.gemfile

@@ -1,8 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rack", "< 2.0"
-gem "activesupport", "< 5.0.0"
-
-gemspec :path => "../"

data/pact-support.gemspec

@@ -1,39 +0,0 @@
-# -*- encoding: utf-8 -*-
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'pact/support/version'
-
-Gem::Specification.new do |gem|
-  gem.name          = "pact-support"
-  gem.version       = Pact::Support::VERSION
-  gem.authors       = ["James Fraser", "Sergei Matheson", "Brent Snook", "Ronald Holshausen", "Beth Skurrie"]
-  gem.email         = ["james.fraser@alumni.swinburne.edu", "sergei.matheson@gmail.com", "brent@fuglylogic.com", "uglyog@gmail.com", "bskurrie@dius.com.au"]
-  gem.summary       = %q{Shared code for Pact gems}
-  gem.homepage      = "https://github.com/bethesque/pact-support"
-
-  gem.required_ruby_version = '>= 2.0'
-
-  gem.files         = `git ls-files`.split($/)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ["lib"]
-  gem.license       = 'MIT'
-
-  gem.add_runtime_dependency 'randexp', '~> 0.1.7'
-  gem.add_runtime_dependency 'rspec', '>=2.14'
-  gem.add_runtime_dependency 'json'
-  gem.add_runtime_dependency 'term-ansicolor', '~> 1.0'
-  gem.add_runtime_dependency 'find_a_port', '~> 1.0.1'
-  gem.add_runtime_dependency 'thor'
-  gem.add_runtime_dependency 'awesome_print', '~> 1.1'
-
-  gem.add_development_dependency 'rake', '~> 10.0.3'
-  gem.add_development_dependency 'webmock', '~> 3.3'
-  gem.add_development_dependency 'pry'
-  gem.add_development_dependency 'fakefs', '~> 0.11.2'
-  gem.add_development_dependency 'hashie', '~> 2.0'
-  gem.add_development_dependency 'activesupport'
-  gem.add_development_dependency 'appraisal'
-  gem.add_development_dependency 'conventional-changelog', '~>1.3'
-  gem.add_development_dependency 'bump', '~> 0.5'
-end