pact-support 1.11.0 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81a9d5549b8fae48099843919ad94693490e9eb9
-  data.tar.gz: 839c24b776dc088241caac15006827c313009bf0
+  metadata.gz: 6ac267683e54f4813f2e059fc7f83e074442577b
+  data.tar.gz: 7a0a7895073e1e8459d10da113e997dfb06739d8
 SHA512:
-  metadata.gz: 63fb22506c12a51dffbf729ed6b4c652599c581a368b47ad7167bfb2a44761fc26b3ecdcbe4b9f8a7ed7f846b9bd592af510491abce1ece6b167f5066d4d3665
-  data.tar.gz: '055840b001e39360ce459fc1243f56b26d0f19d01023cae27bdecc8a2349a12e0457d96e8c42f6134e50b38a854258dad988c6ebc997c90a8cdb05c80dc3d0fb'
+  metadata.gz: ae754accf93935cae7f5006caa27b16db8a9426afdbf4ccdbdeac123dafd2cfd3576072400da17a059a4e1dcd7ba6fea29e6aa2dd795e810ff4cc2487cf5292b
+  data.tar.gz: 2afd9abf271aa26b3910b8cd1b4ae76687ae0a3d0b2ff4d7ca5f2534d94cce1d6c03f82b02b8318e74494615bac04ec1ee8fd39b8786ad0e209369e9692f23fd

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+<a name="v1.12.0"></a>
+### v1.12.0 (2019-09-26)
+
+
+#### Features
+
+* parse interaction _id from Pact Broker	 ([8d66a84](/../../commit/8d66a84))
+* support marking an interaction as writable/not writable (#75)	 ([e1fc347](/../../commit/e1fc347))
+* modernise gemspec	 ([c941d02](/../../commit/c941d02))
+
+
+#### Bug Fixes
+
+* add CHANGELOG to gem distribution	 ([35c9c48](/../../commit/35c9c48))
+
+
 <a name="v1.11.0"></a>
 ### v1.11.0 (2019-06-18)
 

data/lib/pact/consumer_contract/consumer_contract.rb

@@ -82,5 +82,16 @@ module Pact
       end
     end
 
+    def writable_interactions
+      interactions.reject do |interaction|
+        # For the sake of backwards compatibility, only reject interactions where 
+        # write_to_pact is explicitly set to false
+        interaction.respond_to?(:metadata) && 
+          !interaction.metadata.nil? && 
+          interaction.metadata.key?(:write_to_pact) &&
+          interaction.metadata[:write_to_pact] == false
+      end
+    end
+
   end
 end

data/lib/pact/consumer_contract/interaction.rb

@@ -5,7 +5,7 @@ module Pact
   class Interaction
     include ActiveSupportSupport
 
-    attr_accessor :description, :request, :response, :provider_state, :provider_states
+    attr_accessor :description, :request, :response, :provider_state, :provider_states, :metadata, :_id
 
     def initialize attributes = {}
       @description = attributes[:description]
@@ -13,6 +13,8 @@ module Pact
       @response = attributes[:response]
       @provider_state = attributes[:provider_state] || attributes[:providerState]
       @provider_states = attributes[:provider_states]
+      @metadata = attributes[:metadata]
+      @_id = attributes[:_id]
     end
 
     def self.from_hash hash, options = {}
@@ -30,6 +32,7 @@ module Pact
 
       h[:request] = request.to_hash
       h[:response] = response.to_hash
+      h[:metadata] = metadata
       h
     end
 

data/lib/pact/consumer_contract/interaction_v2_parser.rb

@@ -14,7 +14,11 @@ module Pact
       request = parse_request(hash['request'], options)
       response = parse_response(hash['response'], options)
       provider_states = parse_provider_states(hash['providerState'] || hash['provider_state'])
-      Interaction.new(symbolize_keys(hash).merge(request: request, response: response, provider_states: provider_states))
+      metadata = parse_metadata(hash['metadata'])
+      Interaction.new(symbolize_keys(hash).merge(request: request, 
+                                                 response: response, 
+                                                 provider_states: provider_states,
+                                                 metadata: metadata))
     end
 
     def self.parse_request request_hash, options
@@ -30,5 +34,9 @@ module Pact
     def self.parse_provider_states provider_state_name
       provider_state_name ? [Pact::ProviderState.new(provider_state_name)] : []
     end
+
+    def self.parse_metadata metadata_hash
+      symbolize_keys(metadata_hash)
+    end
   end
 end

data/lib/pact/consumer_contract/interaction_v3_parser.rb

@@ -19,7 +19,12 @@ module Pact
       if provider_states && provider_states.size > 1
         Pact.configuration.error_stream.puts("WARN: Currently only 1 provider state is supported. Ignoring ")
       end
-      Interaction.new(symbolize_keys(hash).merge(request: request, response: response, provider_states: provider_states, provider_state: provider_state))
+      metadata = parse_metadata(hash['metadata'])
+      Interaction.new(symbolize_keys(hash).merge(request: request, 
+                                                 response: response, 
+                                                 provider_states: provider_states, 
+                                                 provider_state: provider_state,
+                                                 metadata: metadata))
     end
 
     def self.parse_request request_hash, options
@@ -69,5 +74,9 @@ module Pact
         Pact::ProviderState.new(provider_state_hash['name'], provider_state_hash['params'])
       end
     end
+
+    def self.parse_metadata metadata_hash
+      symbolize_keys(metadata_hash)
+    end
   end
 end

data/lib/pact/support/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module Support
-    VERSION = "1.11.0"
+    VERSION = "1.12.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-support
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.12.0
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-18 00:00:00.000000000 Z
+date: 2019-09-29 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,19 +207,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/ISSUE_TEMPLATE.md"
-- ".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
@@ -331,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: {}
@@ -443,87 +303,4 @@ rubygems_version: 2.6.11
 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/.github/ISSUE_TEMPLATE.md

@@ -1,33 +0,0 @@
-# Pre issue-raising checklist
-
-I have already (please mark the applicable with an `x`):
-
-* [ ] Upgraded to the latest version of the relevant libraries
-* [ ] Checked to see if the issue has already been raised
-* [ ] Created an executable example that demonstrates the issue using either:
-  * a Dockerfile
-  * a fork of https://github.com/pact-foundation/pact-ruby-standalone-e2e-example
-  * a Git repository with a Travis or Appveyor (or similar) build
-  * a gist with all the relevant code and full instructions on how to run it
-
-## Software versions
-
-* **pact-support:** eg pact-js 1.2.3
-* **pact-ruby-standalone** (if relevant): eg 2.3.1-1
-* **OS**: e.g. Mac OSX 10.11.5
-
-## Expected behaviour
-
-Please complete...
-
-## Actual behaviour
-
-Please complete...
-
-## Steps to reproduce
-
-Your bug will be fixed in our free time, so help us to help you, and make it as easy as possible for us to reproduce the issue. Issues that take longer to reproduce are less likely to be fixed quickly. Please provide a Dockerfile or git repository + build, with instructions on how to reproduce the issue.
-
-## Relevent log files
-
-Please ensure you set logging to `DEBUG` and attach any relevant log files here (or link from a gist).

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