review 2.3.0 → 2.4.0

data/test/test_lineinput.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'test_helper'
 require 'lineinput'
 require 'tempfile'
@@ -17,7 +15,7 @@ class LineInputTest < Test::Unit::TestCase
   def test_gets
     content = "abc\ndef\r\nghi\rjkl"
     do_test_gets(StringIO.new(content))
-    Tempfile.open("lineinput_test") do |io|
+    Tempfile.open('lineinput_test') do |io|
       io.print content
       io.rewind
       do_test_gets(io)
@@ -106,7 +104,7 @@ class LineInputTest < Test::Unit::TestCase
     li = LineInput.new(io)
 
     data = ''
-    li.each {|l| data << l }
+    li.each { |l| data << l }
     assert_equal content, data
   end
 
@@ -116,7 +114,7 @@ class LineInputTest < Test::Unit::TestCase
 
     li.while_match(/^[ad]/) {}
     assert_equal 2, li.lineno
-    assert_equal "ghi", li.gets
+    assert_equal 'ghi', li.gets
   end
 
   def test_getlines_while
@@ -126,7 +124,7 @@ class LineInputTest < Test::Unit::TestCase
     buf = li.getlines_while(/^[ad]/)
     assert_equal ["abc\n", "def\n"], buf
     assert_equal 2, li.lineno
-    assert_equal "ghi", li.gets
+    assert_equal 'ghi', li.gets
   end
 
   def test_until_match
@@ -153,17 +151,17 @@ class LineInputTest < Test::Unit::TestCase
     li = LineInput.new(io)
 
     data = ''
-    li.until_terminator(%r<\A//\}>) {|l| data << l }
+    li.until_terminator(%r<\A//\}>) { |l| data << l }
     assert_equal "abc\n", data
     assert_equal 2, li.lineno
 
     data = ''
-    li.until_terminator(%r<\A//\}>) {|l| data << l }
+    li.until_terminator(%r<\A//\}>) { |l| data << l }
     assert_equal "def\nghi\n", data
     assert_equal 5, li.lineno
 
     data = ''
-    li.until_terminator(%r<\A//\}>) {|l| data << l }
+    li.until_terminator(%r<\A//\}>) { |l| data << l }
     assert_equal "jkl\nmno", data
     assert_equal 8, li.lineno
   end
@@ -177,4 +175,3 @@ class LineInputTest < Test::Unit::TestCase
     assert_equal 3, li.lineno
   end
 end
-

data/test/test_location.rb

@@ -7,24 +7,24 @@ class LocationTest < Test::Unit::TestCase
 
   def test_lineno
     f = StringIO.new("a\nb\nc\n")
-    location = ReVIEW::Location.new("foo", f)
+    location = ReVIEW::Location.new('foo', f)
     assert_equal 0, location.lineno
     f.gets
     assert_equal 1, location.lineno
   end
 
   def test_string
-    location = ReVIEW::Location.new("foo", StringIO.new("a\nb\nc\n"))
-    assert_equal "foo:0", location.string
+    location = ReVIEW::Location.new('foo', StringIO.new("a\nb\nc\n"))
+    assert_equal 'foo:0', location.string
   end
 
   def test_to_s
-    location = ReVIEW::Location.new("foo", StringIO.new("a\nb\nc\n"))
-    assert_equal "foo:0", "#{location}"
+    location = ReVIEW::Location.new('foo', StringIO.new("a\nb\nc\n"))
+    assert_equal 'foo:0', location.to_s
   end
 
   def test_to_s_nil
-    location = ReVIEW::Location.new("foo", nil)
-    assert_equal "foo:nil", "#{location}"
+    location = ReVIEW::Location.new('foo', nil)
+    assert_equal 'foo:nil', location.to_s
   end
 end

data/test/test_makerhelper.rb

@@ -1,11 +1,8 @@
-# -*- coding: utf-8 -*-
-
 require 'test_helper'
 require 'review/makerhelper'
 require 'tmpdir'
 require 'fileutils'
 
-
 class MakerHelperTest < Test::Unit::TestCase
   include ReVIEW
 
@@ -20,10 +17,8 @@ class MakerHelperTest < Test::Unit::TestCase
   end
 
   def test_copy_images_to_dir
-    types = %w{png gif jpg jpeg svg pdf eps}
-    types.each do |type|
-      touch_file("#{@tmpdir1}/foo.#{type}")
-    end
+    types = %w[png gif jpg jpeg svg pdf eps]
+    types.each { |type| touch_file("#{@tmpdir1}/foo.#{type}") }
     FileUtils.mkdir("#{@tmpdir1}/subdir")
     touch_file("#{@tmpdir1}/subdir/foo.png")
 
@@ -33,36 +28,29 @@ class MakerHelperTest < Test::Unit::TestCase
       assert File.exist?("#{@tmpdir2}/foo.#{type}"), "Copying #{type} file failed"
       assert image_files.include?("#{@tmpdir1}/foo.#{type}")
     end
-    assert File.exist?("#{@tmpdir2}/subdir/foo.png"), "Copying a image file in a subdirectory"
+    assert File.exist?("#{@tmpdir2}/subdir/foo.png"), 'Copying a image file in a subdirectory'
     assert image_files.include?("#{@tmpdir1}/subdir/foo.png")
   end
 
   def test_copy_images_to_dir_convert
-    if /mswin|mingw|cygwin/ !~ RUBY_PLATFORM && (`convert -version` rescue nil)
-      touch_file("#{@tmpdir1}/foo.eps")
+    if /mswin|mingw|cygwin/ !~ RUBY_PLATFORM && (`convert -version` rescue nil) && (`gs --version` rescue nil)
+      FileUtils.cp File.join(assets_dir, 'black.eps'), File.join(@tmpdir1, 'foo.eps')
 
       image_files = MakerHelper.copy_images_to_dir(@tmpdir1, @tmpdir2,
-                                                   :convert => {:eps => :png})
+                                                   convert: { eps: :png })
 
-      assert File.exist?("#{@tmpdir2}/foo.eps.png"), "EPS to PNG conversion failed"
+      assert File.exist?("#{@tmpdir2}/foo.eps.png"), 'EPS to PNG conversion failed'
       assert image_files.include?("#{@tmpdir1}/foo.eps.png")
     end
   end
 
   def test_copy_images_to_dir_with_exts
-    types = %w{png gif jpg jpeg svg pdf eps}
-    types4epub = %w{png gif jpg jpeg svg}
-    types.each do |type|
-      touch_file("#{@tmpdir1}/foo.#{type}")
-    end
-    image_files = MakerHelper.copy_images_to_dir(@tmpdir1, @tmpdir2, :exts=>types4epub)
+    types = %w[png gif jpg jpeg svg pdf eps]
+    types4epub = %w[png gif jpg jpeg svg]
+    types.each { |type| touch_file("#{@tmpdir1}/foo.#{type}") }
+    image_files = MakerHelper.copy_images_to_dir(@tmpdir1, @tmpdir2, exts: types4epub)
 
-    types4epub.each do |type|
-      assert image_files.include?("#{@tmpdir1}/foo.#{type}"), "foo.#{type} is not included"
-    end
-    (types - types4epub).each do |type|
-      assert !image_files.include?("#{@tmpdir1}/foo.#{type}"), "foo.#{type} is included"
-    end
+    types4epub.each { |type| assert image_files.include?("#{@tmpdir1}/foo.#{type}"), "foo.#{type} is not included" }
+    (types - types4epub).each { |type| assert !image_files.include?("#{@tmpdir1}/foo.#{type}"), "foo.#{type} is included" }
   end
-
 end

data/test/test_markdownbuilder.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'test_helper'
 require 'review/compiler'
 require 'review/book'
@@ -10,12 +8,12 @@ class MARKDOWNBuilderTest < Test::Unit::TestCase
   include ReVIEW
 
   def setup
-    @builder = MARKDOWNBuilder.new()
+    @builder = MARKDOWNBuilder.new
     @config = {
-      "secnolevel" => 2, # for IDGXMLBuilder, HTMLBuilder
-      "stylesheet" => nil, # for HTMLBuilder
+      'secnolevel' => 2,
+      'stylesheet' => nil
     }
-    @book = Book::Base.new(".")
+    @book = Book::Base.new('.')
     @book.config = @config
     @compiler = ReVIEW::Compiler.new(@builder)
     @chapter = Book::Chapter.new(@book, 1, '-', nil, StringIO.new)
@@ -25,19 +23,19 @@ class MARKDOWNBuilderTest < Test::Unit::TestCase
 
   def test_quote
     actual = compile_block("//quote{\nfoo\nbar\n\nbuz\n//}\n")
-    assert_equal %Q|\n> foobar\n> \n> buz\n\n|, actual
+    assert_equal %Q(\n> foobar\n> \n> buz\n\n), actual
   end
 
   def test_inline_em
-    assert_equal "test*foo*abc", compile_inline("test@<em>{foo}abc")
+    assert_equal 'test*foo*abc', compile_inline('test@<em>{foo}abc')
   end
 
   def test_inline_strong
-    assert_equal "test**foo**abc", compile_inline("test@<strong>{foo}abc")
+    assert_equal 'test**foo**abc', compile_inline('test@<strong>{foo}abc')
   end
 
   def test_ul
-    src =<<-EOS
+    src = <<-EOS
   * AAA
   * BBB
 EOS
@@ -47,18 +45,18 @@ EOS
   end
 
   def test_inline_comment
-    actual = compile_inline("test @<comment>{コメント} test2")
-    assert_equal %Q|test  test2|, actual
+    actual = compile_inline('test @<comment>{コメント} test2')
+    assert_equal 'test  test2', actual
   end
 
   def test_inline_comment_for_draft
-    @config["draft"] = true
-    actual = compile_inline("test @<comment>{コメント} test2")
-    assert_equal %Q|test <span class="red">コメント</span> test2|, actual
+    @config['draft'] = true
+    actual = compile_inline('test @<comment>{コメント} test2')
+    assert_equal %Q(test <span class="red">コメント</span> test2), actual
   end
 
   def test_ul_nest1
-    src =<<-EOS
+    src = <<-EOS
   * AAA
   ** AA
   *** A
@@ -75,29 +73,29 @@ EOS
 
   def test_dlist
     actual = compile_block(": foo\n  foo.\n  bar.\n")
-    assert_equal %Q|<dl>\n<dt>foo</dt>\n<dd>foo.bar.</dd>\n</dl>\n|, actual
+    assert_equal %Q(<dl>\n<dt>foo</dt>\n<dd>foo.bar.</dd>\n</dl>\n), actual
   end
 
   def test_dlist_with_bracket
     actual = compile_block(": foo[bar]\n    foo.\n    bar.\n")
-    assert_equal %Q|<dl>\n<dt>foo[bar]</dt>\n<dd>foo.bar.</dd>\n</dl>\n|, actual
+    assert_equal %Q(<dl>\n<dt>foo[bar]</dt>\n<dd>foo.bar.</dd>\n</dl>\n), actual
   end
 
   def test_dlist_with_comment
     source = ": title\n  body\n\#@ comment\n\#@ comment\n: title2\n  body2\n"
     actual = compile_block(source)
-    assert_equal %Q|<dl>\n<dt>title</dt>\n<dd>body</dd>\n<dt>title2</dt>\n<dd>body2</dd>\n</dl>\n|, actual
+    assert_equal %Q(<dl>\n<dt>title</dt>\n<dd>body</dd>\n<dt>title2</dt>\n<dd>body2</dd>\n</dl>\n), actual
   end
 
   def test_comment
-    actual = compile_block("//comment[コメント]")
-    assert_equal %Q||, actual
+    actual = compile_block('//comment[コメント]')
+    assert_equal '', actual
   end
 
   def test_comment_for_draft
-    @config["draft"] = true
-    actual = compile_block("//comment[コメント]")
-    assert_equal %Q|<div class="red">コメント</div>\n|, actual
+    @config['draft'] = true
+    actual = compile_block('//comment[コメント]')
+    assert_equal %Q(<div class="red">コメント</div>\n), actual
   end
 
   def test_list
@@ -162,8 +160,7 @@ BBB
   end
 
   def test_ruby
-    actual = compile_block("@<ruby>{謳,うた}い文句")
+    actual = compile_block('@<ruby>{謳,うた}い文句')
     assert_equal "<ruby><rb>謳</rb><rp>（</rp><rt>うた</rt><rp>）</rp></ruby>い文句\n\n", actual
   end
-
 end

data/test/test_md2inaobuilder.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'test_helper'
 require 'review/compiler'
 require 'review/book'
@@ -10,22 +8,22 @@ class MD2INAOBuilderTest < Test::Unit::TestCase
   include ReVIEW
 
   def setup
-    @builder = MD2INAOBuilder.new()
+    @builder = MD2INAOBuilder.new
     @config = {
-      "secnolevel" => 2, # for IDGXMLBuilder, HTMLBuilder
-      "stylesheet" => nil, # for HTMLBuilder
+      'secnolevel' => 2,
+      'stylesheet' => nil
     }
-    @book = Book::Base.new(".")
+    @book = Book::Base.new('.')
     @book.config = @config
     @compiler = ReVIEW::Compiler.new(@builder)
     @chapter = Book::Chapter.new(@book, 1, '-', nil, StringIO.new)
     location = Location.new(nil, nil)
     @builder.bind(@compiler, @chapter, location)
-    I18n.setup("ja")
+    I18n.setup('ja')
   end
 
   def test_paragraph
-    actual = compile_block("Hello, world!")
+    actual = compile_block('Hello, world!')
     assert_equal "　Hello, world!\n\n", actual
   end
 
@@ -58,13 +56,12 @@ BBB
   end
 
   def test_ruby_mono
-    actual = compile_block("@<ruby>{謳,うた}い文句")
+    actual = compile_block('@<ruby>{謳,うた}い文句')
     assert_equal "　<span class='monoruby'>謳(うた)</span>い文句\n\n", actual
   end
 
   def test_ruby_group
-    actual = compile_block("@<ruby>{欠伸,あくび}が出る")
+    actual = compile_block('@<ruby>{欠伸,あくび}が出る')
     assert_equal "　<span class='groupruby'>欠伸(あくび)</span>が出る\n\n", actual
   end
-
 end

data/test/test_pdfmaker.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'test_helper'
 require 'review/pdfmaker'
 
@@ -9,25 +7,25 @@ class PDFMakerTest < Test::Unit::TestCase
   def setup
     @maker = ReVIEW::PDFMaker.new
     @config = ReVIEW::Configure.values
-    @config.merge!({
-                     "bookname" => "sample",
-                     "title" => "Sample Book",
-                     "version" => 2,
-                     "urnid" => "http://example.jp/",
-                     "date" => "2011-01-01",
-                     "language" => "ja",
-                     "texcommand" => "uplatex",
-                   })
+    @config.merge!(
+      'bookname' => 'sample',
+      'title' => 'Sample Book',
+      'version' => 2,
+      'urnid' => 'http://example.jp/',
+      'date' => '2011-01-01',
+      'language' => 'ja',
+      'texcommand' => 'uplatex'
+    )
     @maker.config = @config
-    @maker.initialize_metachars(@config["texcommand"])
+    @maker.initialize_metachars(@config['texcommand'])
     @output = StringIO.new
-    I18n.setup(@config["language"])
+    I18n.setup(@config['language'])
   end
 
   def test_check_book_existed
     Dir.mktmpdir do |dir|
       Dir.chdir(dir) do
-        pdf_file = File.join(dir, "sample.pdf")
+        pdf_file = File.join(dir, 'sample.pdf')
         FileUtils.touch(pdf_file)
         @maker.basedir = Dir.pwd
         @maker.remove_old_file
@@ -37,7 +35,7 @@ class PDFMakerTest < Test::Unit::TestCase
   end
 
   def test_check_book_none
-    Dir.mktmpdir do |dir|
+    Dir.mktmpdir do
       assert_nothing_raised do
         @maker.basedir = Dir.pwd
         @maker.remove_old_file
@@ -46,10 +44,10 @@ class PDFMakerTest < Test::Unit::TestCase
   end
 
   def test_buildpath_debug
-    @maker.config["debug"] = true
+    @maker.config['debug'] = true
     path = @maker.build_path
     begin
-      assert_equal(path, "sample-pdf")
+      assert_equal(path, 'sample-pdf')
     ensure
       FileUtils.remove_entry_secure path
     end
@@ -59,7 +57,7 @@ class PDFMakerTest < Test::Unit::TestCase
     io = StringIO.new
     $stdout = io
     assert_raises SystemExit do
-      @maker.parse_opts(["-h"])
+      @maker.parse_opts(['-h'])
     end
     $stdout = STDOUT
     io.rewind
@@ -68,26 +66,28 @@ class PDFMakerTest < Test::Unit::TestCase
   end
 
   def test_parse_opts_ignore_errors
-    conf, yml = @maker.parse_opts(["--ignore-errors", "hoge.yml"])
-    assert_equal conf["ignore-errors"], true
-    assert_equal yml, "hoge.yml"
+    conf, yml = @maker.parse_opts(['--ignore-errors', 'hoge.yml'])
+    assert_equal conf['ignore-errors'], true
+    assert_equal yml, 'hoge.yml'
   end
 
   def test_make_custom_page
     Dir.mktmpdir do |dir|
-      coverfile = "cover.html"
-      content = "<html><body>test</body></html>"
-      File.open(File.join(dir, "cover.tex"),"w"){|f| f.write(content) }
+      coverfile = 'cover.html'
+      content = '<html><body>test</body></html>'
+      File.open(File.join(dir, 'cover.tex'), 'w') { |f| f.write(content) }
       page = @maker.make_custom_page(File.join(dir, coverfile))
       assert_equal(content, page)
     end
   end
 
   def test_make_authors
-    @config.merge!({"aut"=>["テスト太郎","テスト次郎"],
-                    "csl"=>["監修三郎"],
-                    "trl"=>["翻訳四郎","翻訳五郎",]})
-    Dir.mktmpdir do |dir|
+    @config.merge!(
+      'aut' => ['テスト太郎', 'テスト次郎'],
+      'csl' => ['監修三郎'],
+      'trl' => ['翻訳四郎', '翻訳五郎']
+    )
+    Dir.mktmpdir do
       authors = @maker.make_authors
       assert_equal("テスト太郎、テスト次郎　著 \\\\\n監修三郎　監修 \\\\\n翻訳四郎、翻訳五郎　訳",
                    authors)
@@ -95,26 +95,26 @@ class PDFMakerTest < Test::Unit::TestCase
   end
 
   def test_make_authors_only_aut
-    @config.merge!({"aut"=>"テスト太郎"})
-    Dir.mktmpdir do |dir|
+    @config['aut'] = 'テスト太郎'
+    Dir.mktmpdir do
       authors = @maker.make_authors
-      assert_equal("テスト太郎　著", authors)
+      assert_equal('テスト太郎　著', authors)
     end
   end
 
   def test_make_okuduke
-    @config.merge!({
-                     "aut"=>["テスト太郎","テスト次郎"],
-                     "csl"=>["監修三郎"],
-                     "trl"=>["翻訳四郎","翻訳五郎"],
-                     "dsr"=>["デザイン六郎"],
-                     "ill"=>["イラスト七郎","イラスト八郎"],
-                     "cov"=>["表紙九郎"],
-                     "edt"=>["編集十郎"],
-                     "pbl"=>"テスト出版",
-                     "prt"=>"テスト印刷",
-                   })
-    Dir.mktmpdir do |dir|
+    @config.merge!(
+      'aut' => ['テスト太郎', 'テスト次郎'],
+      'csl' => ['監修三郎'],
+      'trl' => ['翻訳四郎', '翻訳五郎'],
+      'dsr' => ['デザイン六郎'],
+      'ill' => ['イラスト七郎', 'イラスト八郎'],
+      'cov' => ['表紙九郎'],
+      'edt' => ['編集十郎'],
+      'pbl' => 'テスト出版',
+      'prt' => 'テスト印刷'
+    )
+    Dir.mktmpdir do
       okuduke = @maker.make_colophon
       assert_equal("著　者 & テスト太郎、テスト次郎 \\\\\n監　修 & 監修三郎 \\\\\n翻　訳 & 翻訳四郎、翻訳五郎 \\\\\nデザイン & デザイン六郎 \\\\\nイラスト & イラスト七郎、イラスト八郎 \\\\\n表　紙 & 表紙九郎 \\\\\n編　集 & 編集十郎 \\\\\n発行所 & テスト出版 \\\\\n印刷所 & テスト印刷 \\\\\n",
                    okuduke)
@@ -122,133 +122,124 @@ class PDFMakerTest < Test::Unit::TestCase
   end
 
   def test_make_okuduke_dojin
-    @config.merge!({
-                     "aut"=>["テスト太郎","テスト次郎"],
-                     "csl"=>["監修三郎"],
-                     "ill"=>["イラスト七郎","イラスト八郎"],
-                     "pbl"=>"テスト出版",
-                     "prt"=>"テスト印刷",
-                     "contact"=>"tarou@example.jp",
-                   })
-    Dir.mktmpdir do |dir|
-      I18n.update({"prt" => "印刷所"},"ja")
+    @config.merge!(
+      'aut' => ['テスト太郎', 'テスト次郎'],
+      'csl' => ['監修三郎'],
+      'ill' => ['イラスト七郎', 'イラスト八郎'],
+      'pbl' => 'テスト出版',
+      'prt' => 'テスト印刷',
+      'contact' => 'tarou@example.jp'
+    )
+    Dir.mktmpdir do
+      I18n.update({ 'prt' => '印刷所' }, 'ja')
       okuduke = @maker.make_colophon
       assert_equal("著　者 & テスト太郎、テスト次郎 \\\\\n監　修 & 監修三郎 \\\\\nイラスト & イラスト七郎、イラスト八郎 \\\\\n発行所 & テスト出版 \\\\\n連絡先 & tarou@example.jp \\\\\n印刷所 & テスト印刷 \\\\\n",
                    okuduke)
     end
   end
 
-  def test_gettemplate
-    Dir.mktmpdir do |dir|
+  def test_template_content
+    Dir.mktmpdir do
       @maker.basedir = Dir.pwd
-      tmpl = @maker.get_template
-      expect = File.read(File.join(assets_dir,"test_template.tex"))
+      tmpl = @maker.template_content
+      expect = File.read(File.join(assets_dir, 'test_template.tex'))
       assert_equal(expect, tmpl)
     end
   end
 
   def test_gettemplate_with_backmatter
-    @config.merge!({
-                     "backcover"=>"backcover.html",
-                     "profile"=>"profile.html",
-                     "advfile"=>"advfile.html",
-                   })
+    @config.merge!(
+      'backcover' => 'backcover.html',
+      'profile' => 'profile.html',
+      'advfile' => 'advfile.html'
+    )
     Dir.mktmpdir do |dir|
       Dir.chdir(dir) do
         profile = "\\thispagestyle{empty}\\chapter*{Profile}\nsome profile\n"
-        File.open(File.join(dir, "profile.tex"),"w"){|f| f.write(profile) }
+        File.open(File.join(dir, 'profile.tex'), 'w') { |f| f.write(profile) }
         advfile = "\\thispagestyle{empty}\\chapter*{Ad}\nsome ad content\n"
-        File.open(File.join(dir, "advfile.tex"),"w"){|f| f.write(advfile) }
+        File.open(File.join(dir, 'advfile.tex'), 'w') { |f| f.write(advfile) }
         backcover = "\\clearpage\n\\thispagestyle{empty}\\AddToShipoutPictureBG{%\n\\AtPageLowerLeft{\\includegraphics[width=\\paperwidth,height=\\paperheight]{images/backcover.png}}\n}\n\\null"
-        File.open(File.join(dir, "backcover.tex"),"w"){|f| f.write(backcover) }
+        File.open(File.join(dir, 'backcover.tex'), 'w') { |f| f.write(backcover) }
 
-        expect = File.read(File.join(assets_dir,"test_template_backmatter.tex"))
+        expect = File.read(File.join(assets_dir, 'test_template_backmatter.tex'))
 
         @maker.basedir = Dir.pwd
-        tmpl = @maker.get_template
-        tmpl.gsub!(/\A.*%% backmatter begins\n/m,"")
+        tmpl = @maker.template_content
+        tmpl.gsub!(/\A.*%% backmatter begins\n/m, '')
         assert_equal(expect, tmpl)
       end
     end
   end
 
   def test_colophon_history
-    @config["aut"] = ["Mr.Smith"]
-    @config["pbl"] = ["BLUEPRINT"]
-    @config["pht"] = ["Mrs.Smith"]
-    @config.merge!({"language" => "ja"})
+    @config['aut'] = ['Mr.Smith']
+    @config['pbl'] = ['BLUEPRINT']
+    @config['pht'] = ['Mrs.Smith']
+    @config['language'] = 'ja'
     history = @maker.make_history_list
-    expect = ["2011年1月1日　発行"]
+    expect = ['2011年1月1日　発行']
     assert_equal expect, history
   end
 
   def test_colophon_history_2
-    @config["aut"] = ["Mr.Smith"]
-    @config["pbl"] = ["BLUEPRINT"]
-    @config["pht"] = ["Mrs.Smith"]
-    @config.merge!({"language" => "ja",
-                    "history" => [[
-                      "2011-08-03 v1.0.0版発行",
-                      "2012-02-15 v1.1.0版発行",
-                    ]] })
+    @config['aut'] = ['Mr.Smith']
+    @config['pbl'] = ['BLUEPRINT']
+    @config['pht'] = ['Mrs.Smith']
+    @config['language'] = 'ja'
+    @config['history'] =
+      [['2011-08-03 v1.0.0版発行',
+        '2012-02-15 v1.1.0版発行']]
     history = @maker.make_history_list
-    expect = ["2011年8月3日　v1.0.0版発行",
-              "2012年2月15日　v1.1.0版発行"]
+    expect = ['2011年8月3日　v1.0.0版発行', '2012年2月15日　v1.1.0版発行']
     assert_equal expect, history
   end
 
   def test_colophon_history_date
-    @config["aut"] = ["Mr.Smith"]
-    @config["pbl"] = ["BLUEPRINT"]
-    @config["pht"] = ["Mrs.Smith"]
-    @config.merge!({"language" => "ja",
-                    "history" => [[
-                      "2011-08-03",
-                      "2012-02-15",
-                    ]] })
+    @config['aut'] = ['Mr.Smith']
+    @config['pbl'] = ['BLUEPRINT']
+    @config['pht'] = ['Mrs.Smith']
+    @config['language'] = 'ja'
+    @config['history'] =
+      [['2011-08-03',
+        '2012-02-15']]
     history = @maker.make_history_list
-    expect = ["2011年8月3日　初版第1刷　発行",
-              "2012年2月15日　初版第2刷　発行"]
+    expect = ['2011年8月3日　初版第1刷　発行',
+              '2012年2月15日　初版第2刷　発行']
     assert_equal expect, history
   end
 
   def test_colophon_history_date2
-    @config["aut"] = ["Mr.Smith"]
-    @config["pbl"] = ["BLUEPRINT"]
-    @config["pht"] = ["Mrs.Smith"]
-    @config.merge!({"language" => "ja",
-                    "history" => [[
-                      "2011-08-03",
-                      "2012-02-15",
-                    ],[
-                      "2012-10-01",
-                    ],[
-                      "2013-03-01",
-                    ]] })
+    @config['aut'] = ['Mr.Smith']
+    @config['pbl'] = ['BLUEPRINT']
+    @config['pht'] = ['Mrs.Smith']
+    @config['language'] = 'ja'
+    @config['history'] =
+      [['2011-08-03',
+        '2012-02-15'],
+       ['2012-10-01'],
+       ['2013-03-01']]
     history = @maker.make_history_list
-    expect = ["2011年8月3日　初版第1刷　発行",
-              "2012年2月15日　初版第2刷　発行",
-              "2012年10月1日　第2版第1刷　発行",
-              "2013年3月1日　第3版第1刷　発行"]
+    expect = ['2011年8月3日　初版第1刷　発行',
+              '2012年2月15日　初版第2刷　発行',
+              '2012年10月1日　第2版第1刷　発行',
+              '2013年3月1日　第3版第1刷　発行']
     assert_equal expect, history
   end
 
   def test_colophon_history_freeformat
-    @config["aut"] = ["Mr.Smith"]
-    @config["pbl"] = ["BLUEPRINT"]
-    @config["pht"] = ["Mrs.Smith"]
-    @config.merge!({"language" => "ja",
-                    "history" => [[
-                      "2011年8月3日 ver 1.1.0発行",
-                    ],[
-                      "2011年10月12日 ver 1.2.0発行",
-                    ],[
-                      "2012年1月31日 ver 1.2.1発行",
-                    ]] })
+    @config['aut'] = ['Mr.Smith']
+    @config['pbl'] = ['BLUEPRINT']
+    @config['pht'] = ['Mrs.Smith']
+    @config['language'] = 'ja'
+    @config['history'] =
+      [['2011年8月3日 ver 1.1.0発行'],
+       ['2011年10月12日 ver 1.2.0発行'],
+       ['2012年1月31日 ver 1.2.1発行']]
     history = @maker.make_history_list
-    expect = ["2011年8月3日 ver 1.1.0発行",
-              "2011年10月12日 ver 1.2.0発行",
-              "2012年1月31日 ver 1.2.1発行"]
+    expect = ['2011年8月3日 ver 1.1.0発行',
+              '2011年10月12日 ver 1.2.0発行',
+              '2012年1月31日 ver 1.2.1発行']
     assert_equal expect, history
   end
 end