narou 3.4.7.1 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40f1f0d7736259e40738de61af66039fd1344c00bd21fb7e30e2cdec8a9d1f86
-  data.tar.gz: 3744f318af16e36ed8018fd948a38f6e03eee6716b4dfc3d8c45e33d56cd0738
+  metadata.gz: b9fcbe89c262fd6d8234351075c7bb9228498751df529c4f6def90d45cb6bca6
+  data.tar.gz: 1d3033f43c00d3dcfe3fcace49bc8e24915b91965716214ffe3e19a7b0a0f392
 SHA512:
-  metadata.gz: 1d1a1e57cc5bf72066079265f6fa2d7b1ebe17f4c822fc8d0338afd6bad661cdc484a5f986e5f6c3702f789c31b19f57d86720140ae06e0e7f5039607e69527a
-  data.tar.gz: b3dafdecd49cf9ccebd2812948377e0bedbabf02a084001eeb941e82ac84d41344a66f534646869e891ba64f40ae51b43b8096898a92774d2e22adc88c518580
+  metadata.gz: 11d21bbf7d64ce68a99e61988ca1c79f74b61832af90a52aea62d9a1e5e270164c7d364eca64188af5c390bdcb4beeefc633089f5fc6b27a084aa7d6d1848b5f
+  data.tar.gz: 39222977f49fc571f61d617503a4d14af9b8072f7f83265330b3244682e3fc38644ee644388a85ab65a6d4e5da9fee2b22e85134df502afc2deb1e48677fd59b

data/.circleci/config.yml

@@ -12,8 +12,8 @@ jobs:
       - checkout
 
       - run:
-          name: Which bundler?
-          command: bundle -v
+          name: Install bundler 2.1.4
+          command: gem install bundler:2.1.4
 
       # Restore bundle cache
       - restore_cache:

data/.rubocop.yml

@@ -8,7 +8,7 @@ AllCops:
     - "narou.gemspec"
     - "spec/**/*"
   DisplayCopNames: true
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.5
 
 Metrics/ClassLength:
   CountComments: false
@@ -30,7 +30,7 @@ Metrics/BlockNesting:
 Metrics/CyclomaticComplexity:
   Max: 8
 
-Metrics/LineLength:
+Layout/LineLength:
   Max: 140
   AllowURI: true
   URISchemes:
@@ -56,9 +56,6 @@ Style/AndOr:
 Style/BlockDelimiters:
   Enabled: false
 
-Style/BracesAroundHashParameters:
-  Enabled: false
-
 Style/CollectionMethods:
   PreferredMethods:
     detect: "detect"
@@ -106,7 +103,7 @@ Style/NumericLiterals:
 
 # has_ から始まるメソッドは許可する
 Naming/PredicateName:
-  NamePrefixBlacklist:
+  ForbiddenPrefixes:
     - "is_"
     - "have_"
   NamePrefix:
@@ -116,7 +113,7 @@ Naming/PredicateName:
 Style/GlobalVars:
   Enabled: false
 
-Layout/IndentFirstHashElement:
+Layout/FirstHashElementIndentation:
   Enabled: false
 
 Layout/LeadingCommentSpace:
@@ -137,7 +134,7 @@ Style/NegatedIf:
 Style/Not:
   Enabled: true
 
-PercentLiteralDelimiters:
+Style/PercentLiteralDelimiters:
   PreferredDelimiters:
     "%":  "!!"
     "%i": "()"
@@ -158,7 +155,7 @@ Style/RedundantReturn:
 Style/RedundantSelf:
   Enabled: false
 
-SignalException:
+Style/SignalException:
   EnforcedStyle: only_raise
 
 Layout/SpaceAfterComma:
@@ -179,10 +176,10 @@ Style/StringLiterals:
 Style/SymbolProc:
   Enabled: true
 
-Layout/Tab:
+Layout/IndentationStyle:
   Enabled: true
 
-Layout/TrailingBlankLines:
+Layout/TrailingEmptyLines:
   Enabled: false
 
 Style/TrailingCommaInArrayLiteral:
@@ -197,7 +194,7 @@ Style/TrivialAccessors:
 Style/UnlessElse:
   Enabled: true
 
-VariableName:
+Naming/VariableName:
   EnforcedStyle: snake_case
 
 Style/WordArray:
@@ -221,13 +218,13 @@ Style/FrozenStringLiteralComment:
 Layout/MultilineOperationIndentation:
   Enabled: false
 
-Layout/IndentHeredoc:
+Layout/HeredocIndentation:
   Enabled: true
 
 Style/NumericPredicate:
   Enabled: false
 
-Lint/HandleExceptions:
+Lint/SuppressedException:
   Enabled: false
 
 Lint/RescueException:
@@ -241,3 +238,6 @@ Style/FormatStringToken:
 
 Layout/EmptyLineAfterGuardClause:
   Enabled: false
+
+Style/StderrPuts:
+  Enabled: false

data/ChangeLog.md

@@ -1,6 +1,35 @@
 更新履歴 - ChangeLog
 ====================
 
+3.6.0: 2021/01/02
+-----------------
+#### 修正内容
+- Ruby 3.0 に対応
+
+
+3.5.1: 2020/03/21
+-----------------
+#### 修正内容
+- 小説家になろう系列の挿絵をダウンロード時に、サムネイル画像を取得するように
+  なってしまっていたのを修正
+- Ruby 2.7 で narou setting -l を実行時に警告が大量に出ていたのを修正
+
+
+3.5.0: 2020/02/16
+-----------------
+#### 修正内容
+- Ruby 2.7 に対応
+
+
+3.4.8: 2019/11/27
+-----------------
+#### 修正内容
+- 小説タイトルが長すぎる場合、backup コマンドでファイルを作成した際にエラーが
+  出るため、ファイル名を端折る処理を導入
+- `デスマーチからはじまる異世界狂想曲` のプリセットファイルにバグが混入していた
+  のを修正
+
+
 3.4.7: 2019/10/06
 -----------------
 #### 修正内容

data/Gemfile

@@ -2,17 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in narou.gemspec
 gemspec
-
-# development gems
-
-gem "rspec"
-gem "rspec-core"
-gem "rspec-retry"
-gem "rspec_junit_formatter"
-gem "timecop"
-gem "pry"
-gem "pry-byebug"
-gem "better_errors"
-gem "binding_of_caller"
-gem "awesome_print"
-gem "simplecov", require: false, group: :test

data/Gemfile.lock

@@ -1,154 +1,140 @@
 PATH
   remote: .
   specs:
-    narou (3.4.6)
-      activesupport (~> 5.2)
+    narou (3.5.1)
+      activesupport (>= 5.2, < 7.0)
       diff-lcs (~> 1.2, >= 1.2.5)
       erubis (~> 2.7)
-      haml (~> 4.0, >= 4.0.7)
+      haml (>= 5.1.2, < 6)
       mail (~> 2.6.0, >= 2.6.6)
       memoist (~> 0.11.0)
       open_uri_redirections (~> 0.2, >= 0.2.1)
       pony (~> 1, >= 1.11)
       rubyzip (~> 2.0, >= 2.0.0)
-      sass (~> 3.4, >= 3.4.18)
-      sinatra (~> 1.4, >= 1.4.5)
-      sinatra-contrib (~> 1.4, >= 1.4.2)
+      sassc (~> 2.4)
+      sinatra (~> 2.0, >= 2.0.8.1)
+      sinatra-contrib (~> 2.0, >= 2.0.8.1)
       systemu (~> 2.6, >= 2.6.5)
       termcolorlight (~> 1.0, >= 1.1.1)
-      tilt (~> 2.0, >= 2.0.1)
+      tilt (~> 2.0, >= 2.0.10)
       unicode-display_width (~> 1.4)
+      webrick (~> 1.7)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.3)
+    activesupport (6.1.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     awesome_print (1.8.0)
-    backports (3.15.0)
-    better_errors (2.5.0)
-      coderay (>= 1.0.0)
-      erubi (>= 1.0.0)
-      rack (>= 0.9.0)
-    binding_of_caller (0.8.0)
-      debug_inspector (>= 0.0.1)
-    byebug (10.0.2)
-    coderay (1.1.2)
-    concurrent-ruby (1.1.5)
-    debug_inspector (0.0.3)
-    diff-lcs (1.3)
-    docile (1.3.1)
-    erubi (1.7.1)
+    byebug (11.1.3)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.7)
+    diff-lcs (1.4.4)
+    docile (1.3.4)
     erubis (2.7.0)
-    ffi (1.9.25)
-    ffi (1.9.25-java)
-    haml (4.0.7)
+    ffi (1.13.1)
+    ffi (1.13.1-java)
+    haml (5.2.1)
+      temple (>= 0.8.0)
       tilt
-    i18n (1.6.0)
+    i18n (1.8.6)
       concurrent-ruby (~> 1.0)
-    json (2.1.0)
-    json (2.1.0-java)
     mail (2.6.6)
       mime-types (>= 1.16, < 4)
     memoist (0.11.0)
-    method_source (0.9.2)
-    mime-types (3.3)
+    method_source (1.0.0)
+    mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.0904)
-    minitest (5.12.2)
-    multi_json (1.13.1)
+    mime-types-data (3.2020.1104)
+    minitest (5.14.2)
+    multi_json (1.15.0)
+    mustermann (1.1.1)
+      ruby2_keywords (~> 0.0.1)
     open_uri_redirections (0.2.1)
     pony (1.13.1)
       mail (>= 2.0)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry (0.12.2-java)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry (0.13.1-java)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
       spoon (~> 0.0)
-    pry-byebug (3.6.0)
-      byebug (~> 10.0)
-      pry (~> 0.10)
-    rack (1.6.11)
-    rack-protection (1.5.5)
+    pry-byebug (3.9.0)
+      byebug (~> 11.0)
+      pry (~> 0.13.0)
+    rack (2.2.3)
+    rack-protection (2.1.0)
       rack
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
-      ffi (~> 1.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-retry (0.6.1)
+      rspec-support (~> 3.9.0)
+    rspec-retry (0.6.2)
       rspec-core (> 3.3)
-    rspec-support (3.8.0)
+    rspec-support (3.9.3)
     rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubyzip (2.0.0)
-    sass (3.7.4)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-    simplecov (0.16.1)
+    ruby2_keywords (0.0.2)
+    rubyzip (2.3.0)
+    sassc (2.4.0)
+      ffi (~> 1.9)
+    simplecov (0.20.0)
       docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    sinatra (1.4.8)
-      rack (~> 1.5)
-      rack-protection (~> 1.4)
-      tilt (>= 1.3, < 3)
-    sinatra-contrib (1.4.7)
-      backports (>= 2.0)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.2)
+    sinatra (2.1.0)
+      mustermann (~> 1.0)
+      rack (~> 2.2)
+      rack-protection (= 2.1.0)
+      tilt (~> 2.0)
+    sinatra-contrib (2.1.0)
       multi_json
-      rack-protection
-      rack-test
-      sinatra (~> 1.4.0)
-      tilt (>= 1.3, < 3)
+      mustermann (~> 1.0)
+      rack-protection (= 2.1.0)
+      sinatra (= 2.1.0)
+      tilt (~> 2.0)
     spoon (0.0.6)
       ffi
     systemu (2.6.5)
+    temple (0.8.2)
     termcolorlight (1.1.1)
-    thread_safe (0.3.6)
-    thread_safe (0.3.6-java)
     tilt (2.0.10)
     timecop (0.9.1)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.6.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (1.7.0)
+    webrick (1.7.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   java
   ruby
 
 DEPENDENCIES
-  awesome_print
-  better_errors
-  binding_of_caller
+  awesome_print (~> 1.8)
   narou!
-  pry
-  pry-byebug
-  rspec
-  rspec-core
-  rspec-retry
-  rspec_junit_formatter
-  simplecov
-  timecop
+  pry (~> 0.12)
+  pry-byebug (~> 3.8)
+  rspec (~> 3.9)
+  rspec-retry (~> 0.6)
+  rspec_junit_formatter (~> 0.4)
+  simplecov (~> 0.20)
+  timecop (~> 0.9)
 
 BUNDLED WITH
-   1.17.2
+   2.2.3

data/README.md

@@ -34,16 +34,10 @@ Narou.rb - 小説家になろうのダウンローダ＆縦書き整形＆管理
 更新履歴 - ChangeLog
 --------------------
 
-3.4.7: 2019/10/06
+3.6.0: 2021/01/02
 -----------------
 #### 修正内容
-- 3.4.6 の修正では更新日時が正常に取れていなかったのを修正
-  - **注意**  
-    3.4.6 で更新した小説の目次データは壊れているので、そのまま 3.4.7 で更新する
-    と大量の再ダウンロードが発生します。目次データを復元するコマンドを用意した
-    のでそれを使用して下さい
-  - コマンドライン上で `narou restore346` を実行すると、壊れた目次データを復元
-    出来ます
+- Ruby 3.0 に対応
 
 ----
 

data/lib/command/backup.rb

@@ -31,7 +31,9 @@ module Command
     end
 
     def create_backup_filename(data)
-      Helper.replace_filename_special_chars(data["title"]) + "_" + Time.now.strftime("%Y%m%d%H%M%S") + ".zip"
+      name = Helper.replace_filename_special_chars(data["title"])
+      name.slice!(-1) while name.bytesize > 180
+      "#{name}_#{Time.now.strftime("%Y%m%d%H%M%S")}.zip"
     end
 
     def create_backup(data)

data/lib/command/setting.rb

@@ -118,7 +118,7 @@ module Command
       settings.each do |scope, scoped_settings|
         stream_io.puts "[#{scope.capitalize} Variables]"
         scoped_settings.each do |name, value|
-          if value =~ / /
+          if value.to_s =~ / /
             value = "'#{value}'"
           end
           stream_io.puts "<bold><green>#{name}</green></bold>=#{value}".termcolor

data/lib/commandbase.rb

@@ -89,7 +89,7 @@ module Command
       tag_index = database.tag_indexies
       all_ids = database.ids
       expanded_array = array.map { |arg|
-        if arg =~ /\A\d+\z/
+        if arg.to_s =~ /\A\d+\z/
           # 優先度はID＞タグのため、数字のみ指定されたら
           # そのIDが存在した場合はIDとみなす
           id = arg.to_i

data/lib/commandline.rb

@@ -51,7 +51,7 @@ module CommandLine
   def argv_for_windows(argv)
     return unless Helper.os_windows?
     argv.map! do |arg|
-      arg&.encode(Encoding::UTF_8)
+      arg.class == Integer ? arg : arg&.encode(Encoding::UTF_8)
     end
   end
 

data/lib/converterbase.rb

@@ -995,7 +995,7 @@ class ConverterBase
   # URL っぽい文字列を一旦別のIDに置き換えてあとで復元することで、変換処理の影響を受けさせない
   #
   def replace_url(data)
-    data.gsub!(URI.regexp(%w(http https))) do |match|
+    data.gsub!(URI::DEFAULT_PARSER.make_regexp(%w(http https))) do |match|
       @url_list << match
       "［＃ＵＲＬ＝#{@url_list.size - 1}］"
     end

data/lib/downloader.rb

@@ -89,7 +89,7 @@ class Downloader
   #
   def self.get_target_type(target)
     case target
-    when URI.regexp
+    when URI::DEFAULT_PARSER.make_regexp
       :url
     when /^n\d+[a-z]+$/i
       target.downcase!
@@ -725,7 +725,7 @@ class Downloader
     cookie = @setting["cookie"] || ""
     open_uri_options = make_open_uri_options("Cookie" => cookie, allow_redirections: :safe)
     begin
-      open(toc_url, open_uri_options) do |toc_fp|
+      URI.open(toc_url, open_uri_options) do |toc_fp|
         if toc_fp.base_uri.to_s != toc_url
           # リダイレクトされた場合。
           # ノクターン・ムーンライトのNコードを ncode.syosetu.com に渡すと、年齢認証のクッションページに飛ばされる
@@ -1092,7 +1092,7 @@ class Downloader
     save_raw_data(raw, subtitle_info, ".html")
     %w(introduction postscript body).each { |type| @setting[type] = nil }
     @setting.multi_match(raw, "body_pattern", "introduction_pattern", "postscript_pattern")
-    element = { "data_type" => "html" }
+    element = { "data_type" => @setting["data_type"] || "html" }
     %w(introduction postscript body).each { |type|
       element[type] = @setting[type].to_s
     }
@@ -1132,7 +1132,7 @@ class Downloader
     cookie = @setting["cookie"] || ""
     begin
       open_uri_options = make_open_uri_options("Cookie" => cookie, allow_redirections: :safe)
-      open(url, "r:#{@setting["encoding"]}", open_uri_options) do |fp|
+      URI.open(url, "r:#{@setting["encoding"]}", open_uri_options) do |fp|
         raw = Helper.pretreatment_source(fp.read, @setting["encoding"])
       end
     rescue OpenURI::HTTPError, Errno::ECONNRESET, Errno::ETIMEDOUT, Net::OpenTimeout => e

data/lib/helper.rb

@@ -464,7 +464,7 @@ module Helper
         fullpath = File.expand_path(path)
         cache_data = @@caches[fullpath]
         if Helper.file_latest?(fullpath) || !cache_data
-          body = File.read(fullpath, options)
+          body = File.read(fullpath, **options)
           @@caches[fullpath] = body
           return body
         else
@@ -493,7 +493,7 @@ module Helper
         key = generate_key(fullpath, block)
         cache = @@result_caches[key]
         if Helper.file_latest?(fullpath) || !cache
-          data = File.read(fullpath, options)
+          data = File.read(fullpath, **options)
           @@result_caches[key] = result = block.call(data)
           return result
         else

data/lib/html.rb

@@ -42,8 +42,8 @@ class HTML
   #
   # 青空文庫形式に変換
   #
-  def to_aozora
-    @string = br_to_aozora
+  def to_aozora(pre_html: false)
+    @string = br_to_aozora unless pre_html
     @string = p_to_aozora
     @string = ruby_to_aozora
     unless @strip_decoration_tag

data/lib/illustration.rb

@@ -27,7 +27,7 @@ class Illustration
     source.gsub!(/［＃挿絵（(.+?)）入る］/) do |match|
       url = $1
       url = "https:#{url}" if url.start_with?("//")
-      if url =~ URI.regexp
+      if url =~ URI::DEFAULT_PARSER.make_regexp
         path = download_image(url)
         path ? block.call(make_illust_chuki(path)) : ""
       else
@@ -53,7 +53,9 @@ class Illustration
     if path = search_image(basename)
       return path
     end
-    open(url, make_open_uri_options(allow_redirections: :safe)) do |fp|
+
+    url = transform_mitemin_url(url)
+    URI.open(url, make_open_uri_options(allow_redirections: :safe)) do |fp|
       content_type = fp.meta["content-type"]
       ext = MIME[content_type] or raise UnknownMIMEType, content_type
       illust_abs_path = create_illust_path(basename) + "." + ext
@@ -77,6 +79,13 @@ class Illustration
     Dir.glob(path)[0]
   end
 
+  def transform_mitemin_url(url)
+    uri = URI.parse(url)
+    return url unless uri.host.end_with?(".mitemin.net")
+
+    url.sub("viewimagebig", "viewimage")
+  end
+
   def create_illust_path(basename)
     illust_abs_dir = File.join(@setting.archive_path, ILLUST_DIR)
     Dir.mkdir(illust_abs_dir) unless File.exist?(illust_abs_dir)

data/lib/loadconverter.rb

@@ -8,10 +8,10 @@ require_relative "helper"
 
 BlankConverter = Class.new(ConverterBase) {}
 
-$converter_container = {}
+$latest_converter = nil
 
 def converter(title, &block)
-  $converter_container[title] = Class.new(ConverterBase, &block)
+  $latest_converter = Class.new(ConverterBase, &block)
 end
 
 #
@@ -61,11 +61,13 @@ end
 def load_converter(title, archive_path)
   converter_path = File.join(archive_path, "converter.rb")
   if File.exist?(converter_path)
+    $latest_converter = nil
     eval(File.read(converter_path, mode: "r:BOM|UTF-8"), binding, converter_path)
   else
     return BlankConverter
   end
-  conv = $converter_container[title] || $converter_container[File.basename(archive_path)]
+
+  conv = $latest_converter
   if conv
     return conv
   else

data/lib/narou.rb

@@ -44,7 +44,7 @@ module Narou
   @@is_web = false
 
   def last_commit_year
-    2019
+    2021
   end
 
   def root_dir

data/lib/narou/api.rb

@@ -54,7 +54,7 @@ module Narou
 
     def request_api(ncodes, limit = BATCH_LIMIT)
       url = "#{@api_url}?gzip=#{GZIP_LEVEL}&ncode=#{ncodes.join("-")}&of=#{@of}&lim=#{limit}&out=json"
-      open(url) do |fp|
+      URI.open(url) do |fp|
         data = Zlib::GzipReader.wrap(fp).read.force_encoding(Encoding::UTF_8)
         results = JSON.parse(data)
         return if results[0]["allcount"].zero?

data/lib/novelconverter.rb

@@ -457,8 +457,8 @@ class NovelConverter
     processing_title = toc["title"]
     processing_title += "_#{index}" if index
     processed_title = decorate_title(processing_title)
-    tempalte_name = (device && device.ibunko? ? NOVEL_TEXT_TEMPLATE_NAME_FOR_IBUNKO : NOVEL_TEXT_TEMPLATE_NAME)
-    Template.get(tempalte_name, binding, 1.1)
+    template_name = (device && device.ibunko? ? NOVEL_TEXT_TEMPLATE_NAME_FOR_IBUNKO : NOVEL_TEXT_TEMPLATE_NAME)
+    Template.get(template_name, binding, 1.1)
   end
 
   #
@@ -698,15 +698,16 @@ class NovelConverter
       if section["chapter"].length > 0
         section["chapter"] = @converter.convert(section["chapter"], "chapter")
       end
+
       @inspector.subtitle = section["subtitle"]
       section["subtitle"] = @converter.convert(section["subtitle"], "subtitle")
       element = section["element"]
       data_type = element.delete("data_type") || "text"
       @converter.data_type = data_type
       element.each do |text_type, elm_text|
-        if data_type == "html"
+        if data_type != "text"
           html.string = elm_text
-          elm_text = html.to_aozora
+          elm_text = html.to_aozora(pre_html: data_type == "pre_html")
         end
         element[text_type] = @converter.convert(elm_text, text_type)
       end

data/lib/novelinfo.rb

@@ -48,7 +48,7 @@ class NovelInfo
     else
       cookie = @setting["cookie"] || ""
       open_uri_options = make_open_uri_options("Cookie" => cookie, allow_redirections: :safe)
-      open(info_url, open_uri_options) do |fp|
+      URI.open(info_url, open_uri_options) do |fp|
         info_source = Helper.restore_entity(Helper.pretreatment_source(fp.read, @setting["encoding"]))
         raise Downloader::DownloaderNotFoundError if Downloader.detect_error_message(@setting, info_source)
       end

data/lib/sitesetting.rb

@@ -24,7 +24,7 @@ class SiteSetting
       load_paths = [
         Narou.script_dir.join(NOVEL_SITE_SETTING_DIR, "*.yaml"),
         Narou.root_dir.join(NOVEL_SITE_SETTING_DIR, "*.yaml")
-      ].uniq.join("\0")
+      ].uniq
       Dir.glob(load_paths) do |path|
         setting = SiteSetting.load_file(path)
         name = setting["name"]

data/lib/version.rb

@@ -5,5 +5,5 @@
 #
 
 module Narou
-  VERSION = "3.4.7.1"
+  VERSION = "3.6.0"
 end

data/lib/web/appserver.rb

@@ -835,8 +835,10 @@ class Narou::AppServer < Sinatra::Base
 
   # ダウンロード登録すると同時にグレーのボタン画像を返す
   get "/api/download4ssl" do
+    target = params["target"] or error("need a parameter: `target'")
+    opt_mail = "--mail" if query_to_boolean(params["mail"])
     Narou::WebWorker.push do
-      CommandLine.run!("download", params["target"])
+      CommandLine.run!("download", target, opt_mail)
       @@push_server.send_all(:"table.reload")
     end
     redirect "/resources/images/dl_button1.gif"

data/lib/web/progressbar4web.rb

@@ -16,8 +16,8 @@ class ProgressBar
 
   alias :original_initialize :initialize
 
-  def initialize(*args)
-    original_initialize(*args)
+  def initialize(*args, **opt)
+    original_initialize(*args, **opt)
     @@push_server.send_all("progressbar.init" => { target_console: io.target_console })
   end
 

data/narou.gemspec

@@ -32,16 +32,10 @@ Gem::Specification.new do |gem|
   install_message = <<-EOS
 #{"*" * 60}
 
-3.4.7: 2019/10/06
+3.6.0: 2021/01/02
 -----------------
 #### 修正内容
-- 3.4.6 の修正では更新日時が正常に取れていなかったのを修正
-  - **注意**
-    3.4.6 で更新した小説の目次データは壊れているので、そのまま 3.4.7 で更新する
-    と大量の再ダウンロードが発生します。目次データを復元するコマンドを用意した
-    のでそれを使用して下さい
-  - コマンドライン上で `narou restore346` を実行すると、壊れた目次データを復元
-    出来ます
+- Ruby 3.0 に対応
 
 #{"*" * 60}
   EOS
@@ -57,16 +51,26 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'mail', '~> 2.6.0', '>= 2.6.6'
   gem.add_runtime_dependency 'pony', '~> 1', '>= 1.11'
   gem.add_runtime_dependency 'diff-lcs', '~> 1.2', '>= 1.2.5'
-  gem.add_runtime_dependency 'sinatra', '~> 1.4', '>= 1.4.5'
-  gem.add_runtime_dependency 'sinatra-contrib', '~> 1.4', '>= 1.4.2'
-  gem.add_runtime_dependency 'tilt', '~> 2.0', '>= 2.0.1'
-  gem.add_runtime_dependency 'sass', '~> 3.4', '>= 3.4.18'
-  gem.add_runtime_dependency 'haml', '~> 4.0', '>= 4.0.7'
+  gem.add_runtime_dependency 'sinatra', '~> 2.0', '>= 2.0.8.1'
+  gem.add_runtime_dependency 'sinatra-contrib', '~> 2.0', '>= 2.0.8.1'
+  gem.add_runtime_dependency 'tilt', '~> 2.0', '>= 2.0.10'
+  gem.add_runtime_dependency 'sassc', '~> 2.4'
+  gem.add_runtime_dependency 'haml', '>= 5.1.2', '< 6'
   gem.add_runtime_dependency 'memoist', '~> 0.11.0'
   gem.add_runtime_dependency 'systemu', '~> 2.6', '>= 2.6.5'
   gem.add_runtime_dependency 'erubis', '~> 2.7'
   gem.add_runtime_dependency 'open_uri_redirections', '~> 0.2', '>= 0.2.1'
-  gem.add_runtime_dependency 'activesupport', '~> 5.2'
+  gem.add_runtime_dependency 'activesupport', '>= 5.2', '< 7.0'
   gem.add_runtime_dependency 'unicode-display_width', '~> 1.4'
+  gem.add_runtime_dependency 'webrick', '~> 1.7'
+
+  gem.add_development_dependency 'rspec', '~> 3.9'
+  gem.add_development_dependency 'rspec-retry', '~> 0.6'
+  gem.add_development_dependency 'rspec_junit_formatter', '~> 0.4'
+  gem.add_development_dependency 'timecop', '~> 0.9'
+  gem.add_development_dependency 'pry', '~> 0.12'
+  gem.add_development_dependency 'pry-byebug', '~> 3.8'
+  gem.add_development_dependency 'awesome_print', '~> 1.8'
+  gem.add_development_dependency 'simplecov', '~> 0.20'
 end
 

data/preset/ncode.syosetu.com/n9902bn/converter.rb

@@ -6,7 +6,7 @@
 # 作者: 愛七ひろ
 # URL: http://ncode.syosetu.com/n9902bn/
 #
-converter "n9902bn デスマーチからはじまる異世界狂想曲（ web版 ）"
+converter "n9902bn デスマーチからはじまる異世界狂想曲（ web版 ）" do
   def before(io, text_type)
     super
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: narou
 version: !ruby/object:Gem::Version
-  version: 3.4.7.1
+  version: 3.6.0
 platform: ruby
 authors:
 - whiteleaf7
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-07 00:00:00.000000000 Z
+date: 2021-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: termcolorlight
@@ -34,22 +34,22 @@ dependencies:
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
@@ -116,40 +116,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.5
+        version: 2.0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.5
+        version: 2.0.8.1
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 2.0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 2.0.8.1
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -159,7 +159,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -169,47 +169,41 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.10
 - !ruby/object:Gem::Dependency
-  name: sass
+  name: sassc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.4.18
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.4.18
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.7
+        version: 5.1.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.7
+        version: 5.1.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: memoist
   requirement: !ruby/object:Gem::Requirement
@@ -282,16 +276,22 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: unicode-display_width
   requirement: !ruby/object:Gem::Requirement
@@ -306,6 +306,132 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.9'
+- !ruby/object:Gem::Dependency
+  name: rspec-retry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: rspec_junit_formatter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.8'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.20'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.20'
 description: 小説家になろうで公開されている小説の管理、及び電子書籍データへの変換を支援します。縦書用に特化されており、横書き用に特化されたWEB小説を違和感なく縦書で読むことが出来るようになります。
 email:
 - 2nd.leaf@gmail.com
@@ -549,16 +675,10 @@ metadata: {}
 post_install_message: |
   ************************************************************
 
-  3.4.7: 2019/10/06
+  3.6.0: 2021/01/02
   -----------------
   #### 修正内容
-  - 3.4.6 の修正では更新日時が正常に取れていなかったのを修正
-    - **注意**
-      3.4.6 で更新した小説の目次データは壊れているので、そのまま 3.4.7 で更新する
-      と大量の再ダウンロードが発生します。目次データを復元するコマンドを用意した
-      のでそれを使用して下さい
-    - コマンドライン上で `narou restore346` を実行すると、壊れた目次データを復元
-      出来ます
+  - Ruby 3.0 に対応
 
   ************************************************************
 rdoc_options: []
@@ -575,7 +695,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Narou.rb ― 小説家になろうダウンローダ＆縦書用整形スクリプト