super_diff 0.13.0 → 0.15.0

data/lib/super_diff/rspec/matcher_text_builders/respond_to.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module RSpec
     module MatcherTextBuilders
@@ -19,7 +21,7 @@ module SuperDiff
         protected
 
         def add_expected_value_to(template, expected)
-          template.add_text " "
+          template.add_text ' '
           template.add_list_in_color(expected_color, expected)
         end
 
@@ -28,7 +30,7 @@ module SuperDiff
 
           if arbitrary_keywords?
             add_arbitrary_keywords_clause_to(template)
-          elsif has_expected_keywords?
+          elsif expected_keywords?
             add_keywords_clause_to(template)
           end
 
@@ -43,8 +45,8 @@ module SuperDiff
           @arbitrary_keywords
         end
 
-        def has_expected_keywords?
-          expected_keywords && expected_keywords.count > 0
+        def expected_keywords?
+          expected_keywords&.count&.positive?
         end
 
         def unlimited_arguments?
@@ -52,34 +54,34 @@ module SuperDiff
         end
 
         def add_arity_clause_to(template)
-          template.add_text " with "
+          template.add_text ' with '
           template.add_text_in_color expected_color, expected_arity
-          template.add_text " "
-          template.add_text pluralize("argument", expected_arity)
+          template.add_text ' '
+          template.add_text pluralize('argument', expected_arity)
         end
 
         def add_arbitrary_keywords_clause_to(template)
-          template.add_text " with "
-          template.add_text_in_color expected_color, "any"
-          template.add_text " keywords"
+          template.add_text ' with '
+          template.add_text_in_color expected_color, 'any'
+          template.add_text ' keywords'
         end
 
         def add_keywords_clause_to(template)
-          template.add_text " with "
-          template.add_text pluralize("keyword", expected_keywords.length)
-          template.add_text " "
+          template.add_text ' with '
+          template.add_text pluralize('keyword', expected_keywords.length)
+          template.add_text ' '
           template.add_list_in_color expected_color, expected_keywords
         end
 
         def add_unlimited_arguments_clause_to(template)
-          if arbitrary_keywords? || has_expected_keywords?
-            template.add_text " and "
+          if arbitrary_keywords? || expected_keywords?
+            template.add_text ' and '
           else
-            template.add_text " with "
+            template.add_text ' with '
           end
 
-          template.add_text_in_color expected_color, "unlimited"
-          template.add_text " arguments"
+          template.add_text_in_color expected_color, 'unlimited'
+          template.add_text ' arguments'
         end
 
         def pluralize(word, count)

data/lib/super_diff/rspec/matcher_text_builders.rb

@@ -1,25 +1,27 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module RSpec
     module MatcherTextBuilders
-      autoload :Base, "super_diff/rspec/matcher_text_builders/base"
+      autoload :Base, 'super_diff/rspec/matcher_text_builders/base'
       autoload(
         :BePredicate,
-        "super_diff/rspec/matcher_text_builders/be_predicate"
+        'super_diff/rspec/matcher_text_builders/be_predicate'
       )
       autoload(
         :ContainExactly,
-        "super_diff/rspec/matcher_text_builders/contain_exactly"
+        'super_diff/rspec/matcher_text_builders/contain_exactly'
       )
       autoload(
         :HavePredicate,
-        "super_diff/rspec/matcher_text_builders/have_predicate"
+        'super_diff/rspec/matcher_text_builders/have_predicate'
       )
-      autoload :Match, "super_diff/rspec/matcher_text_builders/match"
+      autoload :Match, 'super_diff/rspec/matcher_text_builders/match'
       autoload(
         :RaiseError,
-        "super_diff/rspec/matcher_text_builders/raise_error"
+        'super_diff/rspec/matcher_text_builders/raise_error'
       )
-      autoload(:RespondTo, "super_diff/rspec/matcher_text_builders/respond_to")
+      autoload(:RespondTo, 'super_diff/rspec/matcher_text_builders/respond_to')
     end
   end
 end

data/lib/super_diff/rspec/matcher_text_template.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module RSpec
     class MatcherTextTemplate
@@ -13,41 +15,41 @@ module SuperDiff
         yield self if block_given?
       end
 
-      def add_text(*args, &block)
-        add_token(PlainText, *args, &block)
+      def add_text(...)
+        add_token(PlainText, ...)
       end
 
-      def add_text_in_color(*args, &block)
-        add_token(ColorizedText, *args, &block)
+      def add_text_in_color(...)
+        add_token(ColorizedText, ...)
       end
 
-      def add_text_in_singleline_mode(*args, &block)
-        add_token(PlainTextInSinglelineMode, *args, &block)
+      def add_text_in_singleline_mode(...)
+        add_token(PlainTextInSinglelineMode, ...)
       end
 
-      def add_text_in_multiline_mode(*args, &block)
-        add_token(PlainTextInMultilineMode, *args, &block)
+      def add_text_in_multiline_mode(...)
+        add_token(PlainTextInMultilineMode, ...)
       end
 
-      def add_list_in_color(*args, &block)
-        add_token(ColorizedList, *args, &block)
+      def add_list_in_color(...)
+        add_token(ColorizedList, ...)
       end
 
-      def add_break(*args, &block)
-        add_token(Break, *args, &block)
+      def add_break(...)
+        add_token(Break, ...)
       end
 
-      def insert(*args, &block)
-        add_token(Insertion, *args, &block)
+      def insert(...)
+        add_token(Insertion, ...)
       end
 
       def length_of_first_paragraph
-        Csi.decolorize(to_string_in_singleline_mode).split(/\n\n/).first.length
+        Csi.decolorize(to_string_in_singleline_mode).split("\n\n").first.length
       end
 
       def to_s(as_single_line: nil)
         if length_of_first_paragraph > MAX_LINE_LENGTH ||
-             as_single_line == false
+           as_single_line == false
           to_string_in_multiline_mode
         elsif length_of_first_paragraph <= MAX_LINE_LENGTH ||
               as_single_line == true
@@ -67,21 +69,17 @@ module SuperDiff
 
       attr_reader :tokens
 
-      def add_token(klass, *args, &block)
-        tokens << klass.new(*args, &block)
+      def add_token(klass, ...)
+        tokens << klass.new(...)
       end
 
       class Base
         def to_string_in_singleline_mode
-          raise NotImplementedError.new(
-                  "#{self.class} must support #to_string_in_singleline_mode"
-                )
+          raise NotImplementedError, "#{self.class} must support #to_string_in_singleline_mode"
         end
 
         def to_string_in_multiline_mode
-          raise NotImplementedError.new(
-                  "#{self.class} must support #to_string_in_multiline_mode"
-                )
+          raise NotImplementedError, "#{self.class} must support #to_string_in_multiline_mode"
         end
 
         def length
@@ -91,6 +89,7 @@ module SuperDiff
 
       class Text < Base
         def initialize(immediate_value = nil, &block)
+          super()
           @immediate_value = immediate_value
           @block = block
         end
@@ -104,7 +103,7 @@ module SuperDiff
         end
 
         def to_s
-          raise NotImplementedError.new("#{self.class} must support #to_s")
+          raise NotImplementedError, "#{self.class} must support #to_s"
         end
 
         protected
@@ -112,11 +111,7 @@ module SuperDiff
         attr_reader :immediate_value, :block
 
         def evaluate
-          if immediate_value && block
-            raise ArgumentError.new(
-                    "Cannot provide both immediate value and block"
-                  )
-          end
+          raise ArgumentError, 'Cannot provide both immediate value and block' if immediate_value && block
 
           immediate_value || block.call
         end
@@ -124,12 +119,12 @@ module SuperDiff
         def to_sentence(values)
           case values.length
           when 0
-            ""
+            ''
           when 1
             values[0]
           else
             # TODO: Use Oxford comma
-            values[0..-2].join(", ") + " and #{values[-1]}"
+            values[0..-2].join(', ') + " and #{values[-1]}"
           end
         end
       end
@@ -141,8 +136,8 @@ module SuperDiff
       end
 
       class ColorizedText < Text
-        def initialize(color, *args, &block)
-          super(*args, &block)
+        def initialize(color, ...)
+          super(...)
 
           @color = color
         end
@@ -165,8 +160,8 @@ module SuperDiff
       end
 
       class ColorizedList < Text
-        def initialize(color, *args, &block)
-          super(*args, &block)
+        def initialize(color, ...)
+          super(...)
 
           @color = color
         end
@@ -199,13 +194,13 @@ module SuperDiff
         end
 
         def to_string_in_multiline_mode
-          ""
+          ''
         end
       end
 
       class PlainTextInMultilineMode < Text
         def to_string_in_singleline_mode
-          ""
+          ''
         end
 
         def to_string_in_multiline_mode
@@ -215,7 +210,7 @@ module SuperDiff
 
       class Break < Base
         def to_string_in_singleline_mode
-          " "
+          ' '
         end
 
         def to_string_in_multiline_mode

data/lib/super_diff/rspec/monkey_patches.rb

@@ -309,73 +309,146 @@ module RSpec
   end
 
   module Matchers
-    class ExpectedsForMultipleDiffs
-      SuperDiff.insert_singleton_overrides(self) do
-        # Add a key for different sides
-        def from(expected)
-          return expected if self === expected
-
-          text = colorizer.wrap("Diff:", SuperDiff.configuration.header_color)
-
-          if SuperDiff.configuration.key_enabled?
-            text +=
-              "\n\n" +
-                colorizer.wrap(
-                  "┌ (Key) ──────────────────────────┐",
-                  SuperDiff.configuration.border_color
-                ) + "\n" +
-                colorizer.wrap("│ ", SuperDiff.configuration.border_color) +
-                colorizer.wrap(
-                  "‹-› in expected, not in actual",
-                  SuperDiff.configuration.expected_color
-                ) +
-                colorizer.wrap("  │", SuperDiff.configuration.border_color) +
-                "\n" +
-                colorizer.wrap("│ ", SuperDiff.configuration.border_color) +
-                colorizer.wrap(
-                  "‹+› in actual, not in expected",
-                  SuperDiff.configuration.actual_color
-                ) +
-                colorizer.wrap("  │", SuperDiff.configuration.border_color) +
-                "\n" +
-                colorizer.wrap("│ ", SuperDiff.configuration.border_color) +
-                "‹ › in both expected and actual" +
-                colorizer.wrap(" │", SuperDiff.configuration.border_color) +
-                "\n" +
-                colorizer.wrap(
-                  "└─────────────────────────────────┘",
-                  SuperDiff.configuration.border_color
-                )
+    if SuperDiff::RSpec.rspec_version < "3.13.0"
+      class ExpectedsForMultipleDiffs
+        SuperDiff.insert_singleton_overrides(self) do
+          # Add a key for different sides
+          def from(expected)
+            return expected if self === expected
+
+            text = colorizer.wrap("Diff:", SuperDiff.configuration.header_color)
+
+            if SuperDiff.configuration.key_enabled?
+              text +=
+                "\n\n" +
+                  colorizer.wrap(
+                    "┌ (Key) ──────────────────────────┐",
+                    SuperDiff.configuration.border_color
+                  ) + "\n" +
+                  colorizer.wrap("│ ", SuperDiff.configuration.border_color) +
+                  colorizer.wrap(
+                    "‹-› in expected, not in actual",
+                    SuperDiff.configuration.expected_color
+                  ) +
+                  colorizer.wrap("  │", SuperDiff.configuration.border_color) +
+                  "\n" +
+                  colorizer.wrap("│ ", SuperDiff.configuration.border_color) +
+                  colorizer.wrap(
+                    "‹+› in actual, not in expected",
+                    SuperDiff.configuration.actual_color
+                  ) +
+                  colorizer.wrap("  │", SuperDiff.configuration.border_color) +
+                  "\n" +
+                  colorizer.wrap("│ ", SuperDiff.configuration.border_color) +
+                  "‹ › in both expected and actual" +
+                  colorizer.wrap(" │", SuperDiff.configuration.border_color) +
+                  "\n" +
+                  colorizer.wrap(
+                    "└─────────────────────────────────┘",
+                    SuperDiff.configuration.border_color
+                  )
+            end
+
+            new([[expected, text]])
           end
 
-          new([[expected, text]])
+          def colorizer
+            RSpec::Core::Formatters::ConsoleCodes
+          end
         end
 
-        def colorizer
-          RSpec::Core::Formatters::ConsoleCodes
+        SuperDiff.insert_overrides(self) do
+          # Add an extra line break
+          def message_with_diff(message, differ, actual)
+            diff = diffs(differ, actual)
+
+            diff.empty? ? message : "#{message.rstrip}\n\n#{diff}"
+          end
+
+          private
+
+          # Add extra line breaks in between diffs, and colorize the word "Diff"
+          def diffs(differ, actual)
+            @expected_list
+              .map do |(expected, diff_label)|
+                diff = differ.diff(actual, expected)
+                next if diff.strip.empty?
+                diff_label + diff
+              end
+              .compact
+              .join("\n\n")
+          end
         end
       end
+    else
+      class MultiMatcherDiff
+        SuperDiff.insert_singleton_overrides(self) do
+          # Add a key for different sides
+          def from(expected, actual)
+            return expected if self === expected
+
+            text = colorizer.wrap("Diff:", SuperDiff.configuration.header_color)
+
+            if SuperDiff.configuration.key_enabled?
+              text +=
+                "\n\n" +
+                  colorizer.wrap(
+                    "┌ (Key) ──────────────────────────┐",
+                    SuperDiff.configuration.border_color
+                  ) + "\n" +
+                  colorizer.wrap("│ ", SuperDiff.configuration.border_color) +
+                  colorizer.wrap(
+                    "‹-› in expected, not in actual",
+                    SuperDiff.configuration.expected_color
+                  ) +
+                  colorizer.wrap("  │", SuperDiff.configuration.border_color) +
+                  "\n" +
+                  colorizer.wrap("│ ", SuperDiff.configuration.border_color) +
+                  colorizer.wrap(
+                    "‹+› in actual, not in expected",
+                    SuperDiff.configuration.actual_color
+                  ) +
+                  colorizer.wrap("  │", SuperDiff.configuration.border_color) +
+                  "\n" +
+                  colorizer.wrap("│ ", SuperDiff.configuration.border_color) +
+                  "‹ › in both expected and actual" +
+                  colorizer.wrap(" │", SuperDiff.configuration.border_color) +
+                  "\n" +
+                  colorizer.wrap(
+                    "└─────────────────────────────────┘",
+                    SuperDiff.configuration.border_color
+                  )
+            end
 
-      SuperDiff.insert_overrides(self) do
-        # Add an extra line break
-        def message_with_diff(message, differ, actual)
-          diff = diffs(differ, actual)
+            new([[expected, text, actual]])
+          end
 
-          diff.empty? ? message : "#{message.rstrip}\n\n#{diff}"
+          def colorizer
+            RSpec::Core::Formatters::ConsoleCodes
+          end
         end
 
-        private
+        SuperDiff.insert_overrides(self) do
+          # Add an extra line break
+          def message_with_diff(message, differ)
+            diff = diffs(differ)
+
+            diff.empty? ? message : "#{message.rstrip}\n\n#{diff}"
+          end
 
-        # Add extra line breaks in between diffs, and colorize the word "Diff"
-        def diffs(differ, actual)
-          @expected_list
-            .map do |(expected, diff_label)|
-              diff = differ.diff(actual, expected)
-              next if diff.strip.empty?
-              diff_label + diff
-            end
-            .compact
-            .join("\n\n")
+          private
+
+          # Add extra line breaks in between diffs, and colorize the word "Diff"
+          def diffs(differ)
+            @expected_list
+              .map do |(expected, diff_label, actual)|
+                diff = differ.diff(actual, expected)
+                next if diff.strip.empty?
+                diff_label + diff
+              end
+              .compact
+              .join("\n\n")
+          end
         end
       end
     end

data/lib/super_diff/rspec/object_inspection.rb

@@ -1,14 +1,16 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module RSpec
     module ObjectInspection
       module InspectionTreeBuilders
         def self.const_missing(missing_const_name)
           if RSpec::InspectionTreeBuilders.const_defined?(missing_const_name)
-            warn <<~EOT
-          WARNING: SuperDiff::RSpec::ObjectInspection::InspectionTreeBuilders::#{missing_const_name} is deprecated and will be removed in the next major release.
-          Please use SuperDiff::RSpec::InspectionTreeBuilders::#{missing_const_name} instead.
-          #{caller_locations.join("\n")}
-        EOT
+            warn <<~WARNING
+              WARNING: SuperDiff::RSpec::ObjectInspection::InspectionTreeBuilders::#{missing_const_name} is deprecated and will be removed in the next major release.
+              Please use SuperDiff::RSpec::InspectionTreeBuilders::#{missing_const_name} instead.
+              #{caller_locations.join("\n")}
+            WARNING
             RSpec::InspectionTreeBuilders.const_get(missing_const_name)
           else
             super

data/lib/super_diff/rspec/operation_tree_builders/collection_containing_exactly.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module RSpec
     module OperationTreeBuilders
@@ -19,9 +21,7 @@ module SuperDiff
           operations = []
 
           (0...actual.length)
-            .reject do |index|
-              indexes_in_actual_but_not_in_expected.include?(index)
-            end
+            .reject { |index| indexes_in_actual_but_not_in_expected.include?(index) }
             .each { |index| add_noop_to(operations, index) }
 
           indexes_in_actual_but_not_in_expected.each do |index|
@@ -36,7 +36,7 @@ module SuperDiff
         end
 
         def build_operation_tree
-          OperationTrees::Array.new([])
+          Basic::OperationTrees::Array.new([])
         end
 
         private

data/lib/super_diff/rspec/operation_tree_builders/collection_including.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module RSpec
     module OperationTreeBuilders

data/lib/super_diff/rspec/operation_tree_builders/hash_including.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module RSpec
     module OperationTreeBuilders

data/lib/super_diff/rspec/operation_tree_builders/object_having_attributes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module RSpec
     module OperationTreeBuilders

data/lib/super_diff/rspec/operation_tree_builders.rb

@@ -1,21 +1,23 @@
+# frozen_string_literal: true
+
 module SuperDiff
   module RSpec
     module OperationTreeBuilders
       autoload(
         :CollectionContainingExactly,
-        "super_diff/rspec/operation_tree_builders/collection_containing_exactly"
+        'super_diff/rspec/operation_tree_builders/collection_containing_exactly'
       )
       autoload(
         :CollectionIncluding,
-        "super_diff/rspec/operation_tree_builders/collection_including"
+        'super_diff/rspec/operation_tree_builders/collection_including'
       )
       autoload(
         :HashIncluding,
-        "super_diff/rspec/operation_tree_builders/hash_including"
+        'super_diff/rspec/operation_tree_builders/hash_including'
       )
       autoload(
         :ObjectHavingAttributes,
-        "super_diff/rspec/operation_tree_builders/object_having_attributes"
+        'super_diff/rspec/operation_tree_builders/object_having_attributes'
       )
     end
   end

data/lib/super_diff/rspec-rails.rb

@@ -1,2 +1,4 @@
-require "super_diff/rspec"
-require "super_diff/rails"
+# frozen_string_literal: true
+
+require 'super_diff/rspec'
+require 'super_diff/rails'