diff-lcs 1.6.2 → 2.0.0

data/integration/rspec_differ_spec.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+# Integration test to verify diff-lcs 2.0 works with RSpec's differ
+# This runs RSpec with diff-lcs 1.x installed but loads the repo version
+
+RSpec.describe "Diff::LCS 2.0 with RSpec::Support::Differ" do
+  let(:differ) { RSpec::Support::Differ.new }
+
+  it "produces diff output for multiline strings" do
+    expected = "foo\nzap\nbar\n"
+    actual = "foo\nbar\nzap\n"
+
+    diff = differ.diff(actual, expected)
+
+    expect(diff).to be_a(String)
+    expect(diff).not_to be_empty
+  end
+
+  it "handles identical strings" do
+    str = "same\n"
+    diff = differ.diff(str, str)
+
+    # May return empty or just newline depending on implementation
+    expect(diff.strip).to be_empty
+  end
+end

data/integration/rspec_expectations_spec.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+# Integration test for RSpec expectation failures that use diff-lcs
+# Verifies that diff output is generated correctly with diff-lcs 2.0
+
+RSpec.describe "Diff::LCS 2.0 with RSpec expectations" do
+  it "produces diff for failed multiline string equality" do
+    expect {
+      expect("foo\nbar\nbaz").to eq("foo\nqux\nbaz")
+    }.to raise_error(RSpec::Expectations::ExpectationNotMetError) do |error|
+      expect(error.message).to include("Diff:")
+      expect(error.message).to match(/[-+](qux|bar)/)
+    end
+  end
+
+  it "produces diff for failed hash equality" do
+    expect {
+      expect({a: 1, b: 2}).to eq({a: 1, b: 3})
+    }.to raise_error(RSpec::Expectations::ExpectationNotMetError) do |error|
+      expect(error.message).to include("Diff:")
+    end
+  end
+
+  it "does not crash when comparing complex objects" do
+    obj1 = {a: [1, 2, 3], b: "test"}
+    obj2 = {a: [1, 4, 3], b: "test"}
+
+    expect {
+      expect(obj1).to eq(obj2)
+    }.to raise_error(RSpec::Expectations::ExpectationNotMetError)
+  end
+end

data/integration/runner

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+
+require "rbconfig"
+require "rubygems"
+
+if ENV["CI"]
+  vendor_dir = Dir.glob(File.join(Dir.pwd, "vendor", "bundle", "{ruby,jruby,truffleruby}", "*")).max
+  unless vendor_dir && Dir.exist?(vendor_dir)
+    fail "vendor bundle not found; expected vendor/bundle/ruby/*"
+  end
+
+  # Prefer vendored gems, fall back to system gem dir
+  ENV["GEM_HOME"] = vendor_dir
+  ENV["GEM_PATH"] = "#{vendor_dir}:#{Gem.default_dir}"
+
+  # Ensure Gem.path is updated for the running process (affects Gem.lookup)
+  Gem.use_paths(ENV["GEM_HOME"], ENV["GEM_PATH"].split(":"))
+end
+
+exec RbConfig.ruby, "-S", *ARGV

data/lib/diff/lcs/block.rb

@@ -1,37 +1,42 @@
 # frozen_string_literal: true
 
-# A block is an operation removing, adding, or changing a group of items.
-# Basically, this is just a list of changes, where each change adds or
-# deletes a single item. Used by bin/ldiff.
-class Diff::LCS::Block
-  attr_reader :changes, :insert, :remove
+Diff::LCS::Block = Data.define(:changes, :insert, :remove) # :nodoc:
 
-  def initialize(chunk)
-    @changes = []
-    @insert = []
-    @remove = []
+# A block is an operation removing, adding, or changing a group of items, a list of
+# changes, where each change adds or deletes a single item.
+#
+# Used by bin/ldiff.
+class Diff::LCS::Block
+  def self.from_chunk(chunk)
+    changes, insert, remove = [], [], []
 
-    chunk.each do |item|
-      @changes << item
-      @remove << item if item.deleting?
-      @insert << item if item.adding?
+    chunk.each do
+      changes << _1
+      remove << _1 if _1.deleting?
+      insert << _1 if _1.adding?
     end
+
+    new(changes: changes.freeze, remove: remove.freeze, insert: insert.freeze)
   end
 
-  def diff_size
-    @insert.size - @remove.size
+  class << self
+    private :new, :[]
   end
 
+  private :with
+
+  def diff_size = insert.size - remove.size
+
   def op
-    case [@remove.empty?, @insert.empty?]
-    when [false, false]
-      "!"
-    when [false, true]
-      "-"
-    when [true, false]
-      "+"
-    else # [true, true]
-      "^"
+    case [remove, insert]
+    # Unchanged
+    in [[], []] then "^"
+    # Delete
+    in [_, []] then "-"
+    # Insert
+    in [[], _] then "+"
+    # Conflict
+    in [_, _] then "!"
     end
   end
 end