aozora2html 2.0.0 → 3.0.0

data/test/test_ruby_parse.rb

@@ -1,4 +1,5 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require 'test_helper'
 require 'aozora2html'
 
@@ -65,41 +66,43 @@ class RubyParseTest < Test::Unit::TestCase
   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|
+    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|
+    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|
+    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|
+    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|
+    expected = %Q(<ruby><rb>大空文庫</rb><rp>（</rp><rt>あおぞらぶんこ</rt><rp>）</rp></ruby><span class="notes">［＃「大空文庫」の左に「ママ」の注記］</span><br />\r\n)
     assert_equal expected, parsed
   end
 
+  using Aozora2Html::StringRefinements
+
   def test_parse_ruby12
     src = "大空文庫《あおぞらぶんこ》［＃「大空文庫」に「ママ」の注記］\r\n"
-    assert_raise(Aozora2Html::Error.new("同じ箇所に2つのルビはつけられません".encode("shift_jis"))) do
+    assert_raise(Aozora2Html::Error.new('同じ箇所に2つのルビはつけられません'.to_sjis)) do
       _parsed = parse_text(src)
     end
   end
@@ -112,19 +115,16 @@ class RubyParseTest < Test::Unit::TestCase
   end
 
   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
-
 end
-
-

data/test/test_ruby_tag.rb

@@ -1,22 +1,25 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require 'test_helper'
 require 'aozora2html'
 
 class RubyTagTest < 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_ruby_new
-    tag = Aozora2Html::Tag::Ruby.new(@parser,"aaa".encode("shift_jis"),"bb")
+    tag = Aozora2Html::Tag::Ruby.new(@parser, 'aaa'.to_sjis, 'bb')
     assert_equal Aozora2Html::Tag::Ruby, 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::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")
+    tag = Aozora2Html::Tag::Ruby.new(@parser, 'テスト'.to_sjis, 'てすと'.to_sjis)
+    assert_equal '<ruby><rb>テスト</rb><rp>（</rp><rt>てすと</rt><rp>）</rp></ruby>', tag.to_s.to_utf8
   end
 
   def teardown

data/test/test_tag_parser.rb

@@ -1,4 +1,5 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require 'test_helper'
 require 'aozora2html'
 require 'fileutils'
@@ -9,72 +10,73 @@ class TagParserTest < Test::Unit::TestCase
     @jisx0213 = Aozora2Html::Tag::EmbedGaiji.use_jisx0213
   end
 
+  using Aozora2Html::StringRefinements
+
   def test_parse_katakana
-    str = "テスト！あいうえお\r\n".encode("shift_jis")
+    str = "テスト！あいうえお\r\n".to_sjis
     strio = StringIO.new(str)
     stream = Jstream.new(strio)
-    command, _raw = Aozora2Html::TagParser.new(stream,"！".encode("shift_jis"),{},[]).process
-    expected = "テスト"
-    assert_equal expected, command.to_s.encode("utf-8")
+    command, _raw = Aozora2Html::TagParser.new(stream, '！'.to_sjis, {}, [], gaiji_dir: nil).process
+    expected = 'テスト'
+    assert_equal expected, command.to_s.to_utf8
   end
 
   def test_parse_bouten
-    str = "腹がへっても［＃「腹がへっても」に傍点］、ひもじゅうない［＃「ひもじゅうない」に傍点］とかぶりを振っている…\r\n".encode("shift_jis")
+    str = "腹がへっても［＃「腹がへっても」に傍点］、ひもじゅうない［＃「ひもじゅうない」に傍点］とかぶりを振っている…\r\n".to_sjis
     strio = StringIO.new(str)
     stream = Jstream.new(strio)
-    command, _raw = Aozora2Html::TagParser.new(stream,"…".encode("shift_jis"),{},[]).process
+    command, _raw = Aozora2Html::TagParser.new(stream, '…'.to_sjis, {}, [], gaiji_dir: nil).process
     expected = '<em class="sesame_dot">腹がへっても</em>、<em class="sesame_dot">ひもじゅうない</em>とかぶりを振っている'
-    assert_equal expected, command.to_s.encode("utf-8")
+    assert_equal expected, command.to_s.to_utf8
   end
 
   def test_parse_gaiji
-    str = "※［＃「てへん＋劣」、第3水準1-84-77］…\r\n".encode("shift_jis")
+    str = "※［＃「てへん＋劣」、第3水準1-84-77］…\r\n".to_sjis
     strio = StringIO.new(str)
     stream = Jstream.new(strio)
-    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")
+    command, _raw = Aozora2Html::TagParser.new(stream, '…'.to_sjis, {}, [], gaiji_dir: 'g_dir/').process
+    expected = '<img src="g_dir/1-84/1-84-77.png" alt="※(「てへん＋劣」、第3水準1-84-77)" class="gaiji" />'
+    assert_equal expected, command.to_s.to_utf8
   end
 
   def test_parse_gaiji_a
-    str = "※［＃「口＋世」、ページ数-行数］…\r\n".encode("shift_jis")
+    str = "※［＃「口＋世」、ページ数-行数］…\r\n".to_sjis
     strio = StringIO.new(str)
     stream = Jstream.new(strio)
-    command, _raw = Aozora2Html::TagParser.new(stream,"…".encode("shift_jis"),{},[]).process
+    command, _raw = Aozora2Html::TagParser.new(stream, '…'.to_sjis, {}, [], gaiji_dir: 'g_dir/').process
     expected = '※<span class="notes">［＃「口＋世」、ページ数-行数］</span>'
-    assert_equal expected, command.to_s.encode("utf-8")
+    assert_equal expected, command.to_s.to_utf8
   end
 
   def test_parse_gaiji_b
-    str = "※［＃二の字点、1-2-22］…\r\n".encode("shift_jis")
+    str = "※［＃二の字点、1-2-22］…\r\n".to_sjis
     strio = StringIO.new(str)
     stream = Jstream.new(strio)
-    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")
+    command, _raw = Aozora2Html::TagParser.new(stream, '…'.to_sjis, {}, [], gaiji_dir: 'g_dir/').process
+    expected = '<img src="g_dir/1-02/1-02-22.png" alt="※(二の字点、1-2-22)" class="gaiji" />'
+    assert_equal expected, command.to_s.to_utf8
   end
 
   def test_parse_gaiji_kaeri
-    str = "自［＃二］女王國［＃一］東度［＃レ］海千餘里。…\r\n".encode("shift_jis")
+    str = "自［＃二］女王國［＃一］東度［＃レ］海千餘里。…\r\n".to_sjis
     strio = StringIO.new(str)
     stream = Jstream.new(strio)
-    command, _raw = Aozora2Html::TagParser.new(stream,"…".encode("shift_jis"),{},[]).process
+    command, _raw = Aozora2Html::TagParser.new(stream, '…'.to_sjis, {}, [], gaiji_dir: 'g_dir/').process
     expected = '自<sub class="kaeriten">二</sub>女王國<sub class="kaeriten">一</sub>東度<sub class="kaeriten">レ</sub>海千餘里。'
-    assert_equal expected, command.to_s.encode("utf-8")
+    assert_equal expected, command.to_s.to_utf8
   end
 
   def test_parse_gaiji_jisx0213
     Aozora2Html::Tag::EmbedGaiji.use_jisx0213 = true
-    str = "※［＃「てへん＋劣」、第3水準1-84-77］…\r\n".encode("shift_jis")
+    str = "※［＃「てへん＋劣」、第3水準1-84-77］…\r\n".to_sjis
     strio = StringIO.new(str)
     stream = Jstream.new(strio)
-    command, _raw = Aozora2Html::TagParser.new(stream,"…".encode("shift_jis"),{},[]).process
+    command, _raw = Aozora2Html::TagParser.new(stream, '…'.to_sjis, {}, [], gaiji_dir: 'g_dir/').process
     expected = '&#x6318;'
-    assert_equal expected, command.to_s.encode("utf-8")
+    assert_equal expected, command.to_s.to_utf8
   end
 
   def teardown
     Aozora2Html::Tag::EmbedGaiji.use_jisx0213 = @jisx0213
   end
 end
-

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: aozora2html
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - aozorahack team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-05 00:00:00.000000000 Z
+date: 2021-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +52,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '12.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  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: rubocop-performance
+  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: rubocop-rake
+  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: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -89,13 +131,15 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/rubocop.yml"
 - ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
+- ".rubocop_todo.yml"
 - CHANGELOG.md
 - Gemfile
 - Guardfile
+- HACKING.md
 - LICENSE
 - README.md
 - Rakefile
@@ -107,6 +151,7 @@ files:
 - lib/aozora2html/header.rb
 - lib/aozora2html/i18n.rb
 - lib/aozora2html/ruby_buffer.rb
+- lib/aozora2html/string_refinements.rb
 - lib/aozora2html/style_stack.rb
 - lib/aozora2html/tag.rb
 - lib/aozora2html/tag/accent.rb
@@ -147,13 +192,13 @@ files:
 - lib/aozora2html/tag/ruby.rb
 - lib/aozora2html/tag/un_embed_gaiji.rb
 - lib/aozora2html/tag_parser.rb
+- lib/aozora2html/text_buffer.rb
 - lib/aozora2html/utils.rb
 - lib/aozora2html/version.rb
 - lib/aozora2html/yaml_loader.rb
 - lib/aozora2html/zip.rb
 - lib/extensions.rb
 - lib/jstream.rb
-- lib/t2hs.rb
 - sample/chukiichiran_kinyurei.html
 - sample/chukiichiran_kinyurei.txt
 - test/test_aozora2html.rb
@@ -197,8 +242,9 @@ files:
 homepage: https://github.com/aozorahack/aozora2html
 licenses:
 - CC0
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -206,15 +252,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: converter from Aozora Bunko format into xhtml. It's based of t2hs.rb from
   kumihan.aozora.gr.jp.

data/.travis.yml

@@ -1,12 +0,0 @@
-sudo: false
-cache: bundler
-rvm:
-  - 1.9.3
-  - 2.0
-  - 2.1
-  - 2.2
-  - 2.3.1
-
-branches:
-  only:
-    - master