Simplify color configuration

* Use `attr_accessor`s instead of `set_` methods to prepare for upcoming
  elision settings
* Rename all instances of `alpha` to `expected` and `beta` to `actual`
  across the tests and code
* Adjust alignment in places in tests where colors are used so they're
  easier to read

Author: mcmire

lib/super_diff/colorized_document_extensions.rb

@@ -6,12 +6,12 @@ def self.extended(extendee)
       end
     end
 
-    def alpha(*args, **opts, &block)
-      colorize(*args, **opts, fg: SuperDiff.configuration.alpha_color, &block)
+    def expected(*args, **opts, &block)
+      colorize(*args, **opts, fg: SuperDiff.configuration.expected_color, &block)
     end
 
-    def beta(*args, **opts, &block)
-      colorize(*args, **opts, fg: SuperDiff.configuration.beta_color, &block)
+    def actual(*args, **opts, &block)
+      colorize(*args, **opts, fg: SuperDiff.configuration.actual_color, &block)
     end
   end
 end

lib/super_diff/configuration.rb

@@ -1,52 +1,31 @@
 module SuperDiff
   class Configuration
     attr_reader(
+      :extra_diff_formatter_classes,
       :extra_differ_classes,
+      :extra_inspector_classes,
       :extra_operation_tree_builder_classes,
       :extra_operation_tree_classes,
-      :extra_diff_formatter_classes,
-      :extra_inspector_classes,
-      :alpha_color,
-      :beta_color,
+    )
+    attr_accessor(
+      :actual_color,
       :border_color,
+      :expected_color,
       :header_color,
     )
 
     def initialize
+      @actual_color = :yellow
+      @border_color = :blue
+      @expected_color = :magenta
+      @extra_diff_formatter_classes = [].freeze
       @extra_differ_classes = [].freeze
+      @extra_inspector_classes = [].freeze
       @extra_operation_tree_builder_classes = [].freeze
       @extra_operation_tree_classes = [].freeze
-      @extra_diff_formatter_classes = [].freeze
-      @extra_inspector_classes = [].freeze
-      @alpha_color = :magenta
-      @beta_color = :yellow
-      @border_color = :blue
       @header_color = :white
     end
 
-    def add_extra_differ_classes(*classes)
-      @extra_differ_classes = (@extra_differ_classes + classes).freeze
-    end
-    alias_method :add_extra_differ_class, :add_extra_differ_classes
-
-    def add_extra_operation_tree_builder_classes(*classes)
-      @extra_operation_tree_builder_classes =
-        (@extra_operation_tree_builder_classes + classes).freeze
-    end
-    alias_method(
-      :add_extra_operation_tree_builder_class,
-      :add_extra_operation_tree_builder_classes,
-    )
-
-    def add_extra_operation_tree_classes(*classes)
-      @extra_operation_tree_classes =
-        (@extra_operation_tree_classes + classes).freeze
-    end
-    alias_method(
-      :add_extra_operation_tree_class,
-      :add_extra_operation_tree_classes,
-    )
-
     def add_extra_diff_formatter_classes(*classes)
       @extra_diff_formatter_classes =
         (@extra_diff_formatter_classes + classes).freeze
@@ -56,6 +35,11 @@ def add_extra_diff_formatter_classes(*classes)
       :add_extra_diff_formatter_classes,
     )
 
+    def add_extra_differ_classes(*classes)
+      @extra_differ_classes = (@extra_differ_classes + classes).freeze
+    end
+    alias_method :add_extra_differ_class, :add_extra_differ_classes
+
     def add_extra_inspector_classes(*classes)
       @extra_inspector_classes =
         (@extra_inspector_classes + classes).freeze
@@ -65,28 +49,22 @@ def add_extra_inspector_classes(*classes)
       :add_extra_inspector_classes,
     )
 
-    def set_alpha_color(color)
-      @alpha_color = color
+    def add_extra_operation_tree_builder_classes(*classes)
+      @extra_operation_tree_builder_classes =
+        (@extra_operation_tree_builder_classes + classes).freeze
     end
     alias_method(
-      :set_expected_color,
-      :set_alpha_color
+      :add_extra_operation_tree_builder_class,
+      :add_extra_operation_tree_builder_classes,
     )
 
-    def set_beta_color(color)
-      @beta_color = color
+    def add_extra_operation_tree_classes(*classes)
+      @extra_operation_tree_classes =
+        (@extra_operation_tree_classes + classes).freeze
     end
     alias_method(
-      :set_actual_color,
-      :set_beta_color
+      :add_extra_operation_tree_class,
+      :add_extra_operation_tree_classes,
     )
-
-    def set_border_color(color)
-      @border_color = color
-    end
-
-    def set_header_color(color)
-      @header_color = color
-    end
   end
 end

lib/super_diff/diff_formatters/collection.rb

@@ -4,7 +4,7 @@ class Collection
       extend AttrExtras.mixin
 
       ICONS = { delete: "-", insert: "+" }.freeze
-      STYLES = { insert: :beta, delete: :alpha, noop: :plain }.freeze
+      STYLES = { insert: :actual, delete: :expected, noop: :plain }.freeze
 
       method_object(
         [

lib/super_diff/diff_formatters/multiline_string.rb

@@ -15,12 +15,12 @@ def lines
         operation_tree.reduce([]) do |array, operation|
           case operation.name
           when :change
-            array << Helpers.style(:alpha, "- #{operation.left_value}")
-            array << Helpers.style(:beta, "+ #{operation.right_value}")
+            array << Helpers.style(:expected, "- #{operation.left_value}")
+            array << Helpers.style(:actual, "+ #{operation.right_value}")
           when :delete
-            array << Helpers.style(:alpha, "- #{operation.value}")
+            array << Helpers.style(:expected, "- #{operation.value}")
           when :insert
-            array << Helpers.style(:beta, "+ #{operation.value}")
+            array << Helpers.style(:actual, "+ #{operation.value}")
           else
             array << Helpers.style(:plain, "  #{operation.value}")
           end

lib/super_diff/equality_matchers/array.rb

@@ -11,14 +11,14 @@ def fail
 
           #{
             Helpers.style(
-              :alpha,
+              :expected,
               "Expected: " +
               ObjectInspection.inspect(expected, as_single_line: true),
             )
           }
           #{
             Helpers.style(
-              :beta,
+              :actual,
               "  Actual: " +
               ObjectInspection.inspect(actual, as_single_line: true),
             )

lib/super_diff/equality_matchers/default.rb

@@ -19,15 +19,15 @@ def fail
 
       def expected_line
         Helpers.style(
-          :alpha,
+          :expected,
           "Expected: " +
           ObjectInspection.inspect(expected, as_single_line: true),
         )
       end
 
       def actual_line
         Helpers.style(
-          :beta,
+          :actual,
           "  Actual: " +
           ObjectInspection.inspect(actual, as_single_line: true),
         )

lib/super_diff/equality_matchers/hash.rb

@@ -11,14 +11,14 @@ def fail
 
           #{
             Helpers.style(
-              :alpha,
+              :expected,
               "Expected: " +
               ObjectInspection.inspect(expected, as_single_line: true),
             )
           }
           #{
             Helpers.style(
-              :beta,
+              :actual,
               "  Actual: " +
               ObjectInspection.inspect(actual, as_single_line: true),
             )

lib/super_diff/equality_matchers/multiline_string.rb

@@ -12,14 +12,14 @@ def fail
           #{
             # TODO: This whole thing should not be red or green, just the values
             Helpers.style(
-              :alpha,
+              :expected,
               "Expected: " +
               ObjectInspection.inspect(expected, as_single_line: true),
             )
           }
           #{
             Helpers.style(
-              :beta,
+              :actual,
               "  Actual: " +
               ObjectInspection.inspect(actual, as_single_line: true),
             )

lib/super_diff/equality_matchers/primitive.rb

@@ -15,14 +15,14 @@ def fail
 
           #{
             Helpers.style(
-              :alpha,
+              :expected,
               "Expected: " +
               ObjectInspection.inspect(expected, as_single_line: true),
             )
           }
           #{
             Helpers.style(
-              :beta,
+              :actual,
               "  Actual: " +
               ObjectInspection.inspect(actual, as_single_line: true),
             )

lib/super_diff/equality_matchers/singleline_string.rb

@@ -11,14 +11,14 @@ def fail
 
           #{
             Helpers.style(
-              :alpha,
+              :expected,
               "Expected: " +
               ObjectInspection.inspect(expected, as_single_line: true),
             )
           }
           #{
             Helpers.style(
-              :beta,
+              :actual,
               "  Actual: " +
               ObjectInspection.inspect(actual, as_single_line: true),
             )