review 3.2.0 → 4.0.0

data/test/test_logger.rb

@@ -14,7 +14,20 @@ class LoggerTest < Test::Unit::TestCase
       msg = r.readline
       STDERR.reopen(old_stderr)
 
-      assert_equal "WARN: test\n", msg
+      assert_equal "WARN --: test\n", msg
+    end
+  end
+
+  def test_logging_with_progname
+    old_stderr = STDERR.dup
+    IO.pipe do |r, w|
+      STDERR.reopen(w)
+      @logger = ReVIEW::Logger.new(STDERR, progname: 'review-dummy-cmd')
+      @logger.warn('test')
+      msg = r.readline
+      STDERR.reopen(old_stderr)
+
+      assert_equal "WARN review-dummy-cmd: test\n", msg
     end
   end
 end

data/test/test_makerhelper.rb

@@ -12,8 +12,8 @@ class MakerHelperTest < Test::Unit::TestCase
   end
 
   def teardown
-    FileUtils.rm_rf @tmpdir1
-    FileUtils.rm_rf @tmpdir2
+    FileUtils.rm_rf(@tmpdir1)
+    FileUtils.rm_rf(@tmpdir2)
   end
 
   def test_copy_images_to_dir
@@ -34,7 +34,7 @@ class MakerHelperTest < Test::Unit::TestCase
 
   def test_copy_images_to_dir_convert
     if /mswin|mingw|cygwin/ !~ RUBY_PLATFORM && (`convert -version` rescue nil) && (`gs --version` rescue nil)
-      FileUtils.cp File.join(assets_dir, 'black.eps'), File.join(@tmpdir1, 'foo.eps')
+      FileUtils.cp(File.join(assets_dir, 'black.eps'), File.join(@tmpdir1, 'foo.eps'))
 
       image_files = MakerHelper.copy_images_to_dir(@tmpdir1, @tmpdir2,
                                                    convert: { eps: :png })

data/test/test_markdownbuilder.rb

@@ -26,6 +26,17 @@ class MARKDOWNBuilderTest < Test::Unit::TestCase
 > 
 > buz
 
+EOS
+    assert_equal expected, actual
+
+    @book.config['join_lines_by_lang'] = true
+    actual = compile_block("//quote{\nfoo\nbar\n\nbuz\n//}\n")
+    expected = <<-EOS
+
+> foo bar
+> 
+> buz
+
 EOS
     assert_equal expected, actual
   end
@@ -49,6 +60,16 @@ EOS
 
 foo2bar2
 
+EOS
+    assert_equal expected, actual
+
+    @book.config['join_lines_by_lang'] = true
+    actual = compile_block("//noindent\nfoo\nbar\n\nfoo2\nbar2\n")
+    expected = <<-EOS
+<p class="noindent">foo bar</p>
+
+foo2 bar2
+
 EOS
     assert_equal expected, actual
   end
@@ -105,29 +126,49 @@ EOS
   end
 
   def test_dlist
-    actual = compile_block(": foo\n  foo.\n  bar.\n")
+    actual = compile_block(" : foo\n  foo.\n  bar.\n")
     expected = <<-EOS
 <dl>
 <dt>foo</dt>
 <dd>foo.bar.</dd>
 </dl>
+EOS
+    assert_equal expected, actual
+
+    @book.config['join_lines_by_lang'] = true
+    actual = compile_block(" : foo\n  foo.\n  bar.\n")
+    expected = <<-EOS
+<dl>
+<dt>foo</dt>
+<dd>foo. bar.</dd>
+</dl>
 EOS
     assert_equal expected, actual
   end
 
   def test_dlist_with_bracket
-    actual = compile_block(": foo[bar]\n    foo.\n    bar.\n")
+    actual = compile_block(" : foo[bar]\n    foo.\n    bar.\n")
     expected = <<-EOS
 <dl>
 <dt>foo[bar]</dt>
 <dd>foo.bar.</dd>
 </dl>
+EOS
+    assert_equal expected, actual
+
+    @book.config['join_lines_by_lang'] = true
+    actual = compile_block(" : foo[bar]\n    foo.\n    bar.\n")
+    expected = <<-EOS
+<dl>
+<dt>foo[bar]</dt>
+<dd>foo. bar.</dd>
+</dl>
 EOS
     assert_equal expected, actual
   end
 
   def test_dlist_with_comment
-    source = ": title\n  body\n\#@ comment\n\#@ comment\n: title2\n  body2\n"
+    source = " : title\n  body\n\#@ comment\n\#@ comment\n: title2\n  body2\n"
     actual = compile_block(source)
     expected = <<-EOS
 <dl>
@@ -189,7 +230,7 @@ BBB
 
   def test_listnum
     def @chapter.list(_id)
-      Book::ListIndex::Item.new('test', 1)
+      Book::Index::Item.new('test', 1)
     end
     actual = compile_block("//listnum[test][this is @<b>{test}<&>_]{\nfoo\nbar\n\tbuz\n//}\n")
     expected = <<-EOS

data/test/test_md2inaobuilder.rb

@@ -40,12 +40,22 @@ EOS
   end
 
   def test_dlist
-    actual = compile_block(": foo\n  foo.\n  bar.\n")
+    actual = compile_block(" : foo\n  foo.\n  bar.\n")
     expected = <<-EOS
 <dl>
 <dt>foo</dt>
 <dd>foo.bar.</dd>
 </dl>
+EOS
+    assert_equal expected, actual
+
+    @book.config['join_lines_by_lang'] = true
+    actual = compile_block(" : foo\n  foo.\n  bar.\n")
+    expected = <<-EOS
+<dl>
+<dt>foo</dt>
+<dd>foo. bar.</dd>
+</dl>
 EOS
     assert_equal expected, actual
   end
@@ -59,9 +69,9 @@ BBB
     EOS
 
     assert_equal <<-EOS, actual
-```
 ●リスト1::caption
 
+```
 AAA
 BBB
 ```

data/test/test_pdfmaker.rb

@@ -49,7 +49,7 @@ class PDFMakerTest < Test::Unit::TestCase
     begin
       assert_equal(path, 'sample-pdf')
     ensure
-      FileUtils.remove_entry_secure path
+      FileUtils.remove_entry_secure(path)
     end
   end
 

data/test/test_pdfmaker_cmd.rb

@@ -15,7 +15,7 @@ class PDFMakerCmdTest < Test::Unit::TestCase
   end
 
   def teardown
-    FileUtils.rm_rf @tmpdir1
+    FileUtils.rm_rf(@tmpdir1)
     ENV['RUBYLIB'] = @old_rubylib
   end
 

data/test/test_plaintextbuilder.rb

@@ -176,11 +176,19 @@ EOS
   def test_paragraph
     actual = compile_block("foo\nbar\n")
     assert_equal %Q(foobar\n), actual
+
+    @book.config['join_lines_by_lang'] = true
+    actual = compile_block("foo\nbar\n")
+    assert_equal %Q(foo bar\n), actual
   end
 
   def test_tabbed_paragraph
     actual = compile_block("\tfoo\nbar\n")
     assert_equal %Q(\tfoobar\n), actual
+
+    @book.config['join_lines_by_lang'] = true
+    actual = compile_block("\tfoo\nbar\n")
+    assert_equal %Q(\tfoo bar\n), actual
   end
 
   def test_flushright
@@ -189,6 +197,15 @@ EOS
 foobar
 buz
 
+EOS
+    assert_equal expected, actual
+
+    @book.config['join_lines_by_lang'] = true
+    actual = compile_block("//flushright{\nfoo\nbar\n\nbuz\n//}\n")
+    expected = <<-EOS
+foo bar
+buz
+
 EOS
     assert_equal expected, actual
   end
@@ -198,6 +215,14 @@ EOS
     expected = <<-EOS
 foobar
 foo2bar2
+EOS
+    assert_equal expected, actual
+
+    @book.config['join_lines_by_lang'] = true
+    actual = compile_block("//noindent\nfoo\nbar\n\nfoo2\nbar2\n")
+    expected = <<-EOS
+foo bar
+foo2 bar2
 EOS
     assert_equal expected, actual
   end
@@ -215,7 +240,7 @@ EOS
 
   def test_list
     def @chapter.list(_id)
-      Book::ListIndex::Item.new('test', 1)
+      Book::Index::Item.new('test', 1)
     end
     actual = compile_block("//list[samplelist][this is @<b>{test}<&>_]{\nfoo\nbar\n//}\n")
     expected = <<-EOS
@@ -230,7 +255,7 @@ EOS
 
   def test_listnum
     def @chapter.list(_id)
-      Book::ListIndex::Item.new('test', 1)
+      Book::Index::Item.new('test', 1)
     end
     actual = compile_block("//listnum[test][this is @<b>{test}<&>_]{\nfoo\nbar\n//}\n")
     expected = <<-EOS
@@ -340,7 +365,7 @@ EOS
 
   def test_bib
     def @chapter.bibpaper(_id)
-      Book::BibpaperIndex::Item.new('samplebib', 1, 'sample bib')
+      Book::Index::Item.new('samplebib', 1, 'sample bib')
     end
 
     assert_equal '1 ', compile_inline('@<bib>{samplebib}')
@@ -376,7 +401,7 @@ EOS
 
   def test_inline_table
     def @chapter.table(_id)
-      Book::TableIndex::Item.new('sampletable', 1)
+      Book::Index::Item.new('sampletable', 1)
     end
     actual = compile_block("@<table>{sampletest}\n")
     assert_equal "表1.1\n", actual
@@ -489,7 +514,7 @@ EOS
 
   def test_image
     def @chapter.image(_id)
-      item = Book::ImageIndex::Item.new('sampleimg', 1)
+      item = Book::Index::Item.new('sampleimg', 1)
       item.instance_eval { @path = './images/chap1-sampleimg.png' }
       item
     end
@@ -500,7 +525,7 @@ EOS
 
   def test_image_with_metric
     def @chapter.image(_id)
-      item = Book::ImageIndex::Item.new('sampleimg', 1)
+      item = Book::Index::Item.new('sampleimg', 1)
       item.instance_eval { @path = './images/chap1-sampleimg.png' }
       item
     end

data/test/test_rstbuilder.rb

@@ -207,11 +207,19 @@ EOS
   def test_paragraph
     actual = compile_block("foo\nbar\n")
     assert_equal %Q(foobar\n\n), actual
+
+    @book.config['join_lines_by_lang'] = true
+    actual = compile_block("foo\nbar\n")
+    assert_equal %Q(foo bar\n\n), actual
   end
 
   def test_tabbed_paragraph
     actual = compile_block("\tfoo\nbar\n")
     assert_equal %Q(\tfoobar\n\n), actual
+
+    @book.config['join_lines_by_lang'] = true
+    actual = compile_block("\tfoo\nbar\n")
+    assert_equal %Q(\tfoo bar\n\n), actual
   end
 
   def test_flushright
@@ -222,6 +230,17 @@ EOS
    foobar
 buz
 
+EOS
+    assert_equal expected, actual
+
+    @book.config['join_lines_by_lang'] = true
+    actual = compile_block("//flushright{\nfoo\nbar\n\nbuz\n//}\n")
+    expected = <<-EOS
+.. flushright::
+
+   foo bar
+buz
+
 EOS
     assert_equal expected, actual
   end
@@ -233,6 +252,16 @@ foobar
 
 foo2bar2
 
+EOS
+    assert_equal expected, actual
+
+    @book.config['join_lines_by_lang'] = true
+    actual = compile_block("//noindent\nfoo\nbar\n\nfoo2\nbar2\n")
+    expected = <<-EOS
+foo bar
+
+foo2 bar2
+
 EOS
     assert_equal expected, actual
   end
@@ -250,7 +279,7 @@ EOS
 
   def test_list
     def @chapter.list(_id)
-      Book::ListIndex::Item.new('test', 1)
+      Book::Index::Item.new('test', 1)
     end
     actual = compile_block("//list[samplelist][this is @<b>{test}<&>_]{\nfoo\nbar\n//}\n")
     expected = <<-EOS
@@ -264,7 +293,7 @@ EOS
 
   def test_listnum
     def @chapter.list(_id)
-      Book::ListIndex::Item.new('test', 1)
+      Book::Index::Item.new('test', 1)
     end
     actual = compile_block("//listnum[test][this is @<b>{test}<&>_]{\nfoo\nbar\n//}\n")
     expected = <<-EOS
@@ -416,7 +445,7 @@ EOS
 
   def test_image
     def @chapter.image(_id)
-      item = Book::ImageIndex::Item.new('sampleimg', 1)
+      item = Book::Index::Item.new('sampleimg', 1)
       item.instance_eval { @path = './images/chap1-sampleimg.png' }
       item
     end
@@ -435,7 +464,7 @@ EOS
 
   def test_image_with_metric
     def @chapter.image(_id)
-      item = Book::ImageIndex::Item.new('sampleimg', 1)
+      item = Book::Index::Item.new('sampleimg', 1)
       item.instance_eval { @path = './images/chap1-sampleimg.png' }
       item
     end

data/test/test_textutils.rb

@@ -6,7 +6,12 @@ class TextUtilsTest < Test::Unit::TestCase
 
   def setup
     @tu_nil = Object.new
-    @tu_nil.extend ReVIEW::TextUtils
+    @tu_nil.extend(ReVIEW::TextUtils)
+    @tu_nil.instance_eval { @book = Book::Base.new('.') }
+    def @tu_nil.config
+      @book.config
+    end
+
     def @tu_nil.pre_paragraph
       nil
     end
@@ -16,7 +21,12 @@ class TextUtilsTest < Test::Unit::TestCase
     end
 
     @tu_p = Object.new
-    @tu_p.extend ReVIEW::TextUtils
+    @tu_p.extend(ReVIEW::TextUtils)
+    @tu_p.instance_eval { @book = Book::Base.new('.') }
+    def @tu_p.config
+      @book.config
+    end
+
     def @tu_p.pre_paragraph
       '<p>'
     end
@@ -63,6 +73,20 @@ class TextUtilsTest < Test::Unit::TestCase
     assert_equal ['<p>abc</p>', '<p>defghi</p>'], ret
     ret = @tu_p.split_paragraph(['abc', '', '', 'def', 'ghi', '', ''])
     assert_equal ['<p>abc</p>', '<p>defghi</p>'], ret
+
+    @tu_p.config['join_lines_by_lang'] = true
+    ret = @tu_p.split_paragraph(['abc'])
+    assert_equal ['<p>abc</p>'], ret
+    ret = @tu_p.split_paragraph(['abc', 'def'])
+    assert_equal ['<p>abc def</p>'], ret
+    ret = @tu_p.split_paragraph(['abc', '', 'def'])
+    assert_equal ['<p>abc</p>', '<p>def</p>'], ret
+    ret = @tu_p.split_paragraph(['abc', '', '', 'def'])
+    assert_equal ['<p>abc</p>', '<p>def</p>'], ret
+    ret = @tu_p.split_paragraph(['abc', '', '', 'def', 'ghi'])
+    assert_equal ['<p>abc</p>', '<p>def ghi</p>'], ret
+    ret = @tu_p.split_paragraph(['abc', '', '', 'def', 'ghi', '', ''])
+    assert_equal ['<p>abc</p>', '<p>def ghi</p>'], ret
   end
 
   def test_split_paragraph_nil
@@ -76,5 +100,88 @@ class TextUtilsTest < Test::Unit::TestCase
     assert_equal ['abc', 'def'], ret
     ret = @tu_nil.split_paragraph(['abc', '', '', 'def', 'ghi'])
     assert_equal ['abc', 'defghi'], ret
+
+    @tu_nil.config['join_lines_by_lang'] = true
+    ret = @tu_nil.split_paragraph(['abc'])
+    assert_equal ['abc'], ret
+    ret = @tu_nil.split_paragraph(['abc', 'def'])
+    assert_equal ['abc def'], ret
+    ret = @tu_nil.split_paragraph(['abc', '', 'def'])
+    assert_equal ['abc', 'def'], ret
+    ret = @tu_nil.split_paragraph(['abc', '', '', 'def'])
+    assert_equal ['abc', 'def'], ret
+    ret = @tu_nil.split_paragraph(['abc', '', '', 'def', 'ghi'])
+    assert_equal ['abc', 'def ghi'], ret
+  end
+
+  def test_split_paragraph_p_lang
+    ret = @tu_p.split_paragraph(['I', 'have.'])
+    assert_equal ['<p>Ihave.</p>'], ret
+    ret = @tu_p.split_paragraph(['I', 'have', '.'])
+    assert_equal ['<p>Ihave.</p>'], ret
+    ret = @tu_p.split_paragraph(['01', '23', 'a', '4'])
+    assert_equal ['<p>0123a4</p>'], ret
+    ret = @tu_p.split_paragraph(['こんにちは', '漢字', 'α', 'アルファ?', '！'])
+    assert_equal ['<p>こんにちは漢字αアルファ?！</p>'], ret
+    ret = @tu_p.split_paragraph(['こんにちは', '0814', '日'])
+    assert_equal ['<p>こんにちは0814日</p>'], ret
+    ret = @tu_p.split_paragraph(['あ', 'a', 'い', '?', 'a'])
+    assert_equal ['<p>あaい?a</p>'], ret
+    ret = @tu_p.split_paragraph(['안녕하세요', 'こんにちは'])
+    assert_equal ['<p>안녕하세요こんにちは</p>'], ret
+    ret = @tu_p.split_paragraph(['Hello', '안녕하세요', '처음뵙겠습니다'])
+    assert_equal ['<p>Hello안녕하세요처음뵙겠습니다</p>'], ret
+    ret = @tu_p.split_paragraph([''])
+    assert_equal ['<p></p>'], ret
+    # LaTeX
+    ret = @tu_p.split_paragraph(['\tag{a}', 'A', '\tag{b}', 'B'])
+    assert_equal ['<p>\tag{a}A\tag{b}B</p>'], ret
+    ret = @tu_p.split_paragraph(['\tag{あ}', 'い', '\tag{う}', 'A', '\tag{え}', '\tag{b}', '\tag{お}', '\tag{か}'])
+    assert_equal ['<p>\tag{あ}い\tag{う}A\tag{え}\tag{b}\tag{お}\tag{か}</p>'], ret
+    # HTML/IDGXML
+    ret = @tu_p.split_paragraph(['<b>a</b>', 'A', '<b>b</b>', 'B'])
+    assert_equal ['<p><b>a</b>A<b>b</b>B</p>'], ret
+    ret = @tu_p.split_paragraph(['<b>あ</b>', 'い', '<b>う</b>', 'A', '<b>え</b>', '<b>b</b>', '<b>お</b>', '<b>か</b>'])
+    assert_equal ['<p><b>あ</b>い<b>う</b>A<b>え</b><b>b</b><b>お</b><b>か</b></p>'], ret
+    # Text
+    ret = @tu_p.split_paragraph(['★a☆', 'A', '★b☆', 'B'])
+    assert_equal ['<p>★a☆A★b☆B</p>'], ret
+    ret = @tu_p.split_paragraph(['★あ☆', 'い', '★う☆', 'A', '★え☆', '★b☆', '★お☆', '★か☆'])
+    assert_equal ['<p>★あ☆い★う☆A★え☆★b☆★お☆★か☆</p>'], ret
+
+    @tu_p.config['join_lines_by_lang'] = true
+    ret = @tu_p.split_paragraph(['I', 'have.'])
+    assert_equal ['<p>I have.</p>'], ret
+    ret = @tu_p.split_paragraph(['I', 'have', '.'])
+    assert_equal ['<p>I have .</p>'], ret # ...OK? (I have. ?)
+    ret = @tu_p.split_paragraph(['01', '23', 'a', '4'])
+    assert_equal ['<p>01 23 a 4</p>'], ret
+    ret = @tu_p.split_paragraph(['こんにちは', '漢字', 'α', 'アルファ?', '！'])
+    assert_equal ['<p>こんにちは漢字αアルファ?！</p>'], ret
+    ret = @tu_p.split_paragraph(['こんにちは', '0814', '日'])
+    assert_equal ['<p>こんにちは0814日</p>'], ret
+    ret = @tu_p.split_paragraph(['あ', 'a', 'い', '?', 'a'])
+    assert_equal ['<p>あaい? a</p>'], ret
+    ret = @tu_p.split_paragraph(['안녕하세요', 'こんにちは'])
+    assert_equal ['<p>안녕하세요こんにちは</p>'], ret
+    ret = @tu_p.split_paragraph(['Hello', '안녕하세요', '처음뵙겠습니다'])
+    assert_equal ['<p>Hello 안녕하세요 처음뵙겠습니다</p>'], ret
+    ret = @tu_p.split_paragraph([''])
+    assert_equal ['<p></p>'], ret
+    # LaTeX
+    ret = @tu_p.split_paragraph(['\tag{a}', 'A', '\tag{b}', 'B'])
+    assert_equal ['<p>\tag{a} A \tag{b} B</p>'], ret
+    ret = @tu_p.split_paragraph(['\tag{あ}', 'い', '\tag{う}', 'A', '\tag{え}', '\tag{b}', '\tag{お}', '\tag{か}'])
+    assert_equal ['<p>\tag{あ}い\tag{う} A \tag{え} \tag{b} \tag{お} \tag{か}</p>'], ret # ...OK? (\tag{お}\tag{か}?)
+    # HTML/IDGXML
+    ret = @tu_p.split_paragraph(['<b>a</b>', 'A', '<b>b</b>', 'B'])
+    assert_equal ['<p><b>a</b> A <b>b</b> B</p>'], ret
+    ret = @tu_p.split_paragraph(['<b>あ</b>', 'い', '<b>う</b>', 'A', '<b>え</b>', '<b>b</b>', '<b>お</b>', '<b>か</b>'])
+    assert_equal ['<p><b>あ</b>い<b>う</b> A <b>え</b> <b>b</b> <b>お</b> <b>か</b></p>'], ret # ...OK? (<b>お</b><b>か</b>?)
+    # Text
+    ret = @tu_p.split_paragraph(['★a☆', 'A', '★b☆', 'B'])
+    assert_equal ['<p>★a☆ A ★b☆ B</p>'], ret
+    ret = @tu_p.split_paragraph(['★あ☆', 'い', '★う☆', 'A', '★え☆', '★b☆', '★お☆', '★か☆'])
+    assert_equal ['<p>★あ☆い★う☆ A ★え☆ ★b☆ ★お☆ ★か☆</p>'], ret # ...OK? (★お☆★か☆?)
   end
 end