Kouhei Sutou 2018-10-25 12:42:17 +0900 (Thu, 25 Oct 2018) Revision: b2de9031abc5aadc6f6c0d33b4864cad2ba846b3 https://github.com/ranguba/ranguba/commit/b2de9031abc5aadc6f6c0d33b4864cad2ba846b3 Message: Really use the default value Modified files: lib/ranguba/file_reader.rb lib/ranguba/template.rb Modified: lib/ranguba/file_reader.rb (+2 -2) =================================================================== --- lib/ranguba/file_reader.rb 2018-10-25 12:41:15 +0900 (a16416a) +++ lib/ranguba/file_reader.rb 2018-10-25 12:42:17 +0900 (83f585d) @@ -2,8 +2,8 @@ require 'csv' class Ranguba::FileReader - def self.read(path, external_encoding=Encoding::UTF_8) - return '' unless File.exist?(path) + def self.read(path, external_encoding=Encoding::UTF_8, default="") + return default unless File.exist?(path) if external_encoding == Encoding::UTF_8 File.open(path, "r:utf-8") {|file| file.read} else Modified: lib/ranguba/template.rb (+3 -3) =================================================================== --- lib/ranguba/template.rb 2018-10-25 12:41:15 +0900 (c08c4a5) +++ lib/ranguba/template.rb 2018-10-25 12:42:17 +0900 (68f52d6) @@ -8,9 +8,9 @@ class Ranguba::Template end def title - @title ||= - Ranguba::FileReader.read(@title_path, @encodings['title.txt']) || - "Ranguba" + @title ||= Ranguba::FileReader.read(@title_path, + @encodings['title.txt'], + "Ranguba") end def header -------------- next part -------------- An HTML attachment was scrubbed... URL: <https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20181025/85b25a10/attachment-0001.html>
