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

Merge pull request #1284 from mojombo/include-exclude-deprecation-simplification 

Include exclude deprecation simplification
This commit is contained in:
Parker Moore 2013-07-08 10:49:09 -07:00
parent be91ee3df2 9d3d095bca
commit c4fd5ddc8b
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/jekyll/configuration.rb
View File

@ -185,22 +185,15 @@ module Jekyll
config.delete('server_port') config.delete('server_port')
end end
if config.has_key?('exclude') && config['exclude'].is_a?(String) %w[include exclude].each do |option|
Jekyll.logger.warn "Deprecation:", "The 'exclude' configuration option" + if config.fetch(option, []).is_a?(String)
Jekyll.logger.warn "Deprecation:", "The '#{option}' configuration option" +
" must now be specified as an array, but you specified" + " must now be specified as an array, but you specified" +
" a string. For now, we've treated the string you provided" + " a string. For now, we've treated the string you provided" +
" as a list of comma-separated values." " as a list of comma-separated values."
config['exclude'] = csv_to_array(config['exclude']) config[option] = csv_to_array(config[option])
end end
if config.has_key?('include') && config['include'].is_a?(String)
Jekyll.logger.warn "Deprecation:", "The 'include' configuration option" +
" must now be specified as an array, but you specified" +
" a string. For now, we've treated the string you provided" +
" as a list of comma-separated values."
config['include'] = csv_to_array(config['include'])
end end
config config
end end