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

Update lib/jekyll/site.rb

This commit is contained in:
xiaojian cai 2013-01-09 16:06:43 +08:00
parent 44822a252e
commit 1e892678bc
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/jekyll/site.rb
View File

@ -22,8 +22,8 @@ module Jekyll
self.lsi = config['lsi'] self.lsi = config['lsi']
self.pygments = config['pygments'] self.pygments = config['pygments']
self.permalink_style = config['permalink'].to_sym self.permalink_style = config['permalink'].to_sym
self.exclude = (config['exclude'] || []).map { |e| Regexp.new("^#{e}$") } self.exclude = config['exclude'] || []
self.include = (config['include'] || []).map { |e| Regexp.new("^#{e}$") } self.include = config['include'] || []
self.future = config['future'] self.future = config['future']
self.limit_posts = config['limit_posts'] || nil self.limit_posts = config['limit_posts'] || nil
@ -318,17 +318,17 @@ module Jekyll
# Returns the Array of filtered entries. # Returns the Array of filtered entries.
def filter_entries(entries) def filter_entries(entries)
entries.reject do |e| entries.reject do |e|
unless regexp_include?(self.include, e) unless glob_include?(self.include, e)
['.', '_', '#'].include?(e[0..0]) || ['.', '_', '#'].include?(e[0..0]) ||
e[-1..-1] == '~' || e[-1..-1] == '~' ||
regexp_include?(self.exclude, e) || glob_include?(self.exclude, e) ||
File.symlink?(e) File.symlink?(e)
end end
end end
end end
def regexp_include?(exps, e) def glob_include?(exps, e)
!(exps.index { |exp| !exp.match(e).nil? }).nil? !(exps.index { |exp| File.fnmatch?(exp, e) }).nil?
end end
# Get the implementation class for the given Converter. # Get the implementation class for the given Converter.