pact_broker 1.14.0 → 1.15.0

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

@@ -5,9 +5,7 @@ require 'pact_broker/pacts/diff'
 module PactBroker
   module Api
     module Resources
-
       class PactContentDiff < BaseResource
-
         def content_types_provided
           [["text/plain", :to_text]]
         end
@@ -22,8 +20,8 @@ module PactBroker
         end
 
         def to_text
-          _, operation = PactBroker::Pacts::Diff.run pact_params, base_url: base_url
-          response.body = operation.output
+          output = PactBroker::Pacts::Diff.new.process pact_params.merge(base_url: base_url)
+          response.body = output
         end
 
         def pact
@@ -33,7 +31,6 @@ module PactBroker
         def pact_params
           @pact_params ||= PactBroker::Pacts::PactParams.from_request request, path_info
         end
-
       end
     end
   end

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

@@ -22,7 +22,7 @@ module PactBroker
         end
 
         def to_json
-          PactBroker::Api::Decorators::PactVersionsDecorator.new(pacts).to_json(decorator_context(identifier_from_path))
+          PactBroker::Api::Decorators::PactVersionsDecorator.new(pacts).to_json(user_options: decorator_context(identifier_from_path))
         end
 
         def pacts

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

@@ -35,11 +35,14 @@ module PactBroker
         end
 
         def validation_errors? webhook
-          if (errors = webhook_service.errors(webhook)).any?
+          errors = webhook_service.errors(webhook)
+
+          unless errors.empty?
             response.headers['Content-Type'] = 'application/json;charset=utf-8'
-            response.body = {errors: errors.full_messages }.to_json
+            response.body = { errors: errors.messages }.to_json
           end
-          errors.any?
+
+          !errors.empty?
         end
 
         def create_path
@@ -52,11 +55,11 @@ module PactBroker
 
         def from_json
           saved_webhook = webhook_service.create next_uuid, webhook, consumer, provider
-          response.body = Decorators::WebhookDecorator.new(saved_webhook).to_json(base_url: base_url)
+          response.body = Decorators::WebhookDecorator.new(saved_webhook).to_json(user_options: { base_url: base_url })
         end
 
         def to_json
-          Decorators::WebhooksDecorator.new(webhooks).to_json(decorator_context(resource_title: 'Pact webhooks'))
+          Decorators::WebhooksDecorator.new(webhooks).to_json(user_options: decorator_context(resource_title: 'Pact webhooks'))
         end
 
         private

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

@@ -50,7 +50,7 @@ module PactBroker
         end
 
         def to_json
-          PactBroker::Api::Decorators::PacticipantDecorator.new(pacticipant).to_json(base_url: base_url)
+          PactBroker::Api::Decorators::PacticipantDecorator.new(pacticipant).to_json(user_options: { base_url: base_url })
         end
 
         private

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

@@ -45,7 +45,7 @@ module PactBroker
         end
 
         def generate_json pacticipants
-          PactBroker::Api::Decorators::PacticipantCollectionDecorator.new(pacticipants).to_json(base_url: base_url)
+          PactBroker::Api::Decorators::PacticipantCollectionDecorator.new(pacticipants).to_json(user_options: { base_url: base_url })
         end
 
         def decorator_for model
@@ -60,4 +60,4 @@ module PactBroker
     end
 
   end
-end
+end

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

@@ -32,7 +32,7 @@ module PactBroker
         end
 
         def to_json
-          PactBroker::Api::Decorators::TagDecorator.new(tag).to_json(base_url: base_url)
+          PactBroker::Api::Decorators::TagDecorator.new(tag).to_json(user_options: { base_url: base_url })
         end
 
         def tag
@@ -48,4 +48,4 @@ module PactBroker
     end
 
   end
-end
+end

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

@@ -20,7 +20,7 @@ module PactBroker
         end
 
         def to_json
-          Decorators::VersionDecorator.new(version).to_json(base_url: base_url)
+          Decorators::VersionDecorator.new(version).to_json(user_options: {base_url: base_url})
         end
 
         private

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

@@ -0,0 +1,34 @@
+require 'pact_broker/api/resources/base_resource'
+require 'pact_broker/configuration'
+require 'pact_broker/api/decorators/versions_decorator'
+
+module PactBroker
+  module Api
+    module Resources
+
+      class Versions < BaseResource
+
+        def content_types_provided
+          [["application/json", :to_json]]
+        end
+
+        def allowed_methods
+          ["GET"]
+        end
+
+        def resource_exists?
+          pacticipant_service.find_pacticipant_by_name(pacticipant_name)
+        end
+
+        def to_json
+          PactBroker::Api::Decorators::VersionsDecorator.new(versions).to_json(user_options: decorator_context(identifier_from_path))
+        end
+
+        def versions
+          pacticipant_service.find_all_pacticipant_versions pacticipant_name
+        end
+
+      end
+    end
+  end
+end

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

@@ -20,7 +20,7 @@ module PactBroker
         end
 
         def to_json
-          Decorators::WebhookDecorator.new(webhook).to_json(base_url: base_url)
+          Decorators::WebhookDecorator.new(webhook).to_json(user_options: { base_url: base_url })
         end
 
         def delete_resource
@@ -42,4 +42,4 @@ module PactBroker
     end
 
   end
-end
+end

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

@@ -25,7 +25,7 @@ module PactBroker
         private
 
         def post_response_body webhook_execution_result
-          Decorators::WebhookExecutionResultDecorator.new(webhook_execution_result).to_json(base_url: base_url, webhook: webhook)
+          Decorators::WebhookExecutionResultDecorator.new(webhook_execution_result).to_json(user_options: { base_url: base_url, webhook: webhook })
         end
 
         def webhook

data/lib/pact_broker/domain/version.rb

@@ -19,6 +19,10 @@ module PactBroker
       def to_s
         "Version: number=#{number}, pacticipant=#{pacticipant_id}"
       end
+
+      def version_and_updated_date
+        "Version #{number} - #{updated_at.to_time.localtime.strftime("%d/%m/%Y")}"
+      end
     end
 
     Version.plugin :timestamps, :update_on_create=>true

data/lib/pact_broker/domain/webhook.rb

@@ -13,8 +13,10 @@ module PactBroker
       include Logging
 
       attr_accessor :uuid, :consumer, :provider, :request, :created_at, :updated_at
+      attr_reader :attributes
 
       def initialize attributes = {}
+        @attributes = attributes
         @uuid = attributes[:uuid]
         @request = attributes[:request]
         @consumer = attributes[:consumer]

data/lib/pact_broker/locale/en.yml

@@ -1,4 +1,12 @@
 en:
+  errors:
+    filled?: "can't be blank"
+    valid_method?: "is not a recognised HTTP method"
+    valid_url?: "is not a valid URL eg. http://example.org"
+
+    name_in_path_matches_name_in_pact?: "does not match %{left} name in path ('%{right}')."
+    valid_consumer_version_number?: "Consumer version number '%{value}' cannot be parsed to a version number. The expected format (unless this configuration has been overridden) is a semantic version. eg. 1.3.0 or 2.0.4.rc1"
+
   pact_broker:
     errors:
       validation:
@@ -70,4 +78,4 @@ en:
         other: "over %{count} years"
       almost_x_years:
         one:   "almost 1 year"
-        other: "almost %{count} years"
+        other: "almost %{count} years"

data/lib/pact_broker/pacts/diff.rb

@@ -1,39 +1,39 @@
-require 'trailblazer/operation'
-require 'pact_broker/repositories'
-require 'pact_broker/pacts/create_formatted_diff'
 require 'pact_broker/api/pact_broker_urls'
-require 'yaml'
 require 'pact_broker/date_helper'
-
+require 'pact_broker/pacts/create_formatted_diff'
+require 'pact_broker/repositories'
+require 'yaml'
 
 module PactBroker
   module Pacts
 
-    class Diff < Trailblazer::Operation
-
+    class Diff
       include PactBroker::Repositories
-      attr_reader :params, :options
-
-      def process params, options
-        pact = pact_repository.find_pact(params.consumer_name, params.consumer_version_number, params.provider_name)
-        previous_distinct_pact = pact_repository.find_previous_distinct_pact pact
-        @output = if previous_distinct_pact
-          next_pact = pact_repository.find_next_pact previous_distinct_pact
-          DiffDecorator.new(pact, previous_distinct_pact, next_pact, options[:base_url]).to_text
+
+      def process(params)
+        pact = find_pact(params)
+        previous_distinct_pact = pact_repository.find_previous_distinct_pact(pact)
+
+        if previous_distinct_pact
+          next_pact = pact_repository.find_next_pact(previous_distinct_pact)
+          DiffDecorator.new(pact, previous_distinct_pact, next_pact, params[:base_url]).to_text
         else
           no_previous_version_message pact
         end
       end
 
-      def no_previous_version_message pact
-        "No previous distinct version was found for #{pact.name}"
+      private
+
+      def find_pact(params)
+        pact_repository.find_pact(params.consumer_name,
+                                  params.consumer_version_number,
+                                  params.provider_name)
       end
 
-      def output
-        @output
+      def no_previous_version_message(pact)
+        "No previous distinct version was found for #{pact.name}"
       end
 
-      private
 
       # The next pact version after the previous distinct version.
       # Eg. v1 (previous distinct) -> pactContentA
@@ -46,10 +46,7 @@ module PactBroker
       # the latest distinct version content was first created.
 
       class DiffDecorator
-
-        attr_reader :pact, :previous_distinct_pact, :next_pact, :base_url
-
-        def initialize pact, previous_distinct_pact, next_pact, base_url
+        def initialize(pact, previous_distinct_pact, next_pact, base_url)
           @pact = pact
           @previous_distinct_pact = previous_distinct_pact
           @next_pact = next_pact
@@ -62,6 +59,8 @@ module PactBroker
 
         private
 
+        attr_reader :pact, :previous_distinct_pact, :next_pact, :base_url
+
         def change_date_in_words
           DateHelper.local_date_in_words next_pact.updated_at
         end
@@ -73,12 +72,13 @@ module PactBroker
         def header
           title = "# Diff between versions #{previous_distinct_pact.consumer_version_number} and #{pact.consumer_version_number} of the pact between #{pact.consumer.name} and #{pact.provider.name}"
           description = "The following changes were made #{change_date_ago_in_words} ago (#{change_date_in_words})"
+
           title +  "\n\n" + description
         end
 
         def links
-          self_url = PactBroker::Api::PactBrokerUrls.pact_url base_url, pact
-          previous_distinct_url = PactBroker::Api::PactBrokerUrls.pact_url base_url, previous_distinct_pact
+          self_url = PactBroker::Api::PactBrokerUrls.pact_url(base_url, pact)
+          previous_distinct_url = PactBroker::Api::PactBrokerUrls.pact_url(base_url, previous_distinct_pact)
 
           links = {
             "current-pact-version" => {
@@ -103,7 +103,6 @@ module PactBroker
           DateHelper.distance_of_time_in_words next_pact.updated_at, now
         end
       end
-
     end
   end
 end

data/lib/pact_broker/repositories/pacticipant_repository.rb

@@ -20,6 +20,13 @@ module PactBroker
         PactBroker::Domain::Pacticipant.order(:name).all
       end
 
+      def find_all_pacticipant_versions name
+        PactBroker::Domain::Version
+          .select(:versions__id, :versions__number, :versions__pacticipant_id, :versions__order, :versions__created_at, :versions__updated_at)
+          .join(:pacticipants, {id: :pacticipant_id})
+          .where(name_like(:name, name))
+      end
+
       def find_by_name_or_create name
         if pacticipant = find_by_name(name)
           pacticipant

data/lib/pact_broker/services/pacticipant_service.rb

@@ -41,6 +41,10 @@ module PactBroker
         pacticipant_repository.find_by_name(name)
       end
 
+      def self.find_all_pacticipant_versions name
+        pacticipant_repository.find_all_pacticipant_versions(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/services/webhook_service.rb

@@ -16,7 +16,7 @@ module PactBroker
 
       def self.errors webhook
         contract = PactBroker::Api::Contracts::WebhookContract.new(webhook)
-        contract.validate
+        contract.validate(webhook.attributes)
         contract.errors
       end
 
@@ -71,4 +71,4 @@ module PactBroker
       end
     end
   end
-end
+end

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '1.14.0'
+  VERSION = '1.15.0'
 end

data/pact_broker.gemspec

@@ -1,4 +1,3 @@
-
 # -*- encoding: utf-8 -*-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
@@ -24,8 +23,9 @@ Gem::Specification.new do |gem|
   #gem.add_runtime_dependency 'pact'
   gem.add_runtime_dependency 'httparty'
   gem.add_runtime_dependency 'json'
-  gem.add_runtime_dependency 'roar', '~> 1.0.0.beta2'
-  gem.add_runtime_dependency 'reform', '~> 1.0'
+  gem.add_runtime_dependency 'roar', '~> 1.1'
+  gem.add_runtime_dependency 'reform', '~> 2.2.0'
+  gem.add_runtime_dependency 'dry-validation', '~> 0.10.5'
   gem.add_runtime_dependency 'sequel', '~> 4.23'
   gem.add_runtime_dependency 'webmachine', '1.4.0'
   gem.add_runtime_dependency 'versionomy', '~> 0.4'
@@ -35,16 +35,14 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'pact-support', '~>0.4', '>=0.4.2'
   gem.add_runtime_dependency 'padrino-core', '~>0.12.4'
   gem.add_runtime_dependency 'haml'
-  gem.add_runtime_dependency 'trailblazer', '~>0.3.0'
 
   gem.add_development_dependency 'sqlite3'
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'rake', '~>10.0'
   gem.add_development_dependency 'fakefs', '~>0.4'
   gem.add_development_dependency 'mysql2', '~>0.3.15'
-  gem.add_development_dependency 'webmock', '~>2.0.0'
+  gem.add_development_dependency 'webmock', '~>2.3'
   gem.add_development_dependency 'rspec', '~>3.0'
   gem.add_development_dependency 'rspec-its'
   gem.add_development_dependency 'database_cleaner'
-
 end

data/spec/features/get_versions_spec.rb

@@ -0,0 +1,36 @@
+require 'spec/support/provider_state_builder'
+
+describe "Get versions" do
+
+  let(:path) { "/pacticipants/Consumer/versions" }
+  let(:last_response_body) { JSON.parse(subject.body, symbolize_names: true) }
+
+  subject { get path; last_response }
+
+  context "when the pacticipant exists" do
+
+    before do
+      ProviderStateBuilder.new
+        .create_consumer("Consumer")
+        .create_consumer_version("1.0.0")
+        .create_consumer_version("1.0.1")
+    end
+
+    it "returns a 200 response" do
+      expect(subject.status).to be 200
+    end
+
+    it "returns a list of links to the versions" do
+      expect(last_response_body[:_links][:"versions"].size).to eq 2
+    end
+
+  end
+
+  context "when the pacticipant does not exist" do
+
+    it "returns a 404 response" do
+      expect(subject).to be_a_404_response
+    end
+
+  end
+end