pact-support 1.2.5 → 1.2.99.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ceba97bd72023027c4e7580355cb8466ef517803
-  data.tar.gz: 1e795b9e00a0f8e8a434c11fcb0da831cf34c691
+  metadata.gz: bb6aa8891e3b73c96d764ca9dd4c43849dc2972b
+  data.tar.gz: 79d896556e2d8eb9679aa41ae84200fe26fec695
 SHA512:
-  metadata.gz: c55960e2c5ccc2855f832d9d7fb9fb1d8cba364a528a9677531a58886cac598c8fdb49ae3a214b0ddc78d40dc825e7145939a30ebb148258202f0a59fd7ea939
-  data.tar.gz: 968254cef4d186916334e42f0bed7e1b80d4d25f9ad65688e9c06b5b96f1eb4d1bc215038874af77211aeaf1ff809ee5cb0b373c07fc30c4cf2613f4fb1cf733
+  metadata.gz: 9c3ca1df6aef0c0c5fa2944f9a75980dd5c2970d99c23c3940d8a1812fce409f9ac2f527733a3c9d06505453ae09b7dbddc6383170b62b1191c4036c0ffb6dac
+  data.tar.gz: b16006ef3b27268ecfa08793847709f9aee236c4b7ebf11a8a539bf41ffc4f38e7a1e76d63149e04bf9fc7bc916b05660e799e3bf974f487c35ab52a9e951104

data/CHANGELOG.md

@@ -1,9 +1,6 @@
-<a name="v1.2.5"></a>
-### v1.2.5 (2018-02-16)
+Do this to generate your change history
 
-#### Bug Fixes
-
-* replace backslashes in pact dir path with forward slashes	 ([a1b5013](/../../commit/a1b5013))
+  git log --pretty=format:'  * %h - %s (%an, %ad)'
 
 ### 1.2.4 (2017-10-30)
 * 80bbdcc - fix: remove unused dependency on rack-test (Beth Skurrie, Mon Oct 30 09:52:22 2017 +1100)

data/RELEASING.md

@@ -1,5 +1,15 @@
 # Releasing
 
-Run
+1. Increment the version in `lib/pact/support/version.rb`
+2. Update the `CHANGELOG.md` using:
 
-    script/release.sh [major|minor|patch] # default is minor
+      $ git log --pretty=format:'  * %h - %s (%an, %ad)' vX.Y.Z..HEAD
+
+3. Add files to git
+
+      $ git add CHANGELOG.md lib/pact/support/version.rb
+      $ git commit -m "chore(release): version $(ruby -r ./lib/pact/support/version.rb -e "puts Pact::Support::VERSION")"
+
+3. Release:
+
+      $ bundle exec rake release

data/lib/pact/consumer_contract/consumer_contract.rb

@@ -10,9 +10,9 @@ require 'pact/consumer_contract/service_consumer'
 require 'pact/consumer_contract/service_provider'
 require 'pact/consumer_contract/interaction'
 require 'pact/consumer_contract/pact_file'
+require 'pact/consumer_contract/http_consumer_contract_parser'
 
 module Pact
-
   class ConsumerContract
 
     include SymbolizeKeys
@@ -29,13 +29,19 @@ module Pact
       @provider = attributes[:provider]
     end
 
+    def self.add_parser consumer_contract_parser
+      parsers << consumer_contract_parser
+    end
+
+    def self.parsers
+      @parsers ||= [Pact::HttpConsumerContractParser.new]
+    end
+
     def self.from_hash(hash)
-      hash = symbolize_keys(hash)
-      new(
-        :consumer => ServiceConsumer.from_hash(hash[:consumer]),
-        :provider => ServiceProvider.from_hash(hash[:provider]),
-        :interactions => hash[:interactions].collect { |hash| Interaction.from_hash(hash)}
-      )
+      parsers.each do | parser |
+        return parser.call(hash) if parser.can_parse?(hash)
+      end
+      raise Pact::Error.new("No consumer contract parser found for hash: #{hash}")
     end
 
     def self.from_json string
@@ -54,9 +60,9 @@ module Pact
     def find_interaction criteria
       interactions = find_interactions criteria
       if interactions.size == 0
-        raise "Could not find interaction matching #{criteria} in pact file between #{consumer.name} and #{provider.name}."
+        raise Pact::Error.new("Could not find interaction matching #{criteria} in pact file between #{consumer.name} and #{provider.name}.")
       elsif interactions.size > 1
-        raise "Found more than 1 interaction matching #{criteria} in pact file between #{consumer.name} and #{provider.name}."
+        raise Pact::Error.new("Found more than 1 interaction matching #{criteria} in pact file between #{consumer.name} and #{provider.name}.")
       end
       interactions.first
     end

data/lib/pact/consumer_contract/file_name.rb

@@ -8,15 +8,11 @@ module Pact
     end
 
     def file_path consumer_name, provider_name, pact_dir = Pact.configuration.pact_dir, options = {}
-      File.join(windows_safe(pact_dir), file_name(consumer_name, provider_name, options))
+      File.join(pact_dir, file_name(consumer_name, provider_name, options))
     end
 
     def filenamify name
       name.downcase.gsub(/\s/, '_')
     end
-
-    def windows_safe(pact_dir)
-      pact_dir.gsub("\\", "/")
-    end
   end
 end

data/lib/pact/consumer_contract/http_consumer_contract_parser.rb

@@ -0,0 +1,26 @@
+module Pact
+  class HttpConsumerContractParser
+    include SymbolizeKeys
+
+    def call(hash)
+      hash = symbolize_keys(hash)
+      interactions = if hash[:interactions]
+        hash[:interactions].collect { |hash| Interaction.from_hash(hash)}
+      elsif hash[:messages]
+        hash[:messages].collect { |hash| Message.from_hash(hash)}
+      else
+        [] # or raise an error?
+      end
+
+      ConsumerContract.new(
+        :consumer => ServiceConsumer.from_hash(hash[:consumer]),
+        :provider => ServiceProvider.from_hash(hash[:provider]),
+        :interactions => interactions
+      )
+    end
+
+    def can_parse?(hash)
+      hash.key?('interactions') || hash.key?(:interactions)
+    end
+  end
+end

data/lib/pact/consumer_contract/interaction.rb

@@ -6,7 +6,7 @@ require 'pact/matching_rules'
 require 'pact/errors'
 
 module Pact
-   class Interaction
+  class Interaction
     include ActiveSupportSupport
       include SymbolizeKeys
 
@@ -36,6 +36,10 @@ module Pact
         }
       end
 
+      def http?
+        true
+      end
+
       def validate!
         raise Pact::InvalidInteractionError.new(self) unless description && request && response
       end

data/lib/pact/shared/json_differ.rb

@@ -5,7 +5,7 @@ module Pact
 
     extend Matchers
     
-    # Delegates to https://github.com/pact-foundation/pact-support/blob/master/lib/pact/matchers/matchers.rb#L25
+    # Delegates to https://github.com/bethesque/pact-support/blob/master/lib/pact/matchers/matchers.rb#L25
     def self.call expected, actual, options = {}
       diff expected, actual, options
     end

data/lib/pact/support/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module Support
-    VERSION = "1.2.5"
+    VERSION = "1.2.99.alpha.1"
   end
 end

data/pact-support.gemspec

@@ -34,6 +34,4 @@ Gem::Specification.new do |gem|
   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

data/spec/lib/pact/consumer_contract/consumer_contract_spec.rb

@@ -3,50 +3,53 @@ require 'pact/consumer_contract'
 
 module Pact
   describe ConsumerContract do
-
     describe ".from_json" do
+
       let(:loaded_pact) { ConsumerContract.from_json(string) }
-      context "when the top level object is a ConsumerContract" do
-        let(:string) { '{"interactions":[{"request": {"path":"/path", "method" : "get"}, "response": {"status" : 200}}], "consumer": {"name" : "Bob"} , "provider": {"name" : "Mary"} }' }
 
-        it "should create a Pact" do
-          expect(loaded_pact).to be_instance_of ConsumerContract
-        end
+      context "with an HTTP contract" do
+        context "when the top level object is a ConsumerContract" do
+          let(:string) { '{"interactions":[{"request": {"path":"/path", "method" : "get"}, "response": {"status" : 200}}], "consumer": {"name" : "Bob"} , "provider": {"name" : "Mary"} }' }
 
-        it "should have interactions" do
-          expect(loaded_pact.interactions).to be_instance_of Array
-        end
+          it "should create a Pact" do
+            expect(loaded_pact).to be_instance_of ConsumerContract
+          end
 
-        it "should have a consumer" do
-          expect(loaded_pact.consumer).to be_instance_of Pact::ServiceConsumer
-        end
+          it "should have interactions" do
+            expect(loaded_pact.interactions).to be_instance_of Array
+          end
 
-        it "should have a provider" do
-          expect(loaded_pact.provider).to be_instance_of Pact::ServiceProvider
-        end
-      end
+          it "should have a consumer" do
+            expect(loaded_pact.consumer).to be_instance_of Pact::ServiceConsumer
+          end
 
-      context "with old 'producer' key" do
-        let(:string) { File.read('./spec/support/a_consumer-a_producer.json')}
-        it "should create a Pact" do
-          expect(loaded_pact).to be_instance_of ConsumerContract
+          it "should have a provider" do
+            expect(loaded_pact.provider).to be_instance_of Pact::ServiceProvider
+          end
         end
 
-        it "should have interactions" do
-          expect(loaded_pact.interactions).to be_instance_of Array
-        end
+        context "with old 'producer' key" do
+          let(:string) { File.read('./spec/support/a_consumer-a_producer.json')}
+          it "should create a Pact" do
+            expect(loaded_pact).to be_instance_of ConsumerContract
+          end
 
-        it "should have a consumer" do
-          expect(loaded_pact.consumer).to be_instance_of Pact::ServiceConsumer
-        end
+          it "should have interactions" do
+            expect(loaded_pact.interactions).to be_instance_of Array
+          end
 
-        it "should have a provider" do
-          expect(loaded_pact.provider).to be_instance_of Pact::ServiceProvider
-          expect(loaded_pact.provider.name).to eq "an old producer"
-        end
+          it "should have a consumer" do
+            expect(loaded_pact.consumer).to be_instance_of Pact::ServiceConsumer
+          end
 
-        it "should have a provider_state" do
-          expect(loaded_pact.interactions.first.provider_state).to eq 'state one'
+          it "should have a provider" do
+            expect(loaded_pact.provider).to be_instance_of Pact::ServiceProvider
+            expect(loaded_pact.provider.name).to eq "an old producer"
+          end
+
+          it "should have a provider_state" do
+            expect(loaded_pact.interactions.first.provider_state).to eq 'state one'
+          end
         end
       end
     end

data/spec/lib/pact/consumer_contract/file_name_spec.rb

@@ -3,22 +3,13 @@ require 'pact/consumer_contract/file_name'
 module Pact
   describe FileName do
     describe "file_path" do
-
-      subject { FileName.file_path 'foo', 'bar', 'tmp/pacts' }
+      let(:subject) { FileName.file_path 'foo', 'bar', 'tmp/pacts' }
       it { is_expected.to eq 'tmp/pacts/foo-bar.json' }
 
       context "when unique is true" do
-        subject { FileName.file_path 'foo', 'bar', 'tmp/pacts', unique: true }
+        let(:subject) { FileName.file_path 'foo', 'bar', 'tmp/pacts', unique: true }
         it { is_expected.to match %r{tmp/pacts/foo-bar-\d+.json} }
       end
-
-      context "when the path includes backslashes" do
-        subject { FileName.file_path 'foo', 'bar', 'c:\tmp\pacts' }
-
-        it "changes them to forward slashes" do
-          expect(subject).to eq "c:/tmp/pacts/foo-bar.json"
-        end
-      end
     end
   end
 end

data/tasks/spec.rake

@@ -12,4 +12,3 @@ task :spec_with_active_support => [:set_active_support_on] do
 end
 
 task :default => [:spec, :spec_with_active_support]
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-support
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.99.alpha.1
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-16 00:00:00.000000000 Z
+date: 2018-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: randexp
@@ -210,34 +210,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: conventional-changelog
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: bump
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
 description: 
 email:
 - james.fraser@alumni.swinburne.edu
@@ -268,6 +240,7 @@ files:
 - lib/pact/consumer_contract/consumer_contract.rb
 - lib/pact/consumer_contract/file_name.rb
 - lib/pact/consumer_contract/headers.rb
+- lib/pact/consumer_contract/http_consumer_contract_parser.rb
 - lib/pact/consumer_contract/interaction.rb
 - lib/pact/consumer_contract/pact_file.rb
 - lib/pact/consumer_contract/query.rb
@@ -320,7 +293,6 @@ files:
 - 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/integration/matching_rules_extract_and_merge_spec.rb
@@ -391,7 +363,6 @@ files:
 - 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
 licenses:
@@ -408,9 +379,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5.2

data/script/release.sh

@@ -1,9 +0,0 @@
-#!/bin/sh
-set -e
-
-git checkout -- lib/pact/support/version.rb
-bundle exec bump ${1:-minor} --no-commit
-bundle exec rake generate_changelog
-git add CHANGELOG.md lib/pact/support/version.rb
-git commit -m "Releasing version $(ruby -r ./lib/pact/support/version.rb -e "puts Pact::Support::VERSION")"
-bundle exec rake release

data/tasks/release.rake

@@ -1,5 +0,0 @@
-task :generate_changelog do
-  require 'pact/support/version'
-  require 'conventional_changelog'
-  ConventionalChangelog::Generator.new.generate! version: "v#{Pact::Support::VERSION}"
-end