review 5.3.0 → 5.4.0

data/lib/review/preprocessor/repository.rb

@@ -165,7 +165,7 @@ module ReVIEW
       end
 
       def check_spec(spec)
-        app_error "wrong spec: #{spec.inspect}" unless /\A\w+\z/ =~ spec
+        app_error "wrong spec: #{spec.inspect}" unless /\A\w+\z/.match?(spec)
         spec
       end
 

data/lib/review/preprocessor.rb

@@ -70,11 +70,11 @@ module ReVIEW
             direc = parse_directive(line, 1, 'eval')
             path = expand(direc.arg)
             @leave_content = File.extname(path) == '.re'
-            if direc['eval']
-              ent = evaluate(path, ent)
-            else
-              ent = @repository.fetch_file(path)
-            end
+            ent = if direc['eval']
+                    evaluate(path, ent)
+                  else
+                    @repository.fetch_file(path)
+                  end
             replace_block(f, line, ent, false) # FIXME: turn off lineno: tmp
 
           when /\A\#@map(?:range)?/

data/lib/review/textmaker.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2018-2021 Kenshi Muto
+# Copyright (c) 2018-2022 Kenshi Muto
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -74,9 +74,14 @@ module ReVIEW
       cmd_config, yamlfile = parse_opts(args)
       error! "#{yamlfile} not found." unless File.exist?(yamlfile)
 
-      @config = ReVIEW::Configure.create(maker: 'textmaker',
-                                         yamlfile: yamlfile,
-                                         config: cmd_config)
+      begin
+        @config = ReVIEW::Configure.create(maker: 'textmaker',
+                                           yamlfile: yamlfile,
+                                           config: cmd_config)
+      rescue ReVIEW::ConfigError => e
+        error! e.message
+      end
+
       @img_math = ReVIEW::ImgMath.new(@config, path_name: '_review_math_text')
 
       I18n.setup(@config['language'])
@@ -111,12 +116,11 @@ module ReVIEW
 
     def build_body(basetmpdir, _yamlfile)
       base_path = Pathname.new(@basedir)
-      builder = nil
-      if @plaintext
-        builder = ReVIEW::PLAINTEXTBuilder.new(img_math: @img_math)
-      else
-        builder = ReVIEW::TOPBuilder.new(img_math: @img_math)
-      end
+      builder = if @plaintext
+                  ReVIEW::PLAINTEXTBuilder.new(img_math: @img_math)
+                else
+                  ReVIEW::TOPBuilder.new(img_math: @img_math)
+                end
       @converter = ReVIEW::Converter.new(@book, builder)
       @book.parts.each do |part|
         if part.name.present?
@@ -142,13 +146,11 @@ module ReVIEW
     end
 
     def build_chap(chap, base_path, basetmpdir, ispart)
-      filename = ''
-
-      if ispart.present?
-        filename = chap.path
-      else
-        filename = Pathname.new(chap.path).relative_path_from(base_path).to_s
-      end
+      filename = if ispart.present?
+                   chap.path
+                 else
+                   Pathname.new(chap.path).relative_path_from(base_path).to_s
+                 end
       id = File.basename(filename).sub(/\.re\Z/, '')
       if @buildonly && !@buildonly.include?(id)
         warn "skip #{id}.re"
@@ -159,7 +161,7 @@ module ReVIEW
 
       begin
         @converter.convert(filename, File.join(basetmpdir, textfile))
-      rescue => e
+      rescue StandardError => e
         @compile_errors = true
         error "compile error in #{filename} (#{e.class})"
         error e.message

data/lib/review/textutils.rb

@@ -72,13 +72,11 @@ module ReVIEW
         end
 
         # lazy than rule 3, but it looks better
-        if lazy
-          if (%i[F W H].include?(Unicode::Eaw.property(tail)) &&
+        if lazy && ((%i[F W H].include?(Unicode::Eaw.property(tail)) &&
               tail !~ /\p{Hangul}/) ||
              (%i[F W H].include?(Unicode::Eaw.property(head)) &&
-              head !~ /\p{Hangul}/)
-            space = nil
-          end
+              head !~ /\p{Hangul}/))
+          space = nil
         end
       end
       space

data/lib/review/topbuilder.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2008-2021 Minero Aoki, Kenshi Muto
+# Copyright (c) 2008-2022 Minero Aoki, Kenshi Muto
 #               2002-2006 Minero Aoki
 #
 # This program is free software.
@@ -262,13 +262,61 @@ module ReVIEW
       blank
     end
 
+    def table_rows(sepidx, rows)
+      if sepidx
+        sepidx.times do
+          tr(rows.shift.map { |s| th(s) })
+        end
+        if !@book.config['textmaker'] || !@book.config['textmaker']['th_bold']
+          puts '-' * 12
+        end
+        rows.each do |cols|
+          tr(cols.map { |s| td(s) })
+        end
+      else
+        rows.each do |cols|
+          h, *cs = *cols
+          tr([th(h)] + cs.map { |s| td(s) })
+        end
+      end
+    end
+
     def th(str)
-      "★#{str}☆"
+      if @book.config['textmaker'] && @book.config['textmaker']['th_bold']
+        "★#{str}☆"
+      else
+        str
+      end
     end
 
     def table_end
     end
 
+    def imgtable(lines, id, caption = nil, metric = nil)
+      metrics = parse_metric('top', metric)
+      metrics = " #{metrics}" if metrics.present?
+      blank
+      puts "◆→開始:#{@titles['table']}←◆"
+      if caption_top?('table') && caption.present?
+        table_header(id, caption)
+      end
+
+      if @chapter.image_bound?(id)
+        puts "◆→#{@chapter.image(id).path}#{metrics}←◆"
+      else
+        warn "image not bound: #{id}", location: location
+        lines.each do |line|
+          puts line
+        end
+      end
+
+      if !caption_top?('table') && caption.present?
+        table_header(id, caption)
+      end
+      puts "◆→終了:#{@titles['table']}←◆"
+      blank
+    end
+
     def comment(lines, comment = nil)
       return unless @book.config['draft']
 
@@ -314,8 +362,9 @@ module ReVIEW
 
     def compile_kw(word, alt)
       if alt
-      then "★#{word}☆（#{alt.strip}）"
-      else "★#{word}☆"
+        "★#{word}☆（#{alt.strip}）"
+      else
+        "★#{word}☆"
       end
     end
 
@@ -398,7 +447,7 @@ module ReVIEW
     def inline_icon(id)
       begin
         "◆→画像 #{@chapter.image(id).path.sub(%r{\A\./}, '')}←◆"
-      rescue
+      rescue StandardError
         warn "image not bound: #{id}", location: location
         "◆→画像 #{id}←◆"
       end
@@ -495,27 +544,37 @@ module ReVIEW
       ), __FILE__, __LINE__ - 11
     end
 
-    def indepimage(_lines, id, caption = nil, metric = nil)
+    def indepimage(lines, id, caption = nil, metric = nil)
       metrics = parse_metric('top', metric)
       metrics = " #{metrics}" if metrics.present?
       blank
+      puts "◆→開始:#{@titles['image']}←◆"
       if caption_top?('image') && caption.present?
-        puts "図　#{compile_inline(caption)}"
+        indepimage_header(id, caption)
+        blank
       end
-      begin
-        puts "◆→画像 #{@chapter.image(id).path.sub(%r{\A\./}, '')}#{metrics}←◆"
-      rescue
+      if @chapter.image_bound?(id)
+        puts "◆→#{@chapter.image(id).path}#{metrics}←◆"
+      else
         warn "image not bound: #{id}", location: location
-        puts "◆→画像 #{id}←◆"
+        lines.each do |line|
+          puts line
+        end
       end
       if !caption_top?('image') && caption.present?
-        puts "図　#{compile_inline(caption)}"
+        blank
+        indepimage_header(id, caption)
       end
+      puts "◆→終了:#{@titles['image']}←◆"
       blank
     end
 
     alias_method :numberlessimage, :indepimage
 
+    def indepimage_header(_id, caption)
+      puts "図#{I18n.t('caption_prefix_idgxml')}#{compile_inline(caption)}"
+    end
+
     def inline_code(str)
       "△#{str}☆"
     end

data/lib/review/update.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018-2020 Kenshi Muto
+# Copyright (c) 2018-2022 Kenshi Muto
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -165,7 +165,7 @@ module ReVIEW
 
       Dir.glob(File.join(dir, '*.yml')).sort.each do |yml|
         begin
-          config = YAML.load_file(yml)
+          config = YAMLLoader.safe_load_file(yml)
           if config['language'].present?
             language = config['language']
           end
@@ -226,9 +226,11 @@ module ReVIEW
 
     def check_own_files(dir)
       if File.exist?(File.join(dir, 'layouts/layout.tex.erb'))
+        # rubocop:disable Style/SoleNestedConditional
         unless confirm('** There is custom layouts/layout.tex.erb file. Updating may break to make PDF until you fix layout.tex.erb. Do you really proceed to update? **', [], nil)
           raise ApplicationError
         end
+        # rubocop:enable Style/SoleNestedConditional
       end
 
       if File.exist?(File.join(dir, 'review-ext.rb'))
@@ -238,7 +240,7 @@ module ReVIEW
 
     def update_version
       @config_ymls.each do |yml|
-        config = YAML.load_file(yml)
+        config = YAMLLoader.safe_load_file(yml)
         if config['review_version'].to_f.round(1) == TARGET_VERSION.to_f.round(1)
           next
         end
@@ -265,10 +267,12 @@ module ReVIEW
       target_rakefile = File.join(dir, 'Rakefile')
       if File.exist?(target_rakefile)
         if Digest::SHA256.hexdigest(File.read(target_rakefile)) != Digest::SHA256.hexdigest(File.read(master_rakefile))
+          # rubocop:disable Style/SoleNestedConditional
           if confirm('%s will be overridden with Re:VIEW version (%s). Do you really proceed?', ['Rakefile', master_rakefile])
             FileUtils.mv(target_rakefile, "#{target_rakefile}-old")
             FileUtils.cp(master_rakefile, target_rakefile)
           end
+          # rubocop:enable Style/SoleNestedConditional
         end
       else
         @logger.info t('new file %s is created.', [target_rakefile]) unless @force
@@ -278,12 +282,14 @@ module ReVIEW
       master_rakefile = File.join(@review_dir, 'samples/sample-book/src/lib/tasks/review.rake')
       target_rakefile = File.join(taskdir, 'review.rake')
       if File.exist?(target_rakefile)
+        # rubocop:disable Style/SoleNestedConditional
         if Digest::SHA256.hexdigest(File.read(target_rakefile)) != Digest::SHA256.hexdigest(File.read(master_rakefile))
           if confirm('%s will be overridden with Re:VIEW version (%s). Do you really proceed?', ['lib/tasks/review.rake', master_rakefile])
             FileUtils.mv(target_rakefile, "#{target_rakefile}-old")
             FileUtils.cp(master_rakefile, target_rakefile)
           end
         end
+        # rubocop:enable Style/SoleNestedConditional
       else
         @logger.info t('new file %s is created.', [target_rakefile]) unless @force
         FileUtils.cp(master_rakefile, target_rakefile)
@@ -292,11 +298,13 @@ module ReVIEW
 
     def update_epub_version
       @epub_ymls.each do |yml|
-        config = YAML.load_file(yml)
+        config = YAMLLoader.safe_load_file(yml)
         if config['epubversion'].present? && config['epubversion'].to_f < EPUB_VERSION.to_f
+          # rubocop:disable Style/SoleNestedConditional
           if confirm("%s: Update '%s' to '%s' from '%s'?", [File.basename(yml), 'epubversion', EPUB_VERSION, config['epubversion']])
             rewrite_yml(yml, 'epubversion', EPUB_VERSION)
           end
+          # rubocop:enable Style/SoleNestedConditional
         end
         if !config['htmlversion'].present? || config['htmlversion'].to_f >= HTML_VERSION.to_f
           next
@@ -310,7 +318,7 @@ module ReVIEW
 
     def update_locale
       @locale_ymls.each do |yml|
-        config = YAML.load_file(yml)
+        config = YAMLLoader.safe_load_file(yml)
         if !config['chapter_quote'].present? || config['chapter_quote'].scan('%s').size != 1
           next
         end
@@ -324,7 +332,7 @@ module ReVIEW
 
     def update_tex_parameters
       @tex_ymls.each do |yml|
-        config = YAML.load_file(yml)
+        config = YAMLLoader.safe_load_file(yml)
         unless config['texdocumentclass']
           next
         end
@@ -510,7 +518,7 @@ module ReVIEW
 
     def update_tex_command
       @tex_ymls.each do |yml|
-        config = YAML.load_file(yml)
+        config = YAMLLoader.safe_load_file(yml)
         if !config['texcommand'] || config['texcommand'] !~ /\s+-/
           next
         end
@@ -535,7 +543,7 @@ module ReVIEW
 
     def update_dvi_command
       @tex_ymls.each do |yml|
-        config = YAML.load_file(yml)
+        config = YAMLLoader.safe_load_file(yml)
         if !config['dvicommand'] || config['dvicommand'] !~ /\s+-/
           next
         end

data/lib/review/version.rb

@@ -1,3 +1,3 @@
 module ReVIEW
-  VERSION = '5.3.0'.freeze
+  VERSION = '5.4.0'.freeze
 end

data/lib/review/webmaker.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2021 Masayoshi Takahashi, Masanori Kado, Kenshi Muto
+# Copyright (c) 2016-2022 Masayoshi Takahashi, Masanori Kado, Kenshi Muto
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -78,9 +78,13 @@ module ReVIEW
       cmd_config, yamlfile = parse_opts(args)
       error! "#{yamlfile} not found." unless File.exist?(yamlfile)
 
-      @config = ReVIEW::Configure.create(maker: 'webmaker',
-                                         yamlfile: yamlfile,
-                                         config: cmd_config)
+      begin
+        @config = ReVIEW::Configure.create(maker: 'webmaker',
+                                           yamlfile: yamlfile,
+                                           config: cmd_config)
+      rescue ReVIEW::ConfigError => e
+        error! e.message
+      end
 
       @config['htmlext'] = 'html'
       @img_math = ReVIEW::ImgMath.new(@config)
@@ -97,7 +101,7 @@ module ReVIEW
     end
 
     def generate_html_files(yamlfile)
-      @basedir = File.dirname(yamlfile)
+      @basedir = File.absolute_path(File.dirname(yamlfile))
       @path = build_path
       remove_old_files(@path)
       Dir.mkdir(@path)
@@ -146,19 +150,27 @@ module ReVIEW
     def build_part(part, basetmpdir, htmlfile)
       @title = h("#{ReVIEW::I18n.t('part', part.number)} #{part.name.strip}")
       File.open("#{basetmpdir}/#{htmlfile}", 'w') do |f|
-        @body = ''
-        @body << %Q(<div class="part">\n)
-        @body << %Q(<h1 class="part-number">#{ReVIEW::I18n.t('part', part.number)}</h1>\n)
-        @body << %Q(<h2 class="part-title">#{part.name.strip}</h2>\n) if part.name.strip.present?
-        @body << "</div>\n"
-
+        @part_number = part.number
+        @part_title = part.name.strip
+        @body = ReVIEW::Template.generate(path: template_name(localfile: '_part_body.html.erb', systemfile: 'html/_part_body.html.erb'), binding: binding)
         @language = @config['language']
         @stylesheets = @config['stylesheet']
         f.write ReVIEW::Template.generate(path: template_name, binding: binding)
       end
     end
 
-    def template_name
+    def template_name(localfile: 'layout-web.html.erb', systemfile: nil)
+      if @basedir
+        layoutfile = File.join(@basedir, 'layouts', localfile)
+        if File.exist?(layoutfile)
+          return layoutfile
+        end
+      end
+
+      if systemfile
+        return systemfile
+      end
+
       if @config['htmlversion'].to_i == 5
         'web/html/layout-html5.html.erb'
       else
@@ -167,13 +179,11 @@ module ReVIEW
     end
 
     def build_chap(chap, base_path, basetmpdir, ispart)
-      filename = ''
-
-      if ispart.present?
-        filename = chap.path
-      else
-        filename = Pathname.new(chap.path).relative_path_from(base_path).to_s
-      end
+      filename = if ispart.present?
+                   chap.path
+                 else
+                   Pathname.new(chap.path).relative_path_from(base_path).to_s
+                 end
       id = File.basename(filename).sub(/\.re\Z/, '')
 
       if @buildonly && !@buildonly.include?(id)
@@ -219,7 +229,7 @@ module ReVIEW
 
           if FileTest.directory?("#{resdir}/#{fname}")
             recursive_copy_files("#{resdir}/#{fname}", "#{destdir}/#{fname}", allow_exts)
-          elsif fname =~ /\.(#{allow_exts.join('|')})\Z/i
+          elsif /\.(#{allow_exts.join('|')})\Z/i.match?(fname)
             FileUtils.mkdir_p(destdir)
             FileUtils.cp("#{resdir}/#{fname}", destdir)
           end
@@ -274,18 +284,8 @@ module ReVIEW
 
     def build_titlepage(basetmpdir, htmlfile)
       @title = h('titlepage')
-      File.open("#{basetmpdir}/#{htmlfile}", 'w') do |f|
-        @body = ''
-        @body << %Q(<div class="titlepage">)
-        @body << %Q(<h1 class="tp-title">#{h(@config.name_of('booktitle'))}</h1>)
-        if @config['aut']
-          @body << %Q(<h2 class="tp-author">#{join_with_separator(@config.names_of('aut'), ReVIEW::I18n.t('names_splitter'))}</h2>)
-        end
-        if @config['pbl']
-          @body << %Q(<h3 class="tp-publisher">#{join_with_separator(@config.names_of('pbl'), ReVIEW::I18n.t('names_splitter'))}</h3>)
-        end
-        @body << '</div>'
-
+      File.open(File.join(basetmpdir, htmlfile), 'w') do |f|
+        @body = ReVIEW::Template.generate(path: template_name(localfile: '_titlepage.html.erb', systemfile: 'html/_titlepage.html.erb'), binding: binding)
         @language = @config['language']
         @stylesheets = @config['stylesheet']
         f.write ReVIEW::Template.generate(path: template_name, binding: binding)

data/lib/review/webtocprinter.rb

@@ -41,16 +41,16 @@ EOT
           next
         end
 
-        if path.start_with?('.')
-          content << "<li>#{escape(result.headline)}"
-        else
-          content << %Q(<li><a href="#{path}">#{escape(result.headline)}</a>)
-        end
-        if result.level == 0
-          content << "\n<ul>" # part
-        else
-          content << "</li>\n"
-        end
+        content << if path.start_with?('.')
+                     "<li>#{escape(result.headline)}"
+                   else
+                     %Q(<li><a href="#{path}">#{escape(result.headline)}</a>)
+                   end
+        content << if result.level == 0
+                     "\n<ul>" # part
+                   else
+                     "</li>\n"
+                   end
       end
       content << "</ul>\n"
     end

data/lib/review/yamlloader.rb

@@ -2,6 +2,39 @@ require 'yaml'
 
 module ReVIEW
   class YAMLLoader
+    def self.safe_load_file(file)
+      if YAML.respond_to?(:safe_load_file)
+        YAML.safe_load_file(file, aliases: true, permitted_classes: [Date])
+      else
+        File.open(file, 'rt:bom|utf-8') do |f|
+          begin
+            # < Ruby 3.1
+            YAML.safe_load(f, filename: file, aliases: true, permitted_classes: [Date])
+          rescue ArgumentError
+            # < Ruby 2.7
+            YAML.safe_load(f, [Date])
+          rescue Psych::DisallowedClass
+            # < Ruby 2.5
+            YAML.safe_load(File.read(file), [Date])
+          end
+        end
+      end
+    end
+
+    def self.safe_load(s)
+      if YAML.respond_to?(:safe_load_file)
+        YAML.safe_load(s, aliases: true, permitted_classes: [Date])
+      else
+        begin
+          # < Ruby 3.1
+          YAML.safe_load(s, aliases: true, permitted_classes: [Date])
+        rescue ArgumentError, Psych::DisallowedClass
+          # < Ruby 2.7
+          YAML.safe_load(s, [Date])
+        end
+      end
+    end
+
     def initialize
     end
 
@@ -17,8 +50,8 @@ module ReVIEW
 
       while file_queue.present?
         current_file = file_queue.shift
-        current_yaml = YAML.load_file(current_file)
-        if current_yaml.instance_of?(FalseClass)
+        current_yaml = YAMLLoader.safe_load_file(current_file)
+        if current_yaml.instance_of?(FalseClass) || current_yaml.nil?
           raise "#{File.basename(current_file)} is malformed."
         end
 

data/review.gemspec

@@ -12,6 +12,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.metadata = { 'rubygems_mfa_required' => 'true' }
 
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

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

@@ -3,7 +3,6 @@ review_version: 5.0
 bookname: book
 language: ja
 booktitle: Re:VIEWサンプル書籍
-urnid: urn:uuid:http://reviewml.com/books/review-sample-book/
 # isbn: null
 aut: Re:VIEW Writers
 pbl: Re:VIEW Publishers

data/templates/html/_titlepage.html.erb

@@ -1,20 +1,12 @@
-  <h1 class="tp-title"><%= @title_str %></h1>
-<% if @subtitle_str %>
-  <h2 class="tp-subtitle"><%= h(@subtitle_str) %></h2>
+<div class="titlepage">
+<h1 class="tp-title"><%= h(@config.name_of('booktitle')) %></h1>
+<% if @config['subtitle'] %>
+<h2 class="tp-subtitle"><%= h(@config.name_of('subtitle')) %></h2>
 <% end %>
-<% if @author_str %>
-  <p>
-    <br />
-    <br />
-  </p>
-  <h2 class="tp-author"><%= h(@author_str) %></h2>
+<% if @config['aut'] %>
+<h2 class="tp-author"><%= h(@config.names_of('aut').join(ReVIEW::I18n.t('names_splitter'))) %></h2>
 <% end %>
-<% if @publisher_str %>
-  <p>
-    <br />
-    <br />
-    <br />
-    <br />
-  </p>
-  <h3 class="tp-publisher"><%= h(@publisher_str) %></h3>
+<% if @config['pbl'] %>
+<h3 class="tp-publisher"><%= h(@config.names_of('pbl').join(ReVIEW::I18n.t('names_splitter'))) %></h3>
 <% end %>
+</div>

data/templates/opf/opf_manifest_epubv2.opf.erb

@@ -4,7 +4,7 @@
 <% if @config['toc'] && @config['mytoc'] %>
     <item id="toc" href="<%= @config['bookname'] %>-toc.<%= @config['htmlext'] %>" media-type="application/xhtml+xml"/>
 <% end %>
-<% @items.each do |item| %>
+<% @items.sort_by { |x| x.id }.each do |item| %>
     <item id="<%= item.id %>" href="<%= item.file %>" media-type="<%= item.media %>"/>
 <% end %>
   </manifest>

data/templates/opf/opf_manifest_epubv3.opf.erb

@@ -4,7 +4,7 @@
 <% if @coverimage %>
     <item properties="cover-image" id="cover-<%= @coverimage.id %>" href="<%= @coverimage.file %>" media-type="<%= @coverimage.media %>"/>
 <% end %>
-<% @items.each do |item| %>
+<% @items.sort_by { |x| x.id }.each do |item| %>
     <item id="<%= item.id %>" href="<%= item.file %>" media-type="<%= item.media %>"<%= item.properties_attribute %>/>
 <% end %>
   </manifest>

data/test/book_test_helper.rb

@@ -20,11 +20,11 @@ module BookTestHelper
           created_files[filename] = path
         end
         conf_path = File.expand_path('config.yml', dir)
-        if File.exist?(conf_path)
-          config = ReVIEW::Configure.create(yamlfile: conf_path)
-        else
-          config = ReVIEW::Configure.values
-        end
+        config = if File.exist?(conf_path)
+                   ReVIEW::Configure.create(yamlfile: conf_path)
+                 else
+                   ReVIEW::Configure.values
+                 end
         book = Book::Base.new(dir, config: config)
         yield(dir, book, created_files)
       end
@@ -34,11 +34,11 @@ module BookTestHelper
   def get_instance_variables(obj)
     obj.instance_variables.each_with_object({}) do |name, memo|
       value = obj.instance_variable_get(name)
-      if value.instance_variables.empty?
-        memo[name] = value
-      else
-        memo[name] = get_instance_variables(value)
-      end
+      memo[name] = if value.instance_variables.empty?
+                     value
+                   else
+                     get_instance_variables(value)
+                   end
     end
   end
 end