Simplify match data values by using named tuples

src/spectator/matchers/array_matcher.cr

@@ -1,4 +1,3 @@
-require "../test_value"
 require "./failed_match_data"
 require "./matcher"
 require "./successful_match_data"
@@ -61,29 +60,26 @@ module Spectator::Matchers
 
     private def failed_size_mismatch(expected_elements, actual_elements, actual_label)
       FailedMatchData.new("#{actual_label} does not contain exactly #{expected.label} (size mismatch)",
-        [
+        expected: expected_elements.inspect,
-          LabeledValue.new(expected_elements.inspect, "expected"),
+        actual: actual_elements.inspect,
-          LabeledValue.new(actual_elements.inspect, "actual"),
+        "expected size": expected_elements.size.to_s,
-          LabeledValue.new(expected_elements.size, "expected size"),
+        "actual size": actual_elements.size.to_s
-          LabeledValue.new(actual_elements.size, "actual size"),
+      )
-        ])
     end
 
     private def failed_content_mismatch(expected_elements, actual_elements, index, actual_label)
       FailedMatchData.new("#{actual_label} does not contain exactly #{expected.label} (element mismatch)",
-        [
+        expected: expected_elements[index].inspect,
-          LabeledValue.new(expected_elements[index].inspect, "expected"),
+        actual: actual_elements[index].inspect,
-          LabeledValue.new(actual_elements[index].inspect, "actual"),
+        index: index.to_s
-          LabeledValue.new(index.to_s, "index"),
+      )
-        ])
     end
 
     private def failed_content_identical(expected_elements, actual_elements, actual_label)
       FailedMatchData.new("#{actual.label} contains exactly #{expected.label}",
-        [
+        expected: "Not #{expected_elements.inspect}",
-          LabeledValue.new("Not #{expected_elements.inspect}", "expected"),
+        actual: actual_elements.inspect
-          LabeledValue.new(actual_elements.inspect, "actual"),
+      )
-        ])
     end
   end
 end

src/spectator/matchers/contain_matcher.cr

@@ -22,11 +22,11 @@ module Spectator::Matchers
       "#{actual.label} contains #{expected.label}"
     end
 
-    private def values(actual) : Array(LabeledValue)
+    private def values(actual)
-      [
+      {
-        LabeledValue.new(expected.value.inspect, "subset"),
+        subset:   expected.value.inspect,
-        LabeledValue.new(actual.value.inspect, "superset"),
+        superset: actual.value.inspect,
-      ]
+      }
     end
   end
 end

src/spectator/matchers/empty_matcher.cr

@@ -20,8 +20,8 @@ module Spectator::Matchers
       "#{actual.label} is empty"
     end
 
-    private def values(actual) : Array(LabeledValue)
+    private def values(actual)
-      [LabeledValue.new(actual.value.inspect, "actual")]
+      {actual: actual.value.inspect}
     end
   end
 end

src/spectator/matchers/failed_match_data.cr

@@ -1,4 +1,3 @@
-require "../test_value"
 require "./match_data"
 
 module Spectator::Matchers
@@ -9,9 +8,10 @@ module Spectator::Matchers
 
     getter failure_message : String
 
-    getter values : Array(LabeledValue)
+    getter values : Array(Tuple(Symbol, String))
 
-    def initialize(@failure_message, @values = [] of LabeledValue)
+    def initialize(@failure_message, **values)
+      @values = values.to_a
     end
   end
 end

src/spectator/matchers/greater_than_equal_matcher.cr

@@ -21,17 +21,17 @@ module Spectator::Matchers
     end
 
     private def values(actual)
-      [
+      {
-        LabeledValue.new(">= #{expected.value.inspect}", "expected"),
+        expected: ">= #{expected.value.inspect}",
-        LabeledValue.new(actual.value.inspect, "actual"),
+        actual:   actual.value.inspect,
-      ]
+      }
     end
 
     private def negated_values(actual)
-      [
+      {
-        LabeledValue.new("< #{expected.value.inspect}", "expected"),
+        expected: "< #{expected.value.inspect}",
-        LabeledValue.new(actual.value.inspect, "actual"),
+        actual:   actual.value.inspect,
-      ]
+      }
     end
   end
 end

src/spectator/matchers/greater_than_matcher.cr

@@ -21,17 +21,17 @@ module Spectator::Matchers
     end
 
     private def values(actual)
-      [
+      {
-        LabeledValue.new("> #{expected.value.inspect}", "expected"),
+        expected: "> #{expected.value.inspect}",
-        LabeledValue.new(actual.value.inspect, "actual"),
+        actual:   actual.value.inspect,
-      ]
+      }
     end
 
     private def negated_values(actual)
-      [
+      {
-        LabeledValue.new("<= #{expected.value.inspect}", "expected"),
+        expected: "<= #{expected.value.inspect}",
-        LabeledValue.new(actual.value.inspect, "actual"),
+        actual:   actual.value.inspect,
-      ]
+      }
     end
   end
 end

src/spectator/matchers/less_than_equal_matcher.cr

@@ -21,17 +21,17 @@ module Spectator::Matchers
     end
 
     private def values(actual)
-      [
+      {
-        LabeledValue.new("<= #{expected.value.inspect}", "expected"),
+        expected: "<= #{expected.value.inspect}",
-        LabeledValue.new(actual.value.inspect, "actual"),
+        actual:   actual.value.inspect,
-      ]
+      }
     end
 
     private def negated_values(actual)
-      [
+      {
-        LabeledValue.new("> #{expected.value.inspect}", "expected"),
+        expected: "> #{expected.value.inspect}",
-        LabeledValue.new(actual.value.inspect, "actual"),
+        actual:   actual.value.inspect,
-      ]
+      }
     end
   end
 end

src/spectator/matchers/less_than_matcher.cr

@@ -21,17 +21,17 @@ module Spectator::Matchers
     end
 
     private def values(actual)
-      [
+      {
-        LabeledValue.new("< #{expected.value.inspect}", "expected"),
+        expected: "< #{expected.value.inspect}",
-        LabeledValue.new(actual.value.inspect, "actual"),
+        actual:   actual.value.inspect,
-      ]
+      }
     end
 
     private def negated_values(actual)
-      [
+      {
-        LabeledValue.new(">= #{expected.value.inspect}", "expected"),
+        expected: ">= #{expected.value.inspect}",
-        LabeledValue.new(actual.value.inspect, "actual"),
+        actual:   actual.value.inspect,
-      ]
+      }
     end
   end
 end

src/spectator/matchers/standard_matcher.cr

@@ -32,12 +32,12 @@ module Spectator::Matchers
       !matches?(actual)
     end
 
-    private def values(actual) : Array(LabeledValue)
+    private def values(actual)
-      [LabeledValue.new(actual.value.inspect, "actual")]
+      {actual: actual.value.inspect}
     end
 
-    private def negated_values(actual) : Array(LabeledValue)
+    private def negated_values(actual)
-      values
+      values(actual)
     end
 
     def match(actual)

src/spectator/matchers/value_matcher.cr

@@ -13,12 +13,12 @@ module Spectator::Matchers
     def initialize(@expected)
     end
 
-    private def values(actual) : Array(LabeledValue)
+    private def values(actual)
-      super(actual) << LabeledValue.new(expected.value.inspect, "expected")
+      super.merge(expected: expected.value.inspect)
     end
 
-    private def negated_values(actual) : Array(LabeledValue)
+    private def negated_values(actual)
-      super(actual) << LabeledValue.new("Not #{expected.value.inspect}", "expected")
+      super.merge(expected: "Not #{expected.value.inspect}")
     end
   end
 end