narou 1.6.4 → 1.7.0

data/lib/command/mail.rb

@@ -45,7 +45,7 @@ module Command
       database = Database.instance
       begin
         mailer = Mailer.create
-      rescue Mailer::SettingNotFound => e
+      rescue Mailer::SettingNotFound
         install_mailer_setting
         return
       rescue Mailer::SettingUncompleteError => e
@@ -73,13 +73,13 @@ module Command
             next   # すでに送信済みなので送信しない
           end
         end
-        unless File.exists?(ebook_path)
+        unless File.exist?(ebook_path)
           error "まだファイル(#{File.basename(ebook_path)})が無いようです" unless send_all
           next
         end
         id = data["id"]
         title = data["title"]
-        puts "<bold><green>ID:#{id}　#{TermColor.escape(title)}</green></bold>".termcolor
+        puts "<bold><green>ID:#{id}　#{TermColorLight.escape(title)}</green></bold>".termcolor
         print "メールを送信しています"
         exit_mail = false
         mail_result = nil
@@ -120,7 +120,7 @@ module Command
 
     def alter_database_add_column_last_mail_date
       database = Database.instance
-      database.each do |id, data|
+      database.each do |_, data|
         data["last_mail_date"] ||= Time.now
       end
       database.save_database

data/lib/command/remove.rb

@@ -51,10 +51,9 @@ module Command
 
     def execute(argv)
       super
-      novels = []
       if @options["all-ss"]
         novels = get_all_short_story
-        if novels.count == 0
+        if novels.size == 0
           puts "短編小説がひとつもありません"
           return
         end
@@ -81,7 +80,7 @@ module Command
           next unless Helper.confirm("#{title} を#{(@options["with-file"] ? "“完全に”" : "")}削除しますか")
         end
         Downloader.remove_novel(target, @options["with-file"])
-        puts "<bold><green>#{TermColor.escape(title)} を削除しました</green></bold>".termcolor
+        puts "<bold><green>#{TermColorLight.escape(title)} を削除しました</green></bold>".termcolor
       end
     end
   end

data/lib/command/send.rb

@@ -84,13 +84,13 @@ module Command
           error "#{target} は存在しません"
           next
         end
-        unless File.exists?(ebook_path)
+        unless File.exist?(ebook_path)
           error "まだファイル(#{File.basename(ebook_path)})が無いようです" unless send_all
           next
         end
         if send_all
           if device.ebook_file_old?(ebook_path)
-            puts "<bold><green>ID:#{target}　#{TermColor.escape(titles[target])}</green></bold>".termcolor
+            puts "<bold><green>ID:#{target}　#{TermColorLight.escape(titles[target])}</green></bold>".termcolor
           else
             next
           end
@@ -114,7 +114,7 @@ module Command
           exit 1   # next しても次も失敗すると分かりきっているためここで終了する
         end
       end
-    rescue Interrupt => e
+    rescue Interrupt
       puts "送信を中断しました"
       exit 1
     end

data/lib/command/tag.rb

@@ -56,7 +56,7 @@ module Command
       }
       @opt.on("-c", "--color COL", String,
               "タグの色を自分で指定する\n" \
-              "#{' '*25}COL=#{get_color_list}".termcolor) { |color|
+              "#{' '*25}COL=#{get_color_list}") { |color|
         color.downcase!
         unless COLORS.include?(color)
           error "#{color}という色は存在しません。色指定は無視されます"
@@ -72,7 +72,7 @@ module Command
     def get_color_list
       COLORS.map { |color|
         "<bold><#{color}>#{color}</#{color}></bold>"
-      }.join(",")
+      }.join(",").termcolor
     end
 
     def execute(argv)
@@ -110,7 +110,7 @@ module Command
       puts "タグ一覧"
       puts tags_list.map { |tag, count|
         color = Tag.get_color(tag)
-        "<bold><#{color}>#{TermColor.escape(tag)}(#{count})</#{color}></bold>"
+        "<bold><#{color}>#{TermColorLight.escape(tag)}(#{count})</#{color}></bold>"
       }.join(" ").termcolor
     end
 
@@ -145,11 +145,11 @@ module Command
             set_color(tag, @options["color"])
           end
         end
-        if tags.count > 0
+        if tags.size > 0
           print "現在のタグは "
           print tags.map { |tagname|
             color = Tag.get_color(tagname)
-            "<bold><#{color}>#{TermColor.escape(tagname)}</#{color}></bold>"
+            "<bold><#{color}>#{TermColorLight.escape(tagname)}</#{color}></bold>"
           }.join(" ").termcolor
           puts " です"
         end
@@ -163,7 +163,7 @@ module Command
       color = @@tag_colors[tagname]
       return color if color
       last_color = @@tag_colors.values.last || COLORS.last
-      index = (COLORS.index(last_color) + 1) % COLORS.count
+      index = (COLORS.index(last_color) + 1) % COLORS.size
       color = COLORS[index]
       @@tag_colors[tagname] = color
       @@tag_colors.save

data/lib/command/update.rb

@@ -71,8 +71,8 @@ module Command
         result = Downloader.start(target)
         case result.status
         when :ok
-          unless @options["no-convert"] or
-                 (@options["convert-only-new-arrival"] and not result.new_arrivals)
+          unless @options["no-convert"] ||
+                 (@options["convert-only-new-arrival"] && !result.new_arrivals)
             convert_argv = [target]
             convert_argv << "--no-open" if no_open
             Convert.execute!(convert_argv)

data/lib/commandbase.rb

@@ -14,7 +14,7 @@ module Command
       banner = postfixies.split("\n").map.with_index { |postfix, i|
         (i == 0 ? "Usage: " : "   or: ") + "narou #{command_name} #{postfix}"
       }.join("\n")
-      @opt.banner = "<bold><green>#{TermColor.escape(banner)}</green></bold>".termcolor
+      @opt.banner = "<bold><green>#{TermColorLight.escape(banner)}</green></bold>".termcolor
       @options = {}
       # ヘルプを見やすく色付け
       def @opt.help
@@ -25,11 +25,11 @@ module Command
         end
         # Examples のコメント部分
         msg.gsub!(/(#.+)$/) do
-          "<cyan>#{TermColor.escape($1)}</cyan>".termcolor
+          "<cyan>#{TermColorLight.escape($1)}</cyan>".termcolor
         end
         # 文字列部分
         msg.gsub!(/(".+?")/) do
-          "<yellow>#{TermColor.escape($1)}</yellow>".termcolor
+          "<yellow>#{TermColorLight.escape($1)}</yellow>".termcolor
         end
         msg
       end
@@ -87,7 +87,7 @@ module Command
       0
     end
 
-    def self.oneline_help(msg)
+    def self.oneline_help
       ""
     end
 

data/lib/commandline.rb

@@ -9,7 +9,7 @@ require_relative "helper"
 require_relative "inventory"
 
 module CommandLine
-  extend self
+  module_function
 
   def run(argv)
     if Helper.os_windows?

data/lib/converterbase.rb

@@ -12,6 +12,8 @@ require_relative "inspector"
 
 class ConverterBase
   KANJI_NUM = "〇一二三四五六七八九"
+  ENGLISH_SENTENCES_CHARACTERS = /[\w.,!?'" &:;_-]+/
+  ENGLISH_SENTENCES_MIN_LENGTH = 8   # この文字数以上アルファベットが続くと半角のまま
 
   attr_reader :use_dakuten_font
 
@@ -192,7 +194,7 @@ class ConverterBase
       m1 = total.to_s.tr("0-9", KANJI_NUM)
       if m1 =~ /〇{#{lower_digit_zero},}$/
         digits = m1.reverse.scan(/.{1,4}/).map(&:reverse).reverse   # 下の桁から4桁ずつ区切った配列を作成
-        keta = digits.count - 1
+        keta = digits.size - 1
         digits.map.with_index { |nums, keta_i|
           four_digit_num = nums.scan(/./).map.with_index { |d, di|
             next "" if d == "〇"
@@ -245,7 +247,7 @@ class ConverterBase
     target_num = "\d０-９#{KANJI_NUM}十百千万億兆京垓"
     data.gsub!(/[#{target_num}\/／]+/) do |match|
       numerics = match.split(/[\/／]/)
-      case numerics.count
+      case numerics.size
       when 2
         # 分数
         if @setting.enable_transform_fraction
@@ -470,6 +472,8 @@ class ConverterBase
   #
   # force : 強制的に全アルファベットを全角にするか？
   #         false の場合、英文章（半角スペースで区切られた2単語以上）を半角のままにする
+  #         英文の定義： 1. 半角スペースで区切られた２単語以上の文章、
+  #                      2. 一定以上の長さの一文字以上アルファベットを含む文章
   #
   def alphabet_to_zenkaku(data, force = false)
     if force
@@ -477,10 +481,11 @@ class ConverterBase
         match.tr("a-zA-Z", "ａ-ｚＡ-Ｚ")
       end
     else
-     data.gsub!(/[\w.,!?' ]+/) do |match|
-        if match.split(" ").count > 1
+      data.gsub!(ENGLISH_SENTENCES_CHARACTERS) do |match|
+        if match.split(" ").size >= 2 \
+           || (match.length >= ENGLISH_SENTENCES_MIN_LENGTH && match.match(/[a-z]/i))
           @english_sentences << match
-          "［＃英文＝#{@english_sentences.count - 1}］"
+          "［＃英文＝#{@english_sentences.size - 1}］"
         else
           match.tr("a-zA-Z", "ａ-ｚＡ-Ｚ")
         end
@@ -592,7 +597,6 @@ class ConverterBase
     @@count_of_rebuild_container ||= 0
     data.gsub!(/^[ 　\t]*([－―<＜〈-]*)([0-9０-９#{KANJI_NUM}]{1,3})([－―>＞〉-]*)$/) do
       top, chapter, bottom = $1, $2, $3
-      pre, post = $`, $'
       if top != "" && "―－-".include?(top)   # include?は空文字("")だとtrueなのでチェック必須
         top = "― "
         bottom = " ―"
@@ -854,7 +858,7 @@ class ConverterBase
     ten =~ /^[・、]+$/ && (str.include?("｜") || object_of_ruby?(last_char))
   end
 
-  def sesame(str, ten)
+  def sesame(str)
     if str.include?("｜")
       str.sub("｜", "［＃傍点］") + "［＃傍点終わり］"
     else
@@ -880,7 +884,7 @@ class ConverterBase
       # 直前に｜がある場合ルビ化は抑制される
       "#{m1[0...-1]}#{openclose_symbols[0]}#{m2}#{openclose_symbols[1]}"
     when is_sesame?(m1, m2, last_char)
-      sesame(m1, m2)
+      sesame(m1)
     when m1.include?("｜")
       "#{m1.sub(/｜([^｜]*)$/, "［＃ルビ用縦線］\\1")}《#{m2}》"
     when object_of_ruby?(last_char)
@@ -922,9 +926,9 @@ class ConverterBase
   # URL っぽい文字列を一旦別のIDに置き換えてあとで復元することで、変換処理の影響を受けさせない
   #
   def replace_url(data)
-    data.gsub!(URI.regexp) do |match|
+    data.gsub!(URI.regexp(%w(http https))) do |match|
       @url_list << match
-      "［＃ＵＲＬ＝#{@url_list.count - 1}］"
+      "［＃ＵＲＬ＝#{@url_list.size - 1}］"
     end
   end
 
@@ -943,7 +947,7 @@ class ConverterBase
     @illustration.scanner(data) do |chuki|
       next "" unless @setting.enable_illust
       @illust_chuki_list << chuki
-      "［＃挿絵＝#{@illust_chuki_list.count - 1}］\n"
+      "［＃挿絵＝#{@illust_chuki_list.size - 1}］\n"
     end
   end
 
@@ -1089,10 +1093,6 @@ class ConverterBase
     convert_special_characters(data)
     convert_fraction_and_date(data)
     modify_kana_ni_to_kanji_ni(data)
-    if @text_type == "body" || @text_type == "textfile"
-      half_indent_bracket(data)
-      auto_indent(data)
-    end
     convert_dakuten_char_to_font(data)
   end
 
@@ -1128,8 +1128,10 @@ class ConverterBase
     when "postscript"
       return @write_fp if @setting.enable_erase_postscript
     end
+    title_and_author = nil
     if @text_type == "textfile"
-      @write_fp.puts(io.gets + io.gets)   # タイトル・著者名スキップ
+      # タイトル・著者名スキップ
+      title_and_author = io.gets + io.gets
       data = io.read
     else
       data = io.read
@@ -1188,6 +1190,10 @@ class ConverterBase
     rebuild_hankaku_num_and_comma(data)
     rebuild_kome_to_gaiji(data)
     rebuild_force_indent_special_chapter(data)
+    if @text_type == "body" || @text_type == "textfile"
+      half_indent_bracket(data)
+      auto_indent(data)
+    end
     # 再構築された文章にルビがふられる可能性を考慮して、
     # この位置でルビの処理を行う
     narou_ruby(data) if @setting.enable_ruby
@@ -1196,7 +1202,11 @@ class ConverterBase
     # ルビ化されなくて残ったギュメを二重山括弧（の外字）に変換
     convert_double_angle_quotation_to_gaiji(data)
     delete_dust_char(data)
-    data.strip!
+    if title_and_author
+      puts title_and_author
+      data.replace(title_and_author + data)
+    end
+    data.rstrip!
     progressbar.clear if @text_type == "textfile"
     @write_fp
   end

data/lib/database.rb

@@ -55,7 +55,7 @@ class Database
   # データベース初期設定
   #
   def self.init
-    unless File.exists?(ARCHIVE_ROOT_DIR_PATH)
+    unless File.exist?(ARCHIVE_ROOT_DIR_PATH)
       FileUtils.mkdir(ARCHIVE_ROOT_DIR_PATH)
       puts ARCHIVE_ROOT_DIR_PATH + " を作成しました"
     end

data/lib/device.rb

@@ -94,7 +94,7 @@ class Device
     documents_path = get_documents_path
     if documents_path
       dst_path = File.join(documents_path, File.basename(src_file))
-      if File.exists?(dst_path)
+      if File.exist?(dst_path)
         return File.mtime(src_file) > File.mtime(dst_path)
       end
     end

data/lib/device/ibooks.rb

@@ -25,7 +25,7 @@ module Device::Ibooks
       "force.enable_half_indent_bracket" => false,
     })
     @@__ibooks_container_dir = File.expand_path(IBOOKS_CONTAINER_DIR)
-    unless File.exists?(@@__ibooks_container_dir)
+    unless File.exist?(@@__ibooks_container_dir)
       error "iBooksの管理フォルダが見つかりませんでした。" \
             "MacOSX Mavericks以降のiBooksのみ管理に対応しています"
       @@__ibooks_container_dir = nil
@@ -46,7 +46,7 @@ module Device::Ibooks
     end
     @toc_url = @novel_data["toc_url"]
     epubdir_path = get_epubdir_path_in_ibooks_container
-    if epubdir_path && File.exists?(epubdir_path)
+    if epubdir_path && File.exist?(epubdir_path)
       extract_epub(ebook_file_path, epubdir_path)
       puts "iBooksに登録してあるEPUBを更新しました"
     else

data/lib/device/ibunko.rb

@@ -26,12 +26,12 @@ module Device::Ibunko
     dirpath = File.dirname(@converted_txt_path)
     translate_illust_chuki_to_img_tag
     zipfile_path = @converted_txt_path.sub(/.txt$/, @device.ebook_file_ext)
-    File.delete(zipfile_path) if File.exists?(zipfile_path)
+    File.delete(zipfile_path) if File.exist?(zipfile_path)
     Zip::File.open(zipfile_path, Zip::File::CREATE) do |zip|
       zip.add(File.basename(@converted_txt_path), @converted_txt_path)
       illust_dirpath = File.join(dirpath, Illustration::ILLUST_DIR)
       # 挿絵
-      if File.exists?(illust_dirpath)
+      if File.exist?(illust_dirpath)
         Dir.glob(File.join(illust_dirpath, "*")) do |img_path|
           zip.add(File.join(Illustration::ILLUST_DIR, File.basename(img_path)), img_path)
         end

data/lib/diffviewer.rb

@@ -4,7 +4,6 @@
 #
 
 require "diff/lcs"
-require "termcolor"
 
 #
 # 指定されたソースの差分を作成する
@@ -91,7 +90,7 @@ class DiffViewer
   # differ には Diff::LCS.sdiff で処理したものをそのまま渡す
   #
   def calc_levenshtein_distance(differ)
-    differ.reject { |e| e.unchanged? }.count
+    differ.reject { |e| e.unchanged? }.size
   end
 
   #
@@ -113,12 +112,12 @@ class DiffViewer
       if normalized_distance > 0.7
         # 双方の文字列があまりにも似ていない場合、編集部分をカラー化すると
         # 非常に見づらい表示になってしまうので、単純に削除・追加のみ装飾する
-        old_str = TermColor.escape(old_element)
-        new_str = TermColor.escape(new_element)
+        old_str = TermColorLight.escape(old_element)
+        new_str = TermColorLight.escape(new_element)
       else
         line_events.each do |e|
-          os = TermColor.escape(e.old_element) rescue ""
-          ns = TermColor.escape(e.new_element) rescue ""
+          os = TermColorLight.escape(e.old_element) rescue ""
+          ns = TermColorLight.escape(e.new_element) rescue ""
           case e.action
           when "="
             old_str += os
@@ -138,9 +137,9 @@ class DiffViewer
       result = "<bold><red>-#{old_str}</red>\n" \
                "<green>+#{new_str}</green></bold>"
     when "-"
-      result = "<bold><red>-#{TermColor.escape(old_element)}</red></bold>"
+      result = "<bold><red>-#{TermColorLight.escape(old_element)}</red></bold>"
     when "+"
-      result = "<bold><green>+#{TermColor.escape(new_element)}</green></bold>"
+      result = "<bold><green>+#{TermColorLight.escape(new_element)}</green></bold>"
     end
     result.termcolor
   end

data/lib/downloader.rb

@@ -118,7 +118,6 @@ class Downloader
     target = Narou.alias_to_id(target)
     type = get_target_type(target)
     data = nil
-    id = nil
     case type
     when :url, :ncode
       toc_url = get_toc_url(target)
@@ -132,7 +131,7 @@ class Downloader
     id = data["id"]
     file_title = data["file_title"] || data["title"]   # 互換性維持のための処理
     path = File.join(Database.archive_root_path, data["sitename"], file_title)
-    if File.exists?(path)
+    if File.exist?(path)
       return path
     else
       @@database.delete(id)
@@ -325,7 +324,6 @@ class Downloader
     end
   end
 
-
   #
   # ダウンロードを処理本体を起動
   #
@@ -380,7 +378,7 @@ class Downloader
     id_and_title = "#{@id}　#{@title}"
 
     return_status =
-      if update_subtitles.count > 0
+      if update_subtitles.size > 0
         @cache_dir = create_cache_dir if old_toc.length > 0
         begin
           sections_download_and_save(update_subtitles)
@@ -394,7 +392,7 @@ class Downloader
         end
         update_database
         :ok
-      elsif old_toc["subtitles"].count > latest_toc["subtitles"].count
+      elsif old_toc["subtitles"].size > latest_toc["subtitles"].size
         # 削除された節がある（かつ更新がない）場合
         puts "#{id_and_title} は一部の話が削除されています"
         :ok
@@ -419,7 +417,7 @@ class Downloader
       end
     else
       if tags.include?("end")
-        update_database if update_subtitles.count == 0
+        update_database if update_subtitles.size == 0
         $stdout.silence do
           Command::Tag.execute!([@id, "--delete", "end"])
         end
@@ -439,8 +437,8 @@ class Downloader
   #
   def process_digest(old_toc, latest_toc)
     return false unless old_toc["subtitles"]
-    latest_subtitles_count = latest_toc["subtitles"].count
-    old_subtitles_count = old_toc["subtitles"].count
+    latest_subtitles_count = latest_toc["subtitles"].size
+    old_subtitles_count = old_toc["subtitles"].size
     if latest_subtitles_count < old_subtitles_count
       STDOUT.puts "#{latest_toc["title"]}"
       STDOUT.puts "更新後の話数が保存されている話数より減少していることを検知しました"
@@ -730,7 +728,7 @@ class Downloader
         latest_section_timestamp_ymd = __strdate_to_ymd(get_section_file_timestamp(old, latest))
         section_file_name = "#{index} #{old["file_subtitle"]}.yaml"
         section_file_relative_path = File.join(SECTION_SAVE_DIR_NAME, section_file_name)
-        different_check = -> {
+        different_check = lambda do
           latest_info_dummy = latest.dup
           latest_info_dummy["element"] = a_section_download(latest)
           deffer = different_section?(section_file_relative_path, latest_info_dummy)
@@ -741,7 +739,7 @@ class Downloader
             File.utime(now, now, File.join(get_novel_data_dir, section_file_relative_path))
           end
           deffer
-        }
+        end
       end
       if old_subupdate && latest_subupdate
         if old_subupdate == ""
@@ -822,14 +820,14 @@ class Downloader
   # subtitles にダウンロードしたいものをまとめた subtitle info を渡す
   #
   def sections_download_and_save(subtitles)
-    max = subtitles.count
+    max = subtitles.size
     return if max == 0
-    puts ("<bold><green>" + TermColor.escape("ID:#{@id}　#{get_title} のDL開始") + "</green></bold>").termcolor
+    puts "<bold><green>#{"ID:#{@id}　#{get_title}".escape} のDL開始</green></bold>".termcolor
     save_least_one = false
     subtitles.each_with_index do |subtitle_info, i|
       index, subtitle, file_subtitle, chapter = %w(index subtitle file_subtitle chapter).map { |k|
-                                                  subtitle_info[k]
-                                                }
+        subtitle_info[k]
+      }
       unless chapter.empty?
         puts "#{chapter}"
       end
@@ -844,9 +842,9 @@ class Downloader
       print "#{subtitle} (#{i+1}/#{max})"
       info = subtitle_info.dup
       info["element"] = a_section_download(subtitle_info)
-      section_file_name = "#{info["index"]} #{info["file_subtitle"]}.yaml"
+      section_file_name = "#{index} #{file_subtitle}.yaml"
       section_file_relative_path = File.join(SECTION_SAVE_DIR_NAME, section_file_name)
-      if File.exists?(File.join(get_novel_data_dir, section_file_relative_path))
+      if File.exist?(File.join(get_novel_data_dir, section_file_relative_path))
         if @force
           if different_section?(section_file_relative_path, info)
             print " (更新あり)"
@@ -873,7 +871,7 @@ class Downloader
   #
   def different_section?(old_relative_path, new_subtitle_info)
     path = File.join(get_novel_data_dir, old_relative_path)
-    if File.exists?(path)
+    if File.exist?(path)
       return YAML.load_file(path)["element"] != new_subtitle_info["element"]
     else
       return true
@@ -885,7 +883,7 @@ class Downloader
   #
   def move_to_cache_dir(relative_path)
     path = File.join(get_novel_data_dir, relative_path)
-    if File.exists?(path) && @cache_dir
+    if File.exist?(path) && @cache_dir
       FileUtils.mv(path, @cache_dir)
     end
   end
@@ -982,7 +980,7 @@ class Downloader
 
   def init_raw_dir
     path = get_raw_dir
-    FileUtils.mkdir_p(path) unless File.exists?(path)
+    FileUtils.mkdir_p(path) unless File.exist?(path)
   end
 
   #
@@ -1062,7 +1060,7 @@ class Downloader
   def save_novel_data(filename, object)
     path = File.join(get_novel_data_dir, filename)
     dir_path = File.dirname(path)
-    unless File.exists?(dir_path)
+    unless File.exist?(dir_path)
       FileUtils.mkdir_p(dir_path)
     end
     File.write(path, YAML.dump(object))
@@ -1083,15 +1081,15 @@ class Downloader
   def init_novel_dir
     novel_dir_path = get_novel_data_dir
     file_title = File.basename(novel_dir_path)
-    FileUtils.mkdir_p(novel_dir_path) unless File.exists?(novel_dir_path)
+    FileUtils.mkdir_p(novel_dir_path) unless File.exist?(novel_dir_path)
     default_settings = NovelSetting::DEFAULT_SETTINGS
     special_preset_dir = File.join(Narou.get_preset_dir, @setting["domain"], @setting["ncode"])
-    exists_special_preset_dir = File.exists?(special_preset_dir)
+    exists_special_preset_dir = File.exist?(special_preset_dir)
     [NovelSetting::INI_NAME, "converter.rb", NovelSetting::REPLACE_NAME].each do |filename|
       if exists_special_preset_dir
         preset_file_path = File.join(special_preset_dir, filename)
-        if File.exists?(preset_file_path)
-          unless File.exists?(File.join(novel_dir_path, filename))
+        if File.exist?(preset_file_path)
+          unless File.exist?(File.join(novel_dir_path, filename))
             FileUtils.cp(preset_file_path, novel_dir_path)
           end
           next