review 3.2.0 → 5.1.0

data/test/test_logger.rb

@@ -6,15 +6,28 @@ 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
+      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
@@ -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
@@ -26,6 +27,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
@@ -36,7 +48,9 @@ EOS
 <div class="memo">
 <p class="caption">this is **test**<&>_</p>
 test1
+
 test*2*
+
 </div>
 EOS
     assert_equal expected, actual
@@ -49,6 +63,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
@@ -82,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
@@ -105,29 +158,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 +262,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

@@ -10,9 +10,10 @@ class PDFMakerTest < Test::Unit::TestCase
     @config.merge!(
       'bookname' => 'sample',
       'title' => 'Sample Book',
-      'review_version' => 3,
+      'aut' => 'anonymous',
+      'review_version' => 4,
       'urnid' => 'http://example.jp/',
-      'date' => '2011-01-01',
+      'date' => '2020-07-11',
       'language' => 'ja',
       'texcommand' => 'uplatex'
     )
@@ -49,7 +50,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
 
@@ -75,7 +76,7 @@ class PDFMakerTest < Test::Unit::TestCase
     Dir.mktmpdir do |dir|
       coverfile = 'cover.html'
       content = '<html><body>test</body></html>'
-      File.open(File.join(dir, 'cover.tex'), 'w') { |f| f.write(content) }
+      File.write(File.join(dir, 'cover.tex'), content)
       page = @maker.make_custom_page(File.join(dir, coverfile))
       assert_equal(content, page)
     end
@@ -144,11 +145,28 @@ class PDFMakerTest < Test::Unit::TestCase
       @maker.erb_config
       tmpl = @maker.template_content
       expect = File.read(File.join(assets_dir, 'test_template.tex'))
-      expect.gsub!(/\\def\\review@reviewversion{[^\}]+}/, "\\def\\review@reviewversion{#{ReVIEW::VERSION}}")
+      expect.gsub!(/\\def\\review@reviewversion{[^}]+}/, "\\def\\review@reviewversion{#{ReVIEW::VERSION}}")
       assert_equal(expect, tmpl)
     end
   end
 
+  def test_template_content_with_localconfig
+    @config['mycustom'] = { 'value' => '#_TEST_' }
+    Dir.mktmpdir do |dir|
+      Dir.chdir(dir) do
+        Dir.mkdir('layouts')
+        File.write(File.join('layouts', 'config-local.tex.erb'), %q(\def\customvalue{<%= escape(@config['mycustom']['value']) %>}) + "\n")
+        @maker.basedir = Dir.pwd
+        @maker.erb_config
+        tmpl = @maker.template_content
+        expect = File.read(File.join(assets_dir, 'test_template.tex'))
+        expect.gsub!(/\\def\\review@reviewversion{[^}]+}/, "\\def\\review@reviewversion{#{ReVIEW::VERSION}}")
+        expect.sub!("\\makeatother\n", '\&' + "%% BEGIN: config-local.tex.erb\n\\def\\customvalue{\\#\\textunderscore{}TEST\\textunderscore{}}\n%% END: config-local.tex.erb\n")
+        assert_equal(expect, tmpl)
+      end
+    end
+  end
+
   def test_gettemplate_with_backmatter
     @config.merge!(
       'backcover' => 'backcover.tex',
@@ -158,13 +176,13 @@ class PDFMakerTest < Test::Unit::TestCase
     Dir.mktmpdir do |dir|
       Dir.chdir(dir) do
         profile = "\\thispagestyle{empty}\\chapter*{Profile}\nsome profile\n"
-        File.open(File.join(dir, 'profile.tex'), 'w') { |f| f.write(profile) }
+        File.write(File.join(dir, 'profile.tex'), profile)
         advfile = "\\thispagestyle{empty}\\chapter*{Ad}\nsome ad content\n"
-        File.open(File.join(dir, 'advfile.tex'), 'w') { |f| f.write(advfile) }
+        File.write(File.join(dir, 'advfile.tex'), advfile)
         backcover = "\\clearpage\n\\thispagestyle{empty}\\AddToShipoutPictureBG{%\n\\AtPageLowerLeft{\\includegraphics[width=\\paperwidth,height=\\paperheight]{images/backcover.png}}\n}\n\\null"
-        File.open(File.join(dir, 'backcover.tex'), 'w') { |f| f.write(backcover) }
+        File.write(File.join(dir, 'backcover.tex'), backcover)
         expect = File.read(File.join(assets_dir, 'test_template_backmatter.tex'))
-        expect.gsub!(/\\def\\review@reviewversion{[^\}]+}/, "\\def\\review@reviewversion{#{ReVIEW::VERSION}}")
+        expect.gsub!(/\\def\\review@reviewversion{[^}]+}/, "\\def\\review@reviewversion{#{ReVIEW::VERSION}}")
         @maker.basedir = Dir.pwd
         @maker.erb_config
         tmpl = @maker.template_content
@@ -179,7 +197,7 @@ class PDFMakerTest < Test::Unit::TestCase
     @config['pht'] = ['Mrs.Smith']
     @config['language'] = 'ja'
     history = @maker.make_history_list
-    expect = ['2011年1月1日　発行']
+    expect = ['2020年7月11日　発行']
     assert_equal expect, history
   end
 
@@ -190,9 +208,9 @@ class PDFMakerTest < Test::Unit::TestCase
     @config['language'] = 'ja'
     @config['history'] =
       [['2011-08-03 v1.0.0版発行',
-        '2012-02-15 v1.1.0版発行']]
+        '2020-07-11 v1.2.0版発行']]
     history = @maker.make_history_list
-    expect = ['2011年8月3日　v1.0.0版発行', '2012年2月15日　v1.1.0版発行']
+    expect = ['2011年8月3日　v1.0.0版発行', '2020年7月11日　v1.2.0版発行']
     assert_equal expect, history
   end
 
@@ -243,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

@@ -3,34 +3,128 @@ require 'tmpdir'
 require 'fileutils'
 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
-    FileUtils.rm_rf @tmpdir1
+    FileUtils.rm_rf(@tmpdir1)
     ENV['RUBYLIB'] = @old_rubylib
   end
 
-  def test_pdfmaker_cmd
+  def common_buildpdf(bookdir, templatedir, configfile, targetpdffile, option = nil)
     if /mswin|mingw|cygwin/ !~ RUBY_PLATFORM
-      config = prepare_samplebook(@tmpdir1)
+      config = prepare_samplebook(@tmpdir1, bookdir, templatedir, configfile)
       builddir = File.join(@tmpdir1, config['bookname'] + '-pdf')
-      # assert !File.exist?(builddir)
+      assert !File.exist?(builddir)
 
       ruby_cmd = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])
       Dir.chdir(@tmpdir1) do
-        system("#{ruby_cmd} -S #{REVIEW_PDFMAKER} config.yml 1>/dev/null 2>/dev/null")
+        _o, e, s = Open3.capture3("#{ruby_cmd} -S #{REVIEW_PDFMAKER} #{option} #{configfile}")
+        if !e.empty? && !s.success?
+          $stderr.puts e
+        end
+        assert s.success?
       end
+      assert File.exist?(File.join(@tmpdir1, targetpdffile))
+    end
+  end
+
+  def test_pdfmaker_cmd_sample_jsbook_print
+    begin
+      `uplatex -v`
+    rescue
+      $stderr.puts 'skip test_pdfmaker_cmd_sample_jsbook_print'
+      return true
+    end
+    common_buildpdf('sample-book/src', 'review-jsbook', 'config.yml', 'book.pdf')
+  end
+
+  def test_pdfmaker_cmd_sample_jsbook_ebook
+    begin
+      `uplatex -v`
+    rescue
+      $stderr.puts 'skip test_pdfmaker_cmd_sample_jsbook_ebook'
+      return true
+    end
+    common_buildpdf('sample-book/src', 'review-jsbook', 'config-ebook.yml', 'book.pdf')
+  end
+
+  def test_pdfmaker_cmd_sample_jlreq_print
+    begin
+      `uplatex -v`
+    rescue
+      $stderr.puts 'skip test_pdfmaker_cmd_sample_jlreq_print'
+      return true
+    end
+    common_buildpdf('sample-book/src', 'review-jlreq', 'config-jlreq.yml', 'book.pdf')
+  end
+
+  def test_pdfmaker_cmd_sample_jlreq_ebook
+    begin
+      `uplatex -v`
+    rescue
+      $stderr.puts 'skip test_pdfmaker_cmd_sample_jlreq_ebook'
+      return true
+    end
+    common_buildpdf('sample-book/src', 'review-jlreq', 'config-jlreq-ebook.yml', 'book.pdf')
+  end
+
+  def test_pdfmaker_cmd_syntax_jsbook_print
+    begin
+      `uplatex -v`
+    rescue
+      $stderr.puts 'skip test_pdfmaker_cmd_syntax_jsbook_print'
+      return true
+    end
+    common_buildpdf('syntax-book', 'review-jsbook', 'config-print.yml', 'syntax-book.pdf')
+  end
+
+  def test_pdfmaker_cmd_syntax_jsbook_print_buildonly
+    begin
+      `uplatex -v`
+    rescue
+      $stderr.puts 'skip test_pdfmaker_cmd_syntax_jsbook_print_buildonly'
+      return true
+    end
+    common_buildpdf('syntax-book', 'review-jsbook', 'config-print.yml', 'syntax-book.pdf', '-y ch01')
+  end
+
+  def test_pdfmaker_cmd_syntax_jsbook_ebook
+    begin
+      `uplatex -v`
+    rescue
+      $stderr.puts 'skip test_pdfmaker_cmd_syntax_jsbook_ebook'
+      return true
+    end
+    common_buildpdf('syntax-book', 'review-jsbook', 'config.yml', 'syntax-book.pdf')
+  end
+
+  def test_pdfmaker_cmd_syntax_jlreq_ebook
+    begin
+      `uplatex -v`
+    rescue
+      $stderr.puts 'skip test_pdfmaker_cmd_syntax_jlreq_ebook'
+      return true
+    end
+    common_buildpdf('syntax-book', 'review-jlreq', 'config-jlreq.yml', 'syntax-book.pdf')
+  end
 
-      assert File.exist?(builddir)
+  def test_pdfmaker_cmd_syntax_jlreq_ebook_lualatex
+    begin
+      `lualatex -v`
+    rescue
+      $stderr.puts 'skip test_pdfmaker_cmd_syntax_jlreq_ebook_lualatex'
+      return true
     end
+    common_buildpdf('syntax-book', 'review-jlreq', 'config-jlreq-lualatex.yml', 'syntax-book.pdf')
   end
 end