pact-mock_service 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de67c3aa131cccf2035d9d24be56968b9f942be3
-  data.tar.gz: c741a83e177cbe124ffe3c83c01b8ddac950883b
+  metadata.gz: 878a7bdcbd07da354857adfe0eaead4f7a7df91b
+  data.tar.gz: ecea144926461df7936678c54dd44a8aa84f97c8
 SHA512:
-  metadata.gz: 15d4b2f7c9c6692cc482a5159805278d62127e8676fa1db6d6fb174b6317fadd126cd39513e94b600d21915771d2adf4b6c11f868cebe5d23516d4a6844c948e
-  data.tar.gz: 9854ecc116422877812ce15ff1d337981db5fd6ba32b7381a09bcf9cd34a0231adeb08c7a82d427d30deb17ca7cfe0e8d410f2931d09957b52c24079766bf095
+  metadata.gz: 3112599095c361f9e20b9d448761c8125cdc83007b002c55f0eeec871342d0bb6cffd775d3fca69e103c202ce88c5e91dac2ff25fa1b2ba22c76f769661c79dd
+  data.tar.gz: d2bac546292fb47abdc7bac62355b10296b2ea53a778df02422df7cc48931c3fa1caf7001a2917e68225853418dad3e1ff48f99b8a099f3c7299dcb18c5aea31

data/CHANGELOG.md

@@ -2,6 +2,9 @@ Do this to generate your change history
 
   git log --pretty=format:'  * %h - %s (%an, %ad)' vX.Y.Z..HEAD
 
+### 2.0.1 (11 May 2017)
+* 2c106b9 - Fix serialisation of request in pact for pact spec 2. (Beth Skurrie, Thu May 11 09:32:43 2017 +1000)
+
 ### 2.0.0 (12 Apr 2017)
 * 74bd80e - Bumping pact-support version to ~> 1.0 (Beth Skurrie, Wed Apr 12 15:10:49 2017 +1000)
 

data/lib/pact/consumer_contract/request_decorator.rb

@@ -13,6 +13,15 @@ module Pact
     end
 
     def as_json options = {}
+      hash = to_hash_without_rules
+      include_matching_rules? ? with_matching_rules(hash) : hash
+    end
+
+    private
+
+    attr_reader :request
+
+    def to_hash_without_rules
       hash = {
         method: request.method,
         path: path
@@ -20,40 +29,19 @@ module Pact
       hash[:query]   = query   if request.specified?(:query)
       hash[:headers] = headers if request.specified?(:headers)
       hash[:body]    = body    if request.specified?(:body)
-      include_matching_rules? ? with_matching_rules(hash) : hash
+      hash
     end
 
-    private
-
-    attr_reader :request
-
     def path
-      if include_matching_rules?
-        request.path
-      else
-        Pact::Reification.from_term(request.path)
-      end
+      Pact::Reification.from_term(request.path)
     end
 
     def query
-      if include_matching_rules?
-        request.query.query.each do | key, val |
-          if val.length == 1
-            request.query.query[key] = val[0]
-          end
-        end
-        request.query.query
-      else
-        Pact::Reification.from_term(request.query)
-      end
+      Pact::Reification.from_term(request.query)
     end
 
     def headers
-      if include_matching_rules?
-        request.headers
-      else
-        Pact::Reification.from_term(request.headers)
-      end
+      Pact::Reification.from_term(request.headers)
     end
 
     # This feels wrong to be checking the class type of the body
@@ -62,11 +50,7 @@ module Pact
       if content_type_is_form && request.body.is_a?(Hash)
         URI.encode_www_form convert_hash_body_to_array_of_arrays
       else
-        if include_matching_rules?
-          request.body
-        else
-          Pact::Reification.from_term(request.body)
-        end
+        Pact::Reification.from_term(request.body)
       end
     end
 
@@ -83,11 +67,7 @@ module Pact
         end
       end
 
-      if include_matching_rules?
-        arrays
-      else
-        Pact::Reification.from_term(arrays)
-      end
+      Pact::Reification.from_term(arrays)
     end
 
     def include_matching_rules?
@@ -95,10 +75,9 @@ module Pact
     end
 
     def with_matching_rules hash
-      matching_rules = Pact::MatchingRules.extract hash
-      example = Pact::Reification.from_term hash
-      return example if matching_rules.empty?
-      example.merge(matchingRules: matching_rules)
+      matching_rules = Pact::MatchingRules.extract request.to_hash
+      return hash if matching_rules.empty?
+      hash.merge(matchingRules: matching_rules)
     end
 
     def pact_specification_version

data/lib/pact/mock_service/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module MockService
-    VERSION = "2.0.0"
+    VERSION = "2.0.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-mock_service
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-12 00:00:00.000000000 Z
+date: 2017-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack