aozora2html 2.0.0 → 3.0.0

data/lib/aozora2html/tag/decorate.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 class Aozora2Html
   class Tag
+    # 装飾用
     class Decorate < Aozora2Html::Tag::ReferenceMentioned
-
       def initialize(parser, target, html_class, html_tag)
         @target = target
         @close = "</#{html_tag}>"
@@ -10,9 +12,8 @@ class Aozora2Html
       end
 
       def to_s
-        @open+@target.to_s+@close
+        @open + @target.to_s + @close
       end
     end
   end
 end
-

data/lib/aozora2html/tag/dir.rb

@@ -1,14 +1,16 @@
+# frozen_string_literal: true
+
 class Aozora2Html
   class Tag
+    # 書字方向（LTR）の指定用
     class Dir < Aozora2Html::Tag::ReferenceMentioned
-
       def initialize(parser, target)
         @target = target
         super
       end
 
       def to_s
-        "<span dir=\"ltr\">#{@target.to_s}</span>"
+        "<span dir=\"ltr\">#{@target}</span>"
       end
     end
   end

data/lib/aozora2html/tag/editor_note.rb

@@ -1,15 +1,18 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 class Aozora2Html
   class Tag
-    class EditorNote < Aozora2Html::Tag
-      include Aozora2Html::Tag::Inline
+    # 編集者による訂正用
+    class EditorNote < Aozora2Html::Tag::Inline
       def initialize(parser, desc)
         @desc = desc
         super
       end
 
+      using StringRefinements
+
       def to_s
-        '<span class="notes">［＃'.encode("shift_jis") + @desc + '］</span>'.encode("shift_jis")
+        '<span class="notes">［＃'.to_sjis + @desc + '］</span>'.to_sjis
       end
     end
   end

data/lib/aozora2html/tag/embed_gaiji.rb

@@ -1,32 +1,36 @@
+# frozen_string_literal: true
+
 class Aozora2Html
   class Tag
+    # 外字注記用
     class EmbedGaiji < Aozora2Html::Tag::Gaiji
       attr_accessor :unicode
 
       @use_jisx0213 = nil
       @use_unicode = nil
 
-      def self.use_jisx0213=(val)
-        @use_jisx0213 = val
+      class << self
+        attr_writer :use_jisx0213
       end
 
-      def self.use_jisx0213
-        @use_jisx0213
+      class << self
+        attr_reader :use_jisx0213
       end
 
-      def self.use_unicode=(val)
-        @use_unicode = val
+      class << self
+        attr_writer :use_unicode
       end
 
-      def self.use_unicode
-        @use_unicode
+      class << self
+        attr_reader :use_unicode
       end
 
-      def initialize(parser, folder, code, name, unicode_num = nil)
+      def initialize(parser, folder, code, name, unicode_num = nil, gaiji_dir:)
         @folder = folder
         @code = code
         @name = name
         @unicode = unicode_num
+        @gaiji_dir = gaiji_dir
         super
       end
 
@@ -38,9 +42,9 @@ class Aozora2Html
         if Aozora2Html::Tag::EmbedGaiji.use_jisx0213 && @code
           jisx0213_to_unicode(@code.to_sym)
         elsif Aozora2Html::Tag::EmbedGaiji.use_unicode && @unicode
-          '&#x'+@unicode+';'
+          "&#x#{@unicode};"
         else
-          "<img src=\"#{$gaiji_dir}#{@folder}/#{@code}.png\" alt=\"" + GAIJI_MARK + "(#{@name})\" class=\"gaiji\" />"
+          "<img src=\"#{@gaiji_dir}#{@folder}/#{@code}.png\" alt=\"" + GAIJI_MARK + "(#{@name})\" class=\"gaiji\" />"
         end
       end
     end

data/lib/aozora2html/tag/font_size.rb

@@ -1,7 +1,10 @@
+# frozen_string_literal: true
+
 class Aozora2Html
   class Tag
-    class FontSize < Aozora2Html::Tag
-      include Aozora2Html::Tag::Block, Aozora2Html::Tag::Multiline
+    # フォントサイズ指定用
+    class FontSize < Aozora2Html::Tag::Block
+      include Aozora2Html::Tag::Multiline
 
       def initialize(parser, times, daisho)
         @class = daisho.to_s + times.to_s

data/lib/aozora2html/tag/gaiji.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
+
 class Aozora2Html
   class Tag
-    class Gaiji < Aozora2Html::Tag
-      include Aozora2Html::Tag::Inline
-
+    # 外字用
+    class Gaiji < Aozora2Html::Tag::Inline
       def char_type
         :kanji
       end

data/lib/aozora2html/tag/img.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
+
 class Aozora2Html
   class Tag
-    class Img < Aozora2Html::Tag
-      include Aozora2Html::Tag::Inline
-
+    # 画像用
+    class Img < Aozora2Html::Tag::Inline
       def initialize(parser, filename, css_class, alt, width, height)
         @filename = filename
         @css_class = css_class
@@ -18,4 +19,3 @@ class Aozora2Html
     end
   end
 end
-

data/lib/aozora2html/tag/indent.rb

@@ -1,8 +1,8 @@
+# frozen_string_literal: true
+
 class Aozora2Html
   class Tag
-    class Indent < Aozora2Html::Tag
-      include Aozora2Html::Tag::Block
+    class Indent < Aozora2Html::Tag::Block
     end
   end
 end
-

data/lib/aozora2html/tag/inline.rb

@@ -1,13 +1,16 @@
-# 全ての青空記法はHTML elementに変換される
-# したがって、block/inlineの区別がある
-# 全ての末端青空classはどちらかのmoduleをincludeする必要がある
+# frozen_string_literal: true
+
 class Aozora2Html
   class Tag
-    module Inline
-      def initialize(*args)
-        true
+    # インラインタグ用class
+    #
+    # 全ての青空記法はHTML elementに変換される
+    # したがって、block/inlineの区別がある
+    # 全ての末端青空classはどちらかのclassのサブクラスになる必要がある
+    class Inline < Aozora2Html::Tag
+      def initialize(*_args)
+        super()
       end
     end
   end
 end
-

data/lib/aozora2html/tag/inline_caption.rb

@@ -1,5 +1,8 @@
+# frozen_string_literal: true
+
 class Aozora2Html
   class Tag
+    # インラインキャプション
     class InlineCaption < Aozora2Html::Tag::ReferenceMentioned
       def initialize(parser, target)
         @target = target
@@ -7,9 +10,8 @@ class Aozora2Html
       end
 
       def to_s
-        "<span class=\"caption\">#{@target.to_s}</span>"
+        "<span class=\"caption\">#{@target}</span>"
       end
     end
   end
 end
-

data/lib/aozora2html/tag/inline_font_size.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 class Aozora2Html
   class Tag
+    # インラインフォントサイズ指定用
     class InlineFontSize < Aozora2Html::Tag::ReferenceMentioned
-
       def initialize(parser, target, times, daisho)
         @target = target
         @class = daisho.to_s + times.to_s
@@ -10,9 +12,8 @@ class Aozora2Html
       end
 
       def to_s
-        "<span class=\"#{@class}\" style=\"font-size: #{@style};\">" + @target.to_s + "</span>"
+        "<span class=\"#{@class}\" style=\"font-size: #{@style};\">#{@target}</span>"
       end
     end
   end
 end
-

data/lib/aozora2html/tag/inline_keigakomi.rb

@@ -1,5 +1,8 @@
+# frozen_string_literal: true
+
 class Aozora2Html
   class Tag
+    # インライン罫囲み用
     class InlineKeigakomi < Aozora2Html::Tag::ReferenceMentioned
       def initialize(parser, target)
         @target = target
@@ -7,9 +10,8 @@ class Aozora2Html
       end
 
       def to_s
-        "<span class=\"keigakomi\">#{@target.to_s}</span>"
+        "<span class=\"keigakomi\">#{@target}</span>"
       end
     end
   end
 end
-

data/lib/aozora2html/tag/inline_yokogumi.rb

@@ -1,16 +1,17 @@
+# frozen_string_literal: true
+
 class Aozora2Html
   class Tag
+    # インライン横組み用
     class InlineYokogumi < Aozora2Html::Tag::ReferenceMentioned
-
       def initialize(parser, target)
         @target = target
         super
       end
 
       def to_s
-        "<span class=\"yokogumi\">#{@target.to_s}</span>"
+        "<span class=\"yokogumi\">#{@target}</span>"
       end
     end
   end
 end
-

data/lib/aozora2html/tag/jisage.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 class Aozora2Html
   class Tag
+    # 字下げ用
     class Jisage < Aozora2Html::Tag::Indent
-
       def initialize(parser, width)
         @width = width
         super

data/lib/aozora2html/tag/jizume.rb

@@ -1,5 +1,8 @@
+# frozen_string_literal: true
+
 class Aozora2Html
   class Tag
+    # 字詰め用
     class Jizume < Aozora2Html::Tag::Indent
       include Aozora2Html::Tag::Multiline
 

data/lib/aozora2html/tag/kaeriten.rb

@@ -1,14 +1,16 @@
+# frozen_string_literal: true
+
 class Aozora2Html
   class Tag
+    # 返り点用
     class Kaeriten < Aozora2Html::Tag::Kunten
-
       def initialize(parser, string)
         @string = string
         super
       end
 
       def to_s
-        "<sub class=\"kaeriten\">#{@string.to_s}</sub>"
+        "<sub class=\"kaeriten\">#{@string}</sub>"
       end
     end
   end

data/lib/aozora2html/tag/keigakomi.rb

@@ -1,13 +1,19 @@
-class Aozora2Html::Tag::Keigakomi < Aozora2Html::Tag
-  include Aozora2Html::Tag::Block, Aozora2Html::Tag::Multiline
+# frozen_string_literal: true
 
-  def initialize(parser, size = 1)
-    @size = size
-    super
-  end
+class Aozora2Html
+  class Tag
+    # 罫囲み用
+    class Keigakomi < Aozora2Html::Tag::Block
+      include Aozora2Html::Tag::Multiline
+
+      def initialize(parser, size = 1)
+        @size = size
+        super
+      end
 
-  def to_s
-    "<div class=\"keigakomi\" style=\"border: solid #{@size}px\">"
+      def to_s
+        "<div class=\"keigakomi\" style=\"border: solid #{@size}px\">"
+      end
+    end
   end
 end
-

data/lib/aozora2html/tag/kunten.rb

@@ -1,12 +1,12 @@
+# frozen_string_literal: true
+
 class Aozora2Html
   class Tag
-    class Kunten < Aozora2Html::Tag
-      include Aozora2Html::Tag::Inline
-
+    # 訓点用
+    class Kunten < Aozora2Html::Tag::Inline
       def char_type
         :else # just remove this line
       end
     end
   end
 end
-

data/lib/aozora2html/tag/midashi.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 class Aozora2Html
   class Tag
+    # 見出し用
     class Midashi < Aozora2Html::Tag::ReferenceMentioned
-
       def initialize(parser, target, size, type)
         super
         @target = target

data/lib/aozora2html/tag/multiline.rb

@@ -1,5 +1,8 @@
+# frozen_string_literal: true
+
 class Aozora2Html
   class Tag
+    # 複数行記法用
     module Multiline
     end
   end

data/lib/aozora2html/tag/multiline_caption.rb

@@ -1,14 +1,12 @@
+# frozen_string_literal: true
+
 class Aozora2Html
   class Tag
-    class MultilineCaption < Aozora2Html::Tag
-      include Aozora2Html::Tag::Block, Aozora2Html::Tag::Multiline
-
-      def initialize(parser)
-        super
-      end
-
+    # 複数行キャプション用
+    class MultilineCaption < Aozora2Html::Tag::Block
+      include Aozora2Html::Tag::Multiline
       def to_s
-        "<div class=\"caption\">"
+        '<div class="caption">'
       end
     end
   end

data/lib/aozora2html/tag/multiline_chitsuki.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 class Aozora2Html
   class Tag
+    # ブロックでの地付き指定用
     class MultilineChitsuki < Aozora2Html::Tag::Chitsuki
       include Aozora2Html::Tag::Multiline
     end
   end
 end
-

data/lib/aozora2html/tag/multiline_jisage.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 class Aozora2Html
   class Tag
+    # ブロックでの字下げ指定用
     class MultilineJisage < Aozora2Html::Tag::Jisage
       include Aozora2Html::Tag::Multiline
     end
   end
 end
-

data/lib/aozora2html/tag/multiline_midashi.rb

@@ -1,9 +1,12 @@
+# frozen_string_literal: true
+
 class Aozora2Html
   class Tag
-    class MultilineMidashi < Aozora2Html::Tag
-      include Aozora2Html::Tag::Block, Aozora2Html::Tag::Multiline
+    # ブロックでの見出し指定用
+    class MultilineMidashi < Aozora2Html::Tag::Block
+      include Aozora2Html::Tag::Multiline
 
-      def initialize(parser,size,type)
+      def initialize(parser, size, type)
         super
         @tag = Utils.create_midashi_tag(size)
         @id = parser.new_midashi_id(size)

data/lib/aozora2html/tag/multiline_style.rb

@@ -1,7 +1,10 @@
+# frozen_string_literal: true
+
 class Aozora2Html
   class Tag
-    class MultilineStyle < Aozora2Html::Tag
-      include Aozora2Html::Tag::Block, Aozora2Html::Tag::Multiline
+    # ブロックでのスタイル指定用
+    class MultilineStyle < Aozora2Html::Tag::Block
+      include Aozora2Html::Tag::Multiline
 
       def initialize(parser, style)
         @style = style
@@ -14,4 +17,3 @@ class Aozora2Html
     end
   end
 end
-

data/lib/aozora2html/tag/multiline_yokogumi.rb

@@ -1,17 +1,14 @@
+# frozen_string_literal: true
+
 class Aozora2Html
   class Tag
-    class MultilineYokogumi < Aozora2Html::Tag
-      include Aozora2Html::Tag::Block, Aozora2Html::Tag::Multiline
-
-      def initialize(parser)
-        super
-      end
+    # ブロックでの横組指定用
+    class MultilineYokogumi < Aozora2Html::Tag::Block
+      include Aozora2Html::Tag::Multiline
 
       def to_s
-        "<div class=\"yokogumi\">"
+        '<div class="yokogumi">'
       end
     end
   end
 end
-
-

data/lib/aozora2html/tag/okurigana.rb

@@ -1,14 +1,16 @@
+# frozen_string_literal: true
+
 class Aozora2Html
   class Tag
+    # 訓点送り仮名用
     class Okurigana < Aozora2Html::Tag::Kunten
-
       def initialize(parser, string)
         @string = string
         super
       end
 
       def to_s
-        "<sup class=\"okurigana\">#{@string.to_s}</sup>"
+        "<sup class=\"okurigana\">#{@string}</sup>"
       end
     end
   end

data/lib/aozora2html/tag/oneline_chitsuki.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
+
 class Aozora2Html
   class Tag
+    # 1行地付き用
     class OnelineChitsuki < Aozora2Html::Tag::Chitsuki
       include Aozora2Html::Tag::OnelineIndent
     end
   end
 end
-
-

data/lib/aozora2html/tag/oneline_indent.rb

@@ -1,2 +1,9 @@
-module Aozora2Html::Tag::OnelineIndent
+# frozen_string_literal: true
+
+class Aozora2Html
+  class Tag
+    # 1行字下げ用
+    module OnelineIndent
+    end
+  end
 end

data/lib/aozora2html/tag/oneline_jisage.rb

@@ -1,5 +1,8 @@
+# frozen_string_literal: true
+
 class Aozora2Html
   class Tag
+    # 1行字下げ用
     class OnelineJisage < Aozora2Html::Tag::Jisage
       include Aozora2Html::Tag::OnelineIndent
     end

data/lib/aozora2html/tag/reference_mentioned.rb

@@ -1,42 +1,43 @@
-# 前方参照でこいつだけは中身をチェックする
-# 子要素を持つAozora2Html::Tag::Inlineは全てこいつのサブクラス
+# frozen_string_literal: true
+
 class Aozora2Html
   class Tag
-    class ReferenceMentioned < Aozora2Html::Tag
-      include Aozora2Html::Tag::Inline
+    # 参照先用
+    #
+    # 前方参照でこいつだけは中身をチェックする
+    # 子要素を持つAozora2Html::Tag::Inlineは全てこいつのサブクラス
+    class ReferenceMentioned < Aozora2Html::Tag::Inline
       attr_accessor :target
 
-      def initialize(*args)
-        if defined?(@target) && block_element?(@target)
-          syntax_error
-        end
+      def initialize(*_args) # rubocop:disable Lint/MissingSuper
+        return unless defined?(@target) && block_element?(@target)
+
+        syntax_error
       end
 
       def block_element?(elt)
-        if elt.is_a?(Array)
-          elt.each do |x|
-            if block_element?(x)
-              return true
-            end
-          end
-          nil
-        elsif elt.is_a?(String)
-          elt.match(/<div/)
+        case elt
+        when Array
+          elt.any? { |x| block_element?(x) }
+        when String
+          elt.include?('<div')
         else
           elt.is_a?(Aozora2Html::Tag::Block)
         end
       end
 
       def target_string
-        if @target.is_a?(Aozora2Html::Tag::ReferenceMentioned)
+        case @target
+        when Aozora2Html::Tag::ReferenceMentioned
           @target.target_string
-        elsif @target.is_a?(Array)
-          @target.collect{|x|
+        when Array
+          @target.collect do |x|
             if x.is_a?(Aozora2Html::Tag::ReferenceMentioned)
               x.target_string
             else
               x
-            end}.to_s
+            end
+          end.join
         else
           @target
         end