aozora2html 2.0.0 → 3.0.0

data/test/test_command_parse.rb

@@ -1,4 +1,5 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require 'test_helper'
 require 'aozora2html'
 
@@ -44,56 +45,56 @@ class CommandParseTest < Test::Unit::TestCase
   def test_parse_command6
     src = "責［＃「責」に白ゴマ傍点］空文庫\r\n"
     parsed = parse_text(src)
-    expected = %Q|<em class="white_sesame_dot">責</em>空文庫<br />\r\n|
+    expected = %Q(<em class="white_sesame_dot">責</em>空文庫<br />\r\n)
     assert_equal expected, parsed
   end
 
   def test_parse_command7
     src = "［＃丸傍点］青空文庫で読書しよう［＃丸傍点終わり］。\r\n"
     parsed = parse_text(src)
-    expected = %Q|<em class="black_circle">青空文庫で読書しよう</em>。<br />\r\n|
+    expected = %Q(<em class="black_circle">青空文庫で読書しよう</em>。<br />\r\n)
     assert_equal expected, parsed
   end
 
   def test_parse_command8
     src = "この形は傍線［＃「傍線」に傍線］と書いてください。\r\n"
     parsed = parse_text(src)
-    expected = %Q|この形は<em class="underline_solid">傍線</em>と書いてください。<br />\r\n|
+    expected = %Q(この形は<em class="underline_solid">傍線</em>と書いてください。<br />\r\n)
     assert_equal expected, parsed
   end
 
   def test_parse_command9
     src = "［＃左に鎖線］青空文庫で読書しよう［＃左に鎖線終わり］。\r\n"
     parsed = parse_text(src)
-    expected = %Q|<em class="overline_dotted">青空文庫で読書しよう</em>。<br />\r\n|
+    expected = %Q(<em class="overline_dotted">青空文庫で読書しよう</em>。<br />\r\n)
     assert_equal expected, parsed
   end
 
   def test_parse_command10
     src = "「クリス、宇宙航行委員会が選考［＃「選考」は太字］するんだ。きみは志願できない。待つ［＃「待つ」は太字］んだ」\r\n"
     parsed = parse_text(src)
-    expected = %Q|「クリス、宇宙航行委員会が<span class="futoji">選考</span>するんだ。きみは志願できない。<span class="futoji">待つ</span>んだ」<br />\r\n|
+    expected = %Q(「クリス、宇宙航行委員会が<span class="futoji">選考</span>するんだ。きみは志願できない。<span class="futoji">待つ</span>んだ」<br />\r\n)
     assert_equal expected, parsed
   end
 
   def test_parse_command11
     src = "Which, teaching us, hath this exordium: Nothing from nothing ever yet was born.［＃「Nothing from nothing ever yet was born.」は斜体］\r\n"
     parsed = parse_text(src)
-    expected = %Q|Which, teaching us, hath this exordium: <span class="shatai">Nothing from nothing ever yet was born.</span><br />\r\n|
+    expected = %Q(Which, teaching us, hath this exordium: <span class="shatai">Nothing from nothing ever yet was born.</span><br />\r\n)
     assert_equal expected, parsed
   end
 
   def test_parse_command_warichu
     src = "［＃割り注］価は四百円であった。［＃割り注終わり］\r\n"
     parsed = parse_text(src)
-    expected = %Q|<span class="warichu">（価は四百円であった。）</span><br />\r\n|
+    expected = %Q(<span class="warichu">（価は四百円であった。）</span><br />\r\n)
     assert_equal expected, parsed
   end
 
   def test_parse_command_warichu2
     src = "飽海郡南平田村大字飛鳥［＃割り注］東は字大林四三七［＃改行］西は字神内一一一ノ一［＃割り注終わり］\r\n"
     parsed = parse_text(src)
-    expected = %Q|飽海郡南平田村大字飛鳥<span class="warichu">（東は字大林四三七<span class="notes">［＃改行］</span>西は字神内一一一ノ一）</span><br />\r\n|
+    expected = %Q(飽海郡南平田村大字飛鳥<span class="warichu">（東は字大林四三七<span class="notes">［＃改行］</span>西は字神内一一一ノ一）</span><br />\r\n)
     assert_equal expected, parsed
   end
 
@@ -117,7 +118,7 @@ class CommandParseTest < Test::Unit::TestCase
     Aozora2Html::Tag::EmbedGaiji.use_unicode = true
     src = "紋附だとか［＃「紋附だとか」は底本では「絞附だとか」］\r\n"
     parsed = parse_text(src)
-    expected = %Q|紋附だとか<span class="notes">［＃「紋附だとか」は底本では「絞附だとか」］</span><br />\r\n|
+    expected = %Q(紋附だとか<span class="notes">［＃「紋附だとか」は底本では「絞附だとか」］</span><br />\r\n)
     assert_equal expected, parsed
   end
 
@@ -125,7 +126,7 @@ class CommandParseTest < Test::Unit::TestCase
     Aozora2Html::Tag::EmbedGaiji.use_unicode = true
     src = "私は籠《ざる》［＃ルビの「ざる」は底本では「さる」］をさげ\r\n"
     parsed = parse_text(src)
-    expected = %Q|私は<ruby><rb>籠</rb><rp>（</rp><rt>ざる</rt><rp>）</rp></ruby><span class="notes">［＃ルビの「ざる」は底本では「さる」］</span>をさげ<br />\r\n|
+    expected = %Q(私は<ruby><rb>籠</rb><rp>（</rp><rt>ざる</rt><rp>）</rp></ruby><span class="notes">［＃ルビの「ざる」は底本では「さる」］</span>をさげ<br />\r\n)
     assert_equal expected, parsed
   end
 
@@ -133,7 +134,7 @@ class CommandParseTest < Test::Unit::TestCase
     Aozora2Html::Tag::EmbedGaiji.use_unicode = true
     src = "広場へに［＃「広場へに」はママ］店でもだそう。\r\n"
     parsed = parse_text(src)
-    expected = %Q|広場へに<span class="notes">［＃「広場へに」はママ］</span>店でもだそう。<br />\r\n|
+    expected = %Q(広場へに<span class="notes">［＃「広場へに」はママ］</span>店でもだそう。<br />\r\n)
     assert_equal expected, parsed
   end
 
@@ -141,7 +142,7 @@ class CommandParseTest < Test::Unit::TestCase
     Aozora2Html::Tag::EmbedGaiji.use_unicode = true
     src = "お湯《ゆう》［＃ルビの「ゆう」はママ］\r\n"
     parsed = parse_text(src)
-    expected = %Q|お<ruby><rb>湯</rb><rp>（</rp><rt>ゆう</rt><rp>）</rp></ruby><span class="notes">［＃ルビの「ゆう」はママ］</span><br />\r\n|
+    expected = %Q(お<ruby><rb>湯</rb><rp>（</rp><rt>ゆう</rt><rp>）</rp></ruby><span class="notes">［＃ルビの「ゆう」はママ］</span><br />\r\n)
     assert_equal expected, parsed
   end
 
@@ -149,7 +150,7 @@ class CommandParseTest < Test::Unit::TestCase
     Aozora2Html::Tag::EmbedGaiji.use_unicode = true
     src = "米機Ｂ29［＃「29」は縦中横］の編隊は、\r\n"
     parsed = parse_text(src)
-    expected = %Q|米機Ｂ<span dir="ltr">29</span>の編隊は、<br />\r\n|
+    expected = %Q(米機Ｂ<span dir="ltr">29</span>の編隊は、<br />\r\n)
     assert_equal expected, parsed
   end
 
@@ -165,7 +166,7 @@ class CommandParseTest < Test::Unit::TestCase
     Aozora2Html::Tag::EmbedGaiji.use_unicode = true
     src = "それ以上である。（５）［＃「（５）」は行右小書き］\r\n"
     parsed = parse_text(src)
-    expected = %Q|それ以上である。<sup class="superscript">（５）</sup><br />\r\n|
+    expected = %Q(それ以上である。<sup class="superscript">（５）</sup><br />\r\n)
     assert_equal expected, parsed
   end
 
@@ -173,7 +174,7 @@ class CommandParseTest < Test::Unit::TestCase
     Aozora2Html::Tag::EmbedGaiji.use_unicode = true
     src = "22［＃「2」は上付き小文字］\r\n"
     parsed = parse_text(src)
-    expected = %Q|2<sup class="superscript">2</sup><br />\r\n|
+    expected = %Q(2<sup class="superscript">2</sup><br />\r\n)
     assert_equal expected, parsed
   end
 
@@ -181,7 +182,7 @@ class CommandParseTest < Test::Unit::TestCase
     Aozora2Html::Tag::EmbedGaiji.use_unicode = true
     src = "支部長の顔にさっと血が流れ［＃「血が流れ」に「×」の傍記］た\r\n"
     parsed = parse_text(src)
-    expected = %Q|支部長の顔にさっと<ruby><rb>血が流れ</rb><rp>（</rp><rt>×&nbsp;×&nbsp;×&nbsp;×</rt><rp>）</rp></ruby>た<br />\r\n|
+    expected = %Q(支部長の顔にさっと<ruby><rb>血が流れ</rb><rp>（</rp><rt>×&nbsp;×&nbsp;×&nbsp;×</rt><rp>）</rp></ruby>た<br />\r\n)
     assert_equal expected, parsed
   end
 
@@ -189,21 +190,23 @@ class CommandParseTest < Test::Unit::TestCase
     Aozora2Html::Tag::EmbedGaiji.use_unicode = true
     src = "グリーンランドの中央部八千尺の氷河地帯にあるといわれる、［＃横組み］“Ser-mik-Suah《セルミク・シュアー》”［＃横組み終わり］の冥路《よみじ》の国。\r\n"
     parsed = parse_text(src)
-    expected = %Q|グリーンランドの中央部八千尺の氷河地帯にあるといわれる、<span class=\"yokogumi\">“<ruby><rb>Ser-mik-Suah</rb><rp>（</rp><rt>セルミク・シュアー</rt><rp>）</rp></ruby>”</span>の<ruby><rb>冥路</rb><rp>（</rp><rt>よみじ</rt><rp>）</rp></ruby>の国。<br />\r\n|
+    expected = %Q(グリーンランドの中央部八千尺の氷河地帯にあるといわれる、<span class=\"yokogumi\">“<ruby><rb>Ser-mik-Suah</rb><rp>（</rp><rt>セルミク・シュアー</rt><rp>）</rp></ruby>”</span>の<ruby><rb>冥路</rb><rp>（</rp><rt>よみじ</rt><rp>）</rp></ruby>の国。<br />\r\n)
     assert_equal expected, parsed
   end
 
+  using Aozora2Html::StringRefinements
+
   def parse_text(input_text)
-    input = StringIO.new(input_text.encode("shift_jis"))
+    input = StringIO.new(input_text.to_sjis)
     output = StringIO.new
     parser = Aozora2Html.new(input, output)
-    parser.instance_eval{@section=:tail}
+    parser.instance_eval { @section = :tail }
     catch(:terminate) do
       loop do
-        parser.parse
+        parser.__send__(:parse)
       end
     end
-    output.string.encode("utf-8")
+    output.string.to_utf8
   end
 
   def teardown

data/test/test_compat.rb

@@ -1,11 +1,10 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 require 'aozora2html'
 
 class CompatTest < Test::Unit::TestCase
   def test_array_to_s
-    assert_equal "abc", ["a", "b", "c"].join
+    assert_equal 'abc', ['a', 'b', 'c'].join
   end
 end
-
-
-

data/test/test_dakuten_katakana_tag.rb

@@ -1,27 +1,25 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require 'test_helper'
 require 'aozora2html'
 
 class DakutenKatakanaTagTest < Test::Unit::TestCase
   def setup
     @parser = Object.new
-    @orig_gaiji_dir = $gaiji_dir
-    $gaiji_dir = "g_dir"
-    stub(@parser).block_allowed_context?{true}
+    @gaiji_dir = 'g_dir'
+    stub(@parser).block_allowed_context? { true }
   end
 
+  using Aozora2Html::StringRefinements
+
   def test_dakuten_katakana_new
-    tag = Aozora2Html::Tag::DakutenKatakana.new(@parser,1,"ア".encode("shift_jis"))
+    tag = Aozora2Html::Tag::DakutenKatakana.new(@parser, 1, 'ア'.to_sjis, gaiji_dir: @gaiji_dir)
     assert_equal Aozora2Html::Tag::DakutenKatakana, tag.class
-    assert_equal true, tag.kind_of?(Aozora2Html::Tag::Inline)
+    assert_equal true, tag.is_a?(Aozora2Html::Tag::Inline)
   end
 
   def test_to_s
-    tag = Aozora2Html::Tag::DakutenKatakana.new(@parser,1,"ア".encode("shift_jis"))
-    assert_equal "<img src=\"g_dir/1-07/1-07-81.png\" alt=\"※(濁点付き片仮名「ア」、1-07-81)\" class=\"gaiji\" />", tag.to_s.encode("utf-8")
-  end
-
-  def teardown
-    $gaiji_dir = @orig_gaiji_dir
+    tag = Aozora2Html::Tag::DakutenKatakana.new(@parser, 1, 'ア'.to_sjis, gaiji_dir: @gaiji_dir)
+    assert_equal '<img src="g_dir/1-07/1-07-81.png" alt="※(濁点付き片仮名「ア」、1-07-81)" class="gaiji" />', tag.to_s.to_utf8
   end
 end

data/test/test_decorate_tag.rb

@@ -1,22 +1,25 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require 'test_helper'
 require 'aozora2html'
 
 class DecorateTagTest < Test::Unit::TestCase
   def setup
     @parser = Object.new
-    stub(@parser).block_allowed_context?{true}
+    stub(@parser).block_allowed_context? { true }
   end
 
   def test_decorate_new
-    tag = Aozora2Html::Tag::Decorate.new(@parser,"aa",1,:dai)
+    tag = Aozora2Html::Tag::Decorate.new(@parser, 'aa', 1, :dai)
     assert_equal Aozora2Html::Tag::Decorate, tag.class
-    assert_equal true, tag.kind_of?(Aozora2Html::Tag::Inline)
+    assert_equal true, tag.is_a?(Aozora2Html::Tag::Inline)
   end
 
+  using Aozora2Html::StringRefinements
+
   def test_to_s
-    tag = Aozora2Html::Tag::Decorate.new(@parser,"テスト".encode("shift_jis"),"foo","span")
-    assert_equal "<span class=\"foo\">テスト</span>", tag.to_s.encode("utf-8")
+    tag = Aozora2Html::Tag::Decorate.new(@parser, 'テスト'.to_sjis, 'foo', 'span')
+    assert_equal '<span class="foo">テスト</span>', tag.to_s.to_utf8
   end
 
   def teardown

data/test/test_dir_tag.rb

@@ -1,22 +1,25 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require 'test_helper'
 require 'aozora2html'
 
 class DirTagTest < Test::Unit::TestCase
   def setup
     @parser = Object.new
-    stub(@parser).block_allowed_context?{true}
+    stub(@parser).block_allowed_context? { true }
   end
 
+  using Aozora2Html::StringRefinements
+
   def test_dir_new
-    tag = Aozora2Html::Tag::Dir.new(@parser,"テスト".encode("shift_jis"))
+    tag = Aozora2Html::Tag::Dir.new(@parser, 'テスト'.to_sjis)
     assert_equal Aozora2Html::Tag::Dir, tag.class
-    assert_equal true, tag.kind_of?(Aozora2Html::Tag::Inline)
+    assert_equal true, tag.is_a?(Aozora2Html::Tag::Inline)
   end
 
   def test_to_s
-    tag = Aozora2Html::Tag::Dir.new(@parser,"テスト".encode("shift_jis"))
-    assert_equal "<span dir=\"ltr\">テスト</span>", tag.to_s.encode("utf-8")
+    tag = Aozora2Html::Tag::Dir.new(@parser, 'テスト'.to_sjis)
+    assert_equal '<span dir="ltr">テスト</span>', tag.to_s.to_utf8
   end
 
   def teardown

data/test/test_editor_note_tag.rb

@@ -1,4 +1,5 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require 'test_helper'
 require 'aozora2html'
 
@@ -6,15 +7,17 @@ class EditorNoteTagTest < Test::Unit::TestCase
   def setup
   end
 
+  using Aozora2Html::StringRefinements
+
   def test_editor_note_new
-    tag = Aozora2Html::Tag::EditorNote.new(nil,"注記のテスト".encode("shift_jis"))
+    tag = Aozora2Html::Tag::EditorNote.new(nil, '注記のテスト'.to_sjis)
     assert_equal Aozora2Html::Tag::EditorNote, tag.class
-    assert_equal true, tag.kind_of?(Aozora2Html::Tag::Inline)
+    assert_equal true, tag.is_a?(Aozora2Html::Tag::Inline)
   end
 
   def test_to_s
-    tag = Aozora2Html::Tag::EditorNote.new(nil,"注記のテスト".encode("shift_jis"))
-    assert_equal "<span class=\"notes\">［＃注記のテスト］</span>", tag.to_s.encode("utf-8")
+    tag = Aozora2Html::Tag::EditorNote.new(nil, '注記のテスト'.to_sjis)
+    assert_equal '<span class="notes">［＃注記のテスト］</span>', tag.to_s.to_utf8
   end
 
   def teardown

data/test/test_exception.rb

@@ -1,23 +1,25 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require 'test_helper'
 require 'aozora2html'
 
 class ExceptionTest < Test::Unit::TestCase
   def test_raise_aozora_exception
     assert_raises(Aozora2Html::Error) do
-      raise Aozora2Html::Error, "error!"
+      raise Aozora2Html::Error, 'error!'
     end
   end
 
+  using Aozora2Html::StringRefinements
+
   def test_raise_aozora_error
-    error_msg = ""
+    error_msg = ''
     begin
-      raise Aozora2Html::Error, "sample error"
-    rescue Aozora2Html::Error => msg
-      error_msg = msg.message(123)
+      raise Aozora2Html::Error, 'sample error'
+    rescue Aozora2Html::Error => e
+      error_msg = e.message(123)
     end
     assert_equal "エラー(123行目):sample error. \r\n処理を停止します",
-                 error_msg.encode("utf-8")
-
+                 error_msg.to_utf8
   end
 end

data/test/test_font_size_tag.rb

@@ -1,38 +1,41 @@
-# -*- coding:utf-8 -*-
+# frozen_string_literal: true
+
 require 'test_helper'
 require 'aozora2html'
 
 class FontSizeTagTest < Test::Unit::TestCase
   def setup
     @parser = Object.new
-    stub(@parser).block_allowed_context?{true} 
+    stub(@parser).block_allowed_context? { true }
   end
 
   def test_font_size_new
-    tag = Aozora2Html::Tag::FontSize.new(@parser,1,:dai)
+    tag = Aozora2Html::Tag::FontSize.new(@parser, 1, :dai)
     assert_equal Aozora2Html::Tag::FontSize, tag.class
-    assert_equal true, tag.kind_of?(Aozora2Html::Tag::Block)
-    assert_equal true, tag.kind_of?(Aozora2Html::Tag::Multiline)
+    assert_equal true, tag.is_a?(Aozora2Html::Tag::Block)
+    assert_equal true, tag.is_a?(Aozora2Html::Tag::Multiline)
   end
 
+  using Aozora2Html::StringRefinements
+
   def test_to_s
-    tag = Aozora2Html::Tag::FontSize.new(@parser,1,:dai)
-    assert_equal "<div class=\"dai1\" style=\"font-size: large;\">", tag.to_s.encode("utf-8")
+    tag = Aozora2Html::Tag::FontSize.new(@parser, 1, :dai)
+    assert_equal '<div class="dai1" style="font-size: large;">', tag.to_s.to_utf8
   end
 
   def test_to_s2
-    tag = Aozora2Html::Tag::FontSize.new(@parser,2,:dai)
-    assert_equal "<div class=\"dai2\" style=\"font-size: x-large;\">", tag.to_s.encode("utf-8")
+    tag = Aozora2Html::Tag::FontSize.new(@parser, 2, :dai)
+    assert_equal '<div class="dai2" style="font-size: x-large;">', tag.to_s.to_utf8
   end
 
   def test_to_s3
-    tag = Aozora2Html::Tag::FontSize.new(@parser,3,:sho)
-    assert_equal "<div class=\"sho3\" style=\"font-size: xx-small;\">", tag.to_s.encode("utf-8")
+    tag = Aozora2Html::Tag::FontSize.new(@parser, 3, :sho)
+    assert_equal '<div class="sho3" style="font-size: xx-small;">', tag.to_s.to_utf8
   end
 
   def test_to_s0
-    assert_raise(Aozora2Html::Error.new("文字サイズの指定が不正です".to_sjis)) do
-      _tag = Aozora2Html::Tag::FontSize.new(@parser,0,:sho)
+    assert_raise(Aozora2Html::Error.new('文字サイズの指定が不正です'.to_sjis)) do
+      _tag = Aozora2Html::Tag::FontSize.new(@parser, 0, :sho)
     end
   end
 

data/test/test_gaiji_tag.rb

@@ -1,49 +1,50 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require 'test_helper'
 require 'aozora2html'
 
 class EmbedGaijiTagTest < Test::Unit::TestCase
   def setup
-    @orig_gaiji_dir = $gaiji_dir
-    $gaiji_dir = "g_dir/"
+    @gaiji_dir = 'g_dir/'
   end
 
+  using Aozora2Html::StringRefinements
+
   def test_gaiji_new
-    egt = Aozora2Html::Tag::EmbedGaiji.new(nil,"foo","1-2-3","name")
-    assert_equal "<img src=\"g_dir/foo/1-2-3.png\" alt=\"※(name)\" class=\"gaiji\" />", egt.to_s.encode("utf-8")
+    egt = Aozora2Html::Tag::EmbedGaiji.new(nil, 'foo', '1-2-3', 'name', gaiji_dir: @gaiji_dir)
+    assert_equal '<img src="g_dir/foo/1-2-3.png" alt="※(name)" class="gaiji" />', egt.to_s.to_utf8
   end
 
   def test_unembed_gaiji_new
-    egt = Aozora2Html::Tag::UnEmbedGaiji.new(nil,"テストtest".encode("Shift_JIS"))
-    assert_equal "<span class=\"notes\">［テストtest］</span>", egt.to_s.encode("utf-8")
+    egt = Aozora2Html::Tag::UnEmbedGaiji.new(nil, 'テストtest'.to_sjis)
+    assert_equal '<span class="notes">［テストtest］</span>', egt.to_s.to_utf8
   end
 
   def test_espcaed?
-    egt = Aozora2Html::Tag::UnEmbedGaiji.new(nil,"テストtest".encode("Shift_JIS"))
+    egt = Aozora2Html::Tag::UnEmbedGaiji.new(nil, 'テストtest'.to_sjis)
     assert_equal false, egt.escaped?
   end
 
   def test_espcae!
-    egt = Aozora2Html::Tag::UnEmbedGaiji.new(nil,"テストtest".encode("Shift_JIS"))
+    egt = Aozora2Html::Tag::UnEmbedGaiji.new(nil, 'テストtest'.to_sjis)
     egt.escape!
     assert_equal true, egt.escaped?
   end
 
   def test_jisx0213
     Aozora2Html::Tag::EmbedGaiji.use_jisx0213 = true
-    egt = Aozora2Html::Tag::EmbedGaiji.new(nil,"foo","1-06-75","snowman")
-    assert_equal "&#x2603;", egt.to_s.encode("utf-8")
+    egt = Aozora2Html::Tag::EmbedGaiji.new(nil, 'foo', '1-06-75', 'snowman', gaiji_dir: @gaiji_dir)
+    assert_equal '&#x2603;', egt.to_s.to_utf8
   end
 
   def test_use_unicode
     Aozora2Html::Tag::EmbedGaiji.use_unicode = true
-    egt = Aozora2Html::Tag::EmbedGaiji.new(nil,"foo","1-06-75","snowman","2603")
-    assert_equal "&#x2603;", egt.to_s.encode("utf-8")
+    egt = Aozora2Html::Tag::EmbedGaiji.new(nil, 'foo', '1-06-75', 'snowman', '2603', gaiji_dir: @gaiji_dir)
+    assert_equal '&#x2603;', egt.to_s.to_utf8
   end
 
   def teardown
     Aozora2Html::Tag::EmbedGaiji.use_jisx0213 = false
     Aozora2Html::Tag::EmbedGaiji.use_unicode = false
-    $gaiji_dir = @orig_gaiji_dir
   end
 end

data/test/test_header.rb

@@ -1,60 +1,45 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require 'test_helper'
 require 'aozora2html'
 
 class HeaderTest < Test::Unit::TestCase
   def setup
-    @header = Aozora2Html::Header.new
+    @header = Aozora2Html::Header.new(css_files: Array['../../aozora.css'])
   end
 
+  using Aozora2Html::StringRefinements
+
   def test_header_to_html
-    @header.push("武装せる市街".encode("shift_jis"))
-    @header.push("黒島伝治".encode("shift_jis"))
-    actual = @header.to_html.encode("utf-8")
+    @header.push('武装せる市街'.to_sjis)
+    @header.push('黒島伝治'.to_sjis)
+    actual = @header.to_html.to_utf8
+
+    # rubocop:disable Layout/LineLength
     expected =
-      "<?xml version=\"1.0\" encoding=\"Shift_JIS\"?>\r\n" +
-      "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\"\r\n" +
-      "    \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">\r\n" +
-      "<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"ja\" >\r\n" +
-      "<head>\r\n" +
-      "\t<meta http-equiv=\"Content-Type\" content=\"text/html;charset=Shift_JIS\" />\r\n" +
-      "\t<meta http-equiv=\"content-style-type\" content=\"text/css\" />\r\n" +
-      "\t<link rel=\"stylesheet\" type=\"text/css\" href=\"../../aozora.css\" />\r\n" +
-      "\t<title>黒島伝治 武装せる市街</title>\r\n" +
-      "\t<script type=\"text/javascript\" src=\"../../jquery-1.4.2.min.js\"></script>\r\n" +
-      "  <link rel=\"Schema.DC\" href=\"http://purl.org/dc/elements/1.1/\" />\r\n" +
-      "\t<meta name=\"DC.Title\" content=\"武装せる市街\" />\r\n" +
-      "\t<meta name=\"DC.Creator\" content=\"黒島伝治\" />\r\n" +
-      "\t<meta name=\"DC.Publisher\" content=\"青空文庫\" />\r\n" +
-      "</head>\r\n" +
-      "<body>\r\n" +
-      "<div class=\"metadata\">\r\n" +
-      "<h1 class=\"title\">武装せる市街</h1>\r\n" +
-      "<h2 class=\"author\">黒島伝治</h2>\r\n" +
-      "<br />\r\n" +
-      "<br />\r\n" +
-      "</div>\r\n" +
-      "<div id=\"contents\" style=\"display:none\"></div><div class=\"main_text\">"
+      "<?xml version=\"1.0\" encoding=\"Shift_JIS\"?>\r\n<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\"\r\n    \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">\r\n<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"ja\" >\r\n<head>\r\n\t<meta http-equiv=\"Content-Type\" content=\"text/html;charset=Shift_JIS\" />\r\n\t<meta http-equiv=\"content-style-type\" content=\"text/css\" />\r\n\t<link rel=\"stylesheet\" type=\"text/css\" href=\"../../aozora.css\" />\r\n\t<title>黒島伝治 武装せる市街</title>\r\n\t<script type=\"text/javascript\" src=\"../../jquery-1.4.2.min.js\"></script>\r\n  <link rel=\"Schema.DC\" href=\"http://purl.org/dc/elements/1.1/\" />\r\n\t<meta name=\"DC.Title\" content=\"武装せる市街\" />\r\n\t<meta name=\"DC.Creator\" content=\"黒島伝治\" />\r\n\t<meta name=\"DC.Publisher\" content=\"青空文庫\" />\r\n</head>\r\n<body>\r\n<div class=\"metadata\">\r\n<h1 class=\"title\">武装せる市街</h1>\r\n<h2 class=\"author\">黒島伝治</h2>\r\n<br />\r\n<br />\r\n</div>\r\n<div id=\"contents\" style=\"display:none\"></div><div class=\"main_text\">"
+    # rubocop:enable Layout/LineLength
+
     assert_equal(expected, actual)
   end
 
   def test_build_title
-    @header.push("武装せる市街".encode("shift_jis"))
-    @header.push("黒島伝治".encode("shift_jis"))
-    header_info = @header.build_header_info()
-    actual = @header.build_title(header_info).encode("utf-8")
-    expected = "<title>黒島伝治 武装せる市街</title>"
+    @header.push('武装せる市街'.to_sjis)
+    @header.push('黒島伝治'.to_sjis)
+    header_info = @header.build_header_info
+    actual = @header.build_title(header_info).to_utf8
+    expected = '<title>黒島伝治 武装せる市街</title>'
     assert_equal(expected, actual)
   end
 
   def test_build_title2
-    @header.push("スリーピー・ホローの伝説".encode("shift_jis"))
-    @header.push("故ディードリッヒ・ニッカボッカーの遺稿より".encode("shift_jis"))
-    @header.push("ワシントン・アーヴィング　Washington Irving".encode("shift_jis"))
-    @header.push("吉田甲子太郎訳".encode("shift_jis"))
-    header_info = @header.build_header_info()
-    actual = @header.build_title(header_info).encode("utf-8")
-    expected = "<title>ワシントン・アーヴィング　Washington Irving 吉田甲子太郎訳 スリーピー・ホローの伝説 故ディードリッヒ・ニッカボッカーの遺稿より</title>"
+    @header.push('スリーピー・ホローの伝説'.to_sjis)
+    @header.push('故ディードリッヒ・ニッカボッカーの遺稿より'.to_sjis)
+    @header.push('ワシントン・アーヴィング　Washington Irving'.to_sjis)
+    @header.push('吉田甲子太郎訳'.to_sjis)
+    header_info = @header.build_header_info
+    actual = @header.build_title(header_info).to_utf8
+    expected = '<title>ワシントン・アーヴィング　Washington Irving 吉田甲子太郎訳 スリーピー・ホローの伝説 故ディードリッヒ・ニッカボッカーの遺稿より</title>'
     assert_equal(expected, actual)
   end
 end

data/test/test_helper.rb

@@ -1,4 +1,6 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib/')
+# frozen_string_literal: true
+
+$LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../lib/")
 require 'test/unit'
 require 'test/unit/rr'
 require 'tmpdir'

data/test/test_i18n.rb

@@ -1,21 +1,37 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require 'test_helper'
 require 'aozora2html'
 
 class I18nTest < Test::Unit::TestCase
+  using Aozora2Html::StringRefinements
+
   def test_t
-      assert_equal "警告(123行目):JIS外字「①」が使われています",
+    assert_equal '警告(123行目):JIS外字「①」が使われています',
+                 Aozora2Html::I18n.t(:warn_jis_gaiji,
+                                     123,
+                                     '①'.encode('cp932').force_encoding('shift_jis'))
+                                  .force_encoding('cp932').to_utf8
+  end
+
+  def test_error_utf8
+    orig_value = Aozora2Html::I18n.use_utf8
+    Aozora2Html::I18n.use_utf8 = true
+    begin
+      assert_equal '警告(123行目):JIS外字「①」が使われています',
                    Aozora2Html::I18n.t(:warn_jis_gaiji,
                                        123,
-                                       "①".encode("cp932").force_encoding("shift_jis"))
-                     .force_encoding("cp932").encode("utf-8")
+                                       '①'.encode('cp932').force_encoding('shift_jis'))
+    ensure
+      Aozora2Html::I18n.use_utf8 = orig_value
+    end
   end
 
   def test_ruby_puts_behavior
     $stdout = StringIO.new
     begin
-      puts "①".encode("cp932").force_encoding("shift_jis")
-      assert_equal "①\n", $stdout.string.force_encoding("cp932").encode("utf-8")
+      puts '①'.encode('cp932').force_encoding('shift_jis')
+      assert_equal "①\n", $stdout.string.force_encoding('cp932').to_utf8
     ensure
       $stdout = STDOUT
     end