pact_broker 1.1.0 → 1.2.0

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

@@ -1,38 +1,40 @@
 require 'pact_broker/api/resources/base_resource'
 require 'pact_broker/api/decorators/relationships_csv_decorator'
 
-module PactBroker::Api
+module PactBroker
 
-  module Resources
+  module Api
+    module Resources
 
-    class Group < BaseResource
+      class Group < BaseResource
 
-      def content_types_provided
-        [["text/csv", :to_csv]]
-      end
+        def content_types_provided
+          [["text/csv", :to_csv]]
+        end
 
-      def allowed_methods
-        ["GET"]
-      end
+        def allowed_methods
+          ["GET"]
+        end
 
-      def to_csv
-        generate_csv(group_service.find_group_containing @pacticipant)
-      end
+        def to_csv
+          generate_csv(group_service.find_group_containing @pacticipant)
+        end
 
-      def generate_csv group
-        PactBroker::Api::Decorators::RelationshipsCsvDecorator.new(group).to_csv
-      end
+        def generate_csv group
+          PactBroker::Api::Decorators::RelationshipsCsvDecorator.new(group).to_csv
+        end
 
-      def pacticipant_name
-        identifier_from_path[:pacticipant_name]
-      end
+        def pacticipant_name
+          identifier_from_path[:pacticipant_name]
+        end
 
-      def resource_exists?
-        @pacticipant = pacticipant_service.find_pacticipant_by_name(pacticipant_name)
-        @pacticipant != nil
-      end
+        def resource_exists?
+          @pacticipant = pacticipant_service.find_pacticipant_by_name(pacticipant_name)
+          @pacticipant != nil
+        end
 
+      end
     end
-  end
 
-end
+  end
+end

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

@@ -1,59 +1,60 @@
 require 'pact_broker/api/resources/base_resource'
 require 'json'
 
-module PactBroker::Api
+module PactBroker
+  module Api
+    module Resources
+
+      class Index < BaseResource
+
+        def content_types_provided
+          [["application/hal+json", :to_json]]
+        end
+
+        def allowed_methods
+          ["GET"]
+        end
+
+        # TODO change to use request.base_url to avoid params getting included!!!
+        def to_json
+          {
+            _links: {
+              'pb:self' =>
+              {
+                href: request.uri.to_s,
+                title: 'The Pact Broker index page',
+                templated: false
+              },
+              'pb:latest-pacts' =>
+              {
+                href: request.uri.to_s + 'pacts/latest',
+                title: 'Retrieve latest pacts',
+                templated: false
+              },
+              'pb:pacticipants' =>
+              {
+                href: request.uri.to_s + 'pacticipants',
+                title: 'Retrieve pacticipants',
+                templated: false
+              },
+              'pb:webhooks' =>
+              {
+                href: request.uri.to_s + 'webhooks',
+                title: 'Webhooks',
+                templated: false
+              },'curies' =>
+              [{
+                name: 'pb',
+                href: request.uri.to_s + 'doc/{rel}',
+                templated: true
+              }]
+            }
+          }.to_json
+        end
 
-  module Resources
 
-    class Index < BaseResource
-
-      def content_types_provided
-        [["application/hal+json", :to_json]]
-      end
-
-      def allowed_methods
-        ["GET"]
-      end
-
-      # TODO change to use request.base_url to avoid params getting included!!!
-      def to_json
-        {
-          _links: {
-            'pb:self' =>
-            {
-              href: request.uri.to_s,
-              title: 'The Pact Broker index page',
-              templated: false
-            },
-            'pb:latest-pacts' =>
-            {
-              href: request.uri.to_s + 'pacts/latest',
-              title: 'Retrieve latest pacts',
-              templated: false
-            },
-            'pb:pacticipants' =>
-            {
-              href: request.uri.to_s + 'pacticipants',
-              title: 'Retrieve pacticipants',
-              templated: false
-            },
-            'pb:webhooks' =>
-            {
-              href: request.uri.to_s + 'webhooks',
-              title: 'Webhooks',
-              templated: false
-            },'curies' =>
-            [{
-              name: 'pb',
-              href: request.uri.to_s + 'doc/{rel}',
-              templated: true
-            }]
-          }
-        }.to_json
       end
-
-
     end
-  end
 
-end
+  end
+end

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

@@ -1,36 +1,36 @@
 require 'pact_broker/api/resources/base_resource'
 require 'pact_broker/configuration'
 
-module PactBroker::Api
+module PactBroker
+  module Api
+    module Resources
 
-  module Resources
+      class LatestPact < BaseResource
 
-    class LatestPact < BaseResource
+        def content_types_provided
+          [["application/json", :to_json],
+          ["text/html", :to_html]]
+        end
 
-      def content_types_provided
-        [["application/json", :to_json],
-        ["text/html", :to_html]]
-      end
+        def allowed_methods
+          ["GET"]
+        end
 
-      def allowed_methods
-        ["GET"]
-      end
+        def resource_exists?
+          @pact = pact_service.find_latest_pact(identifier_from_path)
+          @pact != nil
+        end
 
-      def resource_exists?
-        @pact = pact_service.find_latest_pact(identifier_from_path)
-        @pact != nil
-      end
+        def to_json
+          response.headers['X-Pact-Consumer-Version'] = @pact.consumer_version_number
+          PactBroker::Api::Decorators::PactDecorator.new(@pact).to_json(base_url: base_url)
+        end
 
-      def to_json
-        response.headers['X-Pact-Consumer-Version'] = @pact.consumer_version_number
-        PactBroker::Api::Decorators::PactDecorator.new(@pact).to_json(base_url: base_url)
-      end
+        def to_html
+          PactBroker.configuration.html_pact_renderer.call(@pact)
+        end
 
-      def to_html
-        PactBroker.configuration.html_pact_renderer.call(@pact.json_content)
       end
-
     end
   end
-
 end

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

@@ -1,28 +1,29 @@
 require 'pact_broker/api/resources/base_resource'
 
-module PactBroker::Api
+module PactBroker
+  module Api
+    module Resources
 
-  module Resources
+      class LatestPacts < BaseResource
 
-    class LatestPacts < BaseResource
+        def content_types_provided
+          [["application/hal+json", :to_json]]
+        end
 
-      def content_types_provided
-        [["application/hal+json", :to_json]]
-      end
+        def allowed_methods
+          ["GET"]
+        end
 
-      def allowed_methods
-        ["GET"]
-      end
+        def to_json
+          generate_json(pact_service.find_latest_pacts)
+        end
 
-      def to_json
-        generate_json(pact_service.find_latest_pacts)
-      end
+        def generate_json pacts
+          PactBroker::Api::Decorators::PactCollectionDecorator.new(pacts).to_json(base_url: base_url)
+        end
 
-      def generate_json pacts
-        PactBroker::Api::Decorators::PactCollectionDecorator.new(pacts).to_json(base_url: base_url)
       end
-
     end
-  end
 
-end
+  end
+end

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

@@ -1,60 +1,55 @@
 require 'cgi'
 require 'pact_broker/api/resources/base_resource'
+require 'pact_broker/api/resources/pacticipant_resource_methods'
 require 'pact_broker/api/decorators/pact_decorator'
 require 'pact_broker/json'
 
-module PactBroker::Api
+module PactBroker
 
-  module Resources
+  module Api
+    module Resources
 
-    class Pact < BaseResource
+      class Pact < BaseResource
 
-      def content_types_provided
-        [["application/json", :to_json]]
-      end
+        include PacticipantResourceMethods
 
-      def content_types_accepted
-        [["application/json", :from_json]]
-      end
+        def content_types_provided
+          [["application/json", :to_json]]
+        end
 
-      def allowed_methods
-        ["GET", "PUT"]
-      end
+        def content_types_accepted
+          [["application/json", :from_json]]
+        end
+
+        def allowed_methods
+          ["GET", "PUT"]
+        end
 
-      def malformed_request?
-        if request.put?
-          begin
-            JSON.parse(pact_content, PactBroker::PACT_PARSING_OPTIONS) #Not load! Otherwise it will try to load Ruby classes.
+        def malformed_request?
+          if request.put?
+            return invalid_json? ||
+              potential_duplicate_pacticipants?([identifier_from_path[:consumer_name], identifier_from_path[:provider_name]])
+          else
             false
-          rescue StandardError => e
-            logger.error "Error parsing JSON #{e} - #{pact_content}"
-            response.headers['Content-Type'] = 'application/json'
-            response.body = {error: "Invalid JSON - #{e.message}"}.to_json
-            true
           end
         end
-      end
 
-      def resource_exists?
-        @pact = pact_service.find_pact(identifier_from_path)
-        @pact != nil
-      end
+        def resource_exists?
+          @pact = pact_service.find_pact(identifier_from_path)
+          @pact != nil
+        end
 
-      def from_json
-        @pact, created = pact_service.create_or_update_pact(identifier_from_path.merge(:json_content => pact_content))
-        response.headers["Location"] = pact_url(base_url, @pact) if created
-        response.body = to_json
-      end
+        def from_json
+          @pact, created = pact_service.create_or_update_pact(identifier_from_path.merge(:json_content => request_body))
+          response.headers["Location"] = pact_url(base_url, @pact) if created
+          response.body = to_json
+        end
 
-      def to_json
-        PactBroker::Api::Decorators::PactDecorator.new(@pact).to_json(base_url: base_url)
-      end
+        def to_json
+          PactBroker::Api::Decorators::PactDecorator.new(@pact).to_json(base_url: base_url)
+        end
 
-      def pact_content
-        request.body.to_s
       end
-
     end
   end
-
-end
+end

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

@@ -0,0 +1,35 @@
+require 'pact_broker/api/resources/base_resource'
+require 'pact_broker/configuration'
+require 'pact_broker/api/decorators/pact_versions_decorator'
+
+module PactBroker
+  module Api
+    module Resources
+
+      class PactVersions < BaseResource
+
+        def content_types_provided
+          [["application/json", :to_json]]
+        end
+
+        def allowed_methods
+          ["GET"]
+        end
+
+        def resource_exists?
+          pacticipant_service.find_pacticipant_by_name(consumer_name) &&
+            pacticipant_service.find_pacticipant_by_name(provider_name)
+        end
+
+        def to_json
+          PactBroker::Api::Decorators::PactVersionsDecorator.new(pacts).to_json(decorator_context(identifier_from_path))
+        end
+
+        def pacts
+          pact_service.find_all_pacts_between consumer_name, :and => provider_name
+        end
+
+      end
+    end
+  end
+end

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

@@ -3,85 +3,78 @@ require 'pact_broker/api/resources/base_resource'
 require 'pact_broker/api/decorators/webhook_decorator'
 require 'pact_broker/api/decorators/webhooks_decorator'
 
-module PactBroker::Api
+module PactBroker
 
-  module Resources
+  module Api
+    module Resources
 
-    class PactWebhooks < BaseResource
+      class PactWebhooks < BaseResource
 
-      def allowed_methods
-        ["POST", "GET"]
-      end
+        def allowed_methods
+          ["POST", "GET"]
+        end
 
-      def content_types_provided
-        [["application/hal+json", :to_json]]
-      end
+        def content_types_provided
+          [["application/hal+json", :to_json]]
+        end
 
-      def resource_exists?
-        (@consumer = find_pacticipant(identifier_from_path[:consumer_name], "consumer")) &&
-          (@provider = find_pacticipant(identifier_from_path[:provider_name], "provider"))
-      end
+        def content_types_accepted
+          [["application/json", :from_json]]
+        end
+
+        def resource_exists?
+          (@consumer = find_pacticipant(identifier_from_path[:consumer_name], "consumer")) &&
+            (@provider = find_pacticipant(identifier_from_path[:provider_name], "provider"))
+        end
 
-      def malformed_request?
-        if request.post?
-          begin
-            if (errors = webhook.validate).any?
-              set_json_validation_error_messages errors
-              return true
-            end
-          rescue
-            set_json_error_message 'Invalid JSON'
-            return true
+        def malformed_request?
+          if request.post?
+            return invalid_json? || validation_errors?(webhook)
           end
+          false
         end
-        false
-      end
 
-      def process_post
-        saved_webhook = webhook_service.create webhook, consumer, provider
-        response.headers['Content-Type'] = 'application/json'
-        response.headers['Location'] = webhook_url saved_webhook, base_url
-        response.body = Decorators::WebhookDecorator.new(saved_webhook).to_json(base_url: base_url)
-        true
-      end
+        def create_path
+          webhook_url next_uuid, base_url
+        end
 
-      def to_json
-        Decorators::WebhooksDecorator.new(webhooks).to_json(decorator_context(resource_title: 'Pact webhooks'))
-      end
+        def post_is_create?
+          true
+        end
 
-      private
+        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)
+          true
+        end
 
-      attr_reader :consumer, :provider
+        def to_json
+          Decorators::WebhooksDecorator.new(webhooks).to_json(decorator_context(resource_title: 'Pact webhooks'))
+        end
 
-      def webhooks
-        webhook_service.find_by_consumer_and_provider consumer, provider
-      end
+        private
 
-      def webhook
-        @webhook ||= Decorators::WebhookDecorator.new(PactBroker::Models::Webhook.new).from_json(request.body.to_s)
-      end
+        attr_reader :consumer, :provider
 
-      def set_json_error_message message
-        response.headers['Content-Type'] = 'application/json'
-        response.body = {error: message}.to_json
-      end
+        def webhooks
+          webhook_service.find_by_consumer_and_provider consumer, provider
+        end
 
-      def set_json_validation_error_messages errors
-        response.headers['Content-Type'] = 'application/json'
-        response.body = {errors: errors}.to_json
-      end
+        def webhook
+          @webhook ||= Decorators::WebhookDecorator.new(PactBroker::Models::Webhook.new).from_json(request_body)
+        end
 
-      def find_pacticipant name, role
-        pacticipant = pacticipant_service.find_pacticipant_by_name name
-        if pacticipant.nil?
-          set_json_error_message "No #{role} with name '#{name}' found"
-          nil
-        else
-          pacticipant
+        def next_uuid
+          @next_uuid ||= webhook_service.next_uuid
+        end
+
+        def find_pacticipant name, role
+          pacticipant_service.find_pacticipant_by_name(name).tap do | pacticipant |
+            set_json_error_message("No #{role} with name '#{name}' found") if pacticipant.nil?
+          end
         end
-      end
 
+      end
     end
   end
-
-end
+end