super_diff 0.1.0 → 0.2.0

data/lib/super_diff/differs/array.rb

@@ -1,8 +1,8 @@
 module SuperDiff
   module Differs
     class Array < Base
-      def self.applies_to?(value)
-        value.is_a?(::Array)
+      def self.applies_to?(expected, actual)
+        expected.is_a?(::Array) && actual.is_a?(::Array)
       end
 
       def call

data/lib/super_diff/differs/base.rb

@@ -1,29 +1,22 @@
 module SuperDiff
   module Differs
     class Base
-      def self.applies_to?(_value)
+      def self.applies_to?(_expected, _actual)
         raise NotImplementedError
       end
 
-      def self.call(*args)
-        new(*args).call
-      end
+      extend AttrExtras.mixin
 
-      def initialize(
-        expected,
-        actual,
-        indent_level:,
-        index_in_collection: nil,
-        extra_operational_sequencer_classes: [],
-        extra_diff_formatter_classes: []
+      method_object(
+        :expected,
+        :actual,
+        [
+          :indent_level!,
+          index_in_collection: nil,
+          extra_operational_sequencer_classes: [],
+          extra_diff_formatter_classes: [],
+        ],
       )
-        @expected = expected
-        @actual = actual
-        @indent_level = indent_level
-        @index_in_collection = index_in_collection
-        @extra_operational_sequencer_classes = extra_operational_sequencer_classes
-        @extra_diff_formatter_classes = extra_diff_formatter_classes
-      end
 
       def call
         raise NotImplementedError
@@ -31,9 +24,6 @@ module SuperDiff
 
       protected
 
-      attr_reader :expected, :actual, :indent_level, :index_in_collection,
-        :extra_operational_sequencer_classes, :extra_diff_formatter_classes
-
       def indentation
         " " * (indent_level * 2)
       end

data/lib/super_diff/differs/custom_object.rb

@@ -0,0 +1,26 @@
+module SuperDiff
+  module Differs
+    class CustomObject < Base
+      def self.applies_to?(expected, actual)
+        expected.class == actual.class &&
+          expected.respond_to?(:attributes_for_super_diff) &&
+          actual.respond_to?(:attributes_for_super_diff)
+      end
+
+      def call
+        operations.to_diff(indent_level: indent_level)
+      end
+
+      private
+
+      def operations
+        OperationalSequencers::CustomObject.call(
+          expected: expected,
+          actual: actual,
+          extra_operational_sequencer_classes: extra_operational_sequencer_classes,
+          extra_diff_formatter_classes: extra_diff_formatter_classes,
+        )
+      end
+    end
+  end
+end

data/lib/super_diff/differs/default_object.rb

@@ -0,0 +1,25 @@
+module SuperDiff
+  module Differs
+    class DefaultObject < Base
+      def self.applies_to?(expected, actual)
+        expected.class == actual.class
+      end
+
+      def call
+        operations.to_diff(indent_level: indent_level)
+      end
+
+      private
+
+      def operations
+        OperationalSequencer.call(
+          expected: expected,
+          actual: actual,
+          all_or_nothing: true,
+          extra_classes: extra_operational_sequencer_classes,
+          extra_diff_formatter_classes: extra_diff_formatter_classes,
+        )
+      end
+    end
+  end
+end

data/lib/super_diff/differs/empty.rb

@@ -1,7 +1,7 @@
 module SuperDiff
   module Differs
     class Empty < Base
-      def self.applies_to?(_value)
+      def self.applies_to?(_expected, _actual)
         true
       end
 

data/lib/super_diff/differs/hash.rb

@@ -1,8 +1,8 @@
 module SuperDiff
   module Differs
     class Hash < Base
-      def self.applies_to?(value)
-        value.is_a?(::Hash)
+      def self.applies_to?(expected, actual)
+        expected.is_a?(::Hash) && actual.is_a?(::Hash)
       end
 
       def call

data/lib/super_diff/differs/{multi_line_string.rb → multiline_string.rb}

@@ -1,12 +1,13 @@
 module SuperDiff
   module Differs
-    class MultiLineString < Base
-      def self.applies_to?(value)
-        value.is_a?(::String) && value.include?("\n")
+    class MultilineString < Base
+      def self.applies_to?(expected, actual)
+        expected.is_a?(::String) && actual.is_a?(::String) &&
+          (expected.include?("\n") || actual.include?("\n"))
       end
 
       def call
-        DiffFormatters::MultiLineString.call(
+        DiffFormatters::MultilineString.call(
           operations,
           indent_level: indent_level,
         )
@@ -15,7 +16,7 @@ module SuperDiff
       private
 
       def operations
-        OperationalSequencers::MultiLineString.call(
+        OperationalSequencers::MultilineString.call(
           expected: expected,
           actual: actual,
           extra_operational_sequencer_classes: extra_operational_sequencer_classes,

data/lib/super_diff/equality_matcher.rb

@@ -1,22 +1,16 @@
 module SuperDiff
   class EqualityMatcher
-    def self.call(*args)
-      new(*args).call
-    end
+    extend AttrExtras.mixin
 
-    def initialize(
-      expected:,
-      actual:,
-      extra_classes: [],
-      extra_operational_sequencer_classes: [],
-      extra_diff_formatter_classes: []
+    method_object(
+      [
+        :expected!,
+        :actual!,
+        extra_classes: [],
+        extra_operational_sequencer_classes: [],
+        extra_diff_formatter_classes: [],
+      ],
     )
-      @expected = expected
-      @actual = actual
-      @extra_classes = extra_classes
-      @extra_operational_sequencer_classes = extra_operational_sequencer_classes
-      @extra_diff_formatter_classes = extra_diff_formatter_classes
-    end
 
     def call
       resolved_class.call(
@@ -29,14 +23,7 @@ module SuperDiff
 
     private
 
-    attr_reader :expected, :actual, :extra_classes,
-      :extra_operational_sequencer_classes, :extra_diff_formatter_classes
-
     def resolved_class
-      matching_class || EqualityMatchers::Object
-    end
-
-    def matching_class
       (EqualityMatchers::DEFAULTS + extra_classes).find do |klass|
         klass.applies_to?(expected) && klass.applies_to?(actual)
       end

data/lib/super_diff/equality_matchers.rb

@@ -1,5 +1,23 @@
 module SuperDiff
   module EqualityMatchers
-    DEFAULTS = [Array, Hash, MultiLineString, SingleLineString, Object].freeze
+    autoload :Array, "super_diff/equality_matchers/array"
+    autoload :Base, "super_diff/equality_matchers/base"
+    autoload :Hash, "super_diff/equality_matchers/hash"
+    autoload :MultilineString, "super_diff/equality_matchers/multiline_string"
+    autoload :Default, "super_diff/equality_matchers/default"
+    autoload :Primitive, "super_diff/equality_matchers/primitive"
+    autoload(
+      :SinglelineString,
+      "super_diff/equality_matchers/singleline_string",
+    )
+
+    DEFAULTS = [
+      Primitive,
+      Array,
+      Hash,
+      MultilineString,
+      SinglelineString,
+      Default,
+    ].freeze
   end
 end

data/lib/super_diff/equality_matchers/array.rb

@@ -11,14 +11,16 @@ module SuperDiff
 
           #{
             Helpers.style(
-              :deleted,
-              "Expected: #{Helpers.inspect_object(expected)}",
+              :alpha,
+              "Expected: " +
+              ObjectInspection.inspect(expected, as_single_line: true),
             )
           }
           #{
             Helpers.style(
-              :inserted,
-              "  Actual: #{Helpers.inspect_object(actual)}",
+              :beta,
+              "  Actual: " +
+              ObjectInspection.inspect(actual, as_single_line: true),
             )
           }
 

data/lib/super_diff/equality_matchers/base.rb

@@ -5,21 +5,16 @@ module SuperDiff
         raise NotImplementedError
       end
 
-      def self.call(*args)
-        new(*args).call
-      end
+      extend AttrExtras.mixin
 
-      def initialize(
-        expected:,
-        actual:,
-        extra_operational_sequencer_classes: [],
-        extra_diff_formatter_classes: []
+      method_object(
+        [
+          :expected!,
+          :actual!,
+          extra_operational_sequencer_classes: [],
+          extra_diff_formatter_classes: [],
+        ]
       )
-        @expected = expected
-        @actual = actual
-        @extra_operational_sequencer_classes = extra_operational_sequencer_classes
-        @extra_diff_formatter_classes = extra_diff_formatter_classes
-      end
 
       def call
         if expected == actual
@@ -31,9 +26,6 @@ module SuperDiff
 
       protected
 
-      attr_reader :expected, :actual, :extra_operational_sequencer_classes,
-        :extra_diff_formatter_classes
-
       def fail
         raise NotImplementedError
       end

data/lib/super_diff/equality_matchers/default.rb

@@ -0,0 +1,60 @@
+module SuperDiff
+  module EqualityMatchers
+    class Default < Base
+      def self.applies_to?(_value)
+        true
+      end
+
+      def fail
+        <<~OUTPUT.strip
+          Differing objects.
+
+          #{expected_line}
+          #{actual_line}
+          #{diff_section}
+        OUTPUT
+      end
+
+      protected
+
+      def expected_line
+        Helpers.style(
+          :alpha,
+          "Expected: " +
+          ObjectInspection.inspect(expected, as_single_line: true),
+        )
+      end
+
+      def actual_line
+        Helpers.style(
+          :beta,
+          "  Actual: " +
+          ObjectInspection.inspect(actual, as_single_line: true),
+        )
+      end
+
+      def diff_section
+        if diff.blank?
+          ""
+        else
+          <<~SECTION
+
+            Diff:
+
+            #{diff}
+          SECTION
+        end
+      end
+
+      def diff
+        Differ.call(
+          expected,
+          actual,
+          indent_level: 0,
+          extra_operational_sequencer_classes: extra_operational_sequencer_classes,
+          extra_diff_formatter_classes: extra_diff_formatter_classes,
+        )
+      end
+    end
+  end
+end

data/lib/super_diff/equality_matchers/hash.rb

@@ -11,14 +11,16 @@ module SuperDiff
 
           #{
             Helpers.style(
-              :deleted,
-              "Expected: #{Helpers.inspect_object(expected)}",
+              :alpha,
+              "Expected: " +
+              ObjectInspection.inspect(expected, as_single_line: true),
             )
           }
           #{
             Helpers.style(
-              :inserted,
-              "  Actual: #{Helpers.inspect_object(actual)}",
+              :beta,
+              "  Actual: " +
+              ObjectInspection.inspect(actual, as_single_line: true),
             )
           }
 

data/lib/super_diff/equality_matchers/{multi_line_string.rb → multiline_string.rb}

@@ -1,6 +1,6 @@
 module SuperDiff
   module EqualityMatchers
-    class MultiLineString < Base
+    class MultilineString < Base
       def self.applies_to?(value)
         value.is_a?(::String) && value.include?("\n")
       end
@@ -10,15 +10,18 @@ module SuperDiff
           Differing strings.
 
           #{
+            # TODO: This whole thing should not be red or green, just the values
             Helpers.style(
-              :deleted,
-              "Expected: #{Helpers.inspect_object(expected)}",
+              :alpha,
+              "Expected: " +
+              ObjectInspection.inspect(expected, as_single_line: true),
             )
           }
           #{
             Helpers.style(
-              :inserted,
-              "  Actual: #{Helpers.inspect_object(actual)}",
+              :beta,
+              "  Actual: " +
+              ObjectInspection.inspect(actual, as_single_line: true),
             )
           }
 
@@ -31,7 +34,7 @@ module SuperDiff
       private
 
       def diff
-        Differs::MultiLineString.call(
+        Differs::MultilineString.call(
           expected,
           actual,
           indent_level: 0,

data/lib/super_diff/equality_matchers/primitive.rb

@@ -0,0 +1,34 @@
+module SuperDiff
+  module EqualityMatchers
+    class Primitive < Base
+      def self.applies_to?(value)
+        value.is_a?(Symbol) ||
+          value.is_a?(Numeric) ||
+          # TODO: Test this
+          value == true ||
+          value == false
+      end
+
+      def fail
+        <<~OUTPUT.strip
+          Differing #{Helpers.plural_type_for(actual)}.
+
+          #{
+            Helpers.style(
+              :alpha,
+              "Expected: " +
+              ObjectInspection.inspect(expected, as_single_line: true),
+            )
+          }
+          #{
+            Helpers.style(
+              :beta,
+              "  Actual: " +
+              ObjectInspection.inspect(actual, as_single_line: true),
+            )
+          }
+        OUTPUT
+      end
+    end
+  end
+end