dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

code improvements according to @parkr's suggestions

This commit is contained in:
maul.esel 2013-07-05 14:13:40 +02:00
parent 656dcca3d2
commit ef22ebd7f1
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/jekyll/tags/include.rb
View File

@ -6,14 +6,7 @@ module Jekyll
def initialize(tag_name, markup, tokens) def initialize(tag_name, markup, tokens)
super super
markup.strip! @file, @params = markup.strip.split(' ', 2);
if markup.include?(' ')
separator = markup.index(' ')
@file = markup[0..separator].strip
@params = markup[separator..-1]
else
@file = markup
end
end end
def parse_params(markup, context) def parse_params(markup, context)
@ -22,7 +15,7 @@ module Jekyll
# ensure the entire markup string from start to end is valid syntax, and params are separated by spaces # ensure the entire markup string from start to end is valid syntax, and params are separated by spaces
full_matcher = Regexp.compile('\A\s*(?:' + MATCHER.to_s + '(?=\s|\z)\s*)*\z') full_matcher = Regexp.compile('\A\s*(?:' + MATCHER.to_s + '(?=\s|\z)\s*)*\z')
if not markup =~ full_matcher unless markup =~ full_matcher
raise SyntaxError.new <<-eos raise SyntaxError.new <<-eos
Invalid syntax for include tag: Invalid syntax for include tag: