narou 3.1.4 → 3.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f3968784d197a6d45098c0c6d60709d4d83dc27
-  data.tar.gz: 596ed06a2ae6c65c376186ddda343b77db83e7b1
+  metadata.gz: 5c64825f0e9ba719bdba129092a9490baa21b2e9
+  data.tar.gz: cd27b5ff3a870649f44cc24d8453631b3fee3a95
 SHA512:
-  metadata.gz: 9a6738055f7081d514f7749b1a063dcbbccefefa1d47fba40f3111426a915b54eeae0fac73006043c9eb5c782464935f94f54125c35e02ec3bcbd5acbd1f68e4
-  data.tar.gz: 478960b800e328a3330b066d383205fdc80da162f08587fe855f509ac83a45bde835d1876dcdedb457e6e03e3800fc4582a88c478a483baa743cac263bad9f4b
+  metadata.gz: f87b45303c55d9f5e1370bb5752aa78f95aeffddcffb4dcd706f96eda67a7a230a352f5d00ecca8e0baac9e8efcc3053313b08032d43f8f53a71ad2225e863d4
+  data.tar.gz: 18d3a9e31c572d46cf804163db49937aec9068f978f00c5652b680ade13f913d59d74c2bfae20b81c35047232632a5eb2ad870462bb6007a0a7d231156b14282

data/ChangeLog.md

@@ -2,6 +2,12 @@
 更新履歴 - ChangeLog
 ====================
 
+3.1.5: 2017/08/27
+------------------
+#### 修正内容
+- 変換時にエラーになる小説に対応
+
+
 3.1.4 : 2017/08/22
 ------------------
 #### 追加機能

data/README.md

@@ -33,6 +33,12 @@ Narou.rb ― 「小説家になろう」「小説を読もう！」ダウンロ
 更新履歴 - ChangeLog
 --------------------
 
+3.1.5: 2017/08/27
+------------------
+#### 修正内容
+- 変換時にエラーになる小説に対応
+
+
 3.1.4 : 2017/08/22
 ------------------
 #### 追加機能

data/lib/converterbase.rb

@@ -1307,6 +1307,7 @@ class ConverterBase
     return "" if text == ""
     output_text_dir = @output_text_dir || @setting.archive_path
     @text_type = text_type
+    text.force_encoding(Encoding::UTF_8)
     io = StringIO.new(rstrip_all_lines(text))
     (io = before_convert(io)).rewind
     (io = convert_main(io)).rewind

data/lib/novelconverter.rb

@@ -352,9 +352,9 @@ class NovelConverter
   def initialize(setting, output_filename = nil, display_inspector = false, output_text_dir = nil)
     @setting = setting
     @novel_id = setting.id
-    @novel_author = setting.author
-    @novel_title = setting.title
-    @output_filename = output_filename
+    @novel_author = setting.include?("novel_author") ? setting["novel_author"] : setting.author
+    @novel_title = setting.include?("novel_title") ? setting["novel_title"] : setting.title
+    @output_filename = (output_filename || setting.output_filename)
     @inspector = Inspector.new(@setting)
     @illustration = Illustration.new(@setting, @inspector)
     @display_inspector = display_inspector
@@ -427,6 +427,8 @@ class NovelConverter
     cover_chuki = create_cover_chuki
     device = Narou.get_device
     setting = @setting
+    toc["title"] = setting["novel_title"] if setting.include?("novel_title")
+    toc["author"] = setting["novel_author"] if setting.include?("novel_author")
     processed_title = decorate_title(toc["title"])
     tempalte_name = (device && device.ibunko? ? NOVEL_TEXT_TEMPLATE_NAME_FOR_IBUNKO : NOVEL_TEXT_TEMPLATE_NAME)
     Template.get(tempalte_name, binding, 1.1)

data/lib/novelsetting.rb

@@ -193,6 +193,14 @@ class NovelSetting
     @settings[name] = value
   end
 
+  def output_filename
+    @settings.fetch("output_filename", nil)
+  end
+
+  def include?(key)
+    @settings.include?(key)
+  end
+
   #
   # replace.txt による置換定義を読み込む
   #

data/lib/version.rb

@@ -3,4 +3,4 @@
 # Copyright 2013 whiteleaf. All rights reserved.
 #
 
-Version = "3.1.4"
+Version = "3.1.5"

data/narou.gemspec

@@ -32,6 +32,12 @@ Gem::Specification.new do |gem|
   install_message = <<-EOS
 #{"*" * 60}
 
+3.1.5: 2017/08/27
+------------------
+#### 修正内容
+- 変換時にエラーになる小説に対応
+
+
 3.1.4 : 2017/08/22
 ------------------
 #### 追加機能

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: narou
 version: !ruby/object:Gem::Version
-  version: 3.1.4
+  version: 3.1.5
 platform: ruby
 authors:
 - whiteleaf7
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-22 00:00:00.000000000 Z
+date: 2017-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: termcolorlight
@@ -487,6 +487,12 @@ metadata: {}
 post_install_message: |
   ************************************************************
 
+  3.1.5: 2017/08/27
+  ------------------
+  #### 修正内容
+  - 変換時にエラーになる小説に対応
+
+
   3.1.4 : 2017/08/22
   ------------------
   #### 追加機能