feat: add more matchers

contentType
null
semver
values
notEmpty
statusCode

Author: YOU54F

lib/pact/v2/matchers.rb

@@ -89,6 +89,22 @@ def match_each_value(template, value_matchers = V2::Type.new(""))
       def match_each_kv(template, key_matchers)
         V4::EachKeyValue.new(key_matchers.is_a?(Array) ? key_matchers : [key_matchers], template)
       end
+
+      def match_semver(template = nil)
+        V3::Semver.new(template)
+      end
+
+      def match_content_type(content_type, template = nil)
+        V3::ContentType.new(content_type, template: template)
+      end
+
+      def match_not_empty(template = nil)
+        V4::NotEmpty.new(template)
+      end
+
+      def match_status_code(template)
+        V4::StatusCode.new(template)
+      end
     end
   end
 end

lib/pact/v2/matchers/base.rb

@@ -9,23 +9,30 @@ class Base
 
         class MatcherInitializationError < Pact::V2::Error; end
 
-        def initialize(spec_version:, kind:, template:, opts: {})
+        def initialize(spec_version:, kind:, template: nil, opts: {})
           @spec_version = spec_version
           @kind = kind
           @template = template
           @opts = opts
         end
 
         def as_basic
-          {
-            "pact:matcher:type" => serialize!(@kind.deep_dup, :basic),
-            "value" => serialize!(@template.deep_dup, :basic)
-          }.merge(serialize!(@opts.deep_dup, :basic))
+          result = {
+            "pact:matcher:type" => serialize!(@kind.deep_dup, :basic)
+          }
+          result["status"] = serialize!(@opts[:status].deep_dup, :basic) if @opts[:status]
+          result["value"] = serialize!(@template.deep_dup, :basic) unless @template.nil?
+          result.merge!(serialize!(@opts.deep_dup, :basic))
+          result
         end
 
         def as_plugin
           params = @opts.values.map { |v| format_primitive(v) }.join(",")
-          value = format_primitive(@template)
+          value = format_primitive(@template) unless @template.nil?
+
+          if @template.nil?
+            return "matching(#{@kind}#{params.present? ? ", #{params}" : ""})"
+          end
 
           return "matching(#{@kind}, #{params}, #{value})" if params.present?
 

lib/pact/v2/matchers/v3/content_type.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Pact
+  module V2
+    module Matchers
+      module V3
+        class ContentType < Pact::V2::Matchers::Base
+          def initialize(content_type, template: nil)
+            @content_type = content_type
+            @template = template
+            @opts = {}
+            @opts[:plugin_template] = template unless template.nil?
+            unless content_type.is_a?(String) && !content_type.empty?
+              raise MatcherInitializationError, "#{self.class}: content_type must be a non-empty String"
+            end
+
+            super(
+              spec_version: Pact::V2::Matchers::PACT_SPEC_V3,
+              kind: "contentType",
+              template: content_type,
+              opts: @opts
+            )
+          end
+
+          def as_plugin
+            "matching(contentType, '#{@content_type}', '#{@opts[:plugin_template]}')"
+          end
+        end
+      end
+    end
+  end
+end

lib/pact/v2/matchers/v3/null.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Pact
+  module V2
+    module Matchers
+      module V3
+        class Null < Pact::V2::Matchers::Base
+          def initialize
+            super(spec_version: Pact::V2::Matchers::PACT_SPEC_V3, kind: "null", template: nil)
+          end
+
+        end
+      end
+    end
+  end
+end

lib/pact/v2/matchers/v3/semver.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Pact
+  module V2
+    module Matchers
+      module V3
+        class Semver < Pact::V2::Matchers::Base
+          def initialize(template = nil)
+            @template = template
+            super(spec_version: Pact::V2::Matchers::PACT_SPEC_V3, kind: "semver", template: template)
+          end
+
+          def as_plugin
+            if @template.nil? || @template.blank?
+              raise MatcherInitializationError, "#{self.class}: template must be provided when calling as_plugin"
+            end
+            "matching(semver, '#{@template}')"
+          end
+        end
+      end
+    end
+  end
+end

lib/pact/v2/matchers/v3/values.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Pact
+  module V2
+    module Matchers
+      module V3
+        class Values < Pact::V2::Matchers::Base
+          def initialize
+            super(spec_version: Pact::V2::Matchers::PACT_SPEC_V3, kind: "values", template: nil)
+          end
+
+        end
+      end
+    end
+  end
+end

lib/pact/v2/matchers/v4/not_empty.rb

@@ -5,10 +5,17 @@ module V2
     module Matchers
       module V4
         class NotEmpty < Pact::V2::Matchers::Base
-          def initialize(template)
-            raise MatcherInitializationError, "#{self.class}: #{template} should not be empty" if template.blank?
+          def initialize(template = nil)
+            @template = template
+            super(spec_version: Pact::V2::Matchers::PACT_SPEC_V4, kind: 'notEmpty', template: @template)
+          end
+
+          def as_plugin
+            if @template.nil? || @template.blank?
+              raise MatcherInitializationError, "#{self.class}: template must be provided when calling as_plugin"
+            end
 
-            super(spec_version: Pact::V2::Matchers::PACT_SPEC_V4, kind: "time", template: template)
+            "notEmpty('#{@template}')"
           end
         end
       end

lib/pact/v2/matchers/v4/status_code.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Pact
+  module V2
+    module Matchers
+      module V4
+        class StatusCode < Pact::V2::Matchers::Base
+          def initialize(template = nil)
+            super(spec_version: Pact::V2::Matchers::PACT_SPEC_V4, kind: 'statusCode', opts: {
+              'status' => template
+            })
+          end
+        end
+      end
+    end
+  end
+end

spec/v2/pact/matchers_spec.rb

@@ -289,6 +289,46 @@
         }
       })
     end
+
+    it "properly builds semver matcher" do
+      expect(test_class.match_semver.as_basic).to eq({
+        "pact:matcher:type" => "semver",
+      })
+    end
+    it "properly builds content_type matcher" do
+      expect(test_class.match_content_type("application/xml").as_basic).to eq({
+        "pact:matcher:type" => "contentType",
+        "value" => "application/xml"
+      })
+    end
+    it "properly builds not_empty matcher" do
+      expect(test_class.match_not_empty.as_basic).to eq({
+        "pact:matcher:type" => "notEmpty"
+      })
+    end
+
+    it "properly builds values matcher" do
+      expect(Pact::V2::Matchers::V3::Values.new.as_basic).to eq({
+        "pact:matcher:type" => "values"
+      })
+    end
+
+    it "properly builds null matcher" do
+      expect(Pact::V2::Matchers::V3::Null.new.as_basic).to eq({
+        "pact:matcher:type" => "null"
+      })
+    end
+
+    it "properly builds status_code matcher" do
+      expect(test_class.match_status_code(200).as_basic).to eq({
+        "pact:matcher:type" => "statusCode",
+        "status" => 200
+      })
+      expect(test_class.match_status_code('nonError').as_basic).to eq({
+        "pact:matcher:type" => "statusCode",
+        "status" => 'nonError'
+      })
+    end
   end
 
   context "with plugin format serialization" do
@@ -409,6 +449,18 @@
         }
       })
     end
+
+    it "properly builds semver matcher" do
+      expect(test_class.match_semver("1.2.3").as_plugin).to eq("matching(semver, '1.2.3')")
+    end
+
+    it "properly builds content_type matcher" do
+      expect(test_class.match_content_type("application/xml", '<?xml?><test/>').as_plugin).to eq("matching(contentType, 'application/xml', '<?xml?><test/>')")
+    end
+
+    it "properly builds not_empty matcher" do
+      expect(test_class.match_not_empty("some value").as_plugin).to eq("notEmpty('some value')")
+    end
   end
 
   context "with common regex" do