pact_broker 1.9.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ea53ff24e52dedddcfd7dc4ba8972fd7a74c690
-  data.tar.gz: e03e51d0361af424ad239ccb74051ed63640c32c
+  metadata.gz: f919919c73ee62c636f69b79971a8b0f8bb6610d
+  data.tar.gz: 0c6208f282a318f57b43719ba10e1d4c77de45c9
 SHA512:
-  metadata.gz: da11452f57a5915402445398373e697df1fa59135b99aadc3e5e4d9cddc481fed445328b6f14b52577ed29bbdbf3023417fee328a531b4a834cc4476b1024f30
-  data.tar.gz: 1da99413c3e602ca6e4d4286c9f8d84a82da08690f34367bfa091b9dbd38ed518171ea09500211d17c4d663f7cbfd257b721ef5c9094318448009e2c4d2dce78
+  metadata.gz: 6a5979960c942e3628e37e362054277f8e4708f726395dac807ca5912ec5f2186fad992d7b51da1bb65e8c1015ed66abe2ffff800e6b266044fd50c8fe6ab876
+  data.tar.gz: abac02e82dce27c9a8a16a5b073b9b4a6caeee7ac0c9c83bcd7bbbfd063a145079393fe7d892e26818a72b4036f7f0b926b8bd7f20d8db6b16101954ab256a60

data/.gitignore

@@ -27,4 +27,5 @@ _yardoc
 *.sqlite
 Gemfile.lock
 
-bethtest/
+bethtest/
+bin/

data/.ruby-version

@@ -0,0 +1 @@
+2.1.3

data/.travis.yml

@@ -4,3 +4,4 @@ rvm:
   - 2.0.0
   - 2.1.1
   - 2.1.2
+  - 2.1.3

data/LICENSE.txt

@@ -0,0 +1,20 @@
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,5 +1,7 @@
 # Pact Broker
 
+[![Build Status](https://travis-ci.org/bethesque/pact_broker.svg?branch=master)](https://travis-ci.org/bethesque/pact_broker) [![Join the chat at https://gitter.im/bethesque/pact_broker](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/bethesque/pact_broker?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
 The Pact Broker provides a repository for consumer driven contracts created using the pact gem. 
 
 It: 

data/example/Gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 
 gem "pact_broker", "~>1.4"
-gem "sqlite3" # Replace with your choice of database driver eg. mysql2
+gem "sqlite3" # Replace with your choice of database driver eg. gem "pg"
 gem "thin" # Keep, or replace with your choice of web server

data/example/config.ru

@@ -1,11 +1,19 @@
 require 'fileutils'
 require 'logger'
 require 'sequel'
+# require 'pg' # for postgres
 require 'pact_broker'
 
 # Create a real database, and set the credentials for it here
 # It is highly recommended to set the encoding to utf8 (varchar foreign keys may blow up otherwise)
-DATABASE_CREDENTIALS = {database: "pact_broker_database.sqlite3", adapter: "sqlite", :encoding => 'utf8'}
+DATABASE_CREDENTIALS = {adapter: "sqlite", database: "pact_broker_database.sqlite3", :encoding => 'utf8'}
+
+# For postgres:
+# $ psql postgres
+# > create database pact_broker;
+# > CREATE USER pact_broker WITH PASSWORD 'pact_broker';
+# > GRANT ALL PRIVILEGES ON DATABASE pact_broker to pact_broker;
+# > DATABASE_CREDENTIALS = {adapter: "postgres", database: "pact_broker", username: 'pact_broker', password: 'pact_broker', :encoding => 'utf8'}
 
 # Have a look at the Sequel documentation to make decisions about things like connection pooling
 # and connection validation.

data/lib/pact_broker/api/resources/pact.rb

@@ -27,11 +27,14 @@ module PactBroker
           ["GET", "PUT", "DELETE"]
         end
 
+        def is_conflict?
+          potential_duplicate_pacticipants?(pact_params.pacticipant_names)
+        end
+
         def malformed_request?
           if request.put?
             return invalid_json? ||
-              contract_validation_errors?(Contracts::PutPactParamsContract.new(pact_params)) ||
-              potential_duplicate_pacticipants?(pact_params.pacticipant_names)
+              contract_validation_errors?(Contracts::PutPactParamsContract.new(pact_params))
           else
             false
           end

data/lib/pact_broker/domain/relationship.rb

@@ -35,7 +35,7 @@ module PactBroker
       end
 
       def connected? other
-        (self.to_a & other.to_a).any?
+        include?(other.consumer) || include?(other.provider)
       end
 
       def include? pacticipant
@@ -58,4 +58,4 @@ module PactBroker
 
     end
   end
-end
+end

data/lib/pact_broker/domain/webhook_request.rb

@@ -48,7 +48,6 @@ module PactBroker
       def execute
 
         begin
-          #TODO make it work with https
           req = http_request
 
           headers.each_pair do | name, value |
@@ -60,7 +59,8 @@ module PactBroker
           req.body = body
 
           logger.info "Making webhook request #{to_s}"
-          response = Net::HTTP.start(uri.hostname, uri.port) do |http|
+          response = Net::HTTP.start(uri.hostname, uri.port,
+            :use_ssl => uri.scheme == 'https') do |http|
             http.request req
           end
 

data/lib/pact_broker/relationships/groupify.rb

@@ -11,28 +11,34 @@ module PactBroker
     class Groupify
 
       def self.call relationships
-        recurse_groups([], relationships.dup).collect{ | group | Domain::Group.new(group) }
+        recurse_groups([], relationships.dup).collect { |group| Domain::Group.new(group) }
       end
 
       def self.recurse_groups groups, relationship_pool
         if relationship_pool.empty?
           groups
         else
-          first, *rest = *relationship_pool
-          group = recurse first, rest
-          recurse_groups(groups + [group], relationship_pool - group)
-        end
-      end
+          first, *rest = relationship_pool
+          group = [first]
+          new_connections = true
+          while new_connections
+            new_connections = false
+            group = rest.inject(group) do |connected, candidate|
+              if connected.select { |relationship| relationship.connected?(candidate) }.any?
+                new_connections = true
+                connected + [candidate]
+              else
+                connected
+              end
+            end
+
+            rest = rest - group
+            group.uniq
+          end
 
-      def self.recurse relationship, relationship_pool
-        connected_relationships = relationship_pool.select{ | candidate| candidate.connected?(relationship) }
-        if connected_relationships.empty?
-          [relationship]
-        else
-          ([relationship] + connected_relationships.map{| connected_relationship| recurse(connected_relationship, relationship_pool - connected_relationships)}.flatten).uniq
+          recurse_groups(groups + [group], relationship_pool - group)
         end
       end
-
     end
 
   end

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '1.9.0'
+  VERSION = '1.9.1'
 end

data/spec/lib/pact_broker/api/resources/pact_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 require 'pact_broker/api/resources/pact'
 require 'rack/test'
+require 'pact_broker/pacts/service'
 
 module PactBroker::Api
 
@@ -63,8 +64,8 @@ module PactBroker::Api
             response
           end
 
-          it "returns a 400 response" do
-            expect(response.status).to eq 400
+          it "returns a 409 response" do
+            expect(response.status).to eq 409
           end
 
           it "returns a text response" do

data/spec/lib/pact_broker/domain/webhook_request_spec.rb

@@ -10,11 +10,12 @@ module PactBroker
 
       let(:username) { nil }
       let(:password) { nil }
+      let(:url) { 'http://example.org/hook' }
 
       subject do
         WebhookRequest.new(
           method: 'post',
-          url: 'http://example.org/hook',
+          url: url,
           headers: {'Content-type' => 'text/plain'},
           username: username,
           password: password,
@@ -85,6 +86,22 @@ module PactBroker
           end
         end
 
+        context "when the URL has a https scheme" do
+          let(:url) { 'https://example.org/hook' }
+
+          let!(:https_request) do
+            # webmock will set the request signature scheme to 'https' _only_ if the use_ssl option is set
+            stub_request(:post, "https://example.org/hook").
+              with(:headers => {'Content-Type'=>'text/plain'}, :body => 'body').
+              to_return(:status => 302, :body => "respbod", :headers => {'Content-Type' => 'text/plain, blah'})
+          end
+
+          it "uses SSL" do
+            subject.execute
+            expect(https_request).to have_been_made
+          end
+        end
+
         context "when the request is successful" do
           it "returns a WebhookExecutionResult with success=true" do
             expect(subject.execute.success?).to be true

data/spec/lib/pact_broker/relationships/groupify_spec.rb

@@ -10,18 +10,18 @@ module PactBroker
 
       describe ".call" do
 
-        let(:consumer_a) { double('consumer a', name: 'consumer a') }
-        let(:consumer_b) { double('consumer b', name: 'consumer b') }
-        let(:consumer_c) { double('consumer c', name: 'consumer c') }
+        let(:consumer_a) { double('consumer a', id: 1, name: 'consumer a') }
+        let(:consumer_b) { double('consumer b', id: 2, name: 'consumer b') }
+        let(:consumer_c) { double('consumer c', id: 3, name: 'consumer c') }
 
-        let(:consumer_l) { double('consumer l', name: 'consumer l') }
-        let(:consumer_m) { double('consumer m', name: 'consumer m') }
+        let(:consumer_l) { double('consumer l', id: 4, name: 'consumer l') }
+        let(:consumer_m) { double('consumer m', id: 5, name: 'consumer m') }
 
-        let(:provider_p) { double('provider p', name: 'provider p') }
+        let(:provider_p) { double('provider p', id: 6, name: 'provider p') }
 
-        let(:provider_x) { double('provider x', name: 'provider x') }
-        let(:provider_y) { double('provider y', name: 'provider y') }
-        let(:provider_z) { double('provider z', name: 'provider z') }
+        let(:provider_x) { double('provider x', id: 7, name: 'provider x') }
+        let(:provider_y) { double('provider y', id: 8, name: 'provider y') }
+        let(:provider_z) { double('provider z', id: 9, name: 'provider z') }
 
 
         let(:relationship_1) { Domain::Relationship.new(consumer_a, provider_x) }
@@ -34,7 +34,7 @@ module PactBroker
         let(:relationship_5) { Domain::Relationship.new(consumer_l, provider_p) }
         let(:relationship_6) { Domain::Relationship.new(consumer_m, provider_p) }
 
-        let(:relationships) { [relationship_1, relationship_2, relationship_3, relationship_4, relationship_5, relationship_6 ]}
+        let(:relationships) { [relationship_1, relationship_2, relationship_3, relationship_4, relationship_5, relationship_6] }
 
         it "separates the relationships into isolated groups" do
           groups = Groupify.call(relationships)
@@ -47,4 +47,4 @@ module PactBroker
     end
 
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.1
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-18 00:00:00.000000000 Z
+date: 2016-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -352,9 +352,11 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
+- LICENSE.txt
 - README.md
 - Rakefile
 - bethtest.rb
@@ -713,7 +715,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: See description