diffy 3.4.3 → 3.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4917a9c5ce62dd40fcba1bd26dbe0d43cb864bc17191eb6f1f6d75f0335379b
-  data.tar.gz: 4ec8d980136421bb271f89c61d50ff72caa02fa8ed650e05004f41d0107bfcd8
+  metadata.gz: 47c21389e70aed2e702069a3dbe38eecc74bbc88f37f2ae9f82f26b8bafdea62
+  data.tar.gz: b9ac4fc40b5b9b9ec06da6006295733a3d0c5f20c60ba7d58d8d232e7a10c54d
 SHA512:
-  metadata.gz: 874f8c29026f342558611b1860a45cd51b4d6f5cee3ce5b139e0d3b03f3e0fb1fcc71fb9581550b5be76ad7c213a78f614fdf1688e3612dfc528ae06788975bb
-  data.tar.gz: f0e8ac0ec13e20432927bbcaf4f25caadc30d9af763272c85f8f13a3d32473f9fcb5e1e50a6298843daeea6de0cfd18f3a4755536b8e7399fdc4329554881e56
+  metadata.gz: 14e8e0e6da9b5f34b3e065df2750cd0fc4af9a4523310578032d36fd288f2cca5fa5e3625d4bc8f4a864b4be72f3593c5cfce89dca1159b43274cf3c2501edbc
+  data.tar.gz: af3dd707b07f2a03489070bf5ae6d79decac71bf1a6370dfb0326f240d620711d44ff31818fcd8bc030c3bf38dda4a3e1762fe0ad044853b7cf72bef3c8b96d7

data/CHANGELOG

@@ -1,3 +1,6 @@
+== 3.4.4 ==
+Fix HTML diff highlighting bug for lines containing '\n'. Thanks @P-SiZK!
+
 == 3.4.3 ==
 Require open3 unconditionally on Windows. Thanks @avdv!
 

data/CONTRIBUTORS

@@ -13,3 +13,4 @@
 * Abinoam P. Marques Jr.
 * evgen
 * J Smith @dark-panda
+* @P-SiZK

data/lib/diffy/html_formatter.rb

@@ -91,12 +91,10 @@ module Diffy
     def split_characters(chunk)
       chunk.gsub(/^./, '').each_line.map do |line|
         if @options[:ignore_crlf]
-          (line.chomp.split('') + ['\n']).map{|chr| ERB::Util.h(chr) }
+          line.chomp.split('').map{|chr| ERB::Util.h(chr) } + ['<LINE_BOUNDARY>']
         else
           chars = line.sub(/([\r\n]$)/, '').split('')
-          # add escaped newlines
-          chars << '\n'
-          chars.map{|chr| ERB::Util.h(chr) }
+          chars.map{|chr| ERB::Util.h(chr) } + ['<LINE_BOUNDARY>']
         end
       end.flatten.join("\n") + "\n"
     end
@@ -104,7 +102,7 @@ module Diffy
     def reconstruct_characters(line_diff, type)
       enum = line_diff.each_chunk.to_a
       enum.each_with_index.map do |l, i|
-        re = /(^|\\n)#{Regexp.escape(type)}/
+        re = /(^|<LINE_BOUNDARY>)#{Regexp.escape(type)}/
         case l
         when re
           highlight(l)
@@ -113,7 +111,7 @@ module Diffy
             highlight(l)
           else
             l.gsub(/^./, '').gsub("\n", '').
-              gsub('\r', "\r").gsub('\n', "\n")
+              gsub('\r', "\r").gsub('<LINE_BOUNDARY>', "\n")
           end
         end
       end.join('').split("\n").map do |l|
@@ -125,10 +123,7 @@ module Diffy
       "<strong>" +
         lines.
           # strip diff tokens (e.g. +,-,etc.)
-          gsub(/(^|\\n)./, '').
-          # mark line boundaries from higher level line diff
-          # html is all escaped so using brackets should make this safe.
-          gsub('\n', '<LINE_BOUNDARY>').
+          gsub(/(^|<LINE_BOUNDARY>)./, '').
           # join characters back by stripping out newlines
           gsub("\n", '').
           # close and reopen strong tags.  we don't want inline elements

data/lib/diffy/version.rb

@@ -1,3 +1,3 @@
 module Diffy
-  VERSION = '3.4.3'
+  VERSION = '3.4.4'
 end

data/spec/diffy_spec.rb

@@ -530,6 +530,24 @@ baz
         end
       end
 
+      describe 'with lines that include \n but not as a diff' do
+        before do
+          @string1 = 'a\nb'"\n"
+          @string2 = 'a\nc'"\n"
+        end
+
+        it "should not leave lines out" do
+          expect(Diffy::Diff.new(@string1, @string2).to_s(:html)).to eq <<-DIFF
+<div class="diff">
+  <ul>
+    <li class="del"><del>a\\n<strong>b</strong></del></li>
+    <li class="ins"><ins>a\\n<strong>c</strong></ins></li>
+  </ul>
+</div>
+          DIFF
+        end
+      end
+
       it "should do highlighting on the last line when there's no trailing newlines" do
         s1 = "foo\nbar\nbang"
         s2 = "foo\nbar\nbangleize"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diffy
 version: !ruby/object:Gem::Version
-  version: 3.4.3
+  version: 3.4.4
 platform: ruby
 authors:
 - Sam Goldstein
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-21 00:00:00.000000000 Z
+date: 2025-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake