diff-lcs 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb036eaab7330d135a91816336705b672bcc3d3fc55b235392f0b0d2faaf2e76
-  data.tar.gz: d55364ad8b6a75e697ad90aaffac2d14168c8ef5710b4999d264775de0a220af
+  metadata.gz: 34fc249139fb5ed40b525cf33d8e4e3d3702384f74d1e67e63d8eed54a09133c
+  data.tar.gz: 46739e6b242db46dd6d01c4bb26d7c51fc07ccaebd7ecd58c305d758f30dfc33
 SHA512:
-  metadata.gz: ca32f0e74df9eaab1530842477fca4cbcd730fde728dfeefd8d6e6f212e8ed0086e7cd288a1fb8e2a79ebed18591cda677ddce75ed2bd0863620993ba34aa553
-  data.tar.gz: 2ce80458cd347340b44d8d5cf56c7e11ee145f93559641233ce928bb7ac54e9966a07904e52e1f46f975714b13f28d70832d762185e3d7e867d8caff5fc14ad3
+  metadata.gz: c482d6b11cb38b840ee4a4c11785c592a7a537e5f855cca99739a578e8d833b05ad43cba4ac8e40e4ae1fa876633d9d96c18c29acef63bf72532c352d98b05e6
+  data.tar.gz: 7c6da2681b6a2ddf4ebda85deb24aeaeea29218cfa452d40717e1963c117c95230da2c01c18b806cb0916a804263aa7ac0230c4adcbb8fb1b30a95faee5a4dda

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 1.6.2 / 2025-05-12
+
+- Handle upcoming changes to the `cgi` gem in Ruby 3.5 ([#147][pull-147])
+
+- Fix issues found with `htmldiff` in Ruby 1.8 (which is used approximately
+  never, since the code change which broke Ruby 1.8 was made 6 years ago).
+  [#148][pull-148]
+
+- Fixed some standardrb formatting and configuration issues.
+
 ## 1.6.1 / 2025-03-25
 
 - Performed further work on `Diff::LCS::Ldiff` improvements ([#46][issue-46])
@@ -495,6 +505,8 @@
 [pull-104]: https://github.com/halostatue/diff-lcs/pull/104
 [pull-105]: https://github.com/halostatue/diff-lcs/pull/105
 [pull-129]: https://github.com/halostatue/diff-lcs/pull/129
+[pull-147]: https://github.com/halostatue/diff-lcs/pull/147
+[pull-148]: https://github.com/halostatue/diff-lcs/pull/148
 [rspec-expectations#200]: https://github.com/rspec/rspec-expectations/pull/200
 [rspec-expectations#219]: https://github.com/rspec/rspec-expectations/issues/219
 [rspec-expectations#238]: https://github.com/rspec/rspec-expectations/issues/238

data/CONTRIBUTORS.md

@@ -14,6 +14,7 @@ Thanks to everyone else who has contributed to diff-lcs over the years:
 - Baptiste Courtois (@annih)
 - Camille Drapier
 - Cédric Boutillier
+- @earlopain
 - Gregg Kellogg
 - Jagdeep Singh
 - Jason Gladish

data/README.md

@@ -16,7 +16,7 @@ Diff::LCS computes the difference between two Enumerable sequences using the
 McIlroy-Hunt longest common subsequence (LCS) algorithm. It includes utilities
 to create a simple HTML diff output format and a standard diff-like tool.
 
-This is release 1.4.3, providing a simple extension that allows for
+This is release 1.6.1, providing a simple extension that allows for
 Diff::LCS::Change objects to be treated implicitly as arrays and fixes a number
 of formatting issues.
 

data/Rakefile

@@ -4,13 +4,17 @@ require "rspec/core/rake_task"
 require "hoe"
 require "rake/clean"
 
+MAINTENANCE = ENV["MAINTENANCE"] == "true"
+BUILD_DOCS = MAINTENANCE || ENV["DOCS"] == "true"
+TRUSTED_RELEASE = ENV["rubygems_release_gem"] == "true"
+
 Hoe.plugin :halostatue
 Hoe.plugin :rubygems
 
 Hoe.plugins.delete :debug
 Hoe.plugins.delete :newb
-Hoe.plugins.delete :publish
 Hoe.plugins.delete :signing
+Hoe.plugins.delete :publish unless BUILD_DOCS
 
 if RUBY_VERSION < "1.9"
   class Array # :nodoc:
@@ -37,7 +41,7 @@ end
 _spec = Hoe.spec "diff-lcs" do
   developer("Austin Ziegler", "halostatue@gmail.com")
 
-  self.trusted_release = ENV["rubygems_release_gem"] == "true"
+  self.trusted_release = TRUSTED_RELEASE
 
   require_ruby_version ">= 1.8"
 
@@ -57,12 +61,25 @@ _spec = Hoe.spec "diff-lcs" do
   extra_dev_deps << ["rdoc", ">= 6.3.1", "< 7"]
 end
 
+if BUILD_DOCS
+  rake_tasks = Rake.application.instance_variable_get(:@tasks)
+  tasks = ["publish_docs", "publish_on_announce", "debug_email", "post_blog", "announce"]
+  tasks.each do |task|
+    rake_tasks.delete(task)
+  end
+end
+
 desc "Run all specifications"
 RSpec::Core::RakeTask.new(:spec) do |t|
   rspec_dirs = %w[spec lib].join(":")
   t.rspec_opts = ["-I#{rspec_dirs}"]
 end
 
+task :version do
+  require "diff/lcs/version"
+  puts Diff::LCS::VERSION
+end
+
 Rake::Task["spec"].actions.uniq! { |a| a.source_location }
 
 # standard:disable Style/HashSyntax
@@ -80,20 +97,19 @@ if RUBY_VERSION >= "3.0" && RUBY_ENGINE == "ruby"
   end
 end
 
-task :ruby18 do
-  # standard:disable Layout/HeredocIndentation
-  puts <<-MESSAGE
-You are starting a barebones Ruby 1.8 docker environment. You will need to
-do the following:
+if MAINTENANCE
+  task ruby18: :package do
+    require "diff/lcs/version"
+    # standard:disable Layout/HeredocIndentation
+    puts <<-MESSAGE
+You are starting a barebones Ruby 1.8 docker environment for testing.
+A snapshot package has been built, so install it with:
 
-- mv Gemfile.lock{,.v2}
-- gem install bundler --version 1.17.2 --no-ri --no-rdoc
-- ruby -S bundle
-- rake
+    cd diff-lcs
+    gem install pkg/diff-lcs-#{Diff::LCS::VERSION}
 
-Don't forget to restore your Gemfile.lock after testing.
-
-  MESSAGE
-  # standard:enable Layout/HeredocIndentation
-  sh "docker run -it --rm -v #{Dir.pwd}:/root/diff-lcs bellbind/docker-ruby18-rails2 bash -l"
+    MESSAGE
+    # standard:enable Layout/HeredocIndentation
+    sh "docker run -it --rm -v #{Dir.pwd}:/root/diff-lcs bellbind/docker-ruby18-rails2 bash -l"
+  end
 end

data/lib/diff/lcs/backports.rb

@@ -5,5 +5,9 @@ unless 0.respond_to?(:positive?)
     def positive?
       self > 0
     end
+
+    def negative?
+      self < 0
+    end
   end
 end

data/lib/diff/lcs/change.rb

@@ -45,9 +45,9 @@ class Diff::LCS::Change
     arr = arr.flatten(1)
     case arr.size
     when 5
-      Diff::LCS::ContextChange.new(*(arr[0...5]))
+      Diff::LCS::ContextChange.new(*arr[0...5])
     when 3
-      Diff::LCS::Change.new(*(arr[0...3]))
+      Diff::LCS::Change.new(*arr[0...3])
     else
       fail "Invalid change array format provided."
     end

data/lib/diff/lcs/htmldiff.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "cgi"
+require "erb"
 
 # Produce a simple HTML diff view.
 class Diff::LCS::HTMLDiff
@@ -126,8 +126,8 @@ h1 { margin-left: 2em; }
       @right.map! { |line| formatter.expand(line.chomp) }
     end
 
-    @left.map! { |line| CGI.escapeHTML(line.chomp) }
-    @right.map! { |line| CGI.escapeHTML(line.chomp) }
+    @left.map! { |line| ERB::Util.html_escape(line.chomp) }
+    @right.map! { |line| ERB::Util.html_escape(line.chomp) }
 
     # standard:disable Layout/HeredocIndentation
     @options[:output] << <<-OUTPUT

data/lib/diff/lcs/version.rb

@@ -2,6 +2,6 @@
 
 module Diff
   module LCS
-    VERSION = "1.6.1"
+    VERSION = "1.6.2"
   end
 end

data/lib/diff/lcs.rb

@@ -333,7 +333,7 @@ class << Diff::LCS
         if callbacks.respond_to?(:finished_a) && !run_finished_a
           ax = string ? seq1[-1, 1] : seq1[-1]
           bx = string ? seq2[bj, 1] : seq2[bj]
-          event = Diff::LCS::ContextChange.new(">", (a_size - 1), ax, bj, bx)
+          event = Diff::LCS::ContextChange.new(">", a_size - 1, ax, bj, bx)
           event = yield event if block_given?
           callbacks.finished_a(event)
           run_finished_a = true
@@ -355,7 +355,7 @@ class << Diff::LCS
         if callbacks.respond_to?(:finished_b) && !run_finished_b
           ax = string ? seq1[ai, 1] : seq1[ai]
           bx = string ? seq2[-1, 1] : seq2[-1]
-          event = Diff::LCS::ContextChange.new("<", ai, ax, (b_size - 1), bx)
+          event = Diff::LCS::ContextChange.new("<", ai, ax, b_size - 1, bx)
           event = yield event if block_given?
           callbacks.finished_b(event)
           run_finished_b = true

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: diff-lcs
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Austin Ziegler
 bindir: bin
 cert_chain: []
-date: 2025-03-25 00:00:00.000000000 Z
+date: 2025-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe
@@ -116,7 +116,7 @@ description: |-
   McIlroy-Hunt longest common subsequence (LCS) algorithm. It includes utilities
   to create a simple HTML diff output format and a standard diff-like tool.
 
-  This is release 1.4.3, providing a simple extension that allows for
+  This is release 1.6.1, providing a simple extension that allows for
   Diff::LCS::Change objects to be treated implicitly as arrays and fixes a number
   of formatting issues.