aozora2html 0.9.0 → 0.9.1

data/test/test_aozora2html.rb

@@ -177,19 +177,19 @@ class Aozora2HtmlTest < Test::Unit::TestCase
 
   def test_convert_japanese_number
     assert_equal "3字下げ",
-                 @parser.convert_japanese_number("三字下げ".encode("shift_jis")).encode("utf-8")
+                 Aozora2Html::Utils.convert_japanese_number("三字下げ".encode("shift_jis")).encode("utf-8")
     assert_equal "10字下げ",
-                 @parser.convert_japanese_number("十字下げ".encode("shift_jis")).encode("utf-8")
+                 Aozora2Html::Utils.convert_japanese_number("十字下げ".encode("shift_jis")).encode("utf-8")
     assert_equal "12字下げ",
-                 @parser.convert_japanese_number("十二字下げ".encode("shift_jis")).encode("utf-8")
+                 Aozora2Html::Utils.convert_japanese_number("十二字下げ".encode("shift_jis")).encode("utf-8")
     assert_equal "20字下げ",
-                 @parser.convert_japanese_number("二十字下げ".encode("shift_jis")).encode("utf-8")
+                 Aozora2Html::Utils.convert_japanese_number("二十字下げ".encode("shift_jis")).encode("utf-8")
     assert_equal "20字下げ",
-                 @parser.convert_japanese_number("二〇字下げ".encode("shift_jis")).encode("utf-8")
+                 Aozora2Html::Utils.convert_japanese_number("二〇字下げ".encode("shift_jis")).encode("utf-8")
     assert_equal "23字下げ",
-                 @parser.convert_japanese_number("二十三字下げ".encode("shift_jis")).encode("utf-8")
+                 Aozora2Html::Utils.convert_japanese_number("二十三字下げ".encode("shift_jis")).encode("utf-8")
     assert_equal "2字下げ",
-                 @parser.convert_japanese_number("２字下げ".encode("shift_jis")).encode("utf-8")
+                 Aozora2Html::Utils.convert_japanese_number("２字下げ".encode("shift_jis")).encode("utf-8")
 
   end
 
@@ -217,6 +217,163 @@ class Aozora2HtmlTest < Test::Unit::TestCase
     assert_equal true, @parser.terpri?(["a",tag])
   end
 
+  def test_new_midashi_id
+    midashi_id = @parser.new_midashi_id(1)
+    assert_equal midashi_id + 1, @parser.new_midashi_id(1)
+    assert_equal midashi_id + 2, @parser.new_midashi_id("小".encode("shift_jis"))
+    assert_equal midashi_id + 12, @parser.new_midashi_id("中".encode("shift_jis"))
+    assert_equal midashi_id + 112, @parser.new_midashi_id("大".encode("shift_jis"))
+    assert_raise(Aozora2Html::Error) do
+      @parser.new_midashi_id("？".encode("shift_jis"))
+    end
+  end
+
+  def test_multiply
+    bouki = @parser.multiply("x", 5)
+    assert_equal "x&nbsp;x&nbsp;x&nbsp;x&nbsp;x", bouki
+  end
+
+  def test_apply_midashi
+    midashi = @parser.apply_midashi("中見出し".encode("shift_jis"))
+    assert_equal %Q|<h4 class="naka-midashi"><a class="midashi_anchor" id="midashi10">|, midashi.to_s
+    midashi = @parser.apply_midashi("大見出し".encode("shift_jis"))
+    assert_equal %Q|<h3 class="o-midashi"><a class="midashi_anchor" id="midashi110">|, midashi.to_s
+  end
+
+  def test_detect_command_mode
+    command = "字下げ終わり".encode("shift_jis")
+    assert_equal :jisage, @parser.detect_command_mode(command)
+    command = "地付き終わり".encode("shift_jis")
+    assert_equal :chitsuki, @parser.detect_command_mode(command)
+    command = "中見出し終わり".encode("shift_jis")
+    assert_equal :midashi, @parser.detect_command_mode(command)
+    command = "ここで太字終わり".encode("shift_jis")
+    assert_equal :futoji, @parser.detect_command_mode(command)
+  end
+
+  def test_tcy
+    input = StringIO.new("［＃縦中横］（※［＃ローマ数字1、1-13-21］）\r\n".encode("shift_jis"))
+    output = StringIO.new
+    parser = Aozora2Html.new(input, output)
+    out = StringIO.new
+    $stdout = out
+    message = nil
+    begin
+      parser.parse_body
+      parser.general_output
+    rescue Aozora2Html::Error => e
+      message = e.message.encode("utf-8")
+    ensure
+      $stdout = STDOUT
+      assert_equal "エラー(0行目):縦中横中に改行されました。改行をまたぐ要素にはブロック表記を用いてください. \r\n処理を停止します", message
+    end
+  end
+
+  def test_ensure_close
+    input = StringIO.new("［＃ここから５字下げ］\r\n底本： test\r\n".encode("shift_jis"))
+    output = StringIO.new
+    parser = Aozora2Html.new(input, output)
+    out = StringIO.new
+    $stdout = out
+    message = nil
+    begin
+      parser.parse_body
+      parser.parse_body
+      parser.parse_body
+      parser.general_output
+    rescue Aozora2Html::Error => e
+      message = e.message.encode("utf-8")
+    ensure
+      $stdout = STDOUT
+      assert_equal "エラー(0行目):字下げ中に本文が終了しました. \r\n処理を停止します", message
+    end
+  end
+
+  def test_ending_check
+    input = StringIO.new("本文\r\n\r\n底本：test\r\n".encode("shift_jis"))
+    output = StringIO.new
+    parser = Aozora2Html.new(input, output)
+    out = StringIO.new
+    $stdout = out
+    _message = nil
+    begin
+      parser.parse_body
+      parser.parse_body
+      parser.parse_body
+      parser.parse_body
+      parser.parse_body
+    rescue Aozora2Html::Error => e
+      _message = e.message.encode("utf-8")
+    ensure
+      $stdout = STDOUT
+      output.seek(0)
+      out_text = output.read
+      assert_equal "本文<br />\r\n<br />\r\n</div>\r\n<div class=\"bibliographical_information\">\r\n<hr />\r\n<br />\r\n", out_text
+    end
+  end
+
+  def test_invalid_closing
+    input = StringIO.new("［＃ここで太字終わり］\r\n".encode("shift_jis"))
+    output = StringIO.new
+    parser = Aozora2Html.new(input, output)
+    out = StringIO.new
+    $stdout = out
+    message = nil
+    begin
+      parser.parse_body
+    rescue Aozora2Html::Error => e
+      message = e.message.encode("utf-8")
+    ensure
+      $stdout = STDOUT
+      assert_equal "エラー(0行目):太字を閉じようとしましたが、太字中ではありません. \r\n処理を停止します", message
+    end
+  end
+
+  def test_invalid_nest
+    input = StringIO.new("［＃太字］［＃傍線］あ［＃太字終わり］\r\n".encode("shift_jis"))
+    output = StringIO.new
+    parser = Aozora2Html.new(input, output)
+    out = StringIO.new
+    $stdout = out
+    message = nil
+    begin
+      parser.parse_body
+      parser.parse_body
+      parser.parse_body
+      parser.parse_body
+      parser.parse_body
+      parser.parse_body
+      parser.parse_body
+    rescue Aozora2Html::Error => e
+      message = e.message.encode("utf-8")
+    ensure
+      $stdout = STDOUT
+      assert_equal "エラー(0行目):太字を終了しようとしましたが、傍線中です. \r\n処理を停止します", message
+    end
+  end
+
+  def test_command_do
+    input = StringIO.new("［＃ここから太字］\r\nテスト。\r\n［＃ここで太字終わり］\r\n".encode("shift_jis"))
+    output = StringIO.new
+    parser = Aozora2Html.new(input, output)
+    out = StringIO.new
+    $stdout = out
+    _message = nil
+    begin
+      9.times do
+        parser.parse_body
+      end
+    rescue Aozora2Html::Error => e
+      _message = e.message.encode("utf-8")
+    ensure
+      $stdout = STDOUT
+      output.seek(0)
+      out_text = output.read
+      assert_equal "<div class=\"futoji\">\r\nテスト。<br />\r\n</div>\r\n", out_text
+    end
+  end
+
+
   def teardown
   end
 end

data/test/test_font_size_tag.rb

@@ -1,3 +1,4 @@
+# -*- coding:utf-8 -*-
 require 'test_helper'
 require 'aozora2html'
 
@@ -29,6 +30,12 @@ class FontSizeTagTest < Test::Unit::TestCase
     assert_equal "<div class=\"sho3\" style=\"font-size: xx-small;\">", tag.to_s.encode("utf-8")
   end
 
+  def test_to_s0
+    assert_raise(Aozora2Html::Error.new("文字サイズの指定が不正です".to_sjis)) do
+      _tag = Aozora2Html::Tag::FontSize.new(@parser,0,:sho)
+    end
+  end
+
   def teardown
   end
 end

data/test/test_ruby_parse.rb

@@ -97,6 +97,20 @@ class RubyParseTest < Test::Unit::TestCase
     assert_equal expected, parsed
   end
 
+  def test_parse_ruby12
+    src = "大空文庫《あおぞらぶんこ》［＃「大空文庫」に「ママ」の注記］\r\n"
+    assert_raise(Aozora2Html::Error.new("同じ箇所に2つのルビはつけられません".encode("shift_jis"))) do
+      _parsed = parse_text(src)
+    end
+  end
+
+  def test_parse_ruby13
+    src = "［＃注記付き］名※［＃二の字点、1-2-22］［＃「（銘々）」の注記付き終わり］\r\n"
+    parsed = parse_text(src)
+    expected = %Q|<ruby><rb>名<img src="../../../gaiji/1-02/1-02-22.png" alt="※(二の字点、1-2-22)" class="gaiji" /></rb><rp>（</rp><rt>（銘々）</rt><rp>）</rp></ruby><br />\r\n|
+    assert_equal expected, parsed
+  end
+
   def parse_text(input_text)
     input = StringIO.new(input_text.encode("shift_jis"))
     output = StringIO.new

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: aozora2html
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - aozorahack team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-10 00:00:00.000000000 Z
+date: 2020-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -80,34 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-test
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: converter from Aozora Bunko format into xhtml. It's based of t2hs.rb
   from kumihan.aozora.gr.jp.
 email:
@@ -117,15 +89,17 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Guardfile
+- LICENSE
 - README.md
 - Rakefile
 - aozora2html.gemspec
-- appveyor.yml
 - bin/aozora2html
 - lib/aozora2html.rb
 - lib/aozora2html/accent_parser.rb
@@ -238,8 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: converter from Aozora Bunko format into xhtml. It's based of t2hs.rb from

data/appveyor.yml

@@ -1,23 +0,0 @@
----
-install:
-  - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
-  - ruby --version
-  - gem --version
-  - bundle install
-build_script:
-  - bundle exec rake test
-
-branches:
-  only:
-    - master
-
-environment:
-  matrix:
-    - ruby_version: "200"
-    - ruby_version: "200-x64"
-    - ruby_version: "21"
-    - ruby_version: "21-x64"
-    - ruby_version: "22"
-    - ruby_version: "22-x64"
-    - ruby_version: "23"
-    - ruby_version: "23-x64"