pact_broker 1.18.0.beta.1 → 1.18.0

data/spec/support/provider_state_builder.rb

@@ -1,5 +1,21 @@
 require 'pact_broker/repositories'
+require 'pact_broker/webhooks/repository'
+require 'pact_broker/webhooks/service'
+require 'pact_broker/pacts/repository'
+require 'pact_broker/pacts/service'
+require 'pact_broker/pacticipants/repository'
+require 'pact_broker/pacticipants/service'
+require 'pact_broker/versions/repository'
+require 'pact_broker/versions/service'
+require 'pact_broker/tags/repository'
+require 'pact_broker/tags/service'
+require 'pact_broker/domain'
 require 'json'
+require 'pact_broker/versions/repository'
+require 'pact_broker/pacts/repository'
+require 'pact_broker/pacticipants/repository'
+require 'pact_broker/tags/repository'
+require 'pact_broker/webhooks/repository'
 
 class ProviderStateBuilder
 
@@ -83,24 +99,24 @@ class ProviderStateBuilder
     self
   end
 
-  def create_consumer consumer_name
+  def create_consumer consumer_name = "Consumer #{model_counter}"
     create_pacticipant consumer_name
     @consumer = @pacticipant
     self
   end
 
-  def create_provider provider_name
+  def create_provider provider_name = "Provider #{model_counter}"
     create_pacticipant provider_name
     @provider = @pacticipant
     self
   end
 
-  def create_version version_number
+  def create_version version_number = "1.0.#{model_counter}"
     @version = PactBroker::Domain::Version.create(:number => version_number, :pacticipant => @pacticipant)
     self
   end
 
-  def create_consumer_version version_number
+  def create_consumer_version version_number = "1.0.#{model_counter}"
     @consumer_version = PactBroker::Domain::Version.create(:number => version_number, :pacticipant => @consumer)
     self
   end
@@ -120,12 +136,23 @@ class ProviderStateBuilder
     self
   end
 
-  def create_webhook
-    request = PactBroker::Domain::WebhookRequest.new(method: 'POST', url: 'http://example.org', headers: {'Content-Type' => 'application/json'})
+  def create_webhook params = {}
+    default_params = {method: 'POST', url: 'http://example.org', headers: {'Content-Type' => 'application/json'}}
+    request = PactBroker::Domain::WebhookRequest.new(default_params.merge(params))
     @webhook = PactBroker::Webhooks::Repository.new.create PactBroker::Webhooks::Service.next_uuid, PactBroker::Domain::Webhook.new(request: request), @consumer, @provider
     self
   end
 
+  def model_counter
+    @@model_counter ||= 0
+    @@model_counter += 1
+    @@model_counter
+  end
+
+  def and_return instance_variable_name
+    instance_variable_get("@#{instance_variable_name}")
+  end
+
   private
 
   def default_json_content
@@ -136,8 +163,9 @@ class ProviderStateBuilder
        "provider"     => {
          "name" => "Pricing Service"
        },
-       "interactions" => []
+       "interactions" => [],
+       "random" => rand
      }.to_json
    end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 1.18.0.beta.1
+  version: 1.18.0
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-05 00:00:00.000000000 Z
+date: 2017-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -220,6 +220,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: sucker_punch
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -235,7 +249,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -395,11 +409,11 @@ files:
 - db/migrations/migration_helper.rb
 - db/pact_broker_database.sqlite3
 - example/Gemfile
+- example/basic_auth/Gemfile
+- example/basic_auth/Procfile
+- example/basic_auth/README.md
+- example/basic_auth/config.ru
 - example/config.ru
-- example/heroku/Gemfile
-- example/heroku/Procfile
-- example/heroku/README.md
-- example/heroku/config.ru
 - example/pact_broker_database.sqlite3
 - lib/db.rb
 - lib/pact_broker.rb
@@ -462,7 +476,6 @@ files:
 - lib/pact_broker/api/resources/webhooks.rb
 - lib/pact_broker/app.rb
 - lib/pact_broker/configuration.rb
-- lib/pact_broker/configuration/configure_basic_auth.rb
 - lib/pact_broker/constants.rb
 - lib/pact_broker/date_helper.rb
 - lib/pact_broker/db.rb
@@ -543,6 +556,7 @@ files:
 - lib/pact_broker/versions/parse_semantic_version.rb
 - lib/pact_broker/versions/repository.rb
 - lib/pact_broker/versions/service.rb
+- lib/pact_broker/webhooks/job.rb
 - lib/pact_broker/webhooks/repository.rb
 - lib/pact_broker/webhooks/service.rb
 - lib/pact_broker/webhooks/webhook.rb
@@ -575,9 +589,12 @@ files:
 - public/stylesheets/github.css
 - public/stylesheets/pact.css
 - public/stylesheets/relationships.css
+- script/foo-bar.json
 - script/publish-2.sh
+- script/publish-new.sh
 - script/publish-not-a-pact.sh
 - script/publish.sh
+- script/recreate-pg-db.sh
 - script/update-hal-browser
 - spec/features/create_webhook_spec.rb
 - spec/features/delete_pact_spec.rb
@@ -634,7 +651,6 @@ files:
 - spec/lib/pact_broker/api/resources/webhook_execution_spec.rb
 - spec/lib/pact_broker/api/resources/webhook_spec.rb
 - spec/lib/pact_broker/api/resources/webhooks_spec.rb
-- spec/lib/pact_broker/configuration/configure_basic_auth_spec.rb
 - spec/lib/pact_broker/configuration_spec.rb
 - spec/lib/pact_broker/db/validate_encoding_spec.rb
 - spec/lib/pact_broker/diagnostic/resources/dependencies_spec.rb
@@ -664,6 +680,7 @@ files:
 - spec/lib/pact_broker/ui/view_models/relationship_spec.rb
 - spec/lib/pact_broker/ui/view_models/relationships_spec.rb
 - spec/lib/pact_broker/versions/repository_spec.rb
+- spec/lib/pact_broker/webhooks/job_spec.rb
 - spec/lib/pact_broker/webhooks/repository_spec.rb
 - spec/lib/pact_broker/webhooks/service_spec.rb
 - spec/lib/rack/hal_browser/redirect_spec.rb
@@ -732,9 +749,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.11
@@ -797,7 +814,6 @@ test_files:
 - spec/lib/pact_broker/api/resources/webhook_execution_spec.rb
 - spec/lib/pact_broker/api/resources/webhook_spec.rb
 - spec/lib/pact_broker/api/resources/webhooks_spec.rb
-- spec/lib/pact_broker/configuration/configure_basic_auth_spec.rb
 - spec/lib/pact_broker/configuration_spec.rb
 - spec/lib/pact_broker/db/validate_encoding_spec.rb
 - spec/lib/pact_broker/diagnostic/resources/dependencies_spec.rb
@@ -827,6 +843,7 @@ test_files:
 - spec/lib/pact_broker/ui/view_models/relationship_spec.rb
 - spec/lib/pact_broker/ui/view_models/relationships_spec.rb
 - spec/lib/pact_broker/versions/repository_spec.rb
+- spec/lib/pact_broker/webhooks/job_spec.rb
 - spec/lib/pact_broker/webhooks/repository_spec.rb
 - spec/lib/pact_broker/webhooks/service_spec.rb
 - spec/lib/rack/hal_browser/redirect_spec.rb

data/example/heroku/config.ru

@@ -1,12 +0,0 @@
-require 'fileutils'
-require 'logger'
-require 'sequel'
-require 'pact_broker'
-require 'pg'
-
-app = PactBroker::App.new do | config |
-  config.database_connection = Sequel.connect(ENV['DATABASE_URL'], adapter: "postgres", encoding: 'utf8')
-  config.protect_with_basic_auth :all, {username: ENV['PACT_BROKER_USERNAME'], password: ENV['PACT_BROKER_PASSWORD']}
-end
-
-run app

data/lib/pact_broker/configuration/configure_basic_auth.rb

@@ -1,83 +0,0 @@
-require 'pact_broker/configuration'
-
-module PactBroker
-  class Configuration
-
-    class ConfigurableBasicAuth
-
-      def initialize(app)
-        @app = app
-        @predicates = []
-      end
-
-      def protect credentials_list, &predicate
-        basic_auth_proxy = ::Rack::Auth::Basic.new(app) do | username, password |
-          credentials_list.any? do | credentials |
-            username == credentials[:username] && password == credentials[:password]
-          end
-        end
-        predicates << [predicate, basic_auth_proxy]
-      end
-
-      def call(env)
-        predicates = matching_predicates(env)
-        if predicates.any?
-          cascade(predicates, env)
-        else
-          app.call(env)
-        end
-      end
-
-      private
-
-      attr_accessor :app, :predicates
-
-      def matching_predicates env
-        predicates.select do | predicate, basic_auth_proxy |
-          predicate.call(env)
-        end
-      end
-
-      def cascade predicates, env
-        response = nil
-        predicates.each do | predicate, basic_auth_proxy |
-          response = basic_auth_proxy.call(env)
-          return response if response.first != 401
-        end
-        response
-      end
-
-    end
-
-    class ConfigureBasicAuth
-
-      def self.call app, configuration
-        new(app, configuration).call
-      end
-
-      def initialize app, configuration
-        @configuration = configuration
-        @basic_auth_proxy = ConfigurableBasicAuth.new(app)
-      end
-
-      def call
-        configuration.basic_auth_predicates.each do | scope, predicate |
-          configure_basic_auth_for_scope scope, &predicate
-        end
-
-        basic_auth_proxy
-      end
-
-      private
-
-      attr_accessor :basic_auth_proxy, :configuration
-
-      def configure_basic_auth_for_scope scope, &predicate
-        if configuration.protect_with_basic_auth?(scope)
-          credentials = configuration.basic_auth_credentials_list_for(scope)
-          basic_auth_proxy.protect(credentials, &predicate)
-        end
-      end
-    end
-  end
-end

data/spec/lib/pact_broker/configuration/configure_basic_auth_spec.rb

@@ -1,267 +0,0 @@
-require 'pact_broker/configuration/configure_basic_auth'
-require 'pact_broker/app'
-
-module PactBroker
-  class Configuration
-    describe ConfigurableBasicAuth do
-
-      let(:target_app) { ->(env){  [200, {}, ["hello"]] } }
-      let(:app) do
-        auth_app = ConfigurableBasicAuth.new(target_app)
-        auth_app.protect([{username: 'username', password: 'password'}]) do | env |
-          env['PATH_INFO'] == '/foo'
-        end
-        auth_app
-      end
-
-      context "when not authorized" do
-        it "does not allow requests" do
-          get "/foo"
-          expect(last_response.status).to eq 401
-        end
-      end
-
-      context "when authorized" do
-
-        before { basic_authorize 'username', 'password' }
-
-        it "allows requests" do
-          get "/foo"
-          expect(last_response.status).to eq 200
-        end
-      end
-    end
-
-    describe ConfigureBasicAuth do
-      def read_request_to_ui
-        get "/"
-        last_response
-      end
-
-      def read_request_to_api
-        get "/pacts/latest"
-        last_response
-      end
-
-      def write_request_to_api
-        put "/pacts/provider/foo/consumer/bar/version/1.2.3", '{}', {'Content-Type' => 'application/json'}
-        last_response
-      end
-
-      def read_request_to_diagnostic
-        get "/diagnostic/status/heartbeat"
-        last_response
-      end
-
-      def authorize_request
-        basic_authorize 'username', 'password'
-      end
-
-
-      before do
-        PactBroker.reset_configuration
-      end
-
-      describe "with no basic_auth" do
-        let(:app) do
-          app = PactBroker::App.new do | config |
-            config.database_connection = PactBroker::DB.connection
-          end
-        end
-
-        context "when not authorized" do
-          it "allows GET requests to the UI" do
-            expect(read_request_to_ui.status).to_not eq 401
-          end
-
-          it "allows GET requests to the API" do
-            expect(read_request_to_api.status).to_not eq 401
-          end
-
-          it "allows non GET requests to the API" do
-            expect(write_request_to_api.status).to_not eq 401
-          end
-
-          it "allows GET requests to the diagnostics app" do
-            expect(read_request_to_diagnostic.status).to_not eq 401
-          end
-        end
-      end
-
-      describe "with basic_auth for :all" do
-        let(:app) do
-          app = PactBroker::App.new do | config |
-            config.database_connection = PactBroker::DB.connection
-            config.protect_with_basic_auth :all, {username: 'username', password: 'password'}
-          end
-        end
-
-        context "when authorized" do
-          before do
-            authorize_request
-          end
-
-          it "allows GET requests to the UI" do
-            expect(read_request_to_ui.status).to_not eq 401
-          end
-
-          it "allows GET requests to the API" do
-            expect(read_request_to_api.status).to_not eq 401
-          end
-
-          it "allows non GET requests to the API" do
-            expect(write_request_to_api.status).to_not eq 401
-          end
-
-          it "allows GET requests to the diagnostics app" do
-            expect(read_request_to_diagnostic.status).to_not eq 401
-          end
-        end
-
-        context "when not authorized" do
-          it "does not allow GET requests to the UI" do
-            expect(read_request_to_ui.status).to eq 401
-          end
-
-          it "does not allow GET requests the API" do
-            expect(read_request_to_api.status).to eq 401
-          end
-
-          it "does not allow non GET requests the API" do
-            expect(write_request_to_api.status).to eq 401
-          end
-
-          it "does not allow GET requests to the diagnostics app" do
-            expect(read_request_to_diagnostic.status).to eq 401
-          end
-        end
-      end
-
-      describe "with basic_auth for :app_write" do
-
-        let(:app) do
-          app = PactBroker::App.new do | config |
-            config.database_connection = PactBroker::DB.connection
-            config.protect_with_basic_auth :app_write, {username: 'username', password: 'password'}
-          end
-        end
-
-        context "when authorized" do
-          before do
-            authorize_request
-          end
-
-          it "allows GET requests to the diagnostics app" do
-            expect(read_request_to_diagnostic.status).to_not eq 401
-          end
-
-          it "allows GET requests to the app_write app" do
-            expect(read_request_to_diagnostic.status).to_not eq 401
-          end
-        end
-
-        context "when not authorized" do
-
-          it "allows GET requests to the UI" do
-            expect(read_request_to_ui.status).to_not eq 401
-          end
-
-          it "allows GET requests the API" do
-            expect(read_request_to_api.status).to_not eq 401
-          end
-
-          it "does not allow non GET requests the API" do
-            expect(write_request_to_api.status).to eq 401
-          end
-
-          it "allows GET requests to the diagnostics app" do
-            expect(read_request_to_diagnostic.status).to_not eq 401
-          end
-        end
-      end
-
-      describe "with multiple users for for :app_write" do
-        let(:app) do
-          app = PactBroker::App.new do | config |
-            config.database_connection = PactBroker::DB.connection
-            config.protect_with_basic_auth :app_write, {username: 'read_username', password: 'password'}
-            config.protect_with_basic_auth :app_write, {username: 'another_read_username', password: 'password'}
-          end
-        end
-
-        context "when the first credentials are used" do
-          before { basic_authorize 'read_username', 'password' }
-
-          it "allows a request" do
-            write_request_to_api
-            expect(last_response.status).to_not eq 401
-          end
-        end
-
-        context "when the second credentials are used" do
-          before { basic_authorize 'another_read_username', 'password' }
-
-          it "allows a request" do
-            write_request_to_api
-            expect(last_response.status).to_not eq 401
-          end
-        end
-
-        context "when the wrong credentials are used" do
-          before { basic_authorize 'wrong_username', 'password' }
-
-          it "does not allow the request" do
-            write_request_to_api
-            expect(last_response.status).to eq 401
-          end
-        end
-
-        context "when no credentials are used" do
-          it "does not allow the request" do
-            write_request_to_api
-            expect(last_response.status).to eq 401
-          end
-        end
-
-      end
-
-      describe "with an app_read user and an app user" do
-        let(:app) do
-          app = PactBroker::App.new do | config |
-            config.database_connection = PactBroker::DB.connection
-            config.protect_with_basic_auth :app_read, {username: 'read_username', password: 'password'}
-            config.protect_with_basic_auth :app, {username: 'read_and_write_username', password: 'password'}
-          end
-        end
-
-        context "when the app credentials are used" do
-          before { basic_authorize 'read_and_write_username', 'password' }
-
-          it "allows a read request" do
-            read_request_to_api
-            expect(last_response.status).to_not eq 401
-          end
-
-          it "allows a write request" do
-            write_request_to_api
-            expect(last_response.status).to_not eq 401
-          end
-        end
-
-        context "when the read_username credentials are used" do
-          before { basic_authorize 'read_username', 'password' }
-
-          it "allows a read request" do
-            read_request_to_api
-            expect(last_response.status).to_not eq 401
-          end
-
-          it "does not allow a write request" do
-            write_request_to_api
-            expect(last_response.status).to eq 401
-          end
-        end
-      end
-    end
-  end
-end