super_diff 0.7.0 → 0.8.0

data/lib/super_diff/object_inspection/nodes/text.rb

@@ -2,13 +2,27 @@ module SuperDiff
   module ObjectInspection
     module Nodes
       class Text < Base
-        def evaluate(object, **)
+        def self.node_name
+          :text
+        end
+
+        def self.method_name
+          :add_text
+        end
+
+        def render_to_string(object)
           if block
-            tree.evaluate_block(object, &block).to_s
+            evaluate_block(object).to_s
           else
             immediate_value.to_s
           end
         end
+
+        def render_to_lines(object, **)
+          # NOTE: This is a bit of a hack since it returns a string instead of a
+          # Line, but it is handled in InspectionTree (see UpdateTieredLines)
+          render_to_string(object)
+        end
       end
     end
   end

data/lib/super_diff/object_inspection/nodes/when_empty.rb

@@ -2,16 +2,31 @@ module SuperDiff
   module ObjectInspection
     module Nodes
       class WhenEmpty < Base
-        def evaluate(object, indent_level:, as_single_line:)
+        def self.node_name
+          :when_empty
+        end
+
+        def self.method_name
+          :when_empty
+        end
+
+        def render_to_string(object)
           if empty?(object)
-            evaluate_in_subtree(
+            render_to_string_in_subtree(object)
+          else
+            ""
+          end
+        end
+
+        def render_to_lines(object, type:, indentation_level:)
+          if empty?(object)
+            render_to_lines_in_subtree(
               object,
-              indent_level: indent_level,
-              as_single_line: as_single_line,
-              &block
+              type: type,
+              indentation_level: indentation_level,
             )
           else
-            ""
+            []
           end
         end
 

data/lib/super_diff/object_inspection/nodes/when_non_empty.rb

@@ -2,15 +2,30 @@ module SuperDiff
   module ObjectInspection
     module Nodes
       class WhenNonEmpty < Base
-        def evaluate(object, indent_level:, as_single_line:)
+        def self.node_name
+          :when_non_empty
+        end
+
+        def self.method_name
+          :when_non_empty
+        end
+
+        def render_to_string(object)
           if empty?(object)
             ""
           else
-            evaluate_in_subtree(
+            render_to_string_in_subtree(object)
+          end
+        end
+
+        def render_to_lines(object, type:, indentation_level:)
+          if empty?(object)
+            []
+          else
+            render_to_lines_in_subtree(
               object,
-              indent_level: indent_level,
-              as_single_line: as_single_line,
-              &block
+              type: type,
+              indentation_level: indentation_level,
             )
           end
         end

data/lib/super_diff/object_inspection/nodes/when_rendering_to_lines.rb

@@ -0,0 +1,27 @@
+module SuperDiff
+  module ObjectInspection
+    module Nodes
+      class WhenRenderingToLines < Base
+        def self.node_name
+          :when_rendering_to_lines
+        end
+
+        def self.method_name
+          :when_rendering_to_lines
+        end
+
+        def render_to_string(*)
+          ""
+        end
+
+        def render_to_lines(object, type:, indentation_level:)
+          render_to_lines_in_subtree(
+            object,
+            type: type,
+            indentation_level: indentation_level,
+          )
+        end
+      end
+    end
+  end
+end

data/lib/super_diff/object_inspection/nodes/when_rendering_to_string.rb

@@ -0,0 +1,27 @@
+module SuperDiff
+  module ObjectInspection
+    module Nodes
+      class WhenRenderingToString < Base
+        def self.node_name
+          :when_rendering_to_string
+        end
+
+        def self.method_name
+          :when_rendering_to_string
+        end
+
+        def render_to_string(object)
+          if block
+            render_to_string_in_subtree(object)
+          else
+            immediate_value.to_s
+          end
+        end
+
+        def render_to_lines(*, **)
+          []
+        end
+      end
+    end
+  end
+end

data/lib/super_diff/object_inspection/prefix_for_next_node.rb

@@ -0,0 +1,6 @@
+module SuperDiff
+  module ObjectInspection
+    class PrefixForNextNode < String
+    end
+  end
+end

data/lib/super_diff/object_inspection/prelude_for_next_node.rb

@@ -0,0 +1,6 @@
+module SuperDiff
+  module ObjectInspection
+    class PreludeForNextNode < String
+    end
+  end
+end

data/lib/super_diff/operation_tree_builders/array.rb

@@ -17,7 +17,7 @@ module SuperDiff
           operation_tree: operation_tree,
           expected: expected,
           actual: actual,
-          sequence: method(:sequence),
+          compare: method(:compare),
         )
       end
 
@@ -28,7 +28,7 @@ module SuperDiff
       class LcsCallbacks
         extend AttrExtras.mixin
 
-        pattr_initialize [:operation_tree!, :expected!, :actual!, :sequence!]
+        pattr_initialize [:operation_tree!, :expected!, :actual!, :compare!]
         public :operation_tree
 
         def match(event)
@@ -44,10 +44,10 @@ module SuperDiff
         end
 
         def change(event)
-          child_operations = sequence.call(event.old_element, event.new_element)
+          children = compare.(event.old_element, event.new_element)
 
-          if child_operations
-            add_change_operation(event, child_operations)
+          if children
+            add_change_operation(event, children)
           else
             add_delete_operation(event)
             add_insert_operation(event)
@@ -63,7 +63,6 @@ module SuperDiff
             key: event.old_position,
             value: event.old_element,
             index: event.old_position,
-            index_in_collection: expected.index(event.old_element),
           )
         end
 
@@ -74,7 +73,6 @@ module SuperDiff
             key: event.new_position,
             value: event.new_element,
             index: event.new_position,
-            index_in_collection: actual.index(event.new_element),
           )
         end
 
@@ -85,11 +83,10 @@ module SuperDiff
             key: event.new_position,
             value: event.new_element,
             index: event.new_position,
-            index_in_collection: actual.index(event.new_element),
           )
         end
 
-        def add_change_operation(event, child_operations)
+        def add_change_operation(event, children)
           operation_tree << Operations::BinaryOperation.new(
             name: :change,
             left_collection: expected,
@@ -100,7 +97,7 @@ module SuperDiff
             right_value: event.new_element,
             left_index: event.old_position,
             right_index: event.new_position,
-            child_operations: child_operations,
+            children: children,
           )
         end
       end

data/lib/super_diff/operation_tree_builders/base.rb

@@ -39,7 +39,7 @@ module SuperDiff
           )
             unmatched_delete_operations.delete(delete_operation)
 
-            if (child_operations = possible_comparison_of(
+            if (children = possible_comparison_of(
               delete_operation,
               insert_operation,
             ))
@@ -52,9 +52,9 @@ module SuperDiff
                 right_key: insert_operation.key,
                 left_value: delete_operation.collection[operation.key],
                 right_value: insert_operation.collection[operation.key],
-                left_index: delete_operation.index_in_collection,
-                right_index: insert_operation.index_in_collection,
-                child_operations: child_operations,
+                left_index: delete_operation.index,
+                right_index: insert_operation.index,
+                children: children,
               )
             else
               operation_tree << insert_operation
@@ -73,7 +73,7 @@ module SuperDiff
 
       def possible_comparison_of(operation, next_operation)
         if should_compare?(operation, next_operation)
-          sequence(operation.value, next_operation.value)
+          compare(operation.value, next_operation.value)
         else
           nil
         end
@@ -86,7 +86,7 @@ module SuperDiff
           next_operation.key == operation.key
       end
 
-      def sequence(expected, actual)
+      def compare(expected, actual)
         OperationTreeBuilders::Main.call(
           expected: expected,
           actual: actual,

data/lib/super_diff/operation_tree_builders/custom_object.rb

@@ -7,9 +7,12 @@ module SuperDiff
           actual.respond_to?(:attributes_for_super_diff)
       end
 
+      protected
+
       def build_operation_tree
-        # XXX This assumes that `expected` and `actual` are the same
-        OperationTrees::CustomObject.new([], value_class: expected.class)
+        # NOTE: It doesn't matter whether we use expected or actual here,
+        # because all we care about is the name of the class
+        OperationTrees::CustomObject.new([], underlying_object: actual)
       end
 
       def attribute_names

data/lib/super_diff/operation_tree_builders/default_object.rb

@@ -25,7 +25,7 @@ module SuperDiff
       def build_operation_tree
         # XXX This assumes that `expected` and `actual` are the same
         # TODO: Does this need to be find_operation_tree_for?
-        OperationTrees::DefaultObject.new([], value_class: expected.class)
+        OperationTrees::DefaultObject.new([], underlying_object: actual)
       end
 
       def find_operation_tree_for(value)

data/lib/super_diff/operation_tree_builders/hash.rb

@@ -65,7 +65,6 @@ module SuperDiff
                     key: ek,
                     value: ev2,
                     index: ei2,
-                    index_in_collection: ei2,
                   )
                 end
               end
@@ -77,7 +76,6 @@ module SuperDiff
               key: ak,
               value: av,
               index: ai,
-              index_in_collection: ai,
             )
           else
             # (If we're here, it probably means that the key in 'actual' isn't
@@ -133,7 +131,6 @@ module SuperDiff
                     key: ek,
                     value: ev,
                     index: ei2,
-                    index_in_collection: ei2,
                   )
                 end
 
@@ -148,7 +145,6 @@ module SuperDiff
                     key: ak,
                     value: av,
                     index: ai,
-                    index_in_collection: ai,
                   )
                 end
               end
@@ -169,7 +165,6 @@ module SuperDiff
                 key: ak,
                 value: expected[ak],
                 index: ei,
-                index_in_collection: ei,
               )
             end
 
@@ -184,7 +179,6 @@ module SuperDiff
                 key: ak,
                 value: av,
                 index: ai,
-                index_in_collection: ai,
               )
             end
           end
@@ -207,7 +201,6 @@ module SuperDiff
             key: ek,
             value: ev,
             index: ei,
-            index_in_collection: ei,
           )
         end
 

data/lib/super_diff/operation_tree_builders/multiline_string.rb

@@ -38,12 +38,8 @@ module SuperDiff
 
       attr_reader :sequence_matcher, :original_expected, :original_actual
 
-      def split_into_lines(str)
-        str.
-          split(/(\r?\n)/).
-          each_slice(2).
-          map(&:join).
-          map { |line| line.inspect[1..-2] }
+      def split_into_lines(string)
+        string.scan(/.+(?:\r|\n|\r\n|\Z)/)
       end
 
       def opcodes

data/lib/super_diff/operation_tree_flatteners.rb

@@ -0,0 +1,20 @@
+module SuperDiff
+  module OperationTreeFlatteners
+    autoload :Array, "super_diff/operation_tree_flatteners/array"
+    autoload :Base, "super_diff/operation_tree_flatteners/base"
+    autoload :Collection, "super_diff/operation_tree_flatteners/collection"
+    autoload(
+      :CustomObject,
+      "super_diff/operation_tree_flatteners/custom_object",
+    )
+    autoload(
+      :DefaultObject,
+      "super_diff/operation_tree_flatteners/default_object",
+    )
+    autoload :Hash, "super_diff/operation_tree_flatteners/hash"
+    autoload(
+      :MultilineString,
+      "super_diff/operation_tree_flatteners/multiline_string",
+    )
+  end
+end

data/lib/super_diff/operation_tree_flatteners/array.rb

@@ -0,0 +1,15 @@
+module SuperDiff
+  module OperationTreeFlatteners
+    class Array < Collection
+      protected
+
+      def open_token
+        "["
+      end
+
+      def close_token
+        "]"
+      end
+    end
+  end
+end

data/lib/super_diff/operation_tree_flatteners/base.rb

@@ -0,0 +1,54 @@
+module SuperDiff
+  module OperationTreeFlatteners
+    class Base
+      include ImplementationChecks
+      extend AttrExtras.mixin
+
+      method_object :operation_tree, [indentation_level: 0]
+
+      def call
+        beginning_lines + middle_lines + ending_lines
+      end
+
+      protected
+
+      def build_tiered_lines
+        unimplemented_instance_method!
+      end
+
+      private
+
+      def beginning_lines
+        if tiered_lines.empty?
+          []
+        elsif indentation_level > 0
+          [tiered_lines[0]]
+        else
+          [tiered_lines[0].with_complete_bookend(:open)]
+        end
+      end
+
+      def middle_lines
+        if tiered_lines.empty?
+          []
+        else
+          tiered_lines[1..-2]
+        end
+      end
+
+      def ending_lines
+        if tiered_lines.empty?
+          []
+        elsif indentation_level > 0
+          [tiered_lines[-1]]
+        else
+          [tiered_lines[-1].with_complete_bookend(:close)]
+        end
+      end
+
+      def tiered_lines
+        @_tiered_lines ||= build_tiered_lines
+      end
+    end
+  end
+end