pact-mock_service 0.8.2 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2fe31dd5077800edd5307e100979a92d3056eb9
-  data.tar.gz: cae8ad2a915922e11bab37deb7e38dbc6a467314
+  metadata.gz: f7b163125f31e90906834f1862b956cfb7da2304
+  data.tar.gz: e9161370ca1e3f29af3310ce4d30edd8e36482a4
 SHA512:
-  metadata.gz: 8156beaceb8f03bc993d9510455fc194fe7dc60705521621cf016b660f73ef1a58cde961f322fcde32f76c02745800523a824b345a2e4ccda3f1dc90c564c7c6
-  data.tar.gz: 50b3011a79bd77eb5f905433ec9e78b31450925acbb79da724e6630ae65da005920be792b90c4c243da26c07354f2055920bb2102d3c9542dadbf25772cf1d9f
+  metadata.gz: 7a2406a9a3ede444da95b63ed485b99cd372a41877996744f982bbee859f0621eb2d0e643b324aba9270a2e1d142d5a3ed4d852ac8330631d2d8db15ca68d67e
+  data.tar.gz: 944fb460336e8cccd99d979faac38dac84c4b65d70331a9aafafec2e244821b39439a4808ffe0579f1031eee43e2b2b87739b7941d70b6d91ca144620693cb04

data/CHANGELOG.md

@@ -2,6 +2,15 @@ Do this to generate your change history
 
   git log --pretty=format:'  * %h - %s (%an, %ad)' vX.Y.Z..HEAD
 
+### 0.9.0 (26 May 2016)
+* 28ab905 - Merge pull request #46 from reevoo/order_interactions_by_provider_state (Sergei Matheson, Thu May 26 14:52:08 2016 +1000)
+* d58507c - Add ability to record interactions in alphabetical order. Order key: description + response.status + provider_state Default order: chronological (as it was before) (Alex Malkov, Mon May 23 11:52:39 2016 +0100)
+* 739d111 - Merge pull request #48 from mefellows/readline-fix (Sergei Matheson, Mon May 16 10:53:01 2016 +1000)
+* fe5ea69 - Added -rreadline flag to ruby CLI execution wrapper (Matt Fellows, Sun May 15 13:31:45 2016 +1000)
+* 0dfb431 - Sort by description, status and provider state (Alex Malkov, Wed May 4 00:00:21 2016 +0100)
+* 9ff8337 - Order interactions within the contract by provider state. (Alex Malkov, Tue May 3 22:13:53 2016 +0100)
+* 2f22f7e - Update to ruby 2.3.1 in travis (Sergei Matheson, Tue May 3 10:46:46 2016 +1000)
+
 ### 0.8.2 (19 April 2016)
 * e392333 - Merge pull request #45 from aaronrenner/ar-fix-almost-duplicate-error-web-response (Beth Skurrie, Tue Apr 19 09:53:01 2016 +1000)
 * 6fbcce2 - Fixed invalid Rack response on AlmostDuplicateInteractionError (Aaron Renner, Mon Apr 18 14:08:19 2016 -0600)

data/lib/pact/consumer_contract/consumer_contract_decorator.rb

@@ -15,7 +15,7 @@ module Pact
       fix_all_the_things(
         consumer: consumer_contract.consumer.as_json,
         provider: consumer_contract.provider.as_json,
-        interactions: consumer_contract.interactions.collect{ |i| InteractionDecorator.new(i, @decorator_options).as_json},
+        interactions: sorted_interactions.collect{ |i| InteractionDecorator.new(i, @decorator_options).as_json},
         metadata: {
           pactSpecificationVersion: pact_specification_version
         }
@@ -28,6 +28,19 @@ module Pact
 
     private
 
+    def sorted_interactions
+      # Default order: chronological
+      return consumer_contract.interactions if Pact.configuration.pactfile_write_order == :chronological
+      # We are supporting only chronological or alphabetical order
+      raise NotImplementedError if Pact.configuration.pactfile_write_order != :alphabetical
+
+      consumer_contract.interactions.sort{|a, b| sortable_id(a) <=> sortable_id(b)}
+    end
+
+    def sortable_id interaction
+      "#{interaction.description.downcase} #{interaction.response.status} #{(interaction.provider_state || '').downcase}"
+    end
+
     attr_reader :consumer_contract
 
     def pact_specification_version

data/lib/pact/mock_service/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module MockService
-    VERSION = "0.8.2"
+    VERSION = "0.9.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-mock_service
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.0
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-19 00:00:00.000000000 Z
+date: 2016-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -132,14 +132,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.5.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.5.8
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -331,7 +331,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Provides a mock service for use with Pact