pact-mock_service 3.11.1 → 3.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 849091e40f13174ea1be3cb01825b87de403bb9dcf8853352368383b35cf3ccd
-  data.tar.gz: 0265d10371215e180e768684c3be869f2be42da4755191ab13f560d0ad0780fc
+  metadata.gz: 8df83bcc8595050f2a3a625966e7d2e43b4c75cdc634dc95c8b67eb4b7358d93
+  data.tar.gz: b09a1fc63348ec662c472353311c37036042093a40c6fe8f37561ab01fdbd11b
 SHA512:
-  metadata.gz: 4a379d74298ca5368f11f678a45bcfe023da06fd3ff8d873c8b3fba9e39d13426eaf08384ec5763e9a5a9767721f6fffe1fa0124af540fbc758649d516d51aff
-  data.tar.gz: 50138c0f2f5241c6f86e87b20294f8347fbf31e7d268b9746aa5941d7598bf97677996fce118c137a515914845165bc48fcdf4d567abea7685fb9558ca49b49b
+  metadata.gz: 60405d58990da42e85ea1853c6ff760ab2949f74fefe6af3b809e7b9e876102e9a63f59ec55c2319ed7d67cb5a0f1c9689a76c3e6404be283d0d3e7aeb95fbd1
+  data.tar.gz: 73118d1f9c52a59e655753e0c5a96bb16143b15fe6333d67350379cc5566550cdc5365062d1ea4237364bc3b3ca4bad9201b90434a923403cd018aac6b60e421

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+<a name="v3.12.0"></a>
+### v3.12.0 (2023-10-18)
+
+#### Features
+
+* add Rack 3 compatibility (#146)	 ([9afea51](/../../commit/9afea51))
+
+<a name="v3.11.2"></a>
+### v3.11.2 (2023-05-18)
+
+#### Bug Fixes
+
+* use native lockfile, rather than ruby gem, tested on ruby 3.3.0-dev	 ([9a51a01](/../../commit/9a51a01))
+
 <a name="v3.11.1"></a>
 ### v3.11.1 (2023-05-05)
 

data/lib/pact/consumer/server.rb

@@ -66,7 +66,11 @@ module Pact
     end
 
     def run_default_server(app, port)
-      require 'rack/handler/webrick'
+      begin
+        require 'rack/handler/webrick'
+      rescue LoadError
+        require 'rackup/handler/webrick'
+      end
       Rack::Handler::WEBrick.run(app, **webrick_opts) do |server|
         @port = server[:Port]
       end

data/lib/pact/consumer_contract/consumer_contract_writer.rb

@@ -5,7 +5,6 @@ require 'pact/consumer_contract/pact_file'
 require 'pact/consumer_contract/consumer_contract_decorator'
 require 'pact/shared/active_support_support'
 require 'fileutils'
-require 'filelock'
 
 module Pact
 
@@ -60,8 +59,10 @@ module Pact
     def update_pactfile
       logger.info log_message
       FileUtils.mkdir_p File.dirname(pactfile_path)
-      Filelock(pactfile_path) do | pact_file |
-        # must be read after obtaining the lock, and must be read from the yielded file object, otherwise windows freaks out
+      # must be read after obtaining the lock, and must be read from the yielded file object, otherwise windows freaks out
+      # https://apidock.com/ruby/File/flock
+      File.open(pactfile_path, File::RDWR|File::CREAT, 0644) {|pact_file|
+        pact_file.flock(File::LOCK_EX)
         @existing_contents = pact_file.read
         new_contents = pact_json
         pact_file.rewind
@@ -69,7 +70,7 @@ module Pact
         pact_file.write new_contents
         pact_file.flush
         pact_file.truncate(pact_file.pos)
-      end
+      }
     end
 
     def pact_json

data/lib/pact/mock_service/cli.rb

@@ -171,7 +171,11 @@ module Pact
 
         def require_common_dependencies
           require 'webrick/https'
-          require 'rack/handler/webrick'
+          begin
+            require 'rack/handler/webrick'
+          rescue LoadError
+            require 'rackup/handler/webrick'
+          end
           require 'fileutils'
           require 'pact/mock_service/server/wait_for_server_up'
           require 'pact/mock_service/cli/pidfile'

data/lib/pact/mock_service/interactions/interaction_mismatch.rb

@@ -14,25 +14,25 @@ module Pact
         def initialize candidate_interactions, actual_request
           @candidate_interactions = candidate_interactions
           @actual_request = actual_request
-          @candiate_diffs = candidate_interactions.collect{ | candidate_interaction| CandidateDiff.new(candidate_interaction, actual_request)}
+          @candidate_diffs = candidate_interactions.collect{ | candidate_interaction| CandidateDiff.new(candidate_interaction, actual_request)}
         end
 
         def to_hash
-          candiate_diffs.collect(&:to_hash)
+          candidate_diffs.collect(&:to_hash)
         end
 
         def to_s
-          candiate_diffs.collect(&:to_s).join("\n")
+          candidate_diffs.collect(&:to_s).join("\n")
         end
 
         def short_summary
-          mismatched_attributes = candiate_diffs.collect(&:mismatched_attributes).flatten.uniq.join(", ").reverse.sub(",", "dna ").reverse #OMG what a hack!
+          mismatched_attributes = candidate_diffs.collect(&:mismatched_attributes).flatten.uniq.join(", ").reverse.sub(",", "dna ").reverse #OMG what a hack!
           actual_request.method_and_path + " (request #{mismatched_attributes} did not match)"
         end
 
         private
 
-        attr_accessor :candiate_diffs
+        attr_accessor :candidate_diffs
 
         class CandidateDiff
 

data/lib/pact/mock_service/request_handlers/interaction_post.rb

@@ -21,7 +21,7 @@ module Pact
         end
 
         def respond env
-          request_body = env['rack.input'].string
+          request_body = env['rack.input'].read
           parsing_options = { pact_specification_version: pact_specification_version }
           interaction = Interaction.from_hash(JSON.load(request_body), parsing_options) # Load creates the Pact::XXX classes
 

data/lib/pact/mock_service/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module MockService
-    VERSION = "3.11.1"
+    VERSION = "3.12.0"
   end
 end

data/lib/pact/stub_service/cli.rb

@@ -1,6 +1,10 @@
 require 'pact/mock_service/cli/custom_thor'
 require 'webrick/https'
-require 'rack/handler/webrick'
+begin
+  require 'rack/handler/webrick'
+rescue LoadError
+  require 'rackup/handler/webrick'
+end
 require 'fileutils'
 require 'pact/mock_service/server/wait_for_server_up'
 require 'pact/mock_service/cli/pidfile'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-mock_service
 version: !ruby/object:Gem::Version
-  version: 3.11.1
+  version: 3.12.0
 platform: ruby
 authors:
 - James Fraser
@@ -12,10 +12,30 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-17 00:00:00.000000000 Z
+date: 2023-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: rackup
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -96,14 +116,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: pact-support
   requirement: !ruby/object:Gem::Requirement
@@ -124,34 +144,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.16.4
-- !ruby/object:Gem::Dependency
-  name: filelock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -398,7 +410,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.13
+rubygems_version: 3.4.21
 signing_key:
 specification_version: 4
 summary: Provides a mock service for use with Pact