narou 3.1.11 → 3.2.0

data/lib/web/server_helpers.rb

@@ -0,0 +1,121 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright 2013 whiteleaf. All rights reserved.
+#
+
+# rubocop:disable Style/ClassAndModuleChildren
+
+module Narou::ServerHelpers
+  RELOAD_TIMING_DEFAULT = "every"
+
+  #
+  # タグをHTMLで装飾する
+  #
+  def decorate_tags(tags)
+    tags.sort.map do |tag|
+      %!<span class="tag label label-#{Command::Tag.get_color(tag)}" data-tag="#{escape_html(tag)}">#{escape_html(tag)}</span>!
+    end.join(" ")
+  end
+
+  #
+  # タグをHTMLで装飾する(除外タグ指定用)
+  #
+  def decorate_exclusion_tags(tags)
+    tags.sort.map do |tag|
+      %!<span class="tag label label-#{Command::Tag.get_color(tag)}" data-exclusion-tag="#{escape_html(tag)}">^tag:#{escape_html(tag)}</span>!
+    end.join(" ")
+  end
+
+  #
+  # Rubyバージョンを構築
+  #
+  def build_ruby_version
+    begin
+      `"#{RbConfig.ruby}" -v`.strip
+    rescue
+      config = RbConfig::CONFIG
+      "ruby #{RUBY_VERSION}p#{config["PATCHLEVEL"]} [#{RUBY_PLATFORM}]"
+    end
+  end
+
+  #
+  # 有効な novel ID だけの配列を生成する
+  # ID が指定されなかったか、１件も存在しない場合は nil を返す
+  #
+  def select_valid_novel_ids(ids)
+    return nil unless ids.kind_of?(Array)
+    result = ids.select do |id|
+      id =~ /^\d+$/
+    end
+    result.empty? ? nil : result
+  end
+
+  #
+  # フォーム情報の真偽値データを実際のデータに変換
+  #
+  def convert_on_off_to_boolean(str)
+    case str
+    when "on"
+      true
+    when "off"
+      false
+    else
+      nil
+    end
+  end
+
+  #
+  # nil true false を nil on off という文字列に変換
+  #
+  def convert_boolean_to_on_off(bool)
+    case bool
+    when TrueClass
+      "on"
+    when FalseClass
+      "off"
+    else
+      "nil"
+    end
+  end
+
+  #
+  # HTMLエスケープヘルパー
+  #
+  def h(text)
+    Rack::Utils.escape_html(text)
+  end
+
+  #
+  # 与えられたデータが真偽値だった場合、設定画面用に「はい」「いいえ」に変換する
+  # 真偽値ではなかった場合、そのまま返す
+  #
+  def value_to_msg(value)
+    case value
+    when TrueClass
+      "はい"
+    when FalseClass
+      "いいえ"
+    else
+      value
+    end
+  end
+
+  def notepad_text_path
+    File.join(Narou.local_setting_dir, "notepad.txt")
+  end
+
+  def query_to_boolean(value, default: false)
+    case value
+    when "1", 1, "true", true
+      true
+    when "0", 0, "false", false
+      false
+    else
+      default
+    end
+  end
+
+  def table_reload_timing
+    Inventory.load("local_setting")["webui.table.reload-timing"] || RELOAD_TIMING_DEFAULT
+  end
+end

data/lib/web/views/settings.haml

@@ -121,7 +121,7 @@
                         %div.input-style
                           %select{name: name, class: "selectpicker show-tick"}
                             %option(value="")
-                              - if name == "theme"
+                              - if name == "webui.theme"
                                 デフォルト
                               - else
                                 未設定

data/lib/web/views/style.scss

@@ -492,6 +492,14 @@ input::-ms-clear {
   }
 }
 
+.tag {
+  cursor: copy;
+}
+
+.tag-reset {
+  cursor: pointer;
+}
+
 #tag-list-canvas {
   padding: 3px 20px;
   overflow: auto;
@@ -1139,3 +1147,7 @@ $console-color: white;
     color: darkseagreen;
   }
 }
+
+.add-filter {
+  cursor: copy;
+}

data/narou.gemspec

@@ -80,5 +80,6 @@ Gem::Specification.new do |gem|
   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'
 end
 

data/narou.rb

@@ -25,12 +25,12 @@ end
 require_relative "lib/inventory"
 
 $development = Narou.commit_version.!
-begin
-  if $development
+if $development
+  begin
     require "pry"
     require "awesome_print"
+  rescue LoadError
   end
-rescue LoadError
 end
 
 global = Inventory.load("global_setting", :global)
@@ -44,10 +44,6 @@ require_relative "lib/narou_logger"
 require_relative "lib/version"
 require_relative "lib/commandline"
 
-rescue_level = $debug ? Exception : StandardError
-
-class HogeError < StandardError; end
-
 Narou::Backtracer.capture do
   CommandLine.run(ARGV.map(&:dup))
 end

data/preset/ncode.syosetu.com/n9463br/setting.ini

@@ -115,7 +115,3 @@ kanji_num_with_units_lower_digit_zero = 4
 
 ; HTMLの装飾系タグを削除する（主にArcadiaの作品に影響）
 ; enable_strip_decoration_tag = false
-
-; ２倍ダッシュ（――）を画像に差し替える。Kindleのデフォルトフォントみたいにダッシュが太くて気になる人用
-; enable_double_dash_to_image = true
-

data/preset/vertical_font.css

@@ -3,7 +3,7 @@
 
 body {
 	font-family: "@ＭＳ 明朝", "@MS Mincho", "ヒラギノ明朝 ProN W3", "HiraMinProN-W3", serif, sans-serif;
-	line-height: 1.6em !important;
+	line-height: <%= line_height %>em !important;
 }
 
 .gtc, .b {

data/preset/vertical_font_with_dakuten.css

@@ -3,7 +3,7 @@
 
 body {
 	font-family: "@ＭＳ 明朝", "@MS Mincho", "ヒラギノ明朝 ProN W3", "HiraMinProN-W3", serif, sans-serif;
-	line-height: 1.6em !important;
+	line-height: <%= line_height %>em !important;
 }
 
 .gtc, .b {

data/webnovel/kakuyomu.jp.yaml

@@ -22,15 +22,15 @@ story: |-
 # 目次取得設定
 toc_url: \\k<top_url>/works/\\k<ncode>
 subtitles: |-2
-            (?:<li class="widget-toc-chapter widget-toc-level1">
+            (?:<li class="widget-toc-chapter widget-toc-level1 js-vertical-composition-item">
               <span>(?<chapter>.+?)</span>
             </li>
-            )?(?:<li class="widget-toc-chapter widget-toc-level2">
+            )?(?:<li class="widget-toc-chapter widget-toc-level2 js-vertical-composition-item">
               <span>(?<subchapter>.+?)</span>
             </li>
             )?<li class="widget-toc-episode">
               <a href="(?<href>/works/\d+/episodes/(?<index>\d+))">
-                <span class="widget-toc-episode-titleLabel">(?<subtitle>.+?)</span>
+                <span class="widget-toc-episode-titleLabel js-vertical-composition-item">(?<subtitle>.+?)</span>
                 <time class="widget-toc-episode-datePublished" datetime="(?<subupdate>.+?)">.+?</time>
               </a>
             </li>
@@ -64,13 +64,13 @@ s: |-
 
 # general_firstup 初回掲載日
 gf: |-2
-            <dt><span>公開日</span></dt>
-            <dd><time itemprop="datePublished" datetime="(?<general_firstup>.+?)">.+?</time>
+              <dt><span>公開日</span></dt>
+              <dd><time itemprop="datePublished" datetime="(?<general_firstup>.+?)">.+?</time>
 
 # novelupdated_at 小説の更新時刻。最終掲載日で代用
 nu: |-2
-            <dt><span>最終更新日</span></dt>
-            <dd><time itemprop="dateModified" datetime="(?<novelupdated_at>.+?)">.+?</time>
+              <dt><span>最終更新日</span></dt>
+              <dd><time itemprop="dateModified" datetime="(?<novelupdated_at>.+?)">.+?</time>
 
 # general_lastup 最新話掲載日
 gl: null
@@ -78,3 +78,8 @@ gl: null
 # writer 作者名
 w: |-
   (?:<span class="activityName" itemprop="author">(?<writer>.+?)</span>)|(?:<span class="screenName.*?">(?<writer>.+?)</span>)
+
+# length 文字数
+l: |-2
+              <dt><span>総文字数</span></dt>
+              <dd>(?<length>.+?)文字</dd>

data/webnovel/ncode.syosetu.com.yaml

@@ -75,3 +75,8 @@ gl: |-
 w: |-
   <th>作者名</th>
   <td>(?:<a href=".+?">)?(?<writer>.+?)(?:</a>)?.?</td>
+
+# length 文字数
+l: |-
+  <th>文字数</th>
+  <td>(?<length>.+?)文字</td>

data/webnovel/novel18.syosetu.com.yaml

@@ -75,3 +75,8 @@ gl: |-
 w: |-
   <th>作者名</th>
   <td>(?:<a href=".+?">)?(?<writer>.+?)(?:</a>)?.?</td>
+
+# length 文字数
+l: |-
+  <th>文字数</th>
+  <td>(?<length>.+?)文字</td>

data/webnovel/syosetu.org.yaml

@@ -68,3 +68,6 @@ gl: 最新投稿</td><td>(?<general_lastup>.+?)</td>
 
 # writer 作者名
 w: 作者</td><td bgcolor=\#FFFFFF>(?:<a href=.+?>)?(?<writer>.+?)(?:</a>)?</td>
+
+# length 文字数
+l: 合計文字数</td><td>(?<length>.+?)文字

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: narou
 version: !ruby/object:Gem::Version
-  version: 3.1.11
+  version: 3.2.0
 platform: ruby
 authors:
 - whiteleaf7
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-21 00:00:00.000000000 Z
+date: 2018-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: termcolorlight
@@ -278,6 +278,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.1
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.2'
 description: 小説家になろうで公開されている小説の管理、及び電子書籍データへの変換を支援します。縦書用に特化されており、横書き用に特化されたWEB小説を違和感なく縦書で読むことが出来るようになります。
 email:
 - 2nd.leaf@gmail.com
@@ -422,6 +436,7 @@ files:
 - lib/web/public/theme/fonts/glyphicons-halflings-regular.woff
 - lib/web/public/theme/fonts/glyphicons-halflings-regular.woff2
 - lib/web/pushserver.rb
+- lib/web/server_helpers.rb
 - lib/web/settingmessages.rb
 - lib/web/streaminginput.rb
 - lib/web/streaminglogger.rb
@@ -458,7 +473,6 @@ files:
 - preset/DMincho.ttf
 - preset/bordersymbols.txt
 - preset/custom_chuki_tag.txt
-- preset/doubledash.png
 - preset/mail_setting.yaml
 - preset/ncode.syosetu.com/n1839bd/converter.rb
 - preset/ncode.syosetu.com/n1839bd/setting.ini
@@ -478,7 +492,6 @@ files:
 - preset/ncode.syosetu.com/n9669bk/converter.rb
 - preset/ncode.syosetu.com/n9669bk/setting.ini
 - preset/ncode.syosetu.com/n9902bn/converter.rb
-- preset/singledash.png
 - preset/vertical_font.css
 - preset/vertical_font_with_dakuten.css
 - template/converter.rb.erb