pact-mock_service 0.12.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 398fd7f11eaa7626bf0fad56bb01cc6e14af347e
-  data.tar.gz: 401dc13f5eb8069e0142b024ed1ec17959793a12
+  metadata.gz: 502b6bb8fc1c02f95eb7cc9eceda437d070c14fd
+  data.tar.gz: 7899667f864724cf2dd32c35a914b21cb1fa670e
 SHA512:
-  metadata.gz: b5fa971cae9bd4947f2f94b64e4b786eeb4e9f2e44ac3e8e1237ddcb1ab13cb7f2d9ebefd06f7a03da553013c45804e68dc5cb5141317c57ca8cb11415a32bc8
-  data.tar.gz: f7aae06364aca5a81df5427afcf89a145bc5552f4eebe8db61812a52bbd76c5c2a01d3082ab4cfd2e3a5f94c51247137eb34e54d12010f0c839781646e8f4b95
+  metadata.gz: fd0da22f52dd902c8663a31e1a806cfc2bd86585b0cd8109b2158ad67732e3da0e5299723fdd358136c48f6ba4aab6c7d890b421f0d4be089a8936adbb9dbac0
+  data.tar.gz: 660b0087a8545dfcf910600649a27aeba7c7cdd991e2402e2455bfb411a8dafc7e3c1947c73085dbb0f8b82c5d77e8225efc693ebc9879f91e0eba34831c68dd

data/CHANGELOG.md

@@ -2,6 +2,8 @@ Do this to generate your change history
 
   git log --pretty=format:'  * %h - %s (%an, %ad)' vX.Y.Z..HEAD
 
+* 18b98c0 - Included request matching rules in pact file (Matt Baumgartner, Wed Feb 15 16:20:50 2017 -0500)
+
 ### 0.12.1 (11 Jan 2017)
 * a0fbb02 - Upgrade Traveling Ruby to work on ruby 2.2.x (Matt Fellows, Tue Jan 10 22:57:32 2017 +1100)
 

data/lib/pact/consumer_contract/request_decorator.rb

@@ -20,7 +20,7 @@ module Pact
       hash[:query]   = query   if request.specified?(:query)
       hash[:headers] = headers if request.specified?(:headers)
       hash[:body]    = body    if request.specified?(:body)
-      hash
+      include_matching_rules? ? with_matching_rules(hash) : hash
     end
 
     private
@@ -28,17 +28,32 @@ module Pact
     attr_reader :request
 
     def path
-      Pact::Reification.from_term(request.path)
+      if include_matching_rules?
+        request.path
+      else
+        Pact::Reification.from_term(request.path)
+      end
     end
 
-    def headers
-      Pact::Reification.from_term(request.headers)
+    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
     end
 
-    # This feels wrong to be checking the class type of the Query
-    # Do this better somehow.
-    def query
-      Pact::Reification.from_term(request.query)
+    def headers
+      if include_matching_rules?
+        request.headers
+      else
+        Pact::Reification.from_term(request.headers)
+      end
     end
 
     # This feels wrong to be checking the class type of the body
@@ -47,7 +62,11 @@ module Pact
       if content_type_is_form && request.body.is_a?(Hash)
         URI.encode_www_form convert_hash_body_to_array_of_arrays
       else
-        Pact::Reification.from_term(request.body)
+        if include_matching_rules?
+          request.body
+        else
+          Pact::Reification.from_term(request.body)
+        end
       end
     end
 
@@ -63,8 +82,28 @@ module Pact
           arrays << [key, value]
         end
       end
-      Pact::Reification.from_term arrays
+
+      if include_matching_rules?
+        arrays
+      else
+        Pact::Reification.from_term(arrays)
+      end
+    end
+
+    def include_matching_rules?
+      pact_specification_version && !pact_specification_version.start_with?('1')
+    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)
+    end
+
+    def pact_specification_version
+      @decorator_options[:pact_specification_version]
     end
 
   end
-end
+end

data/lib/pact/mock_service/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module MockService
-    VERSION = "0.12.1"
+    VERSION = "1.0.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-mock_service
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 1.0.0
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-10 00:00:00.000000000 Z
+date: 2017-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -331,7 +331,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Provides a mock service for use with Pact