super_diff 0.7.0 → 0.8.0

data/spec/unit/tiered_lines_formatter_spec.rb

@@ -0,0 +1,193 @@
+require "spec_helper"
+
+RSpec.describe SuperDiff::TieredLinesFormatter, type: :unit do
+  it "formats the given lines as an array of strings with appropriate colors and indentation" do
+    tiered_lines = [
+      line(
+        type: :noop,
+        indentation_level: 0,
+        value: %([),
+      ),
+      line(
+        type: :noop,
+        indentation_level: 1,
+        value: %("foo"),
+        add_comma: true,
+      ),
+      line(
+        type: :noop,
+        indentation_level: 1,
+        value: %({),
+      ),
+      line(
+        type: :noop,
+        indentation_level: 2,
+        prefix: %(one: ),
+        value: %("fish"),
+        add_comma: true,
+      ),
+      line(
+        type: :delete,
+        indentation_level: 2,
+        prefix: %(two: ),
+        value: %("fish"),
+        add_comma: true,
+      ),
+      line(
+        type: :insert,
+        indentation_level: 2,
+        prefix: %(two: ),
+        value: %("FISH"),
+        add_comma: true,
+      ),
+      line(
+        type: :noop,
+        indentation_level: 2,
+        prefix: %(hard: ),
+        value: %([),
+      ),
+      elision(
+        indentation_level: 3,
+        value: %(# ...),
+        children: [
+          line(
+            type: :noop,
+            indentation_level: 3,
+            value: %("a"),
+          ),
+          line(
+            type: :noop,
+            indentation_level: 3,
+            value: %("b"),
+          ),
+          line(
+            type: :noop,
+            indentation_level: 3,
+            value: %("c"),
+          ),
+        ],
+      ),
+      line(
+        type: :noop,
+        indentation_level: 2,
+        value: %(]),
+        add_comma: true,
+      ),
+      line(
+        type: :insert,
+        indentation_level: 2,
+        prefix: %(blue: ),
+        value: %("fish"),
+        add_comma: true,
+      ),
+      line(
+        type: :insert,
+        indentation_level: 2,
+        prefix: %(stew: ),
+        value: %("fish"),
+      ),
+      line(
+        type: :noop,
+        indentation_level: 1,
+        value: %(}),
+        add_comma: true,
+      ),
+      line(
+        type: :noop,
+        indentation_level: 1,
+        value: %(∙∙∙),
+        add_comma: true,
+      ),
+      line(
+        type: :delete,
+        indentation_level: 1,
+        value: %("baz"),
+        add_comma: true,
+      ),
+      line(
+        type: :insert,
+        indentation_level: 1,
+        value: %(2),
+        add_comma: true,
+      ),
+      line(
+        type: :noop,
+        indentation_level: 1,
+        value: %("qux"),
+        add_comma: true,
+      ),
+      line(
+        type: :delete,
+        indentation_level: 1,
+        value: %("blargh"),
+        add_comma: true,
+      ),
+      line(
+        type: :delete,
+        indentation_level: 1,
+        value: %("zig"),
+        add_comma: true,
+      ),
+      line(
+        type: :delete,
+        indentation_level: 1,
+        value: %("zag"),
+      ),
+      line(
+        type: :noop,
+        indentation_level: 0,
+        value: %(]),
+      ),
+    ]
+
+    actual_diff = described_class.call(tiered_lines)
+
+    expected_diff = colored do
+      plain_line          %(  [)
+      plain_line          %(    "foo",)
+      plain_line          %(    {)
+      plain_line          %(      one: "fish",)
+      expected_line       %(-     two: "fish",)
+      actual_line         %(+     two: "FISH",)
+      plain_line          %(      hard: [)
+      elision_marker_line %(        # ...)
+      plain_line          %(      ],)
+      actual_line         %(+     blue: "fish",)
+      actual_line         %(+     stew: "fish")
+      plain_line          %(    },)
+      plain_line          %(    ∙∙∙,)
+      expected_line       %(-   "baz",)
+      actual_line         %(+   2,)
+      plain_line          %(    "qux",)
+      expected_line       %(-   "blargh",)
+      expected_line       %(-   "zig",)
+      expected_line       %(-   "zag")
+      plain_line          %(  ])
+    end
+
+    expect(actual_diff).to eq(expected_diff)
+  end
+
+  def line(type:, indentation_level:, value:, prefix: "", add_comma: false)
+    double(
+      :line,
+      type: type,
+      indentation_level: indentation_level,
+      prefix: prefix,
+      value: value,
+      add_comma?: add_comma,
+    )
+  end
+
+  def elision(indentation_level:, value:, children:)
+    double(
+      :elision,
+      type: :elision,
+      indentation_level: indentation_level,
+      prefix: "",
+      value: value,
+      add_comma?: false,
+      children: children,
+    )
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: super_diff
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Elliot Winkler
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-08 00:00:00.000000000 Z
+date: 2021-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: attr_extras
@@ -64,30 +64,30 @@ files:
 - README.md
 - lib/super_diff.rb
 - lib/super_diff/active_record.rb
-- lib/super_diff/active_record/diff_formatters.rb
-- lib/super_diff/active_record/diff_formatters/active_record_relation.rb
 - lib/super_diff/active_record/differs.rb
 - lib/super_diff/active_record/differs/active_record_relation.rb
 - lib/super_diff/active_record/monkey_patches.rb
 - lib/super_diff/active_record/object_inspection.rb
-- lib/super_diff/active_record/object_inspection/inspectors.rb
-- lib/super_diff/active_record/object_inspection/inspectors/active_record_model.rb
-- lib/super_diff/active_record/object_inspection/inspectors/active_record_relation.rb
+- lib/super_diff/active_record/object_inspection/inspection_tree_builders.rb
+- lib/super_diff/active_record/object_inspection/inspection_tree_builders/active_record_model.rb
+- lib/super_diff/active_record/object_inspection/inspection_tree_builders/active_record_relation.rb
 - lib/super_diff/active_record/operation_tree_builders.rb
 - lib/super_diff/active_record/operation_tree_builders/active_record_model.rb
 - lib/super_diff/active_record/operation_tree_builders/active_record_relation.rb
+- lib/super_diff/active_record/operation_tree_flatteners.rb
+- lib/super_diff/active_record/operation_tree_flatteners/active_record_relation.rb
 - lib/super_diff/active_record/operation_trees.rb
 - lib/super_diff/active_record/operation_trees/active_record_relation.rb
 - lib/super_diff/active_support.rb
-- lib/super_diff/active_support/diff_formatters.rb
-- lib/super_diff/active_support/diff_formatters/hash_with_indifferent_access.rb
 - lib/super_diff/active_support/differs.rb
 - lib/super_diff/active_support/differs/hash_with_indifferent_access.rb
 - lib/super_diff/active_support/object_inspection.rb
-- lib/super_diff/active_support/object_inspection/inspectors.rb
-- lib/super_diff/active_support/object_inspection/inspectors/hash_with_indifferent_access.rb
+- lib/super_diff/active_support/object_inspection/inspection_tree_builders.rb
+- lib/super_diff/active_support/object_inspection/inspection_tree_builders/hash_with_indifferent_access.rb
 - lib/super_diff/active_support/operation_tree_builders.rb
 - lib/super_diff/active_support/operation_tree_builders/hash_with_indifferent_access.rb
+- lib/super_diff/active_support/operation_tree_flatteners.rb
+- lib/super_diff/active_support/operation_tree_flatteners/hash_with_indifferent_access.rb
 - lib/super_diff/active_support/operation_trees.rb
 - lib/super_diff/active_support/operation_trees/hash_with_indifferent_access.rb
 - lib/super_diff/colorized_document_extensions.rb
@@ -103,15 +103,7 @@ files:
 - lib/super_diff/csi/reset_sequence.rb
 - lib/super_diff/csi/twenty_four_bit_color.rb
 - lib/super_diff/csi/uncolorized_document.rb
-- lib/super_diff/diff_formatters.rb
-- lib/super_diff/diff_formatters/array.rb
-- lib/super_diff/diff_formatters/base.rb
 - lib/super_diff/diff_formatters/collection.rb
-- lib/super_diff/diff_formatters/custom_object.rb
-- lib/super_diff/diff_formatters/default_object.rb
-- lib/super_diff/diff_formatters/defaults.rb
-- lib/super_diff/diff_formatters/hash.rb
-- lib/super_diff/diff_formatters/main.rb
 - lib/super_diff/diff_formatters/multiline_string.rb
 - lib/super_diff/differs.rb
 - lib/super_diff/differs/array.rb
@@ -141,29 +133,35 @@ files:
 - lib/super_diff/gem_version.rb
 - lib/super_diff/helpers.rb
 - lib/super_diff/implementation_checks.rb
+- lib/super_diff/line.rb
 - lib/super_diff/object_inspection.rb
 - lib/super_diff/object_inspection/inspection_tree.rb
-- lib/super_diff/object_inspection/inspectors.rb
-- lib/super_diff/object_inspection/inspectors/array.rb
-- lib/super_diff/object_inspection/inspectors/base.rb
-- lib/super_diff/object_inspection/inspectors/custom_object.rb
-- lib/super_diff/object_inspection/inspectors/default_object.rb
-- lib/super_diff/object_inspection/inspectors/defaults.rb
-- lib/super_diff/object_inspection/inspectors/hash.rb
-- lib/super_diff/object_inspection/inspectors/main.rb
-- lib/super_diff/object_inspection/inspectors/primitive.rb
-- lib/super_diff/object_inspection/inspectors/string.rb
-- lib/super_diff/object_inspection/inspectors/time_like.rb
+- lib/super_diff/object_inspection/inspection_tree_builders.rb
+- lib/super_diff/object_inspection/inspection_tree_builders/array.rb
+- lib/super_diff/object_inspection/inspection_tree_builders/base.rb
+- lib/super_diff/object_inspection/inspection_tree_builders/custom_object.rb
+- lib/super_diff/object_inspection/inspection_tree_builders/default_object.rb
+- lib/super_diff/object_inspection/inspection_tree_builders/defaults.rb
+- lib/super_diff/object_inspection/inspection_tree_builders/hash.rb
+- lib/super_diff/object_inspection/inspection_tree_builders/main.rb
+- lib/super_diff/object_inspection/inspection_tree_builders/primitive.rb
+- lib/super_diff/object_inspection/inspection_tree_builders/time_like.rb
 - lib/super_diff/object_inspection/nodes.rb
+- lib/super_diff/object_inspection/nodes/as_lines_when_rendering_to_lines.rb
+- lib/super_diff/object_inspection/nodes/as_prefix_when_rendering_to_lines.rb
+- lib/super_diff/object_inspection/nodes/as_prelude_when_rendering_to_lines.rb
+- lib/super_diff/object_inspection/nodes/as_single_line.rb
 - lib/super_diff/object_inspection/nodes/base.rb
-- lib/super_diff/object_inspection/nodes/break.rb
 - lib/super_diff/object_inspection/nodes/inspection.rb
 - lib/super_diff/object_inspection/nodes/nesting.rb
+- lib/super_diff/object_inspection/nodes/only_when.rb
 - lib/super_diff/object_inspection/nodes/text.rb
 - lib/super_diff/object_inspection/nodes/when_empty.rb
-- lib/super_diff/object_inspection/nodes/when_multiline.rb
 - lib/super_diff/object_inspection/nodes/when_non_empty.rb
-- lib/super_diff/object_inspection/nodes/when_singleline.rb
+- lib/super_diff/object_inspection/nodes/when_rendering_to_lines.rb
+- lib/super_diff/object_inspection/nodes/when_rendering_to_string.rb
+- lib/super_diff/object_inspection/prefix_for_next_node.rb
+- lib/super_diff/object_inspection/prelude_for_next_node.rb
 - lib/super_diff/operation_tree_builders.rb
 - lib/super_diff/operation_tree_builders/array.rb
 - lib/super_diff/operation_tree_builders/base.rb
@@ -174,6 +172,14 @@ files:
 - lib/super_diff/operation_tree_builders/main.rb
 - lib/super_diff/operation_tree_builders/multiline_string.rb
 - lib/super_diff/operation_tree_builders/time_like.rb
+- lib/super_diff/operation_tree_flatteners.rb
+- lib/super_diff/operation_tree_flatteners/array.rb
+- lib/super_diff/operation_tree_flatteners/base.rb
+- lib/super_diff/operation_tree_flatteners/collection.rb
+- lib/super_diff/operation_tree_flatteners/custom_object.rb
+- lib/super_diff/operation_tree_flatteners/default_object.rb
+- lib/super_diff/operation_tree_flatteners/hash.rb
+- lib/super_diff/operation_tree_flatteners/multiline_string.rb
 - lib/super_diff/operation_trees.rb
 - lib/super_diff/operation_trees/array.rb
 - lib/super_diff/operation_trees/base.rb
@@ -208,23 +214,28 @@ files:
 - lib/super_diff/rspec/matcher_text_template.rb
 - lib/super_diff/rspec/monkey_patches.rb
 - lib/super_diff/rspec/object_inspection.rb
-- lib/super_diff/rspec/object_inspection/inspectors.rb
-- lib/super_diff/rspec/object_inspection/inspectors/collection_containing_exactly.rb
-- lib/super_diff/rspec/object_inspection/inspectors/collection_including.rb
-- lib/super_diff/rspec/object_inspection/inspectors/hash_including.rb
-- lib/super_diff/rspec/object_inspection/inspectors/instance_of.rb
-- lib/super_diff/rspec/object_inspection/inspectors/kind_of.rb
-- lib/super_diff/rspec/object_inspection/inspectors/object_having_attributes.rb
-- lib/super_diff/rspec/object_inspection/inspectors/primitive.rb
-- lib/super_diff/rspec/object_inspection/inspectors/value_within.rb
+- lib/super_diff/rspec/object_inspection/inspection_tree_builders.rb
+- lib/super_diff/rspec/object_inspection/inspection_tree_builders/collection_containing_exactly.rb
+- lib/super_diff/rspec/object_inspection/inspection_tree_builders/collection_including.rb
+- lib/super_diff/rspec/object_inspection/inspection_tree_builders/double.rb
+- lib/super_diff/rspec/object_inspection/inspection_tree_builders/hash_including.rb
+- lib/super_diff/rspec/object_inspection/inspection_tree_builders/instance_of.rb
+- lib/super_diff/rspec/object_inspection/inspection_tree_builders/kind_of.rb
+- lib/super_diff/rspec/object_inspection/inspection_tree_builders/object_having_attributes.rb
+- lib/super_diff/rspec/object_inspection/inspection_tree_builders/primitive.rb
+- lib/super_diff/rspec/object_inspection/inspection_tree_builders/value_within.rb
 - lib/super_diff/rspec/operation_tree_builders.rb
 - lib/super_diff/rspec/operation_tree_builders/collection_containing_exactly.rb
 - lib/super_diff/rspec/operation_tree_builders/collection_including.rb
 - lib/super_diff/rspec/operation_tree_builders/hash_including.rb
 - lib/super_diff/rspec/operation_tree_builders/object_having_attributes.rb
+- lib/super_diff/tiered_lines.rb
+- lib/super_diff/tiered_lines_elider.rb
+- lib/super_diff/tiered_lines_formatter.rb
 - lib/super_diff/version.rb
 - spec/examples.txt
 - spec/integration/rails/active_record_spec.rb
+- spec/integration/rails/active_support_spec.rb
 - spec/integration/rails/hash_with_indifferent_access_spec.rb
 - spec/integration/rspec/be_falsey_matcher_spec.rb
 - spec/integration/rspec/be_matcher_spec.rb
@@ -245,6 +256,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/colorizer.rb
 - spec/support/command_runner.rb
+- spec/support/helpers.rb
 - spec/support/integration/helpers.rb
 - spec/support/integration/matchers.rb
 - spec/support/integration/matchers/produce_output_when_run_matcher.rb
@@ -264,11 +276,20 @@ files:
 - spec/support/models/person.rb
 - spec/support/models/player.rb
 - spec/support/models/shipping_address.rb
-- spec/support/object_id.rb
-- spec/support/ruby_versions.rb
 - spec/support/shared_examples/active_record.rb
+- spec/support/shared_examples/active_support.rb
+- spec/support/shared_examples/elided_diffs.rb
 - spec/support/shared_examples/hash_with_indifferent_access.rb
+- spec/support/unit/helpers.rb
+- spec/support/unit/matchers/match_output.rb
+- spec/unit/active_record/object_inspection_spec.rb
 - spec/unit/equality_matchers/main_spec.rb
+- spec/unit/helpers_spec.rb
+- spec/unit/operation_tree_flatteners/array_spec.rb
+- spec/unit/operation_tree_flatteners/custom_object_spec.rb
+- spec/unit/operation_tree_flatteners/default_object_spec.rb
+- spec/unit/operation_tree_flatteners/hash_spec.rb
+- spec/unit/operation_tree_flatteners/multiline_string_spec.rb
 - spec/unit/rspec/matchers/be_compared_to_spec.rb
 - spec/unit/rspec/matchers/be_falsey_spec.rb
 - spec/unit/rspec/matchers/be_nil_spec.rb
@@ -284,13 +305,16 @@ files:
 - spec/unit/rspec/matchers/match_spec.rb
 - spec/unit/rspec/matchers/raise_error_spec.rb
 - spec/unit/rspec/matchers/respond_to_spec.rb
+- spec/unit/rspec/object_inspection_spec.rb
 - spec/unit/super_diff_spec.rb
+- spec/unit/tiered_lines_elider_spec.rb
+- spec/unit/tiered_lines_formatter_spec.rb
 - super_diff.gemspec
 homepage: https://github.com/mcmire/super_diff
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -308,15 +332,25 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 2.7.6.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: A better way to view differences between complex data structures in RSpec.
 test_files:
 - spec/spec_helper.rb
+- spec/unit/tiered_lines_formatter_spec.rb
+- spec/unit/operation_tree_flatteners/default_object_spec.rb
+- spec/unit/operation_tree_flatteners/multiline_string_spec.rb
+- spec/unit/operation_tree_flatteners/custom_object_spec.rb
+- spec/unit/operation_tree_flatteners/array_spec.rb
+- spec/unit/operation_tree_flatteners/hash_spec.rb
 - spec/unit/equality_matchers/main_spec.rb
+- spec/unit/active_record/object_inspection_spec.rb
+- spec/unit/helpers_spec.rb
 - spec/unit/super_diff_spec.rb
+- spec/unit/tiered_lines_elider_spec.rb
+- spec/unit/rspec/object_inspection_spec.rb
 - spec/unit/rspec/matchers/contain_exactly_spec.rb
 - spec/unit/rspec/matchers/be_predicate_spec.rb
 - spec/unit/rspec/matchers/raise_error_spec.rb
@@ -349,9 +383,12 @@ test_files:
 - spec/integration/rspec/have_predicate_matcher_spec.rb
 - spec/integration/rspec/contain_exactly_matcher_spec.rb
 - spec/integration/rspec/include_matcher_spec.rb
+- spec/integration/rails/active_support_spec.rb
 - spec/integration/rails/active_record_spec.rb
 - spec/integration/rails/hash_with_indifferent_access_spec.rb
-- spec/support/object_id.rb
+- spec/support/helpers.rb
+- spec/support/unit/helpers.rb
+- spec/support/unit/matchers/match_output.rb
 - spec/support/integration/test_programs/base.rb
 - spec/support/integration/test_programs/rspec_rails.rb
 - spec/support/integration/test_programs/plain.rb
@@ -372,7 +409,8 @@ test_files:
 - spec/support/models/order.rb
 - spec/support/models/person.rb
 - spec/support/command_runner.rb
-- spec/support/ruby_versions.rb
 - spec/support/colorizer.rb
 - spec/support/shared_examples/hash_with_indifferent_access.rb
+- spec/support/shared_examples/elided_diffs.rb
 - spec/support/shared_examples/active_record.rb
+- spec/support/shared_examples/active_support.rb