pact_broker 1.3.1 → 1.3.2.rc1

data/lib/pact_broker/repositories/version_repository.rb

@@ -1,16 +1,16 @@
 require 'sequel'
-require 'pact_broker/models/version'
+require 'pact_broker/domain/version'
 
 module PactBroker
   module Repositories
     class VersionRepository
 
       def find_by_pacticipant_id_and_number pacticipant_id, number
-        PactBroker::Models::Version.where(number: number, pacticipant_id: pacticipant_id).single_record
+        PactBroker::Domain::Version.where(number: number, pacticipant_id: pacticipant_id).single_record
       end
 
       def find_by_pacticipant_name_and_number pacticipant_name, number
-        PactBroker::Models::Version
+        PactBroker::Domain::Version
           .where(number: number)
           .join(:pacticipants, {id: :pacticipant_id})
           .where(name: pacticipant_name)
@@ -19,8 +19,8 @@ module PactBroker
 
       def create args
         PactBroker.logger.info "Creating version #{args[:number]} for pacticipant_id=#{args[:pacticipant_id]}"
-        version = PactBroker::Models::Version.new(number: args[:number], pacticipant_id: args[:pacticipant_id]).save
-        PactBroker::Models::Version.find(id: version.id) # Need to reload with populated order
+        version = PactBroker::Domain::Version.new(number: args[:number], pacticipant_id: args[:pacticipant_id]).save
+        PactBroker::Domain::Version.find(id: version.id) # Need to reload with populated order
       end
 
       def find_by_pacticipant_id_and_number_or_create pacticipant_id, number

data/lib/pact_broker/repositories/webhook.rb

@@ -0,0 +1,89 @@
+require 'sequel'
+require 'pact_broker/domain/webhook'
+require 'pact_broker/domain/pacticipant'
+
+module PactBroker
+  module Repositories
+    class Webhook < Sequel::Model
+
+      set_primary_key :id
+      associate(:many_to_one, :provider, :class => "PactBroker::Domain::Pacticipant", :key => :provider_id, :primary_key => :id)
+      associate(:many_to_one, :consumer, :class => "PactBroker::Domain::Pacticipant", :key => :consumer_id, :primary_key => :id)
+      one_to_many :headers, :class => "PactBroker::Repositories::WebhookHeader", :reciprocal => :webhook
+
+      def before_destroy
+        WebhookHeader.where(webhook_id: id).destroy
+      end
+
+      def self.from_domain webhook, consumer, provider
+        is_json_request_body = !(String === webhook.request.body || webhook.request.body.nil?) # Can't rely on people to set content type
+        new(
+          uuid: webhook.uuid,
+          method: webhook.request.method,
+          url: webhook.request.url,
+          username: webhook.request.username,
+          password: not_plain_text_password(webhook.request.password),
+          body: (is_json_request_body ? webhook.request.body.to_json : webhook.request.body),
+          is_json_request_body: is_json_request_body
+        ).tap do | db_webhook |
+          db_webhook.consumer_id = consumer.id
+          db_webhook.provider_id = provider.id
+        end
+      end
+
+      def self.not_plain_text_password password
+        password.nil? ? nil : Base64.strict_encode64(password)
+      end
+
+      def to_domain
+        Domain::Webhook.new(
+          uuid: uuid,
+          consumer: consumer,
+          provider: provider,
+          request: Domain::WebhookRequest.new(request_attributes),
+          created_at: created_at,
+          updated_at: updated_at)
+      end
+
+      def request_attributes
+        values.merge(headers: parsed_headers, body: parsed_body, password: plain_text_password)
+      end
+
+      def plain_text_password
+        password.nil? ? nil : Base64.strict_decode64(password)
+      end
+
+      def parsed_headers
+        WebhookHeader.where(webhook_id: id).all.each_with_object({}) do | header, hash |
+          hash[header[:name]] = header[:value]
+        end
+      end
+
+      def parsed_body
+        if body && is_json_request_body
+           JSON.parse(body)
+        else
+          body
+        end
+      end
+
+    end
+
+    Webhook.plugin :timestamps, :update_on_create=>true
+
+    class WebhookHeader < Sequel::Model
+
+      associate(:many_to_one, :webhook, :class => "PactBroker::Repositories::Webhook", :key => :webhook_id, :primary_key => :id)
+
+      def self.from_domain name, value, webhook_id
+        db_header = new
+        db_header.name = name
+        db_header.value = value
+        db_header.webhook_id = webhook_id
+        db_header
+      end
+
+    end
+  end
+
+end

data/lib/pact_broker/repositories/webhook_repository.rb

@@ -1,33 +1,29 @@
 require 'sequel'
-require 'pact_broker/models/webhook'
-require 'pact_broker/models/pacticipant'
+require 'pact_broker/domain/webhook'
+require 'pact_broker/domain/pacticipant'
 require 'pact_broker/db'
+require 'pact_broker/repositories/webhook'
+
 
 module PactBroker
   module Repositories
 
     class WebhookRepository
 
-      # Experimenting with decoupling the model from the database representation.
-      # Sure makes it messier for saving/retrieving.
-
       include Repositories
 
       def create uuid, webhook, consumer, provider
-        db_webhook = Webhook.from_model webhook, consumer, provider
+        db_webhook = Webhook.from_domain webhook, consumer, provider
         db_webhook.uuid = uuid
         db_webhook.save
         webhook.request.headers.each_pair do | name, value |
-          db_webhook.add_header WebhookHeader.from_model(name, value, db_webhook.id)
+          db_webhook.add_header WebhookHeader.from_domain(name, value, db_webhook.id)
         end
-
         find_by_uuid db_webhook.uuid
       end
 
       def find_by_uuid uuid
-        db_webhook = Webhook.where(uuid: uuid).single_record
-        return nil if db_webhook.nil?
-        db_webhook.to_model
+        Webhook.where(uuid: uuid).limit(1).collect(&:to_domain)[0]
       end
 
       def delete_by_uuid uuid
@@ -40,92 +36,11 @@ module PactBroker
       end
 
       def find_all
-        Webhook.all.collect { | db_webhook| db_webhook.to_model }
+        Webhook.all.collect(&:to_domain)
       end
 
       def find_by_consumer_and_provider consumer, provider
-        Webhook.where(consumer_id: consumer.id, provider_id: provider.id).collect { | db_webhook| db_webhook.to_model }
-      end
-
-    end
-
-    class Webhook < Sequel::Model
-
-      set_primary_key :id
-      associate(:many_to_one, :provider, :class => "PactBroker::Models::Pacticipant", :key => :provider_id, :primary_key => :id)
-      associate(:many_to_one, :consumer, :class => "PactBroker::Models::Pacticipant", :key => :consumer_id, :primary_key => :id)
-      one_to_many :headers, :class => "PactBroker::Repositories::WebhookHeader", :reciprocal => :webhook
-
-      def before_destroy
-        WebhookHeader.where(webhook_id: id).destroy
-      end
-
-      def self.from_model webhook, consumer, provider
-        is_json_request_body = !(String === webhook.request.body || webhook.request.body.nil?) # Can't rely on people to set content type
-        new(
-          uuid: webhook.uuid,
-          method: webhook.request.method,
-          url: webhook.request.url,
-          username: webhook.request.username,
-          password: not_plain_text_password(webhook.request.password),
-          body: (is_json_request_body ? webhook.request.body.to_json : webhook.request.body),
-          is_json_request_body: is_json_request_body
-        ).tap do | db_webhook |
-          db_webhook.consumer_id = consumer.id
-          db_webhook.provider_id = provider.id
-        end
-      end
-
-      def self.not_plain_text_password password
-        password.nil? ? nil : Base64.strict_encode64(password)
-      end
-
-      def to_model
-        Models::Webhook.new(
-          uuid: uuid,
-          consumer: consumer,
-          provider: provider,
-          request: Models::WebhookRequest.new(request_attributes),
-          created_at: created_at,
-          updated_at: updated_at)
-      end
-
-      def request_attributes
-        values.merge(headers: parsed_headers, body: parsed_body, password: plain_text_password)
-      end
-
-      def plain_text_password
-        password.nil? ? nil : Base64.strict_decode64(password)
-      end
-
-      def parsed_headers
-        WebhookHeader.where(webhook_id: id).all.each_with_object({}) do | header, hash |
-          hash[header[:name]] = header[:value]
-        end
-      end
-
-      def parsed_body
-        if body && is_json_request_body
-           JSON.parse(body)
-        else
-          body
-        end
-      end
-
-    end
-
-    Webhook.plugin :timestamps, :update_on_create=>true
-
-    class WebhookHeader < Sequel::Model
-
-      associate(:many_to_one, :webhook, :class => "PactBroker::Repositories::Webhook", :key => :webhook_id, :primary_key => :id)
-
-      def self.from_model name, value, webhook_id
-        db_header = new
-        db_header.name = name
-        db_header.value = value
-        db_header.webhook_id = webhook_id
-        db_header
+        Webhook.where(consumer_id: consumer.id, provider_id: provider.id).collect(&:to_domain)
       end
 
     end

data/lib/pact_broker/services/pact_service.rb

@@ -22,6 +22,10 @@ module PactBroker
         pact_repository.find_pact(params[:consumer_name], params[:consumer_version_number], params[:provider_name])
       end
 
+      def delete params
+        pact_repository.delete(params)
+      end
+
       def create_or_update_pact params
         provider = pacticipant_repository.find_by_name_or_create params[:provider_name]
         consumer = pacticipant_repository.find_by_name_or_create params[:consumer_name]

data/lib/pact_broker/services/pacticipant_service.rb

@@ -1,7 +1,7 @@
 require 'pact_broker/repositories'
 require 'pact_broker/logging'
 require 'pact_broker/messages'
-require 'pact_broker/models/relationship'
+require 'pact_broker/domain/relationship'
 require 'pact_broker/functions/find_potential_duplicate_pacticipant_names'
 
 module PactBroker
@@ -51,7 +51,7 @@ module PactBroker
       end
 
       def self.find_relationships
-        pact_repository.find_latest_pacts.collect{ | pact| PactBroker::Models::Relationship.create pact.consumer, pact.provider }
+        pact_repository.find_latest_pacts.collect{ | pact| PactBroker::Domain::Relationship.create pact.consumer, pact.provider }
       end
 
       def self.update params
@@ -66,7 +66,7 @@ module PactBroker
 
       def self.delete name
         pacticipant = find_pacticipant_by_name name
-        connection = PactBroker::Models::Pacticipant.new.db
+        connection = PactBroker::Domain::Pacticipant.new.db
         connection.run("delete from tags where version_id IN (select id from versions where pacticipant_id IN (select id from pacticipants where name = '#{name}'))")
         connection.run("delete from pacts where version_id IN (select id from versions where pacticipant_id IN (select id from pacticipants where name = '#{name}'))")
         connection.run("delete from pacts where provider_id IN (select id from pacticipants where name = '#{name}')")

data/lib/pact_broker/ui.rb

@@ -1,2 +1,9 @@
+
+# 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 } }
+end
+
 require 'pact_broker/ui/controllers/relationships'
 require 'pact_broker/ui/controllers/groups'

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

@@ -18,7 +18,7 @@ module PactBroker
         end
 
         get "/" do
-          view_model = ViewModels::Relationships.new(pacticipant_service.find_relationships)
+          view_model = ViewDomain::Relationships.new(pacticipant_service.find_relationships)
           haml 'clusters/show', locals: {relationships: view_model}
         end
 

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

@@ -10,7 +10,7 @@ module PactBroker
         include PactBroker::Services
 
         get "/" do
-          view_model = ViewModels::Relationships.new(pacticipant_service.find_relationships)
+          view_model = ViewDomain::Relationships.new(pacticipant_service.find_relationships)
 
           haml :'relationships/show', {locals: {relationships: view_model}}, {layout: 'layouts/main'}
         end

data/lib/pact_broker/ui/view_models/relationship.rb

@@ -3,7 +3,7 @@ require 'pact_broker/ui/helpers/url_helper'
 
 module PactBroker
   module UI
-    module ViewModels
+    module ViewDomain
       class Relationship
 
         include PactBroker::Api::PactBrokerUrls

data/lib/pact_broker/ui/view_models/relationships.rb

@@ -2,11 +2,9 @@ require 'pact_broker/ui/view_models/relationship'
 
 module PactBroker
   module UI
-    module ViewModels
+    module ViewDomain
       class Relationships
 
-        attr_reader :relationships
-
         def initialize relationships
           @relationships = relationships.collect{ |relationship| Relationship.new(relationship) }.sort
         end
@@ -15,6 +13,17 @@ module PactBroker
           relationships.each(&block)
         end
 
+        def size_label
+          case relationships.size
+          when 1 then "1 pact"
+          else
+            "#{relationships.size} pacts"
+          end
+        end
+
+        private
+
+        attr_reader :relationships
       end
     end
   end

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

@@ -38,6 +38,8 @@
           %td.provider
             %a{:href => relationship.provider_group_url}
               = relationship.provider_name
+    %div.relationships-size
+      = relationships.size_label
 
 :javascript
 $(function(){

data/lib/pact_broker/version.rb

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

data/public/stylesheets/relationships.css

@@ -11,6 +11,11 @@
   border-left: none;
 }
 
+.relationships-size {
+  text-align: right;
+  color: gray;
+}
+
 .relationships-sort {
   padding-left:10px;
 }

data/spec/features/create_webhook_spec.rb

@@ -0,0 +1,77 @@
+require 'support/provider_state_builder'
+
+describe "Creating a webhook" do
+
+  before do
+    ProviderStateBuilder.new.create_pact_with_hierarchy("Some Consumer", "1", "Some Provider")
+  end
+
+  let(:path) { "/webhooks/provider/Some%20Provider/consumer/Some%20Consumer" }
+  let(:headers) { {'CONTENT_TYPE' => 'application/json'} }
+  let(:response_body) { JSON.parse(last_response.body, symbolize_names: true)}
+  let(:webhook_json) { webhook_hash.to_json }
+
+  subject { post path, webhook_json, headers }
+
+  context "with invalid attributes" do
+
+    let(:webhook_hash) { {} }
+
+    it "returns a 400" do
+      subject
+      expect(last_response.status).to be 400
+    end
+
+    it "returns a JSON content type" do
+      subject
+      expect(last_response.headers['Content-Type']).to eq 'application/json'
+    end
+
+    it "returns the validation errors" do
+      subject
+      expect(response_body[:errors]).to_not be_empty
+    end
+
+  end
+
+  context "with valid attributes" do
+
+    let(:webhook_hash) do
+      {
+        request: {
+          method: 'POST',
+          url: 'http://example.org',
+          headers: {
+            :"Content-Type" => "application/json"
+          },
+          body: {
+            a: 'body'
+          }
+        }
+      }
+    end
+
+    let(:webhook_json) { webhook_hash.to_json }
+
+    it "returns a 201 response" do
+      subject
+      expect(last_response.status).to be 201
+    end
+
+    it "returns the Location header" do
+      subject
+      expect(last_response.headers['Location']).to match(%r{http://example.org/webhooks/.+})
+    end
+
+    it "returns a JSON Content Type" do
+      subject
+      expect(last_response.headers['Content-Type']).to eq 'application/hal+json'
+    end
+
+    it "returns the newly created webhook" do
+      subject
+      expect(response_body).to include webhook_hash
+    end
+  end
+
+end