super_diff 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb09d995aa3a004c723b22f71fc27b9d5a9d3239751b54b7fb14e11c24df1bb1
-  data.tar.gz: 2330655f1192952c82c36b70f3acf89e103290532f4ac3093768ba4371316fc0
+  metadata.gz: 7d1ad189acadc1bcdf4ad4e63ca6b9d946b7a66f8d1544887389d7f093153b31
+  data.tar.gz: f96fb6488cf55e679b3ce8953c26eea0a5c5c6113c35dc30c7d19eb5e3b65ae2
 SHA512:
-  metadata.gz: 7ca49e3d7fd65588e1821133cbdf5f9ec41a23ac8e8bbcdb0650ce39387e73c0919d742868bafa26bdeb6edda1cb6049457e1f454a6b17bbc6f0d90fe53d83d0
-  data.tar.gz: 0bfa520cb843bb293a78f6c40f337881d98871454dde777ea4163b8f3092648b40019adc4fffdc8b405b36bc951a3d37fb6f3ac0a77a37cf05f7d7e852189aa7
+  metadata.gz: 5eaeee5249d8cc865ff1fbef12b0c306607bba7f0224ac906c8bbfac0ad4cc196660fed461a3efcbdd69a557cb8dc7aca925351bd9acae5761d4af25d7bac19e
+  data.tar.gz: 0bdd31dada209126940d0e55c1a3b0970b1c17b8c22eecb685aa59ea518bb28456b902bd81256a4b13132d3c9ad88cd115dabe1a1796edd90afeee65568a0c74

data/README.md

@@ -202,7 +202,6 @@ SuperDiff.configure do |config|
   config.add_extra_differ_class(YourDiffer)
   config.add_extra_operation_tree_builder_class(YourOperationTreeBuilder)
   config.add_extra_operation_tree_class(YourOperationTree)
-  config.add_extra_diff_formatter_class(YourDiffFormatter)
 end
 ```
 

data/lib/super_diff.rb

@@ -7,6 +7,7 @@ module SuperDiff
     :ColorizedDocumentExtensions,
     "super_diff/colorized_document_extensions",
   )
+  autoload :OperationTreeFlatteners, "super_diff/operation_tree_flatteners"
   autoload :Configuration, "super_diff/configuration"
   autoload :Csi, "super_diff/csi"
   autoload :DiffFormatters, "super_diff/diff_formatters"
@@ -16,6 +17,10 @@ module SuperDiff
   autoload :GemVersion, "super_diff/gem_version"
   autoload :Helpers, "super_diff/helpers"
   autoload :ImplementationChecks, "super_diff/implementation_checks"
+  autoload :Line, "super_diff/line"
+  autoload :TieredLines, "super_diff/tiered_lines"
+  autoload :TieredLinesElider, "super_diff/tiered_lines_elider"
+  autoload :TieredLinesFormatter, "super_diff/tiered_lines_formatter"
   autoload :ObjectInspection, "super_diff/object_inspection"
   autoload :OperationTrees, "super_diff/operation_trees"
   autoload :OperationTreeBuilders, "super_diff/operation_tree_builders"
@@ -24,18 +29,25 @@ module SuperDiff
 
   def self.configure
     yield configuration
+    configuration.updated
   end
 
   def self.configuration
     @_configuration ||= Configuration.new
   end
 
-  def self.inspect_object(object, as_single_line:, indent_level: 0)
-    ObjectInspection::Inspectors::Main.call(
-      object,
-      as_single_line: as_single_line,
-      indent_level: indent_level,
-    )
+  def self.inspect_object(object, as_lines:, **rest)
+    SuperDiff::RecursionGuard.guarding_recursion_of(object) do
+      inspection_tree = ObjectInspection::InspectionTreeBuilders::Main.call(
+        object
+      )
+
+      if as_lines
+        inspection_tree.render_to_lines(object, **rest)
+      else
+        inspection_tree.render_to_string(object)
+      end
+    end
   end
 
   def self.time_like?(value)
@@ -45,6 +57,15 @@ module SuperDiff
       value.is_a?(Time)
   end
 
+  def self.primitive?(value)
+    case value
+    when true, false, nil, Symbol, Numeric, Regexp, Class
+      true
+    else
+      false
+    end
+  end
+
   def self.insert_overrides(target_module, mod = nil, &block)
     if mod
       target_module.prepend(mod)

data/lib/super_diff/active_record.rb

@@ -2,7 +2,6 @@ require "super_diff/active_support"
 
 module SuperDiff
   module ActiveRecord
-    autoload :DiffFormatters, "super_diff/active_record/diff_formatters"
     autoload :Differs, "super_diff/active_record/differs"
     autoload(
       :ObjectInspection,
@@ -16,6 +15,10 @@ module SuperDiff
       :OperationTreeBuilders,
       "super_diff/active_record/operation_tree_builders",
     )
+    autoload(
+      :OperationTreeFlatteners,
+      "super_diff/active_record/operation_tree_flatteners",
+    )
 
     SuperDiff.configure do |config|
       config.add_extra_differ_classes(
@@ -25,12 +28,9 @@ module SuperDiff
         OperationTreeBuilders::ActiveRecordModel,
         OperationTreeBuilders::ActiveRecordRelation,
       )
-      config.add_extra_diff_formatter_classes(
-        DiffFormatters::ActiveRecordRelation,
-      )
-      config.add_extra_inspector_classes(
-        ObjectInspection::Inspectors::ActiveRecordModel,
-        ObjectInspection::Inspectors::ActiveRecordRelation,
+      config.add_extra_inspection_tree_builder_classes(
+        ObjectInspection::InspectionTreeBuilders::ActiveRecordModel,
+        ObjectInspection::InspectionTreeBuilders::ActiveRecordRelation,
       )
     end
   end

data/lib/super_diff/active_record/differs/active_record_relation.rb

@@ -7,20 +7,10 @@ module SuperDiff
             actual.is_a?(::ActiveRecord::Relation)
         end
 
-        def call
-          DiffFormatters::ActiveRecordRelation.call(
-            operation_tree,
-            indent_level: indent_level,
-          )
-        end
-
-        private
+        protected
 
-        def operation_tree
-          OperationTreeBuilders::ActiveRecordRelation.call(
-            expected: expected,
-            actual: actual,
-          )
+        def operation_tree_builder_class
+          OperationTreeBuilders::ActiveRecordRelation
         end
       end
     end

data/lib/super_diff/active_record/object_inspection.rb

@@ -2,12 +2,8 @@ module SuperDiff
   module ActiveRecord
     module ObjectInspection
       autoload(
-        :Inspectors,
-        "super_diff/active_record/object_inspection/inspectors",
-      )
-      autoload(
-        :MapExtension,
-        "super_diff/active_record/object_inspection/map_extension",
+        :InspectionTreeBuilders,
+        "super_diff/active_record/object_inspection/inspection_tree_builders",
       )
     end
   end

data/lib/super_diff/active_record/object_inspection/inspection_tree_builders.rb

@@ -0,0 +1,16 @@
+module SuperDiff
+  module ActiveRecord
+    module ObjectInspection
+      module InspectionTreeBuilders
+        autoload(
+          :ActiveRecordModel,
+          "super_diff/active_record/object_inspection/inspection_tree_builders/active_record_model",
+        )
+        autoload(
+          :ActiveRecordRelation,
+          "super_diff/active_record/object_inspection/inspection_tree_builders/active_record_relation",
+        )
+      end
+    end
+  end
+end

data/lib/super_diff/active_record/object_inspection/{inspectors → inspection_tree_builders}/active_record_model.rb

@@ -1,44 +1,43 @@
 module SuperDiff
   module ActiveRecord
     module ObjectInspection
-      module Inspectors
-        class ActiveRecordModel < SuperDiff::ObjectInspection::Inspectors::Base
+      module InspectionTreeBuilders
+        class ActiveRecordModel < SuperDiff::ObjectInspection::InspectionTreeBuilders::Base
           def self.applies_to?(value)
             value.is_a?(::ActiveRecord::Base)
           end
 
-          protected
-
-          def inspection_tree
+          def call
             SuperDiff::ObjectInspection::InspectionTree.new do
-              add_text do |object|
-                "#<#{object.class} "
-              end
+              as_lines_when_rendering_to_lines(collection_bookend: :open) do
+                add_text do |object|
+                  "#<#{object.class} "
+                end
 
-              when_multiline do
-                add_text "{"
+                when_rendering_to_lines do
+                  add_text "{"
+                end
               end
 
               nested do |object|
-                add_break
-
                 insert_separated_list(
                   ["id"] + (object.attributes.keys.sort - ["id"]),
-                  separator: ",",
                 ) do |name|
-                  add_text name
-                  add_text ": "
+                  as_prefix_when_rendering_to_lines do
+                    add_text "#{name}: "
+                  end
+
                   add_inspection_of object.read_attribute(name)
                 end
               end
 
-              add_break
+              as_lines_when_rendering_to_lines(collection_bookend: :close) do
+                when_rendering_to_lines do
+                  add_text "}"
+                end
 
-              when_multiline do
-                add_text "}"
+                add_text ">"
               end
-
-              add_text ">"
             end
           end
         end

data/lib/super_diff/active_record/object_inspection/{inspectors → inspection_tree_builders}/active_record_relation.rb

@@ -1,24 +1,25 @@
 module SuperDiff
   module ActiveRecord
     module ObjectInspection
-      module Inspectors
-        class ActiveRecordRelation < SuperDiff::ObjectInspection::Inspectors::Base
+      module InspectionTreeBuilders
+        class ActiveRecordRelation < SuperDiff::ObjectInspection::InspectionTreeBuilders::Base
           def self.applies_to?(value)
             value.is_a?(::ActiveRecord::Relation)
           end
 
-          protected
-
-          def inspection_tree
+          def call
             SuperDiff::ObjectInspection::InspectionTree.new do
-              add_text "#<ActiveRecord::Relation ["
+              as_lines_when_rendering_to_lines(collection_bookend: :open) do
+                add_text "#<ActiveRecord::Relation ["
+              end
 
               nested do |array|
                 insert_array_inspection_of(array)
               end
 
-              add_break
-              add_text "]>"
+              as_lines_when_rendering_to_lines(collection_bookend: :close) do
+                add_text "]>"
+              end
             end
           end
         end

data/lib/super_diff/active_record/operation_tree_flatteners.rb

@@ -0,0 +1,10 @@
+module SuperDiff
+  module ActiveRecord
+    module OperationTreeFlatteners
+      autoload(
+        :ActiveRecordRelation,
+        "super_diff/active_record/operation_tree_flatteners/active_record_relation",
+      )
+    end
+  end
+end

data/lib/super_diff/active_record/operation_tree_flatteners/active_record_relation.rb

@@ -0,0 +1,17 @@
+module SuperDiff
+  module ActiveRecord
+    module OperationTreeFlatteners
+      class ActiveRecordRelation < SuperDiff::OperationTreeFlatteners::Collection
+        protected
+
+        def open_token
+          "#<ActiveRecord::Relation ["
+        end
+
+        def close_token
+          "]>"
+        end
+      end
+    end
+  end
+end

data/lib/super_diff/active_record/operation_trees/active_record_relation.rb

@@ -2,13 +2,14 @@ module SuperDiff
   module ActiveRecord
     module OperationTrees
       class ActiveRecordRelation < SuperDiff::OperationTrees::Array
-        def to_diff(indent_level:, collection_prefix:, add_comma:)
-          DiffFormatters::ActiveRecordRelation.call(
-            self,
-            indent_level: indent_level,
-            collection_prefix: collection_prefix,
-            add_comma: add_comma,
-          )
+        def self.applies_to?(value)
+          value.is_a?(ActiveRecord::Relation)
+        end
+
+        protected
+
+        def operation_tree_flattener_class
+          OperationTreeFlatteners::ActiveRecordRelation
         end
       end
     end

data/lib/super_diff/active_support.rb

@@ -1,15 +1,18 @@
 module SuperDiff
   module ActiveSupport
-    autoload :DiffFormatters, "super_diff/active_support/diff_formatters"
     autoload :Differs, "super_diff/active_support/differs"
     autoload :ObjectInspection, "super_diff/active_support/object_inspection"
+    autoload(
+      :OperationTrees,
+      "super_diff/active_support/operation_trees",
+    )
     autoload(
       :OperationTreeBuilders,
       "super_diff/active_support/operation_tree_builders",
     )
     autoload(
-      :OperationalSequences,
-      "super_diff/active_support/operational_sequences",
+      :OperationTreeFlatteners,
+      "super_diff/active_support/operation_tree_flatteners",
     )
 
     SuperDiff.configure do |config|
@@ -19,11 +22,8 @@ module SuperDiff
       config.add_extra_operation_tree_builder_classes(
         OperationTreeBuilders::HashWithIndifferentAccess,
       )
-      config.add_extra_diff_formatter_classes(
-        DiffFormatters::HashWithIndifferentAccess,
-      )
-      config.add_extra_inspector_classes(
-        ObjectInspection::Inspectors::HashWithIndifferentAccess,
+      config.add_extra_inspection_tree_builder_classes(
+        ObjectInspection::InspectionTreeBuilders::HashWithIndifferentAccess,
       )
     end
   end

data/lib/super_diff/active_support/differs/hash_with_indifferent_access.rb

@@ -13,20 +13,10 @@ module SuperDiff
           )
         end
 
-        def call
-          DiffFormatters::HashWithIndifferentAccess.call(
-            operation_tree,
-            indent_level: indent_level,
-          )
-        end
+        protected
 
-        private
-
-        def operation_tree
-          OperationTreeBuilders::HashWithIndifferentAccess.call(
-            expected: expected,
-            actual: actual,
-          )
+        def operation_tree_builder_class
+          OperationTreeBuilders::HashWithIndifferentAccess
         end
       end
     end

data/lib/super_diff/active_support/object_inspection.rb

@@ -2,12 +2,8 @@ module SuperDiff
   module ActiveSupport
     module ObjectInspection
       autoload(
-        :Inspectors,
-        "super_diff/active_support/object_inspection/inspectors",
-      )
-      autoload(
-        :MapExtension,
-        "super_diff/active_support/object_inspection/map_extension",
+        :InspectionTreeBuilders,
+        "super_diff/active_support/object_inspection/inspection_tree_builders",
       )
     end
   end

data/lib/super_diff/active_support/object_inspection/{inspectors.rb → inspection_tree_builders.rb}

@@ -1,10 +1,10 @@
 module SuperDiff
   module ActiveSupport
     module ObjectInspection
-      module Inspectors
+      module InspectionTreeBuilders
         autoload(
           :HashWithIndifferentAccess,
-          "super_diff/active_support/object_inspection/inspectors/hash_with_indifferent_access",
+          "super_diff/active_support/object_inspection/inspection_tree_builders/hash_with_indifferent_access",
         )
       end
     end

data/lib/super_diff/active_support/object_inspection/inspection_tree_builders/hash_with_indifferent_access.rb

@@ -0,0 +1,37 @@
+module SuperDiff
+  module ActiveSupport
+    module ObjectInspection
+      module InspectionTreeBuilders
+        class HashWithIndifferentAccess < SuperDiff::ObjectInspection::InspectionTreeBuilders::Base
+          def self.applies_to?(value)
+            value.is_a?(::HashWithIndifferentAccess)
+          end
+
+          def call
+            SuperDiff::ObjectInspection::InspectionTree.new do
+              as_lines_when_rendering_to_lines(collection_bookend: :open) do
+                add_text "#<HashWithIndifferentAccess {"
+              end
+
+              when_rendering_to_string do
+                add_text " "
+              end
+
+              nested do |hash|
+                insert_hash_inspection_of(hash)
+              end
+
+              when_rendering_to_string do
+                add_text " "
+              end
+
+              as_lines_when_rendering_to_lines(collection_bookend: :close) do
+                add_text "}>"
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end