r_spec-clone 1.2.4 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e5c67c5d900bbe71f8e647c1fd1c4e5bd6a96e01b9db3d228918dedb755edd2
-  data.tar.gz: 3907ef8dab4a2bb8c751eacf281c5f643b2f3a9c774fbb71ec1cfc0707072dea
+  metadata.gz: c8475d853643279af5a0a255bf7b3fd5b4547f4dd596bc044fa37a5ac2d69ff0
+  data.tar.gz: 3d22158ee01cb6f0e4924bd57345225e35d40920b2bffaf0cf862575db4b62ca
 SHA512:
-  metadata.gz: 758790442ee21c56a0d40f98385ad7bdfbcbc88d527fc266f86641623fed9c172b68144e538a4565dd19e211b53b3412d847813978991853bfe2d8ab82a67cd7
-  data.tar.gz: fd4c45945f0f84de6361f68aaec5d84feb6f9983f27248b42abb5757b9c17a3fd15b00e4c0ab7314a6050d6234f8e3b8e5ef997d87df26b34e7f199322dc621d
+  metadata.gz: 2f6826b996db0d6b3f727a7bc16b7757f7fc1ae350ca2285cf81aaf4ce8bfb15f0c37a8910bb2413800821524109cd6c655275aa2b800f52ba25aba1c31c9ac7
+  data.tar.gz: 53b85ef4eb8b249cdf2f717de35a6c29916c65d28a125e28656e300a5bfb7263d62865fba6d53a2517ae035cf64daa0c2b7b04a82ecaca93903502b0f5c2a59d

data/README.md

@@ -149,13 +149,13 @@ expect(actual).to match(expected) # passes if expected.match?(actual)
 expect { actual }.to raise_exception(expected) # passes if expected exception is raised
 ```
 
-#### Truth
+#### True
 
 ```ruby
 expect(actual).to be_true # passes if true.equal?(actual)
 ```
 
-#### Untruth
+#### False
 
 ```ruby
 expect(actual).to be_false # passes if false.equal?(actual)
@@ -174,6 +174,21 @@ expect(actual).to be_instance_of(expected)    # passes if expected.equal?(actual
 expect(actual).to be_an_instance_of(expected) # passes if expected.equal?(actual.class)
 ```
 
+#### Change
+
+```ruby
+expect { object.action }.to change(object, :value).from(old).to(new)
+expect { object.action }.to change(object, :value).by(delta)
+expect { object.action }.to change(object, :value).by_at_least(minimum_delta)
+expect { object.action }.to change(object, :value).by_at_most(maximum_delta)
+```
+
+#### Satisfy
+
+```ruby
+expect(actual).to(satisfy { |value| value == expected })
+```
+
 ### Running specs
 
 By convention, specs live in the `spec/` directory of a project. Spec files should end with `_spec.rb` to be recognizable as such.
@@ -234,6 +249,12 @@ bundle exec rake
 
 ## Performance
 
+The benchmarks compare the performance of [`r_spec-clone`](https://rubygems.org/gems/r_spec-clone) with the following frameworks (in alphabetical order):
+
+* [`fix`](https://rubygems.org/gems/fix)
+* [`minitest`](https://rubygems.org/gems/minitest)
+* [`rspec`](https://rubygems.org/gems/rspec)
+
 ### Boot time
 
 Benchmark against [100 executions of a file containing 1 expectation](https://github.com/cyril/r_spec-clone.rb/blob/main/benchmark/boot_time/) (lower is better).

data/lib/r_spec.rb

@@ -37,8 +37,8 @@ require_relative File.join("r_spec", "clone", "dsl")
 #
 #   # Output to the console
 #   #   Success: expected to eq 3.
-#   #   Success: expected true to be true.
-#   #   Success: expected false to be false.
+#   #   Success: expected to be true.
+#   #   Success: expected to be false.
 #
 # @example An inherited definition of let
 #   require "r_spec"

data/lib/r_spec/clone/error/pending_expectation.rb

@@ -12,13 +12,13 @@ module RSpec
         # @return [nil] Write a pending expectation to STDOUT.
         def self.result(message)
           ::Expresenter.call(true).with(
-            actual:   new(message),
-            error:    nil,
-            expected: self,
-            got:      false,
-            matcher:  :raise_exception,
-            negate:   true,
-            level:    :SHOULD
+            actual:     new(message),
+            definition: "raise exception #{self}",
+            error:      nil,
+            expected:   self,
+            got:        false,
+            negate:     true,
+            level:      :SHOULD
           )
         end
       end

data/lib/r_spec/clone/expectation_helper/shared.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
-require "matchi/rspec"
-require "matchi/helper"
+require "matchi"
 
 module RSpec
   module Clone
@@ -11,72 +10,192 @@ module RSpec
       # This module defines a number of methods to create expectations, which
       # are automatically included into examples.
       #
-      # It also includes a collection of expectation matchers 🤹
-      #
-      # @example Equivalence matcher
-      #   matcher = eql("foo") # => Matchi::Matcher::Eql.new("foo")
-      #   matcher.matches? { "foo" } # => true
-      #   matcher.matches? { "bar" } # => false
-      #
-      #   matcher = eq("foo") # => Matchi::Matcher::Eq.new("foo")
-      #   matcher.matches? { "foo" } # => true
-      #   matcher.matches? { "bar" } # => false
-      #
-      # @example Identity matcher
-      #   object = "foo"
-      #
-      #   matcher = equal(object) # => Matchi::Matcher::Equal.new(object)
-      #   matcher.matches? { object } # => true
-      #   matcher.matches? { "foo" } # => false
-      #
-      #   matcher = be(object) # => Matchi::Matcher::Be.new(object)
-      #   matcher.matches? { object } # => true
-      #   matcher.matches? { "foo" } # => false
-      #
-      # @example Regular expressions matcher
-      #   matcher = match(/^foo$/) # => Matchi::Matcher::Match.new(/^foo$/)
-      #   matcher.matches? { "foo" } # => true
-      #   matcher.matches? { "bar" } # => false
-      #
-      # @example Expecting errors matcher
-      #   matcher = raise_exception(NameError) # => Matchi::Matcher::RaiseException.new(NameError)
-      #   matcher.matches? { Boom } # => true
-      #   matcher.matches? { true } # => false
-      #
-      # @example Truth matcher
-      #   matcher = be_true # => Matchi::Matcher::BeTrue.new
-      #   matcher.matches? { true } # => true
-      #   matcher.matches? { false } # => false
-      #   matcher.matches? { nil } # => false
-      #   matcher.matches? { 4 } # => false
-      #
-      # @example Untruth matcher
-      #   matcher = be_false # => Matchi::Matcher::BeFalse.new
-      #   matcher.matches? { false } # => true
-      #   matcher.matches? { true } # => false
-      #   matcher.matches? { nil } # => false
-      #   matcher.matches? { 4 } # => false
-      #
-      # @example Nil matcher
-      #   matcher = be_nil # => Matchi::Matcher::BeNil.new
-      #   matcher.matches? { nil } # => true
-      #   matcher.matches? { false } # => false
-      #   matcher.matches? { true } # => false
-      #   matcher.matches? { 4 } # => false
-      #
-      # @example Type/class matcher
-      #   matcher = be_instance_of(String) # => Matchi::Matcher::BeInstanceOf.new(String)
-      #   matcher.matches? { "foo" } # => true
-      #   matcher.matches? { 4 } # => false
-      #
-      #   matcher = be_an_instance_of(String) # => Matchi::Matcher::BeAnInstanceOf.new(String)
-      #   matcher.matches? { "foo" } # => true
-      #   matcher.matches? { 4 } # => false
+      # It also includes a collection of expectation matchers.
       #
       # @see https://github.com/fixrb/matchi
-      # @see https://github.com/fixrb/matchi-rspec
       module Shared
-        include ::Matchi::Helper
+        # Equivalence matcher
+        #
+        # @example
+        #   matcher = eq("foo")
+        #   matcher.matches? { "foo" } # => true
+        #   matcher.matches? { "bar" } # => false
+        #
+        # @param expected [#eql?] An expected equivalent object.
+        #
+        # @return [#matches?] An equivalence matcher.
+        #
+        # @api public
+        def eq(expected)
+          ::Matchi::Eq.new(expected)
+        end
+
+        alias eql eq
+
+        # Identity matcher
+        #
+        # @example
+        #   object = "foo"
+        #   matcher = be(object)
+        #   matcher.matches? { object } # => true
+        #   matcher.matches? { "foo" } # => false
+        #
+        # @param expected [#equal?] The expected identical object.
+        #
+        # @return [#matches?] An identity matcher.
+        #
+        # @api public
+        def be(expected)
+          ::Matchi::Be.new(expected)
+        end
+
+        alias equal be
+
+        # Regular expressions matcher
+        #
+        # @example
+        #   matcher = match(/^foo$/)
+        #   matcher.matches? { "foo" } # => true
+        #   matcher.matches? { "bar" } # => false
+        #
+        # @param expected [#match] A regular expression.
+        #
+        # @return [#matches?] A regular expression matcher.
+        #
+        # @api public
+        def match(expected)
+          ::Matchi::Match.new(expected)
+        end
+
+        # Expecting errors matcher
+        #
+        # @example
+        #   matcher = raise_exception(NameError)
+        #   matcher.matches? { Boom } # => true
+        #   matcher.matches? { true } # => false
+        #
+        # @param expected [Exception, #to_s] The expected exception name.
+        #
+        # @return [#matches?] An error matcher.
+        #
+        # @api public
+        def raise_exception(expected)
+          ::Matchi::RaiseException.new(expected)
+        end
+
+        # True matcher
+        #
+        # @example
+        #   matcher = be_true
+        #   matcher.matches? { true } # => true
+        #   matcher.matches? { false } # => false
+        #   matcher.matches? { nil } # => false
+        #   matcher.matches? { 4 } # => false
+        #
+        # @return [#matches?] A `true` matcher.
+        #
+        # @api public
+        def be_true
+          be(true)
+        end
+
+        # False matcher
+        #
+        # @example
+        #   matcher = be_false
+        #   matcher.matches? { false } # => true
+        #   matcher.matches? { true } # => false
+        #   matcher.matches? { nil } # => false
+        #   matcher.matches? { 4 } # => false
+        #
+        # @return [#matches?] A `false` matcher.
+        #
+        # @api public
+        def be_false
+          be(false)
+        end
+
+        # Nil matcher
+        #
+        # @example
+        #   matcher = be_nil
+        #   matcher.matches? { nil } # => true
+        #   matcher.matches? { false } # => false
+        #   matcher.matches? { true } # => false
+        #   matcher.matches? { 4 } # => false
+        #
+        # @return [#matches?] A `nil` matcher.
+        #
+        # @api public
+        def be_nil
+          be(nil)
+        end
+
+        # Type/class matcher
+        #
+        # @example
+        #   matcher = be_an_instance_of(String)
+        #   matcher.matches? { "foo" } # => true
+        #   matcher.matches? { 4 } # => false
+        #
+        # @param expected [Class, #to_s] The expected class name.
+        #
+        # @return [#matches?] A type/class matcher.
+        #
+        # @api public
+        def be_an_instance_of(expected)
+          ::Matchi::BeAnInstanceOf.new(expected)
+        end
+
+        # Change matcher
+        #
+        # @example
+        #   object = []
+        #   matcher = change(object, :length).by(1)
+        #   matcher.matches? { object << 1 } # => true
+        #
+        #   object = []
+        #   matcher = change(object, :length).by_at_least(1)
+        #   matcher.matches? { object << 1 } # => true
+        #
+        #   object = []
+        #   matcher = change(object, :length).by_at_most(1)
+        #   matcher.matches? { object << 1 } # => true
+        #
+        #   object = "foo"
+        #   matcher = change(object, :to_s).from("foo").to("FOO")
+        #   matcher.matches? { object.upcase! } # => true
+        #
+        #   object = "foo"
+        #   matcher = change(object, :to_s).to("FOO")
+        #   matcher.matches? { object.upcase! } # => true
+        #
+        # @param object [#object_id]  An object.
+        # @param method [Symbol]      The name of a method.
+        # @param args   [Array]       A list of arguments.
+        # @param kwargs [Hash]        A list of keyword arguments.
+        #
+        # @return [#matches?] A change matcher.
+        #
+        # @api public
+        def change(object, method, *args, **kwargs, &block)
+          ::Matchi::Change.new(object, method, *args, **kwargs, &block)
+        end
+
+        # Satisfy matcher
+        #
+        # @example
+        #   matcher = satisfy { |value| value == 42 }
+        #   matcher.matches? { 42 } # => true
+        #
+        # @param expected [Proc] A block of code.
+        #
+        # @return [#matches?] A satisfy matcher.
+        #
+        # @api public
+        def satisfy(&expected)
+          ::Matchi::Satisfy.new(&expected)
+        end
       end
     end
   end

data/lib/r_spec/clone/expectation_target/base.rb

@@ -95,13 +95,13 @@ module RSpec
         #   `Kernel.exit(false)` with a failure message written to STDERR.
         def result(passed, actual:, error:, got:, matcher:, negate:)
           Console.passed_spec ::Expresenter.call(passed).with(
-            actual:   actual,
-            error:    error,
-            expected: matcher.expected,
-            got:      got,
-            negate:   negate,
-            matcher:  matcher.class.to_sym,
-            level:    :MUST
+            actual:     actual,
+            definition: matcher.to_s,
+            error:      error,
+            expected:   matcher.expected,
+            got:        got,
+            negate:     negate,
+            level:      :MUST
           )
         rescue ::Expresenter::Fail => e
           Console.failed_spec(e)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r_spec-clone
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.3.0
 platform: ruby
 authors:
 - Cyril Kato
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-19 00:00:00.000000000 Z
+date: 2021-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: expresenter
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
-  name: matchi-rspec
+  name: matchi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 3.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 3.1.1
 - !ruby/object:Gem::Dependency
   name: test_tube
   requirement: !ruby/object:Gem::Requirement