review 1.2.0 → 1.3.0

data/test/sample-book/src/config.yml

@@ -38,13 +38,13 @@ coverimage: cover.jpg
 # 固有IDに使用するドメイン
 urnid: http://tatsu-zine.com/books/review-sample-book/1.0.0/
 # CSSファイル (yamlファイルおよびRe:VIEWファイルを置いたディレクトリにあること
-stylesheet: main.css
+stylesheet: style.css
 # 目次として抽出するレベル
 toclevel: 2
 # セクション番号を表示するレベル
 secnolevel: 3
 # review-compileに渡すパラメータ
-params: --stylesheet=main.css
+params: --stylesheet=style.css
 # 目次生成用？
 mytoc: true
 # 奥付生成用

data/test/test_book.rb

@@ -17,24 +17,6 @@ class BookTest < Test::Unit::TestCase
       Dir.chdir(dir) do
         assert_same_path dir, File.expand_path(Book.load_default.basedir), "error in dir CHAPS"
       end
-
-      subdir = File.join(dir, 'sub')
-      Dir.mkdir(subdir)
-      Dir.chdir(subdir) do
-        assert_same_path dir, File.expand_path(Book.load_default.basedir), "error in dir sub"
-      end
-
-      sub2dir = File.join(dir, 'sub', 'sub')
-      Dir.mkdir(sub2dir)
-      Dir.chdir(sub2dir) do
-        assert_same_path dir, File.expand_path(Book.load_default.basedir), "error in dir sub sub"
-      end
-
-      sub3dir = File.join(dir, 'sub', 'sub', 'sub')
-      Dir.mkdir(sub3dir)
-      Dir.chdir(sub3dir) do
-        assert_same_path sub3dir, File.expand_path(Book.load_default.basedir), "error in dir sub sub sub"
-      end
     end
 
     # tests for ReVIEW.book
@@ -76,19 +58,6 @@ class BookTest < Test::Unit::TestCase
       assert_equal save_load_path, $LOAD_PATH
     end
 
-    begin
-      Dir.mktmpdir do |dir|
-        local_lib_path = File.join(dir, 'lib')
-        Dir.mkdir(local_lib_path)
-        Dir.mkdir(File.join(local_lib_path, 'review'))
-        Book.update_rubyenv(dir)
-        assert save_load_path != $LOAD_PATH
-        assert $LOAD_PATH.index(local_lib_path)
-      end
-    ensure
-      $LOAD_PATH.replace save_load_path
-    end
-
     num = rand(99999)
     test_const = "ReVIEW__BOOK__TEST__#{num}"
     begin
@@ -171,10 +140,19 @@ class BookTest < Test::Unit::TestCase
     end
   end
 
+  # backword compatible
   def test_setParameter
     book = Book::Base.new(File.dirname(__FILE__))
     book.param = :test
-    assert_equal :test, book.instance_eval {@param}
+    assert_equal :test, book.param  # old way
+    assert_equal :test, book.config # new way
+  end
+
+  def test_setConfig
+    book = Book::Base.new(File.dirname(__FILE__))
+    book.config = :test
+    assert_equal :test, book.param  # old way
+    assert_equal :test, book.config # new way
   end
 
   def test_parse_chapters
@@ -310,7 +288,7 @@ EOC
     end
 
     mktmpbookdir 'preface.re' => '',
-        'PREDEF' => '' do |dir, book, files|
+                 'PREDEF' => '' do |dir, book, files|
       assert_equal nil, book.prefaces # XXX: OK?
     end
 
@@ -319,7 +297,7 @@ EOC
     end
 
     mktmpbookdir 'PREDEF' => 'chapter1',
-       'chapter1.re' => '' do |dir, book, files|
+                 '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
@@ -328,7 +306,7 @@ EOC
     end
 
     mktmpbookdir 'PREDEF' => "chapter1\n\nchapter2",
-       'chapter1.re' => '', 'chapter2.re' => '' do |dir, book, files|
+                 '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
@@ -339,7 +317,7 @@ EOC
     end
 
     mktmpbookdir 'PREDEF' => "chapter1 chapter2",
-       'chapter1.re' => '', 'chapter2.re' => '' do |dir, book, files|
+                 '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?
@@ -352,14 +330,14 @@ EOC
     end
 
     mktmpbookdir 'PREDEF' => 'chapter1.re',
-       'chapter1.re' => '' do |dir, book, files|
+                 '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|
+                 '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
@@ -390,7 +368,7 @@ EOC
     end
 
     mktmpbookdir 'appendix.re' => '',
-       'postscript.re' => '' do |dir, book, files|
+                 'postscript.re' => '' do |dir, book, files|
       assert_kind_of Book::Part, book.postscripts
       assert_equal '', book.postscripts.name
       assert_equal 2, book.postscripts.chapters.size
@@ -403,7 +381,7 @@ EOC
     end
 
     mktmpbookdir 'preface.re' => '',
-        'POSTDEF' => '' do |dir, book, files|
+                 'POSTDEF' => '' do |dir, book, files|
       assert_equal nil, book.postscripts # XXX: OK?
     end
 
@@ -412,7 +390,7 @@ EOC
     end
 
     mktmpbookdir 'POSTDEF' => 'chapter1',
-       'chapter1.re' => '' do |dir, book, files|
+                 'chapter1.re' => '' do |dir, book, files|
       assert_kind_of Book::Part, book.postscripts
       assert_equal '', book.postscripts.name
       assert_equal 1, book.postscripts.chapters.size
@@ -421,7 +399,7 @@ EOC
     end
 
     mktmpbookdir 'POSTDEF' => "chapter1\n\nchapter2",
-       'chapter1.re' => '', 'chapter2.re' => '' do |dir, book, files|
+                 'chapter1.re' => '', 'chapter2.re' => '' do |dir, book, files|
       assert_kind_of Book::Part, book.postscripts
       assert_equal '', book.postscripts.name
       assert_equal 2, book.postscripts.chapters.size
@@ -432,7 +410,7 @@ EOC
     end
 
     mktmpbookdir 'POSTDEF' => "chapter1 chapter2",
-       'chapter1.re' => '', 'chapter2.re' => '' do |dir, book, files|
+                 'chapter1.re' => '', 'chapter2.re' => '' do |dir, book, files|
       assert_kind_of Book::Part, book.postscripts
       assert_equal '', book.postscripts.name
       assert_equal 2, book.postscripts.chapters.size # XXX: OK?
@@ -470,7 +448,7 @@ EOC
     end
 
     mktmpbookdir 'CHAPS' => "ch1\nch2\n\nch3",
-       'preface.re' => '' do |dir, book, files|
+                 'preface.re' => '' do |dir, book, files|
       parts = book.parts
       assert_equal 3, parts.size
       assert book.part(1)
@@ -485,7 +463,7 @@ EOC
     end
 
     mktmpbookdir 'CHAPS' => "ch1\nch2\n\nch3",
-       'postscript.re' => '' do |dir, book, files|
+                 'postscript.re' => '' do |dir, book, files|
       parts = book.parts
       assert_equal 3, parts.size
       assert book.part(1)
@@ -500,7 +478,7 @@ EOC
     end
 
     mktmpbookdir 'CHAPS' => "ch1\nch2\n\nch3",
-       'preface.re' => '', 'postscript.re' => '' do |dir, book, files|
+                 'preface.re' => '', 'postscript.re' => '' do |dir, book, files|
       parts = book.parts
       assert_equal 4, parts.size
       assert book.part(1)
@@ -519,7 +497,7 @@ EOC
 
   def test_chapters
     mktmpbookdir 'CHAPS' => "ch1\nch2\n\nch3",
-       'preface.re' => '', 'postscript.re' => '' do |dir, book, files|
+                 'preface.re' => '', 'postscript.re' => '' do |dir, book, files|
       chapters = book.chapters
       assert_equal 5, chapters.size
 
@@ -539,7 +517,7 @@ EOC
     end
 
     mktmpbookdir 'CHAPS' => "ch1.txt\nch2.txt\n\nch3.txt",
-       'preface.re' => '', 'postscript.re' => '' do |dir, book, files|
+                 'preface.re' => '', 'postscript.re' => '' do |dir, book, files|
       chapters = book.chapters
       assert_equal 5, chapters.size
 
@@ -559,6 +537,26 @@ EOC
     end
   end
 
+  def test_next_chapter
+    mktmpbookdir 'CHAPS' => "ch1\nch2" do |dir, book, files|
+      chapter = book.chapter('ch1')
+      assert_equal book.chapter('ch2'), book.next_chapter(chapter)
+
+      chapter = book.chapter('ch2')
+      assert_equal nil, book.next_chapter(chapter)
+    end
+  end
+
+  def test_prev_chapter
+    mktmpbookdir 'CHAPS' => "ch1\nch2" do |dir, book, files|
+      chapter = book.chapter('ch2')
+      assert_equal book.chapter('ch1'), book.prev_chapter(chapter)
+
+      chapter = book.chapter('ch1')
+      assert_equal nil, book.prev_chapter(chapter)
+    end
+  end
+
   def test_volume
     mktmpbookdir do |dir, book, files|
       assert book.volume

data/test/test_book_chapter.rb

@@ -133,8 +133,8 @@ class ChapterTest < Test::Unit::TestCase
     ch = Book::Chapter.new(nil, nil, 'foo.bar', nil)
     assert_equal 'foo', ch.name
 
-    ch = Book::Chapter.new(nil, nil, nil, nil)
-    assert_raises(TypeError) { ch.name } # XXX: OK?
+    # ch = Book::Chapter.new(nil, nil, nil, nil)
+    # assert_raises(TypeError) { ch.name } # XXX: OK?
   end
 
   def test_open
@@ -161,11 +161,11 @@ class ChapterTest < Test::Unit::TestCase
 
   def test_title
     io = StringIO.new
-    ch = Book::Chapter.new(nil, nil, nil, nil, io)
+    ch = Book::Chapter.new(ReVIEW.book, nil, nil, nil, io)
     assert_equal '', ch.title
 
     io = StringIO.new("=1\n=2\n")
-    ch = Book::Chapter.new(nil, nil, nil, nil, io)
+    ch = Book::Chapter.new(ReVIEW.book, nil, nil, nil, io)
     assert_equal '1', ch.title
 
 
@@ -176,8 +176,8 @@ class ChapterTest < Test::Unit::TestCase
       ['XYZ', @eucjp_str],
     ].each do |enc, instr|
       io = StringIO.new("= #{instr}\n")
-      ch = Book::Chapter.new(nil, nil, nil, nil, io)
-      ReVIEW.book.param = {'inencoding' => enc}
+      ch = Book::Chapter.new(ReVIEW.book, nil, nil, nil, io)
+      ReVIEW.book.config = {'inencoding' => enc}
       assert_equal @utf8_str, ch.title
       assert_equal @utf8_str, ch.instance_eval { @title }
     end
@@ -195,8 +195,8 @@ class ChapterTest < Test::Unit::TestCase
         tf.print instr
         tf.close
 
-        ch = Book::Chapter.new(nil, nil, nil, tf.path)
-        ReVIEW.book.param = {'inencoding' => enc}
+        ch = Book::Chapter.new(ReVIEW.book, nil, nil, tf.path)
+        ReVIEW.book.config = {'inencoding' => enc}
         assert_equal @utf8_str, ch.content
         assert_equal @utf8_str, ch.instance_eval { @content }
       ensure
@@ -212,8 +212,8 @@ class ChapterTest < Test::Unit::TestCase
         tf2.puts instr
         tf1.close
 
-        ch = Book::Chapter.new(nil, nil, nil, tf1.path, tf2)
-        ReVIEW.book.param = {'inencoding' => enc}
+        ch = Book::Chapter.new(ReVIEW.book, nil, nil, tf1.path, tf2)
+        ReVIEW.book.config = {'inencoding' => enc}
         assert_equal "#{@utf8_str}\n#{@utf8_str}\n", ch.content # XXX: OK?
       ensure
         tf1.close(true)
@@ -228,7 +228,7 @@ class ChapterTest < Test::Unit::TestCase
     tf.print lines.join('')
     tf.close
 
-    ch = Book::Chapter.new(nil, nil, nil, tf.path)
+    ch = Book::Chapter.new(ReVIEW.book, nil, nil, tf.path)
     assert_equal lines, ch.lines
 
     lines = ["1\n", "2\n", "3"]
@@ -240,7 +240,7 @@ class ChapterTest < Test::Unit::TestCase
     tf2.puts lines.join('')
     tf2.close
 
-    ch = Book::Chapter.new(nil, nil, nil, tf1.path, tf2.path)
+    ch = Book::Chapter.new(ReVIEW.book, nil, nil, tf1.path, tf2.path)
     assert_equal lines, ch.lines # XXX: OK?
   end
 
@@ -265,7 +265,7 @@ class ChapterTest < Test::Unit::TestCase
 
   def test_on_CHAPS?
     mktmpbookdir 'CHAPS' => "chapter1.re\nchapter2.re",
-        'chapter1.re' => '12345', 'preface.re' => 'abcde' do |dir, book, files|
+                 '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'])
 
@@ -354,6 +354,18 @@ E
 E
   end
 
+
+  def test_column_index
+    ReVIEW.book.config = {"inencoding" => "utf-8"}
+    do_test_index(<<E, Book::ColumnIndex, :column_index, :column, :propagate => false)
+= dummy1
+===[column]{abc} aaaa
+= dummy2
+===[column] def
+== dummy3
+E
+  end
+
   def test_image
     do_test_index(<<E, Book::ImageIndex, :image_index, :image)
 //image

data/test/test_builder.rb

@@ -80,7 +80,7 @@ class BuidlerTest < Test::Unit::TestCase
       ].each do |m, instr, expstr|
         b = Builder.new
         b.bind(nil, nil, nil)
-        ReVIEW.book.param = params
+        ReVIEW.book.config = params
         b.__send__(m, instr)
         if "".respond_to?(:encode)
           assert_equal expstr.encode("UTF-8"), b.result
@@ -128,9 +128,9 @@ class BuidlerTest < Test::Unit::TestCase
   end
 
   def test_convert_outencoding
-    ReVIEW.book.param = {'outencoding' => "EUC"}
+    ReVIEW.book.config = {'outencoding' => "EUC"}
     b = Builder.new
-    ret = b.convert_outencoding("a", ReVIEW.book.param["outencoding"])
+    ret = b.convert_outencoding("a", ReVIEW.book.config["outencoding"])
     assert_equal "a", ret
   end
 

data/test/test_catalog.rb

@@ -0,0 +1,107 @@
+require 'test_helper'
+require 'review/catalog'
+
+class CatalogTest < Test::Unit::TestCase
+  include ReVIEW
+
+  def test_predef
+    sut = Catalog.new(yaml)
+    exp =<<-EOS
+pre01.re
+pre02.re
+    EOS
+    assert_equal(exp.chomp, sut.predef)
+  end
+
+  def test_chaps
+    sut = Catalog.new(yaml)
+    exp =<<-EOS
+ch01.re
+ch02.re
+    EOS
+    assert_equal(exp.chomp, sut.chaps)
+  end
+
+  def test_chaps_empty
+    yaml = StringIO.new
+    sut = Catalog.new(yaml)
+    assert_equal("", sut.chaps)
+  end
+
+  def test_postdef
+    sut = Catalog.new(yaml)
+    exp =<<-EOS
+post01.re
+post02.re
+    EOS
+    assert_equal(exp.chomp, sut.postdef)
+  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)
+  end
+
+  def test_parts
+    sut = Catalog.new(yaml_with_parts)
+    exp =<<-EOS
+part1.re
+part2.re
+    EOS
+    assert_equal(exp.chomp, sut.parts)
+  end
+
+  def test_parts_with_empty
+    sut = Catalog.new(yaml)
+    assert_equal("", sut.parts)
+  end
+
+  def test_parts2
+    sut = Catalog.new(yaml_with_parts)
+    assert_equal(["ch01.re",
+                  {"part1.re" => ["ch02.re"]},
+                  "ch03.re",
+                  {"part2.re" => ["ch04.re", "ch05.re"]}],
+                 sut.parts_with_chaps)
+  end
+
+  private
+  def yaml
+    StringIO.new <<-EOS
+
+PREDEF:
+  - pre01.re
+  - pre02.re
+
+CHAPS:
+  - ch01.re
+  - ch02.re
+
+POSTDEF:
+  - post01.re
+  - post02.re
+
+    EOS
+  end
+
+  def yaml_with_parts
+    StringIO.new <<-EOS
+CHAPS:
+  - ch01.re
+  - part1.re:
+    - ch02.re
+  - ch03.re
+  - part2.re:
+    - ch04.re
+    - ch05.re
+
+    EOS
+  end
+end