Give FailureMessageTemplate and FailureMessageBuilders better names

Author: mcmire

lib/super_diff/rspec.rb

@@ -6,14 +6,8 @@ module RSpec
     autoload :Configuration, "super_diff/rspec/configuration"
     autoload :Differ, "super_diff/rspec/differ"
     autoload :Differs, "super_diff/rspec/differs"
-    autoload(
-      :FailureMessageBuilders,
-      "super_diff/rspec/failure_message_builders",
-    )
-    autoload(
-      :FailureMessageTemplate,
-      "super_diff/rspec/failure_message_template",
-    )
+    autoload :MatcherTextBuilders, "super_diff/rspec/matcher_text_builders"
+    autoload :MatcherTextTemplate, "super_diff/rspec/matcher_text_template"
     autoload :ObjectInspection, "super_diff/rspec/object_inspection"
     autoload :OperationalSequencers, "super_diff/rspec/operational_sequencers"
 

lib/super_diff/rspec/augmented_matcher.rb

@@ -4,7 +4,7 @@ module AugmentedMatcher
       # Update to use expected_for_description instead of @expected
       # TODO: Test
       def description
-        failure_message_template_builder.matcher_description
+        matcher_text_builder.matcher_description
       end
 
       # Colorize the 'actual' value
@@ -26,7 +26,7 @@ def diffable?
       protected
 
       def build_failure_message(negated:)
-        failure_message_template_builder.call(negated: negated)
+        matcher_text_builder.call(negated: negated)
       end
 
       def actual_for_failure_message
@@ -37,17 +37,17 @@ def expected_for_failure_message
         description_of(expected)
       end
 
-      def failure_message_template_builder
-        @_failure_message_template_builder ||=
-          failure_message_template_builder_class.new(
+      def matcher_text_builder
+        @_matcher_text_builder ||=
+          matcher_text_builder_class.new(
             actual: actual_for_failure_message,
             expected: expected_for_failure_message,
             expected_action: expected_action,
           )
       end
 
-      def failure_message_template_builder_class
-        FailureMessageBuilders::Base
+      def matcher_text_builder_class
+        MatcherTextBuilders::Base
       end
 
       private

lib/super_diff/rspec/failure_message_builders.rb

@@ -0,0 +1,24 @@
+module SuperDiff
+  module RSpec
+    module MatcherTextBuilders
+      autoload :Base, "super_diff/rspec/matcher_text_builders/base"
+      autoload(
+        :BePredicate,
+        "super_diff/rspec/matcher_text_builders/be_predicate",
+      )
+      autoload(
+        :ContainExactly,
+        "super_diff/rspec/matcher_text_builders/contain_exactly",
+      )
+      autoload :Match, "super_diff/rspec/matcher_text_builders/match"
+      autoload(
+        :RaiseError,
+        "super_diff/rspec/matcher_text_builders/raise_error",
+      )
+      autoload(
+        :RespondTo,
+        "super_diff/rspec/matcher_text_builders/respond_to",
+      )
+    end
+  end
+end

lib/super_diff/rspec/matcher_text_builders.rb

@@ -1,14 +1,14 @@
 module SuperDiff
   module RSpec
-    module FailureMessageBuilders
+    module MatcherTextBuilders
       class Base
         def initialize(actual:, expected:, expected_action:)
           @actual = actual
           @expected = expected
           @expected_action = expected_action
 
           @negated = nil
-          @template = FailureMessageTemplate.new
+          @template = MatcherTextTemplate.new
         end
 
         def call(negated:)
@@ -19,7 +19,7 @@ def call(negated:)
         end
 
         def matcher_description
-          template = FailureMessageTemplate.new do |t|
+          template = MatcherTextTemplate.new do |t|
             t.add_text expected_action
             add_expected_value_to(t)
           end
@@ -78,7 +78,7 @@ def add_actual_value
         end
 
         def expected_section
-          FailureMessageTemplate.new do |t|
+          MatcherTextTemplate.new do |t|
             t.add_text_in_singleline_mode expected_phrase
             t.add_text_in_multiline_mode do
               expected_phrase.to_s.rjust(phrase_width)

lib/super_diff/rspec/failure_message_builders/base.rb renamed to lib/super_diff/rspec/matcher_text_builders/base.rb

@@ -1,6 +1,6 @@
 module SuperDiff
   module RSpec
-    module FailureMessageBuilders
+    module MatcherTextBuilders
       class BePredicate < Base
         def initialize(
           predicate_accessible:,
@@ -15,7 +15,7 @@ def initialize(
         end
 
         def matcher_description
-          template = FailureMessageTemplate.new do |t|
+          template = MatcherTextTemplate.new do |t|
             t.add_text "return true for"
             add_expected_value_to(t)
           end

lib/super_diff/rspec/failure_message_builders/be_predicate.rb renamed to lib/super_diff/rspec/matcher_text_builders/be_predicate.rb

@@ -1,6 +1,6 @@
 module SuperDiff
   module RSpec
-    module FailureMessageBuilders
+    module MatcherTextBuilders
       class ContainExactly < Base
         protected
 

lib/super_diff/rspec/failure_message_builders/contain_exactly.rb renamed to lib/super_diff/rspec/matcher_text_builders/contain_exactly.rb

@@ -1,6 +1,6 @@
 module SuperDiff
   module RSpec
-    module FailureMessageBuilders
+    module MatcherTextBuilders
       class Match < Base
         def initialize(expected_captures:, **rest)
           super(rest)

lib/super_diff/rspec/failure_message_builders/match.rb renamed to lib/super_diff/rspec/matcher_text_builders/match.rb

@@ -1,6 +1,6 @@
 module SuperDiff
   module RSpec
-    module FailureMessageBuilders
+    module MatcherTextBuilders
       class RaiseError < Base
         protected
 

lib/super_diff/rspec/failure_message_builders/raise_error.rb renamed to lib/super_diff/rspec/matcher_text_builders/raise_error.rb

@@ -1,6 +1,6 @@
 module SuperDiff
   module RSpec
-    module FailureMessageBuilders
+    module MatcherTextBuilders
       class RespondTo < Base
         def initialize(
           expected_arity:,