diff --git a/Gemfile.lock b/Gemfile.lock index e5b097a5..8be43645 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - narou (3.9.1) + narou (3.9.1.mod.R1) activesupport (~> 8.0, >= 8.1.0) bootsnap (~> 1.18, >= 1.18.6) csv (~> 3.3) diff --git a/LICENSE.txt b/LICENSE.txt index daf79ca3..eb1ca36c 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -26,7 +26,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ---------------------------------------------------------------------- /** - * bootbox.js v4.3.0 + * bootbox.js v4.4.0 * * The MIT License * @@ -53,32 +53,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ---------------------------------------------------------------------- -dataTables.colVis.js - -MIT license -Copyright (C) 2008-2014, SpryMedia Ltd. - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - ----------------------------------------------------------------------- - -perfect-scrollbar - -The MIT License (MIT) -Copyright (c) 2012, 2014 Hyunje Alex Jun and other contributors. - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - ----------------------------------------------------------------------- - CSS Toggle Switch This is free and unencumbered software released into the public domain. diff --git a/README.md b/README.md index 2b19a0ea..684c7b0b 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,16 @@ -Narou.rb - 小説家になろうのダウンローダ＆縦書き整形＆管理アプリ。Kindle（などの電子書籍端末）でなろうを読む場合に超便利です！ -=================================================================================== +# Narou.rb_MOD - 小説家になろうのダウンローダ＆縦書き整形＆管理アプリ。 -[![Gem Version](https://badge.fury.io/rb/narou.svg)](http://badge.fury.io/rb/narou) -[![Join the chat at https://gitter.im/whiteleaf7/narou](https://badges.gitter.im/whiteleaf7/narou.svg)](https://gitter.im/whiteleaf7/narou?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) +このプロジェクトは下記プロジェクトの派生です。 + +- Original Project : [whiteleaf7/narou](https://github.com/whiteleaf7/narou) + +- Forked from : [Rumia-Channel/narou](https://github.com/Rumia-Channel/narou) + +素晴らしいプロジェクトを作成していただいた、[whiteleaf7](https://github.com/whiteleaf7) さん、[Rumia-Channel](https://github.com/Rumia-Channel) さんに多大なる感謝を。 + + +## 概要 - Summary -概要 - Summary --------------- このアプリは[小説家になろう](http://syosetu.com/)などで公開されている小説の管理、 及び電子書籍データへの変換を支援します。縦書き用に特化されており、 横書きに最適化されたWEB小説を違和感なく縦書きで読むことが出来るようになります。 @@ -21,24 +26,50 @@ Narou.rb - 小説家になろうのダウンローダ＆縦書き整形＆管理 + 暁 http://www.akatsuki-novels.com/ （※300話以上ある作品は未対応） + カクヨム https://kakuyomu.jp/ -コンソールで操作するアプリケーションですが、ブラウザを使って直感的に操作することができる WEB UI も搭載！（[デモページ](http://whiteleaf7.github.io/narou/demo/)） - 主な機能は小説家になろうの小説のダウンロード、更新管理、テキスト整形、AozoraEpub3・kindlegen連携によるEPUB/MOBI出力です。 その他にも変換したデータを直接電子書籍端末へ送信する機能は、メールで送信する機能などもあります。 -詳細な説明やインストール方法は **[Narou.rb 説明書](https://github.com/whiteleaf7/narou/wiki)** を御覧ください。 +詳細な説明やインストール方法は **[Narou.rb_MOD説明書](https://github.com/ponponusa/narou/wiki)** を御覧ください。 + +## 動作要件 - Requirements + +- Ruby 3.4以上（※元プロジェクトから変更されています） + +## 更新履歴 - ChangeLog + +### > 3.9.1.mod.R1 : 2025-10-28 + +#### <更新内容> ※[Rumia-Channel/narou](https://github.com/Rumia-Channel/narou)からの更新点を記載しています -![WEB UI ScreenCapture](https://raw.github.com/wiki/whiteleaf7/narou/images/webui_cap.png) -![Console ScreenCapture](https://raw.github.com/wiki/whiteleaf7/narou/images/narou_cap.gif) +```md +- テキスト/EPUB変換処理の高速化 + - 主に話数の多い（1000話オーバーなど）小説で顕著に効果があります + - ※小説掲載サイトからの取得ロジックに変更はないため、取得速度は変化はありません（変更予定もなし） +- JavaScriptライブラリの更新、変更 + - update jQuery 1.11.1 -> 3.7.1 + - update datatables.js 1.10.10 -> 2.3.4 + - update bootstrap 3.3.5 -> 3.4.1 + - and more... +- Rubyパッケージの更新、変更 + - supported Ruby version 2.3.0~ -> 3.4.0~ + - add puma/bootsnap/and more... + - update sinatra/ActiveSuport/tilt/and more... +- Digest認証からBasic認証に変更 + - Rack3.1から[Digest認証が非対応](https://github.com/ruby-grape/grape/issues/2294)となったため +- その他、細かな修正 +``` -更新履歴 - ChangeLog --------------------- +## TODO -3.9.1: 2024-09-19 ------------------ -#### 修正内容 -- 小説家になろうの目次修正に対応 #432 @etg-lt +- 外部Webサーバを利用しない形でのHTTPS対応 +- bootstrap5への移行 + - bootstrap3系では、jQuery3系に対応していないため + - jQuery migrateを削除したい +- 小説タイトルの自動整形 +- セキュリティリスクのある実装の修正 +- 変換処理の並列化による高速化 + - 今後の最適化のためにもスレッドセーフにする ---- -「小説家になろう」は株式会社ヒナプロジェクトの登録商標です +「小説家になろう」は株式会社ヒナプロジェクトの登録商標です。 diff --git a/lib/version.rb b/lib/version.rb index f8f519e0..39284b15 100644 --- a/lib/version.rb +++ b/lib/version.rb @@ -5,5 +5,5 @@ # module Narou - VERSION = "3.9.1" + VERSION = "3.9.1.mod.R1" end diff --git a/lib/web/public/resources/default-style.css b/lib/web/public/resources/css/default-style.css similarity index 100% rename from lib/web/public/resources/default-style.css rename to lib/web/public/resources/css/default-style.css diff --git a/lib/web/public/resources/toggle-switch.css b/lib/web/public/resources/css/toggle-switch.css similarity index 100% rename from lib/web/public/resources/toggle-switch.css rename to lib/web/public/resources/css/toggle-switch.css diff --git a/lib/web/public/resources/dataTables.colVis.js b/lib/web/public/resources/dataTables.colVis.js deleted file mode 100644 index 03f09f40..00000000 --- a/lib/web/public/resources/dataTables.colVis.js +++ /dev/null @@ -1,1113 +0,0 @@ -/*! ColVis 1.1.2-dev - * ©2010-2014 SpryMedia Ltd - datatables.net/license - */ - -/** - * @summary ColVis - * @description Controls for column visibility in DataTables - * @version 1.1.2-dev - * @file dataTables.colReorder.js - * @author SpryMedia Ltd (www.sprymedia.co.uk) - * @contact www.sprymedia.co.uk/contact - * @copyright Copyright 2010-2014 SpryMedia Ltd. - * - * This source file is free software, available under the following license: - * MIT license - http://datatables.net/license/mit - * - * This source file is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the license files for details. - * - * For details please refer to: http://www.datatables.net - */ - -(function(window, document, undefined) { - - -var factory = function( $, DataTable ) { -"use strict"; - -/** - * ColVis provides column visibility control for DataTables - * - * @class ColVis - * @constructor - * @param {object} DataTables settings object. With DataTables 1.10 this can - * also be and API instance, table node, jQuery collection or jQuery selector. - * @param {object} ColVis configuration options - */ -var ColVis = function( oDTSettings, oInit ) -{ - /* Santiy check that we are a new instance */ - if ( !this.CLASS || this.CLASS != "ColVis" ) - { - alert( "Warning: ColVis must be initialised with the keyword 'new'" ); - } - - if ( typeof oInit == 'undefined' ) - { - oInit = {}; - } - - var camelToHungarian = $.fn.dataTable.camelToHungarian; - if ( camelToHungarian ) { - camelToHungarian( ColVis.defaults, ColVis.defaults, true ); - camelToHungarian( ColVis.defaults, oInit ); - } - - - /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Public class variables - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - - /** - * @namespace Settings object which contains customisable information for - * ColVis instance. Augmented by ColVis.defaults - */ - this.s = { - /** - * DataTables settings object - * @property dt - * @type Object - * @default null - */ - "dt": null, - - /** - * Customisation object - * @property oInit - * @type Object - * @default passed in - */ - "oInit": oInit, - - /** - * Flag to say if the collection is hidden - * @property hidden - * @type boolean - * @default true - */ - "hidden": true, - - /** - * Store the original visibility settings so they could be restored - * @property abOriginal - * @type Array - * @default [] - */ - "abOriginal": [] - }; - - - /** - * @namespace Common and useful DOM elements for the class instance - */ - this.dom = { - /** - * Wrapper for the button - given back to DataTables as the node to insert - * @property wrapper - * @type Node - * @default null - */ - "wrapper": null, - - /** - * Activation button - * @property button - * @type Node - * @default null - */ - "button": null, - - /** - * Collection list node - * @property collection - * @type Node - * @default null - */ - "collection": null, - - /** - * Background node used for shading the display and event capturing - * @property background - * @type Node - * @default null - */ - "background": null, - - /** - * Element to position over the activation button to catch mouse events when using mouseover - * @property catcher - * @type Node - * @default null - */ - "catcher": null, - - /** - * List of button elements - * @property buttons - * @type Array - * @default [] - */ - "buttons": [], - - /** - * List of group button elements - * @property groupButtons - * @type Array - * @default [] - */ - "groupButtons": [], - - /** - * Restore button - * @property restore - * @type Node - * @default null - */ - "restore": null - }; - - /* Store global reference */ - ColVis.aInstances.push( this ); - - /* Constructor logic */ - this.s.dt = $.fn.dataTable.Api ? - new $.fn.dataTable.Api( oDTSettings ).settings()[0] : - oDTSettings; - - this._fnConstruct( oInit ); - return this; -}; - - - -ColVis.prototype = { - /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Public methods - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - - /** - * Get the ColVis instance's control button so it can be injected into the - * DOM - * @method button - * @returns {node} ColVis button - */ - button: function () - { - return this.dom.wrapper; - }, - - /** - * Alias of `rebuild` for backwards compatibility - * @method fnRebuild - */ - "fnRebuild": function () - { - this.rebuild(); - }, - - /** - * Rebuild the list of buttons for this instance (i.e. if there is a column - * header update) - * @method fnRebuild - */ - rebuild: function () - { - /* Remove the old buttons */ - for ( var i=this.dom.buttons.length-1 ; i>=0 ; i-- ) { - this.dom.collection.removeChild( this.dom.buttons[i] ); - } - this.dom.buttons.splice( 0, this.dom.buttons.length ); - - if ( this.dom.restore ) { - this.dom.restore.parentNode( this.dom.restore ); - } - - /* Re-add them (this is not the optimal way of doing this, it is fast and effective) */ - this._fnAddGroups(); - this._fnAddButtons(); - - /* Update the checkboxes */ - this._fnDrawCallback(); - }, - - - /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Private methods (they are of course public in JS, but recommended as private) - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - - /** - * Constructor logic - * @method _fnConstruct - * @returns void - * @private - */ - "_fnConstruct": function ( init ) - { - this._fnApplyCustomisation( init ); - - var that = this; - var i, iLen; - this.dom.wrapper = document.createElement('div'); - this.dom.wrapper.className = "ColVis"; - - this.dom.button = $( '