review 3.2.0 → 5.1.0

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
@@ -37,11 +41,13 @@ class ChapterTest < Test::Unit::TestCase
 
   def test_size
     ch = Book::Chapter.new(nil, nil, nil, __FILE__, :io)
-    assert_equal File.size(__FILE__), ch.size
+    filesize = IO.read(__FILE__, mode: 'rt:BOM|utf-8').size
+    assert_equal filesize, ch.size
 
     File.open(__FILE__, 'r') do |i|
       ch = Book::Chapter.new(nil, nil, nil, nil, i)
-      assert_equal File.size(__FILE__), ch.size
+      filesize = IO.read(__FILE__, mode: 'rt:BOM|utf-8').size
+      assert_equal filesize, ch.size
     end
   end
 
@@ -64,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']
@@ -76,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
 
@@ -101,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?
@@ -122,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')
@@ -174,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
 
@@ -202,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
 
@@ -238,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

data/test/test_book_part.rb

@@ -46,8 +46,8 @@ class PartTest < Test::Unit::TestCase
 
     part = Book::Part.new(book, nil, chs)
     assert part.volume
-    assert part.volume.bytes > 0
-    assert part.volume.chars > 0
-    assert part.volume.lines > 0
+    assert part.volume.bytes == 0
+    assert part.volume.chars == 0
+    assert part.volume.lines == 0
   end
 end

data/test/test_builder.rb

@@ -24,7 +24,7 @@ class BuidlerTest < Test::Unit::TestCase
 
   def test_bind
     b = Builder.new
-    chap = ReVIEW::Book::Chapter.new(ReVIEW::Book::Base.load, nil, '-', nil)
+    chap = ReVIEW::Book::Chapter.new(ReVIEW::Book::Base.new, nil, '-', nil)
     assert_nothing_raised do
       b.bind(nil, chap, nil)
     end
@@ -37,7 +37,7 @@ class BuidlerTest < Test::Unit::TestCase
     end
 
     b = Builder.new
-    chapter = ReVIEW::Book::Chapter.new(ReVIEW::Book::Base.load, nil, '-', nil)
+    chapter = ReVIEW::Book::Chapter.new(ReVIEW::Book::Base.new, nil, '-', nil)
     b.bind(nil, chapter, nil)
     assert_equal '', b.result
   end
@@ -82,7 +82,7 @@ class BuidlerTest < Test::Unit::TestCase
 
   def test_inline_missing_ref
     b = Builder.new
-    chapter = ReVIEW::Book::Chapter.new(ReVIEW::Book::Base.load, 1, 'chap1', nil, StringIO.new)
+    chapter = ReVIEW::Book::Chapter.new(ReVIEW::Book::Base.new, 1, 'chap1', nil, StringIO.new)
     b.bind(nil, chapter, nil)
     e = assert_raises(ReVIEW::ApplicationError) { b.inline_list('unknown|list1') }
     assert_equal ': error: unknown list: unknown|list1', e.message
@@ -96,20 +96,29 @@ class BuidlerTest < Test::Unit::TestCase
     assert_equal ': error: unknown footnote: unknown|footnote1', e.message
   end
 
-  class XBuilder < Builder
-    def list_header(id, caption)
-    end
-
-    def list_body(lines)
-    end
-
-    def listnum_body(lines)
-    end
+  def test_nest_error
+    b = XBuilder.new
+    b.children = nil
+    assert_equal '', b.solve_nest('')
+    b.children = ['dl']
+    e = assert_raises(ReVIEW::ApplicationError) { b.solve_nest('') }
+    assert_equal ': error: //beginchild of dl misses //endchild', e.message
+    b.children = ['ul', 'dl', 'ol']
+    e = assert_raises(ReVIEW::ApplicationError) { b.solve_nest('') }
+    assert_equal ': error: //beginchild of ol,dl,ul misses //endchild', e.message
+
+    assert_equal "\u0001→/ol←\u0001", b.endchild
+    assert_equal "\u0001→/dl←\u0001", b.endchild
+    assert_equal "\u0001→/ul←\u0001", b.endchild
+    e = assert_raises(ReVIEW::ApplicationError) { b.endchild }
+    assert_equal ": error: //endchild is shown, but any opened //beginchild doesn't exist", e.message
+  end
 
-    def source_header(caption)
-    end
+  class XBuilder < Builder
+    attr_accessor :children
 
-    def source_body(lines)
+    def puts(s)
+      s
     end
   end
 end

data/test/test_catalog.rb

@@ -1,4 +1,5 @@
 require 'test_helper'
+require 'book_test_helper'
 require 'review/catalog'
 
 class CatalogTest < Test::Unit::TestCase
@@ -7,61 +8,43 @@ class CatalogTest < Test::Unit::TestCase
 
   def test_predef
     sut = Catalog.new(yaml)
-    exp = <<-EOS
-pre01.re
-pre02.re
-    EOS
-    assert_equal(exp.chomp, sut.predef)
+    exp = %w[pre01.re pre02.re]
+    assert_equal(exp, sut.predef)
   end
 
   def test_chaps
     sut = Catalog.new(yaml)
-    exp = <<-EOS
-ch01.re
-ch02.re
-    EOS
-    assert_equal(exp.chomp, sut.chaps)
+    exp = %w[ch01.re ch02.re]
+    assert_equal(exp, sut.chaps)
   end
 
   def test_chaps_empty
     yaml = StringIO.new
     sut = Catalog.new(yaml)
-    assert_equal('', sut.chaps)
+    assert_equal([], sut.chaps)
   end
 
   def test_appendix
     sut = Catalog.new(yaml)
-    exp = <<-EOS
-post01.re
-post02.re
-    EOS
-    assert_equal(exp.chomp, sut.appendix)
+    exp = %w[post01.re post02.re]
+    assert_equal(exp, sut.appendix)
   end
 
   def test_chaps_with_parts
     sut = Catalog.new(yaml_with_parts)
-    exp = <<-EOS
-ch01.re
-ch02.re
-ch03.re
-ch04.re
-ch05.re
-    EOS
-    assert_equal(exp.chomp, sut.chaps)
+    exp = %w[ch01.re ch02.re ch03.re ch04.re ch05.re]
+    assert_equal(exp, sut.chaps)
   end
 
   def test_parts
     sut = Catalog.new(yaml_with_parts)
-    exp = <<-EOS
-part1.re
-part2.re
-    EOS
-    assert_equal(exp.chomp, sut.parts)
+    exp = %w[part1.re part2.re]
+    assert_equal(exp, sut.parts)
   end
 
   def test_parts_with_empty
     sut = Catalog.new(yaml)
-    assert_equal('', sut.parts)
+    assert_equal([], sut.parts)
   end
 
   def test_empty_parts
@@ -80,20 +63,14 @@ part2.re
 
   def test_postdef
     sut = Catalog.new(yaml)
-    exp = <<-EOS
-back01.re
-back02.re
-    EOS
-    assert_equal(exp.chomp, sut.postdef)
+    exp = %w[back01.re back02.re]
+    assert_equal(exp, sut.postdef)
   end
 
   def test_from_object
     sut = Catalog.new(yaml_hash)
-    exp = <<-EOS
-ch01.re
-ch02.re
-    EOS
-    assert_equal(exp.chomp, sut.chaps)
+    exp = %w[ch01.re ch02.re]
+    assert_equal(exp, sut.chaps)
   end
 
   def test_validate
@@ -154,7 +131,7 @@ ch02.re
   private
 
   def yaml
-    StringIO.new <<-EOS
+    StringIO.new(<<-EOS)
 
 PREDEF:
   - pre01.re
@@ -182,7 +159,7 @@ POSTDEF:
   end
 
   def yaml_with_parts
-    StringIO.new <<-EOS
+    StringIO.new(<<-EOS)
 CHAPS:
   - ch01.re
   - part1.re: