review 5.1.1 → 5.4.0

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)
@@ -149,7 +151,8 @@ class TOPBuidlerTest < Test::Unit::TestCase
     actual = compile_block("//table{\n★1☆\t▲2☆\n------------\n★3☆\t▲4☆<>&\n//}\n")
     expected = <<-EOS
 ◆→開始:表←◆
-★★1☆☆\t★▲2☆☆
+★1☆\t▲2☆
+------------
 ★3☆\t▲4☆<>&
 ◆→終了:表←◆
 
@@ -504,7 +507,8 @@ EOS
     actual = compile_block("//table{\naaa\tbbb\n------------\nccc\tddd<>&\n//}\n")
     expected = <<-EOS
 ◆→開始:表←◆
-★aaa☆\t★bbb☆
+aaa\tbbb
+------------
 ccc\tddd<>&
 ◆→終了:表←◆
 
@@ -516,7 +520,8 @@ EOS
 ◆→開始:表←◆
 表1.1　FOO
 
-★aaa☆\t★bbb☆
+aaa\tbbb
+------------
 ccc\tddd<>&
 ◆→終了:表←◆
 
@@ -527,22 +532,46 @@ EOS
     actual = compile_block("//table[foo][FOO]{\naaa\tbbb\n------------\nccc\tddd<>&\n//}\n")
     expected = <<-EOS
 ◆→開始:表←◆
-★aaa☆\t★bbb☆
+aaa\tbbb
+------------
 ccc\tddd<>&
 
 表1.1　FOO
 ◆→終了:表←◆
 
+EOS
+    assert_equal expected, actual
+  end
+
+  def test_table_th_bold
+    @config['textmaker']['th_bold'] = true
+    actual = compile_block("//table{\naaa\tbbb\n------------\nccc\tddd<>&\n//}\n")
+    expected = <<-EOS
+◆→開始:表←◆
+★aaa☆\t★bbb☆
+ccc\tddd<>&
+◆→終了:表←◆
+
+EOS
+    assert_equal expected, actual
+
+    actual = compile_block("//table{\naaa\tbbb\nccc\tddd<>&\n//}\n")
+    expected = <<-EOS
+◆→開始:表←◆
+★aaa☆\tbbb
+★ccc☆\tddd<>&
+◆→終了:表←◆
+
 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
+    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
+    assert_equal 'no rows in the table', e.message
   end
 
   def test_inline_table
@@ -559,6 +588,28 @@ EOS
 ◆→開始:表←◆
 foo
 
+aaa\tbbb
+------------
+ccc\tddd<>&
+◆→終了:表←◆
+
+◆→開始:表←◆
+aaa\tbbb
+------------
+ccc\tddd<>&
+◆→終了:表←◆
+
+EOS
+    assert_equal expected, actual
+  end
+
+  def test_emtable_thbold
+    @config['textmaker']['th_bold'] = true
+    actual = compile_block("//emtable[foo]{\naaa\tbbb\n------------\nccc\tddd<>&\n//}\n//emtable{\naaa\tbbb\n------------\nccc\tddd<>&\n//}\n")
+    expected = <<-EOS
+◆→開始:表←◆
+foo
+
 ★aaa☆\t★bbb☆
 ccc\tddd<>&
 ◆→終了:表←◆
@@ -568,6 +619,37 @@ ccc\tddd<>&
 ccc\tddd<>&
 ◆→終了:表←◆
 
+EOS
+    assert_equal expected, actual
+  end
+
+  def test_imgtable
+    def @chapter.image(_id)
+      item = Book::Index::Item.new('sampleimg', 1)
+      item.instance_eval { @path = './images/chap1-sampleimg.png' }
+      item
+    end
+
+    actual = compile_block("//imgtable[sampleimg][sample photo]{\nfoo\n//}\n")
+    expected = <<-EOS
+◆→開始:表←◆
+表1.1　sample photo
+
+◆→./images/chap1-sampleimg.png←◆
+◆→終了:表←◆
+
+EOS
+    assert_equal expected, actual
+
+    @config['caption_position']['table'] = 'bottom'
+    actual = compile_block("//imgtable[sampleimg][sample photo]{\nfoo\n//}\n")
+    expected = <<-EOS
+◆→開始:表←◆
+◆→./images/chap1-sampleimg.png←◆
+
+表1.1　sample photo
+◆→終了:表←◆
+
 EOS
     assert_equal expected, actual
   end
@@ -576,7 +658,8 @@ EOS
     src = "//table{\n1\t2\t\t3  4| 5\n------------\na b\tc  d   |e\n//}\n"
     expected = <<-EOS
 ◆→開始:表←◆
-★1☆	★2☆	★3  4| 5☆
+1	2	3  4| 5
+------------
 a b	c  d   |e	
 ◆→終了:表←◆
 
@@ -588,7 +671,8 @@ EOS
     actual = compile_block(src)
     expected = <<-EOS
 ◆→開始:表←◆
-★1☆	★2☆	★☆	★3  4| 5☆
+1	2		3  4| 5
+------------
 a b	c  d   |e		
 ◆→終了:表←◆
 
@@ -599,7 +683,8 @@ EOS
     actual = compile_block(src)
     expected = <<-EOS
 ◆→開始:表←◆
-★1☆	★2☆	★3☆	★4|☆	★5☆
+1	2	3	4|	5
+------------
 a	b	c	d	|e
 ◆→終了:表←◆
 
@@ -610,7 +695,8 @@ EOS
     actual = compile_block(src)
     expected = <<-EOS
 ◆→開始:表←◆
-★1	2		3  4☆	★5☆
+1	2		3  4	5
+------------
 a b	c  d	e
 ◆→終了:表←◆
 
@@ -879,8 +965,8 @@ EOS
 
 //}
 EOS
-      e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-      assert_match(/minicolumn cannot be nested:/, e.message)
+      assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+      assert_match(/minicolumn cannot be nested:/, @log_io.string)
     end
   end
 
@@ -896,8 +982,8 @@ EOS
 
 //}
 EOS
-      e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-      assert_match(/minicolumn cannot be nested:/, e.message)
+      assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+      assert_match(/minicolumn cannot be nested:/, @log_io.string)
     end
   end
 
@@ -912,8 +998,8 @@ EOS
 
 //}
 EOS
-      e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-      assert_match(/minicolumn cannot be nested:/, e.message)
+      assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+      assert_match(/minicolumn cannot be nested:/, @log_io.string)
     end
   end
 
@@ -963,6 +1049,63 @@ EOS
 図1.1　sample photo
 ◆→終了:図←◆
 
+EOS
+    assert_equal expected, actual
+  end
+
+  def test_image_dummy
+    actual = compile_block("//image[dummy][sample photo]{\nDUMMY\n//}\n")
+    expected = <<-EOS
+◆→開始:図←◆
+DUMMY
+
+図1.1　sample photo
+◆→終了:図←◆
+
+EOS
+    assert_equal expected, actual
+  end
+
+  def test_indepimage
+    def @chapter.image(_id)
+      item = Book::Index::Item.new('sampleimg', 1)
+      item.instance_eval { @path = './images/chap1-sampleimg.png' }
+      item
+    end
+
+    actual = compile_block("//indepimage[sampleimg][sample photo]{\nfoo\n//}\n")
+    expected = <<-EOS
+◆→開始:図←◆
+◆→./images/chap1-sampleimg.png←◆
+
+図　sample photo
+◆→終了:図←◆
+
+EOS
+    assert_equal expected, actual
+
+    @config['caption_position']['image'] = 'top'
+    actual = compile_block("//indepimage[sampleimg][sample photo]{\nfoo\n//}\n")
+    expected = <<-EOS
+◆→開始:図←◆
+図　sample photo
+
+◆→./images/chap1-sampleimg.png←◆
+◆→終了:図←◆
+
+EOS
+    assert_equal expected, actual
+  end
+
+  def test_indepimage_dummy
+    actual = compile_block("//indepimage[dummy][sample photo]{\nDUMMY\n//}\n")
+    expected = <<-EOS
+◆→開始:図←◆
+DUMMY
+
+図　sample photo
+◆→終了:図←◆
+
 EOS
     assert_equal expected, actual
   end
@@ -981,12 +1124,11 @@ EOS
 
   def test_inline_w
     Dir.mktmpdir do |dir|
-      File.open(File.join(dir, 'words.csv'), 'w') do |f|
-        f.write <<EOB
+      File.write(File.join(dir, 'words.csv'), <<EOB
 "F","foo"
 "B","bar""\\<>_@<b>{BAZ}"
 EOB
-      end
+      )
       @book.config['words_file'] = File.join(dir, 'words.csv')
 
       io = StringIO.new
@@ -997,20 +1139,44 @@ EOB
     end
   end
 
+  def test_endnote
+    e = assert_raises(ReVIEW::ApplicationError) { compile_block("//endnote[foo][bar]\n\n@<endnote>{foo}\n") }
+    assert_equal ':4: //endnote is found but //printendnotes is not found.', e.message
+
+    actual = compile_block("@<endnote>{foo}\n//endnote[foo][bar]\n//printendnotes\n")
+    expected = <<-'EOS'
+【後注1】
+◆→開始:後注←◆
+【後注1】bar
+◆→終了:後注←◆
+EOS
+    assert_equal expected, actual
+  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("@<endnote>{n}\n") }
+    assert_match(/unknown endnote: 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_yamlloader.rb

@@ -14,12 +14,11 @@ class YAMLLoaderTest < Test::Unit::TestCase
   def test_load_file
     Dir.mktmpdir do |dir|
       yaml_file = File.join(dir, 'test.yml')
-      File.open(yaml_file, 'w') do |f|
-        f.write <<EOB
+      File.write(yaml_file, <<EOB
 foo:
   bar: "test"
 EOB
-      end
+      )
       yaml = @loader.load_file(yaml_file)
       assert_equal yaml, 'foo' => { 'bar' => 'test' }
     end
@@ -29,24 +28,22 @@ EOB
     Dir.mktmpdir do |dir|
       yaml_file = File.join(dir, 'test.yml')
       yaml_file2 = File.join(dir, 'test2.yml')
-      File.open(yaml_file, 'w') do |f|
-        f.write <<EOB
+      File.write(yaml_file, <<EOB
 k0: 2
 k1:
   name: "test"
   array: [{name: "N", val: "V"}]
 inherit: ["test2.yml"]
 EOB
-      end
-      File.open(yaml_file2, 'w') do |f|
-        f.write <<EOB
+      )
+      File.write(yaml_file2, <<EOB
 k1:
   name: "test2"
   name2: "value2"
   array: [{name: "shoudoverridden_name", val: "shouldoverridden_val"}]
 k2: "3"
 EOB
-      end
+      )
       yaml = @loader.load_file(yaml_file)
       assert_equal({ 'k0' => 2,
                      'k1' => { 'name' => 'test', 'name2' => 'value2',
@@ -61,31 +58,28 @@ EOB
       yaml_file = File.join(dir, 'test.yml')
       yaml_file2 = File.join(dir, 'test2.yml')
       yaml_file3 = File.join(dir, 'test3.yml')
-      File.open(yaml_file, 'w') do |f|
-        f.write <<EOB
+      File.write(yaml_file, <<EOB
 k0: 2
 k1:
   name1: "value1-1"
 inherit: ["test3.yml", "test2.yml"]
 EOB
-      end
-      File.open(yaml_file2, 'w') do |f|
-        f.write <<EOB
+      )
+      File.write(yaml_file2, <<EOB
 k1:
   name1: "value1-2"
   name2: "value2-2"
 k2: "B"
 EOB
-      end
-      File.open(yaml_file3, 'w') do |f|
-        f.write <<EOB
+      )
+      File.write(yaml_file3, <<EOB
 k1:
   name1: "value1-3"
   name2: "value2-3"
   name3: "value3-3"
 k3: "C"
 EOB
-      end
+      )
       yaml = @loader.load_file(yaml_file)
       assert_equal({
                      'k0' => 2,
@@ -106,40 +100,35 @@ EOB
       yaml_file5 = File.join(dir, 'test5.yml')
       yaml_file6 = File.join(dir, 'test6.yml')
       yaml_file7 = File.join(dir, 'test7.yml')
-      File.open(yaml_file7, 'w') do |f|
-        f.write <<EOB
+      File.write(yaml_file7, <<EOB
 k1:
   name1: "N7"
 inherit: ["test3.yml", "test6.yml"]
 EOB
-      end
-      File.open(yaml_file6, 'w') do |f|
-        f.write <<EOB
+      )
+      File.write(yaml_file6, <<EOB
 k1:
   name1: "N6"
   name2: "N6"
 inherit: ["test4.yml", "test5.yml"]
 EOB
-      end
-      File.open(yaml_file5, 'w') do |f|
-        f.write <<EOB
+      )
+      File.write(yaml_file5, <<EOB
 k1:
   name1: "N5"
   name2: "N5"
   name3: "N5"
 EOB
-      end
-      File.open(yaml_file4, 'w') do |f|
-        f.write <<EOB
+      )
+      File.write(yaml_file4, <<EOB
 k1:
   name1: "N4"
   name2: "N4"
   name3: "N4"
   name4: "N4"
 EOB
-      end
-      File.open(yaml_file3, 'w') do |f|
-        f.write <<EOB
+      )
+      File.write(yaml_file3, <<EOB
 k1:
   name1: "N3"
   name2: "N3"
@@ -148,9 +137,8 @@ k1:
   name5: "N3"
 inherit: ["test1.yml", "test2.yml"]
 EOB
-      end
-      File.open(yaml_file2, 'w') do |f|
-        f.write <<EOB
+      )
+      File.write(yaml_file2, <<EOB
 k1:
   name1: "N2"
   name2: "N2"
@@ -159,9 +147,8 @@ k1:
   name5: "N2"
   name6: "N2"
 EOB
-      end
-      File.open(yaml_file1, 'w') do |f|
-        f.write <<EOB
+      )
+      File.write(yaml_file1, <<EOB
 k1:
   name1: "N1"
   name2: "N1"
@@ -171,7 +158,7 @@ k1:
   name6: "N1"
   name7: "N1"
 EOB
-      end
+      )
 
       yaml = @loader.load_file(yaml_file7)
       assert_equal({ 'k1' => { 'name1' => 'N7',
@@ -188,11 +175,10 @@ EOB
   def test_empty_file
     Dir.mktmpdir do |dir|
       yaml_file = File.join(dir, 'test.yml')
-      File.open(yaml_file, 'w') do |f|
-        f.write <<EOB
+      File.write(yaml_file, <<EOB
 #
 EOB
-      end
+      )
       e = assert_raise(RuntimeError) { @loader.load_file(yaml_file) }
       assert_match('test.yml is malformed.', e.message)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: review
 version: !ruby/object:Gem::Version
-  version: 5.1.1
+  version: 5.4.0
 platform: ruby
 authors:
 - kmuto
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-04 00:00:00.000000000 Z
+date: 2022-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: image_size
@@ -115,14 +115,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.12.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -337,6 +337,7 @@ files:
 - lib/review/latexutils.rb
 - lib/review/lineinput.rb
 - lib/review/location.rb
+- lib/review/loggable.rb
 - lib/review/logger.rb
 - lib/review/makerhelper.rb
 - lib/review/markdownbuilder.rb
@@ -344,6 +345,9 @@ files:
 - lib/review/pdfmaker.rb
 - lib/review/plaintextbuilder.rb
 - lib/review/preprocessor.rb
+- lib/review/preprocessor/directive.rb
+- lib/review/preprocessor/line.rb
+- lib/review/preprocessor/repository.rb
 - lib/review/rstbuilder.rb
 - lib/review/sec_counter.rb
 - lib/review/template.rb
@@ -620,7 +624,8 @@ files:
 homepage: http://github.com/kmuto/review
 licenses:
 - LGPL
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -636,7 +641,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: 'Re:VIEW: a easy-to-use digital publishing system'