minitest-difftastic 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d603a327fc8fce58c1ef00a079628ac03ceef45e5dccb959111f19be4fb0391b
-  data.tar.gz: 4639b7123d9158ffb7629c8e07e0b90b5c8f3606718e8588fc61b61b504835c3
+  metadata.gz: 692dd87d40229d2fea8ac5e00900e45ae33ec436b33f22d98027037f5448ef22
+  data.tar.gz: d1f4de4c6be40d5bdcd5efed3907ecfc52725d15f8d7606083c0d34b4904e142
 SHA512:
-  metadata.gz: 9417837255131ee678670cda378c42e9afcfe8a07975647307b16f70b9139965f92c6f998f8ef0e6f68a4e7837117f44349d6f928259126d748e5c0efa1b8559
-  data.tar.gz: 8c019e2e12b9506a66bd5c766a7b4cbe85d744610a190fafeec35f5593d7ffccc43b0ac016a6ba7a05f459854a59204a75b019dd75d4a2303c8de1b64021c655
+  metadata.gz: 16c1ffb8e443e9423074ec083cc94f7c90121c44590ca7559ae6e0ed6ba75e4d7bec2b293f576e22a7dd4d48487a20c63ca6e0c28a94355d1f6972e3917f0afb
+  data.tar.gz: fb8c0fa64bed4a4d163a295343083b37418cd27ade769f2b8cb71d1dd6f2f8fbd116d0838b5fdd5e19de0411638c8a503ebf9177a25af55ae493c4865914d0f3

data/.rubocop.yml

@@ -1,7 +1,7 @@
 AllCops:
   NewCops: enable
   SuggestExtensions: false
-  TargetRubyVersion: 3.0
+  TargetRubyVersion: 3.1
 
 Style/StringLiterals:
   Enabled: true

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    minitest-difftastic (0.1.0)
+    minitest-difftastic (0.1.1)
       difftastic (~> 0.0.1)
 
 GEM

data/README.md

@@ -1,9 +1,25 @@
 # Minitest::Difftastic
 
-A Minitest Plugin which uses [`difftastic`](https://github.com/Wilfred/difftastic) (via [`difftastic-ruby`](https://github.com/joeldrapper/difftastic-ruby)) to show the diffs for failing assertions. 
+A Minitest Plugin which uses [`difftastic`](https://github.com/Wilfred/difftastic) (via [`difftastic-ruby`](https://github.com/joeldrapper/difftastic-ruby)) to show the diffs for failing assertions.
 
 Also works for Rails tests using `ActiveSupport::TestCase`.
 
+### Integers
+
+![Integers Comparison](./screenshots/integers.png)
+
+### Strings
+
+![Strings Comparison](./screenshots/strings.png)
+
+### Objects
+
+![Objects Comparison](./screenshots/objects.png)
+
+### Nested Objects
+
+![Nested Objects Comparison](./screenshots/nested_objects.png)
+
 ## Installation
 
 Install the gem and add to the application's Gemfile by executing:

data/lib/minitest/difftastic/version.rb

@@ -2,6 +2,6 @@
 
 module Minitest
   module Difftastic
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/lib/minitest/difftastic_plugin.rb

@@ -5,10 +5,44 @@ require "difftastic"
 # TODO: use refinements
 module Minitest
   module Assertions
+    MINIMUM_OFFSET = 29
+    TAB_WIDTH = 2
+
+    RED = "\e[91;1m"
+    GREEN = "\e[92;1m"
+    RESET = "\e[0m"
+
+    DIFFER = ::Difftastic::Differ.new(
+      color: :always,
+      tab_width: TAB_WIDTH,
+      syntax_highlight: :off
+    )
+
+    alias diff_original diff
+
     def diff(exp, act)
-      ::Difftastic::Differ.new(color: :always, tab_width: 2, syntax_highlight: :off).diff_objects(exp, act)
-    rescue StandardError
-      super
+      diff = DIFFER.diff_objects(exp, act)
+      offset = actual_text_offset(diff.split("\n").first)
+
+      "\n#{RED}#{"Expected".ljust(offset)} #{GREEN}Actual#{RESET}\n#{diff}"
+    rescue StandardError => e
+      puts "Minitest::DiffTastic error: #{e.inspect} (#{e.backtrace[0]})"
+      diff_original(exp, act)
+    end
+
+    private
+
+    def strip_ansi_formatting(string)
+      string.to_s.gsub(/\e\[[0-9;]*m/, "")
+    end
+
+    def actual_text_offset(line)
+      stripped_line = strip_ansi_formatting(line)
+      _lhs, rhs = stripped_line.split(/\s{#{TAB_WIDTH},}/, 2)
+
+      offset = stripped_line.index("#{" " * TAB_WIDTH}#{rhs}") + TAB_WIDTH - 1
+
+      [MINIMUM_OFFSET, offset].max
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minitest-difftastic
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Marco Roth
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-21 00:00:00.000000000 Z
+date: 2025-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: difftastic
@@ -24,7 +24,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.1
-description: Minitest Plugin to use difftastic for diffing
+description: Minitest Plugin to use difftastic for failed assertions
 email:
 - marco.roth@intergga.ch
 executables: []
@@ -41,6 +41,10 @@ files:
 - lib/minitest/difftastic.rb
 - lib/minitest/difftastic/version.rb
 - lib/minitest/difftastic_plugin.rb
+- screenshots/integers.png
+- screenshots/nested_objects.png
+- screenshots/objects.png
+- screenshots/strings.png
 - sig/minitest/difftastic.rbs
 homepage: https://github.com/marcoroth/minitest-difftastic
 licenses: []
@@ -57,15 +61,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
-summary: Minitest Plugin to use difftastic for diffing
+summary: Minitest Plugin to use difftastic for failed assertions
 test_files: []