diff-lcs 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0df61a794bf8b132a80753391063526ffc15277d5f2dc592d319d37255d3700f
-  data.tar.gz: 9664b2f8338ff376bf7b4c9c1ae45e591e789b00b726a53523a2076f014aa5e0
+  metadata.gz: 3538bd306feb87c5a2d957b3956a9b8ede2a2782db387f9f253115053c2066a1
+  data.tar.gz: af8dd06512d39de79534212726c6ed9beba9560e110a1026666181a21dbb5dcb
 SHA512:
-  metadata.gz: 37e529e14e23a3c121f3d5cc3f88fbed90d9efe44376bb579699126c2c1d2ea34649a079902dca42cb72f891daa27e347c99b2e0a32b58245117dd2567af2db0
-  data.tar.gz: 30576530bd6e1634635989729caeeaed68b9268423b659443b95abc66549491376f179b558b07dc8cc9bcf14f2768433d771c037514ec720a21a43dc9c197a5f
+  metadata.gz: 3598cd0dc37b22112495d82949a3d846751ca2dc3717dffe313acf6740761df98ed6d9f158ebc1fc7be6739bb3ac774ee3d8a0c4ccb4f2f651aaa5c45b49e9d9
+  data.tar.gz: 77f4c9705752143e88953395b991d4105de3e744f524421ff9a3933aa18febf82854462835ede955b72c62884143f27b9278f968f4629f40bbce2192ca44aa5b

data/Contributing.md

@@ -94,6 +94,7 @@ Thanks to everyone else who has contributed code or bug reports to Diff::LCS:
 - Josep (@apuratepp)
 - Josh Bronson
 - Jun Aruga
+- Justin Steele
 - Kenichi Kamiya
 - Kensuke Nagae
 - Kevin Ansfield
@@ -105,6 +106,7 @@ Thanks to everyone else who has contributed code or bug reports to Diff::LCS:
 - Oleg Orlov
 - Paul Kunysch
 - Pete Higgins
+- Peter Goldstein
 - Peter Wagenet
 - Philippe Lafoucrière
 - Ryan Lovelett

data/History.md

@@ -1,10 +1,33 @@
 # History
 
+## 1.5.1 / 2024-01-31
+
+- Peter Goldstein updated CI configuration to add Ruby 3.1 and Masato Nakamura
+  added Ruby 3.2 and 3.3. [#82][], [#89][]
+
+- Updated the CI configuration, resolving [#82][] to add Ruby 3.1. Masato
+
+- Switched to [standard ruby][] formatting.
+
+- Justin Steele converted the licence file to Markdown. [#84][]
+
+- Updated the gem SPDX identifier for GPL 2.0 or later, resolving [#86][] by Vit
+  Ondruch.
+
+- Resolve a potential security issue with `ldiff` in its use of `IO.read`
+  instead of `File.read`. [#91][]
+
+- Added MFA authentication requirement for release to RubyGems. [#90][]
+
+- Added dependabot management for actions and gems. [#90][]
+
+- Updated CodeQL coniguration. [#90][]
+
 ## 1.5.0 / 2021-12-23
 
 - Updated the CI configuration and monkey-patch Hoe.
 
-- Kenichi Kamiya fixed a test configuration deprecation in SimpleCov. [#69]
+- Kenichi Kamiya fixed a test configuration deprecation in SimpleCov. [#69][]
 
 - Tien introduced several corrections and code improvements:
 
@@ -14,34 +37,34 @@
     That is, `LCS(s2, s1)` should produce a sequence that is transitive with
     `LCS(s1, s2)` on traversal, and applying the diff computed from those
     results would result in equivalent changes that could be played forward or
-    backward as appropriate. [#71], [#75]
+    backward as appropriate. [#71][], [#75][]
 
   - The above fix resulted in a changed order of the longest common subsequence
     when callbacks were applied. After analysis, it was determined that the
     computed subsequence was _equivalent_ to the prior version, so the test was
     updated. This also resulted in the clarification of documentation when
-    traversing the subsequences. [#79]
+    traversing the subsequences. [#79][]
 
   - An infinite loop case in the case where Diff::LCS would be included into an
-    enumerable class has been fixed. [#73]
+    enumerable class has been fixed. [#73][]
 
-  - Clarified the purpose of a threshold test in calculation of LCS. [#72],
-    [#80]
+  - Clarified the purpose of a threshold test in calculation of LCS. [#72][],
+    [#80][]
 
 - Removed autotest directory
 
 ## 1.4.4 / 2020-07-01
 
 - Fixed an issue reported by Jun Aruga in the Diff::LCS::Ldiff binary text
-  detection. [#44]
+  detection. [#44][]
 
 - Fixed a theoretical issue reported by Jun Aruga in Diff::LCS::Hunk to raise
-  a more useful exception. [#43]
+  a more useful exception. [#43][]
 
 - Added documentation that should address custom object issues as reported in
-  [#35].
+  [#35][].
 
-- Fixed more diff errors, in part reported in [#65].
+- Fixed more diff errors, in part reported in [#65][].
 
   - The use of `Numeric#abs` is incorrect in `Diff::LCS::Block#diff_size`. The
     diff size _must_ be accurate for correct change placement.
@@ -89,19 +112,19 @@
 
   - Made the use of `psych` dependent on `RUBY_VERSION >= 1.9`.
 
-  Resolves [#63].
+  Resolves [#63][].
 
 ## 1.4.2 / 2020-06-23
 
-- Camille Drapier fixed a small issue with RuboCop configuration. [#59]
+- Camille Drapier fixed a small issue with RuboCop configuration. [#59][]
 
 - Applied another fix (and unit test) to fix an issue for the Chef team.
-  [#60], [#61]
+  [#60][], [#61][]
 
 ## 1.4.1 / 2020-06-23
 
-- Fix an issue where diff sizes could be negative, and they should be. [#57],
-  [#58]
+- Fix an issue where diff sizes could be negative, and they should be. [#57][],
+  [#58][]
 
 ## 1.4 / 2020-06-23
 
@@ -109,12 +132,12 @@
   of the CI process any longer.
 
 - Akinora MUSHA (knu) added the ability for Diff::LCS::Change objects to be
-  implicitly treated arrays. Originally provided as pull request [#47], but it
-  introduced a number of test failures as documented in [#48], and remediation
-  of Diff::LCS itself was introduced in [#49].
+  implicitly treated arrays. Originally provided as pull request [#47][], but it
+  introduced a number of test failures as documented in [#48][], and remediation
+  of Diff::LCS itself was introduced in [#49][].
 
-- Resolved [#5] with some tests comparing output from `system` calls to
-  `bin/ldiff` with some pre-generated output. Resolved [#6] with these tests.
+- Resolved [#5][] with some tests comparing output from `system` calls to
+  `bin/ldiff` with some pre-generated output. Resolved [#6][] with these tests.
 
 - Resolved a previously undetected `bin/ldiff` issue with `--context` output not
   matching `diff --context` output.
@@ -122,30 +145,30 @@
 - Resolved an issue with later versions of Ruby not working with an `OptParse`
   specification of `Numeric`; this has been changed to `Integer`.
 
-- Brandon Fish added truffleruby in [#52].
+- Brandon Fish added truffleruby in [#52][].
 
-- Fixed two missing classes as reported in [#53].
+- Fixed two missing classes as reported in [#53][].
 
 ## 1.3 / 2017-01-18
 
 - Bugs fixed:
 
-  - Fixed an error for bin/ldiff --version. Fixes issue [#21].
+  - Fixed an error for bin/ldiff --version. Fixes issue [#21][].
 
   - Force Diff::LCS::Change and Diff::LCS::ContextChange to only perform
     equality comparisons against themselves. Provided by Kevin Mook in pull
-    request [#29].
+    request [#29][].
 
   - Fix tab expansion in htmldiff, provided by Mark Friedgan in pull request
-    [#25].
+    [#25][].
 
-  - Silence Ruby 2.4 Fixnum deprecation warnings. Fixes issue [#38] and pull
-    request [#36].
+  - Silence Ruby 2.4 Fixnum deprecation warnings. Fixes issue [#38][] and pull
+    request [#36][].
 
-  - Ensure that test dependencies are loaded properly. Fixes issue [#33] and
-    pull request [#34].
+  - Ensure that test dependencies are loaded properly. Fixes issue [#33][] and
+    pull request [#34][].
 
-  - Fix issue [#1] with incorrect intuition of patch direction. Tentative fix,
+  - Fix issue [#1][] with incorrect intuition of patch direction. Tentative fix,
     but the previous failure cases pass now.
 
 - Tooling changes:
@@ -167,16 +190,17 @@
 - Bugs fixed:
 
   - Comparing arrays flattened them too far, especially with Diff::LCS.sdiff.
-    Fixed by Josh Bronson in pull request [#23].
+    Fixed by Josh Bronson in pull request [#23][].
 
 ## 1.2.4 / 2013-04-20
 
 - Bugs fixed:
 
   - A bug was introduced after 1.1.3 when pruning common sequences at the start
-    of comparison. Paul Kunysch (@pck) fixed this in pull request [#18]. Thanks!
+    of comparison. Paul Kunysch (@pck) fixed this in pull request [#18][].
+    Thanks!
 
-  - The Rubinius (1.9 mode) bug in [rubinius/rubinius#2268] has been fixed by
+  - The Rubinius (1.9 mode) bug in [rubinius/rubinius#2268][] has been fixed by
     the Rubinius team two days after it was filed. Thanks for fixing this so
     quickly!
 
@@ -188,12 +212,12 @@
 
   - The new encoding detection for diff output generation (added in 1.2.2)
     introduced a bug if the left side of the comparison was the empty set.
-    Originally found in [rspec/rspec-expectations#238] and
-    [rspec/rspec-expectations#239]. Jon Rowe developed a reasonable heuristic
+    Originally found in [rspec/rspec-expectations#238][] and
+    [rspec/rspec-expectations#239][]. Jon Rowe developed a reasonable heuristic
     (left side, right side, empty string literal) to avoid this bug.
 
   - There is a known issue with Rubinius in 1.9 mode reported in
-    [rubinius/rubinius#2268] and demonstrated in the Travis CI builds. For all
+    [rubinius/rubinius#2268][] and demonstrated in the Travis CI builds. For all
     other tested platforms, diff-lcs is considered stable. As soon as a suitably
     small test-case can be created for the Rubinius team to examine, this will
     be added to the Rubinius issue around this.
@@ -205,8 +229,8 @@
   - Diff::LCS::Hunk could not properly generate a difference for comparison sets
     that are not US-ASCII-compatible because of the use of literal regular
     expressions and strings. Jon Rowe found this in
-    [rspec/rspec-expectations#219] and provided a first pass implementation in
-    pull request [#15]. I've reworked it because of test failures in Rubinius
+    [rspec/rspec-expectations#219][] and provided a first pass implementation in
+    pull request [#15][]. I've reworked it because of test failures in Rubinius
     when running in Ruby 1.9 mode. This coerces the added values to the encoding
     of the old dataset (as determined by the first piece of the old dataset).
 
@@ -216,9 +240,9 @@
 
 - Bugs Fixed:
 
-  - As seen in [rspec/rspec-expectations#200], the release of Diff::LCS 1.2
+  - As seen in [rspec/rspec-expectations#200][], the release of Diff::LCS 1.2
     introduced an unnecessary public API change to Diff::LCS::Hunk (see the
-    change at [rspec/rspec-expectations@3d6fc82c] for details). The new method
+    change at [rspec/rspec-expectations@3d6fc82c][] for details). The new method
     name (and behaviour) is more correct, but I should not have renamed the
     function or should have at least provided an alias. This release restores
     Diff::LCS::Hunk#unshift as an alias to #merge. Note that the old #unshift
@@ -235,25 +259,25 @@
 
 - Bugs Fixed:
 
-  - Fixed issue [#1] patch direction detection.
+  - Fixed issue [#1][] patch direction detection.
 
-  - Resolved issue [#2] by handling `string[string.size, 1]` properly (it
+  - Resolved issue [#2][] by handling `string[string.size, 1]` properly (it
     returns `""` not `nil`).
 
   - Michael Granger (ged) fixed an implementation error in Diff::LCS::Change and
-    added specs in pull request [#8]. Thanks!
+    added specs in pull request [#8][]. Thanks!
 
   - Made the code auto-testable.
 
   - Vít Ondruch (voxik) provided the latest version of the GPL2 license file in
-    pull request [#10]. Thanks!
+    pull request [#10][]. Thanks!
 
   - Fixed a documentation issue with the includable versions of #patch! and
     #unpatch! where they implied that they would replace the original value.
     Given that Diff::LCS.patch always returns a copy, the documentation was
     incorrect and has been corrected. To provide the behaviour that was
     originally documented, two new methods were added to provide this behaviour.
-    Found by scooter-dangle in issue [#12]. Thanks!
+    Found by scooter-dangle in issue [#12][]. Thanks!
 
 - Code Style Changes:
 
@@ -261,11 +285,11 @@
 
   - Calling class methods using `.` instead of `::`.
 
-  - Vít Ondruch (voxik) removed unnecessary shebangs in pull request [#9].
+  - Vít Ondruch (voxik) removed unnecessary shebangs in pull request [#9][].
     Thanks!
 
   - Kenichi Kamiya (kachick) removed some warnings of an unused variable in
-    lucky pull request [#13]. Thanks!
+    lucky pull request [#13][]. Thanks!
 
   - Embarked on a major refactoring to make the files a little more manageable
     and understand the code on a deeper level.
@@ -285,9 +309,9 @@
 - Bugs fixed:
 
   - Eliminated the explicit use of RubyGems in both bin/htmldiff and bin/ldiff.
-    Resolves issue [#4].
+    Resolves issue [#4][].
 
-  - Eliminated Ruby warnings. Resolves issue [#3].
+  - Eliminated Ruby warnings. Resolves issue [#3][].
 
 ## 1.1.2 / 2004-10-20
 
@@ -349,12 +373,6 @@
 
 - Initial release based mostly on Perl's Algorithm::Diff.
 
-[rubinius/rubinius#2268]: https://github.com/rubinius/rubinius/issues/2268
-[rspec/rspec-expectations#239]: https://github.com/rspec/rspec-expectations/issues/239
-[rspec/rspec-expectations#238]: https://github.com/rspec/rspec-expectations/issues/238
-[rspec/rspec-expectations#219]: https://github.com/rspec/rspec-expectations/issues/219
-[rspec/rspec-expectations@3d6fc82c]: https://github.com/rspec/rspec-expectations/commit/3d6fc82c
-[rspec/rspec-expectations#200]: https://github.com/rspec/rspec-expectations/pull/200
 [#1]: https://github.com/halostatue/diff-lcs/issues/1
 [#2]: https://github.com/halostatue/diff-lcs/issues/2
 [#3]: https://github.com/halostatue/diff-lcs/issues/3
@@ -398,3 +416,16 @@
 [#75]: https://github.com/halostatue/diff-lcs/issues/75
 [#79]: https://github.com/halostatue/diff-lcs/issues/79
 [#80]: https://github.com/halostatue/diff-lcs/issues/80
+[#82]: https://github.com/halostatue/diff-lcs/pull/82
+[#84]: https://github.com/halostatue/diff-lcs/pull/84
+[#86]: https://github.com/halostatue/diff-lcs/pull/86
+[#89]: https://github.com/halostatue/diff-lcs/pull/89
+[#90]: https://github.com/halostatue/diff-lcs/pull/90
+[#91]: https://github.com/halostatue/diff-lcs/issues/91
+[rspec/rspec-expectations#200]: https://github.com/rspec/rspec-expectations/pull/200
+[rspec/rspec-expectations#219]: https://github.com/rspec/rspec-expectations/issues/219
+[rspec/rspec-expectations#238]: https://github.com/rspec/rspec-expectations/issues/238
+[rspec/rspec-expectations#239]: https://github.com/rspec/rspec-expectations/issues/239
+[rspec/rspec-expectations@3d6fc82c]: https://github.com/rspec/rspec-expectations/commit/3d6fc82c
+[rubinius/rubinius#2268]: https://github.com/rubinius/rubinius/issues/2268
+[standard ruby]: https://github.com/standardrb/standard

data/License.md

@@ -1,4 +1,4 @@
-== License
+# License
 
 This software is available under three licenses: the GNU GPL version 2 (or at
 your option, a later version), the Perl Artistic license, or the MIT license.
@@ -12,7 +12,7 @@ licensing terms.
 * Adapted from Algorithm::Diff (Perl) by Ned Konz and a Smalltalk version by
   Mario I. Wolczko.
 
-=== MIT License
+## MIT License
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
@@ -32,8 +32,10 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
-=== Perl Artistic License (version 2)
+## Perl Artistic License
+
 See the file docs/artistic.txt in the main distribution.
 
-=== GNU GPL version 2
+## GNU GPL version 2
+
 See the file docs/COPYING.txt in the main distribution.

data/Rakefile

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require 'rubygems'
-require 'rspec'
-require 'rspec/core/rake_task'
-require 'hoe'
+require "rubygems"
+require "rspec"
+require "rspec/core/rake_task"
+require "hoe"
 
 # This is required until https://github.com/seattlerb/hoe/issues/112 is fixed
 class Hoe
@@ -45,66 +45,74 @@ Hoe.plugin :doofus
 Hoe.plugin :gemspec2
 Hoe.plugin :git
 
-if RUBY_VERSION < '1.9'
-  class Array #:nodoc:
+if RUBY_VERSION < "1.9"
+  class Array # :nodoc:
     def to_h
       Hash[*flatten(1)]
     end
   end
 
-  class Gem::Specification #:nodoc:
-    def metadata=(*); end
+  class Gem::Specification # :nodoc:
+    def metadata=(*)
+    end
 
-    def default_value(*); end
+    def default_value(*)
+    end
   end
 
-  class Object #:nodoc:
+  class Object # :nodoc:
     def caller_locations(*)
       []
     end
   end
 end
 
-_spec = Hoe.spec 'diff-lcs' do
-  developer('Austin Ziegler', 'halostatue@gmail.com')
+_spec = Hoe.spec "diff-lcs" do
+  developer("Austin Ziegler", "halostatue@gmail.com")
+
+  require_ruby_version ">= 1.8"
 
-  require_ruby_version '>= 1.8'
+  self.history_file = "History.md"
+  self.readme_file = "README.rdoc"
+  self.licenses = ["MIT", "Artistic-2.0", "GPL-2.0-or-later"]
 
-  self.history_file = 'History.md'
-  self.readme_file = 'README.rdoc'
-  self.licenses = ['MIT', 'Artistic-2.0', 'GPL-2.0+']
+  spec_extras[:metadata] = ->(val) { val["rubygems_mfa_required"] = "true" }
 
-  extra_dev_deps << ['hoe-doofus', '~> 1.0']
-  extra_dev_deps << ['hoe-gemspec2', '~> 1.1']
-  extra_dev_deps << ['hoe-git', '~> 1.6']
-  extra_dev_deps << ['hoe-rubygems', '~> 1.0']
-  extra_dev_deps << ['rspec', '>= 2.0', '< 4']
-  extra_dev_deps << ['rake', '>= 10.0', '< 14']
-  extra_dev_deps << ['rdoc', '>= 6.3.1', '< 7']
+  extra_dev_deps << ["hoe", ">= 3.0", "< 5"]
+  extra_dev_deps << ["hoe-doofus", "~> 1.0"]
+  extra_dev_deps << ["hoe-gemspec2", "~> 1.1"]
+  extra_dev_deps << ["hoe-git2", "~> 1.7"]
+  extra_dev_deps << ["hoe-rubygems", "~> 1.0"]
+  extra_dev_deps << ["rspec", ">= 2.0", "< 4"]
+  extra_dev_deps << ["rake", ">= 10.0", "< 14"]
+  extra_dev_deps << ["rdoc", ">= 6.3.1", "< 7"]
 end
 
 desc "Run all specifications"
 RSpec::Core::RakeTask.new(:spec) do |t|
-  rspec_dirs = %w(spec lib).join(":")
+  rspec_dirs = %w[spec lib].join(":")
   t.rspec_opts = ["-I#{rspec_dirs}"]
 end
 
 Rake::Task["spec"].actions.uniq! { |a| a.source_location }
 
+# standard:disable Style/HashSyntax
 task :default => :spec unless Rake::Task["default"].prereqs.include?("spec")
 task :test => :spec unless Rake::Task["test"].prereqs.include?("spec")
+# standard:enable Style/HashSyntax
 
-if RUBY_VERSION >= '2.0' && RUBY_ENGINE == 'ruby'
+if RUBY_VERSION >= "2.0" && RUBY_ENGINE == "ruby"
   namespace :spec do
     desc "Runs test coverage. Only works Ruby 2.0+ and assumes 'simplecov' is installed."
     task :coverage do
-      ENV['COVERAGE'] = 'yes'
-      Rake::Task['spec'].execute
+      ENV["COVERAGE"] = "yes"
+      Rake::Task["spec"].execute
     end
   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:
@@ -117,5 +125,6 @@ do the following:
 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"
 end

data/bin/htmldiff

@@ -1,11 +1,11 @@
 #! /usr/bin/env ruby -w
 # frozen_string_literal: true
 
-require 'diff/lcs'
-require 'diff/lcs/htmldiff'
+require "diff/lcs"
+require "diff/lcs/htmldiff"
 
 begin
-  require 'text/format'
+  require "text/format"
 rescue LoadError
   Diff::LCS::HTMLDiff.can_expand_tabs = false
 end
@@ -24,7 +24,7 @@ options = { :title => "diff #{ARGV[0]} #{ARGV[1]}" }
 htmldiff = Diff::LCS::HTMLDiff.new(left, right, options)
 
 if ARGV[2]
-  File.open(ARGV[2], 'w') do |f|
+  File.open(ARGV[2], "w") do |f|
     htmldiff.options[:output] = f
     htmldiff.run
   end

data/lib/diff/lcs/array.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'diff/lcs'
+require "diff/lcs"
 
 class Array
   include Diff::LCS

data/lib/diff/lcs/backports.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 unless 0.respond_to?(:positive?)
-  class Fixnum # rubocop:disable Lint/UnifiedInteger, Style/Documentation
+  class Fixnum # standard:disable Lint/UnifiedInteger
     def positive?
-      self > 0 # rubocop:disable Style/NumericPredicate
+      self > 0
     end
   end
 end

data/lib/diff/lcs/block.rb

@@ -25,13 +25,13 @@ class Diff::LCS::Block
   def op
     case [@remove.empty?, @insert.empty?]
     when [false, false]
-      '!'
+      "!"
     when [false, true]
-      '-'
+      "-"
     when [true, false]
-      '+'
+      "+"
     else # [true, true]
-      '^'
+      "^"
     end
   end
 end

data/lib/diff/lcs/callbacks.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'diff/lcs/change'
+require "diff/lcs/change"
 
-module Diff::LCS # rubocop:disable Style/Documentation
+module Diff::LCS
   # This callback object implements the default set of callback events,
   # which only returns the event itself. Note that #finished_a and
   # #finished_b are not implemented -- I haven't yet figured out where they
@@ -50,7 +50,9 @@ module Diff::LCS # rubocop:disable Style/Documentation
   BalancedCallbacks = DefaultCallbacks
 
   def self.callbacks_for(callbacks)
-    callbacks.new rescue callbacks
+    callbacks.new
+  rescue
+    callbacks
   end
 end
 
@@ -107,7 +109,7 @@ class Diff::LCS::DiffCallbacks
   # Returns the difference set collected during the diff process.
   attr_reader :diffs
 
-  def initialize # :yields self:
+  def initialize # :yields: self
     @hunk = []
     @diffs = []
 
@@ -131,11 +133,11 @@ class Diff::LCS::DiffCallbacks
   end
 
   def discard_a(event)
-    @hunk << Diff::LCS::Change.new('-', event.old_position, event.old_element)
+    @hunk << Diff::LCS::Change.new("-", event.old_position, event.old_element)
   end
 
   def discard_b(event)
-    @hunk << Diff::LCS::Change.new('+', event.new_position, event.new_element)
+    @hunk << Diff::LCS::Change.new("+", event.new_position, event.new_element)
   end
 
   def finish_hunk
@@ -302,7 +304,7 @@ class Diff::LCS::SDiffCallbacks
   # Returns the difference set collected during the diff process.
   attr_reader :diffs
 
-  def initialize #:yields self:
+  def initialize # :yields: self
     @diffs = []
     yield self if block_given?
   end