Move the remaining to_json methods to their own types

src/spectator/example.cr

@@ -53,5 +53,11 @@ module Spectator
       io << ' ' unless symbolic? && @group.symbolic?
       io << what
     end
+
+    # Creates the JSON representation of the example,
+    # which is just its name.
+    def to_json(json : ::JSON::Builder)
+      json.string(to_s)
+    end
   end
 end

src/spectator/expectations/example_expectations.cr

@@ -51,5 +51,12 @@ module Spectator::Expectations
     def failed?
       !successful?
     end
+
+    # Creates the JSON representation of the expectations.
+    def to_json(json : ::JSON::Builder)
+      json.array do
+        each &.to_json(json)
+      end
+    end
   end
 end

src/spectator/expectations/expectation.cr

@@ -40,5 +40,21 @@ module Spectator::Expectations
     def actual_message
       @match_data.matched? ? @match_data.message : @match_data.negated_message
     end
+
+    # Creates the JSON representation of the expectation.
+    def to_json(json : ::JSON::Builder)
+      json.object do
+        json.field("satisfied") { satisfied?.to_json(json) }
+        json.field("expected") { expected_message.to_json(json) }
+        json.field("actual") { actual_message.to_json(json) }
+        json.field("values") do
+          json.object do
+            values.each do |labeled_value|
+              json.field(labeled_value.label, labeled_value.value.to_s)
+            end
+          end
+        end
+      end
+    end
   end
 end

src/spectator/formatting/json_formatter.cr

@@ -36,44 +36,3 @@ module Spectator::Formatting
     end
   end
 end
-
-module Spectator
-  abstract class Example < ExampleComponent
-    def to_json(json : ::JSON::Builder)
-      json.string(to_s)
-    end
-  end
-
-  struct Source
-    def to_json(json : ::JSON::Builder)
-      json.string(to_s)
-    end
-  end
-
-  module Expectations
-    class ExampleExpectations
-      def to_json(json : ::JSON::Builder)
-        json.array do
-          each &.to_json(json)
-        end
-      end
-    end
-
-    class Expectation
-      def to_json(json : ::JSON::Builder)
-        json.object do
-          json.field("satisfied") { satisfied?.to_json(json) }
-          json.field("expected") { expected_message.to_json(json) }
-          json.field("actual") { actual_message.to_json(json) }
-          json.field("values") do
-            json.object do
-              values.each do |labeled_value|
-                json.field(labeled_value.label, labeled_value.value.to_s)
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end

src/spectator/source.cr

@@ -41,5 +41,10 @@ module Spectator
       io << ':'
       io << line
     end
+
+    # Creates the JSON representation of the source.
+    def to_json(json : ::JSON::Builder)
+      json.string(to_s)
+    end
   end
 end