review 1.3.0 → 1.4.0

data/lib/review/tocparser.rb

@@ -21,14 +21,14 @@ module ReVIEW
     def TOCParser.parse(chap)
       chap.open {|f|
         stream = Preprocessor::Strip.new(f)
-        new.parse(stream, chap.id, chap.path).map {|root|
+        new.parse(stream, chap.id, chap.path, chap).map {|root|
           root.number = chap.number
           root
         }
       }
     end
 
-    def parse(f, id, filename)
+    def parse(f, id, filename, chap)
       roots = []
       path = []
 
@@ -80,7 +80,7 @@ module ReVIEW
           #  error! filename, f.lineno, 'text found before section label'
           #end
           next if path.empty?
-          path.last.add_child(par = Paragraph.new)
+          path.last.add_child(par = Paragraph.new(chap.book.page_metric))
           par.add line
           while line = f.gets
             break if /\A\s*\z/ =~ line
@@ -239,8 +239,9 @@ module ReVIEW
 
     class Paragraph < Node
 
-      def initialize
+      def initialize(page_metric)
         @bytes = 0
+        @page_metric = page_metric
       end
 
       def inspect
@@ -252,7 +253,7 @@ module ReVIEW
       end
 
       def estimated_lines
-        (@bytes + 2) / ReVIEW.book.page_metric.text.n_columns + 1
+        (@bytes + 2) / @page_metric.text.n_columns + 1
       end
 
       def yield_section

data/lib/review/tocprinter.rb

@@ -126,9 +126,12 @@ module ReVIEW
           end
         end
       end
+      layout_file = File.join(book.basedir, "layouts", "layout.html.erb")
+      unless File.exist?(layout_file) # backward compatibility
+        layout_file = File.join(book.basedir, "layouts", "layout.erb")
+      end
       puts HTMLLayout.new(
-        {'body' => html, 'title' => "目次"},
-        File.join(book.basedir, "layouts", "layout.erb")).result
+        {'body' => html, 'title' => "目次"}, layout_file).result
     end
 
     private

data/lib/review/version.rb

@@ -1,3 +1,3 @@
 module ReVIEW
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

data/review.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
   gem.summary     = "Re:VIEW: a easy-to-use digital publishing system"
   gem.description = "Re:VIEW is a digital publishing system for books and ebooks. It supports InDesign, EPUB and LaTeX."
   gem.required_rubygems_version = Gem::Requirement.new(">= 0") if gem.respond_to? :required_rubygems_version=
-  gem.date = "2014-06-29"
+  gem.date = "2014-10-29"
 
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/rubocop-todo.yml

@@ -441,3 +441,16 @@ WhileUntilModifier:
 # Cop supports --auto-correct.
 WordArray:
   MinSize: 7
+
+BarePercentLiterals:
+  Enabled: false
+
+UnusedMethodArgument:
+  Enabled: false
+
+PercentQLiterals:
+  Enabled: false
+
+UnneededPercentQ:
+  Enabled: false
+

data/test/test_book.rb

@@ -34,15 +34,6 @@ class BookTest < Test::Unit::TestCase
     end
   end
 
-  def test_s_load
-    Dir.mktmpdir do |dir|
-      book = Book.load(dir)
-      defs = get_instance_variables(Book::Parameters.default)
-      pars = get_instance_variables(book.instance_eval { @parameters })
-      assert_equal defs, pars
-    end
-  end
-
   def test_s_update_rubyenv
     save_load_path = $LOAD_PATH.dup
 
@@ -124,6 +115,52 @@ class BookTest < Test::Unit::TestCase
     end
   end
 
+  def test_read_APPENDIX
+    Dir.mktmpdir do |dir|
+      book = Book::Base.new(dir)
+      assert_equal "", book.read_APPENDIX
+
+      post_path = File.join(dir, 'POSTDEF')
+      re1_path = File.join(dir, "123#{book.ext}")
+      re2_path = File.join(dir, "456#{book.ext}")
+
+      File.open(post_path, 'w') {|o| o.print "abc\n" }
+      File.open(re1_path, 'w') {|o| o.print "123\n" }
+      File.open(re2_path, 'w') {|o| o.print "456\n" }
+
+      assert_equal "abc\n", book.read_APPENDIX
+
+      File.unlink(post_path)
+      assert_equal "#{re1_path}\n#{re2_path}", book.read_APPENDIX
+
+      File.unlink(re1_path)
+      assert_equal "#{re2_path}", book.read_APPENDIX
+
+      File.unlink(re2_path)
+      assert_equal "", book.read_APPENDIX
+    end
+  end
+
+  def test_read_POSTDEF
+    Dir.mktmpdir do |dir|
+      book = Book::Base.new(dir)
+      assert_equal "", book.read_POSTDEF
+
+      post_path = File.join(dir, 'POSTDEF')
+      re1_path = File.join(dir, "123#{book.ext}")
+      re2_path = File.join(dir, "456#{book.ext}")
+
+      File.open(post_path, 'w') {|o| o.print "abc\n" }
+      File.open(re1_path, 'w') {|o| o.print "123\n" }
+      File.open(re2_path, 'w') {|o| o.print "456\n" }
+
+      assert_equal "", book.read_POSTDEF
+
+      File.unlink(post_path)
+      assert_equal "", book.read_POSTDEF
+    end
+  end
+
   def test_read_bib
     Dir.mktmpdir do |dir|
       book = Book::Base.new(dir)
@@ -257,12 +294,11 @@ EOC
     ].each do |n_parts, chaps_text, parts_text, part_names|
       n_test += 1
       Dir.mktmpdir do |dir|
-        params = Book::Parameters.new(:part_file => 'PARTS')
-        book = Book::Base.new(dir, params)
+        book = Book::Base.new(dir)
         chaps_path = File.join(dir, 'CHAPS')
         File.open(chaps_path, 'w') {|o| o.print chaps_text }
         unless parts_text.nil?
-          parts_path = File.join(dir, 'PARTS')
+          parts_path = File.join(dir, 'PART')
           File.open(parts_path, 'w') {|o| o.print parts_text }
         end
 
@@ -278,17 +314,7 @@ EOC
       assert_equal nil, book.prefaces
     end
 
-    mktmpbookdir 'preface.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 "preface", book.prefaces.chapters.first.name
-      assert_equal files['preface.re'], book.prefaces.chapters.first.path
-      assert_equal nil, book.prefaces.chapters.first.number
-    end
-
-    mktmpbookdir 'preface.re' => '',
-                 'PREDEF' => '' do |dir, book, files|
+    mktmpbookdir 'PREDEF' => '' do |dir, book, files|
       assert_equal nil, book.prefaces # XXX: OK?
     end
 
@@ -344,83 +370,68 @@ EOC
     end
   end
 
-  def test_postscripts
+  def test_appendix
     mktmpbookdir do |dir, book, files|
-      assert_equal nil, book.postscripts
-    end
-
-    mktmpbookdir 'appendix.re' => '' do |dir, book, files|
-      assert_kind_of Book::Part, book.postscripts
-      assert_equal '', book.postscripts.name
-      assert_equal 1, book.postscripts.chapters.size
-      assert_equal "appendix", book.postscripts.chapters.first.name
-      assert_equal files['appendix.re'], book.postscripts.chapters.first.path
-      assert_equal nil, book.postscripts.chapters.first.number
-    end
-
-    mktmpbookdir 'postscript.re' => '' do |dir, book, files|
-      assert_kind_of Book::Part, book.postscripts
-      assert_equal '', book.postscripts.name
-      assert_equal 1, book.postscripts.chapters.size
-      assert_equal "postscript", book.postscripts.chapters.first.name
-      assert_equal files['postscript.re'], book.postscripts.chapters.first.path
-      assert_equal nil, book.postscripts.chapters.first.number
-    end
-
-    mktmpbookdir 'appendix.re' => '',
-                 '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
-      assert_equal "appendix", book.postscripts.chapters.first.name
-      assert_equal files['appendix.re'], book.postscripts.chapters.first.path
-      assert_equal nil, book.postscripts.chapters.first.number
-      assert_equal "postscript", book.postscripts.chapters.last.name
-      assert_equal files['postscript.re'], book.postscripts.chapters.last.path
-      assert_equal nil, book.postscripts.chapters.last.number
-    end
-
-    mktmpbookdir 'preface.re' => '',
-                 'POSTDEF' => '' do |dir, book, files|
-      assert_equal nil, book.postscripts # XXX: OK?
+      assert_equal nil, book.appendix
     end
 
     mktmpbookdir 'POSTDEF' => '' do |dir, book, files|
-      assert_equal nil, book.postscripts
+      assert_equal nil, book.appendix
     end
 
     mktmpbookdir 'POSTDEF' => 'chapter1',
                  '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
-      assert_equal "chapter1", book.postscripts.chapters.first.name
-      assert_equal files['chapter1.re'], book.postscripts.chapters.first.path
+      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
+      assert_equal files['chapter1.re'], book.appendix.chapters.first.path
+      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.postscripts
-      assert_equal '', book.postscripts.name
-      assert_equal 2, book.postscripts.chapters.size
-      assert_equal "chapter1", book.postscripts.chapters.first.name
-      assert_equal files['chapter1.re'], book.postscripts.chapters.first.path
-      assert_equal "chapter2", book.postscripts.chapters.last.name
-      assert_equal files['chapter2.re'], book.postscripts.chapters.last.path
+      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
+      assert_equal files['chapter1.re'], book.appendix.chapters.first.path
+      assert_equal "chapter2", book.appendix.chapters.last.name
+      assert_equal files['chapter2.re'], book.appendix.chapters.last.path
+      assert_equal 1, book.appendix.chapters.first.number
+      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.postscripts
-      assert_equal '', book.postscripts.name
-      assert_equal 2, book.postscripts.chapters.size # XXX: OK?
+      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|
       assert_raises FileNotFound do
-        assert_equal nil, book.postscripts
+        assert_equal nil, book.appendix
       end
     end
+
+    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
+      assert_equal 1, book.postscripts.chapters.size
+      assert_equal 'back', book.postscripts.chapters.first.title
+      assert_equal nil, book.postscripts.chapters.first.number
+    end
   end
 
   def test_parts
@@ -446,62 +457,14 @@ EOC
       book.each_part {|p| tmp << p.number }
       assert_equal [1, 2], tmp
     end
-
-    mktmpbookdir 'CHAPS' => "ch1\nch2\n\nch3",
-                 'preface.re' => '' do |dir, book, files|
-      parts = book.parts
-      assert_equal 3, parts.size
-      assert book.part(1)
-      assert book.part(2)
-      assert !book.part(3)
-      assert book.part(nil) # XXX: OK?
-      assert_equal 'preface', parts.first.chapters.first.name
-
-      tmp = []
-      book.each_part {|p| tmp << p.number }
-      assert_equal [nil, 1, 2], tmp
-    end
-
-    mktmpbookdir 'CHAPS' => "ch1\nch2\n\nch3",
-                 'postscript.re' => '' do |dir, book, files|
-      parts = book.parts
-      assert_equal 3, parts.size
-      assert book.part(1)
-      assert book.part(2)
-      assert !book.part(3)
-      assert book.part(nil) # XXX: OK?
-      assert_equal 'postscript', parts.last.chapters.last.name
-
-      tmp = []
-      book.each_part {|p| tmp << p.number }
-      assert_equal [1, 2, nil], tmp
-    end
-
-    mktmpbookdir 'CHAPS' => "ch1\nch2\n\nch3",
-                 'preface.re' => '', 'postscript.re' => '' do |dir, book, files|
-      parts = book.parts
-      assert_equal 4, parts.size
-      assert book.part(1)
-      assert book.part(2)
-      assert !book.part(3)
-      assert !book.part(4)
-      assert book.part(nil) # XXX: OK?
-      assert_equal 'preface', parts.first.chapters.first.name
-      assert_equal 'postscript', parts.last.chapters.last.name
-
-      tmp = []
-      book.each_part {|p| tmp << p.number }
-      assert_equal [nil, 1, 2, nil], tmp
-    end
   end
 
   def test_chapters
-    mktmpbookdir 'CHAPS' => "ch1\nch2\n\nch3",
-                 'preface.re' => '', 'postscript.re' => '' do |dir, book, files|
+    mktmpbookdir 'CHAPS' => "ch1\nch2\n\nch3" do |dir, book, files|
       chapters = book.chapters
-      assert_equal 5, chapters.size
+      assert_equal 3, chapters.size
 
-      ch_names = %w(preface ch1 ch2 ch3 postscript)
+      ch_names = %w(ch1 ch2 ch3)
       tmp = []
       book.each_chapter {|ch| tmp << ch.name }
       assert_equal ch_names, tmp
@@ -516,12 +479,11 @@ EOC
       end
     end
 
-    mktmpbookdir 'CHAPS' => "ch1.txt\nch2.txt\n\nch3.txt",
-                 'preface.re' => '', 'postscript.re' => '' do |dir, book, files|
+    mktmpbookdir 'CHAPS' => "ch1.txt\nch2.txt\n\nch3.txt" do |dir, book, files|
       chapters = book.chapters
-      assert_equal 5, chapters.size
+      assert_equal 3, chapters.size
 
-      ch_names = %w(preface ch1 ch2 ch3 postscript)
+      ch_names = %w(ch1 ch2 ch3)
       tmp = []
       book.each_chapter {|ch| tmp << ch.name }
       assert_equal ch_names, tmp

data/test/test_book_chapter.rb

@@ -84,8 +84,7 @@ class ChapterTest < Test::Unit::TestCase
 
     dir_files = {
       'CHAPS' => "ch1.re\n",
-      'ch1.re' => 'ch1',
-      'preface.re' => 'preface',
+      'ch1.re' => 'ch1'
     }
     mktmpbookdir dir_files do |dir, book, files|
       paths = files.values.grep(/\.re\z/)
@@ -95,14 +94,6 @@ class ChapterTest < Test::Unit::TestCase
     end
   end
 
-  def test_s_for_stdin
-    assert Book::Chapter.for_stdin
-  end
-
-  def test_s_for_path
-    assert Book::Chapter.for_path(1, __FILE__)
-  end
-
   def test_initialize
     ch = Book::Chapter.new(:book, :number, :name, '/foo/bar', :io)
     assert_equal :book, ch.env
@@ -161,11 +152,12 @@ class ChapterTest < Test::Unit::TestCase
 
   def test_title
     io = StringIO.new
-    ch = Book::Chapter.new(ReVIEW.book, nil, nil, nil, io)
+    book = Book::Base.new(nil)
+    ch = Book::Chapter.new(book, nil, nil, nil, io)
     assert_equal '', ch.title
 
     io = StringIO.new("=1\n=2\n")
-    ch = Book::Chapter.new(ReVIEW.book, nil, nil, nil, io)
+    ch = Book::Chapter.new(book, nil, nil, nil, io)
     assert_equal '1', ch.title
 
 
@@ -176,8 +168,8 @@ class ChapterTest < Test::Unit::TestCase
       ['XYZ', @eucjp_str],
     ].each do |enc, instr|
       io = StringIO.new("= #{instr}\n")
-      ch = Book::Chapter.new(ReVIEW.book, nil, nil, nil, io)
-      ReVIEW.book.config = {'inencoding' => enc}
+      ch = Book::Chapter.new(book, nil, nil, nil, io)
+      book.config['inencoding'] = enc
       assert_equal @utf8_str, ch.title
       assert_equal @utf8_str, ch.instance_eval { @title }
     end
@@ -191,12 +183,13 @@ class ChapterTest < Test::Unit::TestCase
       ['XYZ', @eucjp_str],
     ].each do |enc, instr|
       tf = Tempfile.new('chapter_test')
+      book = Book::Base.new(nil)
       begin
         tf.print instr
         tf.close
 
-        ch = Book::Chapter.new(ReVIEW.book, nil, nil, tf.path)
-        ReVIEW.book.config = {'inencoding' => enc}
+        ch = Book::Chapter.new(book, nil, nil, tf.path)
+        book.config['inencoding'] = enc
         assert_equal @utf8_str, ch.content
         assert_equal @utf8_str, ch.instance_eval { @content }
       ensure
@@ -212,8 +205,8 @@ class ChapterTest < Test::Unit::TestCase
         tf2.puts instr
         tf1.close
 
-        ch = Book::Chapter.new(ReVIEW.book, nil, nil, tf1.path, tf2)
-        ReVIEW.book.config = {'inencoding' => enc}
+        ch = Book::Chapter.new(book, nil, nil, tf1.path, tf2)
+        book.config['inencoding'] = enc
         assert_equal "#{@utf8_str}\n#{@utf8_str}\n", ch.content # XXX: OK?
       ensure
         tf1.close(true)
@@ -228,7 +221,8 @@ class ChapterTest < Test::Unit::TestCase
     tf.print lines.join('')
     tf.close
 
-    ch = Book::Chapter.new(ReVIEW.book, nil, nil, tf.path)
+    book = Book::Base.new(nil)
+    ch = Book::Chapter.new(book, nil, nil, tf.path)
     assert_equal lines, ch.lines
 
     lines = ["1\n", "2\n", "3"]
@@ -240,7 +234,7 @@ class ChapterTest < Test::Unit::TestCase
     tf2.puts lines.join('')
     tf2.close
 
-    ch = Book::Chapter.new(ReVIEW.book, nil, nil, tf1.path, tf2.path)
+    ch = Book::Chapter.new(book, nil, nil, tf1.path, tf2.path)
     assert_equal lines, ch.lines # XXX: OK?
   end
 
@@ -356,7 +350,8 @@ E
 
 
   def test_column_index
-    ReVIEW.book.config = {"inencoding" => "utf-8"}
+    book = Book::Base.new(nil)
+    book.config["inencoding"] = "utf-8"
     do_test_index(<<E, Book::ColumnIndex, :column_index, :column, :propagate => false)
 = dummy1
 ===[column]{abc} aaaa