pact_broker 0.0.4 → 0.0.5

data/lib/pact_broker/models/version.rb

@@ -1,4 +1,5 @@
 require 'sequel'
+require 'pact_broker/models/order_versions'
 
 module PactBroker
 
@@ -6,8 +7,13 @@ module PactBroker
 
     class Version < Sequel::Model
 
+      set_primary_key :id
       one_to_many :pacts
-      one_to_one :pacticipant
+      associate(:many_to_one, :pacticipant, :class => "PactBroker::Models::Pacticipant", :key => :pacticipant_id, :primary_key => :id)
+
+      def after_create
+        OrderVersions.(self.pacticipant_id)
+      end
 
       def to_s
         "Version: number=#{number}, pacticipant=#{pacticipant_id}"

data/lib/pact_broker/repositories/pact_repository.rb

@@ -10,15 +10,25 @@ module PactBroker
         PactBroker::Models::Pact.where(version_id: version_id, provider_id: provider_id).single_record
       end
 
-      def find_latest_version(consumer_name, provider_name)
+      def find_latest_pacts
+
+        # TODO Work out a more elegant and efficient way of executing this query.
+        # Haven't found a max/group by combination that works with Sequel Models
+        latest_versions = PactBroker::Models::Version.new.db.execute('select max(id) as id from versions where id in (select distinct(version_id) from pacts) group by pacticipant_id').collect{ | it | it }.flatten
+
         PactBroker::Models::Pact.select(:pacts__id, :pacts__json_content, :pacts__version_id, :pacts__provider_id, :versions__number___consumer_version_number).
           join(:versions, {:id => :version_id}, {implicit_qualifier: :pacts}).
           join(:pacticipants, {:id => :pacticipant_id}, {:table_alias => :consumers, implicit_qualifier: :versions}).
           join(:pacticipants, {:id => :provider_id}, {:table_alias => :providers, implicit_qualifier: :pacts}).
-          where('providers.name = ?', provider_name).
-          where('consumers.name = ?', consumer_name).
-          order(:version_id).
-          last
+          where('versions.id in ?', latest_versions).all
+      end
+
+      def find_latest_pact(consumer_name, provider_name)
+        pact_finder(consumer_name, provider_name).order(:order).last
+      end
+
+      def find_pact consumer_name, consumer_version, provider_name
+        pact_finder(consumer_name, provider_name).where('versions.number = ?', consumer_version).single_record
       end
 
       def create params
@@ -33,6 +43,17 @@ module PactBroker
         end
       end
 
+      private
+
+      def pact_finder consumer_name, provider_name
+        PactBroker::Models::Pact.select(:pacts__id, :pacts__json_content, :pacts__version_id, :pacts__provider_id, :versions__number___consumer_version_number).
+          join(:versions, {:id => :version_id}, {implicit_qualifier: :pacts}).
+          join(:pacticipants, {:id => :pacticipant_id}, {:table_alias => :consumers, implicit_qualifier: :versions}).
+          join(:pacticipants, {:id => :provider_id}, {:table_alias => :providers, implicit_qualifier: :pacts}).
+          where('providers.name = ?', provider_name).
+          where('consumers.name = ?', consumer_name)
+      end
+
     end
   end
 end

data/lib/pact_broker/resources/json_resource.rb

@@ -0,0 +1,37 @@
+require 'webmachine'
+require 'json'
+
+module PactBroker
+
+  module Resources
+
+    module PathInfo
+      def identifier_from_path
+        request.path_info.each_with_object({}) do | pair, hash|
+          hash[pair.first] = CGI::unescape(pair.last)
+        end
+      end
+    end
+
+    class ErrorHandler
+      def self.handle_exception e, response
+        response.body = {:message => e.message, :backtrace => e.backtrace }.to_json
+        response.code = 500
+      end
+    end
+
+    class JsonResource < Webmachine::Resource
+      def content_types_provided
+        [["application/json", :to_json]]
+      end
+
+      def content_types_accepted
+        [["application/json", :from_json]]
+      end
+
+      def handle_exception e
+        PactBroker::Resources::ErrorHandler.handle_exception(e, response)
+      end
+    end
+  end
+end

data/lib/pact_broker/resources/latest_pact.rb

@@ -0,0 +1,41 @@
+require 'webmachine'
+require 'json'
+
+require 'pact_broker/services'
+require 'pact_broker/resources/json_resource'
+
+module PactBroker
+
+  module Resources
+
+    class LatestPact < Webmachine::Resource
+
+      include PactBroker::Services
+      include PactBroker::Resources::PathInfo
+
+      def content_types_provided
+        [["application/json", :to_json]]
+      end
+
+      def allowed_methods
+        ["GET"]
+      end
+
+      def resource_exists?
+        @pact = pact_service.find_pact(identifier_from_path.merge(:consumer_version_number => 'last'))
+        @pact != nil
+      end
+
+      def to_json
+        response.headers['X-Pact-Consumer-Version'] = @pact.consumer_version_number
+        @pact.json_content
+      end
+
+      def handle_exception e
+        PactBroker::Resources::ErrorHandler.handle_exception(e, response)
+      end
+
+    end
+  end
+
+end

data/lib/pact_broker/resources/latest_pacts.rb

@@ -0,0 +1,49 @@
+require 'webmachine'
+require 'json'
+
+require 'pact_broker/services'
+require 'pact_broker/resources/json_resource'
+
+require 'pact_broker/api/representors/representable_pact'
+
+module PactBroker
+
+  module Resources
+
+    class LatestPacts < Webmachine::Resource
+
+      include PactBroker::Services
+
+      #FIX to hal+json
+      def content_types_provided
+        [["application/hal+json", :to_json]]
+      end
+
+      def allowed_methods
+        ["GET"]
+      end
+
+      def to_json
+        generate_json(pact_service.find_latest_pacts)
+      end
+
+      def generate_json pacts
+        pacts = pacts.collect{ | pact | create_representable_pact(pact) }
+        pacts.extend(PactBroker::Api::Representors::PactCollectionRepresenter)
+        pacts.to_json
+      end
+
+      def handle_exception e
+        PactBroker::Resources::ErrorHandler.handle_exception(e, response)
+      end
+
+      private
+
+      def create_representable_pact pact
+        PactBroker::Api::Representors::RepresentablePact.new(pact)
+      end
+
+    end
+  end
+
+end

data/lib/pact_broker/resources/pact.rb

@@ -0,0 +1,49 @@
+require 'webmachine'
+require 'json'
+require 'cgi'
+
+require 'pact_broker/services'
+require 'pact_broker/resources/json_resource'
+
+module PactBroker
+
+  module Resources
+
+    class Pact < JsonResource
+
+      include PactBroker::Services
+      include PactBroker::Resources::PathInfo
+
+      def allowed_methods
+        ["GET", "PUT"]
+      end
+
+      def resource_exists?
+        @pact = pact_service.find_pact(identifier_from_path)
+        @pact != nil
+      end
+
+      def from_json
+        pact, created = pact_service.create_or_update_pact(identifier_from_path.merge(:json_content => pact_content))
+        response.body = pact.json_content
+        @manual_response_code = 201 if created
+      end
+
+      def finish_request
+        if @manual_response_code
+          response.code = @manual_response_code
+        end
+      end
+
+      def to_json
+        @pact.json_content
+      end
+
+      def pact_content
+        request.body.to_s
+      end
+
+    end
+  end
+
+end

data/lib/pact_broker/resources/pacticipant.rb

@@ -0,0 +1,80 @@
+require 'webmachine'
+require 'json'
+require 'cgi'
+
+require 'pact_broker/services'
+require 'pact_broker/resources/json_resource'
+require 'pact_broker/api/representors'
+
+module PactBroker
+
+  module Resources
+
+    class Pacticipant < Webmachine::Resource
+
+      include PactBroker::Services
+      include PactBroker::Resources::PathInfo
+
+      def content_types_provided
+        [["application/hal+json", :to_json]]
+      end
+
+      def content_types_accepted
+        [["application/json", :from_json]]
+      end
+
+      def handle_exception e
+        PactBroker::Resources::ErrorHandler.handle_exception(e, response)
+      end
+
+      def allowed_methods
+        ["GET", "PATCH"]
+      end
+
+      def known_methods
+        super + ['PATCH']
+      end
+
+      def from_json
+        pacticipant, created = pacticipant_service.create_or_update_pacticipant(
+          name: identifier_from_path[:name],
+          repository_url: params[:repository_url]
+        )
+        @manual_response_code = 201 if created
+        response.body = generate_json(pacticipant)
+      end
+
+      def finish_request
+        if @manual_response_code
+          response.code = @manual_response_code
+        end
+      end
+
+      def resource_exists?
+        #Terrible hack to allow Webmachine to continue when a PATCH is used - does not seem to support it
+        if request.method == 'PATCH'
+          def request.method
+            'PUT'
+          end
+        end
+        @pacticipant = pacticipant_service.find_pacticipant_by_name(identifier_from_path[:name])
+        @pacticipant != nil
+      end
+
+      def to_json
+        generate_json(@pacticipant)
+      end
+
+      def generate_json pacticipant
+        pacticipant.extend(PactBroker::Api::Representors::PacticipantRepresenter)
+        pacticipant.to_json
+      end
+
+      def params
+        JSON.parse(request.body.to_s)
+      end
+
+    end
+  end
+
+end

data/lib/pact_broker/resources/pacticipants.rb

@@ -0,0 +1,41 @@
+require 'webmachine'
+require 'json'
+
+require 'pact_broker/services'
+require 'pact_broker/resources/json_resource'
+require 'pact_broker/api/representors'
+
+module PactBroker
+
+  module Resources
+
+    class Pacticipants < Webmachine::Resource
+
+      include PactBroker::Services
+      include PactBroker::Resources::PathInfo
+
+      def content_types_provided
+        [["application/hal+json", :to_json]]
+      end
+
+      def handle_exception e
+        PactBroker::Resources::ErrorHandler.handle_exception(e, response)
+      end
+
+      def allowed_methods
+        ["GET"]
+      end
+
+      def to_json
+        generate_json(pacticipant_service.find_all_pacticipants)
+      end
+
+      def generate_json pacticipants
+        pacticipants.extend(PactBroker::Api::Representors::PacticipantCollectionRepresenter)
+        pacticipants.to_json
+      end
+
+    end
+  end
+
+end

data/lib/pact_broker/services/pact_service.rb

@@ -10,25 +10,27 @@ module PactBroker
       extend PactBroker::Repositories
 
       def find_pact params
-        if params[:number] == 'last'
-          pact_repository.find_latest_version(params[:consumer], params[:provider])
+        if params[:consumer_version_number] == 'last'
+          pact_repository.find_latest_pact(params[:consumer_name], params[:provider_name])
         else
-          raise NotImplementedError
+          pact_repository.find_pact(params[:consumer_name], params[:consumer_version_number], params[:provider_name])
         end
       end
 
+      def find_latest_pacts
+        pact_repository.find_latest_pacts
+      end
+
       def create_or_update_pact params
-        provider = pacticipant_repository.find_by_name_or_create params[:provider]
-        consumer = pacticipant_repository.find_by_name_or_create params[:consumer]
-        version = version_repository.find_by_pacticipant_id_and_number_or_create consumer.id, params[:number]
+        provider = pacticipant_repository.find_by_name_or_create params[:provider_name]
+        consumer = pacticipant_repository.find_by_name_or_create params[:consumer_name]
+        version = version_repository.find_by_pacticipant_id_and_number_or_create consumer.id, params[:consumer_version_number]
 
         if pact = pact_repository.find_by_version_and_provider(version.id, provider.id)
-          http_status = 200
           pact.update(json_content: params[:json_content])
           return pact, false
         else
-          http_status = 201
-          pact_repository.create json_content: params[:json_content], version_id: version.id, provider_id: provider.id
+          pact = pact_repository.create json_content: params[:json_content], version_id: version.id, provider_id: provider.id
           return pact, true
         end
 

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/pact_broker.gemspec

@@ -22,12 +22,11 @@ Gem::Specification.new do |gem|
   #gem.add_runtime_dependency 'pact'
   gem.add_runtime_dependency 'httparty'
   gem.add_runtime_dependency 'json'
-  gem.add_runtime_dependency 'sinatra'
-  gem.add_runtime_dependency 'sinatra-contrib'
-  gem.add_runtime_dependency 'sinatra-param'
   gem.add_runtime_dependency 'roar'
   gem.add_runtime_dependency 'sequel'
   gem.add_runtime_dependency 'sqlite3'
+  gem.add_runtime_dependency 'webmachine'
+  gem.add_runtime_dependency 'versionomy'
 
   gem.add_development_dependency 'rake', '~> 10.0.3'
   gem.add_development_dependency 'pry'

data/spec/lib/pact_broker/api/representors/pact_collection_representor_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+require 'pact_broker/models'
+require 'pact_broker/api/representors'
+
+module PactBroker::Api::Representors
+
+  describe PactCollectionRepresenter do
+
+    let(:pact) do
+      provider = PactBroker::Models::Pacticipant.create(:name => 'Pricing Service')
+      consumer = PactBroker::Models::Pacticipant.create(:name => 'Condor')
+      version = PactBroker::Models::Version.create(:number => '1.3.0', :pacticipant => consumer)
+      pact = PactBroker::Models::Pact.create(:consumer_version => version, :provider => provider)
+      pact
+    end
+
+    xit "should description" do
+      puts [pact].extend(PactCollectionRepresenter).to_json
+    end
+  end
+
+end