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

Merge pull request #962 from dracula2000/refactor-site 

Move defaults found in site.rb to DEFAULTS Hash
This commit is contained in:
Parker Moore 2013-04-13 10:24:35 -07:00
parent dcad4b2867 028e580bb8
commit 3e04655025
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/jekyll/configuration.rb
View File

@ -8,8 +8,12 @@ module Jekyll
'destination' => File.join(Dir.pwd, '_site'), 'destination' => File.join(Dir.pwd, '_site'),
'plugins' => '_plugins', 'plugins' => '_plugins',
'layouts' => '_layouts', 'layouts' => '_layouts',
'keep_files' => ['.git','.svn'], 'keep_files' => ['.git','.svn'],
'safe' => false,
'show_drafts' => nil,
'limit_posts' => nil,
'lsi' => false,
'future' => true, # remove and make true just default 'future' => true, # remove and make true just default
'pygments' => true, # remove and make true just default 'pygments' => true, # remove and make true just default
@ -17,6 +21,7 @@ module Jekyll
'permalink' => 'date', 'permalink' => 'date',
'baseurl' => '/', 'baseurl' => '/',
'include' => ['.htaccess'], 'include' => ['.htaccess'],
'exclude' => [],
'paginate_path' => 'page:num', 'paginate_path' => 'page:num',
'markdown_ext' => 'markdown,mkd,mkdn,md', 'markdown_ext' => 'markdown,mkd,mkdn,md',

10
lib/jekyll/site.rb
View File

@ -23,12 +23,12 @@ module Jekyll
self.pygments = config['pygments'] self.pygments = config['pygments']
self.baseurl = config['baseurl'] self.baseurl = config['baseurl']
self.permalink_style = config['permalink'].to_sym self.permalink_style = config['permalink'].to_sym
self.exclude = config['exclude'] || [] self.exclude = config['exclude']
self.include = config['include'] || [] self.include = config['include']
self.future = config['future'] self.future = config['future']
self.show_drafts = config['show_drafts'] || nil self.show_drafts = config['show_drafts']
self.limit_posts = config['limit_posts'] || nil self.limit_posts = config['limit_posts']
self.keep_files = config['keep_files'] || [] self.keep_files = config['keep_files']
self.reset self.reset
self.setup self.setup