aozora2html 0.7.1 → 0.9.0

data/test/test_dakuten_katakana_tag.rb

@@ -4,19 +4,20 @@ 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}
   end
 
   def test_dakuten_katakana_new
-    tag = Dakuten_katakana_tag.new(@parser,1,"ア".encode("shift_jis"))
-    assert_equal Dakuten_katakana_tag, tag.class
-    assert_equal true, tag.kind_of?(Inline_tag)
+    tag = Aozora2Html::Tag::DakutenKatakana.new(@parser,1,"ア".encode("shift_jis"))
+    assert_equal Aozora2Html::Tag::DakutenKatakana, tag.class
+    assert_equal true, tag.kind_of?(Aozora2Html::Tag::Inline)
   end
 
   def test_to_s
-    tag = Dakuten_katakana_tag.new(@parser,1,"ア".encode("shift_jis"))
+    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
 

data/test/test_decorate_tag.rb

@@ -4,17 +4,18 @@ require 'aozora2html'
 
 class DecorateTagTest < Test::Unit::TestCase
   def setup
+    @parser = Object.new
     stub(@parser).block_allowed_context?{true}
   end
 
   def test_decorate_new
-    tag = Decorate_tag.new(@parser,"aa",1,:dai)
-    assert_equal Decorate_tag, tag.class
-    assert_equal true, tag.kind_of?(Inline_tag)
+    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)
   end
 
   def test_to_s
-    tag = Decorate_tag.new(@parser,"テスト".encode("shift_jis"),"foo","span")
+    tag = Aozora2Html::Tag::Decorate.new(@parser,"テスト".encode("shift_jis"),"foo","span")
     assert_equal "<span class=\"foo\">テスト</span>", tag.to_s.encode("utf-8")
   end
 

data/test/test_dir_tag.rb

@@ -4,17 +4,18 @@ require 'aozora2html'
 
 class DirTagTest < Test::Unit::TestCase
   def setup
+    @parser = Object.new
     stub(@parser).block_allowed_context?{true}
   end
 
   def test_dir_new
-    tag = Dir_tag.new(@parser,"テスト".encode("shift_jis"))
-    assert_equal Dir_tag, tag.class
-    assert_equal true, tag.kind_of?(Inline_tag)
+    tag = Aozora2Html::Tag::Dir.new(@parser,"テスト".encode("shift_jis"))
+    assert_equal Aozora2Html::Tag::Dir, tag.class
+    assert_equal true, tag.kind_of?(Aozora2Html::Tag::Inline)
   end
 
   def test_to_s
-    tag = Dir_tag.new(@parser,"テスト".encode("shift_jis"))
+    tag = Aozora2Html::Tag::Dir.new(@parser,"テスト".encode("shift_jis"))
     assert_equal "<span dir=\"ltr\">テスト</span>", tag.to_s.encode("utf-8")
   end
 

data/test/test_editor_note_tag.rb

@@ -7,13 +7,13 @@ class EditorNoteTagTest < Test::Unit::TestCase
   end
 
   def test_editor_note_new
-    tag = Editor_note_tag.new(nil,"注記のテスト".encode("shift_jis"))
-    assert_equal Editor_note_tag, tag.class
-    assert_equal true, tag.kind_of?(Inline_tag)
+    tag = Aozora2Html::Tag::EditorNote.new(nil,"注記のテスト".encode("shift_jis"))
+    assert_equal Aozora2Html::Tag::EditorNote, tag.class
+    assert_equal true, tag.kind_of?(Aozora2Html::Tag::Inline)
   end
 
   def test_to_s
-    tag = Editor_note_tag.new(nil,"注記のテスト".encode("shift_jis"))
+    tag = Aozora2Html::Tag::EditorNote.new(nil,"注記のテスト".encode("shift_jis"))
     assert_equal "<span class=\"notes\">［＃注記のテスト］</span>", tag.to_s.encode("utf-8")
   end
 

data/test/test_exception.rb

@@ -4,16 +4,16 @@ require 'aozora2html'
 
 class ExceptionTest < Test::Unit::TestCase
   def test_raise_aozora_exception
-    assert_raises(Aozora_Exception) do
-      raise Aozora_Exception, "error!"
+    assert_raises(Aozora2Html::Error) do
+      raise Aozora2Html::Error, "error!"
     end
   end
 
   def test_raise_aozora_error
     error_msg = ""
     begin
-      raise Aozora_Error, "sample error"
-    rescue Aozora_Error => msg
+      raise Aozora2Html::Error, "sample error"
+    rescue Aozora2Html::Error => msg
       error_msg = msg.message(123)
     end
     assert_equal "エラー(123行目):sample error. \r\n処理を停止します",

data/test/test_font_size_tag.rb

@@ -3,28 +3,29 @@ require 'aozora2html'
 
 class FontSizeTagTest < Test::Unit::TestCase
   def setup
+    @parser = Object.new
     stub(@parser).block_allowed_context?{true} 
   end
 
   def test_font_size_new
-    tag = Font_size_tag.new(@parser,1,:dai)
-    assert_equal Font_size_tag, tag.class
-    assert_equal true, tag.kind_of?(Block_tag)
-    assert_equal true, tag.kind_of?(Multiline_tag)
+    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)
   end
 
   def test_to_s
-    tag = Font_size_tag.new(@parser,1,:dai)
+    tag = Aozora2Html::Tag::FontSize.new(@parser,1,:dai)
     assert_equal "<div class=\"dai1\" style=\"font-size: large;\">", tag.to_s.encode("utf-8")
   end
 
   def test_to_s2
-    tag = Font_size_tag.new(@parser,2,:dai)
+    tag = Aozora2Html::Tag::FontSize.new(@parser,2,:dai)
     assert_equal "<div class=\"dai2\" style=\"font-size: x-large;\">", tag.to_s.encode("utf-8")
   end
 
   def test_to_s3
-    tag = Font_size_tag.new(@parser,3,:sho)
+    tag = Aozora2Html::Tag::FontSize.new(@parser,3,:sho)
     assert_equal "<div class=\"sho3\" style=\"font-size: xx-small;\">", tag.to_s.encode("utf-8")
   end
 

data/test/test_gaiji_tag.rb

@@ -9,34 +9,41 @@ class EmbedGaijiTagTest < Test::Unit::TestCase
   end
 
   def test_gaiji_new
-    egt = Embed_Gaiji_tag.new(nil,"foo","1-2-3","name")
+    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")
   end
 
   def test_unembed_gaiji_new
-    egt = UnEmbed_Gaiji_tag.new(nil,"テストtest".encode("Shift_JIS"))
+    egt = Aozora2Html::Tag::UnEmbedGaiji.new(nil,"テストtest".encode("Shift_JIS"))
     assert_equal "<span class=\"notes\">［テストtest］</span>", egt.to_s.encode("utf-8")
   end
 
   def test_espcaed?
-    egt = UnEmbed_Gaiji_tag.new(nil,"テストtest".encode("Shift_JIS"))
+    egt = Aozora2Html::Tag::UnEmbedGaiji.new(nil,"テストtest".encode("Shift_JIS"))
     assert_equal false, egt.escaped?
   end
 
   def test_espcae!
-    egt = UnEmbed_Gaiji_tag.new(nil,"テストtest".encode("Shift_JIS"))
+    egt = Aozora2Html::Tag::UnEmbedGaiji.new(nil,"テストtest".encode("Shift_JIS"))
     egt.escape!
     assert_equal true, egt.escaped?
   end
 
   def test_jisx0213
-    Embed_Gaiji_tag.use_jisx0213 = true
-    egt = Embed_Gaiji_tag.new(nil,"foo","1-06-75","snowman")
+    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")
+  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")
   end
 
   def teardown
-    Embed_Gaiji_tag.use_jisx0213 = false
+    Aozora2Html::Tag::EmbedGaiji.use_jisx0213 = false
+    Aozora2Html::Tag::EmbedGaiji.use_unicode = false
     $gaiji_dir = @orig_gaiji_dir
   end
 end

data/test/test_header.rb

@@ -0,0 +1,60 @@
+# encoding: utf-8
+require 'test_helper'
+require 'aozora2html'
+
+class HeaderTest < Test::Unit::TestCase
+  def setup
+    @header = Aozora2Html::Header.new
+  end
+
+  def test_header_to_html
+    @header.push("武装せる市街".encode("shift_jis"))
+    @header.push("黒島伝治".encode("shift_jis"))
+    actual = @header.to_html.encode("utf-8")
+    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\">"
+    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>"
+    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>"
+    assert_equal(expected, actual)
+  end
+end

data/test/test_img_tag.rb

@@ -3,17 +3,18 @@ require 'aozora2html'
 
 class ImgTagTest < Test::Unit::TestCase
   def setup
+    @parser = Object.new
     stub(@parser).block_allowed_context?{true} 
   end
 
   def test_img_new
-    tag = Img_tag.new(@parser,"foo.png","img1","alt img1",40,50)
-    assert_equal Img_tag, tag.class
-    assert_equal true, tag.kind_of?(Inline_tag)
+    tag = Aozora2Html::Tag::Img.new(@parser,"foo.png","img1","alt img1",40,50)
+    assert_equal Aozora2Html::Tag::Img, tag.class
+    assert_equal true, tag.kind_of?(Aozora2Html::Tag::Inline)
   end
 
   def test_to_s
-    tag = Img_tag.new(@parser,"foo.png","img1","alt img1",40,50)
+    tag = Aozora2Html::Tag::Img.new(@parser,"foo.png","img1","alt img1",40,50)
     assert_equal "<img class=\"img1\" width=\"40\" height=\"50\" src=\"foo.png\" alt=\"alt img1\" />", tag.to_s.encode("utf-8")
   end
 

data/test/test_inline_caption_tag.rb

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

data/test/test_inline_font_size_tag.rb

@@ -4,27 +4,28 @@ require 'aozora2html'
 
 class InlineFontSizeTagTest < Test::Unit::TestCase
   def setup
+    @parser = Object.new
     stub(@parser).block_allowed_context?{true}
   end
 
   def test_font_size_new
-    tag = Inline_font_size_tag.new(@parser,"aa",1,:dai)
-    assert_equal Inline_font_size_tag, tag.class
-    assert_equal true, tag.kind_of?(Inline_tag)
+    tag = Aozora2Html::Tag::InlineFontSize.new(@parser,"aa",1,:dai)
+    assert_equal Aozora2Html::Tag::InlineFontSize, tag.class
+    assert_equal true, tag.kind_of?(Aozora2Html::Tag::Inline)
   end
 
   def test_to_s
-    tag = Inline_font_size_tag.new(@parser,"テスト".encode("shift_jis"),1,:dai)
+    tag = Aozora2Html::Tag::InlineFontSize.new(@parser,"テスト".encode("shift_jis"),1,:dai)
     assert_equal "<span class=\"dai1\" style=\"font-size: large;\">テスト</span>", tag.to_s.encode("utf-8")
   end
 
   def test_to_s2
-    tag = Inline_font_size_tag.new(@parser,"テスト".encode("shift_jis"),2,:sho)
+    tag = Aozora2Html::Tag::InlineFontSize.new(@parser,"テスト".encode("shift_jis"),2,:sho)
     assert_equal "<span class=\"sho2\" style=\"font-size: x-small;\">テスト</span>", tag.to_s.encode("utf-8")
   end
 
   def test_to_s3
-    tag = Inline_font_size_tag.new(@parser,"テスト".encode("shift_jis"),3,:sho)
+    tag = Aozora2Html::Tag::InlineFontSize.new(@parser,"テスト".encode("shift_jis"),3,:sho)
     assert_equal "<span class=\"sho3\" style=\"font-size: xx-small;\">テスト</span>", tag.to_s.encode("utf-8")
   end
 

data/test/test_inline_keigakomi_tag.rb

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

data/test/test_inline_yokogumi_tag.rb

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

data/test/test_jizume_tag.rb

@@ -3,18 +3,19 @@ require 'aozora2html'
 
 class JizumeTagTest < Test::Unit::TestCase
   def setup
-    stub(@parser).block_allowed_context?{true} 
+    @parser = Object.new
+    stub(@parser).block_allowed_context?{true}
   end
 
   def test_jizume_new
-    tag = Jizume_tag.new(@parser,50)
-    assert_equal Jizume_tag, tag.class
-    assert_equal true, tag.kind_of?(Block_tag)
-    assert_equal true, tag.kind_of?(Multiline_tag)
+    tag = Aozora2Html::Tag::Jizume.new(@parser,50)
+    assert_equal Aozora2Html::Tag::Jizume, 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 = Jizume_tag.new(@parser,50)
+    tag = Aozora2Html::Tag::Jizume.new(@parser,50)
     assert_equal "<div class=\"jizume_50\" style=\"width: 50em\">", tag.to_s
     assert_equal "</div>", tag.close_tag
   end

data/test/test_jstream.rb

@@ -28,8 +28,8 @@ class JstreamTest < Test::Unit::TestCase
     assert_equal "b", stm.read_char.encode("utf-8")
     assert_equal "\r\n", stm.read_char.encode("utf-8")
     assert_equal :eof, stm.read_char
-    assert_equal "\r\n", stm.read_char  # XXX ??
-    assert_equal :eof, stm.read_char    # XXX ??
+    assert_equal "\r\n", stm.read_char  # :eof以降は正しい値を保証しない
+    assert_equal :eof, stm.read_char    # 何度もread_charすると:eofが複数回出る
   end
 
   def test_peek_char
@@ -39,9 +39,9 @@ class JstreamTest < Test::Unit::TestCase
     assert_equal "あ", stm.peek_char(1).encode("utf-8")
     assert_equal "５", stm.peek_char(2).encode("utf-8")
     assert_equal "\r\n", stm.peek_char(3).encode("utf-8")
-    assert_equal "\r\n", stm.peek_char(4).encode("utf-8") # XXX ??
-    assert_equal "\r\n", stm.peek_char(5).encode("utf-8") # XXX ??
-    assert_equal "\r\n", stm.peek_char(100).encode("utf-8") # XXX ??
+    assert_equal "\r\n", stm.peek_char(4).encode("utf-8") # 改行文字以降は正しい値を保証しない
+    assert_equal "\r\n", stm.peek_char(5).encode("utf-8") # 同上
+    assert_equal "\r\n", stm.peek_char(100).encode("utf-8") # 同上
     assert_equal "a", stm.read_char.encode("utf-8")
 
     assert_equal "あ", stm.peek_char(0).encode("utf-8")

data/test/test_kaeriten_tag.rb

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