Update TruthyMatcher to use MatchData

spec/matchers/truthy_matcher_spec.cr

@@ -16,14 +16,17 @@ def be_comparison
 end
 
 describe Spectator::Matchers::TruthyMatcher do
+  describe "#match" do
+    context "returned MatchData" do
       context "truthy" do
-    describe "#match?" do
+        describe "#matched?" do
           context "with a truthy value" do
             it "is true" do
               value = 42
               partial = new_partial(value)
               matcher = Spectator::Matchers::TruthyMatcher.new(true)
-          matcher.match?(partial).should be_true
+              match_data = matcher.match(partial)
+              match_data.matched?.should be_true
             end
           end
 
@@ -32,7 +35,8 @@ describe Spectator::Matchers::TruthyMatcher do
               value = false
               partial = new_partial(value)
               matcher = Spectator::Matchers::TruthyMatcher.new(true)
-          matcher.match?(partial).should be_false
+              match_data = matcher.match(partial)
+              match_data.matched?.should be_false
             end
           end
 
@@ -41,7 +45,70 @@ describe Spectator::Matchers::TruthyMatcher do
               value = nil
               partial = new_partial(value)
               matcher = Spectator::Matchers::TruthyMatcher.new(true)
-          matcher.match?(partial).should be_false
+              match_data = matcher.match(partial)
+              match_data.matched?.should be_false
+            end
+          end
+        end
+
+        describe "#values" do
+          context "expected" do
+            it "contains the definition of falsey" do
+              value = 42
+              partial = new_partial(value)
+              matcher = Spectator::Matchers::TruthyMatcher.new(true)
+              match_data = matcher.match(partial)
+              match_data.values[:expected].should match(/false or nil/i)
+            end
+
+            it "is prefixed with \"Not\"" do
+              value = 42
+              partial = new_partial(value)
+              matcher = Spectator::Matchers::TruthyMatcher.new(true)
+              match_data = matcher.match(partial)
+              match_data.values[:expected].should start_with(/not/i)
+            end
+          end
+
+          context "actual" do
+            it "is the actual value" do
+              value = 42
+              partial = new_partial(value)
+              matcher = Spectator::Matchers::TruthyMatcher.new(true)
+              match_data = matcher.match(partial)
+              match_data.values[:actual].should eq(value)
+            end
+          end
+
+          context "truthy" do
+            context "when the actual value is truthy" do
+              it "is true" do
+                value = 42
+                partial = new_partial(value)
+                matcher = Spectator::Matchers::TruthyMatcher.new(true)
+                match_data = matcher.match(partial)
+                match_data.values[:truthy].should be_true
+              end
+            end
+
+            context "when the actual value is false" do
+              it "is false" do
+                value = false
+                partial = new_partial(value)
+                matcher = Spectator::Matchers::TruthyMatcher.new(true)
+                match_data = matcher.match(partial)
+                match_data.values[:truthy].should be_false
+              end
+            end
+
+            context "when the actual value is nil" do
+              it "is false" do
+                value = nil
+                partial = new_partial(value)
+                matcher = Spectator::Matchers::TruthyMatcher.new(true)
+                match_data = matcher.match(partial)
+                match_data.values[:truthy].should be_false
+              end
             end
           end
         end
@@ -52,7 +119,8 @@ describe Spectator::Matchers::TruthyMatcher do
             label = "everything"
             partial = new_partial(value, label)
             matcher = Spectator::Matchers::TruthyMatcher.new(true)
-        matcher.message(partial).should contain(label)
+            match_data = matcher.match(partial)
+            match_data.message.should contain(label)
           end
 
           it "contains the \"truthy\"" do
@@ -60,7 +128,8 @@ describe Spectator::Matchers::TruthyMatcher do
             label = "everything"
             partial = new_partial(value)
             matcher = Spectator::Matchers::TruthyMatcher.new(true)
-        matcher.message(partial).should contain("truthy")
+            match_data = matcher.match(partial)
+            match_data.message.should contain("truthy")
           end
         end
 
@@ -70,7 +139,8 @@ describe Spectator::Matchers::TruthyMatcher do
             label = "everything"
             partial = new_partial(value, label)
             matcher = Spectator::Matchers::TruthyMatcher.new(true)
-        matcher.negated_message(partial).should contain(label)
+            match_data = matcher.match(partial)
+            match_data.negated_message.should contain(label)
           end
 
           it "contains the \"truthy\"" do
@@ -78,19 +148,21 @@ describe Spectator::Matchers::TruthyMatcher do
             label = "everything"
             partial = new_partial(value)
             matcher = Spectator::Matchers::TruthyMatcher.new(true)
-        matcher.negated_message(partial).should contain("truthy")
+            match_data = matcher.match(partial)
+            match_data.negated_message.should contain("truthy")
           end
         end
       end
 
       context "falsey" do
-    describe "#match?" do
+        describe "#matched?" do
           context "with a truthy value" do
             it "is false" do
               value = 42
               partial = new_partial(value)
               matcher = Spectator::Matchers::TruthyMatcher.new(false)
-          matcher.match?(partial).should be_false
+              match_data = matcher.match(partial)
+              match_data.matched?.should be_false
             end
           end
 
@@ -99,7 +171,8 @@ describe Spectator::Matchers::TruthyMatcher do
               value = false
               partial = new_partial(value)
               matcher = Spectator::Matchers::TruthyMatcher.new(false)
-          matcher.match?(partial).should be_true
+              match_data = matcher.match(partial)
+              match_data.matched?.should be_true
             end
           end
 
@@ -108,7 +181,70 @@ describe Spectator::Matchers::TruthyMatcher do
               value = nil
               partial = new_partial(value)
               matcher = Spectator::Matchers::TruthyMatcher.new(false)
-          matcher.match?(partial).should be_true
+              match_data = matcher.match(partial)
+              match_data.matched?.should be_true
+            end
+          end
+        end
+
+        describe "#values" do
+          context "expected" do
+            it "contains the definition of falsey" do
+              value = 42
+              partial = new_partial(value)
+              matcher = Spectator::Matchers::TruthyMatcher.new(false)
+              match_data = matcher.match(partial)
+              match_data.values[:expected].should match(/false or nil/i)
+            end
+
+            it "is not prefixed with \"Not\"" do
+              value = 42
+              partial = new_partial(value)
+              matcher = Spectator::Matchers::TruthyMatcher.new(false)
+              match_data = matcher.match(partial)
+              match_data.values[:expected].should_not start_with(/not/i)
+            end
+          end
+
+          context "actual" do
+            it "is the actual value" do
+              value = 42
+              partial = new_partial(value)
+              matcher = Spectator::Matchers::TruthyMatcher.new(false)
+              match_data = matcher.match(partial)
+              match_data.values[:actual].should eq(value)
+            end
+          end
+
+          context "truthy" do
+            context "when the actual value is truthy" do
+              it "is true" do
+                value = 42
+                partial = new_partial(value)
+                matcher = Spectator::Matchers::TruthyMatcher.new(false)
+                match_data = matcher.match(partial)
+                match_data.values[:truthy].should be_true
+              end
+            end
+
+            context "when the actual value is false" do
+              it "is false" do
+                value = false
+                partial = new_partial(value)
+                matcher = Spectator::Matchers::TruthyMatcher.new(false)
+                match_data = matcher.match(partial)
+                match_data.values[:truthy].should be_false
+              end
+            end
+
+            context "when the actual value is nil" do
+              it "is false" do
+                value = nil
+                partial = new_partial(value)
+                matcher = Spectator::Matchers::TruthyMatcher.new(false)
+                match_data = matcher.match(partial)
+                match_data.values[:truthy].should be_false
+              end
             end
           end
         end
@@ -119,7 +255,8 @@ describe Spectator::Matchers::TruthyMatcher do
             label = "everything"
             partial = new_partial(value, label)
             matcher = Spectator::Matchers::TruthyMatcher.new(false)
-        matcher.message(partial).should contain(label)
+            match_data = matcher.match(partial)
+            match_data.message.should contain(label)
           end
 
           it "contains the \"falsey\"" do
@@ -127,7 +264,8 @@ describe Spectator::Matchers::TruthyMatcher do
             label = "everything"
             partial = new_partial(value)
             matcher = Spectator::Matchers::TruthyMatcher.new(false)
-        matcher.message(partial).should contain("falsey")
+            match_data = matcher.match(partial)
+            match_data.message.should contain("falsey")
           end
         end
 
@@ -137,7 +275,8 @@ describe Spectator::Matchers::TruthyMatcher do
             label = "everything"
             partial = new_partial(value, label)
             matcher = Spectator::Matchers::TruthyMatcher.new(false)
-        matcher.negated_message(partial).should contain(label)
+            match_data = matcher.match(partial)
+            match_data.negated_message.should contain(label)
           end
 
           it "contains the \"falsey\"" do
@@ -145,7 +284,10 @@ describe Spectator::Matchers::TruthyMatcher do
             label = "everything"
             partial = new_partial(value)
             matcher = Spectator::Matchers::TruthyMatcher.new(false)
-        matcher.negated_message(partial).should contain("falsey")
+            match_data = matcher.match(partial)
+            match_data.negated_message.should contain("falsey")
+          end
+        end
       end
     end
   end

src/spectator/matchers/truthy_matcher.cr

@@ -21,28 +21,16 @@ module Spectator::Matchers
     end
 
     # Determines whether the matcher is satisfied with the value given to it.
-    # True is returned if the match was successful, false otherwise.
+    private def match?(actual)
-    def match?(partial)
       # Cast value to truthy value and compare.
-      @truthy == !!partial.actual
+      @truthy == !!actual
     end
 
     # Determines whether the matcher is satisfied with the partial given to it.
     # `MatchData` is returned that contains information about the match.
-    def match(partial) : MatchData
+    def match(partial)
-      raise NotImplementedError.new("#match")
+      actual = partial.actual
-    end
+      MatchData.new(match?(actual), @truthy, actual, partial.label)
-
-    # Describes the condition that satisfies the matcher.
-    # This is informational and displayed to the end-user.
-    def message(partial)
-      "Expected #{partial.label} to be #{label}"
-    end
-
-    # Describes the condition that won't satsify the matcher.
-    # This is informational and displayed to the end-user.
-    def negated_message(partial)
-      "Expected #{partial.label} to not be #{label}"
     end
 
     # Creates a matcher that checks if a value is less than an expected value.
@@ -98,5 +86,39 @@ module Spectator::Matchers
     def !=(expected : ExpectedType) forall ExpectedType
       InequalityMatcher.new(expected)
     end
+
+    # Match data specific to this matcher.
+    private struct MatchData(ActualType) < MatchData
+      # Creates the match data.
+      def initialize(matched, @truthy : Bool, @actual : ActualType, @actual_label : String)
+        super(matched)
+      end
+
+      # Information about the match.
+      def values
+        {
+          expected: @truthy ? "Not false or nil" : "false or nil",
+          actual:   @actual,
+          truthy:   !!@actual,
+        }
+      end
+
+      # Describes the condition that satisfies the matcher.
+      # This is informational and displayed to the end-user.
+      def message
+        "#{@actual_label} is #{expected_label}"
+      end
+
+      # Describes the condition that won't satsify the matcher.
+      # This is informational and displayed to the end-user.
+      def negated_message
+        "#{@actual_label} is not #{expected_label}"
+      end
+
+      # Textual representation of what the matcher expects.
+      private def expected_label
+        @truthy ? "truthy" : "falsey"
+      end
+    end
   end
 end