pact_broker 0.0.8 → 0.0.9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pact_broker (0.0.8)
+    pact_broker (0.0.9)
       httparty
       json
       roar
@@ -14,44 +14,42 @@ GEM
   remote: https://rubygems.org/
   specs:
     as-notifications (1.0.1)
-    awesome_print (1.1.0)
+    awesome_print (1.2.0)
     blockenspiel (0.4.5)
     builder (3.2.2)
     ci_reporter (1.9.0)
       builder (>= 2.1.2)
     coderay (1.0.9)
     columnize (0.3.6)
-    daemons (1.1.9)
     debugger (1.6.2)
       columnize (>= 0.3.1)
       debugger-linecache (~> 1.2.0)
       debugger-ruby_core_source (~> 1.2.3)
     debugger-linecache (1.2.0)
     debugger-ruby_core_source (1.2.3)
-    diff-lcs (1.2.4)
-    eventmachine (1.0.3)
+    diff-lcs (1.2.5)
     fakefs (0.4.3)
     find_a_port (1.0.1)
     httparty (0.12.0)
       json (~> 1.8)
       multi_xml (>= 0.5.2)
-    i18n (0.6.5)
+    i18n (0.6.9)
     json (1.8.1)
     method_source (0.8.2)
     mini_portile (0.5.2)
     multi_json (1.8.2)
     multi_xml (0.5.5)
-    nokogiri (1.6.0)
+    nokogiri (1.6.1)
       mini_portile (~> 0.5.0)
-    pact (1.0.20)
-      awesome_print (~> 1.1.0)
+    pact (1.0.26)
+      awesome_print (~> 1.1)
       find_a_port (~> 1.0.1)
       json
       rack-test (~> 0.6.2)
       randexp (~> 0.1.7)
       rspec (~> 2.12)
-      thin
       thor
+      webrick
     pry (0.9.12.2)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
@@ -70,13 +68,13 @@ GEM
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.6)
-    rspec-expectations (2.14.3)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.4)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-fire (1.2.0)
       rspec (~> 2.11)
     rspec-mocks (2.14.4)
-    sequel (4.4.0)
+    sequel (4.7.0)
     shotgun (0.9)
       rack (>= 1.0)
     simplecov (0.7.1)
@@ -85,17 +83,14 @@ GEM
     simplecov-html (0.7.1)
     slop (3.4.6)
     sqlite3 (1.3.8)
-    thin (1.6.1)
-      daemons (>= 1.0.9)
-      eventmachine (>= 1.0.0)
-      rack (>= 1.0.0)
     thor (0.18.1)
     versionomy (0.4.4)
       blockenspiel (>= 0.4.5)
-    webmachine (1.2.1)
+    webmachine (1.2.2)
       as-notifications (~> 1.0)
       i18n (>= 0.4.0)
       multi_json
+    webrick (1.3.1)
 
 PLATFORMS
   ruby

data/Rakefile

@@ -1,24 +1,5 @@
 # encoding: utf-8
-
-require 'bundler/gem_helper'
-module Bundler
-  class GemHelper
-    def install
-      desc "Build #{name}-#{version}.gem into the pkg directory"
-      task 'build' do
-        build_gem
-      end
-
-      desc "Build and install #{name}-#{version}.gem into system gems"
-      task 'install' do
-        install_gem
-      end
-
-      GemHelper.instance = self
-    end
-  end
-end
-Bundler::GemHelper.install_tasks
+require "bundler/gem_tasks"
 
 require 'rubygems'
 require 'bundler'

data/lib/pact_broker/api/decorators/base_decorator.rb

@@ -12,21 +12,6 @@ module PactBroker
         include Roar::Representer::JSON::HAL
         include Roar::Representer::JSON::HAL::Links
         include PactBroker::Api::PactBrokerUrls
-
-        def initialize represented, base_url = nil
-          super(represented)
-          @base_url = base_url
-        end
-
-        def to_json
-          json = super()
-          if @base_url
-            json.gsub(base_url_placeholder, @base_url)
-          else
-            json
-          end
-        end
-
       end
     end
   end

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

@@ -2,48 +2,42 @@ module PactBroker
   module Api
     module PactBrokerUrls
 
-      BASE_URL_PLACEHOLDER = "http://_______PACT_BROKER_BASE_URL_PLACEHOLDER_TO_BE_REPLACED_AFTER_TO_JSON_______"
-
-      def base_url_placeholder
-        BASE_URL_PLACEHOLDER
-      end
-
-      def pacticipants_url
-        "#{base_url_placeholder}/pacticipants"
+      def pacticipants_url base_url
+        "#{base_url}/pacticipants"
       end
 
-      def pacticipant_url pacticipant
-        "#{pacticipants_url}/#{url_encode(pacticipant.name)}"
+      def pacticipant_url base_url, pacticipant
+        "#{pacticipants_url(base_url)}/#{url_encode(pacticipant.name)}"
       end
 
-      def last_version_url pacticipant
-        "#{pacticipant_url(pacticipant)}/versions/last"
+      def latest_version_url base_url, pacticipant
+        "#{pacticipant_url(base_url, pacticipant)}/versions/latest"
       end
 
-      def versions_url pacticipant
-        "#{pacticipant_url(pacticipant)}/versions"
+      def versions_url base_url, pacticipant
+        "#{pacticipant_url(base_url, pacticipant)}/versions"
       end
 
-      def version_url version
-        "#{pacticipant_url(version.pacticipant)}/versions/#{version.number}"
+      def version_url base_url, version
+        "#{pacticipant_url(base_url, version.pacticipant)}/versions/#{version.number}"
       end
 
-      def pact_url pact
-        "#{pactigration_base_url(pact)}/version/#{pact.consumer.version.number}"
+      def pact_url base_url, pact
+        "#{pactigration_base_url(base_url, pact)}/version/#{pact.consumer.version.number}"
       end
 
-      def latest_pact_url pact
-        "#{pactigration_base_url(pact)}/latest"
+      def latest_pact_url base_url, pact
+        "#{pactigration_base_url(base_url, pact)}/latest"
       end
 
-      def latest_pacts_url
-        "#{base_url_placeholder}/pacts/latest"
+      def latest_pacts_url base_url
+        "#{base_url}/pacts/latest"
       end
 
       private
 
-      def pactigration_base_url pact
-        "#{base_url_placeholder}/pact/provider/#{url_encode(pact.provider.name)}/consumer/#{url_encode(pact.consumer.name)}"
+      def pactigration_base_url base_url, pact
+        "#{base_url}/pact/provider/#{url_encode(pact.provider.name)}/consumer/#{url_encode(pact.consumer.name)}"
       end
 
       def url_encode param

data/lib/pact_broker/api/decorators/pact_collection_decorator.rb

@@ -23,13 +23,13 @@ module PactBroker
           PactBroker::Api::Decorators::RepresentablePact.new(pact)
         end
 
-        link :self do
-          latest_pacts_url
+        link :self do | options |
+          latest_pacts_url(options[:base_url])
         end
 
         # This is the LATEST pact URL
-        links :pacts do
-          represented.collect{ | pact | {:href => latest_pact_url(pact), :title => "Latest pact between #{pact.consumer.name} and #{pact.provider.name}" } }
+        links :pacts do | options |
+          represented.collect{ | pact | {:href => latest_pact_url(options[:base_url], pact), :title => "Latest pact between #{pact.consumer.name} and #{pact.provider.name}" } }
         end
 
       end

data/lib/pact_broker/api/decorators/pact_decorator.rb

@@ -12,8 +12,8 @@ module PactBroker
         property :consumer, :extend => PactBroker::Api::Decorators::PactPacticipantRepresenter, :embedded => true
         property :provider, :extend => PactBroker::Api::Decorators::PactPacticipantRepresenter, :embedded => true
 
-        link :self do
-          pact_url(represented)
+        link :self do | options |
+          pact_url(options[:base_url], represented)
         end
 
       end

data/lib/pact_broker/api/decorators/pact_pacticipant_decorator.rb

@@ -15,8 +15,8 @@ module PactBroker
         property :repository_url
         property :version, :class => "PactBroker::Models::Version", :extend => PactBroker::Api::Decorators::VersionRepresenter, :embedded => true
 
-        link :self do
-          pacticipant_url(represented)
+        link :self do | options |
+          pacticipant_url(options[:base_url], represented)
         end
 
       end

data/lib/pact_broker/api/decorators/pacticipant_collection_decorator.rb

@@ -36,12 +36,12 @@ module PactBroker
           represented
         end
 
-        link :self do
-          pacticipants_url
+        link :self do | options |
+          pacticipants_url options[:base_url]
         end
 
-        links :pacticipants do
-          represented.collect{ | pacticipant | {:href => pacticipant_url(pacticipant), :title => pacticipant.name } }
+        links :pacticipants do | options |
+          represented.collect{ | pacticipant | {:href => pacticipant_url(options[:base_url], pacticipant), :title => pacticipant.name } }
         end
 
       end

data/lib/pact_broker/api/decorators/pacticipant_decorator.rb

@@ -12,18 +12,18 @@ module PactBroker
         property :name
         property :repository_url
 
-        property :last_version, :class => PactBroker::Models::Version, :extend => PactBroker::Api::Decorators::VersionRepresenter, :embedded => true
+        property :latest_version, :class => PactBroker::Models::Version, :extend => PactBroker::Api::Decorators::VersionRepresenter, :embedded => true
 
-        link :self do
-          pacticipant_url(represented)
+        link :self do | options |
+          pacticipant_url(options[:base_url], represented)
         end
 
-        link :last_version do
-          last_version_url(represented)
+        link :latest_version do | options |
+          latest_version_url(options[:base_url], represented)
         end
 
-        link :versions do
-          versions_url(represented)
+        link :versions do | options |
+          versions_url(options[:base_url], represented)
         end
 
       end

data/lib/pact_broker/api/decorators/version_decorator.rb

@@ -7,8 +7,8 @@ module PactBroker
 
         property :number
 
-        link :self do
-          version_url(represented)
+        link :self do | options |
+          version_url(options[:base_url], represented)
         end
       end
     end

data/lib/pact_broker/api/resources/index.rb

@@ -15,6 +15,7 @@ module PactBroker::Api
         ["GET"]
       end
 
+      # TODO change to use request.base_url to avoid params getting included!!!
       def to_json
         {
           _links: {

data/lib/pact_broker/api/resources/latest_pact.rb

@@ -15,7 +15,7 @@ module PactBroker::Api
       end
 
       def resource_exists?
-        @pact = pact_service.find_pact(identifier_from_path.merge(:consumer_version_number => 'last'))
+        @pact = pact_service.find_pact(identifier_from_path.merge(:consumer_version_number => 'latest'))
         @pact != nil
       end
 

data/lib/pact_broker/api/resources/latest_pacts.rb

@@ -19,7 +19,7 @@ module PactBroker::Api
       end
 
       def generate_json pacts
-        PactBroker::Api::Decorators::PactCollectionRepresenter.new(pacts, request_base_url).to_json
+        PactBroker::Api::Decorators::PactCollectionRepresenter.new(pacts).to_json(base_url: request_base_url)
       end
 
     end

data/lib/pact_broker/api/resources/pacticipant.rb

@@ -55,7 +55,7 @@ module PactBroker::Api
       end
 
       def generate_json pacticipant
-        PactBroker::Api::Decorators::PacticipantRepresenter.new(pacticipant, request_base_url).to_json
+        PactBroker::Api::Decorators::PacticipantRepresenter.new(pacticipant).to_json(base_url: request_base_url)
       end
 
       def params

data/lib/pact_broker/api/resources/pacticipants.rb

@@ -19,7 +19,7 @@ module PactBroker::Api
       end
 
       def generate_json pacticipants
-        PactBroker::Api::Decorators::PacticipantCollectionRepresenter.new(pacticipants, request_base_url).to_json
+        PactBroker::Api::Decorators::PacticipantCollectionRepresenter.new(pacticipants).to_json(base_url: request_base_url)
       end
 
     end

data/lib/pact_broker/models/pacticipant.rb

@@ -11,7 +11,7 @@ module PactBroker
       one_to_many :versions, :order => :order, :reciprocal => :pacticipant
       one_to_many :pacts
 
-      def last_version
+      def latest_version
         versions.last
       end
 

data/lib/pact_broker/repositories/pact_repository.rb

@@ -15,7 +15,7 @@ module PactBroker
 
         # 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
+        latest_versions = PactBroker::Models::Version.new.db.fetch('select max(id) as id from versions where id in (select distinct(version_id) from pacts) group by pacticipant_id').collect{ | it | it[:id] }.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}).

data/lib/pact_broker/repositories/pacticipant_repository.rb

@@ -25,7 +25,7 @@ module PactBroker
         PactBroker::Models::Pacticipant.new(name: args[:name], repository_url: args[:repository_url]).save(raise_on_save_failure: true)
       end
 
-      def find_last_version name
+      def find_latest_version name
 
       end
 

data/lib/pact_broker/services/pact_service.rb

@@ -10,7 +10,7 @@ module PactBroker
       extend PactBroker::Repositories
 
       def find_pact params
-        if params[:consumer_version_number] == 'last'
+        if params[:consumer_version_number] == 'latest'
           pact_repository.find_latest_pact(params[:consumer_name], params[:provider_name])
         else
           pact_repository.find_pact(params[:consumer_name], params[:consumer_version_number], params[:provider_name])

data/lib/pact_broker/services/version_service.rb

@@ -7,7 +7,7 @@ module PactBroker
 
       extend PactBroker::Repositories
 
-      def self.find_last_version name
+      def self.find_latest_version name
 
       end
     end

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
 end

data/spec/service_consumers/pact_helper.rb

@@ -13,18 +13,14 @@ Pact.configure do | config |
 end
 
 Pact.service_provider "Pact Broker" do
-  app { PactBroker::API }
+#  app { PactBroker::API }
 
-  # honours_pact_with "Pact Broker Client" do
-  #   pact_uri "../pact_broker-client/spec/pacts/pact_broker_client-pact_broker.json"
-  # end
-
-  honours_pact_with "Pact Broker Client", :ref => :head do
-    pact_uri URI.encode("http://rea-pact-broker.biq.vpc.realestate.com.au/pacticipants/Pact Broker Client/versions/last/pacts/Pact Broker")
+  honours_pact_with "Pact Broker Client" do
+    pact_uri "../pact_broker-client/spec/pacts/pact_broker_client-pact_broker.json"
   end
 
-  honours_pact_with "Pact Broker Client", :ref => :prod do
-    pact_uri URI.encode("http://rea-pact-broker.biq.vpc.realestate.com.au/pacticipants/Pact Broker Client/versions/last/pacts/Pact Broker?tag=prod")
-  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")
+  # end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-18 00:00:00.000000000 Z
+date: 2014-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -361,7 +361,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3477467796967438675
+      hash: 615091496951534936
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -370,7 +370,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3477467796967438675
+      hash: 615091496951534936
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23