pact_broker 1.11.1 → 1.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2e789a7f93e0c406d9a7fddda930d8a226098aa
-  data.tar.gz: 17f764538b78147ee4c2a7fe7546e799b58bd98e
+  metadata.gz: 9a30055706afb5eca1184777c027d6c89fcc58d9
+  data.tar.gz: ded720370181e3cf0afe1554253b6e13a374a2f9
 SHA512:
-  metadata.gz: 786b010b045b1b380f67eceeb0e5a0dbf4689d3daeb52a1445cd9d0cbca7462ce1a219fc39fd47d17da41c631e479690be99f2be051a49fff1d5aa8ab22a8caa
-  data.tar.gz: 2d6b77c90a5ac7d27b7034dd065ebc7dc8005ec4f008010c75434e73ce93d687416238fd17a8971bfd18b439813208516f0b1a26e4d6ebae116fcbc7253ae7e8
+  metadata.gz: 771ed02390e14db3c6aef45d2d1faa2784dea6a4f2d50040873378876ada7b6e42cc7d8a67db2f9c4bd60b576e7669b41706e5433b0c24f2792814819a3200df
+  data.tar.gz: 957fcf5f64742d212d1936a39288fa556d8476ec81f8a740899fe6cbd372728db596e3bc6c854a34ed9a68f8bbf5d7edb7199d09ce6b55207e6e8bb7102dab0d

data/.travis.yml

@@ -1,5 +1,4 @@
 language: ruby
 rvm:
-  - 2.1.10
   - 2.2.5
   - 2.3.1

data/CHANGELOG.md

@@ -2,6 +2,13 @@ Do this to generate your change history
 
     $ git log --pretty=format:'  * %h - %s (%an, %ad)' vX.Y.Z..HEAD
 
+#### 1.11.2 (2016-11-25)
+* 43f2373 - Added require to hopefully fix broken build. https://travis-ci.org/bethesque/pact_broker/jobs/174397806 (Bethany Skurrie, Thu Nov 24 07:47:07 2016 +1100)
+* f747e09 - Removed ruby 2.1 build as it is failing (Beth Skurrie, Wed Nov 9 13:42:08 2016 +1100)
+* 2dd77a5 - Added extra pact version to example database so that the diff feature could be explored. (Beth, Wed Nov 9 10:07:33 2016 +1100)
+* 5c04c59 - Updated trailblazer gem to ~>0.3.0 and fixed pact diff spec. (Beth, Wed Nov 9 10:05:53 2016 +1100)
+* 8102ac9 - Use respond_to?(:acts_like_time?) instead of acts_like?(:time) as it blows up (Beth, Sun Nov 6 12:00:30 2016 +1100)
+
 #### 1.11.1 (2016-10-13)
 * 14381ac - Fix issue #59 Error when executing web hook with body. (Beth Skurrie, Thu Oct 13 12:50:17 2016 +1100)
 

data/README.md

@@ -80,7 +80,7 @@ Use the HAL browser to view documentation as you browse.
 
 ### To have a play around on your local machine
 
-* Install ruby 1.9.3 or later
+* Install ruby 1.9.3 or later and bundler >= 1.12.0 as there is currently an issue with [bundler 1.13](https://github.com/bethesque/pact_broker/issues/57)
 * Run `git clone git@github.com:bethesque/pact_broker.git && cd pact_broker/example`
 * Run `bundle`
 * Run `bundle exec rackup -p 8080`
@@ -95,8 +95,8 @@ Use the HAL browser to view documentation as you browse.
 You can use the [Pact Broker Docker container][docker] or [Terraform on AWS][terraform] or to roll 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 milage 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 well supported database.
-* Install ruby 1.9.3 or later
+* __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/bethesque/pact_broker/issues/33) database.
+* Install ruby 1.9.3 or later and bundler >= 1.12.0 as there is currently an issue with [bundler 1.13](https://github.com/bethesque/pact_broker/issues/57)
 * 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.)
 * Please ensure you use `encoding: 'utf8'` in your Sequel options to avoid encoding issues.

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

@@ -22,8 +22,8 @@ module PactBroker
         end
 
         def to_text
-          _, body = PactBroker::Pacts::Diff.run pact_params, base_url: base_url
-          response.body = body
+          _, operation = PactBroker::Pacts::Diff.run pact_params, base_url: base_url
+          response.body = operation.output
         end
 
         def pact

data/lib/pact_broker/date_helper.rb

@@ -62,7 +62,7 @@ module PactBroker
         # 60 days up to 365 days
         when 86400...525600   then locale.t :x_months,       :count => (distance_in_minutes.to_f / 43200.0).round
         else
-          if from_time.acts_like?(:time) && to_time.acts_like?(:time)
+          if from_time.respond_to?(:acts_like_time?) && to_time.respond_to?(:acts_like_time?)
             fyear = from_time.year
             fyear += 1 if from_time.month >= 3
             tyear = to_time.year

data/lib/pact_broker/pacts/diff.rb

@@ -17,7 +17,7 @@ module PactBroker
       def process params, options
         pact = pact_repository.find_pact(params.consumer_name, params.consumer_version_number, params.provider_name)
         previous_distinct_pact = pact_repository.find_previous_distinct_pact pact
-        if previous_distinct_pact
+        @output = if previous_distinct_pact
           next_pact = pact_repository.find_next_pact previous_distinct_pact
           DiffDecorator.new(pact, previous_distinct_pact, next_pact, options[:base_url]).to_text
         else
@@ -29,6 +29,10 @@ module PactBroker
         "No previous distinct version was found for #{pact.name}"
       end
 
+      def output
+        @output
+      end
+
       private
 
       # The next pact version after the previous distinct version.

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '1.11.1'
+  VERSION = '1.11.2'
 end

data/pact_broker.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'pact-support', '~>0.4', '>=0.4.2'
   gem.add_runtime_dependency 'padrino-core', '~>0.12.4'
   gem.add_runtime_dependency 'haml'
-  gem.add_runtime_dependency 'trailblazer', '~>0.1.0'
+  gem.add_runtime_dependency 'trailblazer', '~>0.3.0'
 
   gem.add_development_dependency 'sqlite3'
   gem.add_development_dependency 'pry'

data/spec/features/{get_diff.rb → get_diff_spec.rb}

@@ -4,7 +4,7 @@ describe "Get diff between versions" do
 
   let(:path) { "/pacts/provider/Provider/consumer/Consumer/version/3/diff/previous-distinct" }
 
-  let(:last_response_body) { JSON.parse(subject.body, symbolize_names: true) }
+  let(:last_response_body) { subject.body }
 
   subject { get path; last_response }
 
@@ -30,12 +30,13 @@ describe "Get diff between versions" do
 
   context "when the versions exist" do
 
-    it "returns a 200 HAL JSON response" do
-      expect(subject).to be_a_hal_json_success_response
+    it "returns a 200 text response" do
+      expect(subject.headers['Content-Type']).to eq "text/plain;charset=utf-8"
     end
 
     it "returns the JSON representation of the diff" do
-      expect(last_response_body).to include({})
+      expect(last_response_body).to include('"method": "post"')
+      expect(last_response_body).to include('"method": "get"')
     end
 
   end
@@ -44,7 +45,7 @@ describe "Get diff between versions" do
 
     let(:path) { "/pacts/provider/Provider/consumer/Consumer/versions/1/diff/previous-distinct" }
 
-    xit "returns a 404 response" do
+    it "returns a 404 response" do
       expect(subject).to be_a_404_response
     end
 

data/spec/service_consumers/provider_states_for_pact_broker_client.rb

@@ -14,6 +14,7 @@ Pact.provider_states_for "Pact Broker Client" do
 
   provider_state "an error occurs while publishing a pact" do
     set_up do
+      require 'pact_broker/pacts/service'
       allow(PactBroker::Pacts::Service).to receive(:create_or_update_pact).and_raise("an error")
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 1.11.1
+  version: 1.11.2
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-13 00:00:00.000000000 Z
+date: 2016-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -206,14 +206,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -571,7 +571,7 @@ files:
 - script/update-hal-browser
 - spec/features/create_webhook_spec.rb
 - spec/features/delete_pact_spec.rb
-- spec/features/get_diff.rb
+- spec/features/get_diff_spec.rb
 - spec/features/get_pact_spec.rb
 - spec/features/get_previous_distinct_version.rb
 - spec/features/get_provider_pacts.rb
@@ -730,7 +730,7 @@ summary: See description
 test_files:
 - spec/features/create_webhook_spec.rb
 - spec/features/delete_pact_spec.rb
-- spec/features/get_diff.rb
+- spec/features/get_diff_spec.rb
 - spec/features/get_pact_spec.rb
 - spec/features/get_previous_distinct_version.rb
 - spec/features/get_provider_pacts.rb