pact_broker 1.2.0 → 1.3.0

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

@@ -17,17 +17,20 @@ module PactBroker
         end
 
         def resource_exists?
-          @pact = pact_service.find_latest_pact(identifier_from_path)
-          @pact != nil
+          pact
         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)
+          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)
+          PactBroker.configuration.html_pact_renderer.call(pact)
+        end
+
+        def pact
+          @pact ||= pact_service.find_latest_pact(identifier_from_path)
         end
 
       end

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

@@ -15,11 +15,11 @@ module PactBroker
         end
 
         def to_json
-          generate_json(pact_service.find_latest_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)
+        def pacts
+          pact_service.find_latest_pacts
         end
 
       end

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

@@ -35,18 +35,22 @@ module PactBroker
         end
 
         def resource_exists?
-          @pact = pact_service.find_pact(identifier_from_path)
-          @pact != nil
+          pact
         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_code = pact ? 200 : 201
+          @pact = pact_service.create_or_update_pact(identifier_from_path.merge(:json_content => request_body))
           response.body = to_json
+          response_code
         end
 
         def to_json
-          PactBroker::Api::Decorators::PactDecorator.new(@pact).to_json(base_url: base_url)
+          PactBroker::Api::Decorators::PactDecorator.new(pact).to_json(base_url: base_url)
+        end
+
+        def pact
+          @pact ||= pact_service.find_pact(identifier_from_path)
         end
 
       end

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

@@ -23,8 +23,7 @@ module PactBroker
         end
 
         def resource_exists?
-          (@consumer = find_pacticipant(identifier_from_path[:consumer_name], "consumer")) &&
-            (@provider = find_pacticipant(identifier_from_path[:provider_name], "provider"))
+          consumer && provider
         end
 
         def malformed_request?
@@ -45,7 +44,6 @@ 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)
-          true
         end
 
         def to_json
@@ -54,8 +52,6 @@ module PactBroker
 
         private
 
-        attr_reader :consumer, :provider
-
         def webhooks
           webhook_service.find_by_consumer_and_provider consumer, provider
         end
@@ -68,6 +64,14 @@ module PactBroker
           @next_uuid ||= webhook_service.next_uuid
         end
 
+        def consumer
+          @consumer ||= find_pacticipant(identifier_from_path[:consumer_name], "consumer")
+        end
+
+        def provider
+          @provider ||= find_pacticipant(identifier_from_path[:provider_name], "provider")
+        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?

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

@@ -31,18 +31,17 @@ module PactBroker
         end
 
         def from_json
-          if @pacticipant
+          if pacticipant
             @pacticipant = pacticipant_service.update params.merge(name: pacticipant_name)
           else
             @pacticipant = pacticipant_service.create params.merge(name: pacticipant_name)
-            response.headers["Location"] = pacticipant_url(base_url, @pacticipant)
+            response.headers["Location"] = pacticipant_url(base_url, pacticipant)
           end
           response.body = to_json
         end
 
         def resource_exists?
-          @pacticipant = pacticipant_service.find_pacticipant_by_name(pacticipant_name)
-          @pacticipant != nil
+          pacticipant
         end
 
         def delete_resource
@@ -51,7 +50,13 @@ module PactBroker
         end
 
         def to_json
-          PactBroker::Api::Decorators::PacticipantRepresenter.new(@pacticipant).to_json(base_url: base_url)
+          PactBroker::Api::Decorators::PacticipantRepresenter.new(pacticipant).to_json(base_url: base_url)
+        end
+
+        private
+
+        def pacticipant
+          @pacticipant ||= pacticipant_service.find_pacticipant_by_name(pacticipant_name)
         end
 
         def pacticipant_name

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

@@ -16,11 +16,11 @@ module PactBroker
         end
 
         def to_csv
-          generate_csv(pact_service.find_latest_pacts)
+          PactBroker::Api::Decorators::RelationshipsCsvDecorator.new(pacts).to_csv
         end
 
-        def generate_csv pacts
-          PactBroker::Api::Decorators::RelationshipsCsvDecorator.new(pacts).to_csv
+        def pacts
+          pact_service.find_latest_pacts
         end
 
       end

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

@@ -19,23 +19,24 @@ module PactBroker
         end
 
         def from_json
-          unless @tag
+          unless tag
             @tag = tag_service.create identifier_from_path
-            response.headers["Location"] = tag_url(base_url, @tag)
+            # Make it return a 201 by setting the Location header
+            response.headers["Location"] = tag_url(base_url, tag)
           end
-          response.body = generate_json @tag
+          response.body = to_json
         end
 
         def resource_exists?
-          @tag = tag_service.find identifier_from_path
+          tag
         end
 
         def to_json
-          generate_json(@tag)
+          PactBroker::Api::Decorators::TagDecorator.new(tag).to_json(base_url: base_url)
         end
 
-        def generate_json tag
-          PactBroker::Api::Decorators::TagDecorator.new(tag).to_json(base_url: base_url)
+        def tag
+          @tag ||= tag_service.find identifier_from_path
         end
 
       end

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

@@ -16,7 +16,7 @@ module PactBroker
         end
 
         def resource_exists?
-          !webhook.nil?
+          webhook
         end
 
         def to_json

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

@@ -19,7 +19,7 @@ module PactBroker
         end
 
         def resource_exists?
-          !webhook.nil?
+          webhook
         end
 
         private

data/lib/pact_broker/app.rb

@@ -2,6 +2,7 @@ require 'pact_broker/configuration'
 require 'pact_broker/db'
 require 'pact_broker/project_root'
 require 'rack/hal_browser'
+require 'rack/pact_broker/convert_file_extension_to_accept_header'
 
 module PactBroker
 
@@ -42,53 +43,23 @@ module PactBroker
     def build_app
       @app = Rack::Builder.new
 
-      @app.use Rack::Static, :urls => ["/stylesheets", "/images", "/css", "/fonts", "/js", "/javascripts"], :root => PactBroker.project_root.join("public")
-
-      logger.info "Mounting UI"
-      require 'pact_broker/ui/controllers/relationships'
-      require 'pact_broker/ui/controllers/groups'
-      require 'pact_broker/doc/controllers/app'
-
-      ui = Rack::Builder.new {
-
-        use HtmlFilter
-
-        map "/ui/relationships" do
-          run PactBroker::UI::Controllers::Relationships
-        end
-
-        map "/groups" do
-          run PactBroker::UI::Controllers::Groups
-        end
-
-        map "/doc" do
-          run PactBroker::Doc::Controllers::App
-        end
-
-        map "/" do
-          run lambda { |env|
-            # A request for the root path in the browser (not the json index) should
-            # redirect to ui/relationships
-            if (env['PATH_INFO'].chomp("/") == "")
-              [303, {'Location' => 'ui/relationships'},[]]
-            else
-              [404, {},[]]
-            end
-          }
-        end
-      }
+      @app.use Rack::Static, :urls => ["/stylesheets", "/css", "/fonts", "/js", "/javascripts"], :root => PactBroker.project_root.join("public")
+      @app.use Rack::PactBroker::ConvertFileExtensionToAcceptHeader
 
       if configuration.use_hal_browser
         logger.info "Mounting HAL browser"
-        @app.use Rack::HalBrowser::Redirect, :exclude => ['/trace', '/network-graph', '/ui']
+        @app.use Rack::HalBrowser::Redirect
       else
         logger.info "Not mounting HAL browser"
       end
 
+      logger.info "Mounting UI"
+      require 'pact_broker/ui/app'
+
       logger.info "Mounting PactBroker::API"
       require 'pact_broker/api'
 
-      apps = [ui, PactBroker::API]
+      apps = [PactBroker::UI::App.new, PactBroker::API]
 
       @app.map "/" do
         run Rack::Cascade.new(apps)
@@ -96,26 +67,6 @@ module PactBroker
 
     end
 
-    class HtmlFilter
-
-      def initialize app
-        @app = app
-      end
-
-      def call env
-        if accepts_html_and_not_json_or_csv env
-          @app.call(env)
-        else
-          [404, {},[]]
-        end
-      end
-
-      def accepts_html_and_not_json_or_csv env
-        accept = env['HTTP_ACCEPT'] || ''
-        accept.include?("html") && !accept.include?("json") && !accept.include?("csv")
-      end
-
-    end
   end
 
 end

data/lib/pact_broker/logging.rb

@@ -1,4 +1,5 @@
 require 'logger'
+require 'pathname'
 
 module PactBroker
 

data/lib/pact_broker/models/pact.rb

@@ -3,15 +3,14 @@ require 'pact_broker/db'
 module PactBroker
 
   module Models
-    class Pact < Sequel::Model
+    class Pact
 
-      set_primary_key :id
-      associate(:many_to_one, :provider, :class => "PactBroker::Models::Pacticipant", :key => :provider_id, :primary_key => :id)
-      associate(:many_to_one, :consumer_version, :class => "PactBroker::Models::Version", :key => :version_id, :primary_key => :id)
+      attr_accessor :id, :provider, :consumer_version, :consumer, :updated_at, :created_at, :json_content, :consumer_version_number
 
-      #Need to work out how to do this properly!
-      def consumer_version_number
-        values[:consumer_version_number]
+      def initialize attributes
+        attributes.each_pair do | key, value |
+          self.send(key.to_s + "=", value)
+        end
       end
 
       def consumer
@@ -35,6 +34,5 @@ module PactBroker
       end
     end
 
-    Pact.plugin :timestamps, :update_on_create=>true
   end
 end

data/lib/pact_broker/repositories/pact.rb

@@ -0,0 +1,29 @@
+require 'pact_broker/models/pact'
+
+module PactBroker
+  module Repositories
+
+    class Pact < Sequel::Model
+
+      set_primary_key :id
+      associate(:many_to_one, :provider, :class => "PactBroker::Models::Pacticipant", :key => :provider_id, :primary_key => :id)
+      associate(:many_to_one, :consumer_version, :class => "PactBroker::Models::Version", :key => :version_id, :primary_key => :id)
+
+      Pact.plugin :timestamps, :update_on_create=>true
+
+      def to_model
+        PactBroker::Models::Pact.new(
+          id: id,
+          provider: provider,
+          consumer: consumer_version.pacticipant,
+          consumer_version_number: consumer_version.number,
+          consumer_version: consumer_version,
+          json_content: json_content,
+          updated_at: updated_at,
+          created_at: created_at
+          )
+      end
+    end
+
+  end
+end

data/lib/pact_broker/repositories/pact_repository.rb

@@ -1,6 +1,7 @@
 require 'sequel'
 require 'pact_broker/logging'
 require 'ostruct'
+require 'pact_broker/repositories/pact'
 
 module PactBroker
   module Repositories
@@ -9,62 +10,98 @@ module PactBroker
       include PactBroker::Logging
 
       def find_all_pacts_between consumer_name, options
-        pact_finder(consumer_name, options.fetch(:and))
-          .left_outer_join(:tags, {:version_id => :id}, {implicit_qualifier: :versions})
-          .reverse_order(:order).all
+        to_models do
+          pact_finder(consumer_name, options.fetch(:and))
+            .left_outer_join(:tags, {:version_id => :id}, {implicit_qualifier: :versions})
+            .reverse_order(:order)
+        end
       end
 
       def find_by_version_and_provider version_id, provider_id
-        PactBroker::Models::Pact.where(version_id: version_id, provider_id: provider_id).single_record
+        to_model do
+          PactBroker::Repositories::Pact.where(version_id: version_id, provider_id: provider_id).single_record
+        end
       end
 
       def find_latest_pacts
-        # Need to use aliases because sqlite returns row with `` in the column name, mysql does not
+        # Need to use aliases because sqlite returns row with `` in the column name,
+        # mysql does not
         db[:latest_pacts].select(:id,
           :consumer_id___consumer_id, :consumer_name___consumer_name,
           :provider_id___provider_id, :provider_name___provider_name,
-          :consumer_version_number___consumer_version_number).all.collect do | row |
+          :consumer_version_number___consumer_version_number,
+          :created_at___created_at,
+          :updated_at___updated_at).all.collect do | row |
           row_to_pact row
         end
 
       end
 
       def find_latest_pact(consumer_name, provider_name, tag = nil)
-        finder = pact_finder(consumer_name, provider_name)
-        finder = add_tag_criteria(finder, tag) unless tag.nil?
-        finder.order(:order).last
+        to_model do
+          finder = pact_finder(consumer_name, provider_name)
+          finder = add_tag_criteria(finder, tag) unless tag.nil?
+          finder.order(:order).last
+        end
       end
 
       def find_pact consumer_name, consumer_version, provider_name
-        pact_finder(consumer_name, provider_name).where('versions.number = ?', consumer_version).single_record
+        to_model do
+          pact_finder(consumer_name, provider_name)
+            .where('versions.number = ?', consumer_version)
+            .single_record
+        end
       end
 
       def create params
-        PactBroker::Models::Pact.new(version_id: params[:version_id], provider_id: params[:provider_id], json_content: params[:json_content]).save
+        to_model do
+          Pact.new(
+            version_id: params[:version_id],
+            provider_id: params[:provider_id],
+            json_content: params[:json_content]
+          ).save
+        end
       end
 
-      def create_or_update params
-        if pact = find_by_version_and_provider(params[:version_id], params[:provider_id])
-          pact.update_fields(json_content: params[:json_content])
-        else
-          create params
+      def update id, params
+        to_model do
+          Pact.find(id: id).tap do | pact |
+            pact.update(json_content: params[:json_content])
+          end
         end
       end
 
       def find_previous_pact pact
-        previous_pact = db[:all_pacts].where(:consumer_id => pact.consumer.id, :provider_id => pact.provider.id).where('consumer_version_order < ?', pact.consumer_version.order).order(:consumer_version_order).last
+        previous_pact = db[:all_pacts]
+          .where(
+            :consumer_id => pact.consumer.id,
+            :provider_id => pact.provider.id)
+          .where('consumer_version_order < ?', pact.consumer_version.order)
+          .order(:consumer_version_order)
+          .last
         previous_pact ? row_to_pact(previous_pact) : nil
       end
 
       private
 
+      def to_model
+        database_model = yield
+        database_model ? database_model.to_model : nil
+      end
+
+      def to_models
+        database_models = yield
+        database_models.collect(&:to_model)
+      end
+
       def db
         PactBroker::Models::Version.new.db
       end
 
       def pact_finder consumer_name, provider_name
-        PactBroker::Models::Pact.select(
-            :pacts__id, :pacts__json_content, :pacts__version_id, :pacts__provider_id, :pacts__created_at, :pacts__updated_at,
+        PactBroker::Repositories::Pact.select(
+            :pacts__id, :pacts__json_content, :pacts__version_id, :pacts__provider_id,
+            :pacts__created_at, :pacts__updated_at,
             :versions__number___consumer_version_number).
           join(:versions, {:id => :version_id}, {implicit_qualifier: :pacts}).
           join(:pacticipants, {:id => :pacticipant_id}, {:table_alias => :consumers, implicit_qualifier: :versions}).
@@ -86,8 +123,16 @@ module PactBroker
         consumer.id = row[:consumer_id]
         provider = Models::Pacticipant.new(name: row[:provider_name])
         provider.id = row[:provider_id]
-        consumer_version = OpenStruct.new(number: row[:consumer_version_number], pacticipant: consumer)
-        pact = OpenStruct.new(id: row[:id], consumer: consumer, consumer_version: consumer_version, provider: provider, consumer_version_number: row[:consumer_version_number])
+        consumer_version = OpenStruct.new(
+          number: row[:consumer_version_number],
+          pacticipant: consumer)
+        pact = Models::Pact.new(id: row[:id],
+          consumer: consumer,
+          consumer_version: consumer_version,
+          provider: provider,
+          consumer_version_number: row[:consumer_version_number],
+          created_at: row[:created_at],
+          updated_at: row[:updated_at])
       end
 
     end