pact_broker 2.0.5 → 2.1.0

data/spec/lib/pact_broker/versions/service_spec.rb

@@ -7,7 +7,7 @@ module PactBroker
 
       describe ".delete" do
         let!(:version) do
-          ProviderStateBuilder.new
+          TestDataBuilder.new
             .create_consumer
             .create_provider
             .create_consumer_version("1.2.3")

data/spec/lib/pact_broker/webhooks/repository_spec.rb

@@ -18,7 +18,7 @@ module PactBroker
           body: body)
       end
       let(:webhook) { Domain::Webhook.new(request: request)}
-      let(:test_data_builder) { ProviderStateBuilder.new }
+      let(:test_data_builder) { TestDataBuilder.new }
       let(:consumer) { test_data_builder.create_pacticipant 'Consumer'; test_data_builder.pacticipant}
       let(:provider) { test_data_builder.create_pacticipant 'Provider'; test_data_builder.pacticipant}
       let(:uuid) { 'the-uuid' }
@@ -202,7 +202,7 @@ module PactBroker
       end
 
       describe "find_by_consumer_and_provider" do
-        let(:test_data_builder) { ProviderStateBuilder.new }
+        let(:test_data_builder) { TestDataBuilder.new }
         subject { Repository.new.find_by_consumer_and_provider test_data_builder.consumer, test_data_builder.provider}
 
         context "when a webhook exists with a matching consumer and provider" do

data/spec/lib/pact_broker/webhooks/service_spec.rb

@@ -68,7 +68,7 @@ module PactBroker
         end
 
         let(:pact) do
-          ProviderStateBuilder.new
+          TestDataBuilder.new
             .create_consumer
             .create_provider
             .create_consumer_version

data/spec/service_consumers/provider_states_for_pact_broker_client.rb

@@ -1,4 +1,4 @@
-require 'spec/support/provider_state_builder'
+require 'spec/support/test_data_builder'
 
 Pact.provider_states_for "Pact Broker Client" do
 
@@ -8,7 +8,7 @@ Pact.provider_states_for "Pact Broker Client" do
 
   provider_state "the 'Pricing Service' already exists in the pact-broker" do
     set_up do
-      ProviderStateBuilder.new.create_pricing_service.create_pricing_service_version("1.3.0")
+      TestDataBuilder.new.create_pricing_service.create_pricing_service_version("1.3.0")
     end
   end
 
@@ -21,7 +21,7 @@ Pact.provider_states_for "Pact Broker Client" do
 
   provider_state "a pact between Condor and the Pricing Service exists" do
     set_up do
-      ProviderStateBuilder.new
+      TestDataBuilder.new
         .create_condor
         .create_condor_version('1.3.0')
         .create_pricing_service
@@ -35,7 +35,7 @@ Pact.provider_states_for "Pact Broker Client" do
 
   provider_state "the 'Pricing Service' and 'Condor' already exist in the pact-broker, and Condor already has a pact published for version 1.3.0" do
     set_up do
-      ProviderStateBuilder.new
+      TestDataBuilder.new
         .create_condor
         .create_condor_version('1.3.0')
         .create_pricing_service
@@ -45,19 +45,19 @@ Pact.provider_states_for "Pact Broker Client" do
 
   provider_state "'Condor' already exist in the pact-broker, but the 'Pricing Service' does not" do
     set_up do
-      ProviderStateBuilder.new.create_condor
+      TestDataBuilder.new.create_condor
     end
   end
 
   provider_state "'Condor' exists in the pact-broker" do
     set_up do
-      ProviderStateBuilder.new.create_condor.create_condor_version('1.3.0')
+      TestDataBuilder.new.create_condor.create_condor_version('1.3.0')
     end
   end
 
   provider_state "'Condor' exists in the pact-broker with version 1.3.0, tagged with 'prod'" do
     set_up do
-      ProviderStateBuilder.new
+      TestDataBuilder.new
         .create_pacticipant("Condor")
         .create_version('1.3.0')
         .create_tag('prod')
@@ -70,7 +70,7 @@ Pact.provider_states_for "Pact Broker Client" do
 
    provider_state "a pact between Condor and the Pricing Service exists for the production version of Condor" do
      set_up do
-      ProviderStateBuilder.new
+      TestDataBuilder.new
         .create_consumer("Condor")
         .create_consumer_version('1.3.0')
         .create_consumer_version_tag('prod')
@@ -91,7 +91,7 @@ Pact.provider_states_for "Pact Broker Client" do
 
   provider_state "a latest pact between Condor and the Pricing Service exists" do
     set_up do
-      ProviderStateBuilder.new
+      TestDataBuilder.new
           .create_consumer("Condor")
           .create_consumer_version('1.3.0')
           .create_provider("Pricing Service")
@@ -101,7 +101,7 @@ Pact.provider_states_for "Pact Broker Client" do
 
   provider_state "tagged as prod pact between Condor and the Pricing Service exists" do
     set_up do
-      ProviderStateBuilder.new
+      TestDataBuilder.new
           .create_consumer("Condor")
           .create_consumer_version('1.3.0')
           .create_consumer_version_tag('prod')

data/spec/support/rspec_matchers.rb

@@ -4,6 +4,6 @@ RSpec::Matchers.define :be_datey do |expected|
   end
 
   failure_message do |actual|
-    "expected #{actual} to be an instance of DateTime or Time"
+    "expected #{actual.inspect} to be an instance of DateTime or Time"
   end
-end
+end

data/spec/support/{provider_state_builder.rb → test_data_builder.rb}

@@ -21,7 +21,7 @@ require 'pact_broker/tags/repository'
 require 'pact_broker/webhooks/repository'
 require 'ostruct'
 
-class ProviderStateBuilder
+class TestDataBuilder
 
   include PactBroker::Repositories
 
@@ -183,7 +183,7 @@ class ProviderStateBuilder
 
   def set_created_at_if_set created_at, table_name, selector
     if created_at
-      Sequel::Model.db.run("update #{table_name} set created_at = \"#{created_at.xmlschema}\" where #{selector.keys.first} = \"#{selector.values.first}\"")
+      Sequel::Model.db[table_name].where(selector.keys.first => selector.values.first).update(created_at: created_at.xmlschema)
     end
   end
 

data/tasks/database.rb

@@ -1,7 +1,8 @@
 require 'pact_broker/project_root'
+require 'pact_broker/db/migrate'
+require 'pact_broker/db/version'
 require 'sequel'
 require 'yaml'
-require 'db'
 
 Sequel.extension :migration
 
@@ -14,15 +15,11 @@ module PactBroker
 
     def migrate target = nil
       opts = target ? {target: target} : {}
-      Sequel::Migrator.run(database, migrations_dir, opts)
+      PactBroker::DB::Migrate.call(database, opts)
     end
 
     def version
-      if database.tables.include?(:schema_info)
-        database[:schema_info].first[:version]
-      else
-        0
-      end
+      PactBroker::DB::Version.call(database)
     end
 
     def delete_database_file
@@ -61,7 +58,6 @@ module PactBroker
     end
 
     def create
-      puts adapter
       if psql?
         system('psql postgres -c "create database pact_broker"')
         system('psql postgres -c "CREATE USER pact_broker WITH PASSWORD \'pact_broker\'"')
@@ -91,7 +87,10 @@ module PactBroker
     end
 
     def database
-      @@database ||= ::DB.connection_for_env env
+      @@database ||= begin
+        require 'db'
+        ::DB.connection_for_env env
+      end
     end
 
     private

data/tasks/db.rake

@@ -1,10 +1,5 @@
 require 'pact_broker/tasks'
 
-PactBroker::DB::MigrationTask.new do | task |
-  require 'db'
-  task.database_connection = DB::PACT_BROKER_DB
-end
-
 namespace :bundler do
   task :setup do
     require 'rubygems'

data/tasks/test_db.rake

@@ -0,0 +1,11 @@
+require 'pact_broker/tasks'
+
+PactBroker::DB::MigrationTask.new do | task |
+  require 'db'
+  task.database_connection = DB::PACT_BROKER_DB
+end
+
+PactBroker::DB::VersionTask.new do | task |
+  require 'db'
+  task.database_connection = DB::PACT_BROKER_DB
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.1.0
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-15 00:00:00.000000000 Z
+date: 2017-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -388,6 +388,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: dry-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.3
 description: A server that stores and returns pact files generated by the pact gem.
   It enables head/prod cross testing of the consumer and provider projects.
 email:
@@ -499,6 +513,7 @@ files:
 - lib/pact_broker/api/decorators/webhooks_decorator.rb
 - lib/pact_broker/api/pact_broker_urls.rb
 - lib/pact_broker/api/renderers/html_pact_renderer.rb
+- lib/pact_broker/api/resources/authentication.rb
 - lib/pact_broker/api/resources/base_resource.rb
 - lib/pact_broker/api/resources/group.rb
 - lib/pact_broker/api/resources/index.rb
@@ -532,7 +547,9 @@ files:
 - lib/pact_broker/constants.rb
 - lib/pact_broker/date_helper.rb
 - lib/pact_broker/db.rb
+- lib/pact_broker/db/migrate.rb
 - lib/pact_broker/db/validate_encoding.rb
+- lib/pact_broker/db/version.rb
 - lib/pact_broker/diagnostic/app.rb
 - lib/pact_broker/diagnostic/resources/base_resource.rb
 - lib/pact_broker/diagnostic/resources/dependencies.rb
@@ -598,6 +615,7 @@ files:
 - lib/pact_broker/tags/service.rb
 - lib/pact_broker/tasks.rb
 - lib/pact_broker/tasks/migration_task.rb
+- lib/pact_broker/tasks/version_task.rb
 - lib/pact_broker/ui.rb
 - lib/pact_broker/ui/app.rb
 - lib/pact_broker/ui/controllers/base_controller.rb
@@ -632,6 +650,7 @@ files:
 - lib/rack/pact_broker/convert_file_extension_to_accept_header.rb
 - lib/rack/pact_broker/database_transaction.rb
 - lib/rack/pact_broker/invalid_uri_protection.rb
+- lib/rack/pact_broker/ui_authentication.rb
 - pact_broker.gemspec
 - pact_broker_client-pact_broker.json
 - public/Network Graph_files/d3.v3.js
@@ -672,6 +691,8 @@ files:
 - spec/features/delete_version_spec.rb
 - spec/features/delete_webhook_spec.rb
 - spec/features/get_diff_spec.rb
+- spec/features/get_latest_tagged_pact_spec.rb
+- spec/features/get_latest_untagged_pact_spec.rb
 - spec/features/get_pact_spec.rb
 - spec/features/get_pact_versions_spec.rb
 - spec/features/get_previous_distinct_version.rb
@@ -789,14 +810,15 @@ files:
 - spec/spec_helper.rb
 - spec/support/database_cleaner.rb
 - spec/support/fixture_helpers.rb
-- spec/support/provider_state_builder.rb
 - spec/support/rspec_match_hash.rb
 - spec/support/rspec_matchers.rb
 - spec/support/shared_examples_for_responses.rb
+- spec/support/test_data_builder.rb
 - tasks/database.rb
 - tasks/db.rake
 - tasks/pact.rake
 - tasks/rspec.rake
+- tasks/test_db.rake
 - vendor/hal-browser/.gitignore
 - vendor/hal-browser/MIT-LICENSE.txt
 - vendor/hal-browser/README.md
@@ -855,7 +877,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: See description
@@ -865,6 +887,8 @@ test_files:
 - spec/features/delete_version_spec.rb
 - spec/features/delete_webhook_spec.rb
 - spec/features/get_diff_spec.rb
+- spec/features/get_latest_tagged_pact_spec.rb
+- spec/features/get_latest_untagged_pact_spec.rb
 - spec/features/get_pact_spec.rb
 - spec/features/get_pact_versions_spec.rb
 - spec/features/get_previous_distinct_version.rb
@@ -982,7 +1006,7 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/database_cleaner.rb
 - spec/support/fixture_helpers.rb
-- spec/support/provider_state_builder.rb
 - spec/support/rspec_match_hash.rb
 - spec/support/rspec_matchers.rb
 - spec/support/shared_examples_for_responses.rb
+- spec/support/test_data_builder.rb