pact_broker 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ccb2b3e09704513328cc45bb520d07bec978a711
-  data.tar.gz: a98ed177a3db187c531c6f7a606a38c0382278b5
+  metadata.gz: 6a3d490394fcae01bbca8de110f64f32cd726bd0
+  data.tar.gz: 924597d9aee8cdcd23c2fc0cf3b04445f1923188
 SHA512:
-  metadata.gz: 029ca439a15afebbcca133103d59a67ce4a359df4f57dfb4d9da5e0cf02b820d6eccbb93304d64f400216d455f7c3beac9b27fcd04318a5beb4960e66cf569a7
-  data.tar.gz: 462f2d6f9a04dbe36916b94e0f2a52965c8f23234d901ea80280859e2f71c8695a2c1f7b484f763a633b1de873c9d9cec6b9ac93b08dab900f07d93f809c52db
+  metadata.gz: ef24406ac81f1990047cc42841dfd0ae2a0df5b2506386eaac087c946bb528208f632f9a8181eb47b5c056423eb7ecadf7e219911c13e007d14a1bfb4337cc2c
+  data.tar.gz: 9b6c513d799464f0a8de5b58a02c1bc6335f2c755b92a676468d31bdbc7302577c0e40500500ac05ce49e55717b316648c489e73224d0bd4ff2879b82d3c2061

data/.travis.yml

@@ -24,5 +24,5 @@ before_script:
   - chmod +x ./cc-test-reporter
 script:
   - bundle exec rake
-  - if [ "$DATABASE_ADAPTER" == "postgres" ]; then ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT; fi
+  - if [ "$DATABASE_ADAPTER" == "postgres" ]; then ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT || true; fi
   - bundle exec bundle-audit update && bundle exec bundle-audit

data/CHANGELOG.md

@@ -1,7 +1,12 @@
-Do this to generate your change history
+<a name="v2.4.1"></a>
+### v2.4.1 (2017-09-07)
 
-    $ git log --pretty=format:'  * %h - %s (%an, %ad)'
+#### Bug Fixes
 
+* allow resource identifiers to contain escaped forward slashes	 ([d875079](/../../commit/d875079))
+
+<a name="v2.4.0"></a>
+### v2.4.0 (2017-07-31)
 * 3a03f41 - fix(publish verification result): Fix Location header for newly created resource (Beth Skurrie, Mon Jul 31 10:49:37 2017 +1000)
 * 3b0f390 - feat(pacticipant labels): Add HAL link to pacticipants resource to find pacticipants by label. (Beth Skurrie, Mon Jul 24 08:17:36 2017 +1000)
 * 588d2ad - fix(pacticipant and pacticipants resources): Add correctly capitalised and namespaced properties and relations. Added deprecation warnings to existing incorrect properties and relations. (Beth Skurrie, Mon Jul 24 08:14:52 2017 +1000)

data/README.md

@@ -93,8 +93,10 @@ Use the HAL browser to view documentation as you browse.
 ### To have a play around on your local machine
 
 * Install ruby 2.2.0 or later and bundler >= 1.12.0
+    * Windows users: get a Rails/Ruby installer from [RailsInstaller](http://railsinstaller.org/) and run it
+    * unix users just use your package manager
 * Run `git clone git@github.com:pact-foundation/pact_broker.git && cd pact_broker/example`
-* Run `bundle`
+* Run `bundle install`
 * Run `bundle exec rackup -p 8080`
 * Open [http://localhost:8080](http://localhost:8080) and you should see a list containing the pact between the Zoo App and the Animal Service.
 * Click on the arrow to see the generated HTML documentation.

data/RELEASING.md

@@ -3,12 +3,12 @@
 1. Increment the version in `./lib/pact_broker/version.rb`
 2. Update the `CHANGELOG.md` using:
 
-      $ git log --pretty=format:'  * %h - %s (%an, %ad)'
+      $ bundle exec rake generate_changelog
 
 3. Add files to git
 
       $ git add CHANGELOG.md lib/pact_broker/version.rb
-      $ git commit -m "Releasing version $(ruby -r ./lib/pact_broker/version.rb -e "puts PactBroker::VERSION")"
+      $ git commit -m "chore(release): version $(ruby -r ./lib/pact_broker/version.rb -e "puts PactBroker::VERSION")" && git push
 
 3. Release:
 

data/lib/pact_broker/api/decorators/verification_summary_decorator.rb

@@ -1,5 +1,6 @@
 require_relative 'base_decorator'
 require_relative 'version_decorator'
+require_relative 'verification_decorator'
 require 'ostruct'
 
 module PactBroker

data/lib/pact_broker/api/resources.rb

@@ -0,0 +1,10 @@
+require 'reform'
+require 'reform/form/dry'
+
+Reform::Form.class_eval do
+  feature Reform::Form::Dry
+end
+
+Dir.glob(File.expand_path(File.join(__FILE__, "..", "resources", "*.rb"))) do |file|
+  require file
+end

data/lib/pact_broker/api.rb

@@ -1,36 +1,5 @@
-require 'reform'
-require 'reform/form/dry'
-Reform::Form.class_eval do
-  feature Reform::Form::Dry
-end
-
-require 'pact_broker/api/resources/pact'
-require 'pact_broker/api/resources/latest_pact'
-require 'pact_broker/api/resources/latest_pacts'
-require 'pact_broker/api/resources/pacticipant'
-require 'pact_broker/api/resources/pacticipants'
-require 'pact_broker/api/resources/pacticipants_for_label'
-require 'pact_broker/api/resources/tag'
-require 'pact_broker/api/resources/label'
-require 'pact_broker/api/resources/index'
-require 'pact_broker/api/resources/relationships'
-require 'pact_broker/api/resources/group'
-require 'pact_broker/api/resources/pact_webhooks'
-require 'pact_broker/api/resources/pact_versions'
-require 'pact_broker/api/resources/webhooks'
-require 'pact_broker/api/resources/webhook'
-require 'pact_broker/api/resources/webhook_execution'
-require 'pact_broker/api/resources/version'
-require 'pact_broker/api/resources/versions'
-require 'pact_broker/api/resources/pact_content_diff'
-require 'pact_broker/api/resources/previous_distinct_pact_version'
-require 'pact_broker/api/resources/latest_provider_pacts'
-require 'pact_broker/api/resources/verifications'
-require 'pact_broker/api/resources/verification'
-require 'pact_broker/api/resources/latest_verifications_for_consumer_version'
-require 'pact_broker/api/resources/badge'
-
 require 'webmachine/adapters/rack_mapped'
+require 'pact_broker/api/resources'
 
 module PactBroker
 

data/lib/pact_broker/app.rb

@@ -78,7 +78,7 @@ module PactBroker
     end
 
     def configure_middleware
-      @app_builder.use Rack::Protection, except: [:remote_token, :session_hijacking, :http_origin]
+      @app_builder.use Rack::Protection, except: [:path_traversal, :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")

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '2.4.0'
+  VERSION = '2.4.1'
 end

data/pact_broker.gemspec

@@ -46,7 +46,9 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'mysql2', '~>0.3.15'
   gem.add_development_dependency 'webmock', '~>2.3'
   gem.add_development_dependency 'rspec', '~>3.0'
-  gem.add_development_dependency 'rspec-its'
-  gem.add_development_dependency 'database_cleaner'
+  gem.add_development_dependency 'rspec-its', '~>1.2'
+  gem.add_development_dependency 'database_cleaner', '~>1.6'
   gem.add_development_dependency 'pg'
+  gem.add_development_dependency 'conventional-changelog', '~>1.3'
+
 end

data/script/publish-new.sh

@@ -1,10 +1,9 @@
-# set -x
+set -e
 BODY=$(ruby -e "require 'json'; j = JSON.parse(File.read('script/foo-bar.json')); j['interactions'][0]['providerState'] = 'it is ' + Time.now.to_s; puts j.to_json")
 latest_url=$(curl http://localhost:9292/pacts/provider/Bar/consumer/Foo/latest | jq -r ._links.self.href)
-next_version=$(echo ${latest_url} | ruby -e "require 'semver'; puts SemVer.parse(ARGF.read[/\d+\.\d\.\d+/]).tap{ | v| v.minor = v.minor + 1}.format('%M.%m.%p')")
-echo ${BODY} >> tmp.json
-curl -v -XPUT \-H "Content-Type: application/json" \
--d@tmp.json \
-http://127.0.0.1:9292/pacts/provider/Bar/consumer/Foo/version/${next_version}
+next_version=$(echo ${latest_url} | ruby -e "version = ARGF.read[/\d+\.\d+\.\d+/]; require 'semver'; puts SemVer.parse(version).tap{ | v| v.minor = v.minor + 1}.format('%M.%m.%p')")
+echo ${BODY} > tmp.json
+curl -v -XPUT \-H "Content-Type: application/json" -d@tmp.json \
+  http://localhost:9292/pacts/provider/Bar/consumer/Foo/version/${next_version}
 rm tmp.json
 echo ""

data/script/seed.rb

@@ -0,0 +1,85 @@
+#!/usr/bin/env ruby
+
+raise "Please supply database path" unless ARGV[0]
+
+$LOAD_PATH.unshift './lib'
+$LOAD_PATH.unshift './spec'
+ENV['RACK_ENV'] = 'development'
+require 'sequel'
+require 'logger'
+DATABASE_CREDENTIALS = {logger: Logger.new($stdout), adapter: "sqlite", database: ARGV[0], :encoding => 'utf8'}
+connection = Sequel.connect(DATABASE_CREDENTIALS)
+connection.timezone = :utc
+require 'pact_broker'
+require 'support/test_data_builder'
+
+def random_build
+  rand * 100
+end
+
+tables_to_clean = [:labels, :webhook_executions, :verifications, :pact_publications, :pact_versions, :pacts, :pact_version_contents, :tags, :versions, :webhook_headers, :webhooks, :pacticipants]
+
+tables_to_clean.each do | table_name |
+  connection[table_name].delete if connection.table_exists?(table_name)
+end
+
+class TestDataBuilder
+  def method_missing *args
+      self
+  end
+
+  def publish_pact params = {}
+    create_pact params
+  end
+end
+
+# latest verifications
+# TestDataBuilder.new
+#   .create_consumer("Foo")
+#   .create_provider("Bar")
+#   .create_consumer_version("1.2.3")
+#   .create_pact
+#   .create_verification(provider_version: "4.5.6", success: true)
+#   .create_provider("Wiffle")
+#   .create_pact
+#   .create_verification(provider_version: "5.6.7", success: false)
+#   .create_provider("Meep")
+#   .create_pact
+
+
+TestDataBuilder.new
+  .create_consumer("Foo")
+  .create_label("microservice")
+  .create_provider("Bar")
+  .create_label("microservice")
+  .create_webhook(method: 'GET', url: 'http://127.0.0.1:1234/')
+  .create_consumer_version("1.2.100")
+  .publish_pact
+  .create_verification(provider_version: "1.4.234", success: true, execution_date: DateTime.now - 15)
+  .revise_pact
+  .create_consumer_version("1.2.101")
+  .publish_pact
+  .create_consumer_version("1.2.102")
+  .publish_pact(created_at: (Date.today - 7).to_datetime)
+  .create_provider("Animals")
+  .create_webhook(method: 'GET', url: 'http://127.0.0.1:1234/')
+  .publish_pact(created_at: (Time.now - 140).to_datetime)
+  .create_verification(provider_version: "2.0.366", execution_date: Date.today - 2) #changed
+  .create_provider("Wiffles")
+  .publish_pact
+  .create_verification(provider_version: "3.6.100", success: false, execution_date: Date.today - 7)
+  .create_provider("Hello World App")
+  .create_consumer_version("1.2.107")
+  .publish_pact(created_at: (Date.today - 1).to_datetime)
+  .create_consumer("The Android App")
+  .create_provider("The back end")
+  .create_webhook(method: 'GET', url: 'http://127.0.0.1:1234/')
+  .create_consumer_version("1.2.106")
+  .publish_pact
+  .create_consumer("Some other app")
+  .create_provider("A service")
+  .create_webhook(method: 'GET', url: 'http://127.0.0.1:1234/')
+  .create_webhook_execution
+  .create_consumer_version("1.2.106")
+  .publish_pact(created_at: (Date.today - 26).to_datetime)
+  .create_verification(provider_version: "4.8.152", execution_date: DateTime.now)

data/script/webhook-server.ru

@@ -0,0 +1,6 @@
+count = 0
+run -> (env) {
+  count += 1
+  status = (count % 3 == 0) ? 200 : 500
+  puts "Received request"; [status, {}, ["Hello. This might be an error.\n"]]
+}

data/spec/features/tag_version_spec.rb

@@ -0,0 +1,13 @@
+describe "tagging a pacticipant version" do
+  let(:path) { "/pacticipants/Foo/versions/1.2.3/tags/feat%2Fbar" }
+
+  subject { put path, nil, {'CONTENT_TYPE' => 'application/json'}; last_response }
+
+  context "when the pacticipant/version/tag do not exist" do
+    it "creates a tag" do
+      expect{ subject }.to change {
+        PactBroker::Domain::Tag.where(name: 'feat/bar').count
+      }.by(1)
+    end
+  end
+end

data/spec/integration/app_spec.rb

@@ -187,5 +187,15 @@ module PactBroker
         expect(last_response.status).to eq 404
       end
     end
+
+    describe "when a resource identifier contains a slash" do
+      let(:path) { "/pacticipants/Foo/versions/1.2.3/tags/feat%2Fbar" }
+
+      subject { put path, nil, {'CONTENT_TYPE' => 'application/json'}; last_response }
+
+      it "returns a success status" do
+        expect(subject.status).to eq 201
+      end
+    end
   end
 end

data/tasks/release.rake

@@ -0,0 +1,6 @@
+require 'conventional_changelog'
+
+task :generate_changelog do
+  require 'pact_broker/version'
+  ConventionalChangelog::Generator.new.generate! version: "v#{PactBroker::VERSION}"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-31 00:00:00.000000000 Z
+date: 2017-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -364,30 +364,30 @@ dependencies:
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -402,6 +402,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: conventional-changelog
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.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:
@@ -521,6 +535,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.rb
 - lib/pact_broker/api/resources/authentication.rb
 - lib/pact_broker/api/resources/badge.rb
 - lib/pact_broker/api/resources/base_resource.rb
@@ -706,7 +721,9 @@ files:
 - script/publish.sh
 - script/record_verification.sh
 - script/recreate-pg-db.sh
+- script/seed.rb
 - script/update-hal-browser
+- script/webhook-server.ru
 - spec/features/create_webhook_spec.rb
 - spec/features/delete_label_spec.rb
 - spec/features/delete_pact_spec.rb
@@ -732,6 +749,7 @@ files:
 - spec/features/publish_not_a_pact_spec.rb
 - spec/features/publish_pact_spec.rb
 - spec/features/publish_verification_spec.rb
+- spec/features/tag_version_spec.rb
 - spec/features/update_pacticipant_spec.rb
 - spec/fixtures/a_consumer-a_provider-2.json
 - spec/fixtures/a_consumer-a_provider-3.json
@@ -852,6 +870,7 @@ files:
 - tasks/database.rb
 - tasks/db.rake
 - tasks/pact.rake
+- tasks/release.rake
 - tasks/rspec.rake
 - tasks/test_db.rake
 - vendor/hal-browser/.gitignore
@@ -912,7 +931,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: See description
@@ -942,6 +961,7 @@ test_files:
 - spec/features/publish_not_a_pact_spec.rb
 - spec/features/publish_pact_spec.rb
 - spec/features/publish_verification_spec.rb
+- spec/features/tag_version_spec.rb
 - spec/features/update_pacticipant_spec.rb
 - spec/fixtures/a_consumer-a_provider-2.json
 - spec/fixtures/a_consumer-a_provider-3.json