super_diff 0.6.2 → 0.9.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (186) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +0 -1
  3. data/lib/super_diff/active_record/differs/active_record_relation.rb +3 -13
  4. data/lib/super_diff/active_record/object_inspection/{inspectors → inspection_tree_builders}/active_record_model.rb +19 -20
  5. data/lib/super_diff/active_record/object_inspection/{inspectors → inspection_tree_builders}/active_record_relation.rb +9 -8
  6. data/lib/super_diff/active_record/object_inspection/inspection_tree_builders.rb +16 -0
  7. data/lib/super_diff/active_record/object_inspection.rb +2 -6
  8. data/lib/super_diff/active_record/operation_tree_flatteners/active_record_relation.rb +17 -0
  9. data/lib/super_diff/active_record/operation_tree_flatteners.rb +10 -0
  10. data/lib/super_diff/active_record/operation_trees/active_record_relation.rb +8 -7
  11. data/lib/super_diff/active_record.rb +7 -7
  12. data/lib/super_diff/active_support/differs/hash_with_indifferent_access.rb +3 -13
  13. data/lib/super_diff/active_support/object_inspection/inspection_tree_builders/hash_with_indifferent_access.rb +37 -0
  14. data/lib/super_diff/active_support/object_inspection/{inspectors.rb → inspection_tree_builders.rb} +2 -2
  15. data/lib/super_diff/active_support/object_inspection.rb +2 -6
  16. data/lib/super_diff/active_support/operation_tree_builders/hash_with_indifferent_access.rb +17 -0
  17. data/lib/super_diff/active_support/operation_tree_flatteners/hash_with_indifferent_access.rb +17 -0
  18. data/lib/super_diff/active_support/operation_tree_flatteners.rb +10 -0
  19. data/lib/super_diff/active_support/operation_trees/hash_with_indifferent_access.rb +4 -7
  20. data/lib/super_diff/active_support.rb +8 -8
  21. data/lib/super_diff/colorized_document_extensions.rb +9 -6
  22. data/lib/super_diff/configuration.rb +81 -8
  23. data/lib/super_diff/csi/four_bit_color.rb +0 -2
  24. data/lib/super_diff/csi.rb +1 -2
  25. data/lib/super_diff/differs/array.rb +1 -1
  26. data/lib/super_diff/differs/base.rb +3 -21
  27. data/lib/super_diff/differs/custom_object.rb +1 -1
  28. data/lib/super_diff/differs/default_object.rb +1 -1
  29. data/lib/super_diff/differs/hash.rb +1 -1
  30. data/lib/super_diff/differs/main.rb +1 -7
  31. data/lib/super_diff/differs/multiline_string.rb +1 -1
  32. data/lib/super_diff/differs/time_like.rb +1 -1
  33. data/lib/super_diff/equality_matchers/array.rb +2 -2
  34. data/lib/super_diff/equality_matchers/default.rb +2 -2
  35. data/lib/super_diff/equality_matchers/hash.rb +2 -2
  36. data/lib/super_diff/equality_matchers/multiline_string.rb +2 -2
  37. data/lib/super_diff/equality_matchers/primitive.rb +4 -7
  38. data/lib/super_diff/equality_matchers/singleline_string.rb +2 -2
  39. data/lib/super_diff/helpers.rb +56 -2
  40. data/lib/super_diff/line.rb +83 -0
  41. data/lib/super_diff/object_inspection/inspection_tree.rb +183 -81
  42. data/lib/super_diff/object_inspection/inspection_tree_builders/array.rb +38 -0
  43. data/lib/super_diff/object_inspection/inspection_tree_builders/base.rb +27 -0
  44. data/lib/super_diff/object_inspection/inspection_tree_builders/custom_object.rb +37 -0
  45. data/lib/super_diff/object_inspection/inspection_tree_builders/default_object.rb +63 -0
  46. data/lib/super_diff/object_inspection/{inspectors → inspection_tree_builders}/defaults.rb +1 -2
  47. data/lib/super_diff/object_inspection/inspection_tree_builders/hash.rb +46 -0
  48. data/lib/super_diff/object_inspection/{inspectors → inspection_tree_builders}/main.rb +5 -10
  49. data/lib/super_diff/object_inspection/inspection_tree_builders/primitive.rb +21 -0
  50. data/lib/super_diff/object_inspection/inspection_tree_builders/time_like.rb +64 -0
  51. data/lib/super_diff/object_inspection/inspection_tree_builders.rb +44 -0
  52. data/lib/super_diff/object_inspection/nodes/as_lines_when_rendering_to_lines.rb +97 -0
  53. data/lib/super_diff/object_inspection/nodes/as_prefix_when_rendering_to_lines.rb +27 -0
  54. data/lib/super_diff/object_inspection/nodes/as_prelude_when_rendering_to_lines.rb +27 -0
  55. data/lib/super_diff/object_inspection/nodes/as_single_line.rb +33 -0
  56. data/lib/super_diff/object_inspection/nodes/base.rb +55 -20
  57. data/lib/super_diff/object_inspection/nodes/inspection.rb +47 -7
  58. data/lib/super_diff/object_inspection/nodes/nesting.rb +16 -5
  59. data/lib/super_diff/object_inspection/nodes/only_when.rb +54 -0
  60. data/lib/super_diff/object_inspection/nodes/text.rb +16 -2
  61. data/lib/super_diff/object_inspection/nodes/when_empty.rb +21 -6
  62. data/lib/super_diff/object_inspection/nodes/when_non_empty.rb +20 -5
  63. data/lib/super_diff/object_inspection/nodes/when_rendering_to_lines.rb +27 -0
  64. data/lib/super_diff/object_inspection/nodes/when_rendering_to_string.rb +27 -0
  65. data/lib/super_diff/object_inspection/nodes.rb +33 -32
  66. data/lib/super_diff/object_inspection/prefix_for_next_node.rb +6 -0
  67. data/lib/super_diff/object_inspection/prelude_for_next_node.rb +6 -0
  68. data/lib/super_diff/object_inspection.rb +12 -1
  69. data/lib/super_diff/operation_tree_builders/array.rb +7 -10
  70. data/lib/super_diff/operation_tree_builders/base.rb +6 -6
  71. data/lib/super_diff/operation_tree_builders/custom_object.rb +5 -2
  72. data/lib/super_diff/operation_tree_builders/default_object.rb +1 -1
  73. data/lib/super_diff/operation_tree_builders/defaults.rb +1 -1
  74. data/lib/super_diff/operation_tree_builders/hash.rb +1 -8
  75. data/lib/super_diff/operation_tree_builders/multiline_string.rb +2 -6
  76. data/lib/super_diff/operation_tree_builders/time_like.rb +2 -2
  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_tree_flatteners.rb +20 -0
  85. data/lib/super_diff/operation_trees/array.rb +4 -7
  86. data/lib/super_diff/operation_trees/base.rb +39 -16
  87. data/lib/super_diff/operation_trees/custom_object.rb +4 -8
  88. data/lib/super_diff/operation_trees/default_object.rb +28 -13
  89. data/lib/super_diff/operation_trees/hash.rb +4 -7
  90. data/lib/super_diff/operation_trees/main.rb +1 -1
  91. data/lib/super_diff/operation_trees/multiline_string.rb +4 -7
  92. data/lib/super_diff/operations/binary_operation.rb +1 -6
  93. data/lib/super_diff/operations/unary_operation.rb +2 -30
  94. data/lib/super_diff/recursion_guard.rb +3 -3
  95. data/lib/super_diff/rspec/differs/collection_including.rb +4 -2
  96. data/lib/super_diff/rspec/differs/hash_including.rb +4 -2
  97. data/lib/super_diff/rspec/monkey_patches.rb +2 -2
  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/inspection_tree_builders/collection_including.rb +34 -0
  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/inspection_tree_builders/instance_of.rb +26 -0
  103. data/lib/super_diff/rspec/object_inspection/inspection_tree_builders/kind_of.rb +26 -0
  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/object_inspection/inspection_tree_builders.rb +44 -0
  108. data/lib/super_diff/rspec/object_inspection.rb +4 -1
  109. data/lib/super_diff/rspec/operation_tree_builders/collection_containing_exactly.rb +0 -3
  110. data/lib/super_diff/rspec/operation_tree_builders/collection_including.rb +10 -3
  111. data/lib/super_diff/rspec/operation_tree_builders/hash_including.rb +10 -3
  112. data/lib/super_diff/rspec.rb +34 -13
  113. data/lib/super_diff/tiered_lines.rb +4 -0
  114. data/lib/super_diff/tiered_lines_elider.rb +490 -0
  115. data/lib/super_diff/tiered_lines_formatter.rb +79 -0
  116. data/lib/super_diff/version.rb +1 -1
  117. data/lib/super_diff.rb +28 -6
  118. data/spec/examples.txt +482 -403
  119. data/spec/integration/rails/active_support_spec.rb +19 -0
  120. data/spec/integration/rspec/contain_exactly_matcher_spec.rb +12 -6
  121. data/spec/integration/rspec/eq_matcher_spec.rb +33 -87
  122. data/spec/integration/rspec/have_attributes_matcher_spec.rb +17 -8
  123. data/spec/integration/rspec/match_array_matcher_spec.rb +14 -7
  124. data/spec/integration/rspec/match_matcher_spec.rb +93 -5
  125. data/spec/spec_helper.rb +4 -1
  126. data/spec/support/command_runner.rb +15 -25
  127. data/spec/support/helpers.rb +21 -0
  128. data/spec/support/integration/helpers.rb +2 -0
  129. data/spec/support/integration/matchers/produce_output_when_run_matcher.rb +3 -3
  130. data/spec/support/integration/test_programs/base.rb +36 -10
  131. data/spec/support/shared_examples/active_record.rb +3 -2
  132. data/spec/support/shared_examples/active_support.rb +65 -0
  133. data/spec/support/shared_examples/elided_diffs.rb +914 -0
  134. data/spec/support/shared_examples/hash_with_indifferent_access.rb +16 -16
  135. data/spec/support/unit/helpers.rb +15 -0
  136. data/spec/support/unit/matchers/match_output.rb +41 -0
  137. data/spec/tmp/warnings_logger/all_warnings.txt +2 -0
  138. data/spec/unit/active_record/object_inspection_spec.rb +273 -0
  139. data/spec/unit/equality_matchers/main_spec.rb +55 -75
  140. data/spec/unit/helpers_spec.rb +75 -0
  141. data/spec/unit/operation_tree_flatteners/array_spec.rb +604 -0
  142. data/spec/unit/operation_tree_flatteners/custom_object_spec.rb +667 -0
  143. data/spec/unit/operation_tree_flatteners/default_object_spec.rb +687 -0
  144. data/spec/unit/operation_tree_flatteners/hash_spec.rb +632 -0
  145. data/spec/unit/operation_tree_flatteners/multiline_string_spec.rb +121 -0
  146. data/spec/unit/rspec/object_inspection_spec.rb +446 -0
  147. data/spec/unit/super_diff_spec.rb +1530 -800
  148. data/spec/unit/tiered_lines_elider_spec.rb +6356 -0
  149. data/spec/unit/tiered_lines_formatter_spec.rb +193 -0
  150. metadata +91 -52
  151. data/lib/super_diff/active_record/diff_formatters/active_record_relation.rb +0 -23
  152. data/lib/super_diff/active_record/diff_formatters.rb +0 -10
  153. data/lib/super_diff/active_record/object_inspection/inspectors.rb +0 -16
  154. data/lib/super_diff/active_support/diff_formatters/hash_with_indifferent_access.rb +0 -36
  155. data/lib/super_diff/active_support/diff_formatters.rb +0 -10
  156. data/lib/super_diff/active_support/object_inspection/inspectors/hash_with_indifferent_access.rb +0 -28
  157. data/lib/super_diff/diff_formatters/array.rb +0 -21
  158. data/lib/super_diff/diff_formatters/base.rb +0 -33
  159. data/lib/super_diff/diff_formatters/custom_object.rb +0 -30
  160. data/lib/super_diff/diff_formatters/default_object.rb +0 -46
  161. data/lib/super_diff/diff_formatters/defaults.rb +0 -10
  162. data/lib/super_diff/diff_formatters/hash.rb +0 -34
  163. data/lib/super_diff/diff_formatters/main.rb +0 -41
  164. data/lib/super_diff/diff_formatters.rb +0 -14
  165. data/lib/super_diff/object_inspection/inspectors/array.rb +0 -32
  166. data/lib/super_diff/object_inspection/inspectors/base.rb +0 -36
  167. data/lib/super_diff/object_inspection/inspectors/custom_object.rb +0 -37
  168. data/lib/super_diff/object_inspection/inspectors/default_object.rb +0 -61
  169. data/lib/super_diff/object_inspection/inspectors/hash.rb +0 -32
  170. data/lib/super_diff/object_inspection/inspectors/primitive.rb +0 -28
  171. data/lib/super_diff/object_inspection/inspectors/string.rb +0 -23
  172. data/lib/super_diff/object_inspection/inspectors/time_like.rb +0 -23
  173. data/lib/super_diff/object_inspection/inspectors.rb +0 -23
  174. data/lib/super_diff/object_inspection/nodes/break.rb +0 -15
  175. data/lib/super_diff/object_inspection/nodes/when_multiline.rb +0 -22
  176. data/lib/super_diff/object_inspection/nodes/when_singleline.rb +0 -24
  177. data/lib/super_diff/rspec/object_inspection/inspectors/collection_including.rb +0 -28
  178. data/lib/super_diff/rspec/object_inspection/inspectors/hash_including.rb +0 -31
  179. data/lib/super_diff/rspec/object_inspection/inspectors/instance_of.rb +0 -23
  180. data/lib/super_diff/rspec/object_inspection/inspectors/kind_of.rb +0 -23
  181. data/lib/super_diff/rspec/object_inspection/inspectors/primitive.rb +0 -13
  182. data/lib/super_diff/rspec/object_inspection/inspectors/value_within.rb +0 -29
  183. data/lib/super_diff/rspec/object_inspection/inspectors.rb +0 -40
  184. data/spec/combustion/Gemfile.lock +0 -173
  185. data/spec/support/object_id.rb +0 -27
  186. data/spec/support/ruby_versions.rb +0 -11
@@ -0,0 +1,193 @@
1
+ require "spec_helper"
2
+
3
+ RSpec.describe SuperDiff::TieredLinesFormatter, type: :unit do
4
+ it "formats the given lines as an array of strings with appropriate colors and indentation" do
5
+ tiered_lines = [
6
+ line(
7
+ type: :noop,
8
+ indentation_level: 0,
9
+ value: %([),
10
+ ),
11
+ line(
12
+ type: :noop,
13
+ indentation_level: 1,
14
+ value: %("foo"),
15
+ add_comma: true,
16
+ ),
17
+ line(
18
+ type: :noop,
19
+ indentation_level: 1,
20
+ value: %({),
21
+ ),
22
+ line(
23
+ type: :noop,
24
+ indentation_level: 2,
25
+ prefix: %(one: ),
26
+ value: %("fish"),
27
+ add_comma: true,
28
+ ),
29
+ line(
30
+ type: :delete,
31
+ indentation_level: 2,
32
+ prefix: %(two: ),
33
+ value: %("fish"),
34
+ add_comma: true,
35
+ ),
36
+ line(
37
+ type: :insert,
38
+ indentation_level: 2,
39
+ prefix: %(two: ),
40
+ value: %("FISH"),
41
+ add_comma: true,
42
+ ),
43
+ line(
44
+ type: :noop,
45
+ indentation_level: 2,
46
+ prefix: %(hard: ),
47
+ value: %([),
48
+ ),
49
+ elision(
50
+ indentation_level: 3,
51
+ value: %(# ...),
52
+ children: [
53
+ line(
54
+ type: :noop,
55
+ indentation_level: 3,
56
+ value: %("a"),
57
+ ),
58
+ line(
59
+ type: :noop,
60
+ indentation_level: 3,
61
+ value: %("b"),
62
+ ),
63
+ line(
64
+ type: :noop,
65
+ indentation_level: 3,
66
+ value: %("c"),
67
+ ),
68
+ ],
69
+ ),
70
+ line(
71
+ type: :noop,
72
+ indentation_level: 2,
73
+ value: %(]),
74
+ add_comma: true,
75
+ ),
76
+ line(
77
+ type: :insert,
78
+ indentation_level: 2,
79
+ prefix: %(blue: ),
80
+ value: %("fish"),
81
+ add_comma: true,
82
+ ),
83
+ line(
84
+ type: :insert,
85
+ indentation_level: 2,
86
+ prefix: %(stew: ),
87
+ value: %("fish"),
88
+ ),
89
+ line(
90
+ type: :noop,
91
+ indentation_level: 1,
92
+ value: %(}),
93
+ add_comma: true,
94
+ ),
95
+ line(
96
+ type: :noop,
97
+ indentation_level: 1,
98
+ value: %(∙∙∙),
99
+ add_comma: true,
100
+ ),
101
+ line(
102
+ type: :delete,
103
+ indentation_level: 1,
104
+ value: %("baz"),
105
+ add_comma: true,
106
+ ),
107
+ line(
108
+ type: :insert,
109
+ indentation_level: 1,
110
+ value: %(2),
111
+ add_comma: true,
112
+ ),
113
+ line(
114
+ type: :noop,
115
+ indentation_level: 1,
116
+ value: %("qux"),
117
+ add_comma: true,
118
+ ),
119
+ line(
120
+ type: :delete,
121
+ indentation_level: 1,
122
+ value: %("blargh"),
123
+ add_comma: true,
124
+ ),
125
+ line(
126
+ type: :delete,
127
+ indentation_level: 1,
128
+ value: %("zig"),
129
+ add_comma: true,
130
+ ),
131
+ line(
132
+ type: :delete,
133
+ indentation_level: 1,
134
+ value: %("zag"),
135
+ ),
136
+ line(
137
+ type: :noop,
138
+ indentation_level: 0,
139
+ value: %(]),
140
+ ),
141
+ ]
142
+
143
+ actual_diff = described_class.call(tiered_lines)
144
+
145
+ expected_diff = colored do
146
+ plain_line %( [)
147
+ plain_line %( "foo",)
148
+ plain_line %( {)
149
+ plain_line %( one: "fish",)
150
+ expected_line %(- two: "fish",)
151
+ actual_line %(+ two: "FISH",)
152
+ plain_line %( hard: [)
153
+ elision_marker_line %( # ...)
154
+ plain_line %( ],)
155
+ actual_line %(+ blue: "fish",)
156
+ actual_line %(+ stew: "fish")
157
+ plain_line %( },)
158
+ plain_line %( ∙∙∙,)
159
+ expected_line %(- "baz",)
160
+ actual_line %(+ 2,)
161
+ plain_line %( "qux",)
162
+ expected_line %(- "blargh",)
163
+ expected_line %(- "zig",)
164
+ expected_line %(- "zag")
165
+ plain_line %( ])
166
+ end
167
+
168
+ expect(actual_diff).to eq(expected_diff)
169
+ end
170
+
171
+ def line(type:, indentation_level:, value:, prefix: "", add_comma: false)
172
+ double(
173
+ :line,
174
+ type: type,
175
+ indentation_level: indentation_level,
176
+ prefix: prefix,
177
+ value: value,
178
+ add_comma?: add_comma,
179
+ )
180
+ end
181
+
182
+ def elision(indentation_level:, value:, children:)
183
+ double(
184
+ :elision,
185
+ type: :elision,
186
+ indentation_level: indentation_level,
187
+ prefix: "",
188
+ value: value,
189
+ add_comma?: false,
190
+ children: children,
191
+ )
192
+ end
193
+ end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: super_diff
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.2
4
+ version: 0.9.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Elliot Winkler
8
- autorequire:
8
+ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-04-17 00:00:00.000000000 Z
11
+ date: 2022-04-26 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: attr_extras
@@ -64,30 +64,30 @@ files:
64
64
  - README.md
65
65
  - lib/super_diff.rb
66
66
  - lib/super_diff/active_record.rb
67
- - lib/super_diff/active_record/diff_formatters.rb
68
- - lib/super_diff/active_record/diff_formatters/active_record_relation.rb
69
67
  - lib/super_diff/active_record/differs.rb
70
68
  - lib/super_diff/active_record/differs/active_record_relation.rb
71
69
  - lib/super_diff/active_record/monkey_patches.rb
72
70
  - lib/super_diff/active_record/object_inspection.rb
73
- - lib/super_diff/active_record/object_inspection/inspectors.rb
74
- - lib/super_diff/active_record/object_inspection/inspectors/active_record_model.rb
75
- - lib/super_diff/active_record/object_inspection/inspectors/active_record_relation.rb
71
+ - lib/super_diff/active_record/object_inspection/inspection_tree_builders.rb
72
+ - lib/super_diff/active_record/object_inspection/inspection_tree_builders/active_record_model.rb
73
+ - lib/super_diff/active_record/object_inspection/inspection_tree_builders/active_record_relation.rb
76
74
  - lib/super_diff/active_record/operation_tree_builders.rb
77
75
  - lib/super_diff/active_record/operation_tree_builders/active_record_model.rb
78
76
  - lib/super_diff/active_record/operation_tree_builders/active_record_relation.rb
77
+ - lib/super_diff/active_record/operation_tree_flatteners.rb
78
+ - lib/super_diff/active_record/operation_tree_flatteners/active_record_relation.rb
79
79
  - lib/super_diff/active_record/operation_trees.rb
80
80
  - lib/super_diff/active_record/operation_trees/active_record_relation.rb
81
81
  - lib/super_diff/active_support.rb
82
- - lib/super_diff/active_support/diff_formatters.rb
83
- - lib/super_diff/active_support/diff_formatters/hash_with_indifferent_access.rb
84
82
  - lib/super_diff/active_support/differs.rb
85
83
  - lib/super_diff/active_support/differs/hash_with_indifferent_access.rb
86
84
  - lib/super_diff/active_support/object_inspection.rb
87
- - lib/super_diff/active_support/object_inspection/inspectors.rb
88
- - lib/super_diff/active_support/object_inspection/inspectors/hash_with_indifferent_access.rb
85
+ - lib/super_diff/active_support/object_inspection/inspection_tree_builders.rb
86
+ - lib/super_diff/active_support/object_inspection/inspection_tree_builders/hash_with_indifferent_access.rb
89
87
  - lib/super_diff/active_support/operation_tree_builders.rb
90
88
  - lib/super_diff/active_support/operation_tree_builders/hash_with_indifferent_access.rb
89
+ - lib/super_diff/active_support/operation_tree_flatteners.rb
90
+ - lib/super_diff/active_support/operation_tree_flatteners/hash_with_indifferent_access.rb
91
91
  - lib/super_diff/active_support/operation_trees.rb
92
92
  - lib/super_diff/active_support/operation_trees/hash_with_indifferent_access.rb
93
93
  - lib/super_diff/colorized_document_extensions.rb
@@ -103,15 +103,7 @@ files:
103
103
  - lib/super_diff/csi/reset_sequence.rb
104
104
  - lib/super_diff/csi/twenty_four_bit_color.rb
105
105
  - lib/super_diff/csi/uncolorized_document.rb
106
- - lib/super_diff/diff_formatters.rb
107
- - lib/super_diff/diff_formatters/array.rb
108
- - lib/super_diff/diff_formatters/base.rb
109
106
  - lib/super_diff/diff_formatters/collection.rb
110
- - lib/super_diff/diff_formatters/custom_object.rb
111
- - lib/super_diff/diff_formatters/default_object.rb
112
- - lib/super_diff/diff_formatters/defaults.rb
113
- - lib/super_diff/diff_formatters/hash.rb
114
- - lib/super_diff/diff_formatters/main.rb
115
107
  - lib/super_diff/diff_formatters/multiline_string.rb
116
108
  - lib/super_diff/differs.rb
117
109
  - lib/super_diff/differs/array.rb
@@ -141,29 +133,35 @@ files:
141
133
  - lib/super_diff/gem_version.rb
142
134
  - lib/super_diff/helpers.rb
143
135
  - lib/super_diff/implementation_checks.rb
136
+ - lib/super_diff/line.rb
144
137
  - lib/super_diff/object_inspection.rb
145
138
  - lib/super_diff/object_inspection/inspection_tree.rb
146
- - lib/super_diff/object_inspection/inspectors.rb
147
- - lib/super_diff/object_inspection/inspectors/array.rb
148
- - lib/super_diff/object_inspection/inspectors/base.rb
149
- - lib/super_diff/object_inspection/inspectors/custom_object.rb
150
- - lib/super_diff/object_inspection/inspectors/default_object.rb
151
- - lib/super_diff/object_inspection/inspectors/defaults.rb
152
- - lib/super_diff/object_inspection/inspectors/hash.rb
153
- - lib/super_diff/object_inspection/inspectors/main.rb
154
- - lib/super_diff/object_inspection/inspectors/primitive.rb
155
- - lib/super_diff/object_inspection/inspectors/string.rb
156
- - lib/super_diff/object_inspection/inspectors/time_like.rb
139
+ - lib/super_diff/object_inspection/inspection_tree_builders.rb
140
+ - lib/super_diff/object_inspection/inspection_tree_builders/array.rb
141
+ - lib/super_diff/object_inspection/inspection_tree_builders/base.rb
142
+ - lib/super_diff/object_inspection/inspection_tree_builders/custom_object.rb
143
+ - lib/super_diff/object_inspection/inspection_tree_builders/default_object.rb
144
+ - lib/super_diff/object_inspection/inspection_tree_builders/defaults.rb
145
+ - lib/super_diff/object_inspection/inspection_tree_builders/hash.rb
146
+ - lib/super_diff/object_inspection/inspection_tree_builders/main.rb
147
+ - lib/super_diff/object_inspection/inspection_tree_builders/primitive.rb
148
+ - lib/super_diff/object_inspection/inspection_tree_builders/time_like.rb
157
149
  - lib/super_diff/object_inspection/nodes.rb
150
+ - lib/super_diff/object_inspection/nodes/as_lines_when_rendering_to_lines.rb
151
+ - lib/super_diff/object_inspection/nodes/as_prefix_when_rendering_to_lines.rb
152
+ - lib/super_diff/object_inspection/nodes/as_prelude_when_rendering_to_lines.rb
153
+ - lib/super_diff/object_inspection/nodes/as_single_line.rb
158
154
  - lib/super_diff/object_inspection/nodes/base.rb
159
- - lib/super_diff/object_inspection/nodes/break.rb
160
155
  - lib/super_diff/object_inspection/nodes/inspection.rb
161
156
  - lib/super_diff/object_inspection/nodes/nesting.rb
157
+ - lib/super_diff/object_inspection/nodes/only_when.rb
162
158
  - lib/super_diff/object_inspection/nodes/text.rb
163
159
  - lib/super_diff/object_inspection/nodes/when_empty.rb
164
- - lib/super_diff/object_inspection/nodes/when_multiline.rb
165
160
  - lib/super_diff/object_inspection/nodes/when_non_empty.rb
166
- - lib/super_diff/object_inspection/nodes/when_singleline.rb
161
+ - lib/super_diff/object_inspection/nodes/when_rendering_to_lines.rb
162
+ - lib/super_diff/object_inspection/nodes/when_rendering_to_string.rb
163
+ - lib/super_diff/object_inspection/prefix_for_next_node.rb
164
+ - lib/super_diff/object_inspection/prelude_for_next_node.rb
167
165
  - lib/super_diff/operation_tree_builders.rb
168
166
  - lib/super_diff/operation_tree_builders/array.rb
169
167
  - lib/super_diff/operation_tree_builders/base.rb
@@ -174,6 +172,14 @@ files:
174
172
  - lib/super_diff/operation_tree_builders/main.rb
175
173
  - lib/super_diff/operation_tree_builders/multiline_string.rb
176
174
  - lib/super_diff/operation_tree_builders/time_like.rb
175
+ - lib/super_diff/operation_tree_flatteners.rb
176
+ - lib/super_diff/operation_tree_flatteners/array.rb
177
+ - lib/super_diff/operation_tree_flatteners/base.rb
178
+ - lib/super_diff/operation_tree_flatteners/collection.rb
179
+ - lib/super_diff/operation_tree_flatteners/custom_object.rb
180
+ - lib/super_diff/operation_tree_flatteners/default_object.rb
181
+ - lib/super_diff/operation_tree_flatteners/hash.rb
182
+ - lib/super_diff/operation_tree_flatteners/multiline_string.rb
177
183
  - lib/super_diff/operation_trees.rb
178
184
  - lib/super_diff/operation_trees/array.rb
179
185
  - lib/super_diff/operation_trees/base.rb
@@ -208,24 +214,28 @@ files:
208
214
  - lib/super_diff/rspec/matcher_text_template.rb
209
215
  - lib/super_diff/rspec/monkey_patches.rb
210
216
  - lib/super_diff/rspec/object_inspection.rb
211
- - lib/super_diff/rspec/object_inspection/inspectors.rb
212
- - lib/super_diff/rspec/object_inspection/inspectors/collection_containing_exactly.rb
213
- - lib/super_diff/rspec/object_inspection/inspectors/collection_including.rb
214
- - lib/super_diff/rspec/object_inspection/inspectors/hash_including.rb
215
- - lib/super_diff/rspec/object_inspection/inspectors/instance_of.rb
216
- - lib/super_diff/rspec/object_inspection/inspectors/kind_of.rb
217
- - lib/super_diff/rspec/object_inspection/inspectors/object_having_attributes.rb
218
- - lib/super_diff/rspec/object_inspection/inspectors/primitive.rb
219
- - lib/super_diff/rspec/object_inspection/inspectors/value_within.rb
217
+ - lib/super_diff/rspec/object_inspection/inspection_tree_builders.rb
218
+ - lib/super_diff/rspec/object_inspection/inspection_tree_builders/collection_containing_exactly.rb
219
+ - lib/super_diff/rspec/object_inspection/inspection_tree_builders/collection_including.rb
220
+ - lib/super_diff/rspec/object_inspection/inspection_tree_builders/double.rb
221
+ - lib/super_diff/rspec/object_inspection/inspection_tree_builders/hash_including.rb
222
+ - lib/super_diff/rspec/object_inspection/inspection_tree_builders/instance_of.rb
223
+ - lib/super_diff/rspec/object_inspection/inspection_tree_builders/kind_of.rb
224
+ - lib/super_diff/rspec/object_inspection/inspection_tree_builders/object_having_attributes.rb
225
+ - lib/super_diff/rspec/object_inspection/inspection_tree_builders/primitive.rb
226
+ - lib/super_diff/rspec/object_inspection/inspection_tree_builders/value_within.rb
220
227
  - lib/super_diff/rspec/operation_tree_builders.rb
221
228
  - lib/super_diff/rspec/operation_tree_builders/collection_containing_exactly.rb
222
229
  - lib/super_diff/rspec/operation_tree_builders/collection_including.rb
223
230
  - lib/super_diff/rspec/operation_tree_builders/hash_including.rb
224
231
  - lib/super_diff/rspec/operation_tree_builders/object_having_attributes.rb
232
+ - lib/super_diff/tiered_lines.rb
233
+ - lib/super_diff/tiered_lines_elider.rb
234
+ - lib/super_diff/tiered_lines_formatter.rb
225
235
  - lib/super_diff/version.rb
226
- - spec/combustion/Gemfile.lock
227
236
  - spec/examples.txt
228
237
  - spec/integration/rails/active_record_spec.rb
238
+ - spec/integration/rails/active_support_spec.rb
229
239
  - spec/integration/rails/hash_with_indifferent_access_spec.rb
230
240
  - spec/integration/rspec/be_falsey_matcher_spec.rb
231
241
  - spec/integration/rspec/be_matcher_spec.rb
@@ -246,6 +256,7 @@ files:
246
256
  - spec/spec_helper.rb
247
257
  - spec/support/colorizer.rb
248
258
  - spec/support/command_runner.rb
259
+ - spec/support/helpers.rb
249
260
  - spec/support/integration/helpers.rb
250
261
  - spec/support/integration/matchers.rb
251
262
  - spec/support/integration/matchers/produce_output_when_run_matcher.rb
@@ -265,11 +276,21 @@ files:
265
276
  - spec/support/models/person.rb
266
277
  - spec/support/models/player.rb
267
278
  - spec/support/models/shipping_address.rb
268
- - spec/support/object_id.rb
269
- - spec/support/ruby_versions.rb
270
279
  - spec/support/shared_examples/active_record.rb
280
+ - spec/support/shared_examples/active_support.rb
281
+ - spec/support/shared_examples/elided_diffs.rb
271
282
  - spec/support/shared_examples/hash_with_indifferent_access.rb
283
+ - spec/support/unit/helpers.rb
284
+ - spec/support/unit/matchers/match_output.rb
285
+ - spec/tmp/warnings_logger/all_warnings.txt
286
+ - spec/unit/active_record/object_inspection_spec.rb
272
287
  - spec/unit/equality_matchers/main_spec.rb
288
+ - spec/unit/helpers_spec.rb
289
+ - spec/unit/operation_tree_flatteners/array_spec.rb
290
+ - spec/unit/operation_tree_flatteners/custom_object_spec.rb
291
+ - spec/unit/operation_tree_flatteners/default_object_spec.rb
292
+ - spec/unit/operation_tree_flatteners/hash_spec.rb
293
+ - spec/unit/operation_tree_flatteners/multiline_string_spec.rb
273
294
  - spec/unit/rspec/matchers/be_compared_to_spec.rb
274
295
  - spec/unit/rspec/matchers/be_falsey_spec.rb
275
296
  - spec/unit/rspec/matchers/be_nil_spec.rb
@@ -285,13 +306,16 @@ files:
285
306
  - spec/unit/rspec/matchers/match_spec.rb
286
307
  - spec/unit/rspec/matchers/raise_error_spec.rb
287
308
  - spec/unit/rspec/matchers/respond_to_spec.rb
309
+ - spec/unit/rspec/object_inspection_spec.rb
288
310
  - spec/unit/super_diff_spec.rb
311
+ - spec/unit/tiered_lines_elider_spec.rb
312
+ - spec/unit/tiered_lines_formatter_spec.rb
289
313
  - super_diff.gemspec
290
314
  homepage: https://github.com/mcmire/super_diff
291
315
  licenses:
292
316
  - MIT
293
317
  metadata: {}
294
- post_install_message:
318
+ post_install_message:
295
319
  rdoc_options: []
296
320
  require_paths:
297
321
  - lib
@@ -309,14 +333,25 @@ required_rubygems_version: !ruby/object:Gem::Requirement
309
333
  - !ruby/object:Gem::Version
310
334
  version: '0'
311
335
  requirements: []
312
- rubygems_version: 3.1.2
313
- signing_key:
336
+ rubyforge_project:
337
+ rubygems_version: 2.7.6.3
338
+ signing_key:
314
339
  specification_version: 4
315
340
  summary: A better way to view differences between complex data structures in RSpec.
316
341
  test_files:
317
342
  - spec/spec_helper.rb
343
+ - spec/unit/tiered_lines_formatter_spec.rb
344
+ - spec/unit/operation_tree_flatteners/default_object_spec.rb
345
+ - spec/unit/operation_tree_flatteners/multiline_string_spec.rb
346
+ - spec/unit/operation_tree_flatteners/custom_object_spec.rb
347
+ - spec/unit/operation_tree_flatteners/array_spec.rb
348
+ - spec/unit/operation_tree_flatteners/hash_spec.rb
318
349
  - spec/unit/equality_matchers/main_spec.rb
350
+ - spec/unit/active_record/object_inspection_spec.rb
351
+ - spec/unit/helpers_spec.rb
319
352
  - spec/unit/super_diff_spec.rb
353
+ - spec/unit/tiered_lines_elider_spec.rb
354
+ - spec/unit/rspec/object_inspection_spec.rb
320
355
  - spec/unit/rspec/matchers/contain_exactly_spec.rb
321
356
  - spec/unit/rspec/matchers/be_predicate_spec.rb
322
357
  - spec/unit/rspec/matchers/raise_error_spec.rb
@@ -349,9 +384,12 @@ test_files:
349
384
  - spec/integration/rspec/have_predicate_matcher_spec.rb
350
385
  - spec/integration/rspec/contain_exactly_matcher_spec.rb
351
386
  - spec/integration/rspec/include_matcher_spec.rb
387
+ - spec/integration/rails/active_support_spec.rb
352
388
  - spec/integration/rails/active_record_spec.rb
353
389
  - spec/integration/rails/hash_with_indifferent_access_spec.rb
354
- - spec/support/object_id.rb
390
+ - spec/support/helpers.rb
391
+ - spec/support/unit/helpers.rb
392
+ - spec/support/unit/matchers/match_output.rb
355
393
  - spec/support/integration/test_programs/base.rb
356
394
  - spec/support/integration/test_programs/rspec_rails.rb
357
395
  - spec/support/integration/test_programs/plain.rb
@@ -372,8 +410,9 @@ test_files:
372
410
  - spec/support/models/order.rb
373
411
  - spec/support/models/person.rb
374
412
  - spec/support/command_runner.rb
375
- - spec/support/ruby_versions.rb
376
413
  - spec/support/colorizer.rb
377
414
  - spec/support/shared_examples/hash_with_indifferent_access.rb
415
+ - spec/support/shared_examples/elided_diffs.rb
378
416
  - spec/support/shared_examples/active_record.rb
379
- - spec/combustion/Gemfile.lock
417
+ - spec/support/shared_examples/active_support.rb
418
+ - spec/tmp/warnings_logger/all_warnings.txt
@@ -1,23 +0,0 @@
1
- module SuperDiff
2
- module ActiveRecord
3
- module DiffFormatters
4
- class ActiveRecordRelation < SuperDiff::DiffFormatters::Base
5
- def self.applies_to?(operation_tree)
6
- operation_tree.is_a?(OperationTrees::ActiveRecordRelation)
7
- end
8
-
9
- def call
10
- SuperDiff::DiffFormatters::Collection.call(
11
- open_token: "#<ActiveRecord::Relation [",
12
- close_token: "]>",
13
- collection_prefix: collection_prefix,
14
- build_item_prefix: proc { "" },
15
- operation_tree: operation_tree,
16
- indent_level: indent_level,
17
- add_comma: add_comma?,
18
- )
19
- end
20
- end
21
- end
22
- end
23
- end
@@ -1,10 +0,0 @@
1
- module SuperDiff
2
- module ActiveRecord
3
- module DiffFormatters
4
- autoload(
5
- :ActiveRecordRelation,
6
- "super_diff/active_record/diff_formatters/active_record_relation",
7
- )
8
- end
9
- end
10
- end
@@ -1,16 +0,0 @@
1
- module SuperDiff
2
- module ActiveRecord
3
- module ObjectInspection
4
- module Inspectors
5
- autoload(
6
- :ActiveRecordModel,
7
- "super_diff/active_record/object_inspection/inspectors/active_record_model",
8
- )
9
- autoload(
10
- :ActiveRecordRelation,
11
- "super_diff/active_record/object_inspection/inspectors/active_record_relation",
12
- )
13
- end
14
- end
15
- end
16
- end
@@ -1,36 +0,0 @@
1
- module SuperDiff
2
- module ActiveSupport
3
- module DiffFormatters
4
- class HashWithIndifferentAccess < SuperDiff::DiffFormatters::Base
5
- def self.applies_to?(operation_tree)
6
- operation_tree.is_a?(OperationTrees::HashWithIndifferentAccess)
7
- end
8
-
9
- def call
10
- SuperDiff::DiffFormatters::Collection.call(
11
- open_token: "#<HashWithIndifferentAccess {",
12
- close_token: "}>",
13
- collection_prefix: collection_prefix,
14
- build_item_prefix: -> (operation) {
15
- key =
16
- if operation.respond_to?(:left_key)
17
- operation.left_key
18
- else
19
- operation.key
20
- end
21
-
22
- if key.is_a?(Symbol)
23
- "#{key}: "
24
- else
25
- "#{key.inspect} => "
26
- end
27
- },
28
- operation_tree: operation_tree,
29
- indent_level: indent_level,
30
- add_comma: add_comma?,
31
- )
32
- end
33
- end
34
- end
35
- end
36
- end
@@ -1,10 +0,0 @@
1
- module SuperDiff
2
- module ActiveSupport
3
- module DiffFormatters
4
- autoload(
5
- :HashWithIndifferentAccess,
6
- "super_diff/active_support/diff_formatters/hash_with_indifferent_access",
7
- )
8
- end
9
- end
10
- end
@@ -1,28 +0,0 @@
1
- module SuperDiff
2
- module ActiveSupport
3
- module ObjectInspection
4
- module Inspectors
5
- class HashWithIndifferentAccess < SuperDiff::ObjectInspection::Inspectors::Base
6
- def self.applies_to?(value)
7
- value.is_a?(::HashWithIndifferentAccess)
8
- end
9
-
10
- protected
11
-
12
- def inspection_tree
13
- SuperDiff::ObjectInspection::InspectionTree.new do
14
- add_text "#<HashWithIndifferentAccess {"
15
-
16
- nested do |hash|
17
- insert_hash_inspection_of(hash)
18
- end
19
-
20
- add_break " "
21
- add_text "}>"
22
- end
23
- end
24
- end
25
- end
26
- end
27
- end
28
- end
@@ -1,21 +0,0 @@
1
- module SuperDiff
2
- module DiffFormatters
3
- class Array < Base
4
- def self.applies_to?(operation_tree)
5
- operation_tree.is_a?(OperationTrees::Array)
6
- end
7
-
8
- def call
9
- Collection.call(
10
- open_token: "[",
11
- close_token: "]",
12
- collection_prefix: collection_prefix,
13
- build_item_prefix: proc { "" },
14
- operation_tree: operation_tree,
15
- indent_level: indent_level,
16
- add_comma: add_comma?,
17
- )
18
- end
19
- end
20
- end
21
- end
@@ -1,33 +0,0 @@
1
- module SuperDiff
2
- module DiffFormatters
3
- class Base
4
- def self.applies_to?(*)
5
- raise NotImplementedError
6
- end
7
-
8
- include ImplementationChecks
9
- extend AttrExtras.mixin
10
-
11
- method_object(
12
- :operation_tree,
13
- [
14
- :indent_level!,
15
- collection_prefix: "",
16
- add_comma: false,
17
- ],
18
- )
19
-
20
- def call
21
- raise NotImplementedError
22
- end
23
-
24
- # rubocop:disable Lint/UselessAccessModifier
25
-
26
- private
27
-
28
- # rubocop:enable Lint/UselessAccessModifier
29
-
30
- attr_query :add_comma?
31
- end
32
- end
33
- end