pact_broker 0.0.4 → 0.0.5

data/CHANGELOG.md

@@ -2,6 +2,20 @@ Do this to generate your change history
 
     $ git log --date=relative --pretty=format:'  * %h - %s (%an, %ad)' 'package/pact-broker-0.0.PRODVERSION'..'package/pact-broker-0.0.NEWVERSION'
 
-#### 0.0.NEWVERSION (YYYY-MM-DD HH:00)
+#### 0.0.5 (2013-11-13)
 
-* Your changes go here
+* 2cf987c - Added data migration to script which adds order column (Beth, 56 minutes ago)
+* 9c709a9 - Changing queries to use new order column. (Beth, 61 minutes ago)
+* 173f231 - Renaming var (Beth, 65 minutes ago)
+* f9be93d - Renamed SortVersions to OrderVersions (Beth, 66 minutes ago)
+* ca6e479 - Added SortVersions as an after version save hook (Beth, 69 minutes ago)
+* 23cd1a3 - Adding order column to version table (Beth, 11 hours ago)
+* c504e5f - Fixing application/json+hal to application/hal+json (Beth, 2 days ago)
+* 1d24b9b - Removing old sinatra API (Beth, 2 days ago)
+* fd1832c - WIP. Converting to use Webmachine (Beth, 2 days ago)
+* 0b096a4 - Redoing the the URLs yet again (Beth, 3 days ago)
+* 0934d89 - Implementing list latest pacts (Beth, 3 days ago)
+* ed2d354 - Changed one_to_one associations to many_to_one (Beth, 4 days ago)
+* 28de0ea - WIP implementing pacts/latest. (Beth, 6 days ago)
+* 1cd36e6 - Changing to new /pacts/latest URL format (Beth, 6 days ago)
+* 54f8fc3 - Writing underlying code to find the latest pact for each consumer/provider pair. (Beth, 6 days ago)

data/Gemfile.lock

@@ -1,21 +1,21 @@
 PATH
   remote: .
   specs:
-    pact_broker (0.0.4)
+    pact_broker (0.0.5)
       httparty
       json
       roar
       sequel
-      sinatra
-      sinatra-contrib
-      sinatra-param
       sqlite3
+      versionomy
+      webmachine
 
 GEM
   remote: https://rubygems.org/
   specs:
+    as-notifications (1.0.1)
     awesome_print (1.1.0)
-    backports (3.3.5)
+    blockenspiel (0.4.5)
     builder (3.2.2)
     ci_reporter (1.9.0)
       builder (>= 2.1.2)
@@ -35,6 +35,7 @@ GEM
     httparty (0.12.0)
       json (~> 1.8)
       multi_xml (>= 0.5.2)
+    i18n (0.6.5)
     json (1.8.1)
     method_source (0.8.2)
     mini_portile (0.5.2)
@@ -56,8 +57,6 @@ GEM
       method_source (~> 0.8)
       slop (~> 3.4)
     rack (1.5.2)
-    rack-protection (1.5.1)
-      rack
     rack-test (0.6.2)
       rack (>= 1.0)
     rake (10.0.4)
@@ -84,19 +83,6 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
-    sinatra (1.4.4)
-      rack (~> 1.4)
-      rack-protection (~> 1.4)
-      tilt (~> 1.3, >= 1.3.4)
-    sinatra-contrib (1.4.1)
-      backports (>= 2.0)
-      multi_json
-      rack-protection
-      rack-test
-      sinatra (~> 1.4.0)
-      tilt (~> 1.3)
-    sinatra-param (1.0.0)
-      sinatra (~> 1.3)
     slop (3.4.6)
     sqlite3 (1.3.8)
     thin (1.6.1)
@@ -104,7 +90,12 @@ GEM
       eventmachine (>= 1.0.0)
       rack (>= 1.0.0)
     thor (0.18.1)
-    tilt (1.4.1)
+    versionomy (0.4.4)
+      blockenspiel (>= 0.4.5)
+    webmachine (1.2.1)
+      as-notifications (~> 1.0)
+      i18n (>= 0.4.0)
+      multi_json
 
 PLATFORMS
   ruby

data/config.ru

@@ -1,10 +1,11 @@
 require File.dirname(__FILE__) + '/config/boot'
 require 'pact_broker/db'
 require 'pact_broker/api'
+require 'pact_broker/resources/pact'
 
 
 use Rack::Static, root: 'public', urls: ['/favicon.ico']
 
 run Rack::URLMap.new(
-  '/' => PactBroker::API,
+  '/' => PactBroker::API
 )

data/db/migrations/05_add_order_column_to_version.rb

@@ -0,0 +1,7 @@
+Sequel.migration do
+  change do
+    add_column(:versions, :order, Integer)
+    self[:versions].update(:order => :id)
+  end
+end
+

data/lib/pact_broker/api.rb

@@ -1,18 +1,30 @@
-require 'sinatra'
+require 'pact_broker/resources/pact'
+require 'pact_broker/resources/latest_pact'
+require 'pact_broker/resources/latest_pacts'
+require 'pact_broker/resources/pacticipant'
+require 'pact_broker/resources/pacticipants'
 
-require_relative 'api/index_api'
-require_relative 'api/pacticipant_api'
-require_relative 'api/pact_api'
+require 'webmachine/adapters/rack'
 
 module PactBroker
-  class API < Sinatra::Base
-#    content_type :json, 'application/json'
-#    content_type :xml, 'text/xml'
-#    default_format :json
 
-    use Api::IndexApi
-    use Api::PacticipantApi
-    use Api::PactApi
+  API ||= begin
+    pact_api = Webmachine::Application.new do |app|
+      app.routes do
+        add(['trace', '*'], Webmachine::Trace::TraceResource) unless ENV['RACK_ENV'] == 'production'
+        add ['pact', 'provider', :provider_name, 'consumer', :consumer_name, 'version', :consumer_version_number], Resources::Pact
+        add ['pact', 'provider', :provider_name, 'consumer', :consumer_name, 'latest'], Resources::LatestPact
+        add ['pacts', 'latest'], Resources::LatestPacts
+        add ['pacticipants'], Resources::Pacticipants
+        add ['pacticipants', :name], Resources::Pacticipant
+      end
+    end
 
+    pact_api.configure do |config|
+      config.adapter = :Rack
+    end
+
+    pact_api.adapter
   end
+
 end

data/lib/pact_broker/api/representors.rb

@@ -1,3 +1,6 @@
 require 'pact_broker/api/representors/pacticipant_representor'
 require 'pact_broker/api/representors/pacticipant_collection_representor'
-require 'pact_broker/api/representors/version_representor'
+require 'pact_broker/api/representors/version_representor'
+require 'pact_broker/api/representors/pact_collection_representor'
+require 'pact_broker/api/representors/pact_pacticipant_representor'
+require 'pact_broker/api/representors/pact_representor'

data/lib/pact_broker/api/representors/pact_broker_urls.rb

@@ -26,6 +26,14 @@ module PactBroker
         "#{pacticipant_url(version.pacticipant)}/versions/#{version.number}"
       end
 
+      def pact_url pact
+        "#{version_url(pact.consumer_version)}/pacts/#{url_encode(pact.provider.name)}"
+      end
+
+      def latest_pacts_url
+        "#{base_url}/pacts/latest"
+      end
+
       def url_encode param
         ERB::Util.url_encode param
       end

data/lib/pact_broker/api/representors/pact_collection_representor.rb

@@ -0,0 +1,34 @@
+require 'roar/representer/json/hal'
+require_relative 'pact_broker_urls'
+require_relative 'version_representor'
+require_relative 'pact_representor'
+
+module PactBroker
+
+  module Api
+
+    module Representors
+
+      module PactCollectionRepresenter
+        include Roar::Representer::JSON::HAL
+        include PactBroker::Api::PactBrokerUrls
+
+
+        collection :pacts, :class => PactBroker::Models::Pact, :extend => PactBroker::Api::Representors::PactRepresenter
+
+        def pacts
+          self
+        end
+
+        link :self do
+          latest_pacts_url
+        end
+
+        links :pacts do
+          collect{ | pact | {:href => pact_url(pact) } }
+        end
+
+      end
+    end
+  end
+end

data/lib/pact_broker/api/representors/pact_pacticipant_representor.rb

@@ -0,0 +1,27 @@
+require 'roar/representer/json/hal'
+require_relative 'pact_broker_urls'
+require_relative 'version_representor'
+
+module PactBroker
+
+  module Api
+
+    module Representors
+
+      module PactPacticipantRepresenter
+        include Roar::Representer::JSON::HAL
+        include Roar::Representer::JSON::HAL::Links
+        include PactBroker::Api::PactBrokerUrls
+
+        property :name
+        property :repository_url
+        property :version, :class => "PactBroker::Models::Version", :extend => PactBroker::Api::Representors::VersionRepresenter, :embedded => true
+
+        link :self do
+          pacticipant_url(self)
+        end
+
+      end
+    end
+  end
+end

data/lib/pact_broker/api/representors/pact_representor.rb

@@ -0,0 +1,27 @@
+require 'roar/representer/json/hal'
+require_relative 'pact_broker_urls'
+require_relative 'pact_pacticipant_representor'
+
+module PactBroker
+
+  module Api
+
+    module Representors
+
+      module PactRepresenter
+        include Roar::Representer::JSON::HAL
+        include Roar::Representer::JSON::HAL::Links
+        include PactBroker::Api::PactBrokerUrls
+
+
+        property :consumer, :extend => PactBroker::Api::Representors::PactPacticipantRepresenter, :embedded => true
+        property :provider, :extend => PactBroker::Api::Representors::PactPacticipantRepresenter, :embedded => true
+
+        link :self do
+          pact_url(self)
+        end
+
+      end
+    end
+  end
+end

data/lib/pact_broker/api/representors/pacticipant_collection_representor.rb

@@ -2,6 +2,26 @@ require 'roar/representer/json/hal'
 require_relative 'pact_broker_urls'
 require_relative 'version_representor'
 
+module Roar
+  module Representer
+    module Feature
+
+      module Hypermedia
+
+        #Monkey patch alert! Get "no method rel for Nil" when there is an empty array
+        #in links. Cannot reproduce this in the roar tests :(
+        alias_method :original_compile_links_for, :compile_links_for
+
+        def compile_links_for configs, *args
+          original_compile_links_for(configs, *args).select(&:any?)
+        end
+
+      end
+    end
+  end
+end
+
+
 module PactBroker
 
   module Api

data/lib/pact_broker/api/representors/pacticipant_empty_collection_representor.rb

@@ -0,0 +1,33 @@
+require 'roar/representer/json/hal'
+require_relative 'pact_broker_urls'
+require_relative 'version_representor'
+
+module PactBroker
+
+  module Api
+
+    module Representors
+
+      module PacticipantCollectionRepresenter
+        include Roar::Representer::JSON::HAL
+        include PactBroker::Api::PactBrokerUrls
+
+
+        collection :pacticipants, :class => PactBroker::Models::Pacticipant, :extend => PactBroker::Api::Representors::PacticipantRepresenter
+
+        def pacticipants
+          self
+        end
+
+        link :self do
+          pacticipants_url
+        end
+
+        links :pacticipants do
+          collect{ | pacticipant | {:href => pacticipant_url(pacticipant), :name => pacticipant.name } }
+        end
+
+      end
+    end
+  end
+end

data/lib/pact_broker/api/representors/representable_pact.rb

@@ -0,0 +1,19 @@
+require 'ostruct'
+
+module PactBroker
+  module Api
+    module Representors
+      class RepresentablePact
+
+        attr_reader :consumer, :provider, :consumer_version
+
+        def initialize pact
+          @consumer_version = pact.consumer_version
+          @consumer = OpenStruct.new(:version => @consumer_version, :name => pact.consumer.name)
+          @provider = OpenStruct.new(:version => nil, :name => pact.provider.name)
+        end
+
+      end
+    end
+  end
+end

data/lib/pact_broker/api/representors/version_representor.rb

@@ -8,6 +8,7 @@ module PactBroker
         include Roar::Representer::JSON::HAL
         include Roar::Representer::JSON::HAL::Links
         include PactBroker::Api::PactBrokerUrls
+
         property :number
 
         link :self do

data/lib/pact_broker/models/order_versions.rb

@@ -0,0 +1,33 @@
+require 'versionomy'
+
+module PactBroker
+  module Models
+    class OrderVersions
+
+      def self.call pacticipant_id
+        orderable_versions = PactBroker::Models::Version.where(:pacticipant_id => pacticipant_id).all.collect{| version | OrderableVersion.new(version) }
+        orderable_versions.sort.each_with_index{ | version, i | version.update_model(i) }
+      end
+
+      class OrderableVersion
+
+        attr_accessor :version_model, :sortable_number
+
+        def initialize version_model
+          @version_model = version_model
+          @sortable_number = Versionomy.parse(version_model.number)
+        end
+
+        def <=> other
+          self.sortable_number <=> other.sortable_number
+        end
+
+        def update_model new_order
+          # Sequel will only run the update if the column value has changed, so in 99% of
+          # cases, only one update will occur.
+          version_model.update(:order => new_order)
+        end
+      end
+    end
+  end
+end

data/lib/pact_broker/models/pact.rb

@@ -5,14 +5,19 @@ module PactBroker
   module Models
     class Pact < Sequel::Model
 
-      associate(:one_to_one, :provider, :class => "PactBroker::Models::Pacticipant", :key => :id, :primary_key => :provider_id)
-      associate(:one_to_one, :consumer_version, :class => "PactBroker::Models::Version", :key => :id, :primary_key => :version_id)
+      set_primary_key :id
+      associate(:many_to_one, :provider, :class => "PactBroker::Models::Pacticipant", :key => :provider_id, :primary_key => :id)
+      associate(:many_to_one, :consumer_version, :class => "PactBroker::Models::Version", :key => :version_id, :primary_key => :id)
 
       #Need to work out how to do this properly!
       def consumer_version_number
         values[:consumer_version_number]
       end
 
+      def consumer
+        consumer_version.pacticipant
+      end
+
       def to_s
         "Pact: provider_id=#{provider_id}"
       end

data/lib/pact_broker/models/pacticipant.rb

@@ -6,7 +6,9 @@ module PactBroker
 
     class Pacticipant < Sequel::Model
 
-      one_to_many :versions, :order => :id, :reciprocal => :pacticipant
+      set_primary_key :id
+
+      one_to_many :versions, :order => :order, :reciprocal => :pacticipant
       one_to_many :pacts
 
       def last_version