super_diff 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 573a4d219dcad689aca11cffe1beaa7e3c4974958231b1cacd92c32ef0542d74
-  data.tar.gz: dfb59c966c00ec59df137eb45289c056f1dd58ec461d36913b49527294c99da9
+  metadata.gz: 3ac91e4432f7f0811776000b7a7153addd51ae073428eb03c8ae46218a5fe63d
+  data.tar.gz: 81e25a8e85f13ecb77c6da4a8a923a4958d4f6695104841573bc80f0dec028b3
 SHA512:
-  metadata.gz: 333c9c71197fa48a68e0328ae1eed9703e96838e6afcef4bc33dcc68f34761ad8b694a8e768bffe86d11372d14c34704634176d35bab5d6584e042fb3eb99627
-  data.tar.gz: '09136f70b82bef9591e709fffb12023da3beb59d69a55d52f89171649e7df1e6bf618ba00bf6ad08ad404369da7b505cd5027a18917701e41737e07a48faa0c7'
+  metadata.gz: f9dd989b77d595b455c73ca7daf7191a9bb5f45f28dedeef4a1729b31f4933935b006beb2c640f063a6041fddb5596f46d876585f995526ed60de5c552ec3b68
+  data.tar.gz: 3f50f8e32f20a2bccdb9b5ca18f39ae9e8b9ebffbe601ce91ecfe0b742d7fffd6ca44fe78a65a5c6fc93598630d37c0d8bd06c27aff352afa27780d103b1413b

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.rb

@@ -81,7 +81,16 @@ module SuperDiff
     end
 
     def self.aliased_matcher?(value)
-      value.is_a?(::RSpec::Matchers::AliasedMatcher)
+      if SuperDiff::RSpec.rspec_version < '3.13.0'
+        value.is_a?(::RSpec::Matchers::AliasedMatcher)
+      else # See Github issue #250.
+        !ordered_options?(value) && value.respond_to?(:base_matcher)
+      end
+    end
+
+    def self.ordered_options?(value)
+      defined?(::ActiveSupport::OrderedOptions) &&
+        value.is_a?(::ActiveSupport::OrderedOptions)
     end
 
     def self.rspec_version
@@ -124,3 +133,5 @@ module SuperDiff
 end
 
 require_relative 'rspec/monkey_patches'
+
+RSpec.configuration.filter_gems_from_backtrace('super_diff')

data/lib/super_diff/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SuperDiff
-  VERSION = '0.14.0'
+  VERSION = '0.15.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: super_diff
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Elliot Winkler
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-15 00:00:00.000000000 Z
+date: 2025-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: attr_extras