review 4.1.0 → 5.2.0

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}")
-        STDERR.puts e unless e.empty?
+        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

data/test/test_topbuilder.rb

@@ -14,6 +14,8 @@ class TOPBuidlerTest < Test::Unit::TestCase
     @config['language'] = 'ja'
     @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, '-', nil, StringIO.new)
     location = Location.new(nil, nil)
@@ -119,6 +121,11 @@ class TOPBuidlerTest < Test::Unit::TestCase
     assert_equal 'test ★inline test☆◆→等幅フォント太字←◆ test2', actual
   end
 
+  def test_inline_tcy
+    actual = compile_inline('test @<tcy>{A} test2')
+    assert_equal 'test ◆→開始:回転←◆A◆→終了:縦回転←◆ test2', actual
+  end
+
   def test_inline_uchar
     actual = compile_inline('test @<uchar>{2460} test2')
     assert_equal 'test ① test2', actual
@@ -175,11 +182,11 @@ EOS
   end
 
   def test_dt_inline
-    fn = Book::FootnoteIndex.parse(['//footnote[bar][bar]'])
-    @chapter.instance_eval { @footnote_index = fn }
-    actual = compile_block(" : foo@<fn>{bar}[]<>&@<m>$\\alpha[]$\n")
+    actual = compile_block("//footnote[bar][bar]\n\n : foo@<fn>{bar}[]<>&@<m>$\\alpha[]$\n")
 
     expected = <<-EOS
+【注1】bar
+
 ★foo【注1】[]<>&◆→TeX式ここから←◆\\alpha[]◆→TeX式ここまで←◆☆
 	
 
@@ -295,6 +302,19 @@ EOS
  2: bar
 ◆→終了:リスト←◆
 
+EOS
+    assert_equal expected, actual
+
+    @config['caption_position']['list'] = 'bottom'
+    actual = compile_block("//listnum[test][this is @<b>{test}<&>_]{\nfoo\nbar\n//}\n")
+    expected = <<-EOS
+◆→開始:リスト←◆
+ 1: foo
+ 2: bar
+
+リスト1.1　this is ★test☆<&>_
+◆→終了:リスト←◆
+
 EOS
     assert_equal expected, actual
   end
@@ -310,6 +330,20 @@ bar
 buz
 ◆→終了:ソースコードリスト←◆
 
+EOS
+    assert_equal expected, actual
+
+    @config['caption_position']['list'] = 'bottom'
+    actual = compile_block("//source[foo/bar/test.rb]{\nfoo\nbar\n\nbuz\n//}\n")
+    expected = <<-EOS
+◆→開始:ソースコードリスト←◆
+foo
+bar
+
+buz
+■foo/bar/test.rb
+◆→終了:ソースコードリスト←◆
+
 EOS
     assert_equal expected, actual
   end
@@ -347,6 +381,18 @@ foo
 bar
 ◆→終了:書式←◆
 
+EOS
+    assert_equal expected, actual
+
+    @config['caption_position']['list'] = 'bottom'
+    actual = compile_block("//box[FOO]{\nfoo\nbar\n//}\n")
+    expected = <<-EOS
+◆→開始:書式←◆
+foo
+bar
+■FOO
+◆→終了:書式←◆
+
 EOS
     assert_equal expected, actual
   end
@@ -370,6 +416,18 @@ lineA
 lineB
 ◆→終了:コマンド←◆
 
+EOS
+    assert_equal expected, actual
+
+    @config['caption_position']['list'] = 'bottom'
+    actual = compile_block("//cmd[cap1]{\nlineA\nlineB\n//}\n")
+    expected = <<-EOS
+◆→開始:コマンド←◆
+lineA
+lineB
+■cap1
+◆→終了:コマンド←◆
+
 EOS
     assert_equal expected, actual
   end
@@ -395,6 +453,18 @@ lineA
 lineB
 ◆→終了:インラインリスト←◆
 
+EOS
+    assert_equal expected, actual
+
+    @config['caption_position']['list'] = 'bottom'
+    actual = compile_block("//emlist[cap1]{\nlineA\nlineB\n//}\n")
+    expected = <<-EOS
+◆→開始:インラインリスト←◆
+lineA
+lineB
+■cap1
+◆→終了:インラインリスト←◆
+
 EOS
     assert_equal expected, actual
   end
@@ -408,6 +478,18 @@ EOS
  2: bar
 ◆→終了:インラインリスト←◆
 
+EOS
+    assert_equal expected, actual
+
+    @config['caption_position']['list'] = 'bottom'
+    actual = compile_block("//emlistnum[this is @<b>{test}<&>_]{\nfoo\nbar\n//}\n")
+    expected = <<-EOS
+◆→開始:インラインリスト←◆
+ 1: foo
+ 2: bar
+■this is ★test☆<&>_
+◆→終了:インラインリスト←◆
+
 EOS
     assert_equal expected, actual
   end
@@ -440,16 +522,29 @@ EOS
 ccc\tddd<>&
 ◆→終了:表←◆
 
+EOS
+    assert_equal expected, actual
+
+    @config['caption_position']['table'] = 'bottom'
+    actual = compile_block("//table[foo][FOO]{\naaa\tbbb\n------------\nccc\tddd<>&\n//}\n")
+    expected = <<-EOS
+◆→開始:表←◆
+★aaa☆\t★bbb☆
+ccc\tddd<>&
+
+表1.1　FOO
+◆→終了:表←◆
+
 EOS
     assert_equal expected, actual
   end
 
   def test_empty_table
-    e = assert_raises(ReVIEW::ApplicationError) { compile_block "//table{\n//}\n" }
-    assert_equal ':2: error: no rows in the table', e.message
+    e = assert_raises(ReVIEW::ApplicationError) { compile_block("//table{\n//}\n") }
+    assert_equal 'no rows in the table', e.message
 
-    e = assert_raises(ReVIEW::ApplicationError) { compile_block "//table{\n------------\n//}\n" }
-    assert_equal ':3: error: no rows in the table', e.message
+    e = assert_raises(ReVIEW::ApplicationError) { compile_block("//table{\n------------\n//}\n") }
+    assert_equal 'no rows in the table', e.message
   end
 
   def test_inline_table
@@ -647,6 +742,183 @@ EOS
     assert_equal expected, actual
   end
 
+  def test_minicolumn_blocks
+    titles = {
+      'note' => 'ノート',
+      'memo' => 'メモ',
+      'important' => '重要',
+      'info' => '情報',
+      'notice' => '注意',
+      'caution' => '警告',
+      'warning' => '危険',
+      'tip' => 'TIP'
+    }
+
+    %w[note memo tip info warning important caution notice].each do |type|
+      @builder.doc_status.clear
+      src = <<-EOS
+//#{type}[#{type}1]{
+
+//}
+
+//#{type}[#{type}2]{
+//}
+EOS
+
+      expected = <<-EOS
+◆→開始:#{titles[type]}←◆
+■#{type}1
+◆→終了:#{titles[type]}←◆
+
+◆→開始:#{titles[type]}←◆
+■#{type}2
+◆→終了:#{titles[type]}←◆
+
+EOS
+      assert_equal expected, compile_block(src)
+
+      src = <<-EOS
+//#{type}[#{type}2]{
+
+//}
+
+//#{type}[#{type}3]{
+
+//}
+
+//#{type}[#{type}4]{
+
+//}
+
+//#{type}[#{type}5]{
+
+//}
+
+//#{type}[#{type}6]{
+
+//}
+EOS
+
+      expected = <<-EOS
+◆→開始:#{titles[type]}←◆
+■#{type}2
+◆→終了:#{titles[type]}←◆
+
+◆→開始:#{titles[type]}←◆
+■#{type}3
+◆→終了:#{titles[type]}←◆
+
+◆→開始:#{titles[type]}←◆
+■#{type}4
+◆→終了:#{titles[type]}←◆
+
+◆→開始:#{titles[type]}←◆
+■#{type}5
+◆→終了:#{titles[type]}←◆
+
+◆→開始:#{titles[type]}←◆
+■#{type}6
+◆→終了:#{titles[type]}←◆
+
+EOS
+      assert_equal expected, compile_block(src)
+
+      src = <<-EOS
+//#{type}{
+
+ * A
+
+ 1. B
+
+//}
+
+//#{type}[OMITEND1]{
+
+//emlist{
+LIST
+//}
+
+//}
+//#{type}[OMITEND2]{
+//}
+EOS
+
+      expected = <<-EOS
+◆→開始:#{titles[type]}←◆
+
+●	A
+
+1	B
+
+◆→終了:#{titles[type]}←◆
+
+◆→開始:#{titles[type]}←◆
+■OMITEND1
+
+◆→開始:インラインリスト←◆
+LIST
+◆→終了:インラインリスト←◆
+
+◆→終了:#{titles[type]}←◆
+
+◆→開始:#{titles[type]}←◆
+■OMITEND2
+◆→終了:#{titles[type]}←◆
+
+EOS
+      assert_equal expected, compile_block(src)
+    end
+  end
+
+  def test_minicolumn_blocks_nest_error1
+    %w[note memo tip info warning important caution notice].each do |type|
+      @builder.doc_status.clear
+      src = <<-EOS
+//#{type}{
+
+//#{type}{
+//}
+
+//}
+EOS
+      assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+      assert_match(/minicolumn cannot be nested:/, @log_io.string)
+    end
+  end
+
+  def test_minicolumn_blocks_nest_error2
+    %w[note memo tip info warning important caution notice].each do |type|
+      @builder.doc_status.clear
+      src = <<-EOS
+//#{type}{
+
+//#{type}{
+
+//}
+
+//}
+EOS
+      assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+      assert_match(/minicolumn cannot be nested:/, @log_io.string)
+    end
+  end
+
+  def test_minicolumn_blocks_nest_error3
+    %w[memo tip info warning important caution notice].each do |type|
+      @builder.doc_status.clear
+      src = <<-EOS
+//#{type}{
+
+//note{
+//}
+
+//}
+EOS
+      assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+      assert_match(/minicolumn cannot be nested:/, @log_io.string)
+    end
+  end
+
   def test_image
     def @chapter.image(_id)
       item = Book::Index::Item.new('sampleimg', 1)
@@ -657,6 +929,18 @@ EOS
     actual = compile_block("//image[sampleimg][sample photo]{\nfoo\n//}\n")
     expected = <<-EOS
 ◆→開始:図←◆
+◆→./images/chap1-sampleimg.png←◆
+
+図1.1　sample photo
+◆→終了:図←◆
+
+EOS
+    assert_equal expected, actual
+
+    @config['caption_position']['image'] = 'top'
+    actual = compile_block("//image[sampleimg][sample photo]{\nfoo\n//}\n")
+    expected = <<-EOS
+◆→開始:図←◆
 図1.1　sample photo
 
 ◆→./images/chap1-sampleimg.png←◆
@@ -676,9 +960,9 @@ EOS
     actual = compile_block("//image[sampleimg][sample photo][scale=1.2]{\nfoo\n//}\n")
     expected = <<-EOS
 ◆→開始:図←◆
-図1.1　sample photo
-
 ◆→./images/chap1-sampleimg.png scale=1.2←◆
+
+図1.1　sample photo
 ◆→終了:図←◆
 
 EOS
@@ -708,7 +992,7 @@ EOB
       @book.config['words_file'] = File.join(dir, 'words.csv')
 
       io = StringIO.new
-      @builder.instance_eval{ @logger = ReVIEW::Logger.new(io) }
+      @builder.instance_eval { @logger = ReVIEW::Logger.new(io) }
       actual = compile_block('@<w>{F} @<w>{B} @<wb>{B} @<w>{N}')
       assert_equal %Q(foo bar"\\<>_@<b>{BAZ} ★bar"\\<>_@<b>{BAZ}☆ [missing word: N]\n), actual
       assert_match(/WARN --: :1: word not bound: N/, io.string)
@@ -716,19 +1000,25 @@ EOB
   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
 
@@ -829,6 +1119,20 @@ EOS
 e=mc^2
 ◆→終了:TeX式←◆
 
+EOS
+    actual = compile_block(src)
+    assert_equal expected, actual
+
+    @config['caption_position']['equation'] = 'bottom'
+
+    expected = <<-EOS
+式1.1
+
+◆→開始:TeX式←◆
+e=mc^2
+式1.1　The Equivalence of Mass ▲and☆ Energy
+◆→終了:TeX式←◆
+
 EOS
     actual = compile_block(src)
     assert_equal expected, actual