narou 3.6.0 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9fcbe89c262fd6d8234351075c7bb9228498751df529c4f6def90d45cb6bca6
-  data.tar.gz: 1d3033f43c00d3dcfe3fcace49bc8e24915b91965716214ffe3e19a7b0a0f392
+  metadata.gz: 9e7602ba2d969aaf94fd33d0a1ba7f706149861cb90b6d7924cc2c8f66081416
+  data.tar.gz: 5d0dc68095c855a69a3af7837949a2902bd2509cf6febae7d8c9589ea1fef301
 SHA512:
-  metadata.gz: 11d21bbf7d64ce68a99e61988ca1c79f74b61832af90a52aea62d9a1e5e270164c7d364eca64188af5c390bdcb4beeefc633089f5fc6b27a084aa7d6d1848b5f
-  data.tar.gz: 39222977f49fc571f61d617503a4d14af9b8072f7f83265330b3244682e3fc38644ee644388a85ab65a6d4e5da9fee2b22e85134df502afc2deb1e48677fd59b
+  metadata.gz: f9f48b127ae554760619b1cfdbd61041b3284ee675a9c6a00fb91adfe54968d8c0f5f776eee036bdf8fadb59308169a2732ac0413c3da3223e18c0fbe0bc83fa
+  data.tar.gz: c368440c723fec9af88932da94755d787720bddf393413467ddbcb86c39b41cdb629e980b79f76db6acc8b7715cd55b41a4e20f998a975caf75259434dd8d46a

data/ChangeLog.md

@@ -1,6 +1,13 @@
 更新履歴 - ChangeLog
 ====================
 
+3.7.0: 2021/01/23
+-----------------
+#### 修正内容
+- Apple Silicon 搭載 Mac でも動く様にライブラリをアップデート
+- device を kobo に設定し、_ebook-filename-length-limit でファイル名が制限され
+  た場合に send コマンドが正常に実行できない不具合を修正
+
 3.6.0: 2021/01/02
 -----------------
 #### 修正内容

data/Gemfile.lock

@@ -1,10 +1,11 @@
 PATH
   remote: .
   specs:
-    narou (3.5.1)
-      activesupport (>= 5.2, < 7.0)
+    narou (3.7.0)
+      activesupport (>= 6.1, < 8.0)
       diff-lcs (~> 1.2, >= 1.2.5)
       erubis (~> 2.7)
+      ffi (>= 1.4.2)
       haml (>= 5.1.2, < 6)
       mail (~> 2.6.0, >= 2.6.6)
       memoist (~> 0.11.0)
@@ -23,7 +24,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.0)
+    activesupport (6.1.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -32,16 +33,16 @@ GEM
     awesome_print (1.8.0)
     byebug (11.1.3)
     coderay (1.1.3)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.8)
     diff-lcs (1.4.4)
-    docile (1.3.4)
+    docile (1.3.5)
     erubis (2.7.0)
-    ffi (1.13.1)
-    ffi (1.13.1-java)
+    ffi (1.14.2)
+    ffi (1.14.2-java)
     haml (5.2.1)
       temple (>= 0.8.0)
       tilt
-    i18n (1.8.6)
+    i18n (1.8.7)
       concurrent-ruby (~> 1.0)
     mail (2.6.6)
       mime-types (>= 1.16, < 4)
@@ -50,7 +51,7 @@ GEM
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2020.1104)
-    minitest (5.14.2)
+    minitest (5.14.3)
     multi_json (1.15.0)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
@@ -70,28 +71,28 @@ GEM
     rack (2.2.3)
     rack-protection (2.1.0)
       rack
-    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)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
+      rspec-support (~> 3.10.0)
     rspec-retry (0.6.2)
       rspec-core (> 3.3)
-    rspec-support (3.9.3)
+    rspec-support (3.10.1)
     rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
-    ruby2_keywords (0.0.2)
+    ruby2_keywords (0.0.4)
     rubyzip (2.3.0)
     sassc (2.4.0)
       ffi (~> 1.9)
-    simplecov (0.20.0)
+    simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
@@ -114,7 +115,7 @@ GEM
     temple (0.8.2)
     termcolorlight (1.1.1)
     tilt (2.0.10)
-    timecop (0.9.1)
+    timecop (0.9.2)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unicode-display_width (1.7.0)
@@ -130,7 +131,7 @@ DEPENDENCIES
   narou!
   pry (~> 0.12)
   pry-byebug (~> 3.8)
-  rspec (~> 3.9)
+  rspec (~> 3.10)
   rspec-retry (~> 0.6)
   rspec_junit_formatter (~> 0.4)
   simplecov (~> 0.20)

data/README.md

@@ -34,6 +34,14 @@ Narou.rb - 小説家になろうのダウンローダ＆縦書き整形＆管理
 更新履歴 - ChangeLog
 --------------------
 
+3.7.0: 2021/01/23
+-----------------
+#### 修正内容
+- Apple Silicon 搭載 Mac でも動く様にライブラリをアップデート
+- device を kobo に設定し、_ebook-filename-length-limit でファイル名が制限され
+  た場合に send コマンドが正常に実行できない不具合を修正
+
+
 3.6.0: 2021/01/02
 -----------------
 #### 修正内容

data/lib/command/setting.rb

@@ -537,8 +537,8 @@ module Command
         "webui.theme" => {
           type: :select, help: "WEB UI 用テーマ選択",
           invisible: true,
-          select_keys: Narou.get_theme_names,
-          select_summaries: Narou.get_theme_names,
+          select_keys: Narou.theme_names,
+          select_summaries: Narou.theme_names,
           tab: :webui
         },
         "webui.table.reload-timing" => {

data/lib/helper.rb

@@ -350,10 +350,10 @@ module Helper
   # 長過ぎるファイルパスを詰める
   # ファイル名部分のみを詰める。拡張子は維持する
   #
-  def truncate_path(path, limit = Inventory.load["filename-length-limit"])
+  def truncate_path(path, limit = Inventory.load["filename-length-limit"], extname: nil)
     limit ||= FILENAME_LENGTH_LIMIT
     dirname = File.dirname(path)
-    extname = File.extname(path)
+    extname ||= File.extname(path)
     basename = File.basename(path, extname)
     if basename.length > limit
       basename = basename[0...limit]

data/lib/narou.rb

@@ -38,330 +38,336 @@ module Narou
 
   extend Mixin::Locker
 
- class << self
-  extend Memoist
+  class << self
+    extend Memoist
 
-  @@is_web = false
+    @@is_web = false
 
-  def last_commit_year
-    2021
-  end
+    def last_commit_year
+      2021
+    end
 
-  def root_dir
-    root = nil
-    path = Dir.pwd
-    drive_letter = ""
-    if Helper.os_windows?
-      path.encode!(Encoding::UTF_8)
-      path.gsub!(/^[a-z]:/i, "")
-      drive_letter = $&
-    end
-    while path != ""
-      if File.directory?("#{drive_letter}#{path}/#{LOCAL_SETTING_DIR_NAME}")
-        root = drive_letter + path
-        break
+    def root_dir
+      root = nil
+      path = Dir.pwd
+      drive_letter = ""
+      if Helper.os_windows?
+        path.encode!(Encoding::UTF_8)
+        path.gsub!(/^[a-z]:/i, "")
+        drive_letter = $&
+      end
+      while path != ""
+        if File.directory?("#{drive_letter}#{path}/#{LOCAL_SETTING_DIR_NAME}")
+          root = drive_letter + path
+          break
+        end
+        path.gsub!(%r!/[^/]*$!, "")
       end
-      path.gsub!(%r!/[^/]*$!, "")
+      Pathname(root) if root
     end
-    Pathname(root) if root
-  end
-  memoize :root_dir
+    memoize :root_dir
 
-  def local_setting_dir
-    root_dir&.join(LOCAL_SETTING_DIR_NAME)
-  end
-  memoize :local_setting_dir
+    def local_setting_dir
+      root_dir&.join(LOCAL_SETTING_DIR_NAME)
+    end
+    memoize :local_setting_dir
 
-  def global_setting_dir
-    if root_dir
-      dir = root_dir.join(GLOBAL_SETTING_DIR_NAME)
-      return dir if dir.directory?
+    def global_setting_dir
+      if root_dir
+        dir = root_dir.join(GLOBAL_SETTING_DIR_NAME)
+        return dir if dir.directory?
+      end
+      dir = Pathname(GLOBAL_SETTING_DIR_NAME).expand_path("~")
+      dir.mkdir unless dir.exist?
+      dir
     end
-    dir = Pathname(GLOBAL_SETTING_DIR_NAME).expand_path("~")
-    dir.mkdir unless dir.exist?
-    dir
-  end
-  memoize :global_setting_dir
+    memoize :global_setting_dir
 
-  def script_dir
-    Pathname(__dir__).join("..").expand_path
-  end
-  memoize :script_dir
+    def script_dir
+      Pathname(__dir__).join("..").expand_path
+    end
+    memoize :script_dir
 
-  def log_dir
-    root_dir&.join(LOG_DIR)
-  end
+    def log_dir
+      root_dir&.join(LOG_DIR)
+    end
 
-  def preset_dir
-    script_dir&.join(PRESET_DIR)
-  end
-  memoize :preset_dir
+    def preset_dir
+      script_dir&.join(PRESET_DIR)
+    end
+    memoize :preset_dir
 
-  def already_init?
-    root_dir.present?
-  end
+    def already_init?
+      root_dir.present?
+    end
 
-  def init
-    return nil if already_init?
-    FileUtils.mkdir(LOCAL_SETTING_DIR_NAME)
-    puts "#{LOCAL_SETTING_DIR_NAME}/ を作成しました"
-    Database.init
-  end
+    def init
+      return nil if already_init?
+      FileUtils.mkdir(LOCAL_SETTING_DIR_NAME)
+      puts "#{LOCAL_SETTING_DIR_NAME}/ を作成しました"
+      Database.init
+    end
 
-  #
-  # target が alias だった場合はIDに変換する
-  #
-  # 全てのtarget照合系はこのメソッドを通過するので、ここで小文字にしてしまう
-  #
-  def alias_to_id(target)
-    aliases = Inventory.load("alias")
-    if aliases[target]
-      return aliases[target]
-    end
-    target.kind_of?(Numeric) ? target : target.downcase
-  end
+    #
+    # target が alias だった場合はIDに変換する
+    #
+    # 全てのtarget照合系はこのメソッドを通過するので、ここで小文字にしてしまう
+    #
+    def alias_to_id(target)
+      aliases = Inventory.load("alias")
+      if aliases[target]
+        return aliases[target]
+      end
+      target.is_a?(Numeric) ? target : target.downcase
+    end
 
-  def novel_frozen?(target)
-    id = Downloader.get_id_by_target(target) or return false
-    Inventory.load("freeze").include?(id)
-  end
+    def novel_frozen?(target)
+      id = Downloader.get_id_by_target(target) or return false
+      Inventory.load("freeze").include?(id)
+    end
 
-  def create_aozoraepub3_jar_path(*paths)
-    Pathname(File.expand_path(File.join(*paths, AOZORAEPUB3_JAR_NAME)))
-  end
+    def create_aozoraepub3_jar_path(*paths)
+      Pathname(File.expand_path(File.join(*paths, AOZORAEPUB3_JAR_NAME)))
+    end
 
-  def aozoraepub3_directory?(path)
-    create_aozoraepub3_jar_path(path).exist?
-  end
+    def aozoraepub3_directory?(path)
+      create_aozoraepub3_jar_path(path).exist?
+    end
 
-  def parse_replace_txt(text)
-    pattern = []
-    text.each_line do |line|
-      line.sub!(/[\r\n]+\z/, "")
-      next if line[0] == ";"    # コメント記号
-      pair = line.split("\t", 2)
-      if pair.length == 2 && pair[0]
-        pattern << pair
+    def parse_replace_txt(text)
+      pattern = []
+      text.each_line do |line|
+        line.sub!(/[\r\n]+\z/, "")
+        next if line[0] == ";" # コメント記号
+        pair = line.split("\t", 2)
+        if pair.length == 2 && pair[0]
+          pattern << pair
+        end
       end
+      pattern
     end
-    pattern
-  end
 
-  def write_replace_txt(path, pairs)
-    buffer = pairs.each_with_object("\t").map(&:join).join("\n")
-    File.write(path, buffer)
-  end
+    def write_replace_txt(path, pairs)
+      buffer = pairs.each_with_object("\t").map(&:join).join("\n")
+      File.write(path, buffer)
+    end
 
-  def load_global_replace_pattern
-    path = root_dir.join(GLOBAL_REPLACE_NAME)
-    pairs =
-      if path.exist?
-        Helper::CacheLoader.memo(path) do |text|
-          parse_replace_txt(text)
+    def load_global_replace_pattern
+      path = root_dir.join(GLOBAL_REPLACE_NAME)
+      pairs =
+        if path.exist?
+          Helper::CacheLoader.memo(path) do |text|
+            parse_replace_txt(text)
+          end
+        else
+          []
         end
-      else
-        []
-      end
-    @@global_replace_pattern_pairs = pairs
-    pairs
-  end
+      @@global_replace_pattern_pairs = pairs
+      pairs
+    end
 
-  def global_replace_pattern
-    @@global_replace_pattern_pairs ||= load_global_replace_pattern
-  end
+    def global_replace_pattern
+      @@global_replace_pattern_pairs ||= load_global_replace_pattern
+    end
 
-  def save_global_replace_pattern
-    path = root_dir.join(GLOBAL_REPLACE_NAME)
-    write_replace_txt(path, @@global_replace_pattern_pairs)
-  end
+    def save_global_replace_pattern
+      path = root_dir.join(GLOBAL_REPLACE_NAME)
+      write_replace_txt(path, @@global_replace_pattern_pairs)
+    end
 
-  #
-  # AozoraEpub3 の実行ファイル(.jar)のフルパス取得
-  # 検索順序
-  # 1. グローバルセッティング (global_setting aozoraepub3dir)
-  # 2. 小説保存ディレクトリ(Narou.root_dir) 直下の AozoraEpub3
-  # 3. スクリプト保存ディレクトリ(Narou.script_dir) 直下の AozoraEpub3
-  #
-  def aozoraepub3_path
-    global_setting_aozora_path = Inventory.load("global_setting", :global)["aozoraepub3dir"]
-    if global_setting_aozora_path
-      aozora_jar_path = create_aozoraepub3_jar_path(global_setting_aozora_path)
-      if aozora_jar_path.exist?
-        return aozora_jar_path
+    #
+    # AozoraEpub3 の実行ファイル(.jar)のフルパス取得
+    # 検索順序
+    # 1. グローバルセッティング (global_setting aozoraepub3dir)
+    # 2. 小説保存ディレクトリ(Narou.root_dir) 直下の AozoraEpub3
+    # 3. スクリプト保存ディレクトリ(Narou.script_dir) 直下の AozoraEpub3
+    #
+    def aozoraepub3_path
+      global_setting_aozora_path = Inventory.load("global_setting", :global)["aozoraepub3dir"]
+      if global_setting_aozora_path
+        aozora_jar_path = create_aozoraepub3_jar_path(global_setting_aozora_path)
+        if aozora_jar_path.exist?
+          return aozora_jar_path
+        end
       end
-    end
-    [Narou.root_dir, Narou.script_dir].each do |dir|
-      aozora_jar_path = create_aozoraepub3_jar_path(dir, AOZORAEPUB3_DIR)
-      return aozora_jar_path if aozora_jar_path.exist?
-    end
-    nil
-  end
-  memoize :aozoraepub3_path
-
-  #
-  # 書籍ファイル名を生成する
-  # convert.filename-to-ncode を設定している場合に novel_data に ncode、domain を
-  # 設定しない場合は id カラムが必須
-  #
-  def create_novel_filename(novel_data, ext = "")
-    filename_to_ncode = Inventory.load("local_setting")["convert.filename-to-ncode"]
-    novel_setting =
-      if novel_data["id"]
-        NovelSetting.load(novel_data["id"])
-      else
-        OpenStruct.new
+      [Narou.root_dir, Narou.script_dir].each do |dir|
+        aozora_jar_path = create_aozoraepub3_jar_path(dir, AOZORAEPUB3_DIR)
+        return aozora_jar_path if aozora_jar_path.exist?
       end
-    if novel_setting.output_filename.present?
-      %!#{novel_setting.output_filename}#{ext}!
-    elsif filename_to_ncode
-      ncode, domain = novel_data["ncode"], novel_data["domain"]
-      if !ncode || !domain
-        id = novel_data["id"]
-        unless id
-          raise ArgumentError, %!novel_data["id"] を設定して下さい!
+      nil
+    end
+    memoize :aozoraepub3_path
+
+    #
+    # 書籍ファイル名を生成する
+    # convert.filename-to-ncode を設定している場合に novel_data に ncode、domain を
+    # 設定しない場合は id カラムが必須
+    #
+    # rubocop:disable Metrics/CyclomaticComplexity
+    # rubocop:disable Metrics/PerceivedComplexity
+    def create_novel_filename(novel_data, ext = "")
+      filename_to_ncode = Inventory.load("local_setting")["convert.filename-to-ncode"]
+      novel_setting =
+        if novel_data["id"]
+          NovelSetting.load(novel_data["id"])
+        else
+          OpenStruct.new
+        end
+      if novel_setting.output_filename.present?
+        %!#{novel_setting.output_filename}#{ext}!
+      elsif filename_to_ncode
+        ncode = novel_data["ncode"]
+        domain = novel_data["domain"]
+        if !ncode || !domain
+          id = novel_data["id"]
+          unless id
+            raise ArgumentError, %!novel_data["id"] を設定して下さい!
+          end
+          site_setting = Downloader.get_sitesetting_by_target(id)
+          ncode = site_setting["ncode"]
+          domain = site_setting["domain"]
         end
-        site_setting = Downloader.get_sitesetting_by_target(id)
-        ncode = site_setting["ncode"]
-        domain = site_setting["domain"]
+        serialized_domain = domain.to_s.gsub(".", "_")
+        %!#{serialized_domain}_#{ncode}#{ext}!
+      else
+        author = Helper.replace_filename_special_chars(
+          novel_setting.novel_author.presence || novel_data["author"],
+          true
+        )
+        title = Helper.replace_filename_special_chars(
+          novel_setting.novel_title.presence || novel_data["title"],
+          true
+        )
+        filename = "[#{author}] #{title}#{ext}"
+        length_limit = Inventory.load["ebook-filename-length-limit"]
+        length_limit ? Helper.truncate_path(filename, length_limit, extname: ext) : filename
       end
-      serialized_domain = domain.to_s.gsub(".", "_")
-      %!#{serialized_domain}_#{ncode}#{ext}!
-    else
-      author = Helper.replace_filename_special_chars(
-        novel_setting.novel_author.presence || novel_data["author"],
-        true
-      )
-      title = Helper.replace_filename_special_chars(
-        novel_setting.novel_title.presence || novel_data["title"],
-        true
-      )
-      filename = "[#{author}] #{title}#{ext}"
-      length_limit = Inventory.load["ebook-filename-length-limit"]
-      length_limit ? Helper.truncate_path(filename, length_limit) : filename
     end
-  end
+    # rubocop:enable Metrics/CyclomaticComplexity
+    # rubocop:enable Metrics/PerceivedComplexity
 
-  def get_mobi_paths(target)
-    get_ebook_file_paths(target, ".mobi")
-  end
+    def get_mobi_paths(target)
+      get_ebook_file_paths(target, ".mobi")
+    end
 
-  def get_ebook_file_paths(target, ext)
-    data = Downloader.get_data_by_target(target)
-    return nil unless data
-    dir = Downloader.get_novel_data_dir_by_target(target)
-    fname = create_novel_filename(data, ext)
-    base = File.basename(fname, ext)
-    get_ebook_file_paths_from_components(dir, base, ext)
-  end
+    def get_ebook_file_paths(target, ext)
+      data = Downloader.get_data_by_target(target)
+      return nil unless data
 
-  def get_ebook_file_paths_from_components(dir, base, ext)
-    paths = [File.join(dir, "#{base}#{ext}")]
-    index = 2
-    while File.exist?(path = File.join(dir, "#{base}_#{index}#{ext}"))
-      paths.push(Pathname(path))
-      index += 1
+      dir = Downloader.get_novel_data_dir_by_target(target)
+      fname = create_novel_filename(data, ext)
+      base = File.basename(fname, ext)
+      get_ebook_file_paths_from_components(dir, base, ext)
     end
-    paths
-  end
 
-  def misc_dir
-    root_dir.join(MISC_DIR)
-  end
+    def get_ebook_file_paths_from_components(dir, base, ext)
+      paths = [File.join(dir, "#{base}#{ext}")]
+      index = 2
+      while File.exist?(path = File.join(dir, "#{base}_#{index}#{ext}"))
+        paths.push(Pathname(path))
+        index += 1
+      end
+      paths
+    end
+
+    def misc_dir
+      root_dir.join(MISC_DIR)
+    end
 
-  require_relative "device"
+    require_relative "device"
 
-  def get_device(device_name = nil)
-    device_name = Inventory.load("local_setting")["device"] unless device_name
-    if device_name && Device.exists?(device_name)
-      return Device.create(device_name)
+    def get_device(device_name = nil)
+      device_name ||= Inventory.load("local_setting")["device"]
+      if device_name && Device.exists?(device_name)
+        return Device.create(device_name)
+      end
+      nil
     end
-    nil
-  end
 
-  def web=(bool)
-    @@is_web = bool
-  end
+    def web=(bool)
+      @@is_web = bool
+    end
 
-  def web?
-    @@is_web
-  end
+    def web?
+      @@is_web
+    end
 
-  def update_sort_key_summaries(left_space = 28)
-    summaries = { "KEY" => "   対象" }.merge(UPDATE_SORT_KEYS)
-    key_max_width = summaries.keys.max_by(&:length).length
-    summaries.map do |(key, summary)|
-      "#{" " * left_space}| #{key.center(key_max_width)} | #{summary}"
-    end.join("\n")
-  end
+    def update_sort_key_summaries(left_space = 28)
+      summaries = { "KEY" => "   対象" }.merge(UPDATE_SORT_KEYS)
+      key_max_width = summaries.keys.max_by(&:length).length
+      summaries.map do |(key, summary)|
+        "#{" " * left_space}| #{key.center(key_max_width)} | #{summary}"
+      end.join("\n")
+    end
 
-  def get_theme
-    Inventory.load("local_setting")["webui.theme"]
-  end
+    def theme
+      Inventory.load("local_setting")["webui.theme"]
+    end
 
-  def get_theme_dir(name = nil)
-    Pathname(File.join([script_dir, "lib/web/public/theme", name].compact))
-  end
+    def get_theme_dir(name = nil)
+      Pathname(File.join([script_dir, "lib/web/public/theme", name].compact))
+    end
 
-  def get_theme_names
-    Dir.glob(get_theme_dir("*")).map do |path|
-      name = File.basename(path)
-      name == "fonts" ? nil : name
-    end.compact
-  end
-  memoize :get_theme_names
+    def theme_names
+      Dir.glob(get_theme_dir("*")).map do |path|
+        name = File.basename(path)
+        name == "fonts" ? nil : name
+      end.compact
+    end
+    memoize :theme_names
 
-  def economy?(mode)
-    eco_modes = Inventory.load("local_setting")["economy"].to_s.split(",").map(&:strip)
-    eco_modes.include?(mode)
-  end
+    def economy?(mode)
+      eco_modes = Inventory.load("local_setting")["economy"].to_s.split(",").map(&:strip)
+      eco_modes.include?(mode)
+    end
 
-  def novel_type_text(type)
-    type == 2 ? "短編" : "連載"
-  end
+    def novel_type_text(type)
+      type == 2 ? "短編" : "連載"
+    end
 
-  #
-  # Narou.rb gem の最新バージョン番号を取得する
-  #
-  # rubygems公式APIによる取得は、WindowsでのSSL証明書問題で取得出来ない
-  # 環境があるため、gemコマンド経由で取得する
-  #
-  def latest_version
-    response = `gem search ^narou$`.split("\n")
-    if response.last =~ /\Anarou \(([0-9.]+).*?\)\z/
-      $1
+    #
+    # Narou.rb gem の最新バージョン番号を取得する
+    #
+    # rubygems公式APIによる取得は、WindowsでのSSL証明書問題で取得出来ない
+    # 環境があるため、gemコマンド経由で取得する
+    #
+    def latest_version
+      response = `gem search ^narou$`.split("\n")
+      if response.last =~ /\Anarou \(([0-9.]+).*?\)\z/
+        $1
+      end
     end
-  end
 
-  def commit_version
-    cv_path = File.expand_path("commitversion", script_dir)
-    File.read(cv_path) if File.exist?(cv_path)
-  end
-  memoize :commit_version
+    def commit_version
+      cv_path = File.expand_path("commitversion", script_dir)
+      File.read(cv_path) if File.exist?(cv_path)
+    end
+    memoize :commit_version
 
-  def kindlegen_path
-    postfix = Helper.os_windows? ? ".exe" : ""
-    aozoraepub3_path.dirname.join("kindlegen#{postfix}")
-  end
-  memoize :kindlegen_path
+    def kindlegen_path
+      postfix = Helper.os_windows? ? ".exe" : ""
+      aozoraepub3_path.dirname.join("kindlegen#{postfix}")
+    end
+    memoize :kindlegen_path
 
-  def line_height(default: LINE_HEIGHT_DEFAULT)
-    global_setting = Inventory.load("global_setting", :global)
-    global_setting["line-height"] || default
-  end
+    def line_height(default: LINE_HEIGHT_DEFAULT)
+      global_setting = Inventory.load("global_setting", :global)
+      global_setting["line-height"] || default
+    end
 
-  def concurrency_enabled?
-    $stdout != $stdout2
-  end
-  memoize :concurrency_enabled?
+    def concurrency_enabled?
+      $stdout != $stdout2
+    end
+    memoize :concurrency_enabled?
 
-  # 同時実行が有効ならキューに積んで、無効なら普通に実行する
-  def concurrency_call(&block)
-    if concurrency_enabled?
-      Worker.push(&block)
-      EXIT_SUCCESS
-    else
-      block.call
+    # 同時実行が有効ならキューに積んで、無効なら普通に実行する
+    def concurrency_call(&block)
+      if concurrency_enabled?
+        Worker.push(&block)
+        EXIT_SUCCESS
+      else
+        block.call
+      end
     end
   end
- end
 end

data/lib/version.rb

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

data/lib/web/appserver.rb

@@ -187,7 +187,7 @@ class Narou::AppServer < Sinatra::Base
     headers "Cache-Control" => "no-cache" if $development
     @bootstrap_theme = case params["webui.theme"]
                        when nil
-                         Narou.get_theme
+                         Narou.theme
                        when ""   # 環境設定画面で未設定が選択された時
                          nil
                        else

data/narou.gemspec

@@ -32,10 +32,12 @@ Gem::Specification.new do |gem|
   install_message = <<-EOS
 #{"*" * 60}
 
-3.6.0: 2021/01/02
+3.7.0: 2021/01/23
 -----------------
 #### 修正内容
-- Ruby 3.0 に対応
+- Apple Silicon 搭載 Mac でも動く様にライブラリをアップデート
+- device を kobo に設定し、_ebook-filename-length-limit でファイル名が制限され
+  た場合に send コマンドが正常に実行できない不具合を修正
 
 #{"*" * 60}
   EOS
@@ -55,16 +57,17 @@ Gem::Specification.new do |gem|
   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 'ffi', '~> 1.4', '>= 1.4.2'
   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', '< 7.0'
+  gem.add_runtime_dependency 'activesupport', '>= 6.1', '< 8.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', '~> 3.10'
   gem.add_development_dependency 'rspec-retry', '~> 0.6'
   gem.add_development_dependency 'rspec_junit_formatter', '~> 0.4'
   gem.add_development_dependency 'timecop', '~> 0.9'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: narou
 version: !ruby/object:Gem::Version
-  version: 3.6.0
+  version: 3.7.0
 platform: ruby
 authors:
 - whiteleaf7
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-02 00:00:00.000000000 Z
+date: 2021-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: termcolorlight
@@ -184,6 +184,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
+- !ruby/object:Gem::Dependency
+  name: ffi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.2
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -278,20 +298,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: unicode-display_width
   requirement: !ruby/object:Gem::Requirement
@@ -326,14 +346,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: rspec-retry
   requirement: !ruby/object:Gem::Requirement
@@ -675,10 +695,12 @@ metadata: {}
 post_install_message: |
   ************************************************************
 
-  3.6.0: 2021/01/02
+  3.7.0: 2021/01/23
   -----------------
   #### 修正内容
-  - Ruby 3.0 に対応
+  - Apple Silicon 搭載 Mac でも動く様にライブラリをアップデート
+  - device を kobo に設定し、_ebook-filename-length-limit でファイル名が制限され
+    た場合に send コマンドが正常に実行できない不具合を修正
 
   ************************************************************
 rdoc_options: []
@@ -696,7 +718,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.2.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Narou.rb ― 小説家になろうダウンローダ＆縦書用整形スクリプト
 test_files: []