narou 3.4.8 → 3.7.0

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.8"
+  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
@@ -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,13 +32,12 @@ Gem::Specification.new do |gem|
   install_message = <<-EOS
 #{"*" * 60}
 
-3.4.8: 2019/11/27
+3.7.0: 2021/01/23
 -----------------
 #### 修正内容
-- 小説タイトルが長すぎる場合、backup コマンドでファイルを作成した際にエラーが
-  出るため、ファイル名を端折る処理を導入
-- `デスマーチからはじまる異世界狂想曲` のプリセットファイルにバグが混入していた
-  のを修正
+- Apple Silicon 搭載 Mac でも動く様にライブラリをアップデート
+- device を kobo に設定し、_ebook-filename-length-limit でファイル名が制限され
+  た場合に send コマンドが正常に実行できない不具合を修正
 
 #{"*" * 60}
   EOS
@@ -54,16 +53,27 @@ 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 '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 'sass', '~> 3.4', '>= 3.4.18'
+  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'
+  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.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'
+  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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: narou
 version: !ruby/object:Gem::Version
-  version: 3.4.8
+  version: 3.7.0
 platform: ruby
 authors:
 - whiteleaf7
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-11-27 00:00:00.000000000 Z
+date: 2021-01-22 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
@@ -171,25 +171,39 @@ dependencies:
       - !ruby/object:Gem::Version
         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'
+        version: '2.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !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: 3.4.18
+        version: 1.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.18
+        version: 1.4.2
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -282,16 +296,22 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        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: '8.0'
 - !ruby/object:Gem::Dependency
   name: unicode-display_width
   requirement: !ruby/object:Gem::Requirement
@@ -306,6 +326,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.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.10'
+- !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,13 +695,12 @@ metadata: {}
 post_install_message: |
   ************************************************************
 
-  3.4.8: 2019/11/27
+  3.7.0: 2021/01/23
   -----------------
   #### 修正内容
-  - 小説タイトルが長すぎる場合、backup コマンドでファイルを作成した際にエラーが
-    出るため、ファイル名を端折る処理を導入
-  - `デスマーチからはじまる異世界狂想曲` のプリセットファイルにバグが混入していた
-    のを修正
+  - Apple Silicon 搭載 Mac でも動く様にライブラリをアップデート
+  - device を kobo に設定し、_ebook-filename-length-limit でファイル名が制限され
+    た場合に send コマンドが正常に実行できない不具合を修正
 
   ************************************************************
 rdoc_options: []
@@ -572,8 +717,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Narou.rb ― 小説家になろうダウンローダ＆縦書用整形スクリプト
 test_files: []