pact-support 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95820adaa595dc1673aab77ebb97494ddb08bc48
-  data.tar.gz: 7cf2419270f7d417f378648dda47cff9c11f16cd
+  metadata.gz: 28fb09a1b1f000cce4b9a16ea20d26400ff8fa0a
+  data.tar.gz: 87433656e306d9ca818b0ea56ecab7c79fe5ec4c
 SHA512:
-  metadata.gz: b585de5fde5541e24230fc6a52f3e2c4f3bcb0d84299488f5b3092f6cc513309e93129443b22a1a71825f0618a6da7de174637b8b7087e22f59a043ae53c1d0f
-  data.tar.gz: 9e7ae773b68f2905478b270660c4a3bb1759bca55074d340b8ef8aebb5057a5cf715b908ba3e6dec59860ef50789490ce073076dbe3c24bc23414f3f3e305064
+  metadata.gz: 4f0ced826a85541d5cd4ac8ad6aa5cf014e76f063b44b21282a1efe9730412575f48e1f35d2853ef950dad374671e72c9a11df4e24a3baeda2fcdae81f7151ca
+  data.tar.gz: ec80f3ad890c6345a6637ac40732fbf8c8d5103d5724eca9bbfca77d36ebb372c51ddf349f2a63a415bffff7a9b7c76be2d9aed87fbd6c05eec87196b226305d

data/CHANGELOG.md

@@ -2,6 +2,9 @@ Do this to generate your change history
 
   git log --pretty=format:'  * %h - %s (%an, %ad)'
 
+### 1.1.2 (20 June 2017)
+* 8c3e53d - Fixing recursive require problems for https://github.com/pact-foundation/pact-support/issues/36 (Beth Skurrie, Tue Jun 20 18:59:24 2017 +1000)
+
 ### 1.1.1 (20 June 2017)
 * 14789df - Adding missing requires for #36 (Beth Skurrie, Tue Jun 20 16:27:43 2017 +1000)
 

data/lib/pact/consumer_contract/query_hash.rb

@@ -1,13 +1,11 @@
 require 'cgi'
 require 'pact/shared/active_support_support'
-require 'pact/matchers'
 require 'pact/symbolize_keys'
 
 module Pact
   class QueryHash
 
     include ActiveSupportSupport
-    include Pact::Matchers
     include SymbolizeKeys
 
     def initialize(query)
@@ -33,7 +31,8 @@ module Pact
     # other will always be a QueryString, not a QueryHash, as it will have ben created
     # from the actual query string.
     def difference(other)
-      diff(query, symbolize_keys(CGI::parse(other.query)), allow_unexpected_keys: false)
+      require 'pact/matchers' # avoid recursive loop between this file, pact/reification and pact/matchers
+      Pact::Matchers.diff(query, symbolize_keys(CGI::parse(other.query)), allow_unexpected_keys: false)
     end
 
     def query

data/lib/pact/consumer_contract/request.rb

@@ -31,13 +31,15 @@ module Pact
       end
 
       def matches_route? actual_request
+        require 'pact/matchers' # avoid recusive loop between pact/reification, pact/matchers and this file
         route = {:method => method.upcase, :path => path}
         other_route = {:method => actual_request.method.upcase, :path => actual_request.path}
-        diff(route, other_route).empty?
+        Pact::Matchers.diff(route, other_route).empty?
       end
 
       def difference(actual_request)
-        request_diff = diff(to_hash_without_body_or_query, actual_request.to_hash_without_body_or_query)
+        require 'pact/matchers' # avoid recusive loop between pact/reification, pact/matchers and this file
+        request_diff = Pact::Matchers.diff(to_hash_without_body_or_query, actual_request.to_hash_without_body_or_query)
         request_diff.merge!(query_diff(actual_request.query))
         request_diff.merge!(body_diff(actual_request.body))
       end

data/lib/pact/matchers/matchers.rb

@@ -1,9 +1,8 @@
 require 'pact/term'
 require 'pact/something_like'
-require 'pact/reification'
+require 'pact/array_like'
 require 'pact/shared/null_expectation'
 require 'pact/shared/key_not_found'
-require 'pact/shared/request' # Not sure why this is needed, possibly something downstream https://github.com/pact-foundation/pact-support/issues/36
 require 'pact/matchers/unexpected_key'
 require 'pact/matchers/unexpected_index'
 require 'pact/matchers/index_not_found'
@@ -13,11 +12,11 @@ require 'pact/matchers/type_difference'
 require 'pact/matchers/expected_type'
 require 'pact/matchers/actual_type'
 require 'pact/matchers/no_diff_at_index'
-require 'pact/array_like'
+require 'pact/reification'
 
 module Pact
   # Should be called Differs
-  # Note to self: Some people (Mike Williams) are using this module directly, so if you refactor it
+  # Note to self: Some people are using this module directly, so if you refactor it
   # maintain backwards compatibility
 
   module Matchers
@@ -26,6 +25,8 @@ module Pact
     DEFAULT_OPTIONS = {allow_unexpected_keys: true, type: false}.freeze
     NO_DIFF = {}.freeze
 
+    extend self
+
     def diff expected, actual, opts = {}
       calculate_diff(expected, actual, DEFAULT_OPTIONS.merge(opts))
     end

data/lib/pact/reification.rb

@@ -1,6 +1,12 @@
 require 'randexp'
 require 'rack/utils'
-# reqiore 'active_support/core_ext/object/to_param'
+require 'pact/term'
+require 'pact/something_like'
+require 'pact/array_like'
+require 'pact/shared/request'
+require 'pact/consumer_contract/query_hash'
+require 'pact/consumer_contract/query_string'
+
 module Pact
   module Reification
     include ActiveSupportSupport

data/lib/pact/shared/request.rb

@@ -8,9 +8,7 @@ module Pact
   module Request
 
     class Base
-      include Pact::Matchers
       include Pact::SymbolizeKeys
-      extend Pact::Matchers
 
       attr_reader :method, :path, :headers, :body, :query, :options
 

data/lib/pact/support/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module Support
-    VERSION = "1.1.1"
+    VERSION = "1.1.2"
   end
 end

data/spec/lib/pact/reification_spec.rb

@@ -1,4 +1,6 @@
 require 'spec_helper'
+require 'pact/reification'
+require 'pact/consumer_contract/request'
 
 module Pact
   describe Reification do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-support
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - James Fraser