aozora2html 0.7.1 → 0.9.0

data/test/test_keigakomi_tag.rb

@@ -3,24 +3,25 @@ require 'aozora2html'
 
 class KeigakomiTagTest < Test::Unit::TestCase
   def setup
-    stub(@parser).block_allowed_context?{true} 
+    @parser = Object.new
+    stub(@parser).block_allowed_context?{true}
   end
 
   def test_keigakomi_new
-    tag = Keigakomi_tag.new(@parser,2)
-    assert_equal Keigakomi_tag, tag.class
-    assert_equal true, tag.kind_of?(Block_tag)
-    assert_equal true, tag.kind_of?(Multiline_tag)
+    tag = Aozora2Html::Tag::Keigakomi.new(@parser,2)
+    assert_equal Aozora2Html::Tag::Keigakomi, tag.class
+    assert_equal true, tag.kind_of?(Aozora2Html::Tag::Block)
+    assert_equal true, tag.kind_of?(Aozora2Html::Tag::Multiline)
   end
 
   def test_to_s
-    tag = Keigakomi_tag.new(@parser)
+    tag = Aozora2Html::Tag::Keigakomi.new(@parser)
     assert_equal "<div class=\"keigakomi\" style=\"border: solid 1px\">", tag.to_s
     assert_equal "</div>", tag.close_tag
   end
 
   def test_to_s2
-    tag = Keigakomi_tag.new(@parser,2)
+    tag = Aozora2Html::Tag::Keigakomi.new(@parser,2)
     assert_equal "<div class=\"keigakomi\" style=\"border: solid 2px\">", tag.to_s
     assert_equal "</div>", tag.close_tag
   end

data/test/test_midashi_tag.rb

@@ -0,0 +1,38 @@
+# encoding: utf-8
+require 'test_helper'
+require 'aozora2html'
+
+class MidashiTagTest < Test::Unit::TestCase
+  def setup
+    @parser = Object.new
+    stub(@parser).block_allowed_context?{true}
+    stub(@parser).new_midashi_id{2}
+  end
+
+  def test_midashi_new
+    tag = Aozora2Html::Tag::Midashi.new(@parser, "テスト見出し".encode("shift_jis"), "小".encode("shift_jis"), :normal)
+    assert_equal Aozora2Html::Tag::Midashi, tag.class
+    assert_equal true, tag.kind_of?(Aozora2Html::Tag::Inline)
+  end
+
+  def test_to_s
+    tag = Aozora2Html::Tag::Midashi.new(@parser, "テスト見出し".encode("shift_jis"), "小".encode("shift_jis"), :normal)
+    assert_equal "<h5 class=\"ko-midashi\"><a class=\"midashi_anchor\" id=\"midashi2\">"+"テスト見出し".encode("shift_jis")+"</a></h5>", tag.to_s
+  end
+
+  def test_to_s_mado
+    tag = Aozora2Html::Tag::Midashi.new(@parser, "テスト見出し".encode("shift_jis"), "小".encode("shift_jis"), :mado)
+    assert_equal "<h5 class=\"mado-ko-midashi\"><a class=\"midashi_anchor\" id=\"midashi2\">"+"テスト見出し".encode("shift_jis")+"</a></h5>", tag.to_s
+  end
+
+  def test_undeined_midashi
+    begin
+      Aozora2Html::Tag::Midashi.new(@parser, "テスト見出し".encode("shift_jis"), "あ".encode("shift_jis"), :normal)
+    rescue Aozora2Html::Error => e
+      assert_equal e.message(123).encode("utf-8"), "エラー(123行目):未定義な見出しです. \r\n処理を停止します"
+    end
+  end
+
+  def teardown
+  end
+end

data/test/test_multiline_caption_tag.rb

@@ -3,18 +3,19 @@ require 'aozora2html'
 
 class MultilineCaptionTagTest < Test::Unit::TestCase
   def setup
-    stub(@parser).block_allowed_context?{true} 
+    @parser = Object.new
+    stub(@parser).block_allowed_context?{true}
   end
 
   def test_multiline_caption_new
-    tag = Multiline_caption_tag.new(@parser0)
-    assert_equal Multiline_caption_tag, tag.class
-    assert_equal true, tag.kind_of?(Block_tag)
-    assert_equal true, tag.kind_of?(Multiline_tag)
+    tag = Aozora2Html::Tag::MultilineCaption.new(@parser)
+    assert_equal Aozora2Html::Tag::MultilineCaption, tag.class
+    assert_equal true, tag.kind_of?(Aozora2Html::Tag::Block)
+    assert_equal true, tag.kind_of?(Aozora2Html::Tag::Multiline)
   end
 
   def test_to_s
-    tag = Multiline_caption_tag.new(@parser)
+    tag = Aozora2Html::Tag::MultilineCaption.new(@parser)
     assert_equal "<div class=\"caption\">", tag.to_s
     assert_equal "</div>", tag.close_tag
   end

data/test/test_multiline_midashi_tag.rb

@@ -4,47 +4,48 @@ require 'aozora2html'
 
 class MultilineMidashiTagTest < Test::Unit::TestCase
   def setup
+    @parser = Object.new
     stub(@parser).block_allowed_context?{true}
     stub(@parser).new_midashi_id{2}
   end
 
   def test_multiline_midashi_new
-    tag = Multiline_midashi_tag.new(@parser,"小".encode("shift_jis"),:normal)
-    assert_equal Multiline_midashi_tag, tag.class
-    assert_equal true, tag.kind_of?(Block_tag)
-    assert_equal true, tag.kind_of?(Multiline_tag)
+    tag = Aozora2Html::Tag::MultilineMidashi.new(@parser,"小".encode("shift_jis"),:normal)
+    assert_equal Aozora2Html::Tag::MultilineMidashi, tag.class
+    assert_equal true, tag.kind_of?(Aozora2Html::Tag::Block)
+    assert_equal true, tag.kind_of?(Aozora2Html::Tag::Multiline)
   end
 
   def test_to_s
-    tag = Multiline_midashi_tag.new(@parser,"小".encode("shift_jis"),:normal)
+    tag = Aozora2Html::Tag::MultilineMidashi.new(@parser,"小".encode("shift_jis"),:normal)
     assert_equal "<h5 class=\"ko-midashi\"><a class=\"midashi_anchor\" id=\"midashi2\">", tag.to_s
     assert_equal "</a></h5>", tag.close_tag
   end
 
   def test_to_s_chu
-    tag = Multiline_midashi_tag.new(@parser,"中".encode("shift_jis"),:dogyo)
+    tag = Aozora2Html::Tag::MultilineMidashi.new(@parser,"中".encode("shift_jis"),:dogyo)
     assert_equal "<h4 class=\"dogyo-naka-midashi\"><a class=\"midashi_anchor\" id=\"midashi2\">", tag.to_s
     assert_equal "</a></h4>", tag.close_tag
   end
 
   def test_to_s_dai
-    tag = Multiline_midashi_tag.new(@parser,"大".encode("shift_jis"),:mado)
+    tag = Aozora2Html::Tag::MultilineMidashi.new(@parser,"大".encode("shift_jis"),:mado)
     assert_equal "<h3 class=\"mado-o-midashi\"><a class=\"midashi_anchor\" id=\"midashi2\">", tag.to_s
     assert_equal "</a></h3>", tag.close_tag
   end
 
   def test_undeined_midashi
     begin
-      Multiline_midashi_tag.new(@parser,"あ".encode("shift_jis"),:mado)
-    rescue Aozora_Error => e
+      Aozora2Html::Tag::MultilineMidashi.new(@parser,"あ".encode("shift_jis"),:mado)
+    rescue Aozora2Html::Error => e
       assert_equal e.message(123).encode("utf-8"), "エラー(123行目):未定義な見出しです. \r\n処理を停止します"
     end
   end
 
   def test_undeined_midashi2
     begin
-      Multiline_midashi_tag.new(@parser,"大".encode("shift_jis"),:madoo)
-    rescue Aozora_Error => e
+      Aozora2Html::Tag::MultilineMidashi.new(@parser,"大".encode("shift_jis"),:madoo)
+    rescue Aozora2Html::Error => e
       assert_equal e.message(123).encode("utf-8"), "エラー(123行目):未定義な見出しです. \r\n処理を停止します"
     end
   end

data/test/test_multiline_style_tag.rb

@@ -3,18 +3,19 @@ require 'aozora2html'
 
 class MultilineStyleTagTest < Test::Unit::TestCase
   def setup
-    stub(@parser).block_allowed_context?{true} 
+    @parser = Object.new
+    stub(@parser).block_allowed_context?{true}
   end
 
   def test_multiline_style_new
-    tag = Multiline_style_tag.new(@parser,"style1")
-    assert_equal Multiline_style_tag, tag.class
-    assert_equal true, tag.kind_of?(Block_tag)
-    assert_equal true, tag.kind_of?(Multiline_tag)
+    tag = Aozora2Html::Tag::MultilineStyle.new(@parser,"style1")
+    assert_equal Aozora2Html::Tag::MultilineStyle, tag.class
+    assert_equal true, tag.kind_of?(Aozora2Html::Tag::Block)
+    assert_equal true, tag.kind_of?(Aozora2Html::Tag::Multiline)
   end
 
   def test_to_s
-    tag = Multiline_style_tag.new(@parser,"s1")
+    tag = Aozora2Html::Tag::MultilineStyle.new(@parser,"s1")
     assert_equal "<div class=\"s1\">", tag.to_s
     assert_equal "</div>", tag.close_tag
   end

data/test/test_multiline_yokogumi_tag.rb

@@ -3,18 +3,19 @@ require 'aozora2html'
 
 class MultilineYokogumiTagTest < Test::Unit::TestCase
   def setup
-    stub(@parser).block_allowed_context?{true} 
+    @parser = Object.new
+    stub(@parser).block_allowed_context?{true}
   end
 
   def test_multiline_yokogumi_new
-    tag = Multiline_yokogumi_tag.new(@parser0)
-    assert_equal Multiline_yokogumi_tag, tag.class
-    assert_equal true, tag.kind_of?(Block_tag)
-    assert_equal true, tag.kind_of?(Multiline_tag)
+    tag = Aozora2Html::Tag::MultilineYokogumi.new(@parser)
+    assert_equal Aozora2Html::Tag::MultilineYokogumi, tag.class
+    assert_equal true, tag.kind_of?(Aozora2Html::Tag::Block)
+    assert_equal true, tag.kind_of?(Aozora2Html::Tag::Multiline)
   end
 
   def test_to_s
-    tag = Multiline_yokogumi_tag.new(@parser)
+    tag = Aozora2Html::Tag::MultilineYokogumi.new(@parser)
     assert_equal "<div class=\"yokogumi\">", tag.to_s
     assert_equal "</div>", tag.close_tag
   end

data/test/test_okurigana_tag.rb

@@ -4,17 +4,18 @@ require 'aozora2html'
 
 class OkuriganaTagTest < Test::Unit::TestCase
   def setup
+    @parser = Object.new
     stub(@parser).block_allowed_context?{true}
   end
 
   def test_okurigana_new
-    tag = Okurigana_tag.new(@parser,"aaa")
-    assert_equal Okurigana_tag, tag.class
-    assert_equal true, tag.kind_of?(Inline_tag)
+    tag = Aozora2Html::Tag::Okurigana.new(@parser,"aaa")
+    assert_equal Aozora2Html::Tag::Okurigana, tag.class
+    assert_equal true, tag.kind_of?(Aozora2Html::Tag::Inline)
   end
 
   def test_to_s
-    tag = Okurigana_tag.new(@parser,"テスト".encode("shift_jis"))
+    tag = Aozora2Html::Tag::Okurigana.new(@parser,"テスト".encode("shift_jis"))
     assert_equal "<sup class=\"okurigana\">テスト</sup>", tag.to_s.encode("utf-8")
   end
 

data/test/test_ruby_parse.rb

@@ -0,0 +1,116 @@
+# encoding: utf-8
+require 'test_helper'
+require 'aozora2html'
+
+class RubyParseTest < Test::Unit::TestCase
+  def setup
+  end
+
+  def test_parse_ruby1
+    src = "青空文庫《あおぞらぶんこ》\r\n"
+    parsed = parse_text(src)
+    expected = "<ruby><rb>青空文庫</rb><rp>（</rp><rt>あおぞらぶんこ</rt><rp>）</rp></ruby><br />\r\n"
+    assert_equal expected, parsed
+  end
+
+  def test_parse_ruby1b
+    src = "身装《みなり》\r\n"
+    parsed = parse_text(src)
+    expected = "<ruby><rb>身装</rb><rp>（</rp><rt>みなり</rt><rp>）</rp></ruby><br />\r\n"
+    assert_equal expected, parsed
+  end
+
+  def test_parse_ruby2
+    src = "霧の｜ロンドン警視庁《スコットランドヤード》\r\n"
+    parsed = parse_text(src)
+    expected = "霧の<ruby><rb>ロンドン警視庁</rb><rp>（</rp><rt>スコットランドヤード</rt><rp>）</rp></ruby><br />\r\n"
+    assert_equal expected, parsed
+  end
+
+  def test_parse_ruby2b
+    src = "いかにも最｜猛者《もさ》のように\r\n"
+    parsed = parse_text(src)
+    expected = "いかにも最<ruby><rb>猛者</rb><rp>（</rp><rt>もさ</rt><rp>）</rp></ruby>のように<br />\r\n"
+    assert_equal expected, parsed
+  end
+
+  def test_parse_ruby3
+    src = "〆切《しめきり》を逃れるために、市ヶ谷《いちがや》から転々《てんてん》と、居を移した。\r\n"
+    parsed = parse_text(src)
+    expected = "<ruby><rb>〆切</rb><rp>（</rp><rt>しめきり</rt><rp>）</rp></ruby>を逃れるために、<ruby><rb>市ヶ谷</rb><rp>（</rp><rt>いちがや</rt><rp>）</rp></ruby>から<ruby><rb>転々</rb><rp>（</rp><rt>てんてん</rt><rp>）</rp></ruby>と、居を移した。<br />\r\n"
+    assert_equal expected, parsed
+  end
+
+  def test_parse_ruby4
+    src = "水鉢を置いた※［＃「木＋靈」、第3水準1-86-29］子窓《れんじまど》の下には\r\n"
+    parsed = parse_text(src)
+    expected = "水鉢を置いた<ruby><rb><img src=\"../../../gaiji/1-86/1-86-29.png\" alt=\"※(「木＋靈」、第3水準1-86-29)\" class=\"gaiji\" />子窓</rb><rp>（</rp><rt>れんじまど</rt><rp>）</rp></ruby>の下には<br />\r\n"
+    assert_equal expected, parsed
+  end
+
+  def test_parse_ruby5
+    src = "それが彼の 〔E'tude〕《エチュード》 だった。\r\n"
+    parsed = parse_text(src)
+    expected = "それが彼の <ruby><rb><img src=\"../../../gaiji/1-09/1-09-32.png\" alt=\"※(アキュートアクセント付きE)\" class=\"gaiji\" />tude</rb><rp>（</rp><rt>エチュード</rt><rp>）</rp></ruby> だった。<br />\r\n"
+    assert_equal expected, parsed
+  end
+
+  def test_parse_ruby6
+    src = "青空文庫［＃「青空文庫」の左に「あおぞらぶんこ」のルビ］\r\n"
+    parsed = parse_text(src)
+    expected = "青空文庫<span class=\"notes\">［＃「青空文庫」の左に「あおぞらぶんこ」のルビ］</span><br />\r\n"
+    assert_equal expected, parsed
+  end
+
+  def test_parse_ruby7
+    src = "青空文庫《あおぞらぶんこ》［＃「青空文庫」の左に「aozora bunko」のルビ］\r\n"
+    parsed = parse_text(src)
+    expected = %Q|<ruby><rb>青空文庫</rb><rp>（</rp><rt>あおぞらぶんこ</rt><rp>）</rp></ruby><span class="notes">［＃「青空文庫」の左に「aozora bunko」のルビ］</span><br />\r\n|
+    assert_equal expected, parsed
+  end
+
+  def test_parse_ruby8
+    src = "大空文庫［＃「大空文庫」に「ママ」の注記］\r\n"
+    parsed = parse_text(src)
+    expected = %Q|<ruby><rb>大空文庫</rb><rp>（</rp><rt>ママ</rt><rp>）</rp></ruby><br />\r\n|
+    assert_equal expected, parsed
+  end
+
+  def test_parse_ruby9
+    src = "大空文庫［＃「大空文庫」の左に「ママ」の注記］\r\n"
+    parsed = parse_text(src)
+    expected = %Q|大空文庫<span class="notes">［＃「大空文庫」の左に「ママ」の注記］</span><br />\r\n|
+    assert_equal expected, parsed
+  end
+
+  def test_parse_ruby10
+    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|
+    assert_equal expected, parsed
+  end
+
+  def test_parse_ruby11
+    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|
+    assert_equal expected, parsed
+  end
+
+  def parse_text(input_text)
+    input = StringIO.new(input_text.encode("shift_jis"))
+    output = StringIO.new
+    parser = Aozora2Html.new(input, output)
+    parser.instance_eval{@section=:tail}
+    catch(:terminate) do
+      loop do
+        parser.parse
+      end
+    end
+
+    output.string.encode("utf-8")
+  end
+
+end
+
+

data/test/test_ruby_tag.rb

@@ -4,17 +4,18 @@ require 'aozora2html'
 
 class RubyTagTest < Test::Unit::TestCase
   def setup
+    @parser = Object.new
     stub(@parser).block_allowed_context?{true}
   end
 
   def test_ruby_new
-    tag = Ruby_tag.new(@parser,"aaa".encode("shift_jis"),"bb")
-    assert_equal Ruby_tag, tag.class
-    assert_equal true, tag.kind_of?(Inline_tag)
+    tag = Aozora2Html::Tag::Ruby.new(@parser,"aaa".encode("shift_jis"),"bb")
+    assert_equal Aozora2Html::Tag::Ruby, tag.class
+    assert_equal true, tag.kind_of?(Aozora2Html::Tag::Inline)
   end
 
   def test_to_s
-    tag = Ruby_tag.new(@parser,"テスト".encode("shift_jis"),"てすと".encode("shift_jis"))
+    tag = Aozora2Html::Tag::Ruby.new(@parser,"テスト".encode("shift_jis"),"てすと".encode("shift_jis"))
     assert_equal "<ruby><rb>テスト</rb><rp>（</rp><rt>てすと</rt><rp>）</rp></ruby>", tag.to_s.encode("utf-8")
   end
 

data/test/test_tag_parser.rb

@@ -6,14 +6,14 @@ require 'tmpdir'
 
 class TagParserTest < Test::Unit::TestCase
   def setup
-    @jisx0213 = Embed_Gaiji_tag.use_jisx0213
+    @jisx0213 = Aozora2Html::Tag::EmbedGaiji.use_jisx0213
   end
 
   def test_parse_katakana
     str = "テスト！あいうえお\r\n".encode("shift_jis")
     strio = StringIO.new(str)
     stream = Jstream.new(strio)
-    command, raw = Aozora_tag_parser.new(stream,"！".encode("shift_jis"),{},[]).process
+    command, _raw = Aozora2Html::TagParser.new(stream,"！".encode("shift_jis"),{},[]).process
     expected = "テスト"
     assert_equal expected, command.to_s.encode("utf-8")
   end
@@ -22,7 +22,7 @@ class TagParserTest < Test::Unit::TestCase
     str = "腹がへっても［＃「腹がへっても」に傍点］、ひもじゅうない［＃「ひもじゅうない」に傍点］とかぶりを振っている…\r\n".encode("shift_jis")
     strio = StringIO.new(str)
     stream = Jstream.new(strio)
-    command, raw = Aozora_tag_parser.new(stream,"…".encode("shift_jis"),{},[]).process
+    command, _raw = Aozora2Html::TagParser.new(stream,"…".encode("shift_jis"),{},[]).process
     expected = '<em class="sesame_dot">腹がへっても</em>、<em class="sesame_dot">ひもじゅうない</em>とかぶりを振っている'
     assert_equal expected, command.to_s.encode("utf-8")
   end
@@ -31,7 +31,7 @@ class TagParserTest < Test::Unit::TestCase
     str = "※［＃「てへん＋劣」、第3水準1-84-77］…\r\n".encode("shift_jis")
     strio = StringIO.new(str)
     stream = Jstream.new(strio)
-    command, raw = Aozora_tag_parser.new(stream,"…".encode("shift_jis"),{},[]).process
+    command, _raw = Aozora2Html::TagParser.new(stream,"…".encode("shift_jis"),{},[]).process
     expected = '<img src="../../../gaiji/1-84/1-84-77.png" alt="※(「てへん＋劣」、第3水準1-84-77)" class="gaiji" />'
     assert_equal expected, command.to_s.encode("utf-8")
   end
@@ -40,7 +40,7 @@ class TagParserTest < Test::Unit::TestCase
     str = "※［＃「口＋世」、ページ数-行数］…\r\n".encode("shift_jis")
     strio = StringIO.new(str)
     stream = Jstream.new(strio)
-    command, raw = Aozora_tag_parser.new(stream,"…".encode("shift_jis"),{},[]).process
+    command, _raw = Aozora2Html::TagParser.new(stream,"…".encode("shift_jis"),{},[]).process
     expected = '※<span class="notes">［＃「口＋世」、ページ数-行数］</span>'
     assert_equal expected, command.to_s.encode("utf-8")
   end
@@ -49,7 +49,7 @@ class TagParserTest < Test::Unit::TestCase
     str = "※［＃二の字点、1-2-22］…\r\n".encode("shift_jis")
     strio = StringIO.new(str)
     stream = Jstream.new(strio)
-    command, raw = Aozora_tag_parser.new(stream,"…".encode("shift_jis"),{},[]).process
+    command, _raw = Aozora2Html::TagParser.new(stream,"…".encode("shift_jis"),{},[]).process
     expected = '<img src="../../../gaiji/1-02/1-02-22.png" alt="※(二の字点、1-2-22)" class="gaiji" />'
     assert_equal expected, command.to_s.encode("utf-8")
   end
@@ -58,23 +58,23 @@ class TagParserTest < Test::Unit::TestCase
     str = "自［＃二］女王國［＃一］東度［＃レ］海千餘里。…\r\n".encode("shift_jis")
     strio = StringIO.new(str)
     stream = Jstream.new(strio)
-    command, raw = Aozora_tag_parser.new(stream,"…".encode("shift_jis"),{},[]).process
+    command, _raw = Aozora2Html::TagParser.new(stream,"…".encode("shift_jis"),{},[]).process
     expected = '自<sub class="kaeriten">二</sub>女王國<sub class="kaeriten">一</sub>東度<sub class="kaeriten">レ</sub>海千餘里。'
     assert_equal expected, command.to_s.encode("utf-8")
   end
 
   def test_parse_gaiji_jisx0213
-    Embed_Gaiji_tag.use_jisx0213 = true
+    Aozora2Html::Tag::EmbedGaiji.use_jisx0213 = true
     str = "※［＃「てへん＋劣」、第3水準1-84-77］…\r\n".encode("shift_jis")
     strio = StringIO.new(str)
     stream = Jstream.new(strio)
-    command, raw = Aozora_tag_parser.new(stream,"…".encode("shift_jis"),{},[]).process
+    command, _raw = Aozora2Html::TagParser.new(stream,"…".encode("shift_jis"),{},[]).process
     expected = '&#x6318;'
     assert_equal expected, command.to_s.encode("utf-8")
   end
 
   def teardown
-    Embed_Gaiji_tag.use_jisx0213 = @jisx0213
+    Aozora2Html::Tag::EmbedGaiji.use_jisx0213 = @jisx0213
   end
 end