review 4.1.0 → 5.2.0

data/test/test_book.rb

@@ -23,8 +23,8 @@ class BookTest < Test::Unit::TestCase
     test_const = "ReVIEW__BOOK__TEST__#{num}"
     begin
       Dir.mktmpdir do |dir|
-        File.open(File.join(dir, 'review-ext.rb'), 'w') { |o| o.puts "#{test_const} = #{num}" }
-        Book::Base.load(dir)
+        File.write(File.join(dir, 'review-ext.rb'), "#{test_const} = #{num}")
+        Book::Base.new(dir)
         assert_equal num, (Object.class_eval { const_get(test_const) })
       end
     ensure
@@ -159,12 +159,12 @@ class BookTest < Test::Unit::TestCase
   end
 
   def test_parse_chapters
-    mktmpbookdir 'CHAPS' => '' do |_dir, book, _files|
+    mktmpbookdir('CHAPS' => '') do |_dir, book, _files|
       parts = book.instance_eval { parse_chapters }
       assert_equal 0, parts.size
     end
 
-    mktmpbookdir 'CHAPS' => "chapter1.re\nchapter2\n" do |dir, book, _files|
+    mktmpbookdir('CHAPS' => "chapter1.re\nchapter2\n") do |dir, book, _files|
       parts = book.instance_eval { parse_chapters }
       assert_equal 1, parts.size
 
@@ -178,7 +178,7 @@ class BookTest < Test::Unit::TestCase
       assert_equal expect, chaps
     end
 
-    mktmpbookdir 'CHAPS' => <<EOC do |dir, book, _files|
+    mktmpbookdir('CHAPS' => <<EOC) do |dir, book, _files|
 part1_chapter1.re
 part1_chapter2.re
 
@@ -280,22 +280,22 @@ EOC
       assert_equal nil, book.prefaces
     end
 
-    mktmpbookdir 'PREDEF' => '' do |_dir, book, _files|
+    mktmpbookdir('PREDEF' => '') do |_dir, book, _files|
       assert_equal nil, book.prefaces # XXX: OK?
     end
 
-    mktmpbookdir 'PREDEF' => 'chapter1',
-                 'chapter1.re' => '' do |_dir, book, files|
-      assert_kind_of Book::Part, book.prefaces
+    mktmpbookdir('PREDEF' => 'chapter1',
+                 'chapter1.re' => '') do |_dir, book, files|
+      assert_kind_of(Book::Part, book.prefaces)
       assert_equal '', book.prefaces.name
       assert_equal 1, book.prefaces.chapters.size
       assert_equal 'chapter1', book.prefaces.chapters.first.name
       assert_equal files['chapter1.re'], book.prefaces.chapters.first.path
     end
 
-    mktmpbookdir 'PREDEF' => "chapter1\n\nchapter2",
-                 'chapter1.re' => '', 'chapter2.re' => '' do |_dir, book, files|
-      assert_kind_of Book::Part, book.prefaces
+    mktmpbookdir('PREDEF' => "chapter1\n\nchapter2",
+                 'chapter1.re' => '', 'chapter2.re' => '') do |_dir, book, files|
+      assert_kind_of(Book::Part, book.prefaces)
       assert_equal '', book.prefaces.name
       assert_equal 2, book.prefaces.chapters.size
       assert_equal 'chapter1', book.prefaces.chapters.first.name
@@ -304,29 +304,29 @@ EOC
       assert_equal files['chapter2.re'], book.prefaces.chapters.last.path
     end
 
-    mktmpbookdir 'PREDEF' => 'chapter1 chapter2',
-                 'chapter1.re' => '', 'chapter2.re' => '' do |_dir, book, _files|
-      assert_kind_of Book::Part, book.prefaces
+    mktmpbookdir('PREDEF' => 'chapter1 chapter2',
+                 'chapter1.re' => '', 'chapter2.re' => '') do |_dir, book, _files|
+      assert_kind_of(Book::Part, book.prefaces)
       assert_equal '', book.prefaces.name
       assert_equal 2, book.prefaces.chapters.size # XXX: OK?
     end
 
-    mktmpbookdir 'PREDEF' => 'not_exist' do |_dir, book, _files|
+    mktmpbookdir('PREDEF' => 'not_exist') do |_dir, book, _files|
       assert_raises FileNotFound do
         assert_equal nil, book.prefaces
       end
     end
 
-    mktmpbookdir 'PREDEF' => 'chapter1.re',
-                 'chapter1.re' => '' do |_dir, book, _files|
-      assert_kind_of Book::Part, book.prefaces
+    mktmpbookdir('PREDEF' => 'chapter1.re',
+                 'chapter1.re' => '') do |_dir, book, _files|
+      assert_kind_of(Book::Part, book.prefaces)
       assert_equal '', book.prefaces.name
       assert_equal 1, book.prefaces.chapters.size
     end
 
-    mktmpbookdir 'PREDEF' => 'chapter1.txt',
-                 'chapter1.txt' => '' do |_dir, book, _files|
-      assert_kind_of Book::Part, book.prefaces
+    mktmpbookdir('PREDEF' => 'chapter1.txt',
+                 'chapter1.txt' => '') do |_dir, book, _files|
+      assert_kind_of(Book::Part, book.prefaces)
       assert_equal '', book.prefaces.name
       assert_equal 1, book.prefaces.chapters.size
     end
@@ -337,13 +337,13 @@ EOC
       assert_equal nil, book.appendix
     end
 
-    mktmpbookdir 'POSTDEF' => '' do |_dir, book, _files|
+    mktmpbookdir('POSTDEF' => '') do |_dir, book, _files|
       assert_equal nil, book.appendix
     end
 
-    mktmpbookdir 'POSTDEF' => 'chapter1',
-                 'chapter1.re' => '' do |_dir, book, files|
-      assert_kind_of Book::Part, book.appendix
+    mktmpbookdir('POSTDEF' => 'chapter1',
+                 'chapter1.re' => '') do |_dir, book, files|
+      assert_kind_of(Book::Part, book.appendix)
       assert_equal '', book.appendix.name
       assert_equal 1, book.appendix.chapters.size
       assert_equal 'chapter1', book.appendix.chapters.first.name
@@ -351,9 +351,9 @@ EOC
       assert_equal 1, book.appendix.chapters.first.number
     end
 
-    mktmpbookdir 'POSTDEF' => "chapter1\n\nchapter2",
-                 'chapter1.re' => '', 'chapter2.re' => '' do |_dir, book, files|
-      assert_kind_of Book::Part, book.appendix
+    mktmpbookdir('POSTDEF' => "chapter1\n\nchapter2",
+                 'chapter1.re' => '', 'chapter2.re' => '') do |_dir, book, files|
+      assert_kind_of(Book::Part, book.appendix)
       assert_equal '', book.appendix.name
       assert_equal 2, book.appendix.chapters.size
       assert_equal 'chapter1', book.appendix.chapters.first.name
@@ -364,32 +364,32 @@ EOC
       assert_equal 2, book.appendix.chapters.last.number
     end
 
-    mktmpbookdir 'POSTDEF' => 'chapter1 chapter2',
-                 'chapter1.re' => '', 'chapter2.re' => '' do |_dir, book, _files|
-      assert_kind_of Book::Part, book.appendix
+    mktmpbookdir('POSTDEF' => 'chapter1 chapter2',
+                 'chapter1.re' => '', 'chapter2.re' => '') do |_dir, book, _files|
+      assert_kind_of(Book::Part, book.appendix)
       assert_equal '', book.appendix.name
       assert_equal 2, book.appendix.chapters.size # XXX: OK?
       assert_equal 1, book.appendix.chapters.first.number
       assert_equal 2, book.appendix.chapters.last.number
     end
 
-    mktmpbookdir 'POSTDEF' => 'not_exist' do |_dir, book, _files|
+    mktmpbookdir('POSTDEF' => 'not_exist') do |_dir, book, _files|
       assert_raises FileNotFound do
         assert_equal nil, book.appendix
       end
     end
 
-    mktmpbookdir 'catalog.yml' => "APPENDIX:\n  - p01.re",
-                 'p01.re' => '= appendix' do |_dir, book, _files|
+    mktmpbookdir('catalog.yml' => "APPENDIX:\n  - p01.re",
+                 'p01.re' => '= appendix') do |_dir, book, _files|
       assert_equal 'appendix', book.appendix.chapters.first.title
       assert_equal 1, book.appendix.chapters.first.number
     end
   end
 
   def test_postscripts
-    mktmpbookdir 'catalog.yml' => "POSTDEF:\n  - b01.re",
-                 'b01.re' => '= back' do |_dir, book, _files|
-      assert_kind_of Book::Part, book.postscripts
+    mktmpbookdir('catalog.yml' => "POSTDEF:\n  - b01.re",
+                 'b01.re' => '= back') do |_dir, book, _files|
+      assert_kind_of(Book::Part, book.postscripts)
       assert_equal 1, book.postscripts.chapters.size
       assert_equal 'back', book.postscripts.chapters.first.title
       assert_equal nil, book.postscripts.chapters.first.number
@@ -407,7 +407,7 @@ EOC
       assert tmp.empty?
     end
 
-    mktmpbookdir 'CHAPS' => "ch1\nch2\n\nch3", 'PART' => "foo\nbar\n" do |_dir, book, _files|
+    mktmpbookdir('CHAPS' => "ch1\nch2\n\nch3", 'PART' => "foo\nbar\n") do |_dir, book, _files|
       parts = book.parts
       assert_equal 2, parts.size
       assert !book.part(0)
@@ -432,10 +432,10 @@ EOC
       assert tmp.empty?
     end
 
-    mktmpbookdir 'CHAPS' => "ch1.re\nch2.re\n\nch3.re\n",
+    mktmpbookdir('CHAPS' => "ch1.re\nch2.re\n\nch3.re\n",
                  'PART' => "foo\nbar\n",
                  'ch1.re' => "= ch1\n\n", 'ch2.re' => "= ch2\n\n",
-                 'ch3.re' => "= ch3\n\n" do |_dir, book, _files|
+                 'ch3.re' => "= ch3\n\n") do |_dir, book, _files|
       parts = book.parts_in_file
       assert_equal 0, parts.size
       assert !book.part(0)
@@ -448,11 +448,11 @@ EOC
       assert_equal [1, 2], tmp
     end
 
-    mktmpbookdir 'CHAPS' => "ch1.re\nch2.re\n\nch3.re\n",
+    mktmpbookdir('CHAPS' => "ch1.re\nch2.re\n\nch3.re\n",
                  'PART' => "foo.re\nbar.re\n",
                  'foo.re' => "= part1\n\n", 'bar.re' => "= part2\n\n",
                  'ch1.re' => "= ch1\n\n", 'ch2.re' => "= ch2\n\n",
-                 'ch3.re' => "= ch3\n\n" do |_dir, book, _files|
+                 'ch3.re' => "= ch3\n\n") do |_dir, book, _files|
       parts = book.parts_in_file
       assert_equal 2, parts.size
       assert !book.part(0)
@@ -467,7 +467,7 @@ EOC
   end
 
   def test_chapters
-    mktmpbookdir 'CHAPS' => "ch1\nch2\n\nch3" do |_dir, book, _files|
+    mktmpbookdir('CHAPS' => "ch1\nch2\n\nch3") do |_dir, book, _files|
       chapters = book.chapters
       assert_equal 3, chapters.size
 
@@ -486,7 +486,7 @@ EOC
       end
     end
 
-    mktmpbookdir 'CHAPS' => "ch1.txt\nch2.txt\n\nch3.txt" do |_dir, book, _files|
+    mktmpbookdir('CHAPS' => "ch1.txt\nch2.txt\n\nch3.txt") do |_dir, book, _files|
       chapters = book.chapters
       assert_equal 3, chapters.size
 
@@ -507,7 +507,7 @@ EOC
   end
 
   def test_next_chapter
-    mktmpbookdir 'CHAPS' => "ch1\nch2" do |_dir, book, _files|
+    mktmpbookdir('CHAPS' => "ch1\nch2") do |_dir, book, _files|
       chapter = book.chapter('ch1')
       assert_equal book.chapter('ch2'), book.next_chapter(chapter)
 
@@ -517,7 +517,7 @@ EOC
   end
 
   def test_prev_chapter
-    mktmpbookdir 'CHAPS' => "ch1\nch2" do |_dir, book, _files|
+    mktmpbookdir('CHAPS' => "ch1\nch2") do |_dir, book, _files|
       chapter = book.chapter('ch2')
       assert_equal book.chapter('ch1'), book.prev_chapter(chapter)
 
@@ -534,14 +534,14 @@ EOC
       assert_equal 0, book.volume.lines
     end
 
-    mktmpbookdir 'CHAPS' => 'chapter1.re', 'chapter1.re' => '12345' do |_dir, book, _files|
+    mktmpbookdir('CHAPS' => 'chapter1.re', 'chapter1.re' => '12345') do |_dir, book, _files|
       assert book.volume
       assert book.volume.bytes > 0
       assert book.volume.chars > 0
       assert book.volume.lines > 0
     end
 
-    mktmpbookdir 'preface.re' => '12345' do |dir, _book, _files|
+    mktmpbookdir('preface.re' => '12345') do |dir, _book, _files|
       Dir.chdir(dir) do
         book2 = Book::Base.new('.')
         assert book2.volume
@@ -560,12 +560,9 @@ EOC
   end
 
   def test_contentdir
-    mktmpbookdir('config.yml' => "contentdir: content\n", 'catalog.yml' => "CHAPS:\n - ch01.re\n") do |dir, _book, _files|
-      Dir.mkdir('content')
-      File.open('content/ch01.re', 'w') { |f| f.puts "foo\n" }
-      book = Book::Base.new(dir)
-      config_file = File.join(dir, 'config.yml')
-      book.load_config(config_file)
+    mktmpbookdir('config.yml' => "contentdir: content\n",
+                 'catalog.yml' => "CHAPS:\n - ch01.re\n",
+                 'content/ch01.re' => "foo\n") do |_dir, book, _files|
       assert_equal "foo\n", book.chapters[0].content
     end
   end
@@ -578,19 +575,13 @@ EOC
   end
 
   def test_page_metric_config
-    mktmpbookdir('config.yml' => "bookname: book\npage_metric: B5\n") do |dir, _book, _files|
-      book = Book::Base.new(dir)
-      config_file = File.join(dir, 'config.yml')
-      book.load_config(config_file)
+    mktmpbookdir('config.yml' => "bookname: book\npage_metric: B5\n") do |_dir, book, _files|
       assert_equal ReVIEW::Book::PageMetric::B5, book.page_metric
     end
   end
 
   def test_page_metric_config_array
-    mktmpbookdir('config.yml' => "bookname: book\npage_metric: [46, 80, 30, 74, 2]\n") do |dir, _book, _files|
-      book = Book::Base.new(dir)
-      config_file = File.join(dir, 'config.yml')
-      book.load_config(config_file)
+    mktmpbookdir('config.yml' => "bookname: book\npage_metric: [50, 40, 36, 40, 1]\n") do |_dir, book, _files|
       assert_equal ReVIEW::Book::PageMetric::B5, book.page_metric
     end
   end

data/test/test_book_chapter.rb

@@ -2,6 +2,10 @@ require 'book_test_helper'
 class ChapterTest < Test::Unit::TestCase
   include BookTestHelper
 
+  def setup
+    I18n.setup
+  end
+
   def test_initialize
     ch = Book::Chapter.new(:book, :number, :name, '/foo/bar', :io)
     assert_equal :book, ch.book
@@ -66,6 +70,7 @@ class ChapterTest < Test::Unit::TestCase
 
     book = Book::Base.new
     ch = Book::Chapter.new(book, nil, nil, tf.path)
+    ch.generate_indexes
     assert_equal lines, ch.lines
 
     lines = ["1\n", "2\n", '3']
@@ -78,6 +83,7 @@ class ChapterTest < Test::Unit::TestCase
     tf2.close
 
     ch = Book::Chapter.new(book, nil, nil, tf1.path, tf2.path)
+    ch.generate_indexes
     assert_equal lines, ch.lines # XXX: OK?
   end
 
@@ -103,20 +109,20 @@ class ChapterTest < Test::Unit::TestCase
   end
 
   def test_on_chaps?
-    mktmpbookdir 'CHAPS' => "chapter1.re\nchapter2.re",
-                 'chapter1.re' => '12345', 'preface.re' => 'abcde' do |dir, book, files|
+    mktmpbookdir('CHAPS' => "chapter1.re\nchapter2.re",
+                 'chapter1.re' => '12345', 'preface.re' => 'abcde') do |dir, book, files|
       ch1 = Book::Chapter.new(book, 1, 'chapter1', files['chapter1.re'])
       pre = Book::Chapter.new(book, nil, 'preface', files['preface.re'])
 
       assert ch1.on_chaps?
       assert !pre.on_chaps?
 
-      ch2_path = File.join(dir, 'chapter2.er')
-      File.open(ch2_path, 'w') {}
+      ch2_path = File.join(dir, 'chapter2.re')
+      FileUtils.touch(ch2_path)
       ch2 = Book::Chapter.new(book, 2, 'chapter2', ch2_path)
 
-      ch3_path = File.join(dir, 'chapter3.er')
-      File.open(ch3_path, 'w') {}
+      ch3_path = File.join(dir, 'chapter3.re')
+      FileUtils.touch(ch3_path)
       ch3 = Book::Chapter.new(book, 3, 'chapter3', ch3_path)
 
       assert ch2.on_chaps?
@@ -124,50 +130,70 @@ class ChapterTest < Test::Unit::TestCase
     end
   end
 
+  def test_invalid_encoding
+    mktmpbookdir('CHAPS' => 'chapter1.re',
+                 'chapter1.re' => "= 日本語UTF-8\n") do |_dir, book, files|
+      assert Book::Chapter.new(book, 1, 'chapter1', files['chapter1.re'])
+    end
+
+    # UTF-16LE UTF-16BE UTF-32LE UTF-32BE cause error on Windows
+    %w[CP932 SHIFT_JIS EUC-JP].each do |enc|
+      mktmpbookdir('CHAPS' => 'chapter1.re',
+                   'chapter1.re' => "= 日本語UTF-8\n".encode(enc)) do |_dir, book, files|
+        e = assert_raises(ReVIEW::CompileError) { Book::Chapter.new(book, 1, 'chapter1', files['chapter1.re']) }
+        assert_equal 'chapter1: invalid byte sequence in UTF-8', e.message
+      end
+    end
+  end
+
   def test_list_index
     do_test_index(<<E, Book::ListIndex, :list_index, :list)
-//list
-//listnum [abc]
-//list [def]
-//table [def]
-//table [others]
+//listnum[abc][abc-listnum]{
+//}
+//list[def][def-list]{
+//}
+//table[def]{
+//}
+//table[others]{
+//}
 E
   end
 
   def test_table_index
     do_test_index(<<E, Book::TableIndex, :table_index, :table)
-//table
-//table [abc]
-//table [def]
-//list [def]
-//list [others]
+//table[abc]{
+//}
+//table[def]{
+//}
+//list[def][def-list]{
+//}
+//list[others][other-list]{
+//}
 E
   end
 
   def test_footnote_index
     content = <<E
-//footnote
-//footnote [abc][text...]
-//footnote [def][text...]
-//footnote [xyz]
-//list [def]
-//list [others]
+//footnote[abc][textabc...]
+//footnote[def][textdef...]
+//footnote[xyz][textxyz...]
+//list[def][def-list]{
+//}
+//list[others][others-list]{
+//}
 E
     do_test_index(content, Book::FootnoteIndex, :footnote_index, :footnote) do |ch|
       assert_raises ReVIEW::KeyError do
-        ch.footnote('xyz')
+        ch.footnote('xyz2')
       end
     end
   end
 
   def test_bibpaper
     do_test_index(<<E, Book::BibpaperIndex, :bibpaper_index, :bibpaper, filename: 'bib.re')
-//bibpaper
-//bibpaper [abc][text...]
-//bibpaper [def][text...]
-//bibpaper [xyz]
-//list [def]
-//list [others]
+//bibpaper[abc][text...]
+//bibpaper[def][text...]
+//bibpaper[xyz][text...]
 E
     assert_raises FileNotFound do
       do_test_index('', Book::BibpaperIndex, :bibpaper_index, :bibpaper, filename: 'bib')
@@ -176,11 +202,12 @@ E
 
   def test_headline_index
     do_test_index(<<E, Book::HeadlineIndex, :headline_index, :headline, propagate: false)
-==
+== x
 == abc
 == def
 === def
-//table others
+//table[others]{
+//}
 E
   end
 
@@ -204,35 +231,47 @@ E
 
   def test_image
     do_test_index(<<E, Book::ImageIndex, :image_index, :image)
-//image
-//image [abc]
-//image [def]
-//list [def]
-//list [others]
+//image[abc][abc-image]{
+//}
+//image[def][abc-image]{
+//}
+//list[def][def-list]{
+//}
+//list[others][others-list]{
+//}
 E
 
     do_test_index(<<E, Book::NumberlessImageIndex, :numberless_image_index, :image, propagate: false)
-//numberlessimage
-//numberlessimage [abc]
-//numberlessimage [def]
-//list [def]
-//list [others]
+//numberlessimage[abc]{
+//}
+//numberlessimage[def]{
+//}
+//list[def][def-list]{
+//}
+//list[others][others-list]{
+//}
 E
 
     do_test_index(<<E, Book::ImageIndex, :image_index, :image)
-//image
-//numberlessimage [abc]
-//image [def]
-//list [def]
-//list [others]
+//numberlessimage[abc]{
+//}
+//image[def][def-image]{
+//}
+//list[def][def-list]{
+//}
+//list[others][others-list]{
+//}
 E
 
     do_test_index(<<E, Book::NumberlessImageIndex, :numberless_image_index, :image, propagate: false)
-//image
-//numberlessimage [abc]
-//image [def]
-//list [def]
-//list [others]
+//numberlessimage[abc]{
+//}
+//image[def][def-image]{
+//}
+//list[def][def-list]{
+//}
+//list[others][others-list]{
+//}
 E
   end
 
@@ -240,13 +279,15 @@ E
     Dir.mktmpdir do |dir|
       path = File.join(dir, opts[:filename] || 'chapter.re')
 
-      book = Book::Base.new(dir)
-
       File.open(path, 'w') do |o|
         o.print content
       end
-      ch = Book::Chapter.new(book, 1, 'chapter', path)
 
+      book = Book::Base.new(dir)
+
+      ch = Book::Chapter.new(book, 1, 'chapter', path)
+      book.generate_indexes
+      ch.generate_indexes
       assert ch.__send__(ref_method, 'abc')
       assert ch.__send__(ref_method, 'def')
       assert_raises ReVIEW::KeyError do