github-pages 71 → 72

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92ff16a0bd12e1601913b69226209dd022a1f897
-  data.tar.gz: 83b0d523b2bbc228b056bcadb2a8b360b7e5c73e
+  metadata.gz: 853426d5801e23f4e76b3d558dbb403805662e25
+  data.tar.gz: c938c888882ee3769d735d032b87f9b89d6e4bc9
 SHA512:
-  metadata.gz: 8a67b6ca00ae88fe196fd94bcbe64f3591d80d8f2e941e1bdecc4335dde3724365b1e1d95d7747ba4481438df504645b0b08536e6caa424fa7d251bec0857f64
-  data.tar.gz: 2a6c3bc6ef6ac9fae2d1d7c02c4e6a9a55f7c99edd8556672f11bec78c2ae132a8e1a144521816ed3cff6105be3de056edad992b0e22ef75c18851d22a08cfb4
+  metadata.gz: 7c97bfc4936c45715fdd4fc2772c1df2cdf0a4066d432038d8f873c4ae1d1dbb9b6a3f4a940363ec06089d81372fda3062d2f234f81eb3dac41e8ece973db41c
+  data.tar.gz: a44cf3ea8553d226470698de0ef21bcd18da5c83a8f41958dece87404eef02b755e749b50439f4817adaf5071b90d68e396c3263c8b2a935eb42859753b49371

data/lib/github-pages.rb

@@ -12,8 +12,6 @@ module GitHubPages
   end
 end
 
-Jekyll.logger.debug "GitHub Pages:", "github-pages v#{GitHubPages::VERSION}"
-Jekyll.logger.debug "GitHub Pages:", "jekyll v#{Jekyll::VERSION}"
 Jekyll::Hooks.register :site, :after_reset do |site|
   GitHubPages::Configuration.set(site)
 end

data/lib/github-pages/configuration.rb

@@ -54,7 +54,7 @@ module GitHubPages
     OVERRIDES = {
       "lsi"         => false,
       "safe"        => true,
-      "plugins"     => SecureRandom.hex,
+      "plugins_dir" => SecureRandom.hex,
       "whitelist"   => PLUGIN_WHITELIST,
       "highlighter" => "rouge",
       "kramdown"    => {
@@ -98,10 +98,11 @@ module GitHubPages
         # Merge user config into defaults
         config = Jekyll::Utils.deep_merge_hashes(MERGED_DEFAULTS, user_config)
           .fix_common_issues
+          .backwards_compatibilize
           .add_default_collections
 
-        # Merge overwrites into user config
-        config = Jekyll::Utils.deep_merge_hashes config, OVERRIDES
+        # Merge overwrites into user config & ensure fully compatible
+        config = Jekyll::Utils.deep_merge_hashes(config, OVERRIDES)
 
         # Ensure we have those gems we want.
         config["gems"] = Array(config["gems"]) | DEFAULT_PLUGINS
@@ -115,10 +116,16 @@ module GitHubPages
       # guards against double-processing via the value in #processed.
       def set(site)
         return if processed? site
+        print_debug_versions
         set!(site)
         processed(site)
       end
 
+      def print_debug_versions
+        Jekyll.logger.debug "GitHub Pages:", "github-pages v#{GitHubPages::VERSION}"
+        Jekyll.logger.debug "GitHub Pages:", "jekyll v#{Jekyll::VERSION}"
+      end
+
       # Set the site's configuration with all the proper defaults and overrides.
       # Should be called by #set to protect against multiple processings.
       def set!(site)

data/lib/github-pages/version.rb

@@ -1,3 +1,3 @@
 module GitHubPages
-  VERSION = 71
+  VERSION = 72
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: github-pages
 version: !ruby/object:Gem::Version
-  version: '71'
+  version: '72'
 platform: ruby
 authors:
 - GitHub, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-18 00:00:00.000000000 Z
+date: 2016-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll