docdiff 0.6.7 → 0.7.0

data/test/fixture/humpty_dumpty_01_en.txt

@@ -0,0 +1,4 @@
+Humpty Dumpty sat on a wall,
+Poor Humpty Dumpty had a fall.
+All the queen's horses and all the queen's men
+Couldn't put Humpty together again.

data/test/fixture/humpty_dumpty_01_ja.txt

@@ -0,0 +1,4 @@
+ハンプティ・ダンプティ、塀の上に座った
+あわれなハンプティ・ダンプティ、落っこちた
+女王様の馬をみな集めても、女王様の家来みなでかかっても
+ハンプティを元に戻せなかった

data/test/fixture/{humpty_dumpty01_ascii_lf.txt → humpty_dumpty_02_en.txt}

@@ -1,4 +1,4 @@
-Humpty Dumpty sat on a wall.
+Humpty Dumpty sat on a wall,
 Humpty Dumpty had a great fall.
 All the king's horses and all the king's men
-Couldn't put Humpty together again!
+Couldn't put Humpty together again.

data/test/fixture/humpty_dumpty_02_ja.txt

@@ -0,0 +1,4 @@
+ハンプティ・ダンプティ、塀の上に座った
+ハンプティ・ダンプティ、まっさかさまに落っこちた
+王様の馬をみな集めても、王様の家来みなでかかっても
+ハンプティを元に戻せなかった

data/test/view_test.rb

@@ -13,6 +13,13 @@ class TestView < Test::Unit::TestCase
   def setup
   end
 
+  def test_format_line_number
+    view = Difference.new([], []).to_view("US-ASCII", nil)
+    assert_equal("L1", view.format_line_number(1, nil))
+    assert_equal("(L1)", view.format_line_number(1, nil, paren: true))
+    assert_equal("LL1-2", view.format_line_number(1, 2))
+  end
+
   def test_scan_lines_cr
     str = "A\r\rA\n\nA\r\n\r\nA\n\r\n\rA"
     expected = ["A\r", "\r", "A\n\nA\r", "\n\r", "\nA\n\r", "\n\r", "A"]
@@ -239,9 +246,9 @@ class TestView < Test::Unit::TestCase
     array2 = ["c", "d", "X", "\n", "Y", "e", "\n", "F", "\n"]
     expected = [
       "----\n",
-      "1-2,(1)\n\033[7;4;31ma\nb\033[0mcd\n----\n",
-      "(2),1-2\ncd\033[7;1;34mX\nY\033[0me\n\n----\n",
-      "3,3\ne\n\033[7;4;33mf\033[0m\033[7;1;32mF\033[0m\n\n----\n",
+      "LL1-2, (L1)\n\033[7;4;31ma\nb\033[0mcd\n----\n",
+      "(L2), LL1-2\ncd\033[7;1;34mX\nY\033[0me\n\n----\n",
+      "L3, L3\ne\n\033[7;4;33mf\033[0m\033[7;1;32mF\033[0m\n\n----\n",
     ]
     view = View.new(Difference.new(array1, array2), "US-ASCII", "LF")
     assert_equal(expected, view.to_tty_digest(nil, false))
@@ -252,9 +259,9 @@ class TestView < Test::Unit::TestCase
     array2 = ["c", "d", "X", "\n", "Y", "e", "\n", "F", "\n"]
     expected = [
       "----\n",
-      "1-2,(1)\na\nbcd\n\033[7;4;31ma\nb\033[0mcd\n----\n",
-      "(2),1-2\ncde\n\ncd\033[7;1;34mX\nY\033[0me\n\n----\n",
-      "3,3\ne\n\033[7;4;33mf\033[0m\n\ne\n\033[7;1;32mF\033[0m\n\n----\n",
+      "LL1-2, (L1)\na\nbcd\n\033[7;4;31ma\nb\033[0mcd\n----\n",
+      "(L2), LL1-2\ncde\n\ncd\033[7;1;34mX\nY\033[0me\n\n----\n",
+      "L3, L3\ne\n\033[7;4;33mf\033[0m\n\ne\n\033[7;1;32mF\033[0m\n\n----\n",
     ]
     view = View.new(Difference.new(array1, array2), "US-ASCII", "LF")
     assert_equal(expected, view.to_tty_digest({ display: "block" }, false))
@@ -297,9 +304,9 @@ class TestView < Test::Unit::TestCase
     array2 = ["c", "d", "X", "\n", "Y", "e", "\n", "F", "\n"]
     expected = [
       "<ul>",
-      "<li class=\"entry\"><p class=\"position\">1-2,(1)</p><blockquote class=\"body\"><p class=\"body\"><span class=\"del\"><del>a<br />\nb</del></span>cd</p></blockquote></li>\n",
-      "<li class=\"entry\"><p class=\"position\">(2),1-2</p><blockquote class=\"body\"><p class=\"body\">cd<span class=\"add\"><ins>X<br />\nY</ins></span>e<br />\n</p></blockquote></li>\n",
-      "<li class=\"entry\"><p class=\"position\">3,3</p><blockquote class=\"body\"><p class=\"body\">e<br />\n<span class=\"before-change\"><del>f</del></span><span class=\"after-change\"><ins>F</ins></span><br />\n</p></blockquote></li>\n",
+      "<li class=\"entry\"><p class=\"position\">LL1-2, (L1)</p><blockquote class=\"body\"><p class=\"body\"><span class=\"del\"><del>a<br />\nb</del></span>cd</p></blockquote></li>\n",
+      "<li class=\"entry\"><p class=\"position\">(L2), LL1-2</p><blockquote class=\"body\"><p class=\"body\">cd<span class=\"add\"><ins>X<br />\nY</ins></span>e<br />\n</p></blockquote></li>\n",
+      "<li class=\"entry\"><p class=\"position\">L3, L3</p><blockquote class=\"body\"><p class=\"body\">e<br />\n<span class=\"before-change\"><del>f</del></span><span class=\"after-change\"><ins>F</ins></span><br />\n</p></blockquote></li>\n",
       "</ul>",
     ]
     view = Difference.new(array1, array2).to_view("US-ASCII", "LF")
@@ -311,9 +318,9 @@ class TestView < Test::Unit::TestCase
     array2 = ["c", "d", "X", "\n", "Y", "e", "\n", "F", "\n"]
     expected = [
       "<ul>",
-      "<li class=\"entry\"><p class=\"position\">1-2,(1)</p><blockquote class=\"body\"><p class=\"body\">a<br />\nbcd</p><p class=\"body\"><span class=\"del\"><del>a<br />\nb</del></span>cd</p></blockquote></li>\n",
-      "<li class=\"entry\"><p class=\"position\">(2),1-2</p><blockquote class=\"body\"><p class=\"body\">cde<br />\n</p><p class=\"body\">cd<span class=\"add\"><ins>X<br />\nY</ins></span>e<br />\n</p></blockquote></li>\n",
-      "<li class=\"entry\"><p class=\"position\">3,3</p><blockquote class=\"body\"><p class=\"body\">e<br />\n<span class=\"before-change\"><del>f</del></span><br />\n</p><p class=\"body\">e<br />\n<span class=\"after-change\"><ins>F</ins></span><br />\n</p></blockquote></li>\n",
+      "<li class=\"entry\"><p class=\"position\">LL1-2, (L1)</p><blockquote class=\"body\"><p class=\"body\">a<br />\nbcd</p><p class=\"body\"><span class=\"del\"><del>a<br />\nb</del></span>cd</p></blockquote></li>\n",
+      "<li class=\"entry\"><p class=\"position\">(L2), LL1-2</p><blockquote class=\"body\"><p class=\"body\">cde<br />\n</p><p class=\"body\">cd<span class=\"add\"><ins>X<br />\nY</ins></span>e<br />\n</p></blockquote></li>\n",
+      "<li class=\"entry\"><p class=\"position\">L3, L3</p><blockquote class=\"body\"><p class=\"body\">e<br />\n<span class=\"before-change\"><del>f</del></span><br />\n</p><p class=\"body\">e<br />\n<span class=\"after-change\"><ins>F</ins></span><br />\n</p></blockquote></li>\n",
       "</ul>",
     ]
     view = View.new(Difference.new(array1, array2), "US-ASCII", "LF")
@@ -491,9 +498,9 @@ class TestView < Test::Unit::TestCase
     array2 = ["c", "d", "X", "\n", "Y", "e", "\n", "F", "\n"]
     expected = [
       "----\n",
-      "1-2,(1)\n[a\nb/]cd\n----\n",
-      "(2),1-2\ncd[/X\nY]e\n\n----\n",
-      "3,3\ne\n[f/F]\n\n----\n",
+      "LL1-2, (L1)\n[a\nb/]cd\n----\n",
+      "(L2), LL1-2\ncd[/X\nY]e\n\n----\n",
+      "L3, L3\ne\n[f/F]\n\n----\n",
     ]
     view = Difference.new(array1, array2).to_view("US-ASCII", "LF")
     assert_equal(expected, view.to_manued_digest(nil, false))
@@ -504,9 +511,9 @@ class TestView < Test::Unit::TestCase
     array2 = ["c", "d", "X", "\n", "Y", "e", "\n", "F", "\n"]
     expected = [
       "----\n",
-      "1-2,(1)\na\nbcd\n[a\nb/]cd\n----\n",
-      "(2),1-2\ncde\n\ncd[/X\nY]e\n\n----\n",
-      "3,3\ne\n[f/]\n\ne\n[/F]\n\n----\n",
+      "LL1-2, (L1)\na\nbcd\n[a\nb/]cd\n----\n",
+      "(L2), LL1-2\ncde\n\ncd[/X\nY]e\n\n----\n",
+      "L3, L3\ne\n[f/]\n\ne\n[/F]\n\n----\n",
     ]
     view = Difference.new(array1, array2).to_view("US-ASCII", "LF")
     assert_equal(expected, view.to_manued_digest({ display: "block" }, false))
@@ -587,9 +594,9 @@ class TestView < Test::Unit::TestCase
     array2 = ["c", "d", "X", "\n", "Y", "e", "\n", "F", "\n"]
     expected = [
       "----\n",
-      "1-2,(1)\n[-a\nb-]cd\n----\n",
-      "(2),1-2\ncd{+X\nY+}e\n\n----\n",
-      "3,3\ne\n[-f-]{+F+}\n\n----\n",
+      "LL1-2, (L1)\n[-a\nb-]cd\n----\n",
+      "(L2), LL1-2\ncd{+X\nY+}e\n\n----\n",
+      "L3, L3\ne\n[-f-]{+F+}\n\n----\n",
     ]
     view = Difference.new(array1, array2).to_view("US-ASCII", "LF")
     assert_equal(expected, view.to_wdiff_digest(nil, false))
@@ -600,9 +607,9 @@ class TestView < Test::Unit::TestCase
     array2 = ["c", "d", "X", "\n", "Y", "e", "\n", "F", "\n"]
     expected = [
       "----\n",
-      "1-2,(1)\na\nbcd\n[-a\nb-]cd\n----\n",
-      "(2),1-2\ncde\n\ncd{+X\nY+}e\n\n----\n",
-      "3,3\ne\n[-f-]\n\ne\n{+F+}\n\n----\n",
+      "LL1-2, (L1)\na\nbcd\n[-a\nb-]cd\n----\n",
+      "(L2), LL1-2\ncde\n\ncd{+X\nY+}e\n\n----\n",
+      "L3, L3\ne\n[-f-]\n\ne\n{+F+}\n\n----\n",
     ]
     view = Difference.new(array1, array2).to_view("US-ASCII", "LF")
     assert_equal(expected, view.to_wdiff_digest({ display: "block" }, false))
@@ -673,9 +680,9 @@ class TestView < Test::Unit::TestCase
       end_after_change:    "</!+>",
     }
     expected = [
-      "1-2,(1) <->a\nb</->cd\n",
-      "(2),1-2 cd<+>X\nY</+>e\n\n",
-      "3,3 e\n<!->f</!-><!+>F</!+>\n\n",
+      "LL1-2, (L1) <->a\nb</->cd\n",
+      "(L2), LL1-2 cd<+>X\nY</+>e\n\n",
+      "L3, L3 e\n<!->f</!-><!+>F</!+>\n\n",
     ]
     view = Difference.new(array1, array2).to_view("US-ASCII", "LF")
     assert_equal(expected, view.to_user_digest(user_tags, false))
@@ -698,9 +705,9 @@ class TestView < Test::Unit::TestCase
       display:             "block",
     }
     expected = [
-      "1-2,(1) a\nbcd<->a\nb</->cd\n",
-      "(2),1-2 cde\ncd<+>X\nY</+>e\n\n",
-      "3,3 e\n<!->f</!->\ne\n<!+>F</!+>\n\n",
+      "LL1-2, (L1) a\nbcd<->a\nb</->cd\n",
+      "(L2), LL1-2 cde\ncd<+>X\nY</+>e\n\n",
+      "L3, L3 e\n<!->f</!->\ne\n<!+>F</!+>\n\n",
     ]
     view = Difference.new(array1, array2).to_view("US-ASCII", "LF")
     assert_equal(expected, view.to_user_digest(user_tags, false))
@@ -721,7 +728,7 @@ class TestView < Test::Unit::TestCase
     assert_equal(expected, view.difference_whole)
   end
 
-  # def test_difference_digest()
+  # def test_difference_digest
   #   array1 = ["a", "\n", "b", "c", "d", "e", "\n", "f", "\n"] # a \n  b  c  d           e \n  f \n
   #   array2 = ["c", "d", "X", "\n", "Y", "e", "\n", "F", "\n"] #          c  d  X \n  Y  e \n  F \n
   #   expected = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: docdiff
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.7.0
 platform: ruby
 authors:
 - Hisashi Morita
 bindir: bin
 cert_chain: []
-date: 2026-02-25 00:00:00.000000000 Z
+date: 2026-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -27,7 +27,7 @@ description: |-
   DocDiff compares two text files and shows the
   difference. It can compare files word by word,
   character by character, or line by line. It has
-  several output formats such as HTML, tty, Manued,
+  several output formats such as tty, HTML, Manued,
   or user-defined markup.
 email:
 - hisashim@icloud.com
@@ -53,15 +53,25 @@ files:
 - doc/example/docdiff.conf.example
 - doc/example/docdiffwebui.cgi
 - doc/example/docdiffwebui.html
-- doc/img/screenshot-format-html-digest-firefox.png
-- doc/img/screenshot-format-html-firefox.png
-- doc/img/screenshot-format-tty-cmdexe-en.png
-- doc/img/screenshot-format-tty-cmdexe-ja.png
-- doc/img/screenshot-format-tty-rxvtunicode-en.png
-- doc/img/screenshot-format-tty-rxvtunicode-ja.png
-- doc/img/screenshot-format-tty-xterm-en.png
-- doc/img/screenshot-format-tty-xterm-ja.png
-- doc/img/screenshot-resolution-linewordchar-xterm.png
+- doc/img/old/screenshot-format-html-digest-firefox.png
+- doc/img/old/screenshot-format-html-firefox.png
+- doc/img/old/screenshot-format-tty-cmdexe-en.png
+- doc/img/old/screenshot-format-tty-cmdexe-ja.png
+- doc/img/old/screenshot-format-tty-rxvtunicode-en.png
+- doc/img/old/screenshot-format-tty-rxvtunicode-ja.png
+- doc/img/old/screenshot-format-tty-xterm-en.png
+- doc/img/old/screenshot-format-tty-xterm-ja.png
+- doc/img/old/screenshot-resolution-linewordchar-xterm.png
+- doc/img/screenshot-html.png
+- doc/img/screenshot-tty-char.png
+- doc/img/screenshot-tty-digest-block.png
+- doc/img/screenshot-tty-digest-license-block.png
+- doc/img/screenshot-tty-digest-license.png
+- doc/img/screenshot-tty-digest.png
+- doc/img/screenshot-tty-en-ja.png
+- doc/img/screenshot-tty-manued.png
+- doc/img/screenshot-tty-wdiff.png
+- doc/img/screenshot-tty-word-char.png
 - doc/man/docdiff.adoc
 - doc/news.md
 - doc/shell_completion/_docdiff.zsh
@@ -110,8 +120,10 @@ files:
 - test/fixture/02_ja_utf8_crlf.txt
 - test/fixture/02_ja_utf8_lf.txt
 - test/fixture/format_wdiff.conf
-- test/fixture/humpty_dumpty01_ascii_lf.txt
-- test/fixture/humpty_dumpty02_ascii_lf.txt
+- test/fixture/humpty_dumpty_01_en.txt
+- test/fixture/humpty_dumpty_01_ja.txt
+- test/fixture/humpty_dumpty_02_en.txt
+- test/fixture/humpty_dumpty_02_ja.txt
 - test/fixture/simple.conf
 - test/test_helper.rb
 - test/view_test.rb

data/test/fixture/humpty_dumpty02_ascii_lf.txt

@@ -1,4 +0,0 @@
-Humpty Dumpty was sitting on a Humpty Dumpty wall.
-Humpty had a great fall by mistake.
-All the king's men and all the king's horses
-Couldn't put Humpty Dumpty together!