review 5.0.0 → 5.1.0

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_markdownbuilder.rb

@@ -106,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

data/test/test_pdfmaker.rb

@@ -261,4 +261,75 @@ class PDFMakerTest < Test::Unit::TestCase
               '2012年1月31日 ver 1.2.1発行']
     assert_equal expect, history
   end
+
+  def test_box_setting_is_defined
+    %w[column note memo tip info warning important caution notice].each do |name|
+      @config['pdfmaker']['boxsetting'] = {
+        name => { 'style' => 'simplebox' }
+      }
+      assert !ReVIEW::LaTeXBox.new.tcbox(@config).empty?
+    end
+    @config['pdfmaker']['boxsetting'] = {
+      'invalid' => { 'style' => 'simplebox' }
+    }
+    assert ReVIEW::LaTeXBox.new.tcbox(@config).empty?
+  end
+
+  def test_box_setting_options
+    @config['pdfmaker']['boxsetting'] = {
+      'note' => { 'style' => 'simplebox' },
+      'important' => { 'style' => 'simplebox', 'options' => 'colback=blue,arc=3mm' },
+      'caution' => { 'style' => 'squarecaptionbox', 'options_with_caption' => 'attach boxed title to top bottom' }
+    }
+
+    expected = <<-EOS
+\\renewenvironment{reviewnote}[1][]{%
+  \\csdef{rv@tmp@withcaption}{true}
+  \\notblank{##1}{
+    \\begin{rv@simplebox@caption}{##1}[]
+   }{
+    \\csundef{rv@tmp@withcaption}
+    \\begin{rv@simplebox@nocaption}[]
+   }
+}{
+  \\ifcsdef{rv@tmp@withcaption}{
+    \\end{rv@simplebox@caption}
+  }{
+    \\end{rv@simplebox@nocaption}
+  }
+}
+\\renewenvironment{reviewimportant}[1][]{%
+  \\csdef{rv@tmp@withcaption}{true}
+  \\notblank{##1}{
+    \\begin{rv@simplebox@caption}{##1}[colback=blue,arc=3mm]
+   }{
+    \\csundef{rv@tmp@withcaption}
+    \\begin{rv@simplebox@nocaption}[colback=blue,arc=3mm]
+   }
+}{
+  \\ifcsdef{rv@tmp@withcaption}{
+    \\end{rv@simplebox@caption}
+  }{
+    \\end{rv@simplebox@nocaption}
+  }
+}
+\\renewenvironment{reviewcaution}[1][]{%
+  \\csdef{rv@tmp@withcaption}{true}
+  \\notblank{##1}{
+    \\begin{rv@squarecaptionbox@caption}{##1}[attach boxed title to top bottom]
+   }{
+    \\csundef{rv@tmp@withcaption}
+    \\begin{rv@squarecaptionbox@nocaption}[]
+   }
+}{
+  \\ifcsdef{rv@tmp@withcaption}{
+    \\end{rv@squarecaptionbox@caption}
+  }{
+    \\end{rv@squarecaptionbox@nocaption}
+  }
+}
+EOS
+    actual = ReVIEW::LaTeXBox.new.tcbox(@config)
+    assert_equal expected, actual
+  end
 end

data/test/test_pdfmaker_cmd.rb

@@ -5,14 +5,14 @@ require 'yaml'
 require 'rbconfig'
 require 'open3'
 
-REVIEW_PDFMAKER = File.expand_path('../bin/review-pdfmaker', File.dirname(__FILE__))
+REVIEW_PDFMAKER = File.expand_path('../bin/review-pdfmaker', __dir__)
 
 class PDFMakerCmdTest < Test::Unit::TestCase
   def setup
     @tmpdir1 = Dir.mktmpdir
 
     @old_rubylib = ENV['RUBYLIB']
-    ENV['RUBYLIB'] = File.expand_path('../lib', File.dirname(__FILE__))
+    ENV['RUBYLIB'] = File.expand_path('../lib', __dir__)
   end
 
   def teardown

data/test/test_plaintextbuilder.rb

@@ -90,9 +90,16 @@ class PLAINTEXTBuidlerTest < Test::Unit::TestCase
     assert_equal "\n", actual
   end
 
-  def test_inline_i
-    actual = compile_inline('test @<i>{inline test} test2')
-    assert_equal 'test inline test test2', actual
+  def test_inline_asis
+    %w[i b tti ttb bou ami u strong em code ins tcy].each do |tag|
+      actual = compile_inline("test @<#{tag}>{inline test} test2")
+      assert_equal 'test inline test test2', actual
+    end
+  end
+
+  def test_inline_del
+    actual = compile_inline('test @<del>{inline test} test2')
+    assert_equal 'test  test2', actual
   end
 
   def test_inline_i_and_escape
@@ -100,11 +107,6 @@ class PLAINTEXTBuidlerTest < Test::Unit::TestCase
     assert_equal 'test inline<&;\\ test test2', actual
   end
 
-  def test_inline_b
-    actual = compile_inline('test @<b>{inline test} test2')
-    assert_equal 'test inline test test2', actual
-  end
-
   def test_inline_b_and_escape
     actual = compile_inline('test @<b>{inline<&;\\ test} test2')
     assert_equal 'test inline<&;\\ test test2', actual
@@ -115,16 +117,6 @@ class PLAINTEXTBuidlerTest < Test::Unit::TestCase
     assert_equal 'test inline test test2}', actual
   end
 
-  def test_inline_tti
-    actual = compile_inline('test @<tti>{inline test} test2')
-    assert_equal 'test inline test test2', actual
-  end
-
-  def test_inline_ttb
-    actual = compile_inline('test @<ttb>{inline test} test2')
-    assert_equal 'test inline test test2', actual
-  end
-
   def test_inline_uchar
     actual = compile_inline('test @<uchar>{2460} test2')
     assert_equal 'test ① test2', actual

data/test/test_reviewheaderlistener.rb

@@ -0,0 +1,49 @@
+require 'test_helper'
+require 'rexml/document'
+require 'rexml/streamlistener'
+require 'review/epubmaker'
+
+class ReVIEWHeaderListenerTest < Test::Unit::TestCase
+  def setup
+    @epubmaker = ReVIEW::EPUBMaker.new
+  end
+
+  def teardown
+  end
+
+  def test_epubmaker_parse_headlines
+    # original Re:VIEW source:
+    #
+    # = first chapter
+    # == first section
+    # === first @<embed>{<img src="images/icon1.jpg" alt="subsection" />}
+    # == second section
+    # ==={dummy1} dummy subsection
+    # == third section
+    # ==[notoc] notoc section
+    # ==[notoc]{dummy2} notoc section
+    # ==[nodisp] nodisp section
+    # ==[nodisp]{dummy3} nodisp section
+    # ==[nonum] nonum section
+    # ==[nonum]{dummy4} nonum section
+    Dir.mktmpdir do |_dir|
+      path = File.join(assets_dir, 'header_listener.html')
+      headlines = @epubmaker.parse_headlines(path)
+
+      expected = [{ 'id' => 'h1', 'level' => 1, 'notoc' => nil, 'title' => '第1章　first chapter' },
+                  { 'id' => 'h1-1', 'level' => 2, 'notoc' => nil, 'title' => '1.1　first section' },
+                  { 'id' => 'h1-1-1', 'level' => 3, 'notoc' => nil, 'title' => 'first subsection' },
+                  { 'id' => 'h1-2', 'level' => 2, 'notoc' => nil, 'title' => '1.2　second section' },
+                  { 'id' => 'h1-2-1', 'level' => 3, 'notoc' => nil, 'title' => 'dummy subsection' },
+                  { 'id' => 'h1-3', 'level' => 2, 'notoc' => nil, 'title' => '1.3　third section' },
+                  { 'id' => 'ch01_nonum1', 'level' => 2, 'notoc' => 'true', 'title' => 'notoc section' },
+                  { 'id' => 'dummy2', 'level' => 2, 'notoc' => 'true', 'title' => 'notoc section' },
+                  { 'id' => 'ch01_nonum3', 'level' => 2, 'notoc' => nil, 'title' => 'nodisp section' },
+                  { 'id' => 'dummy3', 'level' => 2, 'notoc' => nil, 'title' => 'nodisp section' },
+                  { 'id' => 'ch01_nonum5', 'level' => 2, 'notoc' => nil, 'title' => 'nonum section' },
+                  { 'id' => 'dummy4', 'level' => 2, 'notoc' => nil, 'title' => 'nonum section' }]
+
+      assert_equal expected, headlines
+    end
+  end
+end

data/test/test_template.rb

@@ -9,15 +9,25 @@ class TemplateTest < Test::Unit::TestCase
   end
 
   def test_load
-    tmplfile = File.expand_path('./assets/test.xml.erb', File.dirname(__FILE__))
+    tmplfile = File.expand_path('./assets/test.xml.erb', __dir__)
     tmpl = ReVIEW::Template.load(tmplfile)
     assert_equal("<test>\n<name></name>\n</test>\n", tmpl.result(binding))
   end
 
   def test_open_with_value
-    tmplfile = File.expand_path('./assets/test.xml.erb', File.dirname(__FILE__))
+    tmplfile = File.expand_path('./assets/test.xml.erb', __dir__)
     tmpl = ReVIEW::Template.load(tmplfile)
     @name = 'test'
     assert_equal("<test>\n<name>test</name>\n</test>\n", tmpl.result(binding))
   end
+
+  def test_generate
+    result = ReVIEW::Template.generate(path: './assets/test.xml.erb', binding: binding, template_dir: __dir__)
+    assert_equal("<test>\n<name></name>\n</test>\n", result)
+  end
+
+  def test_generate_without_template_dir
+    result = ReVIEW::Template.generate(path: '../test/assets/test.xml.erb', binding: binding)
+    assert_equal("<test>\n<name></name>\n</test>\n", result)
+  end
 end

data/test/test_textmaker_cmd.rb

@@ -29,7 +29,11 @@ class TEXTMakerCmdTest < Test::Unit::TestCase
       ruby_cmd = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name']) + RbConfig::CONFIG['EXEEXT']
       Dir.chdir(@tmpdir1) do
         _o, e, s = Open3.capture3("#{ruby_cmd} -S #{REVIEW_TEXTMAKER} #{option} #{configfile}")
-        assert_equal '', e
+        if defined?(ReVIEW::TTYLogger)
+          assert_match(/SUCCESS/, e)
+        else
+          assert_equal '', e
+        end
         assert s.success?
       end
       assert File.exist?(File.join(@tmpdir1, targetfile))

data/test/test_tocprinter.rb

@@ -0,0 +1,46 @@
+require 'test_helper'
+require 'review/tocprinter'
+require 'unicode/eaw'
+
+class TOCPrinterTest < Test::Unit::TestCase
+  def setup
+    @toc_printer = ReVIEW::TOCPrinter.new
+  end
+
+  def teardown
+  end
+
+  def test_calc_linesize
+    @toc_printer.calc_char_width = nil
+    size = @toc_printer.calc_linesize('あ いうえおABCD')
+    assert_equal 10, size
+    size = @toc_printer.calc_linesize("あ い\nうえ\nおAB\nCD\n")
+    assert_equal 14, size
+  end
+
+  def test_calc_linesize_with_char_width
+    @toc_printer.calc_char_width = true
+    size = @toc_printer.calc_linesize('あ いうえおABCD')
+    assert_equal 7.5, size
+    size = @toc_printer.calc_linesize("あ い\nうえ\nおAB\nCD\n")
+    assert_equal 9.5, size
+  end
+
+  def test_execute_syntax_book_detail
+    Dir.chdir('./samples/syntax-book') do
+      stdout = $stdout
+      tmp_io = StringIO.new
+      $stdout = tmp_io
+      begin
+        @toc_printer.execute('-d')
+        tmp_io.rewind
+        result = tmp_io.read
+        path = File.join(assets_dir, 'syntax_book_index_detail.txt')
+        expected = File.read(path)
+        assert_equal expected, result
+      ensure
+        $stdout = stdout
+      end
+    end
+  end
+end