From 8b892ed735bfcaaeecfcf8d97db763561ee466a9 Mon Sep 17 00:00:00 2001 From: Shigeya Suzuki Date: Sun, 18 Aug 2013 10:43:02 +0900 Subject: [PATCH] read_yaml to accept optional parameter to override defaults --- lib/jekyll/convertible.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb index da8858ee..21f950d0 100644 --- a/lib/jekyll/convertible.rb +++ b/lib/jekyll/convertible.rb @@ -24,11 +24,13 @@ module Jekyll # # base - The String path to the dir containing the file. # name - The String filename of the file. + # opts - optional parameter to File.read, default at site configs # # Returns nothing. - def read_yaml(base, name) + def read_yaml(base, name, opts = {}) begin - opts = self.site ? self.site.file_read_opts : {} + opts = (self.site ? self.site.file_read_opts : {}).merge(opts) + self.content = File.read(File.join(base, name), opts) if self.content =~ /\A(---\s*\n.*?\n?)^(---\s*$\n?)/m