diff --git a/lib/jekyll-spaceship.rb b/lib/jekyll-spaceship.rb index c5bdb2c..a76f8c0 100644 --- a/lib/jekyll-spaceship.rb +++ b/lib/jekyll-spaceship.rb @@ -8,5 +8,5 @@ require 'jekyll-spaceship/cores/register' module Jekyll::Spaceship Logger.display_info - Config.load + Config.load_config end diff --git a/lib/jekyll-spaceship/cores/config.rb b/lib/jekyll-spaceship/cores/config.rb index 6c22de0..273a15d 100644 --- a/lib/jekyll-spaceship/cores/config.rb +++ b/lib/jekyll-spaceship/cores/config.rb @@ -35,7 +35,7 @@ module Jekyll::Spaceship @@store[section] = deep_merge(default, @@store[section]) end - def self.load(config = self.site_config) + def self.load(config = {}) config = deep_merge( { CONFIG_NAME => DEFAULT_CONFIG }, config @@ -50,8 +50,11 @@ module Jekyll::Spaceship end end - def self.site_config - Jekyll.sites.first.config + def self.load_config + # post load site config for `group :jekyll_plugin` + Jekyll::Hooks.register :site, :after_init do |site| + self.load(site.config) + end end end end