pact_broker 1.3.1 → 1.3.2.rc1

data/lib/pact_broker/{models → domain}/relationship.rb

@@ -1,5 +1,5 @@
 module PactBroker
-  module Models
+  module Domain
 
     class Relationship
 

data/lib/pact_broker/{models → domain}/tag.rb

@@ -2,12 +2,12 @@ require 'pact_broker/db'
 
 module PactBroker
 
-  module Models
+  module Domain
     class Tag < Sequel::Model
 
       unrestrict_primary_key
 
-      associate(:many_to_one, :version, :class => "PactBroker::Models::Version", :key => :version_id, :primary_key => :id)
+      associate(:many_to_one, :version, :class => "PactBroker::Domain::Version", :key => :version_id, :primary_key => :id)
 
 
     end

data/lib/pact_broker/{models → domain}/version.rb

@@ -1,15 +1,15 @@
 require 'pact_broker/db'
-require 'pact_broker/models/order_versions'
+require 'pact_broker/domain/order_versions'
 
 module PactBroker
 
-  module Models
+  module Domain
 
     class Version < Sequel::Model
 
       set_primary_key :id
       one_to_many :pacts
-      associate(:many_to_one, :pacticipant, :class => "PactBroker::Models::Pacticipant", :key => :pacticipant_id, :primary_key => :id)
+      associate(:many_to_one, :pacticipant, :class => "PactBroker::Domain::Pacticipant", :key => :pacticipant_id, :primary_key => :id)
       one_to_many :tags, :reciprocal => :version
 
       def after_create

data/lib/pact_broker/{models → domain}/webhook.rb

@@ -1,11 +1,11 @@
-require 'pact_broker/models/webhook_request'
+require 'pact_broker/domain/webhook_request'
 require 'pact_broker/messages'
 require 'pact_broker/logging'
 require 'pact_broker/api/contracts/webhook_contract'
 
 module PactBroker
 
-  module Models
+  module Domain
 
     class Webhook
 

data/lib/pact_broker/{models → domain}/webhook_execution_result.rb

@@ -1,6 +1,6 @@
 module PactBroker
 
-  module Models
+  module Domain
 
     class WebhookExecutionResult
 

data/lib/pact_broker/{models → domain}/webhook_request.rb

@@ -1,12 +1,12 @@
-require 'pact_broker/models/webhook_request_header'
-require 'pact_broker/models/webhook_execution_result'
+require 'pact_broker/domain/webhook_request_header'
+require 'pact_broker/domain/webhook_execution_result'
 require 'pact_broker/logging'
 require 'pact_broker/messages'
 require 'net/http'
 
 module PactBroker
 
-  module Models
+  module Domain
 
     class WebhookRequestError < StandardError
 

data/lib/pact_broker/{models → domain}/webhook_request_header.rb

@@ -1,5 +1,5 @@
 module PactBroker
-  module Models
+  module Domain
     class WebhookRequestHeader
 
       attr_accessor :name, :value

data/lib/pact_broker/functions/find_potential_duplicate_pacticipant_names.rb

@@ -1,4 +1,4 @@
-require 'pact_broker/models/group'
+require 'pact_broker/domain/group'
 
 =begin
 

data/lib/pact_broker/functions/groupify.rb

@@ -1,4 +1,4 @@
-require 'pact_broker/models/group'
+require 'pact_broker/domain/group'
 
 =begin
   Splits all relationships up into groups of non-connecting relationships.
@@ -11,7 +11,7 @@ module PactBroker
     class Groupify
 
       def self.call relationships
-        recurse_groups([], relationships.dup).collect{ | group | Models::Group.new(group) }
+        recurse_groups([], relationships.dup).collect{ | group | Domain::Group.new(group) }
       end
 
       def self.recurse_groups groups, relationship_pool

data/lib/pact_broker/locale/en.yml

@@ -11,6 +11,7 @@ en:
         consumer_version_number_header_invalid: "X-Pact-Consumer-Version '%{consumer_version_number}' is not recognised as a standard semantic version. eg. 1.3.0 or 2.0.4.rc1"
         consumer_version_number_invalid: "Consumer version number '%{consumer_version_number}' is not recognised as a standard semantic version. eg. 1.3.0 or 2.0.4.rc1"
         pacticipant_name_mismatch: "in pact ('%{name_in_pact}') does not match %{pacticipant} name in path ('%{name}')."
+        connection_encoding_not_utf8: "The Sequel connection encoding (%{encoding}) is strongly recommended to be \"utf8\". If you need to set it to %{encoding} for some particular reason, then disable this check by setting config.validate_database_connection_config = false"
       duplicate_pacticipant: |
         This is the first time a pact has been published for "%{new_name}".
         The name "%{new_name}" is very similar to the following existing consumers/providers:

data/lib/pact_broker/pacts/all_pacts.rb

@@ -0,0 +1,82 @@
+require 'pact_broker/domain/tag'
+require 'pact_broker/domain/pacticipant'
+require 'pact_broker/domain/version'
+require 'pact_broker/pacts/pact_version_content'
+
+module PactBroker
+  module Pacts
+
+    class AllPacts < Sequel::Model(:all_pacts)
+
+
+      set_primary_key :id
+      associate(:one_to_many, :tags, :class => "PactBroker::Domain::Tag", :reciprocal => :version, :key => :version_id, :primary_key => :consumer_version_id)
+      associate(:many_to_one, :pact_version_content, :key => :pact_version_content_sha, :primary_key => :sha)
+
+      dataset_module do
+      #   def latest_versions
+      #     join(:latest_pact_consumer_version_orders,
+      #       {
+      #         consumer_id: :consumer_id,
+      #         provider_id: :provider_id,
+      #         latest_consumer_version_order: :consumer_version_order
+      #       },
+      #       {table_alias: :lp}
+      #     )
+      #   end
+
+        def consumer consumer_name
+          filter(consumer_name: consumer_name)
+        end
+
+        def provider provider_name
+          filter(provider_name: provider_name)
+        end
+
+        def tag tag_name
+          join(:tags, {version_id: :consumer_version_id})
+          .where('tags.name = ?', tag_name)
+        end
+
+        def consumer_version_number number
+          filter(consumer_version_number: number)
+        end
+
+        def consumer_version_order_before order
+          where('consumer_version_order < ?', order)
+        end
+
+        def latest
+          reverse_order(:consumer_version_order).limit(1)
+        end
+      end
+
+      def to_domain
+        consumer = Domain::Pacticipant.new(name: consumer_name)
+        consumer.id = consumer_id
+        provider = Domain::Pacticipant.new(name: provider_name)
+        provider.id = provider_id
+        consumer_version = OpenStruct.new(
+          number: consumer_version_number,
+          order: consumer_version_order,
+          pacticipant: consumer,
+          tags: tags)
+        Domain::Pact.new(id: id,
+          consumer: consumer,
+          consumer_version: consumer_version,
+          provider: provider,
+          consumer_version_number: consumer_version_number,
+          created_at: created_at,
+          updated_at: updated_at)
+      end
+
+      def to_domain_with_content
+        to_domain.tap do | pact |
+          pact.json_content = pact_version_content.content
+        end
+      end
+
+    end
+
+  end
+end

data/lib/pact_broker/pacts/database_model.rb

@@ -0,0 +1,35 @@
+require 'pact_broker/domain/pact'
+require 'pact_broker/pacts/pact_version_content'
+
+module PactBroker
+  module Pacts
+
+    class DatabaseModel < Sequel::Model(:pacts)
+
+      set_primary_key :id
+      associate(:many_to_one, :provider, :class => "PactBroker::Domain::Pacticipant", :key => :provider_id, :primary_key => :id)
+      associate(:many_to_one, :consumer_version, :class => "PactBroker::Domain::Version", :key => :version_id, :primary_key => :id)
+      associate(:many_to_one, :pact_version_content, :key => :pact_version_content_sha, :primary_key => :sha)
+
+      DatabaseModel.plugin :timestamps, :update_on_create=>true
+
+      def to_domain
+        PactBroker::Domain::Pact.new(
+          id: id,
+          provider: provider,
+          consumer: consumer_version.pacticipant,
+          consumer_version_number: consumer_version.number,
+          consumer_version: to_version_domain,
+          json_content: pact_version_content.content,
+          updated_at: updated_at,
+          created_at: created_at
+          )
+      end
+
+      def to_version_domain
+        OpenStruct.new(number: consumer_version.number, pacticipant: consumer_version.pacticipant, tags: consumer_version.tags, order: consumer_version.order)
+      end
+
+    end
+  end
+end

data/lib/pact_broker/pacts/latest_pacts.rb

@@ -0,0 +1,11 @@
+require 'pact_broker/pacts/all_pacts'
+
+module PactBroker
+  module Pacts
+
+    class LatestPacts < AllPacts
+      set_dataset(:latest_pacts)
+    end
+
+  end
+end

data/lib/pact_broker/pacts/pact_version_content.rb

@@ -0,0 +1,11 @@
+require 'sequel'
+
+module PactBroker
+  module Pacts
+    class PactVersionContent < Sequel::Model(:pact_version_contents)
+      set_primary_key :sha
+    end
+
+    PactVersionContent.plugin :timestamps, :update_on_create=>true
+  end
+end

data/lib/pact_broker/pacts/repository.rb

@@ -0,0 +1,106 @@
+require 'digest/sha1'
+require 'sequel'
+require 'ostruct'
+require 'pact_broker/logging'
+require 'pact_broker/pacts/database_model'
+require 'pact_broker/pacts/all_pacts'
+require 'pact_broker/pacts/latest_pacts'
+
+module PactBroker
+  module Pacts
+    class Repository
+
+      include PactBroker::Logging
+
+      def create params
+        DatabaseModel.new(
+          version_id: params[:version_id],
+          provider_id: params[:provider_id],
+          pact_version_content: find_or_create_pact_version_content(params[:json_content]),
+        ).save.to_domain
+      end
+
+      def update id, params
+        DatabaseModel.find(id: id).tap do | pact |
+          pact_version_content = find_or_create_pact_version_content(params[:json_content])
+          pact.update(pact_version_content: pact_version_content)
+        end.to_domain
+      end
+
+      def delete params
+        id = AllPacts
+          .consumer(params.consumer_name)
+          .provider(params.provider_name)
+          .consumer_version_number(params.consumer_version_number)
+          .limit(1).first.id
+        DatabaseModel.where(id: id).delete
+      end
+
+      def find_all_pacts_between consumer_name, options
+        AllPacts
+          .eager(:tags)
+          .consumer(consumer_name)
+          .provider(options.fetch(:and))
+          .reverse_order(:consumer_version_order)
+          .collect(&:to_domain)
+      end
+
+      def find_by_version_and_provider version_id, provider_id
+        AllPacts
+          .eager(:tags)
+          .where(consumer_version_id: version_id, provider_id: provider_id)
+          .limit(1).collect(&:to_domain)[0]
+      end
+
+      def find_latest_pacts
+        LatestPacts.collect(&:to_domain)
+      end
+
+      def find_latest_pact(consumer_name, provider_name, tag = nil)
+        query = AllPacts
+          .consumer(consumer_name)
+          .provider(provider_name)
+        query = query.tag(tag) unless tag.nil?
+        query.latest.all.collect(&:to_domain_with_content)[0]
+      end
+
+      def find_pact consumer_name, consumer_version, provider_name
+        AllPacts
+          .eager(:tags)
+          .consumer(consumer_name)
+          .provider(provider_name)
+          .consumer_version_number(consumer_version)
+          .limit(1).collect(&:to_domain_with_content)[0]
+      end
+
+      def find_previous_pact pact
+        AllPacts
+          .eager(:tags)
+          .consumer(pact.consumer.name)
+          .provider(pact.provider.name)
+          .consumer_version_order_before(pact.consumer_version.order)
+          .latest.collect(&:to_domain)[0]
+      end
+
+      private
+
+      def find_or_create_pact_version_content json_content
+        sha = Digest::SHA1.hexdigest(json_content)
+        PactVersionContent.find(sha: sha) || create_pact_version_content(sha, json_content)
+      end
+
+      def create_pact_version_content sha, json_content
+        PactBroker.logger.debug("Creating new PactVersionContent for sha #{sha}")
+        pact_version_content = PactVersionContent.new(content: json_content)
+        pact_version_content[:sha] = sha
+        pact_version_content.save
+      end
+
+      def to_domain
+        database_model = yield
+        database_model ? database_model.to_domain : nil
+      end
+
+    end
+  end
+end

data/lib/pact_broker/repositories.rb

@@ -1,7 +1,7 @@
-require 'pact_broker/models'
+require 'pact_broker/domain'
 require 'pact_broker/repositories/pacticipant_repository'
 require 'pact_broker/repositories/version_repository'
-require 'pact_broker/repositories/pact_repository'
+require 'pact_broker/pacts/repository'
 require 'pact_broker/repositories/tag_repository'
 require 'pact_broker/repositories/webhook_repository'
 
@@ -17,7 +17,7 @@ module PactBroker
     end
 
     def pact_repository
-      PactRepository.new
+      PactBroker::Pacts::Repository.new
     end
 
     def tag_repository

data/lib/pact_broker/repositories/pacticipant_repository.rb

@@ -1,20 +1,20 @@
 require 'sequel'
-require 'pact_broker/models/pacticipant'
+require 'pact_broker/domain/pacticipant'
 
 module PactBroker
   module Repositories
     class PacticipantRepository
 
       def find_by_name name
-        PactBroker::Models::Pacticipant.where(name: name).single_record
+        PactBroker::Domain::Pacticipant.where(name: name).single_record
       end
 
       def find_by_id id
-        PactBroker::Models::Pacticipant.where(id: id).single_record
+        PactBroker::Domain::Pacticipant.where(id: id).single_record
       end
 
       def find_all
-        PactBroker::Models::Pacticipant.order(:name).all
+        PactBroker::Domain::Pacticipant.order(:name).all
       end
 
       def find_by_name_or_create name
@@ -26,11 +26,11 @@ module PactBroker
       end
 
       def create args
-        PactBroker::Models::Pacticipant.new(name: args[:name], repository_url: args[:repository_url]).save(raise_on_save_failure: true)
+        PactBroker::Domain::Pacticipant.new(name: args[:name], repository_url: args[:repository_url]).save(raise_on_save_failure: true)
       end
 
       def pacticipant_names
-        PactBroker::Models::Pacticipant.select(:name).order(:name).collect{ | pacticipant| pacticipant.name }
+        PactBroker::Domain::Pacticipant.select(:name).order(:name).collect{ | pacticipant| pacticipant.name }
       end
 
       def find_latest_version name

data/lib/pact_broker/repositories/tag_repository.rb

@@ -1,4 +1,4 @@
-require 'pact_broker/models/tag'
+require 'pact_broker/domain/tag'
 
 module PactBroker
   module Repositories
@@ -6,11 +6,11 @@ module PactBroker
 
 
       def create args
-        Models::Tag.new(name: args.fetch(:name), version: args.fetch(:version)).save
+        Domain::Tag.new(name: args.fetch(:name), version: args.fetch(:version)).save
       end
 
       def find args
-        PactBroker::Models::Tag
+        PactBroker::Domain::Tag
           .select(:tags__name, :tags__version_id, :tags__created_at, :tags__updated_at)
           .join(:versions, {id: :version_id})
           .join(:pacticipants, {pacticipants__id: :versions__pacticipant_id})