Merge pull request #1563 from kmuto/book-base-new

use Book::Base.new (with :config) instead of Book::Base.load
kmuto · Aug 29, 2020 · 82f5fa6 · 82f5fa6
2 parents 3deb234 + ab23af1
commit 82f5fa6
Show file tree

Hide file tree

Showing 15 changed files with 20 additions and 24 deletions.
diff --git a/bin/review-check b/bin/review-check
@@ -31,9 +31,7 @@ end
 
 def main
   @config = ReVIEW::Configure.values
-  @book = ReVIEW::Book::Base.load
-  @book.config = @config
-
+  @book = ReVIEW::Book::Base.new(config: @config)
   @logger = ReVIEW.logger
 
   modes = nil

diff --git a/bin/review-compile b/bin/review-compile
@@ -79,8 +79,7 @@ def _main
       error('no input') if ARGV.empty?
 
       @basedir = File.dirname(ARGV[0])
-      book = ReVIEW::Book::Base.load(@basedir)
-      book.config = @config # needs only at the first time
+      book = ReVIEW::Book::Base.new(@basedir, config: @config)
       ARGV.each do |item|
         error("file not found: #{item}") unless File.exist?(File.join(book.config['contentdir'], item))
         chap_name = File.basename(item, '.*')
@@ -94,8 +93,7 @@ def _main
         end
       end
     when :dir
-      book = @basedir ? ReVIEW::Book::Base.load(@basedir) : ReVIEW::Book::Base.load
-      book.config = @config
+      book = @basedir ? ReVIEW::Book::Base.new(@basedir, config: @config) : ReVIEW::Book::Base.new(config: @config)
       compiler = ReVIEW::Compiler.new(load_builder_class(@target, @check_only))
       book.chapters.each do |chap|
         str = compiler.compile(chap)

diff --git a/lib/review/book.rb b/lib/review/book.rb
@@ -19,7 +19,7 @@
 module ReVIEW
   module Book
     def self.load(_dir)
-      raise NotImplementedError, 'ReVIEW::Book.load is obsoleted. Please use ReVIEW::Book::Base.load.'
+      raise NotImplementedError, 'ReVIEW::Book.load is obsoleted. Please use ReVIEW::Book::Base.new.'
     end
   end
 end
diff --git a/lib/review/epubmaker.rb b/lib/review/epubmaker.rb
@@ -298,7 +298,7 @@ def build_body(basetmpdir, yamlfile)
 
       basedir = File.dirname(yamlfile)
       base_path = Pathname.new(basedir)
-      book = ReVIEW::Book::Base.load(basedir, config: @config)
+      book = ReVIEW::Book::Base.new(basedir, config: @config)
       @converter = ReVIEW::Converter.new(book, ReVIEW::HTMLBuilder.new)
       @compile_errors = nil
 

diff --git a/lib/review/idgxmlmaker.rb b/lib/review/idgxmlmaker.rb
@@ -98,7 +98,7 @@ def generate_idgxml_files(yamlfile)
       remove_old_files(@path)
       Dir.mkdir(@path)
 
-      @book = ReVIEW::Book::Base.load(@basedir, config: @config)
+      @book = ReVIEW::Book::Base.new(@basedir, config: @config)
       if @table
         @book.config['tableopt'] = @table
       end

diff --git a/lib/review/pdfmaker.rb b/lib/review/pdfmaker.rb
@@ -265,7 +265,7 @@ def generate_pdf
       begin
         @compile_errors = nil
 
-        book = ReVIEW::Book::Base.load(@basedir, config: @config)
+        book = ReVIEW::Book::Base.new(@basedir, config: @config)
         @converter = ReVIEW::Converter.new(book, ReVIEW::LATEXBuilder.new)
 
         @input_files = make_input_files(book)

diff --git a/lib/review/textmaker.rb b/lib/review/textmaker.rb
@@ -102,7 +102,7 @@ def generate_text_files(yamlfile)
       remove_old_files(@path)
       Dir.mkdir(@path)
 
-      @book = ReVIEW::Book::Base.load(@basedir, config: @config)
+      @book = ReVIEW::Book::Base.new(@basedir, config: @config)
 
       build_body(@path, yamlfile)
     end

diff --git a/lib/review/tocprinter.rb b/lib/review/tocprinter.rb
@@ -50,7 +50,7 @@ def initialize
       @logger = ReVIEW.logger
       @config = ReVIEW::Configure.values
       @yamlfile = 'config.yml'
-      @book = ReVIEW::Book::Base.load('.', config: @config)
+      @book = ReVIEW::Book::Base.new('.', config: @config)
       @upper = 4
       @indent = true
       @buildonly = nil

diff --git a/lib/review/volumeprinter.rb b/lib/review/volumeprinter.rb
@@ -28,7 +28,7 @@ def initialize
 
     def execute(*args)
       parse_options(args)
-      @book = ReVIEW::Book::Base.load('.', config: @config)
+      @book = ReVIEW::Book::Base.new('.', config: @config)
       unless File.readable?(@yamlfile)
         @logger.error("No such fiile or can't open #{@yamlfile}.")
         exit 1

diff --git a/lib/review/webmaker.rb b/lib/review/webmaker.rb
@@ -103,7 +103,7 @@ def generate_html_files(yamlfile)
       remove_old_files(@path)
       Dir.mkdir(@path)
 
-      @book = ReVIEW::Book::Base.load(@basedir, config: @config)
+      @book = ReVIEW::Book::Base.new(@basedir, config: @config)
 
       copy_stylesheet(@path)
       copy_frontmatter(@path)

diff --git a/test/book_test_helper.rb b/test/book_test_helper.rb
@@ -25,7 +25,7 @@ def mktmpbookdir(files = {})
         else
           config = ReVIEW::Configure.values
         end
-        book = Book::Base.load(dir, config: config)
+        book = Book::Base.new(dir, config: config)
         yield(dir, book, created_files)
       end
     end

diff --git a/test/test_book.rb b/test/test_book.rb
@@ -24,7 +24,7 @@ def test_update_rubyenv
     begin
       Dir.mktmpdir do |dir|
         File.write(File.join(dir, 'review-ext.rb'), "#{test_const} = #{num}")
-        Book::Base.load(dir)
+        Book::Base.new(dir)
         assert_equal num, (Object.class_eval { const_get(test_const) })
       end
     ensure

diff --git a/test/test_builder.rb b/test/test_builder.rb
@@ -24,7 +24,7 @@ def test_initialize
 
   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 @@ def test_result
     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 @@ def test_compile_inline_backslash
 
   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

diff --git a/test/test_htmlbuilder.rb b/test/test_htmlbuilder.rb
@@ -925,7 +925,7 @@ def @chapter.list(_id)
   end
 
   def test_inline_list_href
-    book = ReVIEW::Book::Base.load
+    book = ReVIEW::Book::Base.new
     book.config['chapterlink'] = true
     book.catalog = ReVIEW::Catalog.new('CHAPS' => %w[ch1.re ch2.re])
     io1 = StringIO.new("//list[sampletest][a]{\nfoo\n//}\n")
@@ -2220,7 +2220,7 @@ def test_inline_fn
   end
 
   def test_inline_hd
-    book = ReVIEW::Book::Base.load
+    book = ReVIEW::Book::Base.new
     book.catalog = ReVIEW::Catalog.new('CHAPS' => %w[ch1.re ch2.re])
     io1 = StringIO.new("= test1\n\nfoo\n\n== test1-1\n\nbar\n\n== test1-2\n\nbar\n\n")
     io2 = StringIO.new("= test2\n\nfoo\n\n== test2-1\n\nbar\n\n== test2-2\n\nbar\n\n")
@@ -2242,7 +2242,7 @@ def test_inline_hd
   end
 
   def test_inline_hd_for_part
-    book = ReVIEW::Book::Base.load
+    book = ReVIEW::Book::Base.new
     book.catalog = ReVIEW::Catalog.new('CHAPS' => %w[ch1.re ch2.re])
     io1 = StringIO.new("= test1\n\nfoo\n\n== test1-1\n\nbar\n\n== test1-2\n\nbar\n\n")
     io2 = StringIO.new("= test2\n\nfoo\n\n== test2-1\n\nbar\n\n== test2-2\n\nbar\n\n")

diff --git a/test/test_webtocprinter.rb b/test/test_webtocprinter.rb
@@ -11,7 +11,7 @@ def setup
   end
 
   def test_webtocprinter_null
-    dummy_book = ReVIEW::Book::Base.load
+    dummy_book = ReVIEW::Book::Base.new
     # chap = ReVIEW::Book::Chapter.new(dummy_book, 1, '-', nil, StringIO.new)
     str = WEBTOCPrinter.book_to_string(dummy_book)
     expect = <<-EOB