pact_broker 2.3.0 → 2.4.0

data/spec/lib/pact_broker/api/decorators/pacticipant_decorator_spec.rb

@@ -10,16 +10,55 @@ module PactBroker
 
       describe PacticipantDecorator do
 
+        let(:test_data_builder) { TestDataBuilder.new }
+        let(:pacticipant) do
+          test_data_builder
+            .create_pacticipant('Name')
+            .create_label('foo')
+            .and_return(:pacticipant)
+        end
+
         let(:created_at) { Time.new(2014, 3, 4) }
         let(:updated_at) { Time.new(2014, 3, 5) }
-        let(:pacticipant) { PactBroker::Domain::Pacticipant.new(name: 'Name', updated_at: updated_at, created_at: created_at)}
 
-        subject { JSON.parse PacticipantDecorator.new(pacticipant).to_json, symbolize_names: true }
+        before do
+          pacticipant.created_at = created_at
+          pacticipant.updated_at = updated_at
+        end
+
+        subject { JSON.parse PacticipantDecorator.new(pacticipant).to_json(user_options: {base_url: 'http://example.org'}), symbolize_names: true }
 
         it "includes timestamps" do
           expect(subject[:createdAt]).to eq created_at.xmlschema
           expect(subject[:updatedAt]).to eq updated_at.xmlschema
         end
+
+        it "includes embedded labels" do
+          expect(subject[:_embedded][:labels].first).to include name: 'foo'
+          expect(subject[:_embedded][:labels].first[:_links][:self][:href]).to match %r{http://example.org/.*foo}
+        end
+
+        context "when there is a latest_version" do
+          before { test_data_builder.create_version("1.2.107") }
+          it "includes an embedded latestVersion" do
+            expect(subject[:_embedded][:latestVersion]).to include number: "1.2.107"
+          end
+
+          it "includes an embedded latest-version for backwards compatibility" do
+            expect(subject[:_embedded][:'latest-version']).to include number: "1.2.107"
+          end
+
+          it "includes a deprecation warning" do
+            expect(subject[:_embedded][:'latest-version']).to include title: "DEPRECATED - please use latestVersion"
+          end
+        end
+
+        context "when there is no latest_version" do
+          it "doesn't blow up" do
+            expect(subject[:_embedded]).to_not have_key(:latestVersion)
+            expect(subject[:_embedded]).to_not have_key(:'latest-version')
+          end
+        end
       end
     end
   end

data/spec/lib/pact_broker/api/decorators/tag_decorator_spec.rb

@@ -16,7 +16,7 @@ module PactBroker
             .create_consumer("Consumer")
             .create_version("1.2.3")
             .create_tag("prod")
-          PactBroker::Tags::Repository.new.find tag_name: 'prod', pacticipant_version_number: '1.2.3', pacticipant_name: 'Consumer'
+            .and_return(:tag)
         end
 
         let(:options) { { user_options: { base_url: 'http://example.org' } } }

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

@@ -39,7 +39,7 @@ module PactBroker
           end
 
           context "when the pact exists" do
-            let(:pact) { instance_double("PactBroker::Domain::Pact") }
+            let(:pact) { instance_double("PactBroker::Domain::Pact", provider_name: 'Provider', consumer_name: 'Consumer', pact_version_sha: '1234') }
             let(:next_verification_number) { "2" }
             let(:serialised_verification) { {some: 'verification'}.to_json }
             let(:decorator) { instance_double('PactBroker::Api::Decorators::VerificationDecorator', to_json: serialised_verification) }
@@ -55,7 +55,7 @@ module PactBroker
             end
 
             it "returns the path of the newly created resource in the headers" do
-              expect(subject.headers['Location']).to end_with("/verification-results/2")
+              expect(subject.headers['Location']).to eq("http://example.org/pacts/provider/Provider/consumer/Consumer/pact-version/1234/verification-results/2")
             end
 
             it "stores the verification in the database" do

data/spec/lib/pact_broker/badges/service_spec.rb

@@ -69,7 +69,7 @@ module PactBroker
             let(:initials) { true }
             let(:pact) { double("pact", consumer_name: "FooApp", provider_name: "doAThing") }
 
-            it "creates a badge with the consumer and provider names, not initials", pending: "Need to make regexp smarter" do
+            it "creates a badge with the consumer and provider names, not initials" do
               subject
               expect(http_request).to have_been_made
             end

data/spec/lib/pact_broker/labels/repository_spec.rb

@@ -0,0 +1,124 @@
+require 'spec_helper'
+require 'pact_broker/labels/repository'
+
+module PactBroker
+  module Labels
+    describe Repository do
+
+      describe ".find" do
+
+        let(:pacticipant_name) { "foo" }
+        let(:label_name) { "ios" }
+
+        subject { Repository.new }
+        let(:options) { {pacticipant_name: pacticipant_name, label_name: label_name} }
+        let(:find_label) { subject.find options }
+
+        let!(:test_data_builder) do
+          TestDataBuilder.new
+            .create_pacticipant("wiffle")
+            .create_label(label_name)
+            .create_pacticipant(pacticipant_name)
+            .create_label("wrong label")
+        end
+
+        context "when the label exists" do
+
+          before do
+            test_data_builder.create_label(label_name)
+          end
+
+          it "returns the label" do
+            expect(find_label.name).to eq label_name
+            expect(find_label.pacticipant.name).to eq pacticipant_name
+            expect(find_label.created_at).to be_datey
+            expect(find_label.updated_at).to be_datey
+          end
+
+          context "when case sensitivity is turned off and a name with different case is used" do
+            before do
+              allow(PactBroker.configuration).to receive(:use_case_sensitive_resource_names).and_return(false)
+            end
+
+            let(:options) { {pacticipant_name: pacticipant_name.upcase, label_name: label_name.upcase} }
+
+            it "returns the label" do
+              expect(find_label).to_not be nil
+              expect(find_label.name).to eq label_name
+            end
+          end
+
+          context "when case sensitivity is turned on and a label name with different case is used" do
+            before do
+              allow(PactBroker.configuration).to receive(:use_case_sensitive_resource_names).and_return(true)
+            end
+
+            let(:options) { {pacticipant_name: pacticipant_name, label_name: label_name.upcase} }
+
+            it "returns nil" do
+              expect(find_label).to be nil
+            end
+          end
+
+          context "when case sensitivity is turned on and a pacticipant name with different case is used" do
+            before do
+              allow(PactBroker.configuration).to receive(:use_case_sensitive_resource_names).and_return(true)
+            end
+
+            let(:options) { {pacticipant_name: pacticipant_name.upcase, label_name: label_name} }
+
+            it "returns nil" do
+              expect(find_label).to be nil
+            end
+          end
+        end
+
+        context "when the tag does not exist" do
+          it "returns nil" do
+            expect(find_label).to be_nil
+          end
+        end
+      end
+
+      describe "delete" do
+        let(:pacticipant_name) { "foo" }
+        let(:label_name) { "ios" }
+
+        let!(:pacticipant) do
+          TestDataBuilder.new
+            .create_pacticipant("Ignore")
+            .create_label("ios")
+            .create_pacticipant(pacticipant_name)
+            .create_label("ios")
+            .create_label("bar")
+            .and_return(:pacticipant)
+        end
+        let(:options) { {pacticipant_name: pacticipant_name, label_name: label_name} }
+
+        subject { Repository.new.delete(options) }
+
+        it "deletes the label" do
+          expect{ subject }.to change { PactBroker::Domain::Label.count }.by(-1)
+        end
+      end
+
+      describe "delete_by_pacticipant_id" do
+        let!(:pacticipant) do
+          TestDataBuilder.new
+            .create_pacticipant("Ignore")
+            .create_label("ios")
+            .create_pacticipant("Foo")
+            .create_label("ios")
+            .create_label("bar")
+            .and_return(:pacticipant)
+        end
+
+        subject { Repository.new.delete_by_pacticipant_id(pacticipant.id) }
+
+        it "deletes the labels" do
+          expect{ subject }.to change { PactBroker::Domain::Label.count }.by(-2)
+        end
+      end
+    end
+  end
+end

data/spec/lib/pact_broker/labels/service_spec.rb

@@ -0,0 +1,28 @@
+require 'pact_broker/labels/service'
+
+module PactBroker
+  module Labels
+    describe Service do
+      let(:pacticipant_name) { "foo" }
+      let(:label_name) { "ios" }
+      let(:options) { {pacticipant_name: pacticipant_name, label_name: label_name}}
+
+      describe ".create" do
+        subject { Service.create(options) }
+
+        # Naughty integration test... didn't seem much point unit testing this
+        it "creates the new tag" do
+          expect(subject.name).to eq label_name
+          expect(subject.pacticipant.name).to eq pacticipant_name
+        end
+      end
+
+      describe "delete" do
+        it "calls delete on the label repository" do
+          allow_any_instance_of(Labels::Repository).to receive(:delete).with(options)
+          Service.delete(options)
+        end
+      end
+    end
+  end
+end

data/spec/lib/pact_broker/pacticipants/repository_spec.rb

@@ -6,6 +6,25 @@ module PactBroker
   module Pacticipants
     describe Repository do
 
+      describe "#find" do
+        before do
+          TestDataBuilder.new
+            .create_pacticipant("Foo")
+            .create_label("in")
+            .create_pacticipant("Bar")
+            .create_label("in")
+            .create_label("blah")
+            .create_pacticipant("Wiffle")
+            .create_label("out")
+        end
+
+        subject { Repository.new.find label_name: "in" }
+
+        it "returns the pacticipants with the given label" do
+          expect(subject.collect(&:name)).to eq ["Bar", "Foo"]
+        end
+
+      end
       describe "#find_by_name" do
         before do
           TestDataBuilder.new.create_pacticipant("Foo Bar")

data/spec/support/test_data_builder.rb

@@ -9,6 +9,7 @@ require 'pact_broker/pacticipants/service'
 require 'pact_broker/versions/repository'
 require 'pact_broker/versions/service'
 require 'pact_broker/tags/repository'
+require 'pact_broker/labels/repository'
 require 'pact_broker/tags/service'
 require 'pact_broker/domain'
 require 'json'
@@ -135,6 +136,11 @@ class TestDataBuilder
     self
   end
 
+  def create_label label_name
+    @label = PactBroker::Domain::Label.create(name: label_name, pacticipant: @pacticipant)
+    self
+  end
+
   def create_pact params = {}
     @pact = PactBroker::Pacts::Repository.new.create({version_id: @consumer_version.id, consumer_id: @consumer.id, provider_id: @provider.id, json_content: params[:json_content] || default_json_content})
     set_created_at_if_set params[:created_at], :pact_publications, {id: @pact.id}

data/tasks/database.rb

@@ -9,7 +9,7 @@ Sequel.extension :migration
 module PactBroker
   module Database
 
-    TABLES = [:webhook_executions, :config, :pacts, :pact_version_contents, :tags, :verifications, :pact_publications, :pact_versions,  :webhook_headers, :webhooks, :versions, :pacticipants].freeze
+    TABLES = [:labels, :webhook_executions, :config, :pacts, :pact_version_contents, :tags, :verifications, :pact_publications, :pact_versions,  :webhook_headers, :webhooks, :versions, :pacticipants].freeze
 
     extend self
 

data/vendor/hal-browser/browser.html

@@ -192,7 +192,7 @@ Content-Type: application/json
 
   <script id="embedded-resource-template" type="text/template">
     <div class="accordion-heading">
-      <a class="accordion-toggle" href="#"><%= resource.identifier %><% if (resource.title) { %>: <span class="embedded-resource-title"><%- resource.title %></span><% } %>
+      <a class="accordion-toggle" href="#"><%= resource.identifier %><% if (resource.title || resource.name) { %>: <span class="embedded-resource-title"><%- resource.title || resource.name %></span><% } %>
       <% if (HAL.isUrl(resource.embed_rel)) { %>
         <span class="dox pull-right" data-href="<%= HAL.buildUrl(resource.embed_rel) %>">
           <i class="icon-book"></i>

data/vendor/hal-browser/js/hal/resource.js

@@ -3,6 +3,7 @@ HAL.Models.Resource = Backbone.Model.extend({
     representation = representation || {};
     this.links = representation._links;
     this.title = representation.title;
+    this.name = representation.name;
     if(representation._embedded !== undefined) {
       this.embeddedResources = this.buildEmbeddedResources(representation._embedded);
     }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-14 00:00:00.000000000 Z
+date: 2017-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -470,6 +470,7 @@ files:
 - db/migrations/34_create_index_on_consumer_version_order.rb
 - db/migrations/35_create_index_on_names.rb
 - db/migrations/36_create_webhook_execution.rb
+- db/migrations/37_create_labels_table.rb
 - db/migrations/migration_helper.rb
 - db/pact_broker_database.sqlite3
 - example/Gemfile
@@ -492,8 +493,10 @@ files:
 - lib/pact_broker/api/decorators/base_decorator.rb
 - lib/pact_broker/api/decorators/basic_pacticipant_decorator.rb
 - lib/pact_broker/api/decorators/decorator_context.rb
+- lib/pact_broker/api/decorators/embedded_label_decorator.rb
 - lib/pact_broker/api/decorators/embedded_tag_decorator.rb
 - lib/pact_broker/api/decorators/embedded_version_decorator.rb
+- lib/pact_broker/api/decorators/label_decorator.rb
 - lib/pact_broker/api/decorators/latest_pact_decorator.rb
 - lib/pact_broker/api/decorators/pact_collection_decorator.rb
 - lib/pact_broker/api/decorators/pact_decorator.rb
@@ -523,6 +526,7 @@ files:
 - lib/pact_broker/api/resources/base_resource.rb
 - lib/pact_broker/api/resources/group.rb
 - lib/pact_broker/api/resources/index.rb
+- lib/pact_broker/api/resources/label.rb
 - lib/pact_broker/api/resources/latest_pact.rb
 - lib/pact_broker/api/resources/latest_pacts.rb
 - lib/pact_broker/api/resources/latest_provider_pacts.rb
@@ -534,6 +538,7 @@ files:
 - lib/pact_broker/api/resources/pacticipant.rb
 - lib/pact_broker/api/resources/pacticipant_resource_methods.rb
 - lib/pact_broker/api/resources/pacticipants.rb
+- lib/pact_broker/api/resources/pacticipants_for_label.rb
 - lib/pact_broker/api/resources/previous_distinct_pact_version.rb
 - lib/pact_broker/api/resources/relationships.rb
 - lib/pact_broker/api/resources/tag.rb
@@ -582,6 +587,7 @@ files:
 - lib/pact_broker/doc/views/webhooks.markdown
 - lib/pact_broker/domain.rb
 - lib/pact_broker/domain/group.rb
+- lib/pact_broker/domain/label.rb
 - lib/pact_broker/domain/order_versions.rb
 - lib/pact_broker/domain/pact.rb
 - lib/pact_broker/domain/pacticipant.rb
@@ -595,6 +601,8 @@ files:
 - lib/pact_broker/domain/webhook_request_header.rb
 - lib/pact_broker/groups/service.rb
 - lib/pact_broker/json.rb
+- lib/pact_broker/labels/repository.rb
+- lib/pact_broker/labels/service.rb
 - lib/pact_broker/locale/en.yml
 - lib/pact_broker/logging.rb
 - lib/pact_broker/messages.rb
@@ -700,10 +708,12 @@ files:
 - script/recreate-pg-db.sh
 - script/update-hal-browser
 - spec/features/create_webhook_spec.rb
+- spec/features/delete_label_spec.rb
 - spec/features/delete_pact_spec.rb
 - spec/features/delete_version_spec.rb
 - spec/features/delete_webhook_spec.rb
 - spec/features/get_diff_spec.rb
+- spec/features/get_label_spec.rb
 - spec/features/get_latest_pact_badge_spec.rb
 - spec/features/get_latest_tagged_pact_badge_spec.rb
 - spec/features/get_latest_tagged_pact_spec.rb
@@ -711,11 +721,13 @@ files:
 - spec/features/get_latest_untagged_pact_spec.rb
 - spec/features/get_pact_spec.rb
 - spec/features/get_pact_versions_spec.rb
+- spec/features/get_pacticipants_by_label_spec.rb
 - spec/features/get_previous_distinct_version.rb
 - spec/features/get_provider_pacts_spec.rb
 - spec/features/get_verifications_for_consumer_version_spec.rb
 - spec/features/get_version_spec.rb
 - spec/features/get_versions_spec.rb
+- spec/features/label_pacticipant_spec.rb
 - spec/features/merge_pact_spec.rb
 - spec/features/publish_not_a_pact_spec.rb
 - spec/features/publish_pact_spec.rb
@@ -737,8 +749,10 @@ files:
 - spec/lib/pact_broker/api/contracts/put_pact_params_contract_spec.rb
 - spec/lib/pact_broker/api/contracts/verification_contract_spec.rb
 - spec/lib/pact_broker/api/contracts/webhook_contract_spec.rb
+- spec/lib/pact_broker/api/decorators/embedded_label_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/embedded_tag_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/embedded_version_decorator_spec.rb
+- spec/lib/pact_broker/api/decorators/label_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/latest_pact_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/pact_collection_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/pact_decorator_spec.rb
@@ -788,6 +802,8 @@ files:
 - spec/lib/pact_broker/domain/webhook_request_spec.rb
 - spec/lib/pact_broker/domain/webhook_spec.rb
 - spec/lib/pact_broker/groups/service_spec.rb
+- spec/lib/pact_broker/labels/repository_spec.rb
+- spec/lib/pact_broker/labels/service_spec.rb
 - spec/lib/pact_broker/messages_spec.rb
 - spec/lib/pact_broker/pacticipants/find_potential_duplicate_pacticipant_names_spec.rb
 - spec/lib/pact_broker/pacticipants/repository_spec.rb
@@ -902,10 +918,12 @@ specification_version: 4
 summary: See description
 test_files:
 - spec/features/create_webhook_spec.rb
+- spec/features/delete_label_spec.rb
 - spec/features/delete_pact_spec.rb
 - spec/features/delete_version_spec.rb
 - spec/features/delete_webhook_spec.rb
 - spec/features/get_diff_spec.rb
+- spec/features/get_label_spec.rb
 - spec/features/get_latest_pact_badge_spec.rb
 - spec/features/get_latest_tagged_pact_badge_spec.rb
 - spec/features/get_latest_tagged_pact_spec.rb
@@ -913,11 +931,13 @@ test_files:
 - spec/features/get_latest_untagged_pact_spec.rb
 - spec/features/get_pact_spec.rb
 - spec/features/get_pact_versions_spec.rb
+- spec/features/get_pacticipants_by_label_spec.rb
 - spec/features/get_previous_distinct_version.rb
 - spec/features/get_provider_pacts_spec.rb
 - spec/features/get_verifications_for_consumer_version_spec.rb
 - spec/features/get_version_spec.rb
 - spec/features/get_versions_spec.rb
+- spec/features/label_pacticipant_spec.rb
 - spec/features/merge_pact_spec.rb
 - spec/features/publish_not_a_pact_spec.rb
 - spec/features/publish_pact_spec.rb
@@ -939,8 +959,10 @@ test_files:
 - spec/lib/pact_broker/api/contracts/put_pact_params_contract_spec.rb
 - spec/lib/pact_broker/api/contracts/verification_contract_spec.rb
 - spec/lib/pact_broker/api/contracts/webhook_contract_spec.rb
+- spec/lib/pact_broker/api/decorators/embedded_label_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/embedded_tag_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/embedded_version_decorator_spec.rb
+- spec/lib/pact_broker/api/decorators/label_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/latest_pact_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/pact_collection_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/pact_decorator_spec.rb
@@ -990,6 +1012,8 @@ test_files:
 - spec/lib/pact_broker/domain/webhook_request_spec.rb
 - spec/lib/pact_broker/domain/webhook_spec.rb
 - spec/lib/pact_broker/groups/service_spec.rb
+- spec/lib/pact_broker/labels/repository_spec.rb
+- spec/lib/pact_broker/labels/service_spec.rb
 - spec/lib/pact_broker/messages_spec.rb
 - spec/lib/pact_broker/pacticipants/find_potential_duplicate_pacticipant_names_spec.rb
 - spec/lib/pact_broker/pacticipants/repository_spec.rb