Merge pull request #1548 from kmuto/remove-book-load

remove ReVIEW::Book.load, modify ReVIEW::Book::Base.load
kmuto · Aug 18, 2020 · 2d89aa0 · 2d89aa0
2 parents 2883d60 + 4d3c1a0
commit 2d89aa0
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 23 deletions.
diff --git a/bin/review-compile b/bin/review-compile
@@ -94,7 +94,7 @@ def _main
         end
       end
     when :dir
-      book = @basedir ? ReVIEW::Book.load(@basedir) : ReVIEW::Book::Base.load
+      book = @basedir ? ReVIEW::Book::Base.load(@basedir) : ReVIEW::Book::Base.load
       book.config = @config
       compiler = ReVIEW::Compiler.new(load_builder_class(@target, @check_only))
       book.chapters.each do |chap|

diff --git a/lib/review/book.rb b/lib/review/book.rb
@@ -18,8 +18,8 @@
 
 module ReVIEW
   module Book
-    def self.load(dir)
-      Base.load(dir)
+    def self.load(_dir)
+      raise NotImplementedError, 'ReVIEW::Book.load is obsoleted. Please use ReVIEW::Book::Base.load.'
     end
   end
 end
diff --git a/lib/review/book/base.rb b/lib/review/book/base.rb
@@ -18,16 +18,16 @@ class Base
       attr_writer :catalog
       attr_reader :basedir
 
-      def self.load(dir = '.')
-        new(dir)
+      def self.load(basedir = '.', config: nil)
+        new(basedir, config: config)
       end
 
-      def initialize(basedir = '.')
+      def initialize(basedir = '.', config: nil)
         @basedir = basedir
         @logger = ReVIEW.logger
         @parts = nil
         @chapter_index = nil
-        @config = ReVIEW::Configure.values
+        @config = config || ReVIEW::Configure.values
         @catalog = nil
         @warn_old_files = {} # XXX for checking CHAPS, PREDEF, POSTDEF
         @basedir_seen = {}

diff --git a/lib/review/epubmaker.rb b/lib/review/epubmaker.rb
@@ -307,8 +307,7 @@ def build_body(basetmpdir, yamlfile)
 
       basedir = File.dirname(yamlfile)
       base_path = Pathname.new(basedir)
-      book = ReVIEW::Book.load(basedir)
-      book.config = @config
+      book = ReVIEW::Book::Base.load(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
@@ -105,8 +105,7 @@ def generate_idgxml_files(yamlfile)
       remove_old_files(@path)
       Dir.mkdir(@path)
 
-      @book = ReVIEW::Book.load(@basedir)
-      @book.config = @config
+      @book = ReVIEW::Book::Base.load(@basedir, config: @config)
       if @table
         @book.config['tableopt'] = @table
       end

diff --git a/lib/review/pdfmaker.rb b/lib/review/pdfmaker.rb
@@ -272,8 +272,7 @@ def generate_pdf
       begin
         @compile_errors = nil
 
-        book = ReVIEW::Book.load(@basedir)
-        book.config = @config
+        book = ReVIEW::Book::Base.load(@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
@@ -109,8 +109,7 @@ def generate_text_files(yamlfile)
       remove_old_files(@path)
       Dir.mkdir(@path)
 
-      @book = ReVIEW::Book.load(@basedir)
-      @book.config = @config
+      @book = ReVIEW::Book::Base.load(@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
+      @book = ReVIEW::Book::Base.load('.', config: @config)
       @upper = 4
       @indent = true
       @buildonly = nil
@@ -59,7 +59,6 @@ def initialize
 
     def execute(*args)
       parse_options(args)
-      @book.config = ReVIEW::Configure.values
       unless File.readable?(@yamlfile)
         @logger.error("No such fiile or can't open #{@yamlfile}.")
         exit 1

diff --git a/lib/review/volumeprinter.rb b/lib/review/volumeprinter.rb
@@ -28,8 +28,7 @@ def initialize
 
     def execute(*args)
       parse_options(args)
-      @book = ReVIEW::Book::Base.load
-      @book.config = @config
+      @book = ReVIEW::Book::Base.load('.', 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
@@ -109,8 +109,7 @@ def generate_html_files(yamlfile)
       remove_old_files(@path)
       Dir.mkdir(@path)
 
-      @book = ReVIEW::Book.load(@basedir)
-      @book.config = @config
+      @book = ReVIEW::Book::Base.load(@basedir, config: @config)
 
       copy_stylesheet(@path)
       copy_frontmatter(@path)

diff --git a/test/book_test_helper.rb b/test/book_test_helper.rb
@@ -18,8 +18,7 @@ def mktmpbookdir(files = {})
           File.open(path, 'w') { |o| o.print content }
           created_files[basename] = path
         end
-        book = Book::Base.load(dir)
-        book.config = ReVIEW::Configure.values
+        book = Book::Base.load(dir, config: ReVIEW::Configure.values)
         yield(dir, book, created_files)
       end
     end