pact_broker 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90724c609e603dd08b1bc686cbc8c46eeff7c030
-  data.tar.gz: b0b359476aea99b3738b802e8433441544d2add8
+  metadata.gz: 17b10186ffac951ca6a1d81ca4c4941b378d8e72
+  data.tar.gz: 8cfabd6ed5d782788096d445ae46e098679d0fcd
 SHA512:
-  metadata.gz: e027014136c6782da4f3ba31b0d3779b0bb2d55fff9f91ad8378d1644a3facf94630e129140f81c1ea61e628e616e0da4cd14d55c56c290e464bb53989835418
-  data.tar.gz: dbd9391992584cc6fddde02a8de3b15a5799b8a267db22947b3b48b50aa25a1e88d117c9b22a35d84a01a7260b4163843f3bdf010c696b223a747aaa47fe9eda
+  metadata.gz: 758286a2af8b8d56f12763e6b2a4c5f156186ed95a2f37ed4e30b24a8c2d79903fcdd54444317a3cef9fd67811cd5d8c9fed66e950aa9d5244e87b0949d0025b
+  data.tar.gz: c6db590d2225a0738a0b0dd9c8c1582ef1f887905990b383951537a9df23fdc5f1158c75de76242978d4c01689b66bce1f723f5c2f28438561cc5c5a24dbc3fb

data/CHANGELOG.md

@@ -2,6 +2,13 @@ Do this to generate your change history
 
     $ git log --pretty=format:'  * %h - %s (%an, %ad)'
 
+#### 1.5.0 (2015-02-20)
+
+* b848ce3 - Added healthcheck endpoint for database dependency. /diagnostic/status/dependencies (Beth, Fri Feb 20 09:41:16 2015 +1100)
+* 56ea4a6 - Added heartbeat endpoint for monitoring. /diagnostic/status/heartbeat (Beth, Fri Feb 20 08:49:51 2015 +1100)
+* dbdb4fb - Upgraded webmachine gem to 1.3.1 (Beth, Wed Feb 11 21:49:55 2015 +1100)
+* 111f088 - Added validation to ensure that the encoding for the database connection is set to UTF8. This is required to ensure the pact_version_content_sha foreign key works. (Beth, Wed Feb 11 20:03:34 2015 +1100)
+
 #### 1.4.0 (2015-01-20)
 
 * d740fb0 - Removed pact-versions rel from pact resource. Pact versions resource is not implemented yet. (Beth, Tue Jan 20 09:20:52 2015 +1100)

data/lib/db.rb

@@ -25,7 +25,7 @@ module DB
   # pool, as noted in the documentation for the extension.
   #
   def self.connect db_credentials
-    con = Sequel.connect(db_credentials.merge(:logger => logger, :pool_class => Sequel::ThreadedConnectionPool))
+    con = Sequel.connect(db_credentials.merge(:logger => logger, :pool_class => Sequel::ThreadedConnectionPool, :encoding => 'utf8'))
     con.extension(:connection_validator)
     con.pool.connection_validation_timeout = -1 #Check the connection on every request
     con.timezone = :utc

data/lib/pact_broker/api/decorators/basic_pacticipant_decorator.rb

@@ -6,7 +6,7 @@ module PactBroker
 
     module Decorators
 
-      class BasicPacticipantRepresenter < BaseDecorator
+      class BasicPacticipantDecorator < BaseDecorator
 
         property :name
 

data/lib/pact_broker/api/decorators/pact_details_decorator.rb

@@ -9,8 +9,8 @@ module PactBroker
 
       class PactDetailsDecorator < BaseDecorator
 
-        property :consumer, :extend => PactBroker::Api::Decorators::PactPacticipantRepresenter, :embedded => true
-        property :provider, :extend => PactBroker::Api::Decorators::PactPacticipantRepresenter, :embedded => true
+        property :consumer, :extend => PactBroker::Api::Decorators::PactPacticipantDecorator, :embedded => true
+        property :provider, :extend => PactBroker::Api::Decorators::PactPacticipantDecorator, :embedded => true
 
         link :self do | options |
           pact_url(options[:base_url], represented)

data/lib/pact_broker/api/decorators/pact_pacticipant_decorator.rb

@@ -9,7 +9,7 @@ module PactBroker
 
     module Decorators
 
-      class PactPacticipantRepresenter < BaseDecorator
+      class PactPacticipantDecorator < BaseDecorator
 
         property :name
         property :repository_url

data/lib/pact_broker/api/decorators/pacticipant_collection_decorator.rb

@@ -8,9 +8,9 @@ module PactBroker
 
     module Decorators
 
-      class PacticipantCollectionRepresenter < BaseDecorator
+      class PacticipantCollectionDecorator < BaseDecorator
 
-        collection :entries, :as => :pacticipants, :class => PactBroker::Domain::Pacticipant, :extend => PactBroker::Api::Decorators::PacticipantRepresenter
+        collection :entries, :as => :pacticipants, :class => PactBroker::Domain::Pacticipant, :extend => PactBroker::Api::Decorators::PacticipantDecorator
 
         link :self do | options |
           pacticipants_url options[:base_url]

data/lib/pact_broker/api/decorators/pacticipant_decorator.rb

@@ -8,7 +8,7 @@ module PactBroker
 
     module Decorators
 
-      class PacticipantRepresenter < BaseDecorator
+      class PacticipantDecorator < BaseDecorator
 
         property :name
         property :repository_url, as: :repositoryUrl

data/lib/pact_broker/api/decorators/webhook_decorator.rb

@@ -13,8 +13,8 @@ module PactBroker
 
         include Timestamps
 
-        property :consumer, :extend => PactBroker::Api::Decorators::BasicPacticipantRepresenter, :embedded => true, writeable: false
-        property :provider, :extend => PactBroker::Api::Decorators::BasicPacticipantRepresenter, :embedded => true, writeable: false
+        property :consumer, :extend => PactBroker::Api::Decorators::BasicPacticipantDecorator, :embedded => true, writeable: false
+        property :provider, :extend => PactBroker::Api::Decorators::BasicPacticipantDecorator, :embedded => true, writeable: false
 
         link :self do | options |
           {

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

@@ -50,7 +50,7 @@ module PactBroker
         end
 
         def to_json
-          PactBroker::Api::Decorators::PacticipantRepresenter.new(pacticipant).to_json(base_url: base_url)
+          PactBroker::Api::Decorators::PacticipantDecorator.new(pacticipant).to_json(base_url: base_url)
         end
 
         private

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

@@ -45,11 +45,11 @@ module PactBroker
         end
 
         def generate_json pacticipants
-          PactBroker::Api::Decorators::PacticipantCollectionRepresenter.new(pacticipants).to_json(base_url: base_url)
+          PactBroker::Api::Decorators::PacticipantCollectionDecorator.new(pacticipants).to_json(base_url: base_url)
         end
 
         def decorator_for model
-          PactBroker::Api::Decorators::PacticipantRepresenter.new(model)
+          PactBroker::Api::Decorators::PacticipantDecorator.new(model)
         end
 
         def new_model

data/lib/pact_broker/api.rb

@@ -24,7 +24,7 @@ module PactBroker
   API ||= begin
     pact_api = Webmachine::Application.new do |app|
       app.routes do
-        add(['trace', '*'], Webmachine::Trace::TraceResource) unless ENV['RACK_ENV'] == 'production'
+        add(['trace', :*], Webmachine::Trace::TraceResource) unless ENV['RACK_ENV'] == 'production'
         # Support both /pact and /pacts
         # /pact will be deprecated
         # Todo, rename /version/ to /versions

data/lib/pact_broker/app.rb

@@ -31,6 +31,7 @@ module PactBroker
       PactBroker.logger = configuration.logger
       PactBroker::DB.connection = configuration.database_connection
       PactBroker::DB.connection.timezone = :utc
+      PactBroker::DB.validate_connection_config if configuration.validate_database_connection_config
 
       if configuration.auto_migrate_db
         logger.info "Migrating database"
@@ -59,7 +60,15 @@ module PactBroker
       logger.info "Mounting PactBroker::API"
       require 'pact_broker/api'
 
-      apps = [PactBroker::UI::App.new, PactBroker::API]
+      apps = []
+
+      if configuration.enable_diagnostic_endpoints
+        require 'pact_broker/diagnostic/app'
+        apps << PactBroker::Diagnostic::App.new
+      end
+
+      apps << PactBroker::UI::App.new
+      apps << PactBroker::API
 
       @app.map "/" do
         run Rack::Cascade.new(apps)

data/lib/pact_broker/configuration.rb

@@ -7,6 +7,7 @@ module PactBroker
   class Configuration
 
     attr_accessor :log_dir, :database_connection, :auto_migrate_db, :use_hal_browser, :html_pact_renderer
+    attr_accessor :validate_database_connection_config, :enable_diagnostic_endpoints
     attr_writer :logger
 
     def logger
@@ -19,6 +20,8 @@ module PactBroker
       config.auto_migrate_db = true
       config.use_hal_browser = true
       config.html_pact_renderer = default_html_pact_render
+      config.validate_database_connection_config = true
+      config.enable_diagnostic_endpoints = true
       config
     end
 

data/lib/pact_broker/db.rb

@@ -1,4 +1,5 @@
 require 'sequel'
+require 'pact_broker/db/validate_encoding'
 
 Sequel.datetime_class = DateTime
 
@@ -19,5 +20,9 @@ module PactBroker
       Sequel.extension :migration
       Sequel::Migrator.run(database_connection, PactBroker::DB::MIGRATIONS_DIR)
     end
+
+    def self.validate_connection_config
+      PactBroker::DB::ValidateEncoding.(connection)
+    end
   end
-end
+end

data/lib/pact_broker/diagnostic/app.rb

@@ -0,0 +1,37 @@
+require 'pact_broker/diagnostic/resources/heartbeat'
+require 'pact_broker/diagnostic/resources/dependencies'
+require 'webmachine/adapters/rack'
+
+module PactBroker
+  module Diagnostic
+
+    class App
+      def initialize
+        @app = build_diagnostic_app
+      end
+
+      def call env
+        if env['PATH_INFO'].start_with? "/diagnostic/"
+          @app.call(env)
+        else
+          [404, {}, []]
+        end
+      end
+
+      def build_diagnostic_app
+        app = Webmachine::Application.new do |app|
+          app.routes do
+            add ['diagnostic','status','heartbeat'], Diagnostic::Resources::Heartbeat
+            add ['diagnostic','status','dependencies'], Diagnostic::Resources::Dependencies
+          end
+        end
+
+        app.configure do |config|
+          config.adapter = :Rack
+        end
+
+        app.adapter
+      end
+    end
+  end
+end

data/lib/pact_broker/diagnostic/resources/dependencies.rb

@@ -0,0 +1,65 @@
+require 'webmachine'
+require 'pact_broker/db'
+require 'pact_broker/logging'
+
+module PactBroker
+  module Diagnostic
+    module Resources
+      class Dependencies < Webmachine::Resource
+
+        include Logging
+
+        def initialize
+          @return_status = 200
+        end
+
+        def allowed_methods
+          ["GET"]
+        end
+
+        def content_types_provided
+          [["application/hal+json", :to_json]]
+        end
+
+        def to_json
+          ok, report = database_connectivity_status
+          response.body = {
+            "database" => report,
+            "_links" => {
+              "self" => {
+                "href" => request.uri.to_s
+              }
+            }
+          }.to_json
+
+          ok ? 200 : 500
+        end
+
+        private
+
+        def database_connectivity_status
+          begin
+            valid = valid_database_connection?
+            return valid, { "ok" => valid }
+          rescue => e
+            logger.error "#{e.class} - #{e.message}\n#{e.backtrace.join("\n")}"
+            report = {
+              "ok" => false,
+              "error" => {
+                "message" => "#{e.class} - #{e.message}"
+              }
+            }
+            return false, report
+          end
+        end
+
+        def valid_database_connection?
+          connection = PactBroker::DB.connection
+          connection.synchronize do |synchronized_connection|
+            connection.valid_connection? synchronized_connection
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pact_broker/diagnostic/resources/heartbeat.rb

@@ -0,0 +1,30 @@
+require 'webmachine'
+
+module PactBroker
+  module Diagnostic
+    module Resources
+      class Heartbeat < Webmachine::Resource
+
+        def allowed_methods
+          ["GET"]
+        end
+
+        def content_types_provided
+          [["application/hal+json", :to_json]]
+        end
+
+        def to_json
+          {
+            "ok" => true,
+            "_links" => {
+              "self" => {
+                "href" => request.uri.to_s
+              }
+            }
+          }.to_json
+        end
+
+      end
+    end
+  end
+end

data/lib/pact_broker/{functions → pacticipants}/find_potential_duplicate_pacticipant_names.rb

@@ -1,12 +1,8 @@
 require 'pact_broker/domain/group'
 
-=begin
-
-=end
-
 module PactBroker
 
-  module Functions
+  module Pacticipants
 
     class FindPotentialDuplicatePacticipantNames
 

data/lib/pact_broker/{services/pact_service.rb → pacts/service.rb}

@@ -1,14 +1,14 @@
 require 'pact_broker/repositories'
+require 'pact_broker/services'
 
 module PactBroker
-
-  module Services
-    module PactService
+  module Pacts
+    module Service
 
       extend self
 
-      extend Repositories
-      extend Services
+      extend PactBroker::Repositories
+      extend PactBroker::Services
 
       def find_latest_pact params
         pact_repository.find_latest_pact(params[:consumer_name], params[:provider_name], params[:tag])

data/lib/pact_broker/{functions → relationships}/groupify.rb

@@ -6,7 +6,7 @@ require 'pact_broker/domain/group'
 
 module PactBroker
 
-  module Functions
+  module Relationships
 
     class Groupify
 
@@ -36,4 +36,4 @@ module PactBroker
     end
 
   end
-end
+end

data/lib/pact_broker/services/group_service.rb

@@ -1,5 +1,5 @@
 require 'pact_broker/repositories'
-require 'pact_broker/functions/groupify'
+require 'pact_broker/relationships/groupify'
 
 module PactBroker
 
@@ -16,7 +16,7 @@ module PactBroker
       end
 
       def groups
-        Functions::Groupify.call pacticipant_service.find_relationships
+        Relationships::Groupify.call pacticipant_service.find_relationships
       end
 
     end

data/lib/pact_broker/services/pacticipant_service.rb

@@ -2,7 +2,7 @@ require 'pact_broker/repositories'
 require 'pact_broker/logging'
 require 'pact_broker/messages'
 require 'pact_broker/domain/relationship'
-require 'pact_broker/functions/find_potential_duplicate_pacticipant_names'
+require 'pact_broker/pacticipants/find_potential_duplicate_pacticipant_names'
 
 module PactBroker
 
@@ -25,7 +25,7 @@ module PactBroker
       end
 
       def self.find_potential_duplicate_pacticipants pacticipant_name
-        PactBroker::Functions::FindPotentialDuplicatePacticipantNames
+        PactBroker::Pacticipants::FindPotentialDuplicatePacticipantNames
           .call(pacticipant_name, pacticipant_names).tap { | names|
             if names.any?
               logger.info "The following potential duplicate pacticipants were found for #{pacticipant_name}: #{names.join(", ")}"

data/lib/pact_broker/services.rb

@@ -1,4 +1,3 @@
-require 'pact_broker/services/pact_service'
 require 'pact_broker/services/pacticipant_service'
 require 'pact_broker/services/tag_service'
 require 'pact_broker/services/group_service'
@@ -7,8 +6,11 @@ require 'pact_broker/services/version_service'
 
 module PactBroker
   module Services
+
     def pact_service
-      PactService
+      # TODO work out how to fix circular dependency
+      require 'pact_broker/pacts/service'
+      Pacts::Service
     end
 
     def pacticipant_service

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '1.4.0'
+  VERSION = '1.5.0'
 end

data/pact_broker.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |gem|
   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.3.1'
   gem.add_runtime_dependency 'versionomy', '~> 0.4'
   gem.add_runtime_dependency 'rack'
   gem.add_runtime_dependency 'redcarpet', '~>3.1'

data/spec/integration/app_spec.rb

@@ -12,12 +12,14 @@ module PactBroker
 
     let(:hal_browser_enabled) { true }
     let(:group_url) { '/groups/Some%20Consumer' }
+    let(:enable_diagnostic_endpoints) { false }
 
     let(:app) do
       app = PactBroker::App.new do | config |
         config.auto_migrate_db = false
         config.use_hal_browser = hal_browser_enabled
         config.database_connection = ::DB::PACT_BROKER_DB
+        config.enable_diagnostic_endpoints = enable_diagnostic_endpoints
       end
     end
 
@@ -163,5 +165,21 @@ module PactBroker
       end
 
     end
+
+    context "when the diagnostic endpoints are enabled" do
+      let(:enable_diagnostic_endpoints) { true }
+
+      it "returns a 200 to /diagnostic/status/heartbeat" do
+        get "/diagnostic/status/heartbeat"
+        expect(last_response.status).to eq 200
+      end
+    end
+
+    context "when the diagnostic endpoints are not enabled" do
+      it "returns a 404 to /diagnostic/status/heartbeat" do
+        get "/diagnostic/status/heartbeat"
+        expect(last_response.status).to eq 404
+      end
+    end
   end
 end

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

@@ -8,9 +8,9 @@ module PactBroker
 
     module Decorators
 
-      describe PacticipantCollectionRepresenter do
+      describe PacticipantCollectionDecorator do
 
-        subject { JSON.parse PacticipantCollectionRepresenter.new(pacticipants).to_json, symbolize_names: true }
+        subject { JSON.parse PacticipantCollectionDecorator.new(pacticipants).to_json, symbolize_names: true }
 
         context "with no pacticipants" do
           let(:pacticipants) { [] }

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

@@ -8,13 +8,13 @@ module PactBroker
 
     module Decorators
 
-      describe PacticipantRepresenter do
+      describe PacticipantDecorator do
 
         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 PacticipantRepresenter.new(pacticipant).to_json, symbolize_names: true }
+        subject { JSON.parse PacticipantDecorator.new(pacticipant).to_json, symbolize_names: true }
 
         it "includes timestamps" do
           expect(subject[:createdAt]).to eq created_at.xmlschema

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

@@ -22,14 +22,14 @@ module PactBroker::Api
           let(:pact_id_params) { {:provider_name=>"provider_name", :consumer_name=>"consumer_name"} }
 
           before do
-            allow(PactBroker::Services::PactService).to receive(:find_latest_pact).and_return(pact)
+            allow(PactBroker::Pacts::Service).to receive(:find_latest_pact).and_return(pact)
             allow(PactBroker.configuration.html_pact_renderer).to receive(:call).and_return(html)
           end
 
           subject { get "/pacts/provider/provider_name/consumer/consumer_name/latest",{}, {'HTTP_ACCEPT' => "text/html"} }
 
           it "find the pact" do
-            expect(PactBroker::Services::PactService).to receive(:find_latest_pact).with(pact_id_params)
+            expect(PactBroker::Pacts::Service).to receive(:find_latest_pact).with(pact_id_params)
             subject
           end
 

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

@@ -83,7 +83,7 @@ module PactBroker::Api
         subject { delete "/pacts/provider/Provider/consumer/Consumer/version/1.2", json, {'CONTENT_TYPE' => "application/json"} ; last_response }
 
         let(:pact) { double('pact') }
-        let(:pact_service) { PactBroker::Services::PactService }
+        let(:pact_service) { PactBroker::Pacts::Service }
         let(:response) { subject; last_response }
 
         before do

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

@@ -14,7 +14,7 @@ module PactBroker
           let(:created_model) { instance_double(model_class) }
           let(:errors) { [] }
           let(:model_class) { PactBroker::Domain::Pacticipant }
-          let(:decorator_class) { PactBroker::Api::Decorators::PacticipantRepresenter }
+          let(:decorator_class) { PactBroker::Api::Decorators::PacticipantDecorator }
           let(:decorator) { instance_double(decorator_class, to_json: response_json, from_json: model) }
           let(:response_json) { {some: 'json'}.to_json }
 

data/spec/lib/pact_broker/diagnostic/resources/dependencies_spec.rb

@@ -0,0 +1,85 @@
+require 'pact_broker/diagnostic/app'
+require 'rack/test'
+
+module PactBroker
+  module Diagnostic
+    module Resources
+      describe Dependencies do
+
+        describe "GET /diagnostic/status/dependencies" do
+
+          include Rack::Test::Methods
+
+          let(:app) { PactBroker::Diagnostic::App.new }
+          let(:parsed_response_body) { JSON.parse(subject.body) }
+
+          subject { get "/diagnostic/status/dependencies"; last_response }
+
+          it "returns application/hal+json" do
+            expect(subject.headers['Content-Type']).to eq "application/hal+json"
+          end
+
+          it "returns a link to itself" do
+            expect(parsed_response_body['_links']['self']['href']).to eq "http://example.org/diagnostic/status/dependencies"
+          end
+
+          context "when we can connect to the database" do
+            before do
+              allow(PactBroker::DB.connection).to receive(:valid_connection?).and_return(true)
+            end
+
+            it "returns a 200 response" do
+              expect(subject.status).to eq 200
+            end
+
+            it "indicates that the database connectivity is OK" do
+              expect(parsed_response_body['database']['ok']).to be true
+            end
+          end
+
+          context "when we can't connect to the database" do
+            before do
+              allow(PactBroker::DB.connection).to receive(:valid_connection?).and_return(false)
+            end
+
+            it "returns a 500 response" do
+              expect(subject.status).to eq 500
+            end
+
+            it "indicates that the database connectivity is not OK" do
+              expect(parsed_response_body['database']['ok']).to be false
+            end
+          end
+
+          context "when there is an exception valiating the database connection" do
+
+            class TestError < StandardError; end
+
+            before do
+              allow(PactBroker::DB.connection).to receive(:valid_connection?).and_raise(TestError.new("a message"))
+            end
+
+            it "returns a 500 response" do
+              expect(subject.status).to eq 500
+            end
+
+            it "indicates that the database connectivity is not OK" do
+              expect(parsed_response_body['database']['ok']).to be false
+            end
+
+            it "includes an error message" do
+              expect(parsed_response_body['database']['error']['message']).to eq "PactBroker::Diagnostic::Resources::TestError - a message"
+            end
+
+            it "logs the error" do
+              logger = double('Logger')
+              allow_any_instance_of(PactBroker::Diagnostic::Resources::Dependencies).to receive(:logger).and_return(logger)
+              expect(logger).to receive(:error).with(/TestError.*a message/)
+              subject
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/spec/lib/pact_broker/diagnostic/resources/heartbeat_spec.rb

@@ -0,0 +1,35 @@
+require 'pact_broker/diagnostic/resources/heartbeat'
+require 'pact_broker/diagnostic/app'
+require 'rack/test'
+
+module PactBroker
+  module Diagnostic
+    module Resources
+      describe Heartbeat do
+
+        include Rack::Test::Methods
+
+        let(:app) { PactBroker::Diagnostic::App.new }
+
+        describe "GET /diagnostic/status/heartbeat" do
+
+          let(:parsed_response_body) { JSON.parse(subject.body) }
+
+          subject { get "/diagnostic/status/heartbeat"; last_response }
+
+          it "returns a 200" do
+            expect(subject.status).to eq 200
+          end
+
+          it "returns application/hal+json" do
+            expect(subject.headers['Content-Type']).to eq "application/hal+json"
+          end
+
+          it "returns a link to itself" do
+            expect(parsed_response_body['_links']['self']['href']).to eq "http://example.org/diagnostic/status/heartbeat"
+          end
+        end
+      end
+    end
+  end
+end

data/spec/lib/pact_broker/{functions → pacticipants}/find_potential_duplicate_pacticipant_names_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
-require 'pact_broker/functions/find_potential_duplicate_pacticipant_names'
+require 'pact_broker/pacticipants/find_potential_duplicate_pacticipant_names'
 
 module PactBroker
 
-  module Functions
+  module Pacticipants
 
     describe FindPotentialDuplicatePacticipantNames do
 

data/spec/lib/pact_broker/pacts/create_formatted_diff_spec.rb

@@ -19,7 +19,6 @@ module PactBroker
         subject { CreateFormattedDiff.call(pact_content_version_2, pact_content_version_1) }
 
         it "returns the formatted diff" do
-          puts subject
           expect(subject).to include 'interactions'
           expect(subject).to match /\-.*post/
           expect(subject).to match /\+.*get/

data/spec/lib/pact_broker/{services/pact_service_spec.rb → pacts/service_spec.rb}

@@ -1,10 +1,10 @@
 require 'spec_helper'
-require 'pact_broker/services/pact_service'
+require 'pact_broker/pacts/service'
 
 module PactBroker
 
-  module Services
-    module PactService
+  module Pacts
+    module Service
 
       describe "find_distinct_pacts_between" do
         let(:pact_1) { double('pact 1', json_content: 'content 1')}
@@ -18,7 +18,7 @@ module PactBroker
           allow_any_instance_of(Pacts::Repository).to receive(:find_all_pacts_between).and_return(all_pacts)
         end
 
-        subject { PactService.find_distinct_pacts_between 'consumer', :and => 'provider' }
+        subject { Service.find_distinct_pacts_between 'consumer', :and => 'provider' }
 
         it "returns the distinct pacts" do
           expect(subject).to eq [pact_4, pact_2, pact_1]
@@ -35,7 +35,7 @@ module PactBroker
           allow_any_instance_of(Pacts::Repository).to receive(:find_previous_pact).and_return(previous_pact)
         end
 
-        subject { PactService.pact_has_changed_since_previous_version? pact }
+        subject { Service.pact_has_changed_since_previous_version? pact }
 
         context "when a previous pact is found" do
           let(:previous_pact) { instance_double(PactBroker::Domain::Pact, json_content: previous_json_content)}

data/spec/lib/pact_broker/{functions → relationships}/groupify_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
-require 'pact_broker/functions/groupify'
+require 'pact_broker/relationships/groupify'
 require 'pact_broker/domain/relationship'
 
 module PactBroker
 
-  module Functions
+  module Relationships
 
     describe Groupify do
 

data/spec/lib/pact_broker/services/group_service_spec.rb

@@ -28,7 +28,7 @@ module PactBroker
 
         before do
           allow(PacticipantService).to receive(:find_relationships).and_return(relationship_list)
-          allow(Functions::Groupify).to receive(:call).and_return(groups)
+          allow(Relationships::Groupify).to receive(:call).and_return(groups)
         end
 
         it "retrieves a list of the relationships" do
@@ -37,7 +37,7 @@ module PactBroker
         end
 
         it "turns the relationships into groups" do
-          expect(Functions::Groupify).to receive(:call).with(relationship_list)
+          expect(Relationships::Groupify).to receive(:call).with(relationship_list)
           subject
         end
 

data/spec/lib/pact_broker/services/pacticipant_service_spec.rb

@@ -63,7 +63,7 @@ module PactBroker
         let(:pacticipant_repository) { instance_double(PactBroker::Repositories::PacticipantRepository)}
 
         before do
-          allow(PactBroker::Functions::FindPotentialDuplicatePacticipantNames).to receive(:call).and_return(duplicates)
+          allow(PactBroker::Pacticipants::FindPotentialDuplicatePacticipantNames).to receive(:call).and_return(duplicates)
           allow(PactBroker::Repositories::PacticipantRepository).to receive(:new).and_return(pacticipant_repository)
           allow(pacticipant_repository).to receive(:pacticipant_names).and_return(pacticipant_names)
           allow(pacticipant_repository).to receive(:find_by_name).with("Fred").and_return(fred)
@@ -76,7 +76,7 @@ module PactBroker
         end
 
         it "calculates the duplicates" do
-          expect(PactBroker::Functions::FindPotentialDuplicatePacticipantNames).to receive(:call).with(pacticipant_name, pacticipant_names)
+          expect(PactBroker::Pacticipants::FindPotentialDuplicatePacticipantNames).to receive(:call).with(pacticipant_name, pacticipant_names)
           subject.find_potential_duplicate_pacticipants pacticipant_name
         end
 

data/spec/service_consumers/provider_states_for_pact_broker_client.rb

@@ -14,7 +14,7 @@ Pact.provider_states_for "Pact Broker Client" do
 
   provider_state "an error occurs while publishing a pact" do
     set_up do
-      allow(PactBroker::Services::PactService).to receive(:create_or_update_pact).and_raise("an error")
+      allow(PactBroker::Pacts::Service).to receive(:create_or_update_pact).and_raise("an error")
     end
   end
 

data/spec/support/database_cleaner.rb

@@ -15,4 +15,4 @@ RSpec.configure do |config|
   config.after(:each) do
     DatabaseCleaner.clean if defined?(::DB)
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-19 00:00:00.000000000 Z
+date: 2015-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -88,14 +88,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.3.1
 - !ruby/object:Gem::Dependency
   name: versionomy
   requirement: !ruby/object:Gem::Requirement
@@ -448,6 +448,9 @@ files:
 - lib/pact_broker/date_helper.rb
 - lib/pact_broker/db.rb
 - lib/pact_broker/db/validate_encoding.rb
+- lib/pact_broker/diagnostic/app.rb
+- lib/pact_broker/diagnostic/resources/dependencies.rb
+- lib/pact_broker/diagnostic/resources/heartbeat.rb
 - lib/pact_broker/doc/controllers/app.rb
 - lib/pact_broker/doc/views/consumer.markdown
 - lib/pact_broker/doc/views/diff-previous-distinct.markdown
@@ -474,12 +477,11 @@ files:
 - lib/pact_broker/domain/webhook_execution_result.rb
 - lib/pact_broker/domain/webhook_request.rb
 - lib/pact_broker/domain/webhook_request_header.rb
-- lib/pact_broker/functions/find_potential_duplicate_pacticipant_names.rb
-- lib/pact_broker/functions/groupify.rb
 - lib/pact_broker/json.rb
 - lib/pact_broker/locale/en.yml
 - lib/pact_broker/logging.rb
 - lib/pact_broker/messages.rb
+- lib/pact_broker/pacticipants/find_potential_duplicate_pacticipant_names.rb
 - lib/pact_broker/pacts/all_pacts.rb
 - lib/pact_broker/pacts/create_formatted_diff.rb
 - lib/pact_broker/pacts/database_model.rb
@@ -488,9 +490,10 @@ files:
 - lib/pact_broker/pacts/pact_params.rb
 - lib/pact_broker/pacts/pact_version_content.rb
 - lib/pact_broker/pacts/repository.rb
+- lib/pact_broker/pacts/service.rb
 - lib/pact_broker/project_root.rb
+- lib/pact_broker/relationships/groupify.rb
 - lib/pact_broker/repositories.rb
-- lib/pact_broker/repositories/pact_content.rb
 - lib/pact_broker/repositories/pacticipant_repository.rb
 - lib/pact_broker/repositories/tag_repository.rb
 - lib/pact_broker/repositories/version_repository.rb
@@ -498,7 +501,6 @@ files:
 - lib/pact_broker/repositories/webhook_repository.rb
 - lib/pact_broker/services.rb
 - lib/pact_broker/services/group_service.rb
-- lib/pact_broker/services/pact_service.rb
 - lib/pact_broker/services/pacticipant_service.rb
 - lib/pact_broker/services/tag_service.rb
 - lib/pact_broker/services/version_service.rb
@@ -599,25 +601,27 @@ files:
 - spec/lib/pact_broker/api/resources/webhooks_spec.rb
 - spec/lib/pact_broker/configuration_spec.rb
 - spec/lib/pact_broker/db/validate_encoding_spec.rb
+- spec/lib/pact_broker/diagnostic/resources/dependencies_spec.rb
+- spec/lib/pact_broker/diagnostic/resources/heartbeat_spec.rb
 - spec/lib/pact_broker/doc/controllers/app_spec.rb
 - spec/lib/pact_broker/domain/group_spec.rb
 - spec/lib/pact_broker/domain/order_versions_spec.rb
 - spec/lib/pact_broker/domain/pacticipant_spec.rb
 - spec/lib/pact_broker/domain/webhook_request_spec.rb
 - spec/lib/pact_broker/domain/webhook_spec.rb
-- spec/lib/pact_broker/functions/find_potential_duplicate_pacticipant_names_spec.rb
-- spec/lib/pact_broker/functions/groupify_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/pacts/create_formatted_diff_spec.rb
 - spec/lib/pact_broker/pacts/diff_spec.rb
 - spec/lib/pact_broker/pacts/pact_params_spec.rb
 - spec/lib/pact_broker/pacts/repository_spec.rb
+- spec/lib/pact_broker/pacts/service_spec.rb
+- spec/lib/pact_broker/relationships/groupify_spec.rb
 - spec/lib/pact_broker/repositories/pacticipant_repository_spec.rb
 - spec/lib/pact_broker/repositories/tag_repository_spec.rb
 - spec/lib/pact_broker/repositories/version_repository_spec.rb
 - spec/lib/pact_broker/repositories/webhook_repository_spec.rb
 - spec/lib/pact_broker/services/group_service_spec.rb
-- spec/lib/pact_broker/services/pact_service_spec.rb
 - spec/lib/pact_broker/services/pacticipant_service_spec.rb
 - spec/lib/pact_broker/services/tag_service_spec.rb
 - spec/lib/pact_broker/services/webhook_service_spec.rb
@@ -747,25 +751,27 @@ test_files:
 - spec/lib/pact_broker/api/resources/webhooks_spec.rb
 - spec/lib/pact_broker/configuration_spec.rb
 - spec/lib/pact_broker/db/validate_encoding_spec.rb
+- spec/lib/pact_broker/diagnostic/resources/dependencies_spec.rb
+- spec/lib/pact_broker/diagnostic/resources/heartbeat_spec.rb
 - spec/lib/pact_broker/doc/controllers/app_spec.rb
 - spec/lib/pact_broker/domain/group_spec.rb
 - spec/lib/pact_broker/domain/order_versions_spec.rb
 - spec/lib/pact_broker/domain/pacticipant_spec.rb
 - spec/lib/pact_broker/domain/webhook_request_spec.rb
 - spec/lib/pact_broker/domain/webhook_spec.rb
-- spec/lib/pact_broker/functions/find_potential_duplicate_pacticipant_names_spec.rb
-- spec/lib/pact_broker/functions/groupify_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/pacts/create_formatted_diff_spec.rb
 - spec/lib/pact_broker/pacts/diff_spec.rb
 - spec/lib/pact_broker/pacts/pact_params_spec.rb
 - spec/lib/pact_broker/pacts/repository_spec.rb
+- spec/lib/pact_broker/pacts/service_spec.rb
+- spec/lib/pact_broker/relationships/groupify_spec.rb
 - spec/lib/pact_broker/repositories/pacticipant_repository_spec.rb
 - spec/lib/pact_broker/repositories/tag_repository_spec.rb
 - spec/lib/pact_broker/repositories/version_repository_spec.rb
 - spec/lib/pact_broker/repositories/webhook_repository_spec.rb
 - spec/lib/pact_broker/services/group_service_spec.rb
-- spec/lib/pact_broker/services/pact_service_spec.rb
 - spec/lib/pact_broker/services/pacticipant_service_spec.rb
 - spec/lib/pact_broker/services/tag_service_spec.rb
 - spec/lib/pact_broker/services/webhook_service_spec.rb