super_diff 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb5307b0f4dab85f765805443f6315ea45ec58d81f94211292326e32b98e1539
-  data.tar.gz: 3af49d5f9a3d7396828fdc6c1b74cd8e4103ff35fc2ebced5dbef15071fe0bab
+  metadata.gz: '08f4b984e0530c5c4ca5e1ba34b98b380a76712009a1b552a5e21106975293aa'
+  data.tar.gz: 12b49818665c952553c0b052e3fe8166de0c45a5eac7f9862c317560e0a06763
 SHA512:
-  metadata.gz: 9aea5c125c0dbde9f754f4d0fd72dd20142cfe4f49077d9f7ab7e47994ea09297c5f58fc3cd59f564fe9534e17ae7e2a062433c03830dc3d209ee2217d503270
-  data.tar.gz: f1f31c074ce8f043f7ac72127b5bd46158433a5ec6af3a0b79250f08e276fba8d1936b5ed5a09e2134e1ee3e4087b7bec36535da556f7b0b04953690edb949b9
+  metadata.gz: c6df90629d86a0c50680b10803cd1839ba0c94828627775fa840e1726fc70b57c6b13be7614ff35c00af960f3ea05530af6ba2d7dc7a3b9f9670fa8d17f75c72
+  data.tar.gz: 56015f9b40eb6f8b03be2c7b02dc641ea7493db0d7d4a8dae929753f7bf94d9a925f0678b8f68c1c2bf7eb705e2c019b3b38f7bfafb805379d8b37b9016f453d

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

@@ -8,27 +8,39 @@ module SuperDiff
           end
 
           def call
-            SuperDiff::ObjectInspection::InspectionTree.new do
-              as_lines_when_rendering_to_lines(collection_bookend: :open) do
-                add_text { |object| "#<#{object.class} " }
+            SuperDiff::ObjectInspection::InspectionTree.new do |t1|
+              t1.as_lines_when_rendering_to_lines(
+                collection_bookend: :open
+              ) do |t2|
+                t2.add_text "#<#{object.class} "
 
-                when_rendering_to_lines { add_text "{" }
+                # stree-ignore
+                t2.when_rendering_to_lines do |t3|
+                  t3.add_text "{"
+                end
               end
 
-              nested do |object|
-                insert_separated_list(
+              t1.nested do |t2|
+                t2.insert_separated_list(
                   ["id"] + (object.attributes.keys.sort - ["id"])
-                ) do |name|
-                  as_prefix_when_rendering_to_lines { add_text "#{name}: " }
+                ) do |t3, name|
+                  t3.as_prefix_when_rendering_to_lines do |t4|
+                    t4.add_text "#{name}: "
+                  end
 
-                  add_inspection_of object.read_attribute(name)
+                  t3.add_inspection_of object.read_attribute(name)
                 end
               end
 
-              as_lines_when_rendering_to_lines(collection_bookend: :close) do
-                when_rendering_to_lines { add_text "}" }
+              t1.as_lines_when_rendering_to_lines(
+                collection_bookend: :close
+              ) do |t2|
+                # stree-ignore
+                t2.when_rendering_to_lines do |t3|
+                  t3.add_text "}"
+                end
 
-                add_text ">"
+                t2.add_text ">"
               end
             end
           end

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

@@ -8,15 +8,24 @@ module SuperDiff
           end
 
           def call
-            SuperDiff::ObjectInspection::InspectionTree.new do
-              as_lines_when_rendering_to_lines(collection_bookend: :open) do
-                add_text "#<ActiveRecord::Relation ["
+            SuperDiff::ObjectInspection::InspectionTree.new do |t1|
+              # stree-ignore
+              t1.as_lines_when_rendering_to_lines(
+                collection_bookend: :open
+              ) do |t2|
+                t2.add_text "#<ActiveRecord::Relation ["
               end
 
-              nested { |array| insert_array_inspection_of(array) }
+              # stree-ignore
+              t1.nested do |t2|
+                t2.insert_array_inspection_of(object)
+              end
 
-              as_lines_when_rendering_to_lines(collection_bookend: :close) do
-                add_text "]>"
+              # stree-ignore
+              t1.as_lines_when_rendering_to_lines(
+                collection_bookend: :close
+              ) do |t2|
+                t2.add_text "]>"
               end
             end
           end

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

@@ -8,19 +8,34 @@ module SuperDiff
           end
 
           def call
-            SuperDiff::ObjectInspection::InspectionTree.new do
-              as_lines_when_rendering_to_lines(collection_bookend: :open) do
-                add_text "#<HashWithIndifferentAccess {"
+            SuperDiff::ObjectInspection::InspectionTree.new do |t1|
+              # stree-ignore
+              t1.as_lines_when_rendering_to_lines(
+                collection_bookend: :open
+              ) do |t2|
+                t2.add_text "#<HashWithIndifferentAccess {"
               end
 
-              when_rendering_to_string { add_text " " }
+              # stree-ignore
+              t1.when_rendering_to_string do |t2|
+                t2.add_text " "
+              end
 
-              nested { |hash| insert_hash_inspection_of(hash) }
+              # stree-ignore
+              t1.nested do |t2|
+                t2.insert_hash_inspection_of(object)
+              end
 
-              when_rendering_to_string { add_text " " }
+              # stree-ignore
+              t1.when_rendering_to_string do |t2|
+                t2.add_text " "
+              end
 
-              as_lines_when_rendering_to_lines(collection_bookend: :close) do
-                add_text "}>"
+              # stree-ignore
+              t1.as_lines_when_rendering_to_lines(
+                collection_bookend: :close
+              ) do |t2|
+                t2.add_text "}>"
               end
             end
           end

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

@@ -0,0 +1,46 @@
+module SuperDiff
+  module ActiveSupport
+    module ObjectInspection
+      module InspectionTreeBuilders
+        class OrderedOptions < SuperDiff::ObjectInspection::InspectionTreeBuilders::Hash
+          def self.applies_to?(value)
+            value.is_a?(::ActiveSupport::OrderedOptions)
+          end
+
+          def call
+            SuperDiff::ObjectInspection::InspectionTree.new do |t1|
+              # stree-ignore
+              t1.as_lines_when_rendering_to_lines(
+                collection_bookend: :open
+              ) do |t2|
+                t2.add_text "#<OrderedOptions {"
+              end
+
+              # stree-ignore
+              t1.when_rendering_to_string do |t2|
+                t2.add_text " "
+              end
+
+              # stree-ignore
+              t1.nested do |t2|
+                t2.insert_hash_inspection_of(object.to_hash)
+              end
+
+              # stree-ignore
+              t1.when_rendering_to_string do |t2|
+                t2.add_text " "
+              end
+
+              # stree-ignore
+              t1.as_lines_when_rendering_to_lines(
+                collection_bookend: :close
+              ) do |t2|
+                t2.add_text "}>"
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -6,6 +6,10 @@ module SuperDiff
           :HashWithIndifferentAccess,
           "super_diff/active_support/object_inspection/inspection_tree_builders/hash_with_indifferent_access"
         )
+        autoload(
+          :OrderedOptions,
+          "super_diff/active_support/object_inspection/inspection_tree_builders/ordered_options"
+        )
       end
     end
   end

data/lib/super_diff/active_support.rb

@@ -18,7 +18,8 @@ module SuperDiff
         OperationTreeBuilders::HashWithIndifferentAccess
       )
       config.add_extra_inspection_tree_builder_classes(
-        ObjectInspection::InspectionTreeBuilders::HashWithIndifferentAccess
+        ObjectInspection::InspectionTreeBuilders::HashWithIndifferentAccess,
+        ObjectInspection::InspectionTreeBuilders::OrderedOptions
       )
     end
   end

data/lib/super_diff/differs/date_like.rb

@@ -0,0 +1,15 @@
+module SuperDiff
+  module Differs
+    class DateLike < Base
+      def self.applies_to?(expected, actual)
+        SuperDiff.date_like?(expected) && SuperDiff.date_like?(actual)
+      end
+
+      protected
+
+      def operation_tree_builder_class
+        OperationTreeBuilders::DateLike
+      end
+    end
+  end
+end

data/lib/super_diff/differs/defaults.rb

@@ -4,6 +4,7 @@ module SuperDiff
       Array,
       Hash,
       TimeLike,
+      DateLike,
       MultilineString,
       CustomObject,
       DefaultObject

data/lib/super_diff/differs.rb

@@ -9,6 +9,7 @@ module SuperDiff
     autoload :Main, "super_diff/differs/main"
     autoload :MultilineString, "super_diff/differs/multiline_string"
     autoload :TimeLike, "super_diff/differs/time_like"
+    autoload :DateLike, "super_diff/differs/date_like"
   end
 end
 

data/lib/super_diff/errors.rb

@@ -1,9 +1,5 @@
 module SuperDiff
   module Errors
-    autoload(
-      :NoDiffFormatterAvailableError,
-      "super_diff/errors/no_diff_formatter_available_error"
-    )
     autoload(
       :NoDifferAvailableError,
       "super_diff/errors/no_differ_available_error"

data/lib/super_diff/object_inspection/inspection_tree.rb

@@ -7,7 +7,7 @@ module SuperDiff
         @disallowed_node_names = disallowed_node_names
         @nodes = []
 
-        instance_eval(&block) if block
+        evaluate_block(&block) if block
       end
 
       Nodes.registry.each do |node_class|
@@ -26,8 +26,7 @@ module SuperDiff
 
       def render_to_string(object)
         nodes.reduce("") do |string, node|
-          result = node.render_to_string(object)
-          string + result
+          string + node.render_to_string(object)
         end
       end
 
@@ -52,43 +51,45 @@ module SuperDiff
           .first
       end
 
-      def evaluate_block(object, &block)
-        instance_exec(object, &block)
+      def evaluate_block(*args, &block)
+        block.call(self, *args)
       end
 
       def insert_array_inspection_of(array)
-        insert_separated_list(array) do |value|
+        insert_separated_list(array) do |t, value|
           # Have to do these shenanigans so that if value is a hash, Ruby
           # doesn't try to interpret it as keyword args
           if SuperDiff::Helpers.ruby_version_matches?(">= 2.7.1")
-            add_inspection_of(value, **{})
+            t.add_inspection_of(value, **{})
           else
-            add_inspection_of(*[value, {}])
+            t.add_inspection_of(*[value, {}])
           end
         end
       end
 
       def insert_hash_inspection_of(hash)
         keys = hash.keys
-
         format_keys_as_kwargs = keys.all? { |key| key.is_a?(Symbol) }
 
-        insert_separated_list(keys) do |key|
+        insert_separated_list(keys) do |t1, key|
           if format_keys_as_kwargs
-            as_prefix_when_rendering_to_lines { add_text "#{key}: " }
+            # stree-ignore
+            t1.as_prefix_when_rendering_to_lines do |t2|
+              t2.add_text "#{key}: "
+            end
           else
-            as_prefix_when_rendering_to_lines do
-              add_inspection_of key, as_lines: false
-              add_text " => "
+            t1.as_prefix_when_rendering_to_lines do |t2|
+              t2.add_inspection_of key, as_lines: false
+              t2.add_text " => "
             end
           end
 
           # Have to do these shenanigans so that if hash[key] is a hash, Ruby
           # doesn't try to interpret it as keyword args
           if SuperDiff::Helpers.ruby_version_matches?(">= 2.7.1")
-            add_inspection_of(hash[key], **{})
+            t1.add_inspection_of(hash[key], **{})
           else
-            add_inspection_of(*[hash[key], {}])
+            t1.add_inspection_of(*[hash[key], {}])
           end
         end
       end
@@ -97,10 +98,14 @@ module SuperDiff
         enumerable.each_with_index do |value, index|
           as_lines_when_rendering_to_lines(
             add_comma: index < enumerable.size - 1
-          ) do
-            when_rendering_to_string { add_text " " } if index > 0
-
-            evaluate_block(value, &block)
+          ) do |t1|
+            if index > 0
+              # stree-ignore
+              t1.when_rendering_to_string do |t2|
+                t2.add_text " "
+              end
+            end
+            t1.evaluate_block(value, &block)
           end
         end
       end

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

@@ -7,27 +7,46 @@ module SuperDiff
         end
 
         def call
-          empty = -> { object.empty? }
-          nonempty = -> { !object.empty? }
-
-          InspectionTree.new do
-            only_when empty do
-              as_lines_when_rendering_to_lines { add_text "[]" }
+          InspectionTree.new do |t1|
+            t1.only_when empty do |t2|
+              # stree-ignore
+              t2.as_lines_when_rendering_to_lines do |t3|
+                t3.add_text "[]"
+              end
             end
 
-            only_when nonempty do
-              as_lines_when_rendering_to_lines(collection_bookend: :open) do
-                add_text "["
+            t1.only_when nonempty do |t2|
+              # stree-ignore
+              t2.as_lines_when_rendering_to_lines(
+                collection_bookend: :open
+              ) do |t3|
+                t3.add_text "["
               end
 
-              nested { |array| insert_array_inspection_of(array) }
+              # stree-ignore
+              t2.nested do |t3|
+                t3.insert_array_inspection_of(object)
+              end
 
-              as_lines_when_rendering_to_lines(collection_bookend: :close) do
-                add_text "]"
+              # stree-ignore
+              t2.as_lines_when_rendering_to_lines(
+                collection_bookend: :close
+              ) do |t3|
+                t3.add_text "]"
               end
             end
           end
         end
+
+        private
+
+        def empty
+          -> { object.empty? }
+        end
+
+        def nonempty
+          -> { !object.empty? }
+        end
       end
     end
   end

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

@@ -7,21 +7,31 @@ module SuperDiff
         end
 
         def call
-          InspectionTree.new do
-            as_lines_when_rendering_to_lines(collection_bookend: :open) do
-              add_text { |object| "#<#{object.class} " }
+          InspectionTree.new do |t1|
+            t1.as_lines_when_rendering_to_lines(
+              collection_bookend: :open
+            ) do |t2|
+              t2.add_text "#<#{object.class} "
 
-              when_rendering_to_lines { add_text "{" }
+              # stree-ignore
+              t2.when_rendering_to_lines do |t3|
+                t3.add_text "{"
+              end
             end
 
-            nested do |object|
-              insert_hash_inspection_of(object.attributes_for_super_diff)
+            t1.nested do |t2|
+              t2.insert_hash_inspection_of(object.attributes_for_super_diff)
             end
 
-            as_lines_when_rendering_to_lines(collection_bookend: :close) do
-              when_rendering_to_lines { add_text "}" }
+            t1.as_lines_when_rendering_to_lines(
+              collection_bookend: :close
+            ) do |t2|
+              # stree-ignore
+              t2.when_rendering_to_lines do |t3|
+                t3.add_text "}"
+              end
 
-              add_text ">"
+              t2.add_text ">"
             end
           end
         end

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

@@ -0,0 +1,51 @@
+module SuperDiff
+  module ObjectInspection
+    module InspectionTreeBuilders
+      class DateLike < Base
+        def self.applies_to?(value)
+          SuperDiff.date_like?(value)
+        end
+
+        def call
+          InspectionTree.new do |t1|
+            t1.as_lines_when_rendering_to_lines(
+              collection_bookend: :open
+            ) do |t2|
+              t2.add_text "#<#{object.class} "
+
+              # stree-ignore
+              t2.when_rendering_to_lines do |t3|
+                t3.add_text "{"
+              end
+            end
+
+            t1.when_rendering_to_string do |t2|
+              t2.add_text object.strftime("%Y-%m-%d")
+            end
+
+            t1.when_rendering_to_lines do |t2|
+              t2.nested do |t3|
+                t3.insert_separated_list(%i[year month day]) do |t4, name|
+                  t4.add_text name.to_s
+                  t4.add_text ": "
+                  t4.add_inspection_of object.public_send(name)
+                end
+              end
+            end
+
+            t1.as_lines_when_rendering_to_lines(
+              collection_bookend: :close
+            ) do |t2|
+              # stree-ignore
+              t2.when_rendering_to_lines do |t3|
+                t3.add_text "}"
+              end
+
+              t2.add_text ">"
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -7,47 +7,72 @@ module SuperDiff
         end
 
         def call
-          empty = -> { object.instance_variables.empty? }
-          nonempty = -> { !object.instance_variables.empty? }
-
-          InspectionTree.new do
-            only_when empty do
-              as_lines_when_rendering_to_lines do
-                add_text do |object|
+          InspectionTree.new do |t1|
+            t1.only_when empty do |t2|
+              t2.as_lines_when_rendering_to_lines do |t3|
+                t3.add_text(
                   "#<#{object.class.name}:" +
                     SuperDiff::Helpers.object_address_for(object) + ">"
-                end
+                )
               end
             end
 
-            only_when nonempty do
-              as_lines_when_rendering_to_lines(collection_bookend: :open) do
-                add_text do |object|
+            t1.only_when nonempty do |t2|
+              t2.as_lines_when_rendering_to_lines(
+                collection_bookend: :open
+              ) do |t3|
+                t3.add_text(
                   "#<#{object.class.name}:" +
                     SuperDiff::Helpers.object_address_for(object)
-                end
+                )
 
-                when_rendering_to_lines { add_text " {" }
+                # stree-ignore
+                t3.when_rendering_to_lines do |t4|
+                  t4.add_text " {"
+                end
               end
 
-              when_rendering_to_string { add_text " " }
+              # stree-ignore
+              t2.when_rendering_to_string do |t3|
+                t3.add_text " "
+              end
 
-              nested do |object|
-                insert_separated_list(object.instance_variables.sort) do |name|
-                  as_prefix_when_rendering_to_lines { add_text "#{name}=" }
+              t2.nested do |t3|
+                t3.insert_separated_list(
+                  object.instance_variables.sort
+                ) do |t4, name|
+                  # stree-ignore
+                  t4.as_prefix_when_rendering_to_lines do |t5|
+                    t5.add_text "#{name}="
+                  end
 
-                  add_inspection_of object.instance_variable_get(name)
+                  t4.add_inspection_of object.instance_variable_get(name)
                 end
               end
 
-              as_lines_when_rendering_to_lines(collection_bookend: :close) do
-                when_rendering_to_lines { add_text "}" }
+              t2.as_lines_when_rendering_to_lines(
+                collection_bookend: :close
+              ) do |t3|
+                # stree-ignore
+                t3.when_rendering_to_lines do |t4|
+                  t4.add_text "}"
+                end
 
-                add_text ">"
+                t3.add_text ">"
               end
             end
           end
         end
+
+        private
+
+        def empty
+          -> { object.instance_variables.empty? }
+        end
+
+        def nonempty
+          -> { !object.instance_variables.empty? }
+        end
       end
     end
   end

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

@@ -7,6 +7,7 @@ module SuperDiff
         Hash,
         Primitive,
         TimeLike,
+        DateLike,
         DefaultObject
       ].freeze
     end