pact_broker 1.0.0.alpha1 → 1.0.0.alpha2

data/public/rea.csv

@@ -0,0 +1,10 @@
+1,Media Projects,1,3158419,0,1,0,0,0,0,0,0,0,0,0
+2,Billee,1,3158419,0,2,0,0,0,0,0,0,0,0,0
+3,Media Billee Orchestrator,1,3158419,0,3,2,1,0,0,0,0,0,0,0
+4,Media Bill to Contact Sync,1,3158419,0,4,5,2,1,0,0,0,0,0,0
+5,Media Bill to Contact Changes,1,3158419,0,5,0,0,0,0,0,0,0,0,0
+6,Media Billing Account Sync,1,3158419,0,6,7,2,1,0,0,0,0,0,0
+7,Media Billing Account Changes,1,3158419,0,7,0,0,0,0,0,0,0,0,0
+8,Billee notifications,1,3158419,0,8,2,0,0,0,0,0,0,0,0
+9,Billee name notifications,1,3158419,0,9,10,0,0,0,0,0,0,0,0
+10,Media Project Changes,1,3158419,0,10,0,0,0,0,0,0,0,0,0

data/spec/lib/pact_broker/api/resources/latest_pact_spec.rb

@@ -19,17 +19,17 @@ module PactBroker::Api
           let(:json_content) { 'json_content' }
           let(:pact) { double("pact", json_content: json_content)}
           let(:html) { 'html' }
-          let(:pact_id_params) { {:provider_name=>"provider_name", :consumer_name=>"consumer_name", :consumer_version_number=>"latest"} }
+          let(:pact_id_params) { {:provider_name=>"provider_name", :consumer_name=>"consumer_name"} }
 
           before do
-            allow(PactBroker::Services::PactService).to receive(:find_pact).and_return(pact)
+            allow(PactBroker::Services::PactService).to receive(:find_latest_pact).and_return(pact)
             allow(PactBroker.configuration.html_pact_renderer).to receive(:call).and_return(html)
           end
 
-          subject { get "/pact/provider/provider_name/consumer/consumer_name/latest",{}, {'HTTP_ACCEPT' => "text/html"} }
+          subject { get "/pacts/provider/provider_name/consumer/consumer_name/latest",{}, {'HTTP_ACCEPT' => "text/html"} }
 
           it "find the pact" do
-            expect(PactBroker::Services::PactService).to receive(:find_pact).with(pact_id_params)
+            expect(PactBroker::Services::PactService).to receive(:find_latest_pact).with(pact_id_params)
             subject
           end
 

data/spec/lib/pact_broker/repositories/pact_repository_spec.rb

@@ -4,15 +4,41 @@ require 'spec/support/provider_state_builder'
 module PactBroker
   module Repositories
     describe PactRepository do
+
+      describe "find_latest_pact" do
+
+        context "with a tag" do
+          context "when a version with a pact exists with the given tag" do
+            before do
+              ProviderStateBuilder.new
+                .create_consumer("Consumer")
+                .create_consumer_version("2.3.4")
+                .create_provider("Provider")
+                .create_pact
+                .create_consumer_version("1.2.3")
+                .create_consumer_version_tag("prod")
+                .create_pact
+            end
+
+            let(:latest_prod_pact) { PactRepository.new.find_latest_pact("Consumer", "Provider", "prod") }
+
+            it "returns the pact for the latest tagged version" do
+              expect(latest_prod_pact.consumer_version.number).to eq("1.2.3")
+            end
+          end
+
+        end
+      end
+
       describe "find_latest_pacts" do
         before do
           ProviderStateBuilder.new
             .create_condor
             .create_condor_version('1.3.0')
             .create_pricing_service
-            .create_pact
+            .create_condor_pricing_service_pact
             .create_condor_version('1.4.0')
-            .create_pact
+            .create_condor_pricing_service_pact
             .create_contract_email_service
             .create_contract_email_service_version('2.6.0')
             .create_contract_proposal_service

data/spec/lib/pact_broker/ui/controllers/relationships_spec.rb

@@ -26,7 +26,8 @@ module PactBroker
 
             it "does something" do
               get "/"
-              puts last_response.body
+              expect(last_response.body).to include("Relationships")
+              expect(last_response.status).to eq(200)
             end
 
           end

data/spec/lib/pact_broker/ui/view_models/relationship_spec.rb

@@ -14,7 +14,7 @@ module PactBroker
 
         its(:consumer_name) { should eq 'consumer_name'}
         its(:provider_name) { should eq 'provider_name'}
-        its(:latest_pact_url) { should eq "/pact/provider/provider_name/consumer/consumer_name/latest" }
+        its(:latest_pact_url) { should eq "/pacts/provider/provider_name/consumer/consumer_name/latest" }
 
         describe "<=>" do
 

data/spec/service_consumers/pact_helper.rb

@@ -21,7 +21,7 @@ Pact.service_provider "Pact Broker" do
   end
 
   # honours_pact_with "Pact Broker Client", :ref => :head do
-  #   pact_uri URI.encode("http://rea-pact-broker.biq.vpc.realestate.com.au/pact/provider/Pact Broker/consumer/Pact Broker Client/latest")
+  #   pact_uri URI.encode("http://rea-pact-broker.biq.vpc.realestate.com.au/pacts/provider/Pact Broker/consumer/Pact Broker Client/latest")
   # end
 
 end

data/spec/service_consumers/provider_states_for_pact_broker_client.rb

@@ -24,7 +24,7 @@ Pact.provider_states_for "Pact Broker Client" do
         .create_condor
         .create_condor_version('1.3.0')
         .create_pricing_service
-        .create_pact
+        .create_condor_pricing_service_pact
     end
   end
 
@@ -38,7 +38,7 @@ Pact.provider_states_for "Pact Broker Client" do
         .create_condor
         .create_condor_version('1.3.0')
         .create_pricing_service
-        .create_pact
+        .create_condor_pricing_service_pact
     end
   end
 
@@ -69,17 +69,22 @@ Pact.provider_states_for "Pact Broker Client" do
 
    provider_state "a pact between Condor and the Pricing Service exists for the production version of Condor" do
      set_up do
-       # Your set up code goes here
+      ProviderStateBuilder.new
+        .create_consumer("Condor")
+        .create_consumer_version('1.3.0')
+        .create_consumer_version_tag('prod')
+        .create_provider("Pricing Service")
+        .create_pact
      end
    end
 
-   provider_state "a version with production details exists for the Pricing Service" do
+   provider_state "a pacticipant version with production details exists for the Pricing Service" do
      set_up do
        # Your set up code goes here
      end
    end
 
-   provider_state "no version exists for the Pricing Service" do
+   provider_state "no pacticipant version exists for the Pricing Service" do
      no_op
    end
 end

data/spec/spec_helper.rb

@@ -9,6 +9,9 @@ require './spec/support/provider_state_builder'
 require 'pact_broker/api'
 require 'rspec/fire'
 
+YAML::ENGINE.yamler = 'psych'
+I18n.config.enforce_available_locales = false
+
 def load_fixture(file_name)
   File.read(File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', file_name)))
 end

data/spec/support/provider_state_builder.rb

@@ -50,7 +50,7 @@ class ProviderStateBuilder
     self
   end
 
-  def create_pact
+  def create_condor_pricing_service_pact
     @pact_id = pact_repository.create(version_id: @condor_version_id, provider_id: @pricing_service_id, json_content: json_content).id
     self
   end
@@ -77,16 +77,43 @@ class ProviderStateBuilder
     self
   end
 
+  def create_consumer consumer_name
+    create_pacticipant consumer_name
+    @consumer = @pacticipant
+    self
+  end
+
+  def create_provider provider_name
+    create_pacticipant provider_name
+    @provider = @pacticipant
+    self
+  end
+
   def create_version version_number
     @version = PactBroker::Models::Version.create(:number => version_number, :pacticipant => @pacticipant)
     self
   end
 
+  def create_consumer_version version_number
+    @consumer_version = PactBroker::Models::Version.create(:number => version_number, :pacticipant => @consumer)
+    self
+  end
+
   def create_tag tag_name
     @tag = PactBroker::Models::Tag.create(name: tag_name, version: @version)
     self
   end
 
+  def create_consumer_version_tag tag_name
+    @tag = PactBroker::Models::Tag.create(name: tag_name, version: @consumer_version)
+    self
+  end
+
+  def create_pact
+    @pact = PactBroker::Models::Pact.create(consumer_version: @consumer_version, provider: @provider, json_content: json_content)
+    self
+  end
+
   private
 
   # def create_pacticipant name
@@ -97,7 +124,7 @@ class ProviderStateBuilder
   #   version_repository.create(number: number, pacticipant: pacticipant)
   # end
 
-  # def create_pact version, provider
+  # def create_condor_pricing_service_pact version, provider
   #   pact_repository.create(consumer_version: version, provider: provider, json_content: json_content)
   # end
 

data/tasks/pact.rake

@@ -5,7 +5,7 @@ Pact::VerificationTask.new(:dev) do | pact |
 end
 
 namespace :pact do
-  #task :prepare => [:overwrite_rack_env, 'db:recreate']
+  task :prepare => ['db:set_test_env', 'db:prepare:test']
   task :verify => :prepare
   task 'verify:at' => :prepare
   task 'verify:dev' => :prepare

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha1
-  prerelease: 6
+  version: 1.0.0.alpha2
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -11,140 +10,123 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-09 00:00:00.000000000 Z
+date: 2014-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
   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: json
   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: 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
-    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: sqlite3
   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: webmachine
   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: versionomy
   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: rack
   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: redcarpet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -152,7 +134,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -160,7 +141,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pact
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -168,7 +148,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -176,55 +155,48 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.29
+        version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.29
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: haml
   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: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -232,7 +204,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -240,7 +211,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -248,7 +218,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -256,7 +225,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-fire
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -264,7 +232,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -272,7 +239,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -280,11 +246,24 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.15
+- !ruby/object:Gem::Dependency
+  name: pact
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
 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:
@@ -316,6 +295,7 @@ files:
 - db/migrations/03_create_pacts_table.rb
 - db/migrations/04_create_tags_table.rb
 - db/migrations/05_add_order_column_to_version.rb
+- db/migrations/06_make_version_foreign_key_mandatory.rb
 - db/pact_broker_database.sqlite3
 - example/Gemfile
 - example/config.ru
@@ -383,12 +363,16 @@ files:
 - lib/rack/hal_browser/redirect.rb
 - pact_broker.gemspec
 - pact_broker_client-pact_broker.json
+- public/Network Graph REA.html
+- public/Network Graph_files/d3.v3.js
+- public/Network Graph_files/ga.js
 - public/bootstrap.zip
 - public/config.json
 - public/css/bootstrap-theme.css
 - public/css/bootstrap-theme.min.css
 - public/css/bootstrap.css
 - public/css/bootstrap.min.css
+- public/d3.v3.js.pagespeed.ce.dFNRrGTALe.js
 - public/fonts/glyphicons-halflings-regular.eot
 - public/fonts/glyphicons-halflings-regular.svg
 - public/fonts/glyphicons-halflings-regular.ttf
@@ -398,6 +382,7 @@ files:
 - public/javascripts/jquery.tablesorter.min.js
 - public/js/bootstrap.js
 - public/js/bootstrap.min.js
+- public/rea.csv
 - public/stylesheets/github.css
 - public/stylesheets/relationships.css
 - script/update-hal-browser
@@ -466,30 +451,26 @@ files:
 homepage: https://github.com/DiUS/pact_broker
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3233276074341714439
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>'
+  - - '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: See description
 test_files:
 - spec/fixtures/renderer_pact.json