pact_broker 1.3.2.rc1 → 1.4.0

data/lib/pact_broker/services.rb

@@ -3,6 +3,7 @@ require 'pact_broker/services/pacticipant_service'
 require 'pact_broker/services/tag_service'
 require 'pact_broker/services/group_service'
 require 'pact_broker/services/webhook_service'
+require 'pact_broker/services/version_service'
 
 module PactBroker
   module Services
@@ -25,5 +26,9 @@ module PactBroker
     def webhook_service
       WebhookService
     end
+
+    def version_service
+      VersionService
+    end
   end
-end
+end

data/lib/pact_broker/services/pact_service.rb

@@ -43,6 +43,12 @@ module PactBroker
         pact_repository.find_all_pacts_between consumer, options
       end
 
+      def find_previous_distinct_pact_version params
+        pact = find_pact params
+        return nil if pact.nil?
+        pact_repository.find_previous_distinct_pact pact
+      end
+
       def find_distinct_pacts_between consumer, options
         # Assumes pacts are sorted from newest to oldest
         all = pact_repository.find_all_pacts_between consumer, options

data/lib/pact_broker/services/version_service.rb

@@ -7,8 +7,8 @@ module PactBroker
 
       extend PactBroker::Repositories
 
-      def self.find_latest_version name
-
+      def self.find_by_pacticipant_name_and_number params
+        version_repository.find_by_pacticipant_name_and_number params.fetch(:pacticipant_name), params.fetch(:pacticipant_version_number)
       end
     end
   end

data/lib/pact_broker/ui.rb

@@ -2,8 +2,13 @@
 # Stop Padrino creating a log file, as it will try to create it in the gems directory
 # http://www.padrinorb.com/api/Padrino/Logger.html
 unless defined? PADRINO_LOGGER
-  PADRINO_LOGGER = { production: { log_level: :warn, stream: :null } }
+  PADRINO_LOGGER = {
+    production:  { log_level: :error, stream: :stderr },
+    staging:     { log_level: :error, stream: :stderr },
+    test:        { log_level: :warn,  stream: :stdout },
+    development: { log_level: :warn,  stream: :stdout }
+  }
 end
 
-require 'pact_broker/ui/controllers/relationships'
-require 'pact_broker/ui/controllers/groups'
+require 'pact_broker/ui/app'
+

data/lib/pact_broker/ui/app.rb

@@ -1,4 +1,5 @@
-require 'pact_broker/ui'
+require 'pact_broker/ui/controllers/relationships'
+require 'pact_broker/ui/controllers/groups'
 require 'pact_broker/doc/controllers/app'
 
 module PactBroker

data/lib/pact_broker/ui/controllers/base_controller.rb

@@ -1,4 +1,4 @@
-require 'padrino'
+require 'padrino-core'
 require 'haml'
 require 'pact_broker/services'
 

data/lib/pact_broker/ui/controllers/clusters.rb

@@ -1,4 +1,4 @@
-require 'padrino'
+require 'padrino-core'
 require 'haml'
 require 'pact_broker/services'
 

data/lib/pact_broker/ui/views/relationships/show.haml

@@ -1,6 +1,6 @@
 %head
   %title
-    Relationships
+    Pacts
   %link{rel: 'stylesheet', href: '/css/bootstrap.min.css'}
   %link{rel: 'stylesheet', href: '/stylesheets/relationships.css'}
   %script{type: 'text/javascript', src:'/javascripts/jquery-2.1.1.min.js'}
@@ -14,9 +14,10 @@
             HAL Browser
   .container
     %h1.page-header
-      Relationships
+      Pacts
     %table.table.table-bordered.table-striped{id: 'relationships'}
       %thead
+        %th
         %th.consumer
           Consumer
           %span.glyphicon.glyphicon-sort.relationships-sort
@@ -25,19 +26,22 @@
         %th.provider
           Provider
           %span.glyphicon.glyphicon-sort.relationships-sort
+        %th
       %tbody
 
       - relationships.each do | relationship |
         %tr
+          %td
           %td.consumer
             %a{:href => relationship.consumer_group_url}
               = relationship.consumer_name
           %td.pact
-            %a.btn.btn-primary{:href => relationship.latest_pact_url}
-              %span.glyphicon.glyphicon-arrow-right
+            %a{:href => relationship.latest_pact_url, :title => "View pact"}
+              %span.pact
           %td.provider
             %a{:href => relationship.provider_group_url}
               = relationship.provider_name
+          %td
     %div.relationships-size
       = relationships.size_label
 
@@ -46,3 +50,6 @@ $(function(){
   $("#relationships").tablesorter();
 });
 
+$(document).load(function(){
+  $("span.pact").load("/images/doc-text.svg");
+});

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '1.3.2.rc1'
+  VERSION = '1.4.0'
 end

data/pact_broker.gemspec

@@ -22,16 +22,18 @@ Gem::Specification.new do |gem|
   #gem.add_runtime_dependency 'pact'
   gem.add_runtime_dependency 'httparty'
   gem.add_runtime_dependency 'json'
-  gem.add_runtime_dependency 'roar', '~> 0.12.9'
+  gem.add_runtime_dependency 'roar', '~> 1.0.0.beta2'
   gem.add_runtime_dependency 'reform', '~> 1.0'
   gem.add_runtime_dependency 'sequel', '~> 4.12'
-  gem.add_runtime_dependency 'webmachine', '~> 1.2'
+  gem.add_runtime_dependency 'webmachine', '1.2'
   gem.add_runtime_dependency 'versionomy', '~> 0.4'
   gem.add_runtime_dependency 'rack'
   gem.add_runtime_dependency 'redcarpet', '~>3.1'
-  gem.add_runtime_dependency 'pact', '~>1.3', '>=1.3.2'
-  gem.add_runtime_dependency 'padrino', '~>0.12'
+  gem.add_runtime_dependency 'pact', '~>1.4'
+  gem.add_runtime_dependency 'pact-support', '~>0.1', '>=0.1.4'
+  gem.add_runtime_dependency 'padrino-core', '~>0.12.4'
   gem.add_runtime_dependency 'haml'
+  gem.add_runtime_dependency 'trailblazer', '~>0.1.0'
 
   gem.add_development_dependency 'sqlite3'
   gem.add_development_dependency 'pry'

data/public/images/doc-text.svg

@@ -0,0 +1 @@
+<svg height="1000" width="714.286" viewBox="0 0 1000 714.286" xmlns="http://www.w3.org/2000/svg"><path d="M571.392 660.736v35.712q0 7.812 -5.022 12.834t-12.834 5.022h-392.832q-7.812 0 -12.834 -5.022t-5.022 -12.834v-35.712q0 -7.812 5.022 -12.834t12.834 -5.022h392.832q7.812 0 12.834 5.022t5.022 12.834zm0 -142.848v35.712q0 7.812 -5.022 12.834t-12.834 5.022h-392.832q-7.812 0 -12.834 -5.022t-5.022 -12.834v-35.712q0 -7.812 5.022 -12.834t12.834 -5.022h392.832q7.812 0 12.834 5.022t5.022 12.834zm-499.968 339.264h571.392v-428.544h-232.128q-22.32 0 -37.944 -15.624t-15.624 -37.944v-232.128h-285.696v714.24zm357.12 -499.968h209.808q-5.58 -16.182 -12.276 -22.878l-174.654 -174.654q-6.696 -6.696 -22.878 -12.276v209.808zm285.696 17.856v499.968q0 22.32 -15.624 37.944t-37.944 15.624h-607.104q-22.32 0 -37.944 -15.624t-15.624 -37.944v-749.952q0 -22.32 15.624 -37.944t37.944 -15.624h357.12q22.32 0 49.104 11.16t42.408 26.784l174.096 174.096q15.624 15.624 26.784 42.408t11.16 49.104z"/></svg>

data/public/stylesheets/relationships.css

@@ -11,6 +11,25 @@
   border-left: none;
 }
 
+table#relationships {
+  table-layout: fixed;
+}
+
+table#relationships td,
+table#relationships th {
+  text-align: left;
+}
+
+table#relationships th,
+table#relationships td {
+  border-right: none;
+  border-left: none;
+}
+
+table#relationships td.pact {
+  text-align: center;
+}
+
 .relationships-size {
   text-align: right;
   color: gray;
@@ -24,4 +43,27 @@
   padding-right: 20px;
 }
 
-body { padding-top: 10px; }
+body { padding-top: 10px; }
+
+.consumer, .provider {
+  text-align: center;
+  white-space: nowrap;
+}
+
+span.pact {
+  display: inline-block;
+}
+
+span.pact svg {
+  width: 20px !important;
+  height: 20px !important;
+  overflow: visible;
+}
+
+span.pact svg path {
+  fill: #111111;
+}
+
+span.pact:hover svg path {
+  fill: #2a6496;
+}

data/script/publish-2.sh

@@ -0,0 +1,3 @@
+curl -v -XPUT \-H "Content-Type: application/json" \
+-d@spec/fixtures/a_consumer-a_provider-2.json \
+http://localhost:9292/pacts/provider/A%20Provider/consumer/A%20Consumer/version/1.0.1

data/script/publish.sh

@@ -0,0 +1,3 @@
+curl -v -XPUT \-H "Content-Type: application/json" \
+-d@spec/fixtures/a_consumer-a_provider.json \
+http://localhost:9292/pacts/provider/A%20Provider/consumer/A%20Consumer/version/1.0.0

data/spec/features/delete_pact_spec.rb

@@ -1,6 +1,6 @@
 describe "Deleting a pact" do
 
-  let(:pact_content) { load_fixture('consumer-provider.json') }
+  let(:pact_content) { load_fixture('a_consumer-a_provider.json') }
   let(:path) { "/pacts/provider/A%20Provider/consumer/A%20Consumer/version/1.2.3" }
   let(:response_body_json) { JSON.parse(subject.body) }
 

data/spec/features/get_diff.rb

@@ -0,0 +1,52 @@
+require 'spec/support/provider_state_builder'
+
+describe "Get diff between versions" do
+
+  let(:path) { "/pacts/provider/Provider/consumer/Consumer/version/3/diff/previous-distinct" }
+
+  let(:last_response_body) { JSON.parse(subject.body, symbolize_names: true) }
+
+  subject { get path; last_response }
+
+  let(:pact_content_version_1) do
+    hash = load_json_fixture('consumer-provider.json')
+    hash['interactions'].first['request']['method'] = 'post'
+    hash.to_json
+  end
+  let(:pact_content_version_2) { load_fixture('consumer-provider.json') }
+  let(:pact_content_version_3) { pact_content_version_2 }
+
+  before do
+    ProviderStateBuilder.new
+      .create_consumer("Consumer")
+      .create_provider("Provider")
+      .create_consumer_version("1")
+      .create_pact(pact_content_version_1)
+      .create_consumer_version("2")
+      .create_pact(pact_content_version_2)
+      .create_consumer_version("3")
+      .create_pact(pact_content_version_3)
+  end
+
+  context "when the versions exist" do
+
+    it "returns a 200 HAL JSON response" do
+      expect(subject).to be_a_hal_json_success_response
+    end
+
+    it "returns the JSON representation of the diff" do
+      expect(last_response_body).to include({})
+    end
+
+  end
+
+  context "when either version does not exist" do
+
+    let(:path) { "/pacts/provider/Provider/consumer/Consumer/versions/1/diff/previous-distinct" }
+
+    xit "returns a 404 response" do
+      expect(subject).to be_a_404_response
+    end
+
+  end
+end

data/spec/features/get_previous_distinct_version.rb

@@ -0,0 +1,51 @@
+require 'spec/support/provider_state_builder'
+
+describe "Get previous distinct version of pact" do
+
+  let(:path) { "/pacts/provider/Provider/consumer/Consumer/version/3/previous-distinct" }
+  let(:last_response_body) { JSON.parse(subject.body, symbolize_names: true) }
+
+  subject { get path; last_response }
+
+  let(:pact_content_version_1) { load_fixture('consumer-provider.json') }
+  let(:pact_content_version_2) do
+    hash = load_json_fixture('consumer-provider.json')
+    hash['interactions'].first['request']['method'] = 'post'
+    hash.to_json
+  end
+  let(:pact_content_version_3) { pact_content_version_2 }
+
+  before do
+    ProviderStateBuilder.new
+      .create_consumer("Consumer")
+      .create_provider("Provider")
+      .create_consumer_version("1")
+      .create_pact(pact_content_version_1)
+      .create_consumer_version("2")
+      .create_pact(pact_content_version_2)
+      .create_consumer_version("3")
+      .create_pact(pact_content_version_3)
+  end
+
+  context "when the pact version exists" do
+
+    it "returns a 200 HAL JSON response" do
+      expect(subject).to be_a_hal_json_success_response
+    end
+
+    it "returns the JSON representation of the version" do
+      expect(last_response_body[:_links][:self][:href]).to end_with '/1'
+    end
+
+  end
+
+  context "when the version does not exist" do
+
+    let(:path) { "/pacts/provider/Provider/consumer/Consumer/version/1/previous-distinct" }
+
+    it "returns a 404 response" do
+      expect(subject).to be_a_404_response
+    end
+
+  end
+end

data/spec/features/get_version.rb

@@ -0,0 +1,45 @@
+require 'spec/support/provider_state_builder'
+
+describe "Get version" do
+
+  let(:path) { "/pacticipants/Consumer/versions/1.2.3" }
+  let(:last_response_body) { JSON.parse(subject.body, symbolize_names: true) }
+
+  subject { get path; last_response }
+
+  context "when the version exists" do
+
+    before do
+      ProviderStateBuilder.new
+        .create_consumer("Another Consumer")
+        .create_consumer("Consumer")
+        .create_consumer_version("1.2.3")
+        .create_consumer_version_tag("prod")
+        .create_consumer_version("1.2.4")
+    end
+
+
+    it "returns a 200 HAL JSON response" do
+      expect(subject).to be_a_hal_json_success_response
+    end
+
+    it "returns the JSON representation of the version" do
+      expect(last_response_body).to include number: '1.2.3'
+    end
+
+  end
+
+  context "when the version does not exist" do
+
+    before do
+      ProviderStateBuilder.new
+        .create_consumer("Consumer")
+        .create_version("1.2.4")
+    end
+
+    it "returns a 404 response" do
+      expect(subject).to be_a_404_response
+    end
+
+  end
+end

data/spec/features/publish_pact_spec.rb

@@ -1,6 +1,6 @@
 describe "Publishing a pact" do
 
-  let(:pact_content) { load_fixture('consumer-provider.json') }
+  let(:pact_content) { load_fixture('a_consumer-a_provider.json') }
   let(:path) { "/pacts/provider/A%20Provider/consumer/A%20Consumer/version/1.2.3" }
   let(:response_body_json) { JSON.parse(subject.body) }
 

data/spec/fixtures/a_consumer-a_provider-2.json

@@ -0,0 +1,22 @@
+{
+  "consumer": {
+    "name": "A Consumer"
+  },
+  "provider": {
+    "name": "A Provider"
+  },
+  "interactions": [
+    {
+      "description" : "a request for something",
+      "provider_state": null,
+      "request": {
+        "method": "post",
+        "path" : "/something"
+      },
+      "response": {
+        "status": 200,
+        "body" : "something"
+      }
+    }
+  ]
+}

data/spec/fixtures/a_consumer-a_provider.json

@@ -0,0 +1,22 @@
+{
+  "consumer": {
+    "name": "A Consumer"
+  },
+  "provider": {
+    "name": "A Provider"
+  },
+  "interactions": [
+    {
+      "description" : "a request for something",
+      "provider_state": null,
+      "request": {
+        "method": "get",
+        "path" : "/something"
+      },
+      "response": {
+        "status": 200,
+        "body" : "something"
+      }
+    }
+  ]
+}