matchi 2.4.0 → 3.2.0

data/lib/matchi/change/to.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+module Matchi
+  class Change
+    # *Change to* matcher.
+    class To
+      # @return [#object_id] An expected new value.
+      attr_reader :expected
+
+      # Initialize the matcher with an object and a block.
+      #
+      # @example
+      #   require "matchi/change/to"
+      #
+      #   object = "foo"
+      #
+      #   Matchi::Change::To.new("FOO") { object.to_s }
+      #
+      # @param expected [#object_id]  An expected new value.
+      # @param state    [Proc]        A block of code to execute to get the
+      #   state of the object.
+      def initialize(expected, &state)
+        @expected = expected
+        @state    = state
+      end
+
+      # Boolean comparison on the expected change by comparing the value
+      # before and after the code execution.
+      #
+      # @example
+      #   require "matchi/change/to"
+      #
+      #   object = "foo"
+      #
+      #   matcher = Matchi::Change::To.new("FOO") { object.to_s }
+      #
+      #   matcher.expected                    # => "FOO"
+      #   matcher.matches? { object.upcase! } # => true
+      #
+      # @yieldreturn [#object_id] The block of code to execute.
+      #
+      # @return [Boolean] Comparison between the value before and after the
+      #   code execution.
+      def matches?
+        yield
+        value_after = @state.call
+
+        expected == value_after
+      end
+
+      # A string containing a human-readable representation of the matcher.
+      def inspect
+        "#{self.class}(#{expected.inspect})"
+      end
+
+      # Returns a string representing the matcher.
+      def to_s
+        "change to #{expected.inspect}"
+      end
+    end
+  end
+end

data/lib/matchi/eq.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module Matchi
+  # *Equivalence* matcher.
+  class Eq
+    # @return [#eql?] An expected equivalent object.
+    attr_reader :expected
+
+    # Initialize the matcher with an object.
+    #
+    # @example
+    #   require "matchi/eq"
+    #
+    #   Matchi::Eq.new("foo")
+    #
+    # @param expected [#eql?] An expected equivalent object.
+    def initialize(expected)
+      @expected = expected
+    end
+
+    # Boolean comparison between the actual value and the expected value.
+    #
+    # @example
+    #   require "matchi/eq"
+    #
+    #   matcher = Matchi::Eq.new("foo")
+    #
+    #   matcher.expected           # => "foo"
+    #   matcher.matches? { "foo" } # => true
+    #
+    # @yieldreturn [#object_id] The actual value to compare to the expected
+    #   one.
+    #
+    # @return [Boolean] Comparison between actual and expected values.
+    def matches?
+      expected.eql?(yield)
+    end
+
+    # A string containing a human-readable representation of the matcher.
+    def inspect
+      "#{self.class}(#{expected.inspect})"
+    end
+
+    # Returns a string representing the matcher.
+    def to_s
+      "eq #{expected.inspect}"
+    end
+  end
+end

data/lib/matchi/match.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module Matchi
+  # *Regular expressions* matcher.
+  class Match
+    # @return [#match] A regular expression.
+    attr_reader :expected
+
+    # Initialize the matcher with an instance of Regexp.
+    #
+    # @example
+    #   require "matchi/match"
+    #
+    #   Matchi::Match.new(/^foo$/)
+    #
+    # @param expected [#match] A regular expression.
+    def initialize(expected)
+      @expected = expected
+    end
+
+    # Boolean comparison between the actual value and the expected value.
+    #
+    # @example
+    #   require "matchi/match"
+    #
+    #   matcher = Matchi::Match.new(/^foo$/)
+    #
+    #   matcher.expected           # => /^foo$/
+    #   matcher.matches? { "foo" } # => true
+    #
+    # @yieldreturn [#object_id] The actual value to compare to the expected
+    #   one.
+    #
+    # @return [Boolean] Comparison between actual and expected values.
+    def matches?
+      expected.match?(yield)
+    end
+
+    # A string containing a human-readable representation of the matcher.
+    def inspect
+      "#{self.class}(#{expected.inspect})"
+    end
+
+    # Returns a string representing the matcher.
+    def to_s
+      "match #{expected.inspect}"
+    end
+  end
+end

data/lib/matchi/raise_exception.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module Matchi
+  # *Expecting errors* matcher.
+  class RaiseException
+    # @return [String] The expected exception name.
+    attr_reader :expected
+
+    # Initialize the matcher with a descendant of class Exception.
+    #
+    # @example
+    #   require "matchi/raise_exception"
+    #
+    #   Matchi::RaiseException.new(NameError)
+    #
+    # @param expected [Exception, #to_s] The expected exception name.
+    def initialize(expected)
+      @expected = String(expected)
+    end
+
+    # Boolean comparison between the actual value and the expected value.
+    #
+    # @example
+    #   require "matchi/raise_exception"
+    #
+    #   matcher = Matchi::RaiseException.new(NameError)
+    #
+    #   matcher.expected          # => "NameError"
+    #   matcher.matches? { Boom } # => true
+    #
+    # @yieldreturn [#object_id] The actual value to compare to the expected
+    #   one.
+    #
+    # @return [Boolean] Comparison between actual and expected values.
+    def matches?
+      yield
+    rescue self.class.const_get(expected) => _e
+      true
+    else
+      false
+    end
+
+    # A string containing a human-readable representation of the matcher.
+    def inspect
+      "#{self.class}(#{expected})"
+    end
+
+    # Returns a string representing the matcher.
+    def to_s
+      "raise exception #{expected}"
+    end
+  end
+end

data/lib/matchi/satisfy.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module Matchi
+  # *Satisfy* matcher.
+  class Satisfy
+    # @return [Proc] A block of code.
+    attr_reader :expected
+
+    # Initialize the matcher with a block.
+    #
+    # @example
+    #   require "matchi/satisfy"
+    #
+    #   Matchi::Satisfy.new { |value| value == 42 }
+    #
+    # @param block [Proc] A block of code.
+    def initialize(&block)
+      @expected = block
+    end
+
+    # Boolean comparison between the actual value and the expected value.
+    #
+    # @example
+    #   require "matchi/satisfy"
+    #
+    #   matcher = Matchi::Satisfy.new { |value| value == 42 }
+    #
+    #   matcher.expected        # => #<Proc:0x00007fbaafc65540>
+    #   matcher.matches? { 42 } # => true
+    #
+    # @yieldreturn [#object_id] The actual value to compare to the expected
+    #   one.
+    #
+    # @return [Boolean] Comparison between actual and expected values.
+    def matches?
+      expected.call(yield)
+    end
+
+    # A string containing a human-readable representation of the matcher.
+    def inspect
+      "#{self.class}(&block)"
+    end
+
+    # Returns a string representing the matcher.
+    def to_s
+      "satisfy &block"
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: matchi
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Cyril Kato
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-21 00:00:00.000000000 Z
+date: 2021-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,7 +122,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: "Collection of expectation matchers for Ruby \U0001F939"
+description: "Collection of expectation matchers for Rubyists \U0001F939"
 email: contact@cyril.email
 executables: []
 extensions: []
@@ -131,25 +131,21 @@ files:
 - LICENSE.md
 - README.md
 - lib/matchi.rb
-- lib/matchi/helper.rb
-- lib/matchi/matcher.rb
-- lib/matchi/matcher/base.rb
-- lib/matchi/matcher/be_an_instance_of.rb
-- lib/matchi/matcher/be_false.rb
-- lib/matchi/matcher/be_nil.rb
-- lib/matchi/matcher/be_true.rb
-- lib/matchi/matcher/change.rb
-- lib/matchi/matcher/change/by.rb
-- lib/matchi/matcher/change/by_at_least.rb
-- lib/matchi/matcher/change/by_at_most.rb
-- lib/matchi/matcher/change/from.rb
-- lib/matchi/matcher/change/from/to.rb
-- lib/matchi/matcher/change/to.rb
-- lib/matchi/matcher/eql.rb
-- lib/matchi/matcher/equal.rb
-- lib/matchi/matcher/match.rb
-- lib/matchi/matcher/raise_exception.rb
-- lib/matchi/matcher/satisfy.rb
+- lib/matchi/be.rb
+- lib/matchi/be_an_instance_of.rb
+- lib/matchi/be_within.rb
+- lib/matchi/be_within/of.rb
+- lib/matchi/change.rb
+- lib/matchi/change/by.rb
+- lib/matchi/change/by_at_least.rb
+- lib/matchi/change/by_at_most.rb
+- lib/matchi/change/from.rb
+- lib/matchi/change/from/to.rb
+- lib/matchi/change/to.rb
+- lib/matchi/eq.rb
+- lib/matchi/match.rb
+- lib/matchi/raise_exception.rb
+- lib/matchi/satisfy.rb
 homepage: https://github.com/fixrb/matchi
 licenses:
 - MIT
@@ -172,5 +168,5 @@ requirements: []
 rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
-summary: "Collection of expectation matchers for Ruby \U0001F939"
+summary: "Collection of expectation matchers for Rubyists \U0001F939"
 test_files: []

data/lib/matchi/helper.rb

@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "matcher"
-
-module Matchi
-  # When included, this module defines a helper instance method per matcher.
-  #
-  # @example Define and use the dynamic helper instance method of a custom matcher
-  #   require "matchi/matcher/base"
-  #
-  #   module Matchi
-  #     module Matcher
-  #       class BeTheAnswer < ::Matchi::Matcher::Base
-  #         def matches?
-  #           42.equal?(yield)
-  #         end
-  #       end
-  #     end
-  #   end
-  #
-  #   require "matchi/helper"
-  #
-  #   class MatcherBase
-  #     include ::Matchi::Helper
-  #   end
-  #
-  #   matcher_base = MatcherBase.new
-  #   matcher_base.be_the_answer.matches? { 42 } # => true
-  module Helper
-    ::Matchi::Matcher.constants.each do |matcher_const|
-      next if matcher_const.equal?(:Base)
-
-      matcher_klass = ::Matchi::Matcher.const_get(matcher_const)
-
-      define_method(matcher_klass.to_sym) do |*args, **kwargs, &block|
-        matcher_klass.new(*args, **kwargs, &block)
-      end
-    end
-  end
-end

data/lib/matchi/matcher.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module Matchi
-  # Collection of matcher classes.
-  module Matcher
-  end
-end
-
-Dir[File.join(File.dirname(__FILE__), "matcher", "*.rb")].each do |fname|
-  require_relative fname
-end

data/lib/matchi/matcher/base.rb

@@ -1,63 +0,0 @@
-# frozen_string_literal: true
-
-module Matchi
-  module Matcher
-    # Abstract matcher class.
-    class Base
-      # Returns a symbol identifying the matcher.
-      #
-      # @example The readable definition of a FooBar matcher class.
-      #   matcher_class = Matchi::Matcher::FooBar
-      #   matcher_class.to_sym # => "foo_bar"
-      #
-      # @return [Symbol] A symbol identifying the matcher.
-      def self.to_sym
-        name.split("::")
-            .fetch(-1)
-            .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
-            .gsub(/([a-z\d])([A-Z])/, '\1_\2')
-            .downcase
-            .to_sym
-      end
-
-      # @return [#object_id] Any value to give to the matcher.
-      attr_reader :expected
-
-      # A string containing a human-readable representation of the matcher.
-      #
-      # @example The human-readable representation of a FooBar matcher instance.
-      #   matcher = Matchi::Matcher::FooBar.new(42)
-      #   matcher.inspect # => "Matchi::Matcher::FooBar(42)"
-      #
-      # @return [String] The human-readable representation of the matcher.
-      def inspect
-        "#{self.class}(#{expected&.inspect})"
-      end
-
-      # Abstract matcher class.
-      #
-      # @example Test the equivalence between two "foo" strings.
-      #   eql = Matchi::Matcher::Eql.new("foo")
-      #   eql.matches? { "foo" } # => true
-      #
-      # @yieldreturn [#object_id] The actual value to compare to the expected
-      #   one.
-      #
-      # @raise [NotImplementedError] Override this method inside a matcher.
-      def matches?
-        raise ::NotImplementedError, "matcher MUST respond to this method."
-      end
-
-      # Returns a string representing the matcher instance.
-      #
-      # @example The readable definition of a FooBar matcher instance.
-      #   matcher = Matchi::Matcher::FooBar.new(42)
-      #   matcher.to_s # => "foo_bar 42"
-      #
-      # @return [String] A string representing the matcher instance.
-      def to_s
-        [self.class.to_sym, expected&.inspect].compact.join(" ")
-      end
-    end
-  end
-end