From bb57c8047875751bdeb0921642561cbd56b98f37 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 16 Mar 2015 14:54:31 -0700 Subject: [PATCH 1/2] Perform jekyll-paginate deprecation warning correctly. Fixes #3393 --- lib/jekyll/configuration.rb | 5 ----- lib/jekyll/plugin_manager.rb | 10 ++++++++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb index ca5d4839..33668d81 100644 --- a/lib/jekyll/configuration.rb +++ b/lib/jekyll/configuration.rb @@ -262,11 +262,6 @@ module Jekyll "be removed in 3.0.0. We recommend you switch to Kramdown." end - if config.key?('paginate') && config['paginate'] && !(config['gems'] || []).include?('jekyll-paginate') - Jekyll::Deprecator.deprecation_message "You appear to have pagination " + - "turned on, but you haven't included the `jekyll-paginate` gem. " + - "Ensure you have `gems: [jekyll-paginate]` in your configuration file." - end config end diff --git a/lib/jekyll/plugin_manager.rb b/lib/jekyll/plugin_manager.rb index 64dea860..13b554a4 100644 --- a/lib/jekyll/plugin_manager.rb +++ b/lib/jekyll/plugin_manager.rb @@ -17,6 +17,7 @@ module Jekyll def conscientious_require require_plugin_files require_gems + deprecation_checks end # Require each of the gem plugins specified. @@ -88,5 +89,14 @@ module Jekyll end end + def deprecation_checks + pagination_included = (!(site.config['gems'] || []).include?('jekyll-paginate') || !defined?(Jekyll::Paginate)) + if site.config['paginate'] && pagination_included + Jekyll::Deprecator.deprecation_message "You appear to have pagination " + + "turned on, but you haven't included the `jekyll-paginate` gem. " + + "Ensure you have `gems: [jekyll-paginate]` in your configuration file." + end + end + end end From eb2fc89776a5837f25e4d349584e6b5476866923 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 16 Mar 2015 15:48:50 -0700 Subject: [PATCH 2/2] Correct the semantics of checking for jekyll-paginate --- lib/jekyll/plugin_manager.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/jekyll/plugin_manager.rb b/lib/jekyll/plugin_manager.rb index 13b554a4..5ba0924f 100644 --- a/lib/jekyll/plugin_manager.rb +++ b/lib/jekyll/plugin_manager.rb @@ -90,8 +90,8 @@ module Jekyll end def deprecation_checks - pagination_included = (!(site.config['gems'] || []).include?('jekyll-paginate') || !defined?(Jekyll::Paginate)) - if site.config['paginate'] && pagination_included + pagination_included = (site.config['gems'] || []).include?('jekyll-paginate') || defined?(Jekyll::Paginate) + if site.config['paginate'] && !pagination_included Jekyll::Deprecator.deprecation_message "You appear to have pagination " + "turned on, but you haven't included the `jekyll-paginate` gem. " + "Ensure you have `gems: [jekyll-paginate]` in your configuration file."