narou 3.5.0 → 3.7.1

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
 
   #

data/lib/version.rb

@@ -5,5 +5,5 @@
 #
 
 module Narou
-  VERSION = "3.5.0"
+  VERSION = "3.7.1"
 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/narou.gemspec

@@ -32,10 +32,18 @@ Gem::Specification.new do |gem|
   install_message = <<-EOS
 #{"*" * 60}
 
-3.5.0: 2020/02/16
+3.7.1: 2021/04/01
 -----------------
 #### 修正内容
-- Ruby 2.7 に対応
+- その他の小説の最新話掲載日を確認しようとするとクラッシュする不具合を修正
+
+
+3.7.0: 2021/01/23
+-----------------
+#### 修正内容
+- Apple Silicon 搭載 Mac でも動く様にライブラリをアップデート
+- device を kobo に設定し、ebook-filename-length-limit でファイル名が制限され
+  た場合に send コマンドが正常に実行できない不具合を修正
 
 #{"*" * 60}
   EOS
@@ -51,25 +59,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.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'
   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.18'
+  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.5.0
+  version: 3.7.1
 platform: ruby
 authors:
 - whiteleaf7
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-16 00:00:00.000000000 Z
+date: 2021-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: termcolorlight
@@ -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: '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: '3.4'
+        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: '6.1'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: unicode-display_width
   requirement: !ruby/object:Gem::Requirement
@@ -306,20 +326,34 @@ 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'
+        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
@@ -410,14 +444,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.20'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.20'
 description: 小説家になろうで公開されている小説の管理、及び電子書籍データへの変換を支援します。縦書用に特化されており、横書き用に特化されたWEB小説を違和感なく縦書で読むことが出来るようになります。
 email:
 - 2nd.leaf@gmail.com
@@ -661,10 +695,18 @@ metadata: {}
 post_install_message: |
   ************************************************************
 
-  3.5.0: 2020/02/16
+  3.7.1: 2021/04/01
+  -----------------
+  #### 修正内容
+  - その他の小説の最新話掲載日を確認しようとするとクラッシュする不具合を修正
+
+
+  3.7.0: 2021/01/23
   -----------------
   #### 修正内容
-  - Ruby 2.7 に対応
+  - Apple Silicon 搭載 Mac でも動く様にライブラリをアップデート
+  - device を kobo に設定し、ebook-filename-length-limit でファイル名が制限され
+    た場合に send コマンドが正常に実行できない不具合を修正
 
   ************************************************************
 rdoc_options: []
@@ -681,8 +723,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Narou.rb ― 小説家になろうダウンローダ＆縦書用整形スクリプト
 test_files: []