review 4.1.0 → 5.2.0

data/test/test_latexbuilder_v2.rb

@@ -20,6 +20,8 @@ class LATEXBuidlerV2Test < Test::Unit::TestCase
     @config['pdfmaker']['image_scale2width'] = nil
     @book = Book::Base.new
     @book.config = @config
+    @log_io = StringIO.new
+    ReVIEW.logger = ReVIEW::Logger.new(@log_io)
     @compiler = ReVIEW::Compiler.new(@builder)
     @chapter = Book::Chapter.new(@book, 1, 'chap1', nil, StringIO.new)
     location = Location.new(nil, nil)
@@ -229,6 +231,10 @@ EOS
 
     @config['secnolevel'] = 3
     actual = compile_inline('test @<hd>{chap1|test} test2')
+    assert_equal 'test \reviewsecref{「1.1.1 te\\textunderscore{}st」}{sec:1-1-1} test2', actual
+
+    @config['chapterlink'] = nil
+    actual = compile_inline('test @<hd>{chap1|test} test2')
     assert_equal 'test 「1.1.1 te\\textunderscore{}st」 test2', actual
   end
 
@@ -662,9 +668,11 @@ EOS
     expected = <<-EOS
 \\begin{reviewminicolumn}
 \\reviewminicolumntitle{this is \\textbf{test}\\textless{}\\&\\textgreater{}\\textunderscore{}}
+
 test1
 
 test\\textit{2}
+
 \\end{reviewminicolumn}
 EOS
     assert_equal expected, actual
@@ -1285,13 +1293,17 @@ EOS
     actual = compile_block("//note{\nA\n\nB\n//}\n//note[caption]{\nA\n//}")
     expected = <<-EOS
 \\begin{reviewminicolumn}
+
 A
 
 B
+
 \\end{reviewminicolumn}
 \\begin{reviewminicolumn}
 \\reviewminicolumntitle{caption}
+
 A
+
 \\end{reviewminicolumn}
 EOS
     assert_equal expected, actual
@@ -1299,13 +1311,17 @@ EOS
     actual = compile_block("//memo{\nA\n\nB\n//}\n//memo[caption]{\nA\n//}")
     expected = <<-EOS
 \\begin{reviewminicolumn}
+
 A
 
 B
+
 \\end{reviewminicolumn}
 \\begin{reviewminicolumn}
 \\reviewminicolumntitle{caption}
+
 A
+
 \\end{reviewminicolumn}
 EOS
     assert_equal expected, actual
@@ -1313,13 +1329,17 @@ EOS
     actual = compile_block("//info{\nA\n\nB\n//}\n//info[caption]{\nA\n//}")
     expected = <<-EOS
 \\begin{reviewminicolumn}
+
 A
 
 B
+
 \\end{reviewminicolumn}
 \\begin{reviewminicolumn}
 \\reviewminicolumntitle{caption}
+
 A
+
 \\end{reviewminicolumn}
 EOS
     assert_equal expected, actual
@@ -1327,13 +1347,17 @@ EOS
     actual = compile_block("//important{\nA\n\nB\n//}\n//important[caption]{\nA\n//}")
     expected = <<-EOS
 \\begin{reviewminicolumn}
+
 A
 
 B
+
 \\end{reviewminicolumn}
 \\begin{reviewminicolumn}
 \\reviewminicolumntitle{caption}
+
 A
+
 \\end{reviewminicolumn}
 EOS
     assert_equal expected, actual
@@ -1341,13 +1365,17 @@ EOS
     actual = compile_block("//caution{\nA\n\nB\n//}\n//caution[caption]{\nA\n//}")
     expected = <<-EOS
 \\begin{reviewminicolumn}
+
 A
 
 B
+
 \\end{reviewminicolumn}
 \\begin{reviewminicolumn}
 \\reviewminicolumntitle{caption}
+
 A
+
 \\end{reviewminicolumn}
 EOS
     assert_equal expected, actual
@@ -1355,13 +1383,17 @@ EOS
     actual = compile_block("//notice{\nA\n\nB\n//}\n//notice[caption]{\nA\n//}")
     expected = <<-EOS
 \\begin{reviewminicolumn}
+
 A
 
 B
+
 \\end{reviewminicolumn}
 \\begin{reviewminicolumn}
 \\reviewminicolumntitle{caption}
+
 A
+
 \\end{reviewminicolumn}
 EOS
     assert_equal expected, actual
@@ -1369,13 +1401,17 @@ EOS
     actual = compile_block("//warning{\nA\n\nB\n//}\n//warning[caption]{\nA\n//}")
     expected = <<-EOS
 \\begin{reviewminicolumn}
+
 A
 
 B
+
 \\end{reviewminicolumn}
 \\begin{reviewminicolumn}
 \\reviewminicolumntitle{caption}
+
 A
+
 \\end{reviewminicolumn}
 EOS
     assert_equal expected, actual
@@ -1383,13 +1419,17 @@ EOS
     actual = compile_block("//tip{\nA\n\nB\n//}\n//tip[caption]{\nA\n//}")
     expected = <<-EOS
 \\begin{reviewminicolumn}
+
 A
 
 B
+
 \\end{reviewminicolumn}
 \\begin{reviewminicolumn}
 \\reviewminicolumntitle{caption}
+
 A
+
 \\end{reviewminicolumn}
 EOS
     assert_equal expected, actual
@@ -1506,19 +1546,25 @@ EOS
   end
 
   def test_inline_unknown
-    e = assert_raises(ReVIEW::ApplicationError) { compile_block "@<img>{n}\n" }
-    assert_equal ':1: error: unknown image: n', e.message
-    e = assert_raises(ReVIEW::ApplicationError) { compile_block "@<fn>{n}\n" }
-    assert_equal ':1: error: unknown footnote: n', e.message
-    e = assert_raises(ReVIEW::ApplicationError) { compile_block "@<hd>{n}\n" }
-    assert_equal ':1: error: unknown headline: n', e.message
+    assert_raises(ReVIEW::ApplicationError) { compile_block("@<img>{n}\n") }
+    assert_match(/unknown image: n/, @log_io.string)
+
+    @log_io.string = ''
+    assert_raises(ReVIEW::ApplicationError) { compile_block("@<fn>{n}\n") }
+    assert_match(/unknown footnote: n/, @log_io.string)
+
+    @log_io.string = ''
+    assert_raises(ReVIEW::ApplicationError) { compile_block("@<hd>{n}\n") }
+    assert_match(/unknown headline: n/, @log_io.string)
     %w[list table column].each do |name|
-      e = assert_raises(ReVIEW::ApplicationError) { compile_block "@<#{name}>{n}\n" }
-      assert_equal ":1: error: unknown #{name}: n", e.message
+      @log_io.string = ''
+      assert_raises(ReVIEW::ApplicationError) { compile_block("@<#{name}>{n}\n") }
+      assert_match(/unknown #{name}: n/, @log_io.string)
     end
     %w[chap chapref title].each do |name|
-      e = assert_raises(ReVIEW::ApplicationError) { compile_block "@<#{name}>{n}\n" }
-      assert_equal ':1: error: key not found: "n"', e.message
+      @log_io.string = ''
+      assert_raises(ReVIEW::ApplicationError) { compile_block("@<#{name}>{n}\n") }
+      assert_match(/key not found: "n"/, @log_io.string)
     end
   end
 

data/test/test_lineinput.rb

@@ -1,5 +1,5 @@
 require 'test_helper'
-require 'lineinput'
+require 'review/lineinput'
 require 'tempfile'
 require 'stringio'
 
@@ -9,7 +9,7 @@ class LineInputTest < Test::Unit::TestCase
     li = LineInput.new(io)
     assert_equal 0, li.lineno
     assert !li.eof?
-    assert_equal "#<LineInput file=#{io.inspect} line=0>", li.inspect
+    assert_equal "#<ReVIEW::LineInput file=#{io.inspect} line=0>", li.inspect
   end
 
   def test_gets
@@ -40,21 +40,6 @@ class LineInputTest < Test::Unit::TestCase
     assert li.eof?
   end
 
-  def test_ungets
-    io = StringIO.new('abc')
-    li = LineInput.new(io)
-
-    line = li.gets
-    assert_equal line, li.ungets(line)
-    assert_equal 0, li.lineno
-    assert_equal line, li.gets
-
-    li.ungets('xyz')
-    assert_equal 0, li.lineno
-    li.ungets('xyz')
-    assert_equal(-1, li.lineno) # XXX: OK?
-  end
-
   def test_peek
     li = LineInput.new(StringIO.new)
     assert_equal nil, li.peek
@@ -71,33 +56,6 @@ class LineInputTest < Test::Unit::TestCase
     assert li.next?
   end
 
-  def test_gets_if
-    io = StringIO.new
-    li = LineInput.new(io)
-    assert_equal nil, li.gets_if(//)
-
-    io = StringIO.new("abc\ndef\nghi")
-    li = LineInput.new(io)
-
-    assert_equal "abc\n", li.gets_if(//)
-    assert_equal nil, li.gets_if(/^X/)
-    assert_equal nil, li.gets_if(/^g/)
-    assert_equal "def\n", li.gets_if(/^d/)
-  end
-
-  def test_gets_unless
-    io = StringIO.new
-    li = LineInput.new(io)
-    assert_equal nil, li.gets_unless(//)
-
-    io = StringIO.new("abc\ndef\nghi")
-    li = LineInput.new(io)
-
-    assert_equal nil, li.gets_unless(//)
-    assert_equal "abc\n", li.gets_unless(/^X/)
-    assert_equal nil, li.gets_unless(/^d/)
-  end
-
   def test_each
     content = "abc\ndef\nghi"
     io = StringIO.new(content)
@@ -112,17 +70,9 @@ class LineInputTest < Test::Unit::TestCase
     io = StringIO.new("abc\ndef\nghi")
     li = LineInput.new(io)
 
-    li.while_match(/^[ad]/) {}
-    assert_equal 2, li.lineno
-    assert_equal 'ghi', li.gets
-  end
-
-  def test_getlines_while
-    io = StringIO.new("abc\ndef\nghi")
-    li = LineInput.new(io)
-
-    buf = li.getlines_while(/^[ad]/)
-    assert_equal ["abc\n", "def\n"], buf
+    li.while_match(/^[ad]/) do
+      # skip
+    end
     assert_equal 2, li.lineno
     assert_equal 'ghi', li.gets
   end
@@ -131,47 +81,24 @@ class LineInputTest < Test::Unit::TestCase
     io = StringIO.new("abc\ndef\nghi")
     li = LineInput.new(io)
 
-    li.until_match(/^[^a]/) {}
-    assert_equal 1, li.lineno
-    assert_equal "def\n", li.gets
-  end
-
-  def test_getlines_until
-    io = StringIO.new("abc\ndef\nghi")
-    li = LineInput.new(io)
-
-    buf = li.getlines_until(/^[^a]/)
-    assert_equal ["abc\n"], buf
+    li.until_match(/^[^a]/) do
+      # skip
+    end
     assert_equal 1, li.lineno
     assert_equal "def\n", li.gets
   end
 
-  def test_until_terminator
-    io = StringIO.new("abc\n//}\ndef\nghi\n//}\njkl\nmno")
-    li = LineInput.new(io)
-
-    data = ''
-    li.until_terminator(%r<\A//\}>) { |l| data << l }
-    assert_equal "abc\n", data
-    assert_equal 2, li.lineno
-
-    data = ''
-    li.until_terminator(%r<\A//\}>) { |l| data << l }
-    assert_equal "def\nghi\n", data
-    assert_equal 5, li.lineno
-
-    data = ''
-    li.until_terminator(%r<\A//\}>) { |l| data << l }
-    assert_equal "jkl\nmno", data
-    assert_equal 8, li.lineno
-  end
-
-  def test_until_terminator2
-    io = StringIO.new("abc\ndef\n//}\nghi\n//}")
-    li = LineInput.new(io)
-
-    data = li.getblock(%r<\A//\}>)
-    assert_equal ["abc\n", "def\n"], data
-    assert_equal 3, li.lineno
+  def test_invalid_control_sequence
+    0.upto(31) do |n|
+      content = n.chr
+      io = StringIO.new(content)
+      li = ReVIEW::LineInput.new(io)
+      if [9, 10, 13].include?(n) # TAB, LF, CR
+        assert_equal content, li.gets
+      else
+        e = assert_raise(ReVIEW::SyntaxError) { li.gets }
+        assert_match(/found invalid control/, e.message)
+      end
+    end
   end
 end

data/test/test_logger.rb

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

data/test/test_makerhelper.rb

@@ -32,18 +32,6 @@ class MakerHelperTest < Test::Unit::TestCase
     assert image_files.include?(File.join(@tmpdir1, 'subdir/foo.png'))
   end
 
-  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'))
-
-      image_files = MakerHelper.copy_images_to_dir(@tmpdir1, @tmpdir2,
-                                                   convert: { eps: :png })
-
-      assert File.exist?(File.join(@tmpdir2, 'foo.eps.png')), 'EPS to PNG conversion failed'
-      assert image_files.include?(File.join(@tmpdir1, 'foo.eps.png'))
-    end
-  end
-
   def test_copy_images_to_dir_with_exts
     types = %w[png gif jpg jpeg svg pdf eps]
     types4epub = %w[png gif jpg jpeg svg]

data/test/test_markdownbuilder.rb

@@ -16,6 +16,7 @@ class MARKDOWNBuilderTest < Test::Unit::TestCase
     @chapter = Book::Chapter.new(@book, 1, '-', nil, StringIO.new)
     location = Location.new(nil, nil)
     @builder.bind(@compiler, @chapter, location)
+    I18n.setup(@config['language'])
   end
 
   def test_quote
@@ -47,7 +48,9 @@ EOS
 <div class="memo">
 <p class="caption">this is **test**<&>_</p>
 test1
+
 test*2*
+
 </div>
 EOS
     assert_equal expected, actual
@@ -103,6 +106,35 @@ EOS
     assert_equal %Q(test <span class="red">コメント</span> test2), actual
   end
 
+  def test_inline_hd_chap
+    def @chapter.headline_index
+      item = Book::Index::Item.new('chap1|test', [1, 1], 'te_st')
+      idx = Book::HeadlineIndex.new(self)
+      idx.add_item(item)
+      idx
+    end
+
+    @config['secnolevel'] = 2
+    actual = compile_inline('test @<hd>{chap1|test} test2')
+    assert_equal 'test <a href="#h1-1-1">「te_st」</a> test2', actual
+
+    actual = compile_inline('test @<hd>{test} test2')
+    assert_equal 'test <a href="#h1-1-1">「te_st」</a> test2', actual
+
+    @config['secnolevel'] = 3
+    actual = compile_inline('test @<hd>{chap1|test} test2')
+    assert_equal 'test <a href="#h1-1-1">「1.1.1 te_st」</a> test2', actual
+
+    @config['chapterlink'] = nil
+    @config['secnolevel'] = 2
+    actual = compile_inline('test @<hd>{chap1|test} test2')
+    assert_equal 'test 「te_st」 test2', actual
+
+    @config['secnolevel'] = 3
+    actual = compile_inline('test @<hd>{chap1|test} test2')
+    assert_equal 'test 「1.1.1 te_st」 test2', actual
+  end
+
   def test_ul_nest1
     src = <<-EOS
   * AAA