pact_broker 0.0.1 → 0.0.2

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    pact_broker (0.0.1)
+    pact_broker (0.0.2)
       httparty
       json
+      roar
       sequel
       sinatra
       sinatra-contrib
@@ -49,8 +50,11 @@ GEM
       multi_xml (>= 0.5.2)
     json (1.8.1)
     method_source (0.8.2)
+    mini_portile (0.5.1)
     multi_json (1.8.2)
     multi_xml (0.5.5)
+    nokogiri (1.6.0)
+      mini_portile (~> 0.5.0)
     pry (0.9.12.2)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
@@ -62,6 +66,11 @@ GEM
       rack (>= 1.0)
     rake (10.0.4)
     randexp (0.1.7)
+    representable (1.6.1)
+      multi_json
+      nokogiri
+    roar (0.12.0)
+      representable (~> 1.6.0)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)

data/README.md

@@ -1,94 +1,3 @@
-# PactBroker
+# Pact Broker
 
-Add a detailed description of the new service here before your first commit.
-
-Information here will be consumed by the Treasure Map (via the Rumour Mill). Therefore, please retain the existing formatting on this page, importantly:
-
-* The service name at the top of the page
-* The location of this description text (between service name and Custodian(s)
-* Component Custodian(s)
-
-Other headings can be deleted if they are not relevant.
-
-**NOTE: The following is provided for convenience. Please check it carefully before your first commit.**
-
-## Component Custodian(s)
-
-Enter Custodian(s) here
-
-## Development
-
-Enter any developer instructions here.
-
-### Database setup
-
-Instructions to set up the database for local testing.
-
-Then run migrations:
-
-  $ bundle exec rake db:migrate
-
-### Testing
-
-  $ bundle exec rake
-
-### Running
-
-Instructions to run the service locally.
-
-### Debugging
-
-Any specific debugging tools built in to the service (health check is assumed so don't include that).
-
-### Build
-
-**edit the below and add the correct endpoint**
-
-[Standalone (Bamboo)](http://master.cd.vpc.realestate.com.au/browse/YOUR_NEW_SERVICE_BUILD)
-
-## Deployment
-
-Deployment scripts have been generated using [biq-deploy](https://git.realestate.com.au/business-systems/biq-deploy).
-
-#### EC2 environments
-
-Before deploying to EC2 environments, you may wish to check that the build you wish to deploy has been indexed.
-
-1. Log in into the agent unix box:
-
-  $ rea-ec2-ssh agent-01.biq
-
-2. See the list of versions indexed and verify the expected version in the list:
-
-  $ yum list --showduplicates --enablerepo=rea-el6-dev pact_broker
-
-You can get up an running with these scripts like so (from within the pact_broker project on your local machine):
-
-  $ cd deploy
-  $ bundle
-  $ bundle exec bin/pact-broker-deploy-ec2 --help
-
-When deploying to an EC2 environment for the first time, you must create a node for the app:
-
-  $ bundle exec bin/pact-broker-deploy-ec2 -t create -s $YOUR_SUBDOMAIN -p dev
-
-The first time the service is deployed, a database must be created. After adding the [required config values](https://git.realestate.com.au/business-systems/pact_broker/blob/master/lib/pact_broker/environment_variables.rb) to the
-environment's config-svc, you can run the db provision task:
-
-  $ bundle exec bin/pact-broker-deploy-ec2 -t db_provision -s $YOUR_SUBDOMAIN
-
-Then you are free to migrate the db from then on:
-
-  $ bundle exec bin/pact-broker-deploy-ec2 -t db_migrate -s $YOUR_SUBDOMAIN
-
-To deploy to a test environment (eg biq-qa1):
-
-        $ bundle exec bin/pact-broker-deploy-ec2 -t deploy -s biq-qa1 -p dev -y
-
-#### Production
-
-Refer to the [production deployment readme](https://git.realestate.com.au/business-systems/pact_broker/blob/master/README-ProdDeploy.md).
-
-### Architecture
-
-Any important architectural information.
+The Pact Broker provides a repository for pacts created using the pact gem.

data/lib/pact_broker/api/pacticipant_api.rb

@@ -1,13 +1,31 @@
 require_relative 'base_api'
+require_relative 'representors'
 
 module PactBroker
-
   module Api
 
-
     class PacticipantApi < BaseApi
 
+      get "/pacticipants" do
+        pacticipants = pacticipant_service.find_all_pacticipants
+        pacticipants.extend(Representors::PacticipantCollectionRepresenter)
+        content_type 'application/json+hal;charset=utf-8'
+        pacticipants.to_json
+      end
+
       namespace '/pacticipants' do
+
+        get '/:name' do
+          pacticipant = pacticipant_service.find_pacticipant_by_name(params[:name])
+          if pacticipant
+            pacticipant.extend(Representors::PacticipantRepresenter)
+            content_type 'application/json+hal;charset=utf-8'
+            pacticipant.to_json
+          else
+            status 404
+          end
+        end
+
         get '/:name/repository_url' do
           repository_url = pacticipant_service.find_pacticipant_repository_url_by_pacticipant_name(params[:name])
           if repository_url
@@ -25,7 +43,9 @@ module PactBroker
             repository_url: params[:repository_url]
           )
           created ? status(201) : status(200)
-          json pacticipant
+          pacticipant.extend(Representors::PacticipantRepresenter)
+          content_type 'application/json+hal;charset=utf-8'
+          pacticipant.to_json
         end
       end
 

data/lib/pact_broker/api/representors.rb

@@ -0,0 +1,3 @@
+require 'pact_broker/api/representors/pacticipant_representor'
+require 'pact_broker/api/representors/pacticipant_collection_representor'
+require 'pact_broker/api/representors/version_representor'

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

@@ -0,0 +1,34 @@
+module PactBroker
+  module Api
+    module PactBrokerUrls
+
+      def base_url
+        "http://localhost:1234"
+      end
+
+      def pacticipants_url
+        "#{base_url}/pacticipants"
+      end
+
+      def pacticipant_url pacticipant
+        "#{pacticipants_url}/#{url_encode(pacticipant.name)}"
+      end
+
+      def last_version_url pacticipant
+        "#{pacticipant_url(pacticipant)}/versions/last"
+      end
+
+      def versions_url pacticipant
+        "#{pacticipant_url(pacticipant)}/versions"
+      end
+
+      def version_url version
+        "#{pacticipant_url(version.pacticipant)}/versions/#{version.number}"
+      end
+
+      def url_encode param
+        ERB::Util.url_encode param
+      end
+    end
+  end
+end

data/lib/pact_broker/api/representors/pacticipant_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/pacticipant_representor.rb

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

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

@@ -0,0 +1,19 @@
+require 'roar/representer/json/hal'
+require_relative 'pact_broker_urls'
+
+module PactBroker
+  module Api
+    module Representors
+      module VersionRepresenter
+        include Roar::Representer::JSON::HAL
+        include Roar::Representer::JSON::HAL::Links
+        include PactBroker::Api::PactBrokerUrls
+        property :number
+
+        link :self do
+          version_url(self)
+        end
+      end
+    end
+  end
+end

data/lib/pact_broker/models/pact.rb

@@ -5,6 +5,9 @@ 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)
+
       #Need to work out how to do this properly!
       def consumer_version_number
         values[:consumer_version_number]

data/lib/pact_broker/models/pacticipant.rb

@@ -6,7 +6,12 @@ module PactBroker
 
     class Pacticipant < Sequel::Model
 
-      one_to_many :versions
+      one_to_many :versions, :order => :id, :reciprocal => :pacticipant
+      one_to_many :pacts
+
+      def last_version
+        versions.last
+      end
 
       def to_s
         "Pacticipant: id=#{id}, name=#{name}"

data/lib/pact_broker/models/version.rb

@@ -7,6 +7,7 @@ module PactBroker
     class Version < Sequel::Model
 
       one_to_many :pacts
+      one_to_one :pacticipant
 
       def to_s
         "Version: number=#{number}, pacticipant=#{pacticipant_id}"

data/lib/pact_broker/repositories/pacticipant_repository.rb

@@ -9,6 +9,10 @@ module PactBroker
         PactBroker::Models::Pacticipant.where(name: name).single_record
       end
 
+      def find_all
+        PactBroker::Models::Pacticipant.order(:name).all
+      end
+
       def find_by_name_or_create name
         if pacticipant = find_by_name(name)
           pacticipant

data/lib/pact_broker/services/pacticipant_service.rb

@@ -7,6 +7,14 @@ module PactBroker
 
       extend PactBroker::Repositories
 
+      def self.find_all_pacticipants
+        pacticipant_repository.find_all
+      end
+
+      def self.find_pacticipant_by_name name
+        pacticipant_repository.find_by_name(name)
+      end
+
       def self.find_pacticipant_repository_url_by_pacticipant_name name
         pacticipant = pacticipant_repository.find_by_name(name)
         if pacticipant && pacticipant.repository_url

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/pact_broker.gemspec

@@ -7,11 +7,11 @@ require 'pact_broker/version'
 Gem::Specification.new do |gem|
   gem.name          = "pact_broker"
   gem.version       = PactBroker::VERSION
-  gem.authors       = ["Bethany Skurrie"]
-  gem.email         = ["bskurrie@dius.com.au"]
-  gem.description   = %q{An server that stores and returns pact files generated by the pact gem. It enables head/prod cross testing of the consumer and provider projects.}
+  gem.authors       = ["Bethany Skurrie", "Sergei Matheson", "Warner Godfrey"]
+  gem.email         = ["bskurrie@dius.com.au", "serge.matheson@rea-group.com", "warner@warnergodfrey.com"]
+  gem.description   = %q{A server that stores and returns pact files generated by the pact gem. It enables head/prod cross testing of the consumer and provider projects.}
   gem.summary       = %q{See description}
-  gem.homepage      = "https://github.com/bethesque/pact_broker.git"
+  gem.homepage      = "https://github.com/DiUS/pact_broker"
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -25,6 +25,7 @@ Gem::Specification.new do |gem|
   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'
 

data/spec/service_consumers/pact_helper.rb

@@ -32,8 +32,7 @@ Pact.service_provider "Pact Broker" do
   app { PactBroker::API.new }
 
   honours_pact_with "Pact Broker Client" do
-    pact_uri "http://localhost:9292/pacticipants/Pact%20Broker%20Client/versions/last/pacts/Pact%20Broker"
-    # pact_uri "../pact_broker-client/spec/pacts/pact_broker_client-pact_broker.json"
+    pact_uri "../pact_broker-client/spec/pacts/pact_broker_client-pact_broker.json"
   end
 
 end

data/spec/service_consumers/provider_states_for_pact_broker_client.rb

@@ -5,7 +5,7 @@ class ProviderStateBuilder
   include PactBroker::Repositories
 
   def create_pricing_service
-    @pricing_service_id = pacticipant_repository.create(:name => 'Pricing Service', :repository_url => 'git@git.realestate.com.au:business-systems/condor.git').save(raise_on_save_failure: true).id
+    @pricing_service_id = pacticipant_repository.create(:name => 'Pricing Service', :repository_url => 'git@git.realestate.com.au:business-systems/pricing-service').save(raise_on_save_failure: true).id
     self
   end
 
@@ -19,6 +19,11 @@ class ProviderStateBuilder
     self
   end
 
+  def create_pricing_service_version number
+    @pricing_service_version_id = version_repository.create(number: number, pacticipant_id: @pricing_service_id).id
+    self
+  end
+
   def create_pact
     @pact_id = pact_repository.create(version_id: @condor_version_id, provider_id: @pricing_service_id, json_content: json_content).id
     self
@@ -50,7 +55,7 @@ Pact.provider_states_for "Pact Broker Client" do
 
   provider_state "the 'Pricing Service' already exists in the pact-broker" do
     set_up do
-      ProviderStateBuilder.new.create_pricing_service
+      ProviderStateBuilder.new.create_pricing_service.create_pricing_service_version("1.3.0")
     end
   end
 
@@ -92,7 +97,7 @@ Pact.provider_states_for "Pact Broker Client" do
 
   provider_state "'Condor' exists in the pact-broker" do
     set_up do
-      ProviderStateBuilder.new.create_condor
+      ProviderStateBuilder.new.create_condor.create_condor_version('1.3.0')
     end
   end
 

data/tasks/db.rake

@@ -15,6 +15,7 @@ namespace :db do
     require 'yaml'
     puts "Removing database #{db_file}"
     FileUtils.rm_f db_file
+    FileUtils.mkdir_p File.dirname(db_file)
   end
 
   def db_file

metadata

@@ -1,15 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
 - Bethany Skurrie
+- Sergei Matheson
+- Warner Godfrey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-03 00:00:00.000000000 Z
+date: 2013-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -91,6 +93,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: roar
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -251,10 +269,12 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: An server that stores and returns pact files generated by the pact gem.
+description: A server that stores and returns pact files generated by the pact gem.
   It enables head/prod cross testing of the consumer and provider projects.
 email:
 - bskurrie@dius.com.au
+- serge.matheson@rea-group.com
+- warner@warnergodfrey.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -280,6 +300,11 @@ files:
 - lib/pact_broker/api/index_api.rb
 - lib/pact_broker/api/pact_api.rb
 - lib/pact_broker/api/pacticipant_api.rb
+- lib/pact_broker/api/representors.rb
+- lib/pact_broker/api/representors/pact_broker_urls.rb
+- lib/pact_broker/api/representors/pacticipant_collection_representor.rb
+- lib/pact_broker/api/representors/pacticipant_representor.rb
+- lib/pact_broker/api/representors/version_representor.rb
 - lib/pact_broker/db.rb
 - lib/pact_broker/logging.rb
 - lib/pact_broker/models.rb
@@ -306,7 +331,7 @@ files:
 - tasks/db.rake
 - tasks/pact.rake
 - tasks/rspec.rake
-homepage: https://github.com/bethesque/pact_broker.git
+homepage: https://github.com/DiUS/pact_broker
 licenses:
 - MIT
 post_install_message: 
@@ -321,7 +346,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3453264579603755980
+      hash: -4491978602397448326
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -330,7 +355,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3453264579603755980
+      hash: -4491978602397448326
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23