super_diff 0.7.0 → 0.8.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (174) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +0 -1
  3. data/lib/super_diff.rb +27 -6
  4. data/lib/super_diff/active_record.rb +7 -7
  5. data/lib/super_diff/active_record/differs/active_record_relation.rb +3 -13
  6. data/lib/super_diff/active_record/object_inspection.rb +2 -6
  7. data/lib/super_diff/active_record/object_inspection/inspection_tree_builders.rb +16 -0
  8. data/lib/super_diff/active_record/object_inspection/{inspectors → inspection_tree_builders}/active_record_model.rb +19 -20
  9. data/lib/super_diff/active_record/object_inspection/{inspectors → inspection_tree_builders}/active_record_relation.rb +9 -8
  10. data/lib/super_diff/active_record/operation_tree_flatteners.rb +10 -0
  11. data/lib/super_diff/active_record/operation_tree_flatteners/active_record_relation.rb +17 -0
  12. data/lib/super_diff/active_record/operation_trees/active_record_relation.rb +8 -7
  13. data/lib/super_diff/active_support.rb +8 -8
  14. data/lib/super_diff/active_support/differs/hash_with_indifferent_access.rb +3 -13
  15. data/lib/super_diff/active_support/object_inspection.rb +2 -6
  16. data/lib/super_diff/active_support/object_inspection/{inspectors.rb → inspection_tree_builders.rb} +2 -2
  17. data/lib/super_diff/active_support/object_inspection/inspection_tree_builders/hash_with_indifferent_access.rb +37 -0
  18. data/lib/super_diff/active_support/operation_tree_builders/hash_with_indifferent_access.rb +17 -0
  19. data/lib/super_diff/active_support/operation_tree_flatteners.rb +10 -0
  20. data/lib/super_diff/active_support/operation_tree_flatteners/hash_with_indifferent_access.rb +17 -0
  21. data/lib/super_diff/active_support/operation_trees/hash_with_indifferent_access.rb +4 -7
  22. data/lib/super_diff/colorized_document_extensions.rb +9 -6
  23. data/lib/super_diff/configuration.rb +81 -8
  24. data/lib/super_diff/csi.rb +1 -2
  25. data/lib/super_diff/csi/four_bit_color.rb +0 -2
  26. data/lib/super_diff/differs/array.rb +1 -1
  27. data/lib/super_diff/differs/base.rb +3 -21
  28. data/lib/super_diff/differs/custom_object.rb +1 -1
  29. data/lib/super_diff/differs/default_object.rb +1 -1
  30. data/lib/super_diff/differs/hash.rb +1 -1
  31. data/lib/super_diff/differs/main.rb +1 -7
  32. data/lib/super_diff/differs/multiline_string.rb +1 -1
  33. data/lib/super_diff/differs/time_like.rb +1 -1
  34. data/lib/super_diff/equality_matchers/array.rb +2 -2
  35. data/lib/super_diff/equality_matchers/default.rb +2 -2
  36. data/lib/super_diff/equality_matchers/hash.rb +2 -2
  37. data/lib/super_diff/equality_matchers/multiline_string.rb +2 -2
  38. data/lib/super_diff/equality_matchers/primitive.rb +4 -7
  39. data/lib/super_diff/equality_matchers/singleline_string.rb +2 -2
  40. data/lib/super_diff/helpers.rb +52 -2
  41. data/lib/super_diff/line.rb +83 -0
  42. data/lib/super_diff/object_inspection.rb +12 -1
  43. data/lib/super_diff/object_inspection/inspection_tree.rb +183 -81
  44. data/lib/super_diff/object_inspection/inspection_tree_builders.rb +44 -0
  45. data/lib/super_diff/object_inspection/inspection_tree_builders/array.rb +38 -0
  46. data/lib/super_diff/object_inspection/inspection_tree_builders/base.rb +27 -0
  47. data/lib/super_diff/object_inspection/inspection_tree_builders/custom_object.rb +37 -0
  48. data/lib/super_diff/object_inspection/inspection_tree_builders/default_object.rb +63 -0
  49. data/lib/super_diff/object_inspection/{inspectors → inspection_tree_builders}/defaults.rb +1 -2
  50. data/lib/super_diff/object_inspection/inspection_tree_builders/hash.rb +46 -0
  51. data/lib/super_diff/object_inspection/{inspectors → inspection_tree_builders}/main.rb +5 -10
  52. data/lib/super_diff/object_inspection/inspection_tree_builders/primitive.rb +21 -0
  53. data/lib/super_diff/object_inspection/{inspectors → inspection_tree_builders}/time_like.rb +19 -18
  54. data/lib/super_diff/object_inspection/nodes.rb +33 -32
  55. data/lib/super_diff/object_inspection/nodes/as_lines_when_rendering_to_lines.rb +97 -0
  56. data/lib/super_diff/object_inspection/nodes/as_prefix_when_rendering_to_lines.rb +27 -0
  57. data/lib/super_diff/object_inspection/nodes/as_prelude_when_rendering_to_lines.rb +27 -0
  58. data/lib/super_diff/object_inspection/nodes/as_single_line.rb +33 -0
  59. data/lib/super_diff/object_inspection/nodes/base.rb +55 -20
  60. data/lib/super_diff/object_inspection/nodes/inspection.rb +47 -7
  61. data/lib/super_diff/object_inspection/nodes/nesting.rb +16 -5
  62. data/lib/super_diff/object_inspection/nodes/only_when.rb +54 -0
  63. data/lib/super_diff/object_inspection/nodes/text.rb +16 -2
  64. data/lib/super_diff/object_inspection/nodes/when_empty.rb +21 -6
  65. data/lib/super_diff/object_inspection/nodes/when_non_empty.rb +20 -5
  66. data/lib/super_diff/object_inspection/nodes/when_rendering_to_lines.rb +27 -0
  67. data/lib/super_diff/object_inspection/nodes/when_rendering_to_string.rb +27 -0
  68. data/lib/super_diff/object_inspection/prefix_for_next_node.rb +6 -0
  69. data/lib/super_diff/object_inspection/prelude_for_next_node.rb +6 -0
  70. data/lib/super_diff/operation_tree_builders/array.rb +7 -10
  71. data/lib/super_diff/operation_tree_builders/base.rb +6 -6
  72. data/lib/super_diff/operation_tree_builders/custom_object.rb +5 -2
  73. data/lib/super_diff/operation_tree_builders/default_object.rb +1 -1
  74. data/lib/super_diff/operation_tree_builders/hash.rb +0 -7
  75. data/lib/super_diff/operation_tree_builders/multiline_string.rb +2 -6
  76. data/lib/super_diff/operation_tree_flatteners.rb +20 -0
  77. data/lib/super_diff/operation_tree_flatteners/array.rb +15 -0
  78. data/lib/super_diff/operation_tree_flatteners/base.rb +54 -0
  79. data/lib/super_diff/operation_tree_flatteners/collection.rb +139 -0
  80. data/lib/super_diff/operation_tree_flatteners/custom_object.rb +28 -0
  81. data/lib/super_diff/operation_tree_flatteners/default_object.rb +32 -0
  82. data/lib/super_diff/operation_tree_flatteners/hash.rb +41 -0
  83. data/lib/super_diff/operation_tree_flatteners/multiline_string.rb +17 -0
  84. data/lib/super_diff/operation_trees/array.rb +4 -7
  85. data/lib/super_diff/operation_trees/base.rb +39 -16
  86. data/lib/super_diff/operation_trees/custom_object.rb +4 -8
  87. data/lib/super_diff/operation_trees/default_object.rb +28 -13
  88. data/lib/super_diff/operation_trees/hash.rb +4 -7
  89. data/lib/super_diff/operation_trees/main.rb +1 -1
  90. data/lib/super_diff/operation_trees/multiline_string.rb +4 -7
  91. data/lib/super_diff/operations/binary_operation.rb +1 -6
  92. data/lib/super_diff/operations/unary_operation.rb +2 -30
  93. data/lib/super_diff/recursion_guard.rb +3 -3
  94. data/lib/super_diff/rspec.rb +12 -13
  95. data/lib/super_diff/rspec/monkey_patches.rb +2 -2
  96. data/lib/super_diff/rspec/object_inspection.rb +4 -1
  97. data/lib/super_diff/rspec/object_inspection/inspection_tree_builders.rb +44 -0
  98. data/lib/super_diff/rspec/object_inspection/{inspectors → inspection_tree_builders}/collection_containing_exactly.rb +9 -8
  99. data/lib/super_diff/rspec/object_inspection/{inspectors → inspection_tree_builders}/collection_including.rb +9 -8
  100. data/lib/super_diff/rspec/object_inspection/inspection_tree_builders/double.rb +103 -0
  101. data/lib/super_diff/rspec/object_inspection/inspection_tree_builders/hash_including.rb +36 -0
  102. data/lib/super_diff/rspec/object_inspection/{inspectors → inspection_tree_builders}/instance_of.rb +3 -5
  103. data/lib/super_diff/rspec/object_inspection/{inspectors → inspection_tree_builders}/kind_of.rb +3 -5
  104. data/lib/super_diff/rspec/object_inspection/{inspectors → inspection_tree_builders}/object_having_attributes.rb +10 -12
  105. data/lib/super_diff/rspec/object_inspection/inspection_tree_builders/primitive.rb +10 -0
  106. data/lib/super_diff/rspec/object_inspection/inspection_tree_builders/value_within.rb +33 -0
  107. data/lib/super_diff/rspec/operation_tree_builders/collection_containing_exactly.rb +0 -3
  108. data/lib/super_diff/tiered_lines.rb +4 -0
  109. data/lib/super_diff/tiered_lines_elider.rb +490 -0
  110. data/lib/super_diff/tiered_lines_formatter.rb +79 -0
  111. data/lib/super_diff/version.rb +1 -1
  112. data/spec/examples.txt +407 -410
  113. data/spec/integration/rails/active_support_spec.rb +19 -0
  114. data/spec/integration/rspec/contain_exactly_matcher_spec.rb +12 -6
  115. data/spec/integration/rspec/eq_matcher_spec.rb +22 -88
  116. data/spec/integration/rspec/have_attributes_matcher_spec.rb +6 -7
  117. data/spec/integration/rspec/match_array_matcher_spec.rb +14 -7
  118. data/spec/integration/rspec/match_matcher_spec.rb +10 -5
  119. data/spec/spec_helper.rb +1 -0
  120. data/spec/support/command_runner.rb +15 -25
  121. data/spec/support/helpers.rb +21 -0
  122. data/spec/support/integration/helpers.rb +2 -0
  123. data/spec/support/integration/matchers/produce_output_when_run_matcher.rb +3 -3
  124. data/spec/support/integration/test_programs/base.rb +36 -10
  125. data/spec/support/shared_examples/active_record.rb +3 -2
  126. data/spec/support/shared_examples/active_support.rb +65 -0
  127. data/spec/support/shared_examples/elided_diffs.rb +914 -0
  128. data/spec/support/shared_examples/hash_with_indifferent_access.rb +16 -16
  129. data/spec/support/unit/helpers.rb +15 -0
  130. data/spec/support/unit/matchers/match_output.rb +41 -0
  131. data/spec/unit/active_record/object_inspection_spec.rb +273 -0
  132. data/spec/unit/equality_matchers/main_spec.rb +51 -71
  133. data/spec/unit/helpers_spec.rb +61 -0
  134. data/spec/unit/operation_tree_flatteners/array_spec.rb +604 -0
  135. data/spec/unit/operation_tree_flatteners/custom_object_spec.rb +667 -0
  136. data/spec/unit/operation_tree_flatteners/default_object_spec.rb +687 -0
  137. data/spec/unit/operation_tree_flatteners/hash_spec.rb +632 -0
  138. data/spec/unit/operation_tree_flatteners/multiline_string_spec.rb +121 -0
  139. data/spec/unit/rspec/object_inspection_spec.rb +446 -0
  140. data/spec/unit/super_diff_spec.rb +1488 -846
  141. data/spec/unit/tiered_lines_elider_spec.rb +6356 -0
  142. data/spec/unit/tiered_lines_formatter_spec.rb +193 -0
  143. metadata +88 -50
  144. data/lib/super_diff/active_record/diff_formatters.rb +0 -10
  145. data/lib/super_diff/active_record/diff_formatters/active_record_relation.rb +0 -23
  146. data/lib/super_diff/active_record/object_inspection/inspectors.rb +0 -16
  147. data/lib/super_diff/active_support/diff_formatters.rb +0 -10
  148. data/lib/super_diff/active_support/diff_formatters/hash_with_indifferent_access.rb +0 -36
  149. data/lib/super_diff/active_support/object_inspection/inspectors/hash_with_indifferent_access.rb +0 -28
  150. data/lib/super_diff/diff_formatters.rb +0 -14
  151. data/lib/super_diff/diff_formatters/array.rb +0 -21
  152. data/lib/super_diff/diff_formatters/base.rb +0 -33
  153. data/lib/super_diff/diff_formatters/custom_object.rb +0 -30
  154. data/lib/super_diff/diff_formatters/default_object.rb +0 -46
  155. data/lib/super_diff/diff_formatters/defaults.rb +0 -10
  156. data/lib/super_diff/diff_formatters/hash.rb +0 -34
  157. data/lib/super_diff/diff_formatters/main.rb +0 -41
  158. data/lib/super_diff/object_inspection/inspectors.rb +0 -23
  159. data/lib/super_diff/object_inspection/inspectors/array.rb +0 -32
  160. data/lib/super_diff/object_inspection/inspectors/base.rb +0 -36
  161. data/lib/super_diff/object_inspection/inspectors/custom_object.rb +0 -37
  162. data/lib/super_diff/object_inspection/inspectors/default_object.rb +0 -61
  163. data/lib/super_diff/object_inspection/inspectors/hash.rb +0 -32
  164. data/lib/super_diff/object_inspection/inspectors/primitive.rb +0 -28
  165. data/lib/super_diff/object_inspection/inspectors/string.rb +0 -23
  166. data/lib/super_diff/object_inspection/nodes/break.rb +0 -15
  167. data/lib/super_diff/object_inspection/nodes/when_multiline.rb +0 -22
  168. data/lib/super_diff/object_inspection/nodes/when_singleline.rb +0 -24
  169. data/lib/super_diff/rspec/object_inspection/inspectors.rb +0 -40
  170. data/lib/super_diff/rspec/object_inspection/inspectors/hash_including.rb +0 -36
  171. data/lib/super_diff/rspec/object_inspection/inspectors/primitive.rb +0 -13
  172. data/lib/super_diff/rspec/object_inspection/inspectors/value_within.rb +0 -29
  173. data/spec/support/object_id.rb +0 -27
  174. data/spec/support/ruby_versions.rb +0 -11
@@ -0,0 +1,139 @@
1
+ module SuperDiff
2
+ module OperationTreeFlatteners
3
+ class Collection < Base
4
+ protected
5
+
6
+ def build_tiered_lines
7
+ [
8
+ Line.new(
9
+ type: :noop,
10
+ indentation_level: indentation_level,
11
+ value: open_token,
12
+ collection_bookend: :open,
13
+ ),
14
+ *inner_lines,
15
+ Line.new(
16
+ type: :noop,
17
+ indentation_level: indentation_level,
18
+ value: close_token,
19
+ collection_bookend: :close,
20
+ ),
21
+ ]
22
+ end
23
+
24
+ def inner_lines
25
+ @_inner_lines ||= operation_tree.
26
+ flat_map do |operation|
27
+ lines =
28
+ if operation.name == :change
29
+ build_lines_for_change_operation(operation)
30
+ else
31
+ build_lines_for_non_change_operation(operation)
32
+ end
33
+
34
+ maybe_add_prefix_at_beginning_of_lines(
35
+ maybe_add_comma_at_end_of_lines(lines, operation),
36
+ operation,
37
+ )
38
+ end
39
+ end
40
+
41
+ def maybe_add_prefix_at_beginning_of_lines(lines, operation)
42
+ if add_prefix_at_beginning_of_lines?(operation)
43
+ add_prefix_at_beginning_of_lines(lines, operation)
44
+ else
45
+ lines
46
+ end
47
+ end
48
+
49
+ def add_prefix_at_beginning_of_lines?(operation)
50
+ !!item_prefix_for(operation)
51
+ end
52
+
53
+ def add_prefix_at_beginning_of_lines(lines, operation)
54
+ [lines[0].prefixed_with(item_prefix_for(operation))] +
55
+ lines[1..-1]
56
+ end
57
+
58
+ def maybe_add_comma_at_end_of_lines(lines, operation)
59
+ if last_item_in_collection?(operation)
60
+ lines
61
+ else
62
+ add_comma_at_end_of_lines(lines)
63
+ end
64
+ end
65
+
66
+ def last_item_in_collection?(operation)
67
+ if operation.name == :change
68
+ operation.left_index == operation.left_collection.size - 1 &&
69
+ operation.right_index == operation.right_collection.size - 1
70
+ else
71
+ operation.index == operation.collection.size - 1
72
+ end
73
+ end
74
+
75
+ def add_comma_at_end_of_lines(lines)
76
+ lines[0..-2] + [lines[-1].with_comma]
77
+ end
78
+
79
+ def build_lines_for_change_operation(operation)
80
+ SuperDiff::RecursionGuard.guarding_recursion_of(
81
+ operation.left_collection,
82
+ operation.right_collection,
83
+ ) do |already_seen|
84
+ if already_seen
85
+ raise InfiniteRecursionError
86
+ else
87
+ operation.children.flatten(
88
+ indentation_level: indentation_level + 1,
89
+ )
90
+ end
91
+ end
92
+ end
93
+
94
+ def build_lines_for_non_change_operation(operation)
95
+ indentation_level = @indentation_level + 1
96
+
97
+ if recursive_operation?(operation)
98
+ [
99
+ Line.new(
100
+ type: operation.name,
101
+ indentation_level: indentation_level,
102
+ value: SuperDiff::RecursionGuard::PLACEHOLDER,
103
+ ),
104
+ ]
105
+ else
106
+ build_lines_from_inspection_of(
107
+ operation.value,
108
+ type: operation.name,
109
+ indentation_level: indentation_level,
110
+ )
111
+ end
112
+ end
113
+
114
+ def recursive_operation?(operation)
115
+ operation.value.equal?(operation.collection) ||
116
+ SuperDiff::RecursionGuard.already_seen?(operation.value)
117
+ end
118
+
119
+ def item_prefix_for(_operation)
120
+ ""
121
+ end
122
+
123
+ def build_lines_from_inspection_of(value, type:, indentation_level:)
124
+ SuperDiff.inspect_object(
125
+ value,
126
+ as_lines: true,
127
+ type: type,
128
+ indentation_level: indentation_level,
129
+ )
130
+ end
131
+
132
+ class InfiniteRecursionError < StandardError
133
+ def initialize(_message = nil)
134
+ super("Unhandled recursive data structure encountered!")
135
+ end
136
+ end
137
+ end
138
+ end
139
+ end
@@ -0,0 +1,28 @@
1
+ module SuperDiff
2
+ module OperationTreeFlatteners
3
+ class CustomObject < Collection
4
+ protected
5
+
6
+ def open_token
7
+ "#<%<class>s {" % { class: operation_tree.underlying_object.class }
8
+ end
9
+
10
+ def close_token
11
+ "}>"
12
+ end
13
+
14
+ def item_prefix_for(operation)
15
+ key =
16
+ # Note: We could have used the right_key here too, they're both the
17
+ # same keys
18
+ if operation.respond_to?(:left_key)
19
+ operation.left_key
20
+ else
21
+ operation.key
22
+ end
23
+
24
+ "#{key}: "
25
+ end
26
+ end
27
+ end
28
+ end
@@ -0,0 +1,32 @@
1
+ module SuperDiff
2
+ module OperationTreeFlatteners
3
+ class DefaultObject < Collection
4
+ protected
5
+
6
+ def open_token
7
+ "#<#{operation_tree.underlying_object.class.name}:" +
8
+ SuperDiff::Helpers.object_address_for(
9
+ operation_tree.underlying_object
10
+ ) +
11
+ " {"
12
+ end
13
+
14
+ def close_token
15
+ "}>"
16
+ end
17
+
18
+ def item_prefix_for(operation)
19
+ key =
20
+ # Note: We could have used the right_key here too, they're both the
21
+ # same keys
22
+ if operation.respond_to?(:left_key)
23
+ operation.left_key
24
+ else
25
+ operation.key
26
+ end
27
+
28
+ "@#{key}="
29
+ end
30
+ end
31
+ end
32
+ end
@@ -0,0 +1,41 @@
1
+ module SuperDiff
2
+ module OperationTreeFlatteners
3
+ class Hash < Collection
4
+ protected
5
+
6
+ def open_token
7
+ "{"
8
+ end
9
+
10
+ def close_token
11
+ "}"
12
+ end
13
+
14
+ def item_prefix_for(operation)
15
+ key = key_for(operation)
16
+
17
+ if format_keys_as_kwargs?
18
+ "#{key}: "
19
+ else
20
+ "#{key.inspect} => "
21
+ end
22
+ end
23
+
24
+ private
25
+
26
+ def format_keys_as_kwargs?
27
+ operation_tree.all? { |operation| key_for(operation).is_a?(Symbol) }
28
+ end
29
+
30
+ def key_for(operation)
31
+ # Note: We could have used the right_key here too, they're both the
32
+ # same keys
33
+ if operation.respond_to?(:left_key)
34
+ operation.left_key
35
+ else
36
+ operation.key
37
+ end
38
+ end
39
+ end
40
+ end
41
+ end
@@ -0,0 +1,17 @@
1
+ module SuperDiff
2
+ module OperationTreeFlatteners
3
+ class MultilineString < Base
4
+ def build_tiered_lines
5
+ operation_tree.map do |operation|
6
+ Line.new(
7
+ type: operation.name,
8
+ indentation_level: indentation_level,
9
+ # TODO: Test that quotes and things don't get escaped but escape
10
+ # characters do
11
+ value: operation.value.inspect[1..-2].gsub(/\\"/, '"').gsub(/\\'/, "'")
12
+ )
13
+ end
14
+ end
15
+ end
16
+ end
17
+ end
@@ -5,13 +5,10 @@ module SuperDiff
5
5
  value.is_a?(::Array)
6
6
  end
7
7
 
8
- def to_diff(indent_level:, collection_prefix:, add_comma:)
9
- DiffFormatters::Array.call(
10
- self,
11
- indent_level: indent_level,
12
- collection_prefix: collection_prefix,
13
- add_comma: add_comma,
14
- )
8
+ protected
9
+
10
+ def operation_tree_flattener_class
11
+ OperationTreeFlatteners::Array
15
12
  end
16
13
  end
17
14
  end
@@ -1,33 +1,56 @@
1
- require 'delegate'
1
+ require "forwardable"
2
2
 
3
3
  module SuperDiff
4
4
  module OperationTrees
5
- class Base < SimpleDelegator
6
- def self.applies_to?(_value)
5
+ class Base
6
+ def self.applies_to?(*)
7
7
  unimplemented_class_method!
8
8
  end
9
9
 
10
+ include Enumerable
11
+ include ImplementationChecks
10
12
  extend ImplementationChecks
13
+ extend Forwardable
11
14
 
12
- # rubocop:disable Lint/UnusedMethodArgument
13
- def to_diff(indent_level:, add_comma: false, collection_prefix: nil)
14
- raise NotImplementedError
15
+ def_delegators :operations, :<<, :delete, :each
16
+
17
+ def initialize(operations)
18
+ @operations = operations
19
+ end
20
+
21
+ def to_diff(indentation_level:)
22
+ TieredLinesFormatter.call(
23
+ perhaps_elide(flatten(indentation_level: indentation_level)),
24
+ )
25
+ end
26
+
27
+ def flatten(indentation_level:)
28
+ operation_tree_flattener_class.call(
29
+ self,
30
+ indentation_level: indentation_level,
31
+ )
15
32
  end
16
- # rubocop:enable Lint/UnusedMethodArgument
17
33
 
18
34
  def pretty_print(pp)
19
- pp.text "#{self.class.name}.new(["
20
- pp.group_sub do
21
- pp.nest(2) do
22
- pp.breakable
23
- pp.seplist(self) do |value|
24
- pp.pp value
25
- end
35
+ pp.group(1, "#<#{self.class.name} [", "]>") do
36
+ pp.breakable
37
+ pp.seplist(self) do |value|
38
+ pp.pp value
26
39
  end
27
40
  end
28
- pp.breakable
29
- pp.text("])")
30
41
  end
42
+
43
+ def perhaps_elide(tiered_lines)
44
+ if SuperDiff.configuration.diff_elision_enabled?
45
+ TieredLinesElider.call(tiered_lines)
46
+ else
47
+ tiered_lines
48
+ end
49
+ end
50
+
51
+ private
52
+
53
+ attr_reader :operations
31
54
  end
32
55
  end
33
56
  end
@@ -5,14 +5,10 @@ module SuperDiff
5
5
  value.respond_to?(:attributes_for_super_diff)
6
6
  end
7
7
 
8
- def to_diff(indent_level:, add_comma: false, collection_prefix: nil)
9
- DiffFormatters::CustomObject.call(
10
- self,
11
- indent_level: indent_level,
12
- collection_prefix: collection_prefix,
13
- add_comma: add_comma,
14
- value_class: value_class,
15
- )
8
+ protected
9
+
10
+ def operation_tree_flattener_class
11
+ OperationTreeFlatteners::CustomObject
16
12
  end
17
13
  end
18
14
  end
@@ -1,26 +1,41 @@
1
1
  module SuperDiff
2
2
  module OperationTrees
3
3
  class DefaultObject < Base
4
- def self.applies_to?(_value)
4
+ def self.applies_to?(*)
5
5
  true
6
6
  end
7
7
 
8
- attr_reader :value_class
8
+ attr_reader :underlying_object
9
9
 
10
- # TODO: Default this to collection.class?
11
- def initialize(collection, value_class:)
12
- super(collection)
10
+ def initialize(operations, underlying_object:)
11
+ super(operations)
12
+ @underlying_object = underlying_object
13
+ end
13
14
 
14
- @value_class = value_class
15
+ def pretty_print(pp)
16
+ pp.text "#<#{self.class.name} "
17
+ pp.nest(1) do
18
+ pp.breakable
19
+ pp.text ":operations=>"
20
+ pp.group(1, "[", "]") do
21
+ pp.breakable
22
+ pp.seplist(self) do |value|
23
+ pp.pp value
24
+ end
25
+ end
26
+ pp.comma_breakable
27
+ pp.text ":underlying_object=>"
28
+ pp.object_address_group underlying_object do
29
+ # do nothing
30
+ end
31
+ end
32
+ pp.text ">"
15
33
  end
16
34
 
17
- def to_diff(indent_level:, add_comma: false, **_rest)
18
- DiffFormatters::Main.call(
19
- self,
20
- indent_level: indent_level,
21
- add_comma: add_comma,
22
- value_class: value_class,
23
- )
35
+ protected
36
+
37
+ def operation_tree_flattener_class
38
+ OperationTreeFlatteners::DefaultObject
24
39
  end
25
40
  end
26
41
  end
@@ -5,13 +5,10 @@ module SuperDiff
5
5
  value.is_a?(::Hash)
6
6
  end
7
7
 
8
- def to_diff(indent_level:, collection_prefix:, add_comma:)
9
- DiffFormatters::Hash.call(
10
- self,
11
- indent_level: indent_level,
12
- collection_prefix: collection_prefix,
13
- add_comma: add_comma,
14
- )
8
+ protected
9
+
10
+ def operation_tree_flattener_class
11
+ OperationTreeFlatteners::Hash
15
12
  end
16
13
  end
17
14
  end