Remove abstract base match data

Switching to a single type that holds the data.Trying to reduce the
number of types and generic types generated.
This commit is contained in:
Michael Miller 2019-07-30 16:08:06 -06:00
parent ae18316a5a
commit 27f844ce25

View file

@ -1,46 +1,41 @@
require "./match_data_labeled_value" require "./match_data_labeled_value"
require "./match_data_value"
require "./generic_match_data_value"
module Spectator::Matchers module Spectator::Matchers
# Information regarding a expectation parial and matcher. # Result of evaluating a matcher on an expectation partial.
# `Matcher#match` will return a sub-type of this. #
abstract struct MatchData # Procs are used to "store references" to the information.
# Most of the time, the information in this struct is unused.
# To reduce unecessary overhead and memory usage,
# the values are constructed lazily, on-demand when needed.
struct MatchData
# Indicates whether the matcher was satisified with the expectation partial. # Indicates whether the matcher was satisified with the expectation partial.
getter? matched : Bool getter? matched : Bool
# Creates the base of the match data. # Extra information about the match that is shown in the result output.
getter values : Array(MatchDataLabeledValue)
# Creates the match data.
#
# The *matched* argument indicates # The *matched* argument indicates
# whether the matcher was satisified with the expectation partial. # whether the matcher was satisified with the expectation partial.
def initialize(@matched) # The *expected* and *actual* procs are what was expected to happen
# and what actually happened.
# They should write a string to the given IO.
# The *values* are extra information about the match,
# that is shown in the result output.
def initialize(@matched, @expected : IO -> , @actual : IO -> , @values)
end end
# Information about the match. # Description of what should have happened and would satisfy the matcher.
# Returned elments will differ by matcher,
# but all will return a set of labeled values.
def values : Array(MatchDataLabeledValue)
named_tuple.map do |key, value|
if value.is_a?(MatchDataValue)
MatchDataLabeledValue.new(key, value)
else
wrapper = GenericMatchDataValue.new(value)
MatchDataLabeledValue.new(key, wrapper)
end
end
end
# Raw information about the match.
# Sub-types must implement this and return a `NamedTuple`
# containing the match data values.
# This will be transformed and returned by `#values`.
private abstract def named_tuple
# Describes the condition that satisfies the matcher.
# This is informational and displayed to the end-user. # This is informational and displayed to the end-user.
abstract def message : String def expected
@expected.call
end
# Describes the condition that won't satsify the matcher. # Description of what actually happened.
# This is informational and displayed to the end-user. # This is informational and displayed to the end-user.
abstract def negated_message : String def actual
@actual.call
end
end end
end end