diffy 3.3.0 → 3.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f075ae98773be87371ebe062baf246c8e70187b5
-  data.tar.gz: b6a761844cffe0e12134fafe2e8163dafc158def
+SHA256:
+  metadata.gz: 47c21389e70aed2e702069a3dbe38eecc74bbc88f37f2ae9f82f26b8bafdea62
+  data.tar.gz: b9ac4fc40b5b9b9ec06da6006295733a3d0c5f20c60ba7d58d8d232e7a10c54d
 SHA512:
-  metadata.gz: cc19ee7c97c81c4937a4c1c95221a45123f96ba730ea29908fa6c08b77bb17217db5a8bf92fd2463eb4275821ada7201b49448615765508ebf9815d72e81c9b3
-  data.tar.gz: 0e12bfb8ba4bec36c4c659a9157ef6353c1eed14fbb2b2178111e9573cb1a3aab7047208aa1a53cca83f0e956368197aa671885c90066d8fe4766f5263b49a72
+  metadata.gz: 14e8e0e6da9b5f34b3e065df2750cd0fc4af9a4523310578032d36fd288f2cca5fa5e3625d4bc8f4a864b4be72f3593c5cfce89dca1159b43274cf3c2501edbc
+  data.tar.gz: af3dd707b07f2a03489070bf5ae6d79decac71bf1a6370dfb0326f240d620711d44ff31818fcd8bc030c3bf38dda4a3e1762fe0ad044853b7cf72bef3c8b96d7

data/.travis.yml

@@ -9,6 +9,7 @@ rvm:
   - 2.2.6
   - 2.3.3
   - 2.4.0
+  - 3.0
   - jruby-9.1.12.0
 matrix:
   allow_failures:

data/CHANGELOG

@@ -1,3 +1,22 @@
+== 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!
+
+== 3.4.2 ==
+Silence warning from unused variable when using `ruby -w`.  Thanks
+@sambostock!
+
+== 3.4.1 ==
+Prevent remote code execution from user controlled diff file paths.  This
+issue was only present in Windows platforms. Thanks @tehryanx for reporting
+and testing the fix!
+
+== 3.4.0 ==
+Remove space between U diff option and context number. Thanks @tomas!
+Add option to ignore CRLF diffs in HTML comparisons. Thanks @ptyagi16!
+
 == 3.3.0 ==
 Fix diff lines that begin with -- or ++. Thanks @dark-panda!
 

data/CONTRIBUTORS

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

data/README.md

@@ -277,6 +277,15 @@ combined with the `:context` option.
       foo
      bar
 
+### `:ignore_crlf` when doing HTML compares
+
+You can make the HTML output ignore the CRLF by passing the `:ignore_crlf` option a truthy value.
+
+    >> puts Diffy::Diff.new(" foo\nbar\n", "foo\r\nbar\r\n", ignore_crlf: true).to_s(:html)
+      "<div class=\"diff\"></div>"
+
+
+
 Default Diff Options
 --------------------
 

data/lib/diffy/diff.rb

@@ -49,13 +49,7 @@ module Diffy
             [string1, string2]
           end
 
-        if WINDOWS
-          # don't use open3 on windows
-          cmd = sprintf '"%s" %s %s', diff_bin, diff_options.join(' '), @paths.map { |s| %("#{s}") }.join(' ')
-          diff = `#{cmd}`
-        else
-          diff = Open3.popen3(diff_bin, *(diff_options + @paths)) { |i, o, e| o.read }
-        end
+        diff, _stderr, _process_status = Open3.capture3(diff_bin, *(diff_options + @paths))
         diff.force_encoding('ASCII-8BIT') if diff.respond_to?(:valid_encoding?) && !diff.valid_encoding?
         if diff =~ /\A\s*\Z/ && !options[:allow_empty_diff]
           diff = case options[:source]
@@ -174,7 +168,7 @@ module Diffy
 
     # options pass to diff program
     def diff_options
-      Array(options[:context] ? "-U #{options[:context]}" : options[:diff])
+      Array(options[:context] ? "-U#{options[:context]}" : options[:diff])
     end
 
   end

data/lib/diffy/html_formatter.rb

@@ -90,17 +90,19 @@ module Diffy
 
     def split_characters(chunk)
       chunk.gsub(/^./, '').each_line.map do |line|
-        chars = line.sub(/([\r\n]$)/, '').split('')
-        # add escaped newlines
-        chars << '\n'
-        chars.map{|chr| ERB::Util.h(chr) }
+        if @options[:ignore_crlf]
+          line.chomp.split('').map{|chr| ERB::Util.h(chr) } + ['<LINE_BOUNDARY>']
+        else
+          chars = line.sub(/([\r\n]$)/, '').split('')
+          chars.map{|chr| ERB::Util.h(chr) } + ['<LINE_BOUNDARY>']
+        end
       end.flatten.join("\n") + "\n"
     end
 
     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)
@@ -109,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|
@@ -121,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.3.0'
+  VERSION = '3.4.4'
 end

data/lib/diffy.rb

@@ -1,11 +1,11 @@
 require 'tempfile'
 require 'erb'
 require 'rbconfig'
+require 'open3'
 
 module Diffy
   WINDOWS = (RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/)
 end
-require 'open3' unless Diffy::WINDOWS
 require File.join(File.dirname(__FILE__), 'diffy', 'format')
 require File.join(File.dirname(__FILE__), 'diffy', 'html_formatter')
 require File.join(File.dirname(__FILE__), 'diffy', 'diff')

data/spec/diffy_spec.rb

@@ -503,6 +503,13 @@ baz
         expect(@diff.to_s(:html)).to eq(html)
       end
 
+      it "should treat unix vs windows newlines as same if option :ignore_crlf" do
+        @diff = Diffy::Diff.new("one\ntwo\nthree\n", "one\r\ntwo\r\nthree\r\n",
+                               ignore_crlf: true)
+        empty_diff = "<div class=\"diff\"></div>"
+        expect(@diff.to_s(:html)).to eq(empty_diff)
+      end
+
       describe 'with lines that include \n' do
         before do
           string1 = 'a\nb'"\n"
@@ -523,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.3.0
+  version: 3.4.4
 platform: ruby
 authors:
 - Sam Goldstein
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-12-30 00:00:00.000000000 Z
+date: 2025-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -68,7 +68,7 @@ homepage: http://github.com/samg/diffy
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -83,9 +83,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.0.6
+signing_key:
 specification_version: 4
 summary: A convenient way to diff string in ruby
 test_files: