pact_broker 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50c48f4aaa8d0b97a1bf1c5e22221a9f3c1f11da
-  data.tar.gz: ffaeb22aabb0ca377af193023e9d53c9f1e8603e
+  metadata.gz: 8b8b4752ea480c1accb24a8ac99986695d2927e1
+  data.tar.gz: d6cd4104ef81b44b089ee51f37d28d46de6edc11
 SHA512:
-  metadata.gz: 6f78013eca52554efcaca7fdedef4ab71c8c0d5da00226b6296043a1e0880adbf17f228eec498b942b5d4ffaff091237023086f0f27acd564241a4c81f740c2d
-  data.tar.gz: 0f3577bf77b6f5d6fe9e035eaf9495db9bf685a8fd76ec697f97c084234e15550f8a3c1463f2d8d99fc03a94b07ef94e1239483fa14efcf2ff24aba805f435e9
+  metadata.gz: a3369dc3103dc71184db705883000d0ac6a522ca1f7450bf9635ae0976be70eff8a655be909d002c3157a5d7955ab991f3ccd348fc2eedf4960d04548eb43184
+  data.tar.gz: 7d863d3a17c5d4aa0dcf05fcbe7584a085792894263e1486db6d90570e5aa8d6341eea39e6f06d6b622332363c03c02f84d5f3c497f116bc8c9ed15d0632009f

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 Do this to generate your change history
 
-    $ git log --pretty=format:'  * %h - %s (%an, %ad)' vX.Y.Z..HEAD
+    $ git log --pretty=format:'  * %h - %s (%an, %ad)'
+
+#### 2.0.4 (2017-06-02)
+* 99e1c25 - Turn off http_origin checking for https://github.com/pact-foundation/pact_broker/issues/108 (Beth Skurrie, Fri Jun 2 16:27:38 2017 +1000)
+* e58f609 - Add favicon.ico (Beth Skurrie, Mon May 29 15:02:22 2017 +1000)
+* 2780f0a - Add pull request guidelines. (Beth Skurrie, Mon May 29 11:45:04 2017 +1000)
 
 #### 2.0.3 (2017-05-17)
 * c03b871 - Make specs pass for sqlite, postgres and mysql. At the same time. Amazing. (Beth Skurrie, Sun May 28 10:22:20 2017 +1000)

data/CONTRIBUTING.md

@@ -10,6 +10,12 @@ Please provide the following information with your issue to enable us to respond
 * An executable code example where possible. You can use the [pact-ruby-e2e-example] codebase to quickly recreate your issue.
 * Where you are using a pact broker deployed on third party infrastructure, please include the relevant details.
 
+# Pull requests
+* Write tests for any changes
+* Follow existing code style and conventions
+* Separate unrelated changes into multiple pull requests
+* For bigger changes, make sure you start a discussion first by creating an issue and explaining the intended change
+
 [wiki]: https://github.com/pact-foundation/pact_broker/wiki
 [stackoverflow]: https://stackoverflow.com/questions/tagged/pact-broker
 [pact-ruby-e2e-example]: https://github.com/pact-foundation/pact-ruby-e2e-example

data/README.md

@@ -90,20 +90,23 @@ Use the HAL browser to view documentation as you browse.
 * Click on the HAL Browser link to have a poke around the API.
 * Click on the book icon under "docs" to view documentation related to a given relation.
 
-### Hosted
+### For reals
 
-In a hurry? Hate having to run your own infrastructure? Check out
-the [Hosted Pact Broker](https://pact.dius.com.au/?utm_source=github&utm_campaign=GITHUB_BROKER&utm_medium=github) - it's fast, it's secure and it's free!
+#### Hosted
 
-### For reals
+In a hurry? Hate having to run your own infrastructure? Check out the [Hosted Pact Broker][hosted] - it's fast, it's secure and it's free!
+
+#### Container solutions
+
+You can use the [Pact Broker Docker container][docker] or [Terraform on AWS][terraform] 
 
-You can use the [Pact Broker Docker container][docker] or [Terraform on AWS][terraform] or to roll your own...
+#### Rolling your own
 
-* Create a database using a product that is supported by the Sequel gem (listed on this page http://sequel.jeremyevans.net/rdoc/files/README_rdoc.html). The migrations have been tested on MySQL and PostgreSQL - your mileage will vary on other databases.
-* __Note:__ It is recommended to use __PostgreSQL__ as it will support JSON search features that are planned in a future release, however MySQL the other [semi supported](https://github.com/pact-foundation/pact_broker/issues/33) database.
+* Create a PostgreSQL (recommended) or MySQL (not recommended, see following note) database.
+* __Note:__ It is recommended to use __PostgreSQL__ as it will support JSON search features that are planned in the future, however MySQL the other [semi supported](https://github.com/pact-foundation/pact_broker/issues/33) database.
 * Install ruby 2.2.0 or later and bundler >= 1.12.0
 * Copy the [example](/example) directory to the location you want to install the application.
-* Modify the config.ru and Gemfile as desired (eg. choose database driver gem, set your database credentials. Use the "pg" gem if using Postgres.)
+* Modify the config.ru and Gemfile as desired (eg. choose database driver gem, set your database credentials. Use the "pg" gem if using Postgres and the "mysql2" gem if using MySQL)
 * Please ensure you use `encoding: 'utf8'` in your Sequel options to avoid encoding issues.
 * For production usage, use a web application server like [Phusion Passenger](https://www.phusionpassenger.com) or [Nginx](http://nginx.org/) to serve the Pact Broker application.
 * Deploy to your location of choice.
@@ -114,3 +117,4 @@ You can use the [Pact Broker Docker container][docker] or [Terraform on AWS][ter
 [different-teams]: https://github.com/realestate-com-au/pact/wiki/Using-pact-where-the-consumer-team-is-different-from-the-provider-team
 [docker]: https://hub.docker.com/r/dius/pact-broker
 [terraform]: https://github.com/nadnerb/terraform-pact-broker
+[hosted]: https://pact.dius.com.au/?utm_source=github&utm_campaign=GITHUB_BROKER&utm_medium=github

data/lib/pact_broker/api.rb

@@ -36,47 +36,47 @@ module PactBroker
       app.routes do
         add(['trace', :*], Webmachine::Trace::TraceResource) unless ENV['RACK_ENV'] == 'production'
 
-        add ['pacts', 'provider', :provider_name, 'consumer', :consumer_name, 'versions'], Api::Resources::PactVersions
-        add ['pacts', 'provider', :provider_name, 'consumer', :consumer_name, 'versions', :consumer_version_number], Api::Resources::Pact # Not the standard URL, but keep for backwards compatibility
+        add ['pacts', 'provider', :provider_name, 'consumer', :consumer_name, 'versions'], Api::Resources::PactVersions, {resource_name: "pact_publications"}
+        add ['pacts', 'provider', :provider_name, 'consumer', :consumer_name, 'versions', :consumer_version_number], Api::Resources::Pact, {resource_name: "pact_publication", deprecated: true} # Not the standard URL, but keep for backwards compatibility
 
         # Pacts
-        add ['pacts', 'provider', :provider_name, 'consumer', :consumer_name, 'version', :consumer_version_number], Api::Resources::Pact
-        add ['pacts', 'provider', :provider_name, 'consumer', :consumer_name, 'version', :consumer_version_number, 'previous-distinct'], Api::Resources::PreviousDistinctPactVersion
-        add ['pacts', 'provider', :provider_name, 'consumer', :consumer_name, 'version', :consumer_version_number, 'diff', 'previous-distinct'], Api::Resources::PactContentDiff
+        add ['pacts', 'provider', :provider_name, 'consumer', :consumer_name, 'version', :consumer_version_number], Api::Resources::Pact, {resource_name: "pact_publication"}
+        add ['pacts', 'provider', :provider_name, 'consumer', :consumer_name, 'version', :consumer_version_number, 'previous-distinct'], Api::Resources::PreviousDistinctPactVersion, {resource_name: "previous_distinct_pact_version"}
+        add ['pacts', 'provider', :provider_name, 'consumer', :consumer_name, 'version', :consumer_version_number, 'diff', 'previous-distinct'], Api::Resources::PactContentDiff, {resource_name: "previous_distinct_pact_version_diff"}
 
         # Verifications
-        add ['pacts', 'provider', :provider_name, 'consumer', :consumer_name, 'pact-version', :pact_version_sha, 'verification-results'], Api::Resources::Verifications
-        add ['pacts', 'provider', :provider_name, 'consumer', :consumer_name, 'pact-version', :pact_version_sha, 'verification-results', :verification_number], Api::Resources::Verification
-        add ['verification-results', 'consumer', :consumer_name, 'version', :consumer_version_number,'latest'], Api::Resources::LatestVerificationsForConsumerVersion
+        add ['pacts', 'provider', :provider_name, 'consumer', :consumer_name, 'pact-version', :pact_version_sha, 'verification-results'], Api::Resources::Verifications, {resource_name: "verification_results"}
+        add ['pacts', 'provider', :provider_name, 'consumer', :consumer_name, 'pact-version', :pact_version_sha, 'verification-results', :verification_number], Api::Resources::Verification, {resource_name: "verification_result"}
+        add ['verification-results', 'consumer', :consumer_name, 'version', :consumer_version_number,'latest'], Api::Resources::LatestVerificationsForConsumerVersion, {resource_name: "verification_results_for_consumer_version"}
 
         # Latest pacts
-        add ['pacts', 'provider', :provider_name, 'consumer', :consumer_name, 'latest'], Api::Resources::LatestPact
-        add ['pacts', 'provider', :provider_name, 'consumer', :consumer_name, 'latest', :tag], Api::Resources::LatestPact
-        add ['pacts', 'provider', :provider_name, 'latest'], Api::Resources::LatestProviderPacts
-        add ['pacts', 'provider', :provider_name, 'latest', :tag], Api::Resources::LatestProviderPacts
-        add ['pacts', 'latest'], Api::Resources::LatestPacts
+        add ['pacts', 'provider', :provider_name, 'consumer', :consumer_name, 'latest'], Api::Resources::LatestPact, {resource_name: "latest_pact_publication"}
+        add ['pacts', 'provider', :provider_name, 'consumer', :consumer_name, 'latest', :tag], Api::Resources::LatestPact, {resource_name: "latest_tagged_pact_publication"}
+        add ['pacts', 'provider', :provider_name, 'latest'], Api::Resources::LatestProviderPacts, {resource_name: "latest_provider_pact_publications"}
+        add ['pacts', 'provider', :provider_name, 'latest', :tag], Api::Resources::LatestProviderPacts, {resource_name: "latest_tagged_provider_pact_publications"}
+        add ['pacts', 'latest'], Api::Resources::LatestPacts, {resource_name: "latest_pacts"}
 
         # Deprecated pact
-        add ['pact', 'provider', :provider_name, 'consumer', :consumer_name, 'version', :consumer_version_number], Api::Resources::Pact # Deprecate, singular /pact
-        add ['pact', 'provider', :provider_name, 'consumer', :consumer_name, 'latest'], Api::Resources::LatestPact
+        add ['pact', 'provider', :provider_name, 'consumer', :consumer_name, 'version', :consumer_version_number], Api::Resources::Pact, {resource_name: "pact_publications", deprecated: "true"} # Deprecate, singular /pact
+        add ['pact', 'provider', :provider_name, 'consumer', :consumer_name, 'latest'], Api::Resources::LatestPact, {resource_name: "latest_pact_publications", deprecated: "true"}
 
         # Pacticipants
-        add ['pacticipants'], Api::Resources::Pacticipants
-        add ['pacticipants', :name], Api::Resources::Pacticipant
-        add ['pacticipants', :pacticipant_name, 'versions'], Api::Resources::Versions
-        add ['pacticipants', :pacticipant_name, 'versions', :pacticipant_version_number], Api::Resources::Version
-        add ['pacticipants', :pacticipant_name, 'versions', :pacticipant_version_number, 'tags', :tag_name], Api::Resources::Tag
+        add ['pacticipants'], Api::Resources::Pacticipants, {resource_name: "pacticipants"}
+        add ['pacticipants', :name], Api::Resources::Pacticipant, {resource_name: "pacticipant"}
+        add ['pacticipants', :pacticipant_name, 'versions'], Api::Resources::Versions, {resource_name: "pacticipant_versions"}
+        add ['pacticipants', :pacticipant_name, 'versions', :pacticipant_version_number], Api::Resources::Version, {resource_name: "pacticipant_version"}
+        add ['pacticipants', :pacticipant_name, 'versions', :pacticipant_version_number, 'tags', :tag_name], Api::Resources::Tag, {resource_name: "pacticipant_version_tag"}
 
         # Webhooks
-        add ['webhooks', 'provider', :provider_name, 'consumer', :consumer_name ], Api::Resources::PactWebhooks
-        add ['webhooks', :uuid ], Api::Resources::Webhook
-        add ['webhooks', :uuid, 'execute' ], Api::Resources::WebhookExecution
-        add ['webhooks'], Api::Resources::Webhooks
+        add ['webhooks', 'provider', :provider_name, 'consumer', :consumer_name ], Api::Resources::PactWebhooks, {resource_name: "pact_webhooks"}
+        add ['webhooks', :uuid ], Api::Resources::Webhook, {resource_name: "webhook"}
+        add ['webhooks', :uuid, 'execute' ], Api::Resources::WebhookExecution, {resource_name: "execute_webhook"}
+        add ['webhooks'], Api::Resources::Webhooks, {resource_name: "webhooks"}
 
-        add ['relationships'], Api::Resources::Relationships
-        add ['groups', :pacticipant_name], Api::Resources::Group
+        add ['relationships'], Api::Resources::Relationships, {resource_name: "relationships"}
+        add ['groups', :pacticipant_name], Api::Resources::Group, {resource_name: "group"}
 
-        add [], Api::Resources::Index
+        add [], Api::Resources::Index, {resource_name: "index"}
       end
     end
 

data/lib/pact_broker/api/renderers/html_pact_renderer.rb

@@ -35,7 +35,8 @@ module PactBroker
         private
 
         def head
-         "<link rel='stylesheet' type='text/css' href='/stylesheets/github.css'>
+         "<title>#{title}</title>
+          <link rel='stylesheet' type='text/css' href='/stylesheets/github.css'>
           <link rel='stylesheet' type='text/css' href='/stylesheets/pact.css'>
           <link rel='stylesheet' type='text/css' href='/stylesheets/github-json.css'>
           <script src='/javascripts/highlight.pack.js'></script>
@@ -60,6 +61,10 @@ module PactBroker
           </div>"
         end
 
+        def title
+          "Pact between #{@pact.consumer.name} and #{@pact.provider.name}"
+        end
+
         def published_date
           @pact.created_at.to_time.localtime.to_datetime.strftime("%a %d %b %Y, %l:%M%P %:z")
         end

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

@@ -31,9 +31,17 @@ module PactBroker
         include PactBroker::Api::PactBrokerUrls
         include PactBroker::Logging
 
+        def initialize
+          PactBroker.configuration.before_resource.call(self)
+        end
+
+        def finish_request
+          PactBroker.configuration.after_resource.call(self)
+        end
+
         def identifier_from_path
           request.path_info.each_with_object({}) do | pair, hash|
-            hash[pair.first] = URI.decode(pair.last)
+            hash[pair.first] = pair.last === String ? URI.decode(pair.last) : pair.last
           end
         end
 

data/lib/pact_broker/app.rb

@@ -7,6 +7,7 @@ require 'rack/pact_broker/add_pact_broker_version_header'
 require 'rack/pact_broker/convert_file_extension_to_accept_header'
 require 'rack/pact_broker/database_transaction'
 require 'rack/pact_broker/invalid_uri_protection'
+require 'rack/pact_broker/accepts_html_filter'
 require 'sucker_punch'
 
 module PactBroker
@@ -16,14 +17,21 @@ module PactBroker
     attr_accessor :configuration
 
     def initialize &block
+      @app_builder = ::Rack::Builder.new
+      @cascade_apps = []
       @configuration = PactBroker.configuration
       yield configuration
       post_configure
-      build_app
+      migrate_database
+      prepare_app
+    end
+
+    def use *args, &block
+      @app_builder.use *args, &block
     end
 
     def call env
-      @app.call env
+      running_app.call env
     end
 
     private
@@ -36,7 +44,9 @@ module PactBroker
       PactBroker.logger = configuration.logger
       SuckerPunch.logger = configuration.logger
       configure_database_connection
+    end
 
+    def migrate_database
       if configuration.auto_migrate_db
         logger.info "Migrating database"
         PactBroker::DB.run_migrations configuration.database_connection
@@ -55,44 +65,67 @@ module PactBroker
       Sequel.typecast_timezone = :utc # If no timezone specified on dates going into the database, assume they are UTC
     end
 
-    def build_app
-      @app = Rack::Builder.new
+    def prepare_app
+      configure_middleware
 
-      @app.use Rack::Protection, except: [:remote_token, :session_hijacking]
-      @app.use Rack::PactBroker::InvalidUriProtection
-      @app.use Rack::PactBroker::AddPactBrokerVersionHeader
-      @app.use Rack::Static, :urls => ["/stylesheets", "/css", "/fonts", "/js", "/javascripts", "/images"], :root => PactBroker.project_root.join("public")
-      @app.use Rack::PactBroker::ConvertFileExtensionToAcceptHeader
+      if configuration.enable_diagnostic_endpoints
+        @cascade_apps << build_diagnostic
+      end
+
+      @cascade_apps << build_ui
+      @cascade_apps << build_api
+    end
+
+    def configure_middleware
+      @app_builder.use Rack::Protection, except: [:remote_token, :session_hijacking, :http_origin]
+      @app_builder.use Rack::PactBroker::InvalidUriProtection
+      @app_builder.use Rack::PactBroker::AddPactBrokerVersionHeader
+      @app_builder.use Rack::Static, :urls => ["/stylesheets", "/css", "/fonts", "/js", "/javascripts", "/images"], :root => PactBroker.project_root.join("public")
+      @app_builder.use Rack::Static, :urls => ["/favicon.ico"], :root => PactBroker.project_root.join("public/images"), header_rules: [[:all, {'Content-Type' => 'image/x-icon'}]]
+      @app_builder.use Rack::PactBroker::ConvertFileExtensionToAcceptHeader
 
       if configuration.use_hal_browser
         logger.info "Mounting HAL browser"
-        @app.use Rack::HalBrowser::Redirect
+        @app_builder.use Rack::HalBrowser::Redirect
       else
         logger.info "Not mounting HAL browser"
       end
+    end
 
+    def build_ui
       logger.info "Mounting UI"
       require 'pact_broker/ui'
+      builder = ::Rack::Builder.new
+      builder.use Rack::PactBroker::AcceptsHtmlFilter
+      builder.run PactBroker::UI::App.new
+      builder
+    end
 
+    def build_api
       logger.info "Mounting PactBroker::API"
       require 'pact_broker/api'
+      builder = ::Rack::Builder.new
+      builder.use Rack::PactBroker::DatabaseTransaction, configuration.database_connection
+      builder.run PactBroker::API
+      builder
+    end
 
-      apps = []
-
-      if configuration.enable_diagnostic_endpoints
-        require 'pact_broker/diagnostic/app'
-        apps << PactBroker::Diagnostic::App.new
-      end
-
-      apps << PactBroker::UI::App.new
-      apps << Rack::PactBroker::DatabaseTransaction.new(PactBroker::API, configuration.database_connection)
+    def build_diagnostic
+      require 'pact_broker/diagnostic/app'
+      builder = ::Rack::Builder.new
+      builder.run PactBroker::Diagnostic::App.new
+      builder
+    end
 
-      @app.map "/" do
-        run Rack::Cascade.new(apps)
+    def running_app
+      @running_app ||= begin
+        apps = @cascade_apps
+        @app_builder.map "/" do
+          run Rack::Cascade.new(apps)
+        end
+        @app_builder
       end
-
     end
 
   end
-
-end
+end

data/lib/pact_broker/configuration.rb

@@ -4,6 +4,11 @@ module PactBroker
     @@configuration ||= Configuration.default_configuration
   end
 
+  # @private, for testing only
+  def self.reset_configuration
+    @@configuration = Configuration.default_configuration
+  end
+
   class Configuration
 
     SAVABLE_SETTING_NAMES = [:order_versions_by_date, :use_case_sensitive_resource_names]
@@ -14,6 +19,11 @@ module PactBroker
     attr_accessor :semver_formats
     attr_writer :logger
 
+    def initialize
+      @before_resource_hook = ->(resource){}
+      @after_resource_hook = ->(resource){}
+    end
+
     def logger
       @logger ||= create_logger log_path
     end
@@ -43,6 +53,22 @@ module PactBroker
       }
     end
 
+    def before_resource &block
+      if block_given?
+        @before_resource_hook = block
+      else
+        @before_resource_hook
+      end
+    end
+
+    def after_resource &block
+      if block_given?
+        @after_resource_hook = block
+      else
+        @after_resource_hook
+      end
+    end
+
     def save_to_database
       # Can't require a Sequel::Model class before the connection has been set
       require 'pact_broker/config/save'

data/lib/pact_broker/diagnostic/app.rb

@@ -21,8 +21,8 @@ module PactBroker
       def build_diagnostic_app
         app = Webmachine::Application.new do |app|
           app.routes do
-            add ['diagnostic','status','heartbeat'], Diagnostic::Resources::Heartbeat
-            add ['diagnostic','status','dependencies'], Diagnostic::Resources::Dependencies
+            add ['diagnostic','status','heartbeat'], Diagnostic::Resources::Heartbeat, {resource_name: 'diagnostic_heartbeat'}
+            add ['diagnostic','status','dependencies'], Diagnostic::Resources::Dependencies, {resource_name: 'diagnostic_dependencies'}
           end
         end
 

data/lib/pact_broker/diagnostic/resources/base_resource.rb

@@ -0,0 +1,17 @@
+require 'webmachine'
+
+module PactBroker
+  module Diagnostic
+    module Resources
+      class BaseResource < Webmachine::Resource
+        def initialize
+          PactBroker.configuration.before_resource.call(self)
+        end
+
+        def finish_request
+          PactBroker.configuration.after_resource.call(self)
+        end
+      end
+    end
+  end
+end

data/lib/pact_broker/diagnostic/resources/dependencies.rb

@@ -1,11 +1,11 @@
-require 'webmachine'
+require 'pact_broker/diagnostic/resources/base_resource'
 require 'pact_broker/db'
 require 'pact_broker/logging'
 
 module PactBroker
   module Diagnostic
     module Resources
-      class Dependencies < Webmachine::Resource
+      class Dependencies < BaseResource
 
         include Logging
 

data/lib/pact_broker/diagnostic/resources/heartbeat.rb

@@ -1,9 +1,9 @@
-require 'webmachine'
+require 'pact_broker/diagnostic/resources/base_resource'
 
 module PactBroker
   module Diagnostic
     module Resources
-      class Heartbeat < Webmachine::Resource
+      class Heartbeat < BaseResource
 
         def allowed_methods
           ["GET"]

data/lib/pact_broker/ui/app.rb

@@ -9,8 +9,6 @@ module PactBroker
       def initialize
         @app = ::Rack::Builder.new {
 
-          use HtmlFilter
-
           map "/ui/relationships" do
             run PactBroker::UI::Controllers::Relationships
           end
@@ -24,7 +22,7 @@ module PactBroker
           end
 
           map "/" do
-            run RedirectRootToRelationships
+            run PactBroker::UI::Controllers::Relationships
           end
         }
       end
@@ -32,51 +30,6 @@ module PactBroker
       def call env
         @app.call(env)
       end
-
-      class RedirectRootToRelationships
-
-        def self.call 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' =>  "#{env['SCRIPT_NAME']}/ui/relationships"},[]]
-          else
-            [404, {},[]]
-          end
-        end
-
-      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'] || ''
-          accepts_html(accept) && !accepts_json_or_csv(accept)
-        end
-
-        def accepts_html(accept)
-          accept.include?("html")
-        end
-
-        def accepts_json_or_csv accept
-          accept.include?("json") || accept.include?("csv")
-        end
-
-      end
-
     end
   end
-
-end
+end

data/lib/pact_broker/ui/controllers/relationships.rb

@@ -12,7 +12,7 @@ module PactBroker
         get "/" do
           view_model = ViewDomain::Relationships.new(pacticipant_service.find_relationships)
 
-          haml :'relationships/show', {locals: {relationships: view_model}}, {layout: 'layouts/main'}
+          haml :'relationships/show', {locals: {relationships: view_model, title: "Pacts"}, layout: :'layouts/main'}
         end
 
       end

data/lib/pact_broker/ui/views/groups/show.html.erb

@@ -3,6 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>Network Graph</title>
+<link rel='shortcut icon' href='/favicon.ico' type='image/x-icon'/>
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <meta name="description" content="">
 <meta name="author" content="Duncan Alexander">

data/lib/pact_broker/ui/views/layouts/main.haml

@@ -1,2 +1,6 @@
 %html
-  = yield
+  %head
+    %title= defined?(title) ? title : ""
+    %link{rel: 'shortcut icon', href: '/images/favicon.ico', type:'image/x-icon'}
+  %body
+    = yield

data/lib/pact_broker/ui/views/relationships/show.haml

@@ -1,12 +1,9 @@
-%head
-  %title
-    Pacts
+%body
   %link{rel: 'stylesheet', href: '/css/bootstrap.min.css'}
   %link{rel: 'stylesheet', href: '/stylesheets/relationships.css'}
   %script{type: 'text/javascript', src:'/javascripts/jquery-2.1.1.min.js'}
   %script{type: 'text/javascript', src:'/javascripts/jquery.tablesorter.min.js'}
   %script{type: 'text/javascript', src:'/js/bootstrap.min.js'}
-%body
   %nav.navbase-default.navbar-right{role: "navigation"}
     .container
       %ul

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '2.0.3'
+  VERSION = '2.0.4'
 end

data/lib/rack/pact_broker/accepts_html_filter.rb

@@ -0,0 +1,31 @@
+module Rack
+  module PactBroker
+    class AcceptsHtmlFilter
+
+      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'] || ''
+        accepts_html(accept) && !accepts_json_or_csv(accept)
+      end
+
+      def accepts_html(accept)
+        accept.include?("html")
+      end
+
+      def accepts_json_or_csv accept
+        accept.include?("json") || accept.include?("csv")
+      end
+    end
+  end
+end

data/spec/integration/app_spec.rb

@@ -23,6 +23,11 @@ module PactBroker
       end
     end
 
+    it "exposes a favicon.ico file" do
+      get "/favicon.ico"
+      expect(last_response.headers['Content-Type']).to eq "image/x-icon"
+    end
+
     context "when Accept includes text/html" do
       let(:env) { {'HTTP_ACCEPT' => 'text/html'} }
 
@@ -32,9 +37,10 @@ module PactBroker
 
         let(:path) { '/' }
 
-        it "redirects to /ui/relationships" do
-          expect(subject.status).to eq 303
-          expect(subject.headers['Location']).to eq '/ui/relationships'
+        it "returns the relationships page" do
+          expect(subject.status).to eq 200
+          expect(subject.headers['Content-Type']).to include 'text/html'
+          expect(subject.body).to include 'Pacts'
         end
 
       end

data/spec/lib/pact_broker/api/renderers/html_pact_renderer_spec.rb

@@ -40,6 +40,7 @@ module PactBroker
             expect(subject).to match /<h\d>.*Some Provider/
             expect(subject).to include("Date published:")
             expect(subject).to include("Thu 27 Feb 2014, 11:00am +11:00")
+            expect(subject).to match /title.*Pact between Consumer and Provider/
           end
 
           context "when the content is not a valid pact, but is still JSON" do

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

@@ -29,7 +29,7 @@ module PactBroker::Api
           subject { get "/pacts/provider/provider_name/consumer/consumer_name/latest",{}, {'HTTP_ACCEPT' => "text/html"} }
 
           it "find the pact" do
-            expect(PactBroker::Pacts::Service).to receive(:find_latest_pact).with(pact_id_params)
+            expect(PactBroker::Pacts::Service).to receive(:find_latest_pact).with(hash_including(pact_id_params))
             subject
           end
 

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

@@ -29,7 +29,7 @@ module PactBroker
 
           context "when the tag exists" do
             it "deletes the tag by name" do
-              expect(Tags::Service).to receive(:delete) .with(tag_attributes)
+              expect(Tags::Service).to receive(:delete) .with(hash_including(tag_attributes))
               subject
             end
 
@@ -145,7 +145,7 @@ module PactBroker
 
 
             it "creates the tag" do
-              expect(Tags::Service).to receive(:create).with(tag_attributes)
+              expect(Tags::Service).to receive(:create).with(hash_including(tag_attributes))
               subject
             end
 

data/spec/lib/pact_broker/app_spec.rb

@@ -9,7 +9,7 @@ module PactBroker
         # do nothing
       end
 
-      def post_configure
+      def migrate_database
         # do nothing
       end
 
@@ -18,7 +18,6 @@ module PactBroker
     let(:app) do
       TestApp.new do | configuration |
         configuration.database_connection = PactBroker::DB.connection
-        configuration.auto_migrate_db = false
       end
     end
 
@@ -27,6 +26,40 @@ module PactBroker
       expect(last_response.headers['X-Pact-Broker-Version']).to match /\d/
     end
 
+    class Middleware
+
+      def initialize app
+        @app = app
+      end
+
+      def call env
+        self.class.calls << env
+        @app.call(env)
+      end
+
+      def self.calls
+        @calls ||= []
+      end
+    end
+
+    it "acts like a ::Rack::Builder" do
+      app.use Middleware
+      expect { get "/" }.to change { Middleware.calls.count }.by(1)
+    end
+
+    describe "before_resource and after_resource" do
+      CALLBACKS = []
+      before do
+        PactBroker.configuration.before_resource { | resource | CALLBACKS << "before" }
+        PactBroker.configuration.after_resource { | resource | CALLBACKS << "after" }
+      end
+
+      it "executes the callbacks" do
+        get "/"
+        expect(CALLBACKS).to eq ["before", "after"]
+      end
+    end
+
     describe "transactions", no_db_clean: true do
       let(:pact_content) { load_fixture('a_consumer-a_provider.json') }
       let(:path) { "/pacts/provider/A%20Provider/consumer/A%20Consumer/versions/1.2.3" }

data/spec/spec_helper.rb

@@ -18,6 +18,10 @@ RSpec.configure do | config |
     PactBroker::DB.connection = PactBroker::Database.database = DB::PACT_BROKER_DB
   end
 
+  config.before :each do
+    PactBroker.reset_configuration
+  end
+
   config.include Rack::Test::Methods
   config.mock_with :rspec do |mocks|
     mocks.verify_partial_doubles = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-28 00:00:00.000000000 Z
+date: 2017-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -534,6 +534,7 @@ files:
 - lib/pact_broker/db.rb
 - lib/pact_broker/db/validate_encoding.rb
 - lib/pact_broker/diagnostic/app.rb
+- lib/pact_broker/diagnostic/resources/base_resource.rb
 - lib/pact_broker/diagnostic/resources/dependencies.rb
 - lib/pact_broker/diagnostic/resources/heartbeat.rb
 - lib/pact_broker/doc/controllers/app.rb
@@ -626,6 +627,7 @@ files:
 - lib/pact_broker/webhooks/webhook.rb
 - lib/rack/hal_browser.rb
 - lib/rack/hal_browser/redirect.rb
+- lib/rack/pact_broker/accepts_html_filter.rb
 - lib/rack/pact_broker/add_pact_broker_version_header.rb
 - lib/rack/pact_broker/convert_file_extension_to_accept_header.rb
 - lib/rack/pact_broker/database_transaction.rb
@@ -645,6 +647,7 @@ files:
 - public/fonts/glyphicons-halflings-regular.ttf
 - public/fonts/glyphicons-halflings-regular.woff
 - public/images/doc-text.svg
+- public/images/favicon.ico
 - public/javascripts/d3.v3.js.pagespeed.ce.dFNRrGTALe.js
 - public/javascripts/highlight.pack.js
 - public/javascripts/jquery-2.1.1.min.js