pact_broker-client 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7adaed58f0613b3153fe1aef45dec8b038903dba
-  data.tar.gz: 59dd62e52015d518688a7a568e0297855edf40e0
+  metadata.gz: cd260ac11fff621cf61a0ac7ca6a7afd8c6e2628
+  data.tar.gz: 6618227846bb37655c20905d2a499b5d4127d35b
 SHA512:
-  metadata.gz: 1b7e4b86f15221c2864b8bb7261ce005546dc3dfee965b03b9f30f25794d9c56de7c498614817aa4e5aded1c1f233ab73d1d011970e345d58fb04d792fc95fa6
-  data.tar.gz: 86185d962b3b4ea670cf7e9776f0b5297d0c9889ff7161099485ebb18e5eabb09622a3bb7a5cab9650f5a24201772352b56b009cb49a182417c2320cc3b7c2a2
+  metadata.gz: 0b5f64103ed3a3b14c47021a50ae577330a40cec1469455d6ec888c53bca8867ab13fcb82f7270a2a8d1d32e0d81e99f41ebb1950ed82dea8c6edff3a905f63e
+  data.tar.gz: 3131f849daf5d09f8f3edd570d8e20751fb2be390412e480e1f69f88d1605c0fa2b8efdfad0673b0fb52f6e46042553a7aa3978198acd7fff57e3ca3544b1033

data/CHANGELOG.md

@@ -2,6 +2,9 @@ Do this to generate your change history
 
     $ git log --pretty=format:'  * %h - %s (%an, %ad)' vX.Y.Z..HEAD
 
+#### 1.1.0 (2016-08-19)
+* b5ea1b3 - Add support for publishing pacts via patch request (Steve Pletcher, Fri Aug 5 11:16:18 2016 -0400)
+
 #### 1.0.3 (2016-06-27)
 
 * 04bd518 - Clarify that pact_broker-client will only work with ruby >= 2.0 (Sergei Matheson, Mon Jun 27 11:17:57 2016 +1000)

data/README.md

@@ -24,6 +24,7 @@ PactBroker::Client::PublicationTask.new do | task |
   task.consumer_version = MyConsumer::VERSION
   task.pact_broker_base_url = "http://pact-broker.my.org"
   task.pact_broker_basic_auth =  { username: 'basic_auth_user', password: 'basic_auth_pass'} #optional
+  task.write_method = :merge # optional, this will merge the published pact into an existing pact rather than overwriting it if one exists
 end
 ```
 

data/RELEASING.md

@@ -8,6 +8,7 @@
 3. Add files to git
 
       $ git add CHANGELOG.md lib/pact_broker/client/version.rb
+      $ git commit -m "Releasing version X.Y.Z"
 
 3. Release:
 

data/lib/pact_broker/client/base_client.rb

@@ -75,4 +75,4 @@ module PactBroker
 
     end
   end
-end
+end

data/lib/pact_broker/client/pacts.rb

@@ -11,7 +11,13 @@ module PactBroker
         pact_string = options[:pact_json]
         consumer_contract = ::Pact::ConsumerContract.from_json pact_string
         url = save_consumer_contract_url consumer_contract, consumer_version
-        response = self.class.put(url, body: pact_string, headers: default_put_headers)
+
+        if @client_options[:write] == :merge
+          response = self.class.patch(url, body: pact_string, headers: default_patch_headers)
+        else
+          response = self.class.put(url, body: pact_string, headers: default_put_headers)
+        end
+
         handle_response(response) do
           latest_link = find_latest_link JSON.parse(response.body)
           if latest_link.nil?

data/lib/pact_broker/client/tasks/publication_task.rb

@@ -15,7 +15,7 @@ module PactBroker
   module Client
     class PublicationTask < ::Rake::TaskLib
 
-      attr_accessor :pattern, :pact_broker_base_url, :consumer_version, :pact_broker_basic_auth
+      attr_accessor :pattern, :pact_broker_base_url, :consumer_version, :write_method, :pact_broker_basic_auth
 
       def initialize name = nil, &block
         @name = name
@@ -32,7 +32,8 @@ module PactBroker
           task task_name do
             block.call(self)
             require 'pact_broker/client/publish_pacts'
-            pact_broker_client_options = pact_broker_basic_auth ? {basic_auth: pact_broker_basic_auth} :{}
+            basic_auth_client_options = pact_broker_basic_auth ? {basic_auth: pact_broker_basic_auth} : {}
+            pact_broker_client_options = basic_auth_client_options.merge(write_method ? {write: write_method} : {})
             success = PactBroker::Client::PublishPacts.new(pact_broker_base_url, FileList[pattern], consumer_version, pact_broker_client_options).call
             raise "One or more pacts failed to be published" unless success
           end
@@ -45,4 +46,4 @@ module PactBroker
 
     end
   end
-end
+end

data/lib/pact_broker/client/version.rb

@@ -1,5 +1,5 @@
 module PactBroker
   module Client
-    VERSION = '1.0.3'
+    VERSION = '1.1.0'
   end
 end

data/spec/lib/pact_broker/client/tasks/publication_task_spec.rb

@@ -44,6 +44,20 @@ module PactBroker::Client
       end
     end
 
+    describe "merge method configuration" do
+      before :all do
+        PactBroker::Client::PublicationTask.new(:merge) do | task |
+          task.consumer_version = '1.2.3'
+          task.write_method = :merge
+        end
+      end
+
+      it "invokes PublishPacts with the write method set" do
+        PactBroker::Client::PublishPacts.should_receive(:new).with('http://pact-broker', pact_file_list, '1.2.3', {write: :merge}).and_return(publish_pacts)
+        publish_pacts.should_receive(:call).and_return(true)
+        Rake::Task['pact:publish:merge'].execute
+      end
+    end
 
     describe "custom task" do
 
@@ -84,4 +98,4 @@ module PactBroker::Client
 
   end
 
-end
+end

data/spec/pacts/pact_broker_client-pact_broker.json

@@ -236,7 +236,41 @@
       }
     },
     {
-      "description": "a request to publish a pact",
+      "description": "a request to publish a pact with method patch",
+      "provider_state": "the 'Pricing Service' and 'Condor' already exist in the pact-broker, and Condor already has a pact published for version 1.3.0",
+      "request": {
+        "method": "patch",
+        "path": "/pacts/provider/Pricing%20Service/consumer/Condor/version/1.3.0",
+        "headers": {
+          "Content-Type": "application/json"
+        },
+        "body": {
+          "consumer": {
+            "name": "Condor"
+          },
+          "provider": {
+            "name": "Pricing Service"
+          },
+          "interactions": [
+
+          ]
+        }
+      },
+      "response": {
+        "status": 200,
+        "headers": {
+        },
+        "body": {
+          "_links": {
+            "pb:latest-pact-version": {
+              "href": "http://example.org/pacts/provider/Pricing%20Service/consumer/Condor/latest"
+            }
+          }
+        }
+      }
+    },
+    {
+      "description": "a request to publish a pact with method put",
       "provider_state": "the 'Pricing Service' and 'Condor' already exist in the pact-broker, and Condor already has a pact published for version 1.3.0",
       "request": {
         "method": "put",

data/spec/service_providers/pact_broker_client_publish_spec.rb

@@ -36,29 +36,42 @@ module PactBroker::Client
       end
 
       context "when the provider, consumer, pact and version already exist in the pact-broker" do
-        before do
-          pact_broker.
-            given("the 'Pricing Service' and 'Condor' already exist in the pact-broker, and Condor already has a pact published for version 1.3.0").
-            upon_receiving("a request to publish a pact").
-            with(
-              method: :put,
-              path: '/pacts/provider/Pricing%20Service/consumer/Condor/version/1.3.0',
-              headers: default_request_headers,
-              body: pact_hash ).
-            will_respond_with(
-              headers: pact_broker_response_headers,
-              status: 200,
-              body: {
-                _links: {
-                  :'pb:latest-pact-version' => {
-                    href: location
+        shared_examples "an already-existing pact" do |method|
+          before do
+            pact_broker.
+              given("the 'Pricing Service' and 'Condor' already exist in the pact-broker, and Condor already has a pact published for version 1.3.0").
+              upon_receiving("a request to publish a pact with method #{method}").
+              with(
+                method: method,
+                path: '/pacts/provider/Pricing%20Service/consumer/Condor/version/1.3.0',
+                headers: default_request_headers,
+                body: pact_hash ).
+              will_respond_with(
+                headers: pact_broker_response_headers,
+                status: 200,
+                body: {
+                  _links: {
+                    :'pb:latest-pact-version' => {
+                      href: location
+                    }
                   }
                 }
-              }
-            )
-        end
-        it "returns true" do
+              )
+          end
+
+          it "returns true" do
             expect(pact_broker_client.pacticipants.versions.pacts.publish(options)).to be_truthy
+          end
+        end
+
+        context "when the write method is set to merge" do
+          let(:client_config) { super().merge(client_options: {write: :merge}) }
+
+          it_behaves_like "an already-existing pact", :patch
+        end
+
+        context "when the write method is not set" do
+          it_behaves_like "an already-existing pact", :put
         end
       end
 
@@ -85,7 +98,7 @@ module PactBroker::Client
             )
         end
         it "returns true" do
-            expect(pact_broker_client.pacticipants.versions.pacts.publish(options)).to be_truthy
+          expect(pact_broker_client.pacticipants.versions.pacts.publish(options)).to be_truthy
         end
       end
 

data/spec/support/shared_context.rb

@@ -3,7 +3,8 @@ shared_context "pact broker" do
   let(:pact_hash) { {consumer: {name: 'Condor'}, provider: {name: 'Pricing Service'}, interactions: []} }
   let(:consumer_contract) { Pact::ConsumerContract.from_hash pact_hash }
   let(:pact_json) { pact_hash.to_json }
-  let(:pact_broker_client) { PactBroker::Client::PactBrokerClient.new(base_url: 'http://localhost:1234') }
+  let(:pact_broker_client) { PactBroker::Client::PactBrokerClient.new(client_config) }
+  let(:client_config) { { base_url: 'http://localhost:1234' } }
   let(:consumer_version) { '1.3.0' }
   let(:version) { '1.3.0' }
   let(:pact_broker_version) { Pact::Term.new(:matcher => /\d+\.\d+\.\d+/, :generate => '1.0.0') }
@@ -12,4 +13,4 @@ shared_context "pact broker" do
   let(:patch_request_headers)   { { 'Content-Type' => 'application/json'} }
   let(:get_request_headers)     { { 'Accept' => 'application/json'} }
 
-end
+end

metadata

@@ -1,125 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker-client
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Bethany Skurrie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-27 00:00:00.000000000 Z
+date: 2016-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pact
   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: httparty
   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: 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
     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: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 10.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 10.0.3
 - !ruby/object:Gem::Dependency
   name: pry
   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'
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.4'
 - !ruby/object:Gem::Dependency
   name: rspec-fire
   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: Publishes pacts to, and retrieves pacts from, the pact broker server.
@@ -129,9 +129,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - README.md
@@ -183,17 +183,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: See description