Debug Jekyll issue - 7328

Merge pull request 7228

.rubocop.yml

@@ -8,10 +8,9 @@ Jekyll/NoPutsAllowed:
     - rake/*.rake
 
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.1
   Include:
     - lib/**/*.rb
-    - test/**/*.rb
   Exclude:
     - bin/**/*
     - exe/**/*
@@ -19,14 +18,30 @@ AllCops:
     - script/**/*
     - vendor/**/*
     - tmp/**/*
+Layout/AlignArray:
+  Enabled: false
 Layout/AlignHash:
   EnforcedHashRocketStyle: table
+Layout/AlignParameters:
+  Enabled: false
+Layout/EmptyLinesAroundAccessModifier:
+  Enabled: false
+Layout/EmptyLinesAroundModuleBody:
+  Enabled: false
+Layout/EndOfLine:
+  EnforcedStyle: native
+Layout/ExtraSpacing:
+  AllowForAlignment: true
+Layout/FirstParameterIndentation:
+  EnforcedStyle: consistent
 Layout/IndentationWidth:
   Severity: error
 Layout/IndentArray:
   EnforcedStyle: consistent
 Layout/IndentHash:
   EnforcedStyle: consistent
+Layout/IndentHeredoc:
+  Enabled: false
 Layout/MultilineMethodCallIndentation:
   EnforcedStyle: indented
 Layout/MultilineOperationIndentation:
@@ -40,9 +55,10 @@ Layout/EndAlignment:
   Severity: error
 Lint/UnreachableCode:
   Severity: error
+Lint/UselessAccessModifier:
+  Enabled: false
 Lint/Void:
-  Exclude:
-    - lib/jekyll/site.rb
+  Enabled: false
 Metrics/AbcSize:
   Max: 21
 Metrics/BlockLength:
@@ -50,26 +66,22 @@ Metrics/BlockLength:
     - test/**/*.rb
     - lib/jekyll/configuration.rb
     - rake/*.rake
+    - jekyll.gemspec
 Metrics/ClassLength:
   Exclude:
     - !ruby/regexp /features\/.*.rb$/
     - !ruby/regexp /test\/.*.rb$/
-    - lib/jekyll/document.rb
-    - lib/jekyll/site.rb
-    - lib/jekyll/commands/serve.rb
-    - lib/jekyll/configuration.rb
-  Max: 240
+  Max: 300
 Metrics/CyclomaticComplexity:
-  Exclude:
-    - lib/jekyll/utils.rb
-    - lib/jekyll/commands/serve.rb
+  Max: 9
 Metrics/LineLength:
   Exclude:
     - !ruby/regexp /features\/.*.rb/
     - Rakefile
     - rake/*.rake
     - Gemfile
-  Max: 100
+    - jekyll.gemspec
+  Max: 90
   Severity: warning
 Metrics/MethodLength:
   CountComments: false
@@ -84,8 +96,7 @@ Metrics/PerceivedComplexity:
 Naming/FileName:
   Enabled: false
 Naming/HeredocDelimiterNaming:
-  Exclude:
-    - test/**/*.rb
+  Enabled: false
 Naming/MemoizedInstanceVariableName:
   Exclude:
     - lib/jekyll/page_without_a_file.rb
@@ -102,19 +113,20 @@ Security/YAMLLoad:
   Exclude:
     - !ruby/regexp /features\/.*.rb/
     - !ruby/regexp /test\/.*.rb$/
-Style/AccessModifierDeclarations:
-  Enabled: false
 Style/Alias:
-  EnforcedStyle: prefer_alias_method
+  Enabled: false
 Style/AndOr:
   Severity: error
+Style/BracesAroundHashParameters:
+  Enabled: false
 Style/ClassAndModuleChildren:
-  Exclude:
-    - test/**/*.rb
+  Enabled: false
 Style/FrozenStringLiteralComment:
   EnforcedStyle: always
 Style/Documentation:
   Enabled: false
+  Exclude:
+    - !ruby/regexp /features\/.*.rb$/
 Style/DoubleNegation:
   Enabled: false
 Style/FormatStringToken:
@@ -125,6 +137,10 @@ Style/GuardClause:
 Style/HashSyntax:
   EnforcedStyle: hash_rockets
   Severity: error
+Style/IfUnlessModifier:
+  Enabled: false
+Style/InverseMethods:
+  Enabled: false
 Style/MixinUsage:
   Exclude:
     - test/helper.rb
@@ -141,21 +157,24 @@ Style/PercentLiteralDelimiters:
     "%w": "()"
     "%W": "()"
     "%x": "()"
+Style/RedundantReturn:
+  Enabled: false
+Style/RedundantSelf:
+  Enabled: false
 Style/RegexpLiteral:
   EnforcedStyle: percent_r
 Style/RescueModifier:
   Enabled: false
-Style/SafeNavigation:
-  Exclude:
-    - lib/jekyll/document.rb
 Style/SignalException:
   EnforcedStyle: only_raise
+Style/SingleLineMethods:
+  Enabled: false
 Style/StringLiterals:
   EnforcedStyle: double_quotes
 Style/StringLiteralsInInterpolation:
   EnforcedStyle: double_quotes
 Style/SymbolArray:
-  EnforcedStyle: brackets
+  Enabled: false
 Style/TrailingCommaInArrayLiteral:
   EnforcedStyleForMultiline: consistent_comma
 Style/TrailingCommaInHashLiteral:

.travis.yml

@@ -8,16 +8,17 @@ rvm:
   - &ruby1 2.5.1
   - &ruby2 2.4.4
   - &ruby3 2.3.7
+  - &ruby4 2.2.10
   - &jruby jruby-9.1.16.0
 
 matrix:
   include:
     - rvm: *ruby1
       env: TEST_SUITE=fmt
-      name: "🤖️ Code Format"
     - rvm: *ruby1
       env: TEST_SUITE=default-site
-      name: "🏠️ Default Site"
+    - rvm: *ruby1
+      env: ROUGE_VERSION=1.11.1 # runs everything with this version
   exclude:
     - rvm: *jruby
       env: TEST_SUITE=cucumber
@@ -54,4 +55,4 @@ after_success:
 
 before_install:
   - gem update --system
-  - gem install bundler --version 1.16.2
+  - gem install bundler

CODE_OF_CONDUCT.markdown

@@ -1,46 +1,49 @@
 # Code of Conduct
 
-## Our Pledge
+As contributors and maintainers of this project, and in the interest of
+fostering an open and welcoming community, we pledge to respect all people who
+contribute through reporting issues, posting feature requests, updating
+documentation, submitting pull requests or patches, and other activities.
 
-In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
+We are committed to making participation in this project a harassment-free
+experience for everyone, regardless of level of experience, gender, gender
+identity and expression, sexual orientation, disability, personal appearance,
+body size, race, ethnicity, age, religion, or nationality.
 
 Examples of unacceptable behavior by participants include:
 
-* The use of sexualized language or imagery and unwelcome sexual attention or advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
+* The use of sexualized language or imagery
+* Personal attacks
+* Trolling or insulting/derogatory comments
 * Public or private harassment
-* Publishing others' private information, such as a physical or electronic address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a professional setting
+* Publishing other's private information, such as physical or electronic
+  addresses, without explicit permission
+* Other unethical or unprofessional conduct
 
-## Our Responsibilities
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
 
-Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+By adopting this Code of Conduct, project maintainers commit themselves to
+fairly and consistently applying these principles to every aspect of managing
+this project. Project maintainers who do not follow or enforce the Code of
+Conduct may be permanently removed from the project team.
 
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community.
 
-## Scope
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by opening an issue or contacting a project maintainer. All complaints
+will be reviewed and investigated and will result in a response that is deemed
+necessary and appropriate to the circumstances. Maintainers are obligated to
+maintain confidentiality with regard to the reporter of an incident.
 
-This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
 
-## Enforcement
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 1.3.0, available at
+[http://contributor-covenant.org/version/1/3/0/][version]
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting a project maintainer. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [https://www.contributor-covenant.org/version/1/4/code-of-conduct.html][version]
-
-[homepage]: https://www.contributor-covenant.org/
-[version]: https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/3/0/

Gemfile

@@ -5,6 +5,11 @@ gemspec :name => "jekyll"
 
 gem "rake", "~> 12.0"
 
+gem "rouge", ENV["ROUGE"] if ENV["ROUGE"]
+
+# Dependency of jekyll-mentions. RubyGems in Ruby 2.1 doesn't shield us from this.
+gem "activesupport", "~> 4.2", :groups => [:test_legacy, :site] if RUBY_VERSION < "2.2.2"
+
 group :development do
   gem "launchy", "~> 2.3"
   gem "pry"
@@ -18,14 +23,15 @@ end
 
 group :test do
   gem "codeclimate-test-reporter", "~> 1.0.5"
-  gem "cucumber", "~> 3.0"
+  gem "cucumber", RUBY_VERSION >= "2.2" ? "~> 3.0" : "3.0.1"
   gem "httpclient"
   gem "jekyll_test_plugin"
   gem "jekyll_test_plugin_malicious"
-  gem "nokogiri", "~> 1.7"
+  # nokogiri v1.8 does not work with ruby 2.1 and below
+  gem "nokogiri", RUBY_VERSION >= "2.2" ? "~> 1.7" : "~> 1.7.0"
   gem "rspec"
   gem "rspec-mocks"
-  gem "rubocop", "~> 0.57.2"
+  gem "rubocop", "~> 0.56.0"
   gem "test-dependency-theme", :path => File.expand_path("test/fixtures/test-dependency-theme", __dir__)
   gem "test-theme", :path => File.expand_path("test/fixtures/test-theme", __dir__)
 
@@ -35,7 +41,7 @@ end
 #
 
 group :test_legacy do
-  if RUBY_PLATFORM =~ %r!cygwin!
+  if RUBY_PLATFORM =~ %r!cygwin! || RUBY_VERSION.start_with?("2.2")
     gem "test-unit"
   end
 
@@ -69,14 +75,16 @@ group :jekyll_optional_dependencies do
   gem "jekyll-redirect-from"
   gem "kramdown", "~> 1.14"
   gem "mime-types", "~> 3.0"
-  gem "rdoc", "~> 6.0"
+  gem "rdoc", RUBY_VERSION >= "2.2.2" ? "~> 6.0" : "~> 5.1"
   gem "tomlrb", "~> 1.2"
 
   platform :ruby, :mswin, :mingw, :x64_mingw do
     gem "classifier-reborn", "~> 2.2.0"
     gem "liquid-c", "~> 3.0"
     gem "pygments.rb", "~> 1.0"
-    gem "yajl-ruby", "~> 1.3"
+    gem "rdiscount", "~> 2.0"
+    gem "redcarpet", "~> 3.2", ">= 3.2.3"
+    gem "yajl-ruby", "~> 1.3.1"
   end
 
   # Windows does not include zoneinfo files, so bundle the tzinfo-data gem

History.markdown

@@ -1,96 +1,8 @@
-## HEAD
-
-  * Textile is only supported through a converter plugin (#7003)
-
-### Documentation
-
-  * Release post for v3.8.0 (#6849)
-  * Add Installation Instructions for Ubuntu (#6925)
-  * add liquid tag jekyll-flickr (#6946)
-  * Add 4.0 development post (#6934)
-  * Updated copy - fixed casing of SaaS on resources page. (#6949)
-  * WIP: Do not advise users to install Jekyll outside of Bundler (#6927)
-  * Don't prompt for sudo when installing with Ubuntu WSL (#6781)
-  * Fix typo (#6969)
-  * Add version number for group_by_exp doc (#6956)
-  * Update Windows install docs (#6926)
-  * Remove documentation for using Redcarpet (#6990)
-  * Updated nginx configuration for custom-404-page documentation (#6994)
-  * List all static files variables (#7002)
-  * Document that _drafts need to be contained within the custom collection directory (#6985)
-  * proposed change for passive voice. (#7005)
-  * added the CAT plugin to the plugin list (#7011)
-  * Updated to supported version (#7031)
-  * Clarify definition of 'draft' (#7037)
-  * Listed the jekyll-target-blank plugin in plugins list. (#7046)
-  * Typo (#7058)
-  * Add Hints for some Improved Travis Config in Doc (#7049)
-  * Added plugin json-get. (#7086)
-  * Update travis-ci.md to point out "this is an example Gemfile" (#7089)
-  * Adding `jekyll-info` plugin (#7091)
-  * GitHub enables you to use themes from other repos (#7112)
-  * Updates to CODE OF CONDUCT  (v1.4.0) (#7105)
-  * Instructions to view theme’s files under Linux (#7095)
-  * add jekyll-xml-source (#7114)
-  * Add the jekyll-firstimage filter plugin (#7127)
-  * Use a real theme in the example (#7125)
-  * Update docs about post creation (#7138)
-  * Add DEV Community's Jekyll tag to community page (#7139)
-  * Initialize upgrading doc for v4.0 (#7140)
-  * Add version badge for date filters with ordinal (#7162)
-  * Add closing tags for <a> (#7163)
-  * Add TSV to list of supported _data files. (#7168)
-
-### Minor Enhancements
-
-  * use jekyll-compose if installed (#6932)
-  * Memoize computing excerpt's relative_path (#6951)
-  * Liquefied link tag (#6269)
-  * Suggest re-running command with --trace on fail (#6551)
-  * Update item_property to return numbers as numbers instead of strings (#6608)
-  * Use .markdown for page templates (#7126)
-  * Fix custom 404 page for GitHub pages (#7132)
-
-### Major Enhancements
-
-  * Remove unused error class (#6511)
-  * Drop support for Ruby 2.1 and 2.2 (#6560)
-  * Add vendor folder to a newly installed site's .gitignore (#6968)
-  * bump i18n (#6931)
-  * We are not using Ruby 2.2 anymore (#6977)
-  * Drop support for older versions of Rouge (#6978)
-  * Remove support for Redcarpet (#6987)
-  * Remove support for rdiscount (#6988)
-  * Remove 'cache_dir' during `jekyll clean` (#7158)
-  * Output Jekyll Version while debugging (#7173)
-
-### Development Fixes
-
-  * Remove unnecessary Jekyll::Page constant (#6770)
-  * Loggers should accept both numbers and symbols (#6967)
-  * Update instructions for releasing docs Gem (#6975)
-  * yajl-ruby update to v1.4.0 (#6976)
-  * Load Rouge for TestKramdown (#7007)
-  * Useless privates removed (#6768)
-  * Allow i18n v0.9.5 and higher (#7044)
-  * Update Rubocop's config (#7050)
-  * Remember to release docs gem (#7066)
-  * Use assert_include (#7093)
-  * Update rubocop version to 0.57.x ### -docs (#7078)
-  * Example of CircleCI deployment through CircleCI v2 (#7024)
-  * Fix Rubocop offences in test files (#7128)
-  * fix up refute_equal call (#7133)
-  * Fix incorrectly passed arguments to assert_equal (#7134)
-  * Lock Travis to Bundler-1.16.2 (#7144)
+## 3.8.4 / 2018-09-18
 
 ### Bug Fixes
 
-  * Add call to unused method `validate_options` in `commands/serve.rb` (#7122)
-
-### feature
-
-  * Disable Liquid via front matter (#6824)
-  * Do not process Liquid in post excerpt when disabled in front matter (#7146)
+  * security: fix `include` bypass of `EntryFilter#filter` symlink check (#7228)
 
 ## 3.8.3 / 2018-06-05
 

README.markdown

@@ -3,13 +3,13 @@
 [![Gem Version](https://img.shields.io/gem/v/jekyll.svg)][ruby-gems]
 [![Linux Build Status](https://img.shields.io/travis/jekyll/jekyll/master.svg?label=Linux%20build)][travis]
 [![Windows Build status](https://img.shields.io/appveyor/ci/jekyll/jekyll/master.svg?label=Windows%20build)][appveyor]
-[![Maintainability](https://api.codeclimate.com/v1/badges/8ba0cb5b17bb9848e128/maintainability)][codeclimate]
-[![Test Coverage](https://api.codeclimate.com/v1/badges/8ba0cb5b17bb9848e128/test_coverage)][coverage]
+[![Maintainability](https://api.codeclimate.com/v1/badges/8ba0cb5b17bb9848e128/maintainability)](codeclimate)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/8ba0cb5b17bb9848e128/test_coverage)](coverage)
+[![Dependency Status](https://img.shields.io/gemnasium/jekyll/jekyll.svg)][gemnasium]
 [![Security](https://hakiri.io/github/jekyll/jekyll/master.svg)][hakiri]
-[![Backers on Open Collective](https://opencollective.com/jekyll/backers/badge.svg)](#backers)
-[![Sponsors on Open Collective](https://opencollective.com/jekyll/sponsors/badge.svg)](#sponsors) 
 
 [ruby-gems]: https://rubygems.org/gems/jekyll
+[gemnasium]: https://gemnasium.com/jekyll/jekyll
 [codeclimate]: https://codeclimate.com/github/jekyll/jekyll
 [coverage]: https://codeclimate.com/github/jekyll/jekyll/coverage
 [hakiri]: https://hakiri.io/github/jekyll/jekyll/master
@@ -45,7 +45,7 @@ conduct.
 Please adhere to this code of conduct in any interactions you have in the
 Jekyll community. It is strictly enforced on all official Jekyll
 repositories, websites, and resources. If you encounter someone violating
-these terms, please let one of our [core team members](https://jekyllrb.com/team/#core-team) know and we will address it as soon as possible.
+these terms, please let one of our core team members [Olivia](mailto:olivia@jekyllrb.com?subject=Jekyll%20CoC%20Violation), [Pat](mailto:pat@jekyllrb.com?subject=Jekyll%20CoC%20Violation), [Matt](mailto:matt@jekyllrb.com?subject=Jekyll%20CoC%20Violation) or [Parker](mailto:parker@jekyllrb.com?subject=Jekyll%20CoC%20Violation) know and we will address it as soon as possible.
 
 ## Diving In
 
@@ -56,28 +56,6 @@ these terms, please let one of our [core team members](https://jekyllrb.com/team
 * Use the built-in [Liquid Extensions](https://jekyllrb.com/docs/templates/) to make your life easier
 * Use custom [Plugins](https://jekyllrb.com/docs/plugins/) to generate content specific to your site
 
-## Credits
-
-### Contributors
-
-This project exists thanks to all the people who contribute.
-<a href="graphs/contributors"><img src="https://opencollective.com/jekyll/contributors.svg?width=890&button=false" /></a>
-
-### Backers
-
-Thank you to all our backers! 🙏 [Become a backer](https://opencollective.com/jekyll#backer)
-
-<a href="https://opencollective.com/jekyll#backers" target="_blank"><img src="https://opencollective.com/jekyll/backers.svg?width=890" /></a>
-
-### Sponsors
-
-Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [Become a sponsor!](https://opencollective.com/jekyll#sponsor)
-
-<a href="https://opencollective.com/jekyll/sponsor/0/website" target="_blank"><img src="https://opencollective.com/jekyll/sponsor/0/avatar.svg" /></a>
-<a href="https://opencollective.com/jekyll/sponsor/1/website" target="_blank"><img src="https://opencollective.com/jekyll/sponsor/1/avatar.svg" /></a>
-<a href="https://opencollective.com/jekyll/sponsor/2/website" target="_blank"><img src="https://opencollective.com/jekyll/sponsor/2/avatar.svg" /></a>
-
-
 ## License
 
 See the [LICENSE](https://github.com/jekyll/jekyll/blob/master/LICENSE) file.

appveyor.yml

@@ -28,6 +28,8 @@ environment:
       TEST_SUITE: "test"
     - RUBY_FOLDER_VER: "23"
       TEST_SUITE: "test"
+    - RUBY_FOLDER_VER: "22"
+      TEST_SUITE: "test"
 
 test_script:
   - ruby --version

docs/_config.yml

@@ -1,5 +1,5 @@
 ---
-version: 3.8.3
+version: 3.8.4
 name: Jekyll • Simple, blog-aware, static sites
 description: Transform your plain text into static websites and blogs
 url: https://jekyllrb.com

docs/_data/sponsors.yml

@@ -1,15 +0,0 @@
-- name: Forestry.io
-  image: /img/forestry-logo.png
-  url: https://forestry.io
-  width: 140
-  height: 30
-- name: CloudCannon
-  image: /img/cloudcannon-logo.png
-  url: https://cloudcannon.com
-  width: 75
-  height: 30
-- name: Siteleaf
-  image: /img/siteleaf-logo.png
-  url: https://siteleaf.com
-  width: 40
-  height: 50

docs/_docs/collections.md

@@ -56,9 +56,9 @@ defaults:
 </div>
 
 <div class="note warning">
-  <h5>Be sure to move drafts and posts into custom collections directory</h5>
+  <h5>Be sure to move posts into custom collections directory</h5>
 
-  <p>If you specify a directory to store all your collections in the same place with <code>collections_dir: my_collections</code>, then you will need to move your <code>_drafts</code> and <code>_posts</code> directory to <code>my_collections/_drafts</code> and <code>my_collections/_posts</code>. Note that, the name of your collections directory cannot start with an underscore (`_`).</p>
+  <p>If you specify a directory to store all your collections in the same place with <code>collections_dir: my_collections</code>, then you will need to move your <code>_posts</code> directory to <code>my_collections/_posts</code>. Note that, the name of your collections directory cannot start with an underscore (`_`).</p>
 </div>
 
 ### Step 2: Add your content {#step2}

docs/_docs/continuous-integration/circleci.md

@@ -61,7 +61,7 @@ test:
 
 ## Complete Example circle.yml File
 
-When you put it all together, here's an example of what that `circle.yml` file could look like in v1:
+When you put it all together, here's an example of what that `circle.yml` file could look like:
 
 ```yaml
 machine:
@@ -83,75 +83,6 @@ deployment:
       - rsync -va --delete ./_site username@my-website:/var/html
 ```
 
-for CircleCI v2, a Docker-based system which new projects will follow, set the `S3_BUCKET_NAME` environment variable (an example of the required config file is shown below).
-
-```yaml
-defaults: &defaults
-  working_directory: ~/repo
-version: 2
-jobs:
-  build:
-    <<: *defaults
-    docker:
-      - image: circleci/ruby:2.5
-    environment:
-      BUNDLE_PATH: ~/repo/vendor/bundle
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-            - rubygems-v1-{% raw %}{{ checksum "Gemfile.lock" }}{% endraw %}
-            - rubygems-v1-fallback
-      - run:
-          name: Bundle Install
-          command: bundle check || bundle install
-      - run:
-          name: HTMLProofer tests
-          command: |
-            bundle exec htmlproofer ./_site \
-              --allow-hash-href \
-              --check-favicon  \
-              --check-html \
-              --disable-external
-      - save_cache:
-          key: rubygems-v1-{% raw %}{{ checksum "Gemfile.lock" }}{% endraw %}
-          paths:
-            - vendor/bundle
-      - run:
-          name: Jekyll build
-          command: bundle exec jekyll build
-      - persist_to_workspace:
-          root: ./
-          paths:
-            - _site
-  deploy:
-    <<: *defaults
-    docker:
-      - image: circleci/python:3.6.3
-    environment:
-      S3_BUCKET_NAME: <<YOUR BUCKET NAME HERE>>
-    steps:
-      - attach_workspace:
-          at: ./
-      - run:
-          name: Install AWS CLI
-          command: pip install awscli --upgrade --user
-      - run:
-          name: Upload to s3
-          command: ~/.local/bin/aws s3 sync ./_site s3://$S3_BUCKET_NAME/ --delete --acl public-read
-workflows:
-  version: 2
-  test-deploy:
-    jobs:
-      - build
-      - deploy:
-          requires:
-            - build
-          filters:
-            branches:
-              only: master
-```
-
 ## Questions?
 
 This entire guide is open-source. Go ahead and [edit it][7] if you have a fix or [ask for help][8] if you run into trouble and need some help. CircleCI also has an [online community][9] for help.

docs/_docs/continuous-integration/travis-ci.md

@@ -76,7 +76,7 @@ with Ruby and requires RubyGems to install, we use the Ruby language build
 environment. Below is a sample `.travis.yml` file, followed by
 an explanation of each line.
 
-**Note:** You will need a Gemfile as well, [Travis will automatically install](https://docs.travis-ci.com/user/languages/ruby/#Dependency-Management) the dependencies based on the referenced gems. Here is an example `Gemfile` with two referenced gems, "jekyll" and "html-proofer":
+**Note:** You will need a Gemfile as well, [Travis will automatically install](https://docs.travis-ci.com/user/languages/ruby/#Dependency-Management) the dependencies based on the referenced gems:
 
 ```ruby
 source "https://rubygems.org"
@@ -90,7 +90,7 @@ Your `.travis.yml` file should look like this:
 ```yaml
 language: ruby
 rvm:
-  - 2.4.1
+- 2.3.3
 
 before_script:
  - chmod +x ./script/cibuild # or do this locally and commit
@@ -110,12 +110,6 @@ env:
   - NOKOGIRI_USE_SYSTEM_LIBRARIES=true # speeds up installation of html-proofer
 
 sudo: false # route your build to the container-based infrastructure for a faster build
-
-cache: bundler # caching bundler gem packages will speed up build
-
-# Optional: disable email notifications about the outcome of your builds
-notifications:
-  email: false
 ```
 
 Ok, now for an explanation of each line:
@@ -129,13 +123,12 @@ access to Bundler, RubyGems, and a Ruby runtime.
 
 ```yaml
 rvm:
-  - 2.4.1
+- 2.3.3
 ```
 
 RVM is a popular Ruby Version Manager (like rbenv, chruby, etc). This
 directive tells Travis the Ruby version to use when running your test
-script. Use a [version which is pre-installed on the Travis build docker][5]
-image to speed up the build.
+script.
 
 ```yaml
 before_script:
@@ -217,23 +210,6 @@ does need `sudo` access, modify the line to `sudo: required`.
 sudo: false
 ```
 
-To speed up the build, you should cache the gem packages created by `bundler`. 
-Travis has a pre-defined [cache strategy for this tool][6] which should have
-all the default configs to do exactly that.
-
-```yaml
-cache: bundler
-```
-
-Optionally, if you are not interested in the build email notifications you
-can disable them with this configuration. Travis supports a wide array of
-notification services, you may find [another one more useful (e.g. slack)][7].
-
-```yaml
-notifications:
-  email: false
-```
-
 ### Troubleshooting
 
 **Travis error:** *"You are trying to install in deployment mode after changing
@@ -251,6 +227,3 @@ fix or [ask for help][4] if you run into trouble and need some help.
 
 [3]: https://github.com/jekyll/jekyll/edit/master/docs/_docs/continuous-integration/travis-ci.md
 [4]: https://jekyllrb.com/help/
-[5]: https://docs.travis-ci.com/user/languages/ruby/#Specifying-Ruby-versions-and-implementations
-[6]: https://docs.travis-ci.com/user/caching/#Caching-directories-(Bundler%2C-dependencies)
-[7]: https://docs.travis-ci.com/user/notifications/

docs/_docs/drafts.md

@@ -3,7 +3,7 @@ title: Working with drafts
 permalink: /docs/drafts/
 ---
 
-Drafts are posts without a date in the filename. They're posts you're still working on and
+Drafts are posts without a date. They're posts you're still working on and
 don't want to publish yet. To get up and running with drafts, create a
 `_drafts` folder in your site's root (as described in the [site structure](/docs/structure/) section) and create your
 first draft:

docs/_docs/history.md

@@ -4,6 +4,15 @@ permalink: "/docs/history/"
 note: This file is autogenerated. Edit /History.markdown instead.
 ---
 
+## 3.8.4 / 2018-09-18
+{: #v3-8-4}
+
+### Bug Fixes
+{: #bug-fixes-v3-8-4}
+
+- security: fix `include` bypass of `EntryFilter#filter` symlink check ([#7228]({{ site.repository }}/issues/7228))
+
+
 ## 3.8.3 / 2018-06-05
 {: #v3-8-3}
 

docs/_docs/includes.md

@@ -86,7 +86,6 @@ For example, suppose you have a special image syntax with complex formatting, an
    <a href="http://jekyllrb.com">
    <img src="logo.png" style="max-width: 200px;"
       alt="Jekyll logo" />
-   </a>
    <figcaption>This is the Jekyll logo</figcaption>
 </figure>
 ```
@@ -99,7 +98,6 @@ You could templatize this content in your include and make each value available
    <a href="{{ include.url }}">
    <img src="{{ include.file }}" style="max-width: {{ include.max-width }};"
       alt="{{ include.alt }}"/>
-   </a>
    <figcaption>{{ include.caption }}</figcaption>
 </figure>
 ```

docs/_docs/installation.md

@@ -4,15 +4,13 @@ description: Official guide to install Jekyll on macOS, GNU/Linux or Windows.
 permalink: /docs/installation/
 ---
 
-Jekyll is a [Ruby Gem](http://guides.rubygems.org/rubygems-basics/), and can be
-installed on most systems.
-
 - [Requirements](#requirements)
-- [Install Jekyll on macOS](#macOS)
-- [Install Jekyll on Ubuntu Linux](#ubuntu)
-- [Install Jekyll on Windows](../windows/)
+- [Install on macOS](#macOS)
+- [Install on Windows](../windows/)
 - [Upgrade Jekyll](#upgrade-jekyll)
 
+Installing Jekyll should be straight-forward if your system meets the requirements.
+
 ## Requirements
 
 Before you start, make sure your system has the following:
@@ -113,35 +111,6 @@ Check out the [troubleshooting](../troubleshooting/) page or
 
 </div>
 
-## Install on Ubuntu Linux {#ubuntu}
-
-Before we install Jekyll, we need to make sure we have all the required
-dependencies.
-
-```sh
-sudo apt-get install ruby ruby-dev build-essential
-```
-
-It is best to avoid installing Ruby Gems as the root user. Therefore, we need to
-set up a gem installation directory for your user account. The following
-commands will add environment variables to your `~/.bashrc` file to configure
-the gem installation path. Run them now:
-
-```sh
-echo '# Install Ruby Gems to ~/gems' >> ~/.bashrc
-echo 'export GEM_HOME=$HOME/gems' >> ~/.bashrc
-echo 'export PATH=$HOME/gems/bin:$PATH' >> ~/.bashrc
-source ~/.bashrc
-```
-
-Finally, install Jekyll:
-
-```sh
-gem install jekyll bundler
-```
-
-That's it! You're ready to start using Jekyll.
-
 ## Upgrade Jekyll
 
 Before you start developing with Jekyll, you may want to check that you're up to date with the latest version. To find the currently installed version of Jekyll, run one of these commands:

docs/_docs/maintaining/releasing-a-new-version.md

@@ -69,14 +69,6 @@ And then, you're done! :tada: Feel free to celebrate!
 
 If you have access to the [@jekyllrb](https://twitter.com/jekyllrb) Twitter account, you should tweet the release post from there. If not, just ask another maintainer to do it or to give you access.
 
-### Build the docs
-
-We package our documentation as a :gem: Gem for offline use.
-
-This is done with the
-[**jekyll-docs**](https://github.com/jekyll/jekyll-docs#building) repository,
-and more detailed instructions are provided there.
-
 ## For non-core gems
 
 If you're not a maintainer for `jekyll/jekyll`, the procedure is much simpler in a lot of cases. Generally, the procedure still looks like this:

docs/_docs/pagination.md

@@ -14,7 +14,7 @@ your `_config.yml` under `plugins`. For Jekyll 2, this is standard.
 <div class="note info">
   <h5>Pagination only works within HTML files</h5>
   <p>
-    Pagination does not work from within Markdown files from
+    Pagination does not work from within Markdown or Textile files from
     your Jekyll site. Pagination works when called from within the HTML
     file, named <code>index.html</code>, which optionally may reside in and
     produce pagination from within a subdirectory, via the

docs/_docs/plugins.md

@@ -787,8 +787,6 @@ You can find a few useful plugins at the following locations:
 - [Jekyll::Paginate::Content](https://github.com/ibrado/jekyll-paginate-content): Content paginator in the style of jekyll-paginator-v2 that splits pages, posts, and collection entries into several pages. Specify a separator or use HTML <h1> etc. headers. Automatic splitting, single-page view, pager/trail, self-adjusting links, multipage TOC, SEO support.
 - [Premonition](https://github.com/amedia/premonition): Adds block-styled side content to your page. For example summary, notes, hints or warning boxes.
 - [jekyll-fontello](https://github.com/ericcornelissen/jekyll-fontello): A Jekyll plugin that automatically downloads your webfont from Fontello.
-- [Target Blank](https://github.com/keithmifsud/jekyll-target-blank): A Jekyll plugin to automatically open external links in a new browser tab or window.
-- [jekyll-info](https://github.com/swestmoreland/jekyll-info): A plugin to provide information about your Jekyll site’s configuration.
 
 #### Converters
 
@@ -828,7 +826,6 @@ You can find a few useful plugins at the following locations:
 - [replace_regex](https://github.com/sparanoid/replace_regex): A Liquid filter to perform regex replace.
 - [Jekyll Money](https://rubygems.org/gems/jekyll-money): A Jekyll plugin for dealing with money. Because we all have to at some point.
 - [jekyll-random](https://github.com/codecalm/jekyll-random) by [codecalm](https://nodecalm.net): A Jekyll plugin that generates pseudo-random data. Very useful when you want to generate a large amount of random data.
-- [jekyll-firstimage](https://github.com/nhoizey/jekyll-firstimage) adds a Liquid filter finding the first image in a HTML content string, including responsive images srcset.
 
 #### Tags
 
@@ -889,8 +886,6 @@ You can find a few useful plugins at the following locations:
 - [jekyll-html](https://github.com/kacperduras/jekyll-html): A Jekyll plugin to use HTML tags in Jekyll pages, posts and collections.
 - [jekyll-onebox](https://github.com/rriemann/jekyll-onebox): Liquid tag for displaying HTML previews (embeds) for links to popular domains. Plugin is based on [Onebox](https://github.com/discourse/onebox) that powers link previews in [Discourse](http://github.com/discourse/discourse) forums.
 - [jekyll-w2m](https://github.com/kacperduras/jekyll-w2m): A Jekyll plugin to liberate content from Microsoft Word documents (powered by [word-to-markdown](https://github.com/benbalter/word-to-markdown)).
-- [jekyll-flickr](https://github.com/rriemann/jekyll-flickr): Liquid tag for responsive Flickr images using HTML5 srcset. Subtitles and automatic license notices are supported.
-- [CAT](https://github.com/binfalse/jekyll-cat): Include the contents of any file (like the `include` command, but also for files outside of `_include`). Similar to Unix' `cat` tool; useful for including source code etc. in posts and pages.
 
 #### Collections
 
@@ -940,8 +935,6 @@ You can find a few useful plugins at the following locations:
 - [jekyll-pre-commit](https://github.com/mpchadwick/jekyll-pre-commit): A framework for running checks against your posts using a git pre-commit hook before you publish them.
 - [jekyll-pwa-plugin](https://github.com/lavas-project/jekyll-pwa): A plugin provides PWA support for Jekyll. It generates a service worker in Jekyll build process and makes precache and runtime cache available in the runtime with Google Workbox.
 - [jekyll-algolia](https://community.algolia.com/jekyll-algolia/): Add fast and relevant search to your Jekyll site through the Algolia API.
-- [jekyll-get](https://github.com/18F/jekyll-get): Download data from external JSON API sources to use in generating a site.
-- [jekyll-xml-source](https://github.com/mcred/jekyll-xml-source): Download XML and RSS from external sites for use in site data.
 
 <div class="note info">
   <h5>Submit your gem plugins</h5>

docs/_docs/quickstart.md

@@ -26,15 +26,13 @@ If you encounter any unexpected errors during the above, please refer to the [tr
 
 ## About Bundler
 
-`gem install bundler` installs the [bundler](https://rubygems.org/gems/bundler) gem through [RubyGems](https://rubygems.org/). You only need to install it once — not every time you create a new Jekyll project. Here are some additional details:
+`gem install jekyll bundler` installs the [jekyll](https://rubygems.org/gems/jekyll/) and [bundler](https://rubygems.org/gems/bundler) gems through [RubyGems](https://rubygems.org/). You need only to install the gems one time — not every time you create a new Jekyll project. Here are some additional details:
 
 * `bundler` is a gem that manages other Ruby gems. It makes sure your gems and gem versions are compatible, and that you have all necessary dependencies each gem requires.
 * The `Gemfile` and `Gemfile.lock` files inform Bundler about the gem requirements in your site. If your site doesn't have these Gemfiles, you can omit `bundle exec` and just run `jekyll serve`.
 
 * When you run `bundle exec jekyll serve`, Bundler uses the gems and versions as specified in `Gemfile.lock` to ensure your Jekyll site builds with no compatibility or dependency conflicts.
 
-For more information about how to use Bundler in your Jekyll project, this [tutorial](https://jekyllrb.com/tutorials/using-jekyll-with-bundler/) should provide answers to the most common questions and explain how to get up and running quickly.
- 
 ## Options for creating a new site with Jekyll
 
 `jekyll new <PATH>` installs a new Jekyll site at the path specified (relative to current directory). In this case, Jekyll will be installed in a directory called `myblog`. Here are some additional details:

docs/_docs/resources.md

@@ -25,7 +25,7 @@ Jekyll's growing use is producing a wide variety of tutorials, frameworks, exten
 
 ## Integrations
 
-- Use a SaaS service as a backend for forms (contact forms, hiring forms, etc.)
+- Use a saas service as a backend for forms (contact forms, hiring forms, etc.)
 
   - [Formspree (open source)](https://formspree.io/)
   - [FormKeep](https://formkeep.com/guides/contact-form-jekyll?utm_source=github&utm_medium=jekyll-docs&utm_campaign=contact-form-jekyll)

docs/_docs/structure.md

@@ -5,8 +5,7 @@ permalink: /docs/structure/
 
 Jekyll is, at its core, a text transformation engine. The concept behind the
 system is this: you give it text written in your favorite markup language, be
-that Markdown, [Textile](https://github.com/jekyll/jekyll-textile-converter)
-, or just plain HTML, and it churns that through a layout
+that Markdown, Textile, or just plain HTML, and it churns that through a layout
 or a series of layout files. Throughout that process you can tweak how you want
 the site URLs to look, what data gets displayed in the layout, and more. This
 is all done through editing text files; the static web site is the final
@@ -137,9 +136,9 @@ An overview of what each of these does:
         <p>
           Well-formatted site data should be placed here. The Jekyll engine
           will autoload all data files (using either the <code>.yml</code>,
-          <code>.yaml</code>, <code>.json</code>, <code>.csv</code> or
-          <code>.tsv</code> formats and extensions) in this directory,
-          and they will be accessible via `site.data`. If there's a file
+          <code>.yaml</code>, <code>.json</code> or <code>.csv</code>
+          formats and extensions) in this directory, and they will be
+          accessible via `site.data`. If there's a file
           <code>members.yml</code> under the directory, then you can access
           contents of the file through <code>site.data.members</code>.
         </p>
@@ -186,7 +185,7 @@ An overview of what each of these does:
     <tr>
       <td>
         <p><code>index.html</code> or <code>index.md</code> and other HTML,
-        Markdown files</p>
+        Markdown, Textile files</p>
       </td>
       <td>
         <p>

docs/_docs/templates.md

@@ -94,8 +94,7 @@ you come up with your own tags via plugins.
     <tr>
       <td>
         <p class="name"><strong>Date to String in ordinal US style</strong></p>
-        <p>Format a date to ordinal, US, short format.
-        {% include docs_version_badge.html version="3.8.0" %}</p>
+        <p>Format a date to ordinal, US, short format.</p>
       </td>
       <td class="align-center">
         <p>
@@ -123,8 +122,7 @@ you come up with your own tags via plugins.
     <tr>
       <td>
         <p class="name"><strong>Date to Long String in ordinal UK style</strong></p>
-        <p>Format a date to ordinal, UK, long format.
-        {% include docs_version_badge.html version="3.8.0" %}</p>
+        <p>Format a date to ordinal, UK, long format.</p>
       </td>
       <td class="align-center">
         <p>
@@ -149,8 +147,7 @@ you come up with your own tags via plugins.
     <tr>
       <td>
         <p class="name"><strong>Where Expression</strong></p>
-        <p>Select all the objects in an array where the expression is true.
-        {% include docs_version_badge.html version="3.2.0" %}</p>
+        <p>Select all the objects in an array where the expression is true. Jekyll v3.2.0 & later.</p>
       </td>
       <td class="align-center">
         <p>
@@ -181,8 +178,7 @@ you come up with your own tags via plugins.
     <tr>
       <td>
         <p class="name"><strong>Group By Expression</strong></p>
-        <p>Group an array's items using a Liquid expression.
-        {% include docs_version_badge.html version="3.4.0" %}</p>
+        <p>Group an array's items using a Liquid expression.</p>
       </td>
       <td class="align-center">
         <p>

docs/_docs/themes.md

@@ -19,8 +19,8 @@ In the case of Minima, you see only the following files in your Jekyll site dire
 ├── _config.yml
 ├── _posts
 │   └── 2016-12-04-welcome-to-jekyll.markdown
-├── about.markdown
-└── index.markdown
+├── about.md
+└── index.md
 ```
 
 The `Gemfile` and `Gemfile.lock` files are used by Bundler to keep track of the required gems and gem versions you need to build your Jekyll site.
@@ -52,8 +52,6 @@ To locate a theme's files on your computer:
    open $(bundle show minima)
    # On Windows
    explorer /usr/local/lib/ruby/gems/2.3.0/gems/minima-2.1.0
-   # On Linux
-   xdg-open $(bundle show minima)
    ```
 
    A Finder or Explorer window opens showing the theme's files and directories. The Minima theme gem contains these files:
@@ -166,21 +164,20 @@ For example, search for [jekyll theme on RubyGems](https://rubygems.org/search?u
 
 To install a gem-based theme:
 
-1. Add the theme gem to your site's `Gemfile`:
+1. Add the theme to your site's `Gemfile`:
 
    ```ruby
    # ./Gemfile
 
-   # This is an example, declare the theme gem you want to use here
-   gem "jekyll-theme-minimal"
+   gem "jekyll-theme-awesome"
    ```
-  Or if you've started with the `jekyll new` command, replace `gem "minima", "~> 2.0"` with the gem you want, e.g:
+  Or if you've started with the `jekyll new` command, replace `gem "minima", "~> 2.0"` with your theme-gem:
 
    ```diff
    # ./Gemfile
 
    - gem "minima", "~> 2.0"
-   + gem "jekyll-theme-minimal"
+   + gem "jekyll-theme-awesome"
    ```
 
 2. Install the theme:
@@ -192,7 +189,7 @@ To install a gem-based theme:
 3. Add the following to your site's `_config.yml` to activate the theme:
 
    ```yaml
-   theme: jekyll-theme-minimal
+   theme: jekyll-theme-awesome
    ```
 
 4. Build your site:
@@ -204,7 +201,7 @@ To install a gem-based theme:
 You can have multiple themes listed in your site's `Gemfile`, but only one theme can be selected in your site's `_config.yml`.
 {: .note .info }
 
-If you're publishing your Jekyll site on [GitHub Pages](https://pages.github.com/), note that GitHub Pages supports only [some gem-based themes](https://pages.github.com/themes/). GitHub Pages also supports [using any theme hosted on GitHub](https://help.github.com/articles/adding-a-jekyll-theme-to-your-github-pages-site/#adding-a-jekyll-theme-in-your-sites-_configyml-file) using the `remote_theme` configuration as if it were a gem-based theme.
+If you're publishing your Jekyll site on [GitHub Pages](https://pages.github.com/), note that GitHub Pages supports only some gem-based themes. See [Supported Themes](https://pages.github.com/themes/) in GitHub's documentation to see which themes are supported.
 
 ## Creating a gem-based theme
 

docs/_docs/upgrading/2-to-3.md

@@ -44,10 +44,6 @@ For `site.collections.myCollection` in Jekyll 2, you now do:
 
 This is a bit cumbersome at first, but is easier than a big `for` loop.
 
-### Textile support
-
-We dropped native support for Textile, from now on you have to install our  [jekyll-textile-converter](https://github.com/jekyll/jekyll-textile-converter) plugin to work with Textile files.
-
 ### Dropped dependencies
 
 We dropped a number of dependencies the Core Team felt were optional. As such, in 3.0, they must be explicitly installed and included if you use any of the features. They are:

docs/_docs/upgrading/3-to-4.md

@@ -1,51 +0,0 @@
----
-title: Upgrading from 3.x to 4.x
-permalink: /docs/upgrading/3-to-4/
----
-
-Upgrading from an older version of Jekyll? A few things have changed in Jekyll 4
-that you'll want to know about.
-
-Before we dive in, you need to have at least Ruby 2.3.0 installed. Run the following
-in your terminal to check
-
-```sh
-ruby -v
-```
-
-If you're using Ruby >= 2.3.0, go ahead and fetch the latest version of Jekyll:
-
-```sh
-gem update jekyll
-```
-
-
-### Template rendering
-
-We've slightly altered the way Jekyll parses and renders your various templates to improve
-the overall build times. Jekyll now parses a template once, caches it internally and then
-renders the parsed template multiple times as required by your pages and documents.
-
-The downside to this is that some of the community-authored plugins may not work as they
-previously used to.
-
-#### For Plugin-authors
-
-* If your plugin depends on the following code: `site.liquid_renderer.file(path).parse(content)`,
-note that the return value (`template`, an instance of *`Liquid::Template`*), from that line will
-always be the **same object** for a given `path`. <br/>
-The *`template`* instance is then rendered as previously, with respect to the `payload` passed to it.
-You'll therefore have to ensure that *`payload`* is not memoized or cached in your plugin instance.
-
-* If its a requirement that `template` you get from the above step *be different* at all times,
-you can invoke *`Liquid::Template`* directly:
-
-
-  ```diff
-  - template = site.liquid_renderer.file(path).parse(content)
-  + template = Liquid::Template.parse(content)
-  ```
-
----
-
-*Did we miss something? Please click "Improve this page" above and add a section. Thanks!*

docs/_docs/variables.md

@@ -124,7 +124,8 @@ following is a reference of the available data.
 
         A list of all <a href="/docs/static-files/">static files</a> (i.e.
         files not processed by Jekyll's converters or the Liquid renderer).
-        Each file has five properties: <code>path</code>, <code>modified_time</code>, <code>name</code>, <code>basename</code> and <code>extname</code>.
+        Each file has three properties: <code>path</code>,
+        <code>modified_time</code> and <code>extname</code>.
 
       </p></td>
     </tr>

docs/_docs/windows.md

@@ -7,72 +7,13 @@ While Windows is not an officially-supported platform, it can be used to run Jek
 
 
 ## Installing Jekyll
-The easiest way to run Jekyll is by using the [RubyInstaller][] for Windows.
 
-### Installation via RubyInstaller
-
-[RubyInstaller][] is a self-contained Windows-based installer that includes the Ruby language, an execution environment, important documentation, and more.
-We only cover RubyInstaller-2.4 and newer here, older versions need to [install the Devkit][Devkit-install] manually.
-
-1. Download and Install a **Ruby+Devkit** version from [RubyInstaller Downloads][RubyInstaller-downloads].
-   Use default options for installation.
-2. Open a new command prompt window from the start menu, so that changes to the `PATH` environment variable becomes effective.
-   Install Jekyll and Bundler via: `gem install jekyll bundler`
-3. Check if Jekyll installed properly: `jekyll -v`
-
-That's it, you're ready to install our [default minimal blog theme](https://github.com/jekyll/minima) with `jekyll new jekyll-website`.
-
-[RubyInstaller]: https://rubyinstaller.org/
-[RubyInstaller-downloads]: https://rubyinstaller.org/downloads/
-[Devkit-install]: https://github.com/oneclick/rubyinstaller/wiki/Development-Kit
+If you are using Windows 10 Anniversary Update, the easiest way to run Jekyll is by [installing][WSL-Guide] the new Bash on Ubuntu on Windows.
 
 
-### Encoding
+### Installation via Bash on Windows 10
 
-If you use UTF-8 encoding, make sure that no `BOM` header characters exist in your files or very, very bad things will happen to
-Jekyll. This is especially relevant when you're running Jekyll on Windows.
-
-Additionally, you might need to change the code page of the console window to UTF-8 in case you get a "Liquid Exception: Incompatible character encoding" error during the site generation process. It can be done with the following command:
-
-```sh
-chcp 65001
-```
-
-
-### Time-Zone Management
-
-Since Windows doesn't have a native source of zoneinfo data, the Ruby Interpreter would not understand IANA Timezones and hence using them had the `TZ` environment variable default to UTC/GMT 00:00.
-Though Windows users could alternatively define their blog's timezone by setting the key to use POSIX format of defining timezones, it wasn't as user-friendly when it came to having the clock altered to changing DST-rules.
-
-Jekyll now uses a rubygem to internally configure Timezone based on established [IANA Timezone Database][IANA-database].
-While 'new' blogs created with Jekyll v3.4 and greater, will have the following added to their 'Gemfile' by default, existing sites *will* have to update their 'Gemfile' (and installed) to enable development on Windows:
-
-```ruby
-# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
-gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
-```
-
-[IANA-database]: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
-
-### Auto Regeneration
-
-Jekyll uses the `listen` gem to watch for changes when the `--watch` switch is specified during a build or serve. While `listen` has built-in support for UNIX systems, it may require an extra gem for compatibility with Windows.
-
-Add the following to the Gemfile for your site if you have issues with auto-regeneration on Windows alone:
-
-```ruby
-gem 'wdm', '~> 0.1.1' if Gem.win_platform?
-```
-
-You have to use a [Ruby+Devkit](https://rubyinstaller.org/downloads/) version of the RubyInstaller.
-
-
-## Installation via Bash on Windows 10
-
-If you are using Windows 10 version 1607 or later, another option to run Jekyll is by [installing][WSL-Guide] the Windows Subsystem for Linux.
-
-
-*Note:* You must have [Windows Subsystem for Linux][BASH-WSL] enabled.
+*Note:* You must have [Bash on Ubuntu on Windows][BASH-WSL] enabled.
 
 First let's make sure all our packages / repositories are up to date. Open a new Command Prompt instance, and type the following:
 
@@ -89,7 +30,7 @@ Now we can install Ruby. To do this we will use a repository from [BrightBox](ht
 ```sh
 sudo apt-add-repository ppa:brightbox/ruby-ng
 sudo apt-get update
-sudo apt-get install ruby2.4 ruby2.4-dev build-essential dh-autoreconf
+sudo apt-get install ruby2.3 ruby2.3-dev build-essential dh-autoreconf
 ```
 
 Next let's update our Ruby gems:
@@ -110,12 +51,6 @@ Check if Jekyll installed properly by running:
 jekyll -v
 ```
 
-Configure the bundler/gem path so bundle doesn't prompt for sudo
-
-```sh
-bundle config path vendor/bundle
-```
-
 **And that's it!**
 
 To start a new project named `my_blog`, just run:
@@ -136,3 +71,148 @@ You can make sure time management is working properly by inspecting your `_posts
 [WSL-Guide]: https://msdn.microsoft.com/en-us/commandline/wsl/install_guide
 [BASH-WSL]: https://msdn.microsoft.com/en-us/commandline/wsl/about
 
+
+### Installation via RubyInstaller
+
+[RubyInstaller][] is a self-contained Windows-based installer that includes the Ruby language, an execution environment, important documentation, and more.
+
+1. Download and Install a package manager version from [RubyInstaller Downloads][RubyInstaller-downloads].
+2. Install Jekyll and Bundler via a command prompt window: `gem install jekyll bundler`
+3. Check if Jekyll installed properly: `jekyll -v`
+
+[RubyInstaller]: https://rubyinstaller.org/
+[RubyInstaller-downloads]: https://rubyinstaller.org/downloads/
+
+
+### Installation via Chocolatey
+
+A quick way to install Jekyll using Chocolatey is to follow the [installation instructions by David Burela](https://davidburela.wordpress.com/2015/11/28/easily-install-jekyll-on-windows-with-3-command-prompt-entries-and-chocolatey/):
+
+ 1. Install a package manager for Windows called [Chocolatey][]
+ 2. Install Ruby via Chocolatey: `choco install ruby -y`
+ 3. Reopen a command prompt and install Jekyll: `gem install jekyll`
+
+Updates in the infrastructure of Ruby may cause SSL errors when attempting to use `gem install` with versions of the RubyGems package older than 2.6. (The RubyGems package installed via the Chocolatey tool is version 2.3) If you have installed an older version, you can update the RubyGems package using the directions [here][ssl-certificate-update].
+
+[ssl-certificate-update]: http://guides.rubygems.org/ssl-certificate-update/#installing-using-update-packages
+
+
+### Installing *github-pages* via Chocolatey
+
+This section is part of an article written by [Jens Willmer][jwillmerPost]. To follow the instructions you need to have [Chocolatey][] installed on your system. If you already have a version of Ruby installed you need to uninstall it before you can continue.
+
+
+#### Install Ruby and Ruby development kit
+
+Open a command prompt and execute the following commands:
+
+ * `choco install ruby -version 2.2.4`
+ * `choco install ruby2.devkit` - _needed for compilation of json gem_
+
+
+#### Configure Ruby development kit
+
+The development kit did not set the environment path for Ruby so we need to do it.
+
+ * Open command prompt in `C:\tools\DevKit2`
+ * Execute `ruby dk.rb init` to create a file called `config.yml`
+ * Edit the `config.yml` file and include the path to Ruby `- C:/tools/ruby22`
+ * Execute the following command to set the path: `ruby dk.rb install`
+
+
+#### Nokogiri gem installation
+
+This gem is also needed in the github-pages and to get it running on Windows x64 we have to install a few things.
+
+**Note:** In the current [pre release][nokogiriFails] it works out of the box with Windows x64 but this version is not referenced in the github-pages.
+
+```sh
+choco install libxml2 -Source "https://www.nuget.org/api/v2/"
+
+choco install libxslt -Source "https://www.nuget.org/api/v2/"
+
+choco install libiconv -Source "https://www.nuget.org/api/v2/
+
+gem install nokogiri --^
+   --with-xml2-include=C:\Chocolatey\lib\libxml2.2.7.8.7\build\native\include^
+   --with-xml2-lib=C:\Chocolatey\lib\libxml2.redist.2.7.8.7\build\native\bin\v110\x64\Release\dynamic\cdecl^
+   --with-iconv-include=C:\Chocolatey\lib\libiconv.1.14.0.11\build\native\include^
+   --with-iconv-lib=C:\Chocolatey\lib\libiconv.redist.1.14.0.11\build\native\bin\v110\x64\Release\dynamic\cdecl^
+   --with-xslt-include=C:\Chocolatey\lib\libxslt.1.1.28.0\build\native\include^
+   --with-xslt-lib=C:\Chocolatey\lib\libxslt.redist.1.1.28.0\build\native\bin\v110\x64\Release\dynamic
+```
+
+#### Install github-pages
+
+  * Open command prompt and install [Bundler][]: `gem install bundler`
+  * Create a file called `Gemfile` without any extension in your root directory of your blog
+  * Copy & paste the two lines into the file:
+
+
+```ruby
+source 'https://rubygems.org'
+gem 'github-pages', group: :jekyll_plugins
+```
+
+ * **Note:** We use an unsecure connection because SSL throws exceptions in the version of Ruby
+ * Open a command prompt, target your local blog repository root, and install github-pages: `bundle install`
+
+
+After this process you should have github-pages installed on your system and you can host your blog again with `jekyll s`.
+There will be a warning on startup that you should include `gem 'wdm', '>= 0.1.0' if Gem.win_platform?` to your `Gemfile` but I could not get `jekyll s` working if I include that line so for the moment I ignore that warning.
+
+In the future the installation process of the github-pages should be as simple as the setup of the blog. But as long as the new version of the Nokogiri ([v1.6.8][nokogiriReleases]) is not stable and referenced, it is work to get it up and running on Windows.
+
+[jwillmerPost]: https://jwillmer.de/blog/tutorial/how-to-install-jekyll-and-pages-gem-on-windows-10-x46 "Installation instructions by Jens Willmer"
+[Chocolatey]: https://chocolatey.org/install "Package manager for Windows"
+[nokogiriFails]: https://github.com/sparklemotion/nokogiri/issues/1456#issuecomment-206481794 "Nokogiri fails to install on Ruby 2.3 for Windows"
+[Bundler]: http://bundler.io/ "Ruby Dependencie Manager"
+[nokogiriReleases]: https://github.com/sparklemotion/nokogiri/releases "Nokogiri Releases"
+
+For a more conventional way of installing Jekyll you can follow this [complete guide to install Jekyll 3 on Windows by Sverrir Sigmundarson][windows-installjekyll3].
+
+Optionally you can use [Autoinstall Jekyll for Windows][fastjekyll-autoinstall].
+
+[windows-installjekyll3]: https://labs.sverrirs.com/jekyll/
+[fastjekyll-autoinstall]: https://github.com/KeJunMao/fastjekyll#autoinstall-jekyll-for-windows
+
+
+## Encoding
+
+If you use UTF-8 encoding, make sure that no `BOM` header characters exist in your files or very, very bad things will happen to
+Jekyll. This is especially relevant when you're running Jekyll on Windows.
+
+Additionally, you might need to change the code page of the console window to UTF-8 in case you get a "Liquid Exception: Incompatible character encoding" error during the site generation process. It can be done with the following command:
+
+```sh
+chcp 65001
+```
+
+
+## Time-Zone Management
+
+Since Windows doesn't have a native source of zoneinfo data, the Ruby Interpreter would not understand IANA Timezones and hence using them had the `TZ` environment variable default to UTC/GMT 00:00.
+Though Windows users could alternatively define their blog's timezone by setting the key to use POSIX format of defining timezones, it wasn't as user-friendly when it came to having the clock altered to changing DST-rules.
+
+Jekyll now uses a rubygem to internally configure Timezone based on established [IANA Timezone Database][IANA-database].
+While 'new' blogs created with Jekyll v3.4 and greater, will have the following added to their 'Gemfile' by default, existing sites *will* have to update their 'Gemfile' (and installed) to enable development on Windows:
+
+```ruby
+# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+```
+
+[IANA-database]: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+
+
+## Auto Regeneration
+
+Jekyll uses the `listen` gem to watch for changes when the `--watch` switch is specified during a build or serve. While `listen` has built-in support for UNIX systems, it may require an extra gem for compatibility with Windows.
+
+Add the following to the Gemfile for your site if you have issues with auto-regeneration on Windows alone:
+
+```ruby
+gem 'wdm', '~> 0.1.1' if Gem.win_platform?
+```
+
+You may first have to download and install the [Ruby DevKit](https://rubyinstaller.org/downloads/) by following [the instructions here](https://github.com/oneclick/rubyinstaller/wiki/Development-Kit).

docs/_includes/footer.html

@@ -11,15 +11,5 @@
         </a>
       </p>
     </div>
-    <div class="unit two-thirds align-right center-on-mobiles">
-      <p>
-        Sponsored by
-        {% for sponsor in site.data.sponsors %}
-          <a href="{{ sponsor.url }}" style="margin-left: 10px;">
-            <img src="{{ sponsor.image }}" height="{{ sponsor.height }}" width="{{ sponsor.width }}" alt="{{ sponsor.name }}">
-          </a>
-        {% endfor %}
-      </p>
-    </div>
   </div>
 </footer>

docs/_posts/2018-03-14-development-update.md

@@ -1,28 +0,0 @@
----
-title: "Jekyll 4.0 is on the Horizon!"
-date: "2018-04-19 16:07:00 +0100"
-author: oe
-categories: [community]
----
-
-With the release of Jekyll 3.8.0, it's been 2 and a half years since the last major release. Jekyll 3.0.0 was released in late October of 2015! That's a long time ago, and we've been working towards the next major release of Jekyll for a couple of months now. Here's a small preview of what's to come:
-
-- Dropping support for Ruby 2.1 and 2.2. Both versions have reached their EOL period.
-- Dropping Pygments as a dependency. We're already defaulting to Rouge, and this removes the implicit Python dependency. (finally!)
-- Making the `link` tag use relative URLs. This is a big breaking change, but it's the cleaner solution.
-
-We're open to more ideas, though. If the development cost isn't too high, or if someone volunteers to take care of the implementation, it's likely that your suggestion might make it into Jekyll 4.0. Head over to this [issue] for more details. Some interesting topics might be improving Internationalization support in Jekyll, creating convenience Liquid tags, et cetera.
-
-That being said, the development period of version 4.0 begins _now_. This means a couple of things:
-
-- New features will only be implemented in Jekyll 4.0. There will be no 3.9.0 or the like.
-- Same with bug fixes, unless they concern something introduced in Jekyll 3.7 or 3.8, in which case we will backport the fixes and release a patch version.
-- Now is a great time to finally take on the feature you've wanted to see in Jekyll for ages! Just open an issue or experiment with the code to get going!
-
-As for a release date, we're currently aiming for late summer, around September or so. However, keep in mind that this project is purely volunteer-run, and as such, delays might occur and we might not hit that release date.
-
-Finally, this is a great time for newcomers to open-source to make their first contribution. We'll be doing our best to mark recommended contributions and create newcomer-friendly issues, as well as to provide mentoring throughout the contribution process (although we'd like to think that we're already pretty proficient at that). So if you've always been hestitant about contributing to a large open-source project, Jekyll is a good place to start!
-
-Happy Jekylling! :wave:
-
-[issue]: https://github.com/jekyll/jekyll/issues/6948

docs/_posts/2018-03-15-jekyll-3-8-0-released.markdown

@@ -1,43 +0,0 @@
----
-title: 'Jekyll 3.8.0 Released'
-date: 2018-04-19 19:45:15 +0530
-author: ashmaroli
-version: 3.8.0
-categories: [release]
----
-
-Aloha Jekyllers!! :wave:
-
-After months of toiling on the codebase and shipping a couple of release-candidates, the Jekyll Team is delighted to finally
-present `v3.8.0`, packed with optimizations, improvements, some new features and a couple of bug-fixes. Yay!!!
-
-Under the hood, Jekyll has undergone many minor changes that will allow it to run more performantly in the coming years. :smiley:
-Rest assured, our users should see minor improvements in their site's build times.
-
-Speaking of improvements, users running a site containing a huge amount of posts or those who like to use our `where` filter
-frequently in a single template, are going to see a massive reduction in their total build times!! :tada:
-
-Hold on, this version is not just about optimizations, there are some new features as well..:
-  * Detect non-existent variables and filters specified in a template by enabling `strict_variables` and `strict_filters` under the
-  `liquid` key in your config file.
-  * Allow *date filters* to output ordinal days.
-  * `jekyll doctor` now warns you if you have opted for custom `collections_dir` but placed `_posts` directory outside that
-  directory.
-
-..and yes, a couple of bug-fixes, notably:
-  * Jekyll now handles future-dated documents properly.
-  * Jekyll is able to handle Liquid blocks intelligently in excerpts.
-  * A few methods that were *not meant to be publically accessible* have been entombed properly.
-  * A few bugs that still plagued our `collections_dir` feature from `v3.7` got crushed.
-
-As always, the full list of changes since last release can be viewed [here](/docs/history/#v3-8-0).
-
-A big thanks to the following people who contributed to our repository with pull-requests that improved our codebase, documentation
-and tests:
-
-Ana María Martínez Gómez, Antonio Argote, Ashwin Maroli, Awjin Ahn, Ben Balter, Benjamin Høegh, Christian Oliff, Damien Solodow,
-David Zhang, Delson Lima, Eric Cornelissen, Florian Thomas, Frank Taillandier, Heinrich Hartmann, Jakob Vad Nielsen, John Eismeier,
-Kacper Duras, KajMagnus, Mario Cekic, Max Vilimpoc, Michael H, Mike Kasberg, Parker Moore, Pat Hawks, Paweł Kuna, Robert Riemann,
-Roger Rohrbach, Semen Zhydenko, Stefan Dellmuth, Tim Carry, olivia, and steelman.
-
-Happy Jekylling!! :sparkles:

docs/_posts/2018-08-01-jekyll-sponsoring.markdown

@@ -1,68 +0,0 @@
----
-title: "Sponsoring Jekyll's development"
-date: 2018-08-01 15:00:00 +0200
-author: oe
-categories: [community]
----
-
-_(TL;DR: We're open for sponsorships on our [OpenCollective page](https://opencollective.com/jekyll))_
-
-Hi Jekyllers,
-
-As you may know, Jekyll is a completely free and open source project. We offer our
-software and its related plugins and documentation at no cost because we believe
-that good software should not cost anything. We're not planning on changing that,
-but today I want to talk about a different monetary aspect of open source.
-
-Open source developers being paid for the work they do is a rare sight. Most open source
-software is effectively the result of hundreds and thousands of hours of free labor provided
-by individuals who are passionate enough to work outside of their day job to create
-software that, ironically, is being used by almost every company that offers
-digital services. It's a problem that has gotten more attention in recent years, with
-the open source community becoming more diverse and more and more companies actively
-investing in providing monetary support for open source developers.
-
-Jekyll has always been a product of volunteers. Rarely has someone been paid to implement
-a certain plugin or feature. Today, we're excited to announce that we will finally
-be able to fund our contributors! __We are opening an OpenCollective to receive
-individual and corporate sponsorships__. This is not unheard of, [Hugo](http://gohugo.io)
-is also funded by sponsorships, as are many other similar projects, such as
-[webpack](https://opencollective.com/webpack), [Babel](https://opencollective.com/babel) or
-[RuboCop](https://opencollective.com/rubocop).
-
-OpenCollective is a service that makes it easy for open source projects to receive funding
-from individuals and companies alike. It's specifically designed for open source and
-many other projects already use it for funding.
-
-Sponsoring is, for us, a method to finally realize some of the more ambitious goals we've had
-with the project for years. The closest thing we want to realize is to __release Jekyll 4.0, and
-to make it as polished as we can__. In the future, we would also like to work on other things that
-will improve the Jekyll ecosystem. Here's a couple of ideas:
-
-- Create a comprehensive official plugin and theme directory site
-- Improve tooling built around measuring and improving Jekyll's performance
-- Improve maintenance for official plugins
-- Including the community into official decisions; making Jekyll more friendly to folks in the community
-
-Again, these are just some ideas, but with the help of sponsoring, they are now one step closer
-to being realized :heart:
-
-<div align="center">
-  <img src="/img/forestry-logo.png" width="300" />
-</div>
-
-With that, we would like to announce our very first sponsor: [__Forestry.io__](https://forestry.io)! Forestry is
-a CMS that integrates with your Jekyll sites and lets you update content using a beautiful
-interface, and then automatically commits it back to your GitHub repository. We're excited to have
-them on board on a new, exciting step of our journey.
-
-Will anything change for Jekyll users? The answer is no - this step does not impact the Jekyll software
-in any aspect. In fact, you might see positive changes, such as more features and better
-performance. Surprisingly, that's what happens when you properly fund people for their work!
-
-If you have been a long time user for Jekyll and would like to give something back to the project,
-you can consider a small monthly donation to our [OpenCollective page](http://opencollective.com/jekyll).
-If your company heavily relies on Jekyll, do consider sponsoring us! Contact me at
-`olivia at fastmail dot com` and we'll figure something out together.
-
-Thanks for sticking with us, and happy Jekylling! :tada:

docs/_sass/_style.scss

@@ -224,7 +224,8 @@ footer {
 
   img {
     display: inline-block;
-    vertical-align: middle;
+    position: relative;
+    top: 8px;
     margin-left: 5px;
     opacity: .8;
     padding: 1px;

docs/_tutorials/custom-404-page.md

@@ -53,7 +53,7 @@ More info on configuring Apache Error Pages can found in [official documentation
 
 The procedure is just as simple as configuring Apache servers, but slightly different.
 
-The nginx configuration file depends on the system in which it is installed. In most systems, it is the `nginx.conf` file, which is usually located inside `/etc/nginx/` or `/etc/nginx/conf/`. However, in other systems like Ubuntu, you would have to look for a `default` nginx configuration file, containing server related information, which is usually located inside `/etc/nginx/sites-available/` or `/etc/nginx/sites-enabled/`. Add the following to your nginx configuration file, _i.e._ either to `nginx.conf` file or to `default` file:
+Add the following to the nginx configuration file, `nginx.conf`, which is usually located inside `/etc/nginx/` or `/etc/nginx/conf/`:
 
 ```nginx
 server {
@@ -63,11 +63,5 @@ server {
   }
 }
 ```
-If the `server` block already exists, only add the code inside the `server` block given above.
+
 The `location` directive prevents users from directly browsing the 404.html page.
-
-More info on nginx error page can be found on [nginx official documentation](http://nginx.org/en/docs/http/ngx_http_core_module.html#error_page).
-
-<p class="note warning">
-  Proceed with caution while editing the configuration file.
-</p>

docs/_tutorials/using-jekyll-with-bundler.md

@@ -90,7 +90,7 @@ If you're storing your new site in version control, you'll want to ignore the
 `./vendor/` and `./.bundle/` folders since they contain user- or
 platform-specific information. New users will be able to install the correct
 dependencies based on `Gemfile` and `Gemfile.lock`, which should both be checked
-in. You can use this `.gitignore` to get started, if you want.
+in. You can use this `.gitigonre` to get started, if you want.
 
 **.gitignore**
 

docs/help/index.md

@@ -26,10 +26,6 @@ question!
 Get live support at **#jekyll** on **irc.freenode.net**, the official
 Jekyll IRC channel.
 
-### [The Dev community](https://dev.to/)
-
-[DEV’s jekyll tag](https://dev.to/t/jekyll) is a place to share Jekyll projects, articles and tutorials as well as start discussions and ask for feedback on Jekyll-related topics. Developers of all skill-levels are welcome to take part.
-
 ### View source
 
 Learn from the source of others, you'll find plenty of [jekyll sites](https://github.com/topics/jekyll-site) and [jekyll themes](https://github.com/topics/jekyll-themes) carefully handcrafted on GitHub.

docs/index.html

@@ -21,7 +21,7 @@ overview: true
     </div>
     <div class="unit one-third">
       <h2>Static</h2>
-      <p><a href="https://daringfireball.net/projects/markdown/">Markdown</a>, <a href="https://github.com/Shopify/liquid/wiki">Liquid</a>, HTML <span class="amp">&amp;</span> CSS go in. Static sites come out ready for deployment.</p>
+      <p><a href="https://daringfireball.net/projects/markdown/">Markdown</a> (or <a href="http://redcloth.org/textile">Textile</a>), <a href="https://github.com/Shopify/liquid/wiki">Liquid</a>, HTML <span class="amp">&amp;</span> CSS go in. Static sites come out ready for deployment.</p>
       <a href="/docs/templates/">Jekyll template guide &rarr;</a>
     </div>
     <div class="unit one-third">
@@ -45,7 +45,7 @@ overview: true
         <p class="line">
           <span class="path">~</span>
           <span class="prompt">$</span>
-          <span class="command">gem install bundler jekyll</span>
+          <span class="command">gem install jekyll bundler</span>
         </p>
         <p class="line">
           <span class="path">~</span>

docs/latest_version.txt

@@ -1 +1 @@
-3.8.3
+3.8.4

features/post_data.feature

@@ -251,19 +251,6 @@ Feature: Post data
     And I should see "Post categories: scifi and Movies" in "_site/scifi/movies/2009/03/27/star-wars.html"
     And I should see "Post categories: SciFi and movies" in "_site/scifi/movies/2013/03/17/star-trek.html"
 
-Scenario: Use page.render_with_liquid variable
-  Given I have a _posts directory
-  And I have the following posts:
-    | title           | render_with_liquid | date       | content                |
-    | Unrendered Post | false              | 2017-07-06 | Hello {{ page.title }} |
-    | Rendered Post   | true               | 2017-07-06 | Hello {{ page.title }} |
-  When I run jekyll build
-  Then I should get a zero exit status
-  And the _site directory should exist
-  And I should not see "Hello Unrendered Post" in "_site/2017/07/06/unrendered-post.html"
-  But I should see "Hello {{ page.title }}" in "_site/2017/07/06/unrendered-post.html"
-  And I should see "Hello Rendered Post" in "_site/2017/07/06/rendered-post.html"
-
   Scenario Outline: Use page.path variable
     Given I have a <dir>/_posts directory
     And I have the following post in "<dir>":

features/post_excerpts.feature

@@ -70,21 +70,3 @@ Feature: Post excerpts
     And the "_site/2007/12/31/entry1.html" file should exist
     And I should see "<p>content for entry1.</p>" in "_site/index.html"
     And I should see "<html><head></head><body><p>content for entry1.</p>\n</body></html>" in "_site/2007/12/31/entry1.html"
-
-  Scenario: Excerpts from posts having 'render_with_liquid' in their front matter
-    Given I have an "index.html" page that contains "{% for post in site.posts %}{{ post.excerpt }}{% endfor %}"
-    And I have a _posts directory
-    And I have a _layouts directory
-    And I have a post layout that contains "{{ page.excerpt }}"
-    And I have the following posts:
-      | title           | layout | render_with_liquid | date       | content                                  |
-      | Unrendered Post | post   | false              | 2017-07-06 | Liquid is not rendered at {{ page.url }} |
-      | Rendered Post   | post   | true               | 2017-07-06 | Liquid is rendered at {{ page.url }}     |
-    When I run jekyll build
-    Then I should get a zero exit status
-    And the _site/2017/07/06 directory should exist
-    And the "_site/2017/07/06/unrendered-post.html" file should exist
-    And the "_site/2017/07/06/rendered-post.html" file should exist
-    And I should see "Liquid is not rendered at {{ page.url }}" in "_site/2017/07/06/unrendered-post.html"
-    But I should see "<p>Liquid is rendered at /2017/07/06/rendered-post.html</p>" in "_site/2017/07/06/rendered-post.html"
-    And I should see "<p>Liquid is not rendered at {{ page.url }}</p>\n<p>Liquid is rendered at /2017/07/06/rendered-post.html</p>" in "_site/index.html"

features/site_configuration.feature

@@ -65,6 +65,14 @@ Feature: Site configuration
     And the "_site/Rakefile" file should not exist
     And the "_site/README" file should not exist
 
+  Scenario: Use RDiscount for markup
+    Given I have an "index.markdown" page that contains "[Google](https://www.google.com)"
+    And I have a configuration file with "markdown" set to "rdiscount"
+    When I run jekyll build
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "<a href=\"https://www.google.com\">Google</a>" in "_site/index.html"
+
   Scenario: Use Kramdown for markup
     Given I have an "index.markdown" page that contains "[Google](https://www.google.com)"
     And I have a configuration file with "markdown" set to "kramdown"
@@ -73,6 +81,14 @@ Feature: Site configuration
     And the _site directory should exist
     And I should see "<a href=\"https://www.google.com\">Google</a>" in "_site/index.html"
 
+  Scenario: Use Redcarpet for markup
+    Given I have an "index.markdown" page that contains "[Google](https://www.google.com)"
+    And I have a configuration file with "markdown" set to "redcarpet"
+    When I run jekyll build
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "<a href=\"https://www.google.com\">Google</a>" in "_site/index.html"
+
   Scenario: Highlight code with pygments
     Given I have an "index.html" page that contains "{% highlight ruby %} puts 'Hello world!' {% endhighlight %}"
     When I run jekyll build

jekyll.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.specification_version = 2 if s.respond_to? :specification_version=
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.rubygems_version = "2.2.2"
-  s.required_ruby_version = ">= 2.3.0"
+  s.required_ruby_version = ">= 2.1.0"
 
   s.name          = "jekyll"
   s.version       = Jekyll::VERSION
@@ -33,13 +33,14 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("addressable",           "~> 2.4")
   s.add_runtime_dependency("colorator",             "~> 1.0")
   s.add_runtime_dependency("em-websocket",          "~> 0.5")
-  s.add_runtime_dependency("i18n",                  ">= 0.9.5", "< 2")
+  s.add_runtime_dependency("i18n",                  "~> 0.7")
   s.add_runtime_dependency("jekyll-sass-converter", "~> 1.0")
   s.add_runtime_dependency("jekyll-watch",          "~> 2.0")
   s.add_runtime_dependency("kramdown",              "~> 1.14")
   s.add_runtime_dependency("liquid",                "~> 4.0")
   s.add_runtime_dependency("mercenary",             "~> 0.3.3")
   s.add_runtime_dependency("pathutil",              "~> 0.9")
-  s.add_runtime_dependency("rouge",                 "~> 3.0")
+  rouge_versions = ENV["ROUGE_VERSION"] ? ["~> #{ENV["ROUGE_VERSION"]}"] : [">= 1.7", "< 4"]
+  s.add_runtime_dependency("rouge",                 *rouge_versions)
   s.add_runtime_dependency("safe_yaml",             "~> 1.0")
 end

lib/jekyll.rb

@@ -54,7 +54,6 @@ module Jekyll
   autoload :FrontmatterDefaults, "jekyll/frontmatter_defaults"
   autoload :Hooks,               "jekyll/hooks"
   autoload :Layout,              "jekyll/layout"
-  autoload :Cache,               "jekyll/cache"
   autoload :CollectionReader,    "jekyll/readers/collection_reader"
   autoload :DataReader,          "jekyll/readers/data_reader"
   autoload :LayoutReader,        "jekyll/readers/layout_reader"

lib/jekyll/cache.rb

@@ -1,127 +0,0 @@
-# frozen_string_literal: true
-
-require "digest"
-require "fileutils"
-require "pstore"
-
-module Jekyll
-  class Cache
-    extend Forwardable
-
-    # Get an existing named cache, or create a new one if none exists
-    #
-    # name - name of the cache
-    #
-    # Returns nothing.
-    # rubocop:disable Style/ClassVars
-    def initialize(name)
-      @@base_dir ||= File.expand_path(".jekyll-cache/Jekyll/Cache")
-      @@caches ||= {}
-      @cache = @@caches[name] ||= {}
-      @name = name
-      FileUtils.mkdir_p(path_to)
-    end
-
-    def self.clear
-      delete_cache_files
-      @@caches.each_value(&:clear)
-    end
-    # rubocop:enable Style/ClassVars
-
-    def clear
-      delete_cache_files
-      @cache.clear
-    end
-
-    def [](key)
-      return @cache[key] if @cache.key?(key)
-      path = path_to(hash(key))
-      if File.file?(path) && File.readable?(path)
-        @cache[key] = load(path)
-      else
-        raise
-      end
-    end
-
-    def getset(key)
-      return @cache[key] if @cache.key?(key)
-      path = path_to(hash(key))
-      if File.file?(path) && File.readable?(path)
-        value = load(path)
-      else
-        value = yield
-        dump(path, value)
-      end
-      @cache[key] = value
-    end
-
-    def []=(key, value)
-      @cache[key] = value
-      path = path_to(hash(key))
-      dump(path, value)
-    end
-
-    def delete(key)
-      @cache.delete(key)
-      path = path_to(hash(key))
-      File.delete(path)
-    end
-
-    def key?(key)
-      return true if @cache.key?(key)
-      path = path_to(hash(key))
-      File.file?(path) && File.readable?(path)
-    end
-
-    # rubocop:disable Style/ClassVars
-    def self.clear_if_config_changed(config)
-      config = config.inspect
-      cache = Jekyll::Cache.new "Jekyll::Cache"
-      unless cache.key?("config") && cache["config"] == config
-        delete_cache_files
-        @@caches = {}
-        cache = Jekyll::Cache.new "Jekyll::Cache"
-        cache["config"] = config
-      end
-    end
-    # rubocop:enable Style/ClassVars
-
-    private
-
-    def path_to(hash = nil)
-      @base_dir ||= File.join(@@base_dir, @name)
-      return @base_dir if hash.nil?
-      File.join(@base_dir, hash[0..1], hash[2..-1]).freeze
-    end
-
-    def hash(key)
-      Digest::SHA2.hexdigest(key).freeze
-    end
-
-    def delete_cache_files
-      FileUtils.rm_rf(path_to)
-    end
-
-    # rubocop:disable Security/MarshalLoad
-    def load(path)
-      cached_file = File.open(path, "rb")
-      value = Marshal.load(cached_file)
-      cached_file.close
-      value
-    end
-    # rubocop:enable Security/MarshalLoad
-
-    def dump(path, value)
-      dir, _file = File.split(path)
-      FileUtils.mkdir_p(dir)
-      cached_file = File.open(path, "wb")
-      Marshal.dump(value, cached_file)
-      cached_file.close
-    end
-
-    def self.delete_cache_files
-      FileUtils.rm_rf(@@base_dir)
-    end
-    private_class_method :delete_cache_files
-  end
-end

lib/jekyll/collection.rb

@@ -35,7 +35,7 @@ module Jekyll
     def method_missing(method, *args, &blck)
       if docs.respond_to?(method.to_sym)
         Jekyll.logger.warn "Deprecation:",
-                           "#{label}.#{method} should be changed to #{label}.docs.#{method}."
+          "#{label}.#{method} should be changed to #{label}.docs.#{method}."
         Jekyll.logger.warn "", "Called by #{caller(0..0)}."
         docs.public_send(method.to_sym, *args, &blck)
       else
@@ -207,12 +207,18 @@ module Jekyll
       @container ||= site.config["collections_dir"]
     end
 
+    private
+
     def read_document(full_path)
       doc = Document.new(full_path, :site => site, :collection => self)
       doc.read
-      docs << doc if site.unpublished || doc.published?
+      if site.unpublished || doc.published?
+        docs << doc
+      end
     end
 
+    private
+
     def read_static_file(file_path, full_path)
       relative_dir = Jekyll.sanitized_path(
         relative_directory,

lib/jekyll/command.rb

@@ -51,52 +51,28 @@ module Jekyll
       # rubocop:disable Metrics/MethodLength
       def add_build_options(cmd)
         cmd.option "config", "--config CONFIG_FILE[,CONFIG_FILE2,...]",
-                   Array, "Custom configuration file"
+          Array, "Custom configuration file"
         cmd.option "destination", "-d", "--destination DESTINATION",
-                   "The current folder will be generated into DESTINATION"
+          "The current folder will be generated into DESTINATION"
         cmd.option "source", "-s", "--source SOURCE", "Custom source directory"
         cmd.option "future", "--future", "Publishes posts with a future date"
         cmd.option "limit_posts", "--limit_posts MAX_POSTS", Integer,
-                   "Limits the number of posts to parse and publish"
+          "Limits the number of posts to parse and publish"
         cmd.option "watch", "-w", "--[no-]watch", "Watch for changes and rebuild"
         cmd.option "baseurl", "-b", "--baseurl URL",
-                   "Serve the website from the given base URL"
+          "Serve the website from the given base URL"
         cmd.option "force_polling", "--force_polling", "Force watch to use polling"
         cmd.option "lsi", "--lsi", "Use LSI for improved related posts"
         cmd.option "show_drafts", "-D", "--drafts", "Render posts in the _drafts folder"
         cmd.option "unpublished", "--unpublished",
-                   "Render posts that were marked as unpublished"
+          "Render posts that were marked as unpublished"
         cmd.option "quiet", "-q", "--quiet", "Silence output."
         cmd.option "verbose", "-V", "--verbose", "Print verbose output."
         cmd.option "incremental", "-I", "--incremental", "Enable incremental rebuild."
         cmd.option "strict_front_matter", "--strict_front_matter",
-                   "Fail if errors are present in front matter"
+          "Fail if errors are present in front matter"
       end
       # rubocop:enable Metrics/MethodLength
-
-      # Run ::process method in a given set of Jekyll::Command subclasses and suggest
-      # re-running the associated command with --trace switch to obtain any additional
-      # information or backtrace regarding the encountered Exception.
-      #
-      # cmd     - the Jekyll::Command to be handled
-      # options - configuration overrides
-      # klass   - an array of Jekyll::Command subclasses associated with the command
-      #
-      # Note that all exceptions are rescued..
-      # rubocop: disable RescueException
-      def process_with_graceful_fail(cmd, options, *klass)
-        klass.each { |k| k.process(options) if k.respond_to?(:process) }
-      rescue Exception => e
-        raise e if cmd.trace
-
-        msg = " Please append `--trace` to the `#{cmd.name}` command "
-        dashes = "-" * msg.length
-        Jekyll.logger.error "", dashes
-        Jekyll.logger.error "Jekyll #{Jekyll::VERSION} ", msg
-        Jekyll.logger.error "", " for any additional information or backtrace. "
-        Jekyll.logger.abort_with "", dashes
-      end
-      # rubocop: enable RescueException
     end
   end
 end

lib/jekyll/commands/build.rb

@@ -15,7 +15,7 @@ module Jekyll
 
             c.action do |_, options|
               options["serving"] = false
-              process_with_graceful_fail(c, options, self)
+              Jekyll::Commands::Build.process(options)
             end
           end
         end
@@ -31,14 +31,14 @@ module Jekyll
 
           if options.fetch("skip_initial_build", false)
             Jekyll.logger.warn "Build Warning:", "Skipping the initial build." \
-                               " This may result in an out-of-date site."
+                        " This may result in an out-of-date site."
           else
             build(site, options)
           end
 
           if options.fetch("detach", false)
             Jekyll.logger.info "Auto-regeneration:",
-                               "disabled when running server detached."
+              "disabled when running server detached."
           elsif options.fetch("watch", false)
             watch(site, options)
           else
@@ -60,7 +60,7 @@ module Jekyll
           Jekyll.logger.info "Source:", source
           Jekyll.logger.info "Destination:", destination
           Jekyll.logger.info "Incremental build:",
-                             (incremental ? "enabled" : "disabled. Enable with --incremental")
+            (incremental ? "enabled" : "disabled. Enable with --incremental")
           Jekyll.logger.info "Generating..."
           process_site(site)
           Jekyll.logger.info "", "done in #{(Time.now - t).round(3)} seconds."
@@ -76,12 +76,12 @@ module Jekyll
           # Warn Windows users that they might need to upgrade.
           if Utils::Platforms.bash_on_windows?
             Jekyll.logger.warn "",
-                               "Auto-regeneration may not work on some Windows versions."
+              "Auto-regeneration may not work on some Windows versions."
             Jekyll.logger.warn "",
-                               "Please see: https://github.com/Microsoft/BashOnWindows/issues/216"
+              "Please see: https://github.com/Microsoft/BashOnWindows/issues/216"
             Jekyll.logger.warn "",
-                               "If it does not work, please upgrade Bash on Windows or "\
-                               "run Jekyll with --no-watch."
+              "If it does not work, please upgrade Bash on Windows or "\
+                "run Jekyll with --no-watch."
           end
 
           External.require_with_graceful_fail "jekyll-watch"

lib/jekyll/commands/clean.rb

@@ -22,12 +22,10 @@ module Jekyll
           options = configuration_from_options(options)
           destination = options["destination"]
           metadata_file = File.join(options["source"], ".jekyll-metadata")
-          cache_dir = File.join(options["source"], options["cache_dir"])
           sass_cache = ".sass-cache"
 
           remove(destination, :checker_func => :directory?)
           remove(metadata_file, :checker_func => :file?)
-          remove(cache_dir, :checker_func => :directory?)
           remove(sass_cache, :checker_func => :directory?)
         end
 

lib/jekyll/commands/doctor.rb

@@ -11,7 +11,7 @@ module Jekyll
             c.alias(:hyde)
 
             c.option "config", "--config CONFIG_FILE[,CONFIG_FILE2,...]", Array,
-                     "Custom configuration file"
+                            "Custom configuration file"
 
             c.action do |_, options|
               Jekyll::Commands::Doctor.process(options)
@@ -48,18 +48,19 @@ module Jekyll
           posts_at_root = site.in_source_dir("_posts")
           return true unless File.directory?(posts_at_root)
           Jekyll.logger.warn "Warning:",
-                             "Detected '_posts' directory outside custom `collections_dir`!"
+            "Detected '_posts' directory outside custom `collections_dir`!"
           Jekyll.logger.warn "",
-                             "Please move '#{posts_at_root}' into the custom directory at " \
+            "Please move '#{posts_at_root}' into the custom directory at " \
             "'#{site.in_source_dir(site.config["collections_dir"])}'"
           false
         end
 
         def deprecated_relative_permalinks(site)
           if site.config["relative_permalinks"]
-            Jekyll::Deprecator.deprecation_message "Your site still uses relative permalinks," \
-                                                   " which was removed in Jekyll v3.0.0."
-            true
+            Jekyll::Deprecator.deprecation_message "Your site still uses relative" \
+                                " permalinks, which was removed in" \
+                                " Jekyll v3.0.0."
+            return true
           end
         end
 
@@ -116,7 +117,6 @@ module Jekyll
         end
 
         private
-
         def collect_urls(urls, things, destination)
           things.each do |thing|
             dest = thing.destination(destination)

lib/jekyll/commands/help.rb

@@ -25,7 +25,7 @@ module Jekyll
 
         def invalid_command(prog, cmd)
           Jekyll.logger.error "Error:",
-                              "Hmm... we don't know what the '#{cmd}' command is."
+                "Hmm... we don't know what the '#{cmd}' command is."
           Jekyll.logger.info  "Valid commands:", prog.commands.keys.join(", ")
         end
       end

lib/jekyll/commands/new.rb

@@ -62,32 +62,38 @@ module Jekyll
         private
 
         def gemfile_contents
-          <<~RUBY
-            source "https://rubygems.org"
-            # Hello! This is where you manage which Jekyll version is used to run.
-            # When you want to use a different version, change it below, save the
-            # file and run `bundle install`. Run Jekyll with `bundle exec`, like so:
-            #
-            #     bundle exec jekyll serve
-            #
-            # This will help ensure the proper Jekyll version is running.
-            # Happy Jekylling!
-            gem "jekyll", "~> #{Jekyll::VERSION}"
-            # This is the default theme for new Jekyll sites. You may change this to anything you like.
-            gem "minima", "~> 2.0"
-            # If you want to use GitHub Pages, remove the "gem "jekyll"" above and
-            # uncomment the line below. To upgrade, run `bundle update github-pages`.
-            # gem "github-pages", group: :jekyll_plugins
-            # If you have any plugins, put them here!
-            group :jekyll_plugins do
-              gem "jekyll-feed", "~> 0.6"
-            end
-            # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
-            gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
-            # Performance-booster for watching directories on Windows
-            gem "wdm", "~> 0.1.0" if Gem.win_platform?
+          <<-RUBY
+source "https://rubygems.org"
 
-          RUBY
+# Hello! This is where you manage which Jekyll version is used to run.
+# When you want to use a different version, change it below, save the
+# file and run `bundle install`. Run Jekyll with `bundle exec`, like so:
+#
+#     bundle exec jekyll serve
+#
+# This will help ensure the proper Jekyll version is running.
+# Happy Jekylling!
+gem "jekyll", "~> #{Jekyll::VERSION}"
+
+# This is the default theme for new Jekyll sites. You may change this to anything you like.
+gem "minima", "~> 2.0"
+
+# If you want to use GitHub Pages, remove the "gem "jekyll"" above and
+# uncomment the line below. To upgrade, run `bundle update github-pages`.
+# gem "github-pages", group: :jekyll_plugins
+
+# If you have any plugins, put them here!
+group :jekyll_plugins do
+  gem "jekyll-feed", "~> 0.6"
+end
+
+# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+
+# Performance-booster for watching directories on Windows
+gem "wdm", "~> 0.1.0" if Gem.win_platform?
+
+RUBY
         end
 
         def create_site(new_blog_path)

lib/jekyll/commands/new_theme.rb

@@ -2,41 +2,39 @@
 
 require "erb"
 
-module Jekyll
-  module Commands
-    class NewTheme < Jekyll::Command
-      class << self
-        def init_with_program(prog)
-          prog.command(:"new-theme") do |c|
-            c.syntax "new-theme NAME"
-            c.description "Creates a new Jekyll theme scaffold"
-            c.option "code_of_conduct", \
-                     "-c", "--code-of-conduct", \
-                     "Include a Code of Conduct. (defaults to false)"
+class Jekyll::Commands::NewTheme < Jekyll::Command
+  class << self
+    def init_with_program(prog)
+      prog.command(:"new-theme") do |c|
+        c.syntax "new-theme NAME"
+        c.description "Creates a new Jekyll theme scaffold"
+        c.option "code_of_conduct", \
+          "-c", "--code-of-conduct", \
+          "Include a Code of Conduct. (defaults to false)"
 
-            c.action do |args, opts|
-              Jekyll::Commands::NewTheme.process(args, opts)
-            end
-          end
+        c.action do |args, opts|
+          Jekyll::Commands::NewTheme.process(args, opts)
         end
-
-        # rubocop:disable Metrics/AbcSize
-        def process(args, opts)
-          if !args || args.empty?
-            raise Jekyll::Errors::InvalidThemeName, "You must specify a theme name."
-          end
-
-          new_theme_name = args.join("_")
-          theme = Jekyll::ThemeBuilder.new(new_theme_name, opts)
-          Jekyll.logger.abort_with "Conflict:", "#{theme.path} already exists." if theme.path.exist?
-
-          theme.create!
-          Jekyll.logger.info "Your new Jekyll theme, #{theme.name.cyan}," \
-                             " is ready for you in #{theme.path.to_s.cyan}!"
-          Jekyll.logger.info "For help getting started, read #{theme.path}/README.md."
-        end
-        # rubocop:enable Metrics/AbcSize
       end
     end
+
+    # rubocop:disable Metrics/AbcSize
+    def process(args, opts)
+      if !args || args.empty?
+        raise Jekyll::Errors::InvalidThemeName, "You must specify a theme name."
+      end
+
+      new_theme_name = args.join("_")
+      theme = Jekyll::ThemeBuilder.new(new_theme_name, opts)
+      if theme.path.exist?
+        Jekyll.logger.abort_with "Conflict:", "#{theme.path} already exists."
+      end
+
+      theme.create!
+      Jekyll.logger.info "Your new Jekyll theme, #{theme.name.cyan}," \
+        " is ready for you in #{theme.path.to_s.cyan}!"
+      Jekyll.logger.info "For help getting started, read #{theme.path}/README.md."
+    end
+    # rubocop:enable Metrics/AbcSize
   end
 end

lib/jekyll/commands/serve.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "thread"
+
 module Jekyll
   module Commands
     class Serve < Command
@@ -17,28 +19,25 @@ module Jekyll
           "host"                 => ["host", "-H", "--host [HOST]", "Host to bind to"],
           "open_url"             => ["-o", "--open-url", "Launch your site in a browser"],
           "detach"               => ["-B", "--detach",
-                                     "Run the server in the background",],
+            "Run the server in the background",],
           "ssl_key"              => ["--ssl-key [KEY]", "X.509 (SSL) Private Key."],
           "port"                 => ["-P", "--port [PORT]", "Port to listen on"],
           "show_dir_listing"     => ["--show-dir-listing",
-                                     "Show a directory listing instead of loading" \
-                                     " your index file.",],
+            "Show a directory listing instead of loading your index file.",],
           "skip_initial_build"   => ["skip_initial_build", "--skip-initial-build",
-                                     "Skips the initial site build which occurs before" \
-                                     " the server is started.",],
+            "Skips the initial site build which occurs before the server is started.",],
           "livereload"           => ["-l", "--livereload",
-                                     "Use LiveReload to automatically refresh browsers",],
+            "Use LiveReload to automatically refresh browsers",],
           "livereload_ignore"    => ["--livereload-ignore ignore GLOB1[,GLOB2[,...]]",
-                                     Array,
-                                     "Files for LiveReload to ignore. " \
-                                     "Remember to quote the values so your shell " \
-                                     "won't expand them",],
+            Array,
+            "Files for LiveReload to ignore. Remember to quote the values so your shell "\
+            "won't expand them",],
           "livereload_min_delay" => ["--livereload-min-delay [SECONDS]",
-                                     "Minimum reload delay",],
+            "Minimum reload delay",],
           "livereload_max_delay" => ["--livereload-max-delay [SECONDS]",
-                                     "Maximum reload delay",],
+            "Maximum reload delay",],
           "livereload_port"      => ["--livereload-port [PORT]", Integer,
-                                     "Port for LiveReload to listen on",],
+            "Port for LiveReload to listen on",],
         }.freeze
 
         DIRECTORY_INDEX = %w(
@@ -73,28 +72,33 @@ module Jekyll
               opts["serving"] = true
               opts["watch"]   = true unless opts.key?("watch")
 
-              # Set the reactor to nil so any old reactor will be GCed.
-              # We can't unregister a hook so while running tests we don't want to
-              # inadvertently keep using a reactor created by a previous test.
-              @reload_reactor = nil
-
-              config = configuration_from_options(opts)
-              config["url"] = default_url(config) if Jekyll.env == "development"
-
-              process_with_graceful_fail(cmd, config, Build, Serve)
+              start(opts)
             end
           end
         end
 
         #
 
+        def start(opts)
+          # Set the reactor to nil so any old reactor will be GCed.
+          # We can't unregister a hook so in testing when Serve.start is
+          # called multiple times we don't want to inadvertently keep using
+          # a reactor created by a previous test when our test might not
+          @reload_reactor = nil
+
+          config = configuration_from_options(opts)
+          if Jekyll.env == "development"
+            config["url"] = default_url(config)
+          end
+          [Build, Serve].each { |klass| klass.process(config) }
+        end
+
+        #
+
         def process(opts)
           opts = configuration_from_options(opts)
           destination = opts["destination"]
-          if opts["livereload"]
-            validate_options(opts)
-            register_reload_hooks(opts)
-          end
+          register_reload_hooks(opts) if opts["livereload"]
           setup(destination)
 
           start_up_webrick(opts, destination)
@@ -107,12 +111,11 @@ module Jekyll
         # Perform logical validation of CLI options
 
         private
-
         def validate_options(opts)
           if opts["livereload"]
             if opts["detach"]
-              Jekyll.logger.warn "Warning:", "--detach and --livereload are mutually exclusive." \
-                                 " Choosing --livereload"
+              Jekyll.logger.warn "Warning:",
+                "--detach and --livereload are mutually exclusive. Choosing --livereload"
               opts["detach"] = false
             end
             if opts["ssl_cert"] || opts["ssl_key"]
@@ -127,15 +130,18 @@ module Jekyll
               opts["watch"] = true
             end
           elsif %w(livereload_min_delay
-                   livereload_max_delay
-                   livereload_ignore
-                   livereload_port).any? { |o| opts[o] }
+              livereload_max_delay
+              livereload_ignore
+              livereload_port).any? { |o| opts[o] }
             Jekyll.logger.abort_with "--livereload-min-delay, "\
                "--livereload-max-delay, --livereload-ignore, and "\
                "--livereload-port require the --livereload option."
           end
         end
 
+        #
+
+        private
         # rubocop:disable Metrics/AbcSize
         def register_reload_hooks(opts)
           require_relative "serve/live_reload_reactor"
@@ -173,6 +179,7 @@ module Jekyll
         # when we get ready to party, checking for an setting up an error page
         # and making sure our destination exists.
 
+        private
         def setup(destination)
           require_relative "serve/servlet"
 
@@ -187,6 +194,9 @@ module Jekyll
           end
         end
 
+        #
+
+        private
         def webrick_opts(opts)
           opts = {
             :JekyllOptions      => opts,
@@ -207,8 +217,13 @@ module Jekyll
           opts
         end
 
+        #
+
+        private
         def start_up_webrick(opts, destination)
-          @reload_reactor.start(opts) if opts["livereload"]
+          if opts["livereload"]
+            @reload_reactor.start(opts)
+          end
 
           @server = WEBrick::HTTPServer.new(webrick_opts(opts)).tap { |o| o.unmount("") }
           @server.mount(opts["baseurl"].to_s, Servlet, destination, file_handler_opts)
@@ -219,15 +234,20 @@ module Jekyll
         end
 
         # Recreate NondisclosureName under utf-8 circumstance
+
+        private
         def file_handler_opts
-          WEBrick::Config::FileHandler.merge(
+          WEBrick::Config::FileHandler.merge({
             :FancyIndexing     => true,
             :NondisclosureName => [
               ".ht*", "~*",
-            ]
-          )
+            ],
+          })
         end
 
+        #
+
+        private
         def server_address(server, options = {})
           format_url(
             server.config[:SSLEnable],
@@ -237,14 +257,19 @@ module Jekyll
           )
         end
 
+        private
         def format_url(ssl_enabled, address, port, baseurl = nil)
-          format("%<prefix>s://%<address>s:%<port>i%<baseurl>s",
-                 :prefix  => ssl_enabled ? "https" : "http",
-                 :address => address,
-                 :port    => port,
-                 :baseurl => baseurl ? "#{baseurl}/" : "")
+          format("%<prefix>s://%<address>s:%<port>i%<baseurl>s", {
+            :prefix  => ssl_enabled ? "https" : "http",
+            :address => address,
+            :port    => port,
+            :baseurl => baseurl ? "#{baseurl}/" : "",
+          })
         end
 
+        #
+
+        private
         def default_url(opts)
           config = configuration_from_options(opts)
           format_url(
@@ -254,6 +279,9 @@ module Jekyll
           )
         end
 
+        #
+
+        private
         def launch_browser(server, opts)
           address = server_address(server, opts)
           return system "start", address if Utils::Platforms.windows?
@@ -266,6 +294,8 @@ module Jekyll
         # Keep in our area with a thread or detach the server as requested
         # by the user.  This method determines what we do based on what you
         # ask us to do.
+
+        private
         def boot_or_detach(server, opts)
           if opts["detach"]
             pid = Process.fork do
@@ -274,8 +304,7 @@ module Jekyll
 
             Process.detach(pid)
             Jekyll.logger.info "Server detached with pid '#{pid}'.", \
-                               "Run `pkill -f jekyll' or `kill -9 #{pid}'" \
-                               " to stop the server."
+              "Run `pkill -f jekyll' or `kill -9 #{pid}' to stop the server."
           else
             t = Thread.new { server.start }
             trap("INT") { server.shutdown }
@@ -284,6 +313,8 @@ module Jekyll
         end
 
         # Make the stack verbose if the user requests it.
+
+        private
         def enable_logging(opts)
           opts[:AccessLog] = []
           level = WEBrick::Log.const_get(opts[:JekyllOptions]["verbose"] ? :DEBUG : :WARN)
@@ -293,6 +324,8 @@ module Jekyll
         # Add SSL to the stack if the user triggers --enable-ssl and they
         # provide both types of certificates commonly needed.  Raise if they
         # forget to add one of the certificates.
+
+        private
         def enable_ssl(opts)
           cert, key, src =
             opts[:JekyllOptions].values_at("ssl_cert", "ssl_key", "source")
@@ -308,12 +341,13 @@ module Jekyll
           opts[:SSLEnable] = true
         end
 
+        private
         def start_callback(detached)
           unless detached
             proc do
               mutex.synchronize do
                 # Block until EventMachine reactor starts
-                @reload_reactor&.started_event&.wait
+                @reload_reactor.started_event.wait unless @reload_reactor.nil?
                 @running = true
                 Jekyll.logger.info("Server running...", "press ctrl-c to stop.")
                 @run_cond.broadcast
@@ -322,6 +356,7 @@ module Jekyll
           end
         end
 
+        private
         def stop_callback(detached)
           unless detached
             proc do
@@ -337,11 +372,13 @@ module Jekyll
           end
         end
 
+        private
         def mime_types
           file = File.expand_path("../mime.types", __dir__)
           WEBrick::HTTPUtils.load_mime_types(file)
         end
 
+        private
         def read_file(source_dir, file_path)
           File.read(Jekyll.sanitized_path(source_dir, file_path))
         end

lib/jekyll/commands/serve/live_reload_reactor.rb

@@ -58,7 +58,7 @@ module Jekyll
               EM.add_shutdown_hook { @stopped_event.set }
 
               Jekyll.logger.info "LiveReload address:",
-                                 "http://#{opts["host"]}:#{opts["livereload_port"]}"
+                "http://#{opts["host"]}:#{opts["livereload_port"]}"
             end
           end
           @thread.abort_on_exception = true
@@ -68,11 +68,11 @@ module Jekyll
         # http://feedback.livereload.com/knowledgebase/articles/86174-livereload-protocol
         def reload(pages)
           pages.each do |p|
-            json_message = JSON.dump(
+            json_message = JSON.dump({
               :command => "reload",
               :path    => p.url,
-              :liveCSS => true
-            )
+              :liveCSS => true,
+            })
 
             Jekyll.logger.debug "LiveReload:", "Reloading #{p.url}"
             Jekyll.logger.debug "", json_message
@@ -81,7 +81,6 @@ module Jekyll
         end
 
         private
-
         def connect(websocket, handshake)
           @connections_count += 1
           if @connections_count == 1
@@ -100,17 +99,22 @@ module Jekyll
           @websockets << websocket
         end
 
+        private
         def disconnect(websocket)
           @websockets.delete(websocket)
         end
 
+        private
         def print_message(json_message)
           msg = JSON.parse(json_message)
           # Not sure what the 'url' command even does in LiveReload.  The spec is silent
           # on its purpose.
-          Jekyll.logger.info "LiveReload:", "Browser URL: #{msg["url"]}" if msg["command"] == "url"
+          if msg["command"] == "url"
+            Jekyll.logger.info "LiveReload:", "Browser URL: #{msg["url"]}"
+          end
         end
 
+        private
         def log_error(error)
           Jekyll.logger.error "LiveReload experienced an error. " \
             "Run with --trace for more information."

lib/jekyll/commands/serve/servlet.rb

@@ -121,7 +121,9 @@ module Jekyll
           if @options["livereload_max_delay"]
             src += "&maxdelay=#{@options["livereload_max_delay"]}"
           end
-          src += "&port=#{@options["livereload_port"]}" if @options["livereload_port"]
+          if @options["livereload_port"]
+            src += "&port=#{@options["livereload_port"]}"
+          end
           src
         end
       end
@@ -176,8 +178,9 @@ module Jekyll
         end
         # rubocop:enable Naming/MethodName
 
-        private
+        #
 
+        private
         def validate_and_ensure_charset(_req, res)
           key = res.header.keys.grep(%r!content-type!i).first
           typ = res.header[key]
@@ -187,6 +190,9 @@ module Jekyll
           end
         end
 
+        #
+
+        private
         def set_defaults
           hash_ = @jekyll_opts.fetch("webrick", {}).fetch("headers", {})
           DEFAULTS.each_with_object(@headers = hash_) do |(key, val), hash|

lib/jekyll/configuration.rb

@@ -9,7 +9,6 @@ module Jekyll
       "source"              => Dir.pwd,
       "destination"         => File.join(Dir.pwd, "_site"),
       "collections_dir"     => "",
-      "cache_dir"           => ".jekyll-cache",
       "plugins_dir"         => "_plugins",
       "layouts_dir"         => "_layouts",
       "data_dir"            => "_data",
@@ -67,6 +66,14 @@ module Jekyll
         "strict_variables" => false,
       },
 
+      "rdiscount"           => {
+        "extensions" => [],
+      },
+
+      "redcarpet"           => {
+        "extensions" => [],
+      },
+
       "kramdown"            => {
         "auto_ids"      => true,
         "toc_levels"    => "1..6",
@@ -279,7 +286,6 @@ module Jekyll
     end
 
     private
-
     def style_to_permalink(permalink_style)
       case permalink_style.to_sym
       when :pretty
@@ -301,12 +307,14 @@ module Jekyll
     # file - the file from which the config was extracted
     #
     # Raises an ArgumentError if given config is not a hash
+    private
     def check_config_is_hash!(extracted_config, file)
       unless extracted_config.is_a?(Hash)
         raise ArgumentError, "Configuration file: (INVALID) #{file}".yellow
       end
     end
 
+    private
     def check_auto(config)
       if config.key?("auto") || config.key?("watch")
         Jekyll::Deprecator.deprecation_message "Auto-regeneration can no longer" \
@@ -317,6 +325,7 @@ module Jekyll
       end
     end
 
+    private
     def check_server(config)
       if config.key?("server")
         Jekyll::Deprecator.deprecation_message "The 'server' configuration option" \
@@ -326,6 +335,7 @@ module Jekyll
       end
     end
 
+    private
     def check_pygments(config)
       if config.key?("pygments")
         Jekyll::Deprecator.deprecation_message "The 'pygments' configuration option" \
@@ -338,6 +348,7 @@ module Jekyll
       end
     end
 
+    private
     def check_include_exclude(config)
       %w(include exclude).each do |option|
         if config[option].is_a?(String)
@@ -347,10 +358,11 @@ module Jekyll
             " as a list of comma-separated values."
           config[option] = csv_to_array(config[option])
         end
-        config[option]&.map!(&:to_s)
+        config[option].map!(&:to_s) if config[option]
       end
     end
 
+    private
     def check_coderay(config)
       if (config["kramdown"] || {}).key?("use_coderay")
         Jekyll::Deprecator.deprecation_message "Please change 'use_coderay'" \
@@ -359,6 +371,7 @@ module Jekyll
       end
     end
 
+    private
     def check_maruku(config)
       if config.fetch("markdown", "kramdown").to_s.casecmp("maruku").zero?
         Jekyll.logger.abort_with "Error:", "You're using the 'maruku' " \
@@ -375,6 +388,7 @@ module Jekyll
     #
     # Raises a Jekyll::Errors::InvalidConfigurationError if the config `plugins`
     # is a string
+    private
     def check_plugins(config)
       if config.key?("plugins") && config["plugins"].is_a?(String)
         Jekyll.logger.error "Configuration Error:", "You specified the" \
@@ -382,8 +396,8 @@ module Jekyll
           " use an array instead. If you wanted to set the directory of your" \
           " plugins, use the config key `plugins_dir` instead."
         raise Jekyll::Errors::InvalidConfigurationError,
-              "'plugins' should not be a string, but was: " \
-              "#{config["plugins"].inspect}. Use 'plugins_dir' instead."
+          "'plugins' should not be a string, but was: " \
+          "#{config["plugins"].inspect}. Use 'plugins_dir' instead."
       end
     end
   end

lib/jekyll/converters/markdown.rb

@@ -11,7 +11,9 @@ module Jekyll
         return if @setup ||= false
         unless (@parser = get_processor)
           Jekyll.logger.error "Invalid Markdown processor given:", @config["markdown"]
-          Jekyll.logger.info "", "Custom processors are not loaded in safe mode" if @config["safe"]
+          if @config["safe"]
+            Jekyll.logger.info "", "Custom processors are not loaded in safe mode"
+          end
           Jekyll.logger.error(
             "",
             "Available processors are: #{valid_processors.join(", ")}"
@@ -19,8 +21,6 @@ module Jekyll
           raise Errors::FatalException, "Bailing out; invalid Markdown processor."
         end
 
-        @cache = Jekyll::Cache.new("Jekyll::Converters::Markdown")
-
         @setup = true
       end
 
@@ -30,7 +30,9 @@ module Jekyll
       # rubocop:disable Naming/AccessorMethodName
       def get_processor
         case @config["markdown"].downcase
-        when "kramdown" then KramdownParser.new(@config)
+        when "redcarpet" then return RedcarpetParser.new(@config)
+        when "kramdown"  then return KramdownParser.new(@config)
+        when "rdiscount" then return RDiscountParser.new(@config)
         else
           custom_processor
         end
@@ -42,7 +44,7 @@ module Jekyll
       # are not in safe mode.)
 
       def valid_processors
-        %w(kramdown) + third_party_processors
+        %w(rdiscount kramdown redcarpet) + third_party_processors
       end
 
       # Public: A list of processors that you provide via plugins.
@@ -51,7 +53,7 @@ module Jekyll
 
       def third_party_processors
         self.class.constants - \
-          %w(KramdownParser PRIORITIES).map(
+          %w(KramdownParser RDiscountParser RedcarpetParser PRIORITIES).map(
             &:to_sym
           )
       end
@@ -72,16 +74,15 @@ module Jekyll
 
       def convert(content)
         setup
-        @cache.getset(content) do
-          @parser.convert(content)
-        end
+        @parser.convert(content)
       end
 
       private
-
       def custom_processor
         converter_name = @config["markdown"]
-        self.class.const_get(converter_name).new(@config) if custom_class_allowed?(converter_name)
+        if custom_class_allowed?(converter_name)
+          self.class.const_get(converter_name).new(@config)
+        end
       end
 
       # Private: Determine whether a class name is an allowed custom
@@ -91,6 +92,8 @@ module Jekyll
       #
       # Returns true if the parser name contains only alphanumeric
       # characters and is defined within Jekyll::Converters::Markdown
+
+      private
       def custom_class_allowed?(parser_name)
         parser_name !~ %r![^A-Za-z0-9_]! && self.class.constants.include?(
           parser_name.to_sym

lib/jekyll/converters/markdown/kramdown_parser.rb

@@ -47,7 +47,6 @@ module Jekyll
         end
 
         private
-
         def make_accessible(hash = @config)
           hash.keys.each do |key|
             hash[key.to_sym] = hash[key]
@@ -60,6 +59,8 @@ module Jekyll
         #   config[highlighter]
         # Where `enable_coderay` is now deprecated because Kramdown
         # supports Rouge now too.
+
+        private
         def highlighter
           return @highlighter if @highlighter
 
@@ -83,6 +84,7 @@ module Jekyll
           end
         end
 
+        private
         def strip_coderay_prefix(hash)
           hash.each_with_object({}) do |(key, val), hsh|
             cleaned_key = key.to_s.gsub(%r!\Acoderay_!, "")
@@ -100,6 +102,8 @@ module Jekyll
         # If our highlighter is CodeRay we go in to merge the CodeRay defaults
         # with your "coderay" key if it's there, deprecating it in the
         # process of you using it.
+
+        private
         def modernize_coderay_config
           unless @config["coderay"].empty?
             Jekyll::Deprecator.deprecation_message(

lib/jekyll/converters/markdown/rdiscount_parser.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Jekyll
+  module Converters
+    class Markdown
+      class RDiscountParser
+        def initialize(config)
+          unless defined?(RDiscount)
+            Jekyll::External.require_with_graceful_fail "rdiscount"
+          end
+          @config = config
+          @rdiscount_extensions = @config["rdiscount"]["extensions"].map(&:to_sym)
+        end
+
+        def convert(content)
+          rd = RDiscount.new(content, *@rdiscount_extensions)
+          html = rd.to_html
+          if @config["rdiscount"]["toc_token"]
+            html = replace_generated_toc(rd, html, @config["rdiscount"]["toc_token"])
+          end
+          html
+        end
+
+        private
+        def replace_generated_toc(rd_instance, html, toc_token)
+          if rd_instance.generate_toc && html.include?(toc_token)
+            utf8_toc = rd_instance.toc_content
+            utf8_toc.force_encoding("utf-8") if utf8_toc.respond_to?(:force_encoding)
+            html.gsub(toc_token, utf8_toc)
+          else
+            html
+          end
+        end
+      end
+    end
+  end
+end

lib/jekyll/converters/markdown/redcarpet_parser.rb

@@ -0,0 +1,112 @@
+# frozen_string_literal: true
+
+class Jekyll::Converters::Markdown::RedcarpetParser
+  module CommonMethods
+    def add_code_tags(code, lang)
+      code = code.to_s
+      code = code.sub(
+        %r!<pre>!,
+        "<pre><code class=\"language-#{lang}\" data-lang=\"#{lang}\">"
+      )
+      code = code.sub(%r!</pre>!, "</code></pre>")
+      code
+    end
+  end
+
+  module WithPygments
+    include CommonMethods
+    def block_code(code, lang)
+      unless defined?(Pygments)
+        Jekyll::External.require_with_graceful_fail("pygments")
+      end
+      lang = lang && lang.split.first || "text"
+      add_code_tags(
+        Pygments.highlight(
+          code,
+          {
+            :lexer   => lang,
+            :options => { :encoding => "utf-8" },
+          }
+        ),
+        lang
+      )
+    end
+  end
+
+  module WithoutHighlighting
+    require "cgi"
+
+    include CommonMethods
+
+    def code_wrap(code)
+      "<figure class=\"highlight\"><pre>#{CGI.escapeHTML(code)}</pre></figure>"
+    end
+
+    def block_code(code, lang)
+      lang = lang && lang.split.first || "text"
+      add_code_tags(code_wrap(code), lang)
+    end
+  end
+
+  module WithRouge
+    def block_code(_code, lang)
+      code = "<pre>#{super}</pre>"
+
+      "<div class=\"highlight\">#{add_code_tags(code, lang)}</div>"
+    end
+
+    protected
+    def rouge_formatter(_lexer)
+      Jekyll::Utils::Rouge.html_formatter(:wrap => false)
+    end
+  end
+
+  def initialize(config)
+    unless defined?(Redcarpet)
+      Jekyll::External.require_with_graceful_fail("redcarpet")
+    end
+    @config = config
+    @redcarpet_extensions = {}
+    @config["redcarpet"]["extensions"].each do |e|
+      @redcarpet_extensions[e.to_sym] = true
+    end
+
+    @renderer ||= class_with_proper_highlighter(@config["highlighter"])
+  end
+
+  def class_with_proper_highlighter(highlighter)
+    Class.new(Redcarpet::Render::HTML) do
+      case highlighter
+      when "pygments"
+        include WithPygments
+      when "rouge"
+        Jekyll::External.require_with_graceful_fail(%w(
+          rouge rouge/plugins/redcarpet
+        ))
+
+        unless Gem::Version.new(Rouge.version) > Gem::Version.new("1.3.0")
+          abort "Please install Rouge 1.3.0 or greater and try running Jekyll again."
+        end
+
+        include Rouge::Plugins::Redcarpet
+        include CommonMethods
+        include WithRouge
+      else
+        include WithoutHighlighting
+      end
+    end
+  end
+
+  def convert(content)
+    @redcarpet_extensions[:fenced_code_blocks] = \
+      !@redcarpet_extensions[:no_fenced_code_blocks]
+    if @redcarpet_extensions[:smart]
+      @renderer.send :include, Redcarpet::Render::SmartyPants
+    end
+    markdown = Redcarpet::Markdown.new(
+      @renderer.new(@redcarpet_extensions),
+      @redcarpet_extensions
+    )
+    markdown.render(content)
+  end
+end

lib/jekyll/converters/smartypants.rb

@@ -1,20 +1,16 @@
 # frozen_string_literal: true
 
-module Kramdown
-  module Parser
-    class SmartyPants < Kramdown::Parser::Kramdown
-      def initialize(source, options)
-        super
-        @block_parsers = [:block_html, :content]
-        @span_parsers =  [:smart_quotes, :html_entity, :typographic_syms, :span_html]
-      end
-
-      def parse_content
-        add_text @src.scan(%r!\A.*\n!)
-      end
-      define_parser(:content, %r!\A!)
-    end
+class Kramdown::Parser::SmartyPants < Kramdown::Parser::Kramdown
+  def initialize(source, options)
+    super
+    @block_parsers = [:block_html, :content]
+    @span_parsers =  [:smart_quotes, :html_entity, :typographic_syms, :span_html]
   end
+
+  def parse_content
+    add_text @src.scan(%r!\A.*\n!)
+  end
+  define_parser(:content, %r!\A!)
 end
 
 module Jekyll
@@ -24,7 +20,9 @@ module Jekyll
       priority :low
 
       def initialize(config)
-        Jekyll::External.require_with_graceful_fail "kramdown" unless defined?(Kramdown)
+        unless defined?(Kramdown)
+          Jekyll::External.require_with_graceful_fail "kramdown"
+        end
         @config = config["kramdown"].dup || {}
         @config[:input] = :SmartyPants
       end

lib/jekyll/convertible.rb

@@ -46,10 +46,10 @@ module Jekyll
         end
       rescue Psych::SyntaxError => e
         Jekyll.logger.warn "YAML Exception reading #{filename}: #{e.message}"
-        raise e if site.config["strict_front_matter"]
+        raise e if self.site.config["strict_front_matter"]
       rescue StandardError => e
         Jekyll.logger.warn "Error reading file #{filename}: #{e.message}"
-        raise e if site.config["strict_front_matter"]
+        raise e if self.site.config["strict_front_matter"]
       end
 
       self.data ||= {}
@@ -64,12 +64,12 @@ module Jekyll
     def validate_data!(filename)
       unless self.data.is_a?(Hash)
         raise Errors::InvalidYAMLFrontMatterError,
-              "Invalid YAML front matter in #{filename}"
+          "Invalid YAML front matter in #{filename}"
       end
     end
 
     def validate_permalink!(filename)
-      if self.data["permalink"]&.to_s&.empty?
+      if self.data["permalink"] && self.data["permalink"].to_s.empty?
         raise Errors::InvalidPermalinkError, "Invalid permalink in #{filename}"
       end
     end
@@ -125,12 +125,16 @@ module Jekyll
     #
     # Returns the type of self.
     def type
-      :pages if is_a?(Page)
+      if is_a?(Page)
+        :pages
+      end
     end
 
     # returns the owner symbol for hook triggering
     def hook_owner
-      :pages if is_a?(Page)
+      if is_a?(Page)
+        :pages
+      end
     end
 
     # Determine whether the document is an asset file.
@@ -160,7 +164,6 @@ module Jekyll
     #
     # Returns true if the file has Liquid Tags or Variables, false otherwise.
     def render_with_liquid?
-      return false if data["render_with_liquid"] == false
       Jekyll::Utils.has_liquid_construct?(content)
     end
 
@@ -178,7 +181,7 @@ module Jekyll
     #
     # Returns true if the layout is invalid, false if otherwise
     def invalid_layout?(layout)
-      !data["layout"].nil? && layout.nil? && !(is_a? Jekyll::Excerpt)
+      !data["layout"].nil? && layout.nil? && !(self.is_a? Jekyll::Excerpt)
     end
 
     # Recursively render layouts
@@ -207,7 +210,7 @@ module Jekyll
         renderer.payload = payload
       end.run
 
-      Jekyll.logger.debug "Post-Render Hooks:", relative_path
+      Jekyll.logger.debug "Post-Render Hooks:", self.relative_path
       Jekyll::Hooks.trigger hook_owner, :post_render, self
     ensure
       @_renderer = nil # this will allow the modifications above to disappear

lib/jekyll/deprecator.rb

@@ -34,7 +34,9 @@ module Jekyll
     end
 
     def arg_is_present?(args, deprecated_argument, message)
-      deprecation_message(message) if args.include?(deprecated_argument)
+      if args.include?(deprecated_argument)
+        deprecation_message(message)
+      end
     end
 
     def deprecation_message(message)

lib/jekyll/document.rb

@@ -159,7 +159,6 @@ module Jekyll
     #   or if the document doesn't contain any Liquid Tags or Variables,
     #   true otherwise.
     def render_with_liquid?
-      return false if data["render_with_liquid"] == false
       !(coffeescript_file? || yaml_file? || !Utils.has_liquid_construct?(content))
     end
 
@@ -205,11 +204,11 @@ module Jekyll
     #
     # Returns the computed URL for the document.
     def url
-      @url ||= URL.new(
+      @url ||= URL.new({
         :template     => url_template,
         :placeholders => url_placeholders,
-        :permalink    => permalink
-      ).to_s
+        :permalink    => permalink,
+      }).to_s
     end
 
     def [](key)
@@ -316,7 +315,7 @@ module Jekyll
     # method returns true, and if the site's Publisher will publish the document.
     # False otherwise.
     def write?
-      collection&.write? && site.publisher.publish?(self)
+      collection && collection.write? && site.publisher.publish?(self)
     end
 
     # The Document excerpt_separator, from the YAML Front-Matter or site
@@ -336,12 +335,16 @@ module Jekyll
 
     def next_doc
       pos = collection.docs.index { |post| post.equal?(self) }
-      collection.docs[pos + 1] if pos && pos < collection.docs.length - 1
+      if pos && pos < collection.docs.length - 1
+        collection.docs[pos + 1]
+      end
     end
 
     def previous_doc
       pos = collection.docs.index { |post| post.equal?(self) }
-      collection.docs[pos - 1] if pos && pos.positive?
+      if pos && pos > 0
+        collection.docs[pos - 1]
+      end
     end
 
     def trigger_hooks(hook_name, *args)
@@ -397,30 +400,32 @@ module Jekyll
     end
 
     def populate_categories
-      merge_data!(
+      merge_data!({
         "categories" => (
           Array(data["categories"]) + Utils.pluralized_array_from_hash(
             data, "category", "categories"
           )
-        ).map(&:to_s).flatten.uniq
-      )
+        ).map(&:to_s).flatten.uniq,
+      })
     end
 
     def populate_tags
-      merge_data!(
-        "tags" => Utils.pluralized_array_from_hash(data, "tag", "tags").flatten
-      )
+      merge_data!({
+        "tags" => Utils.pluralized_array_from_hash(data, "tag", "tags").flatten,
+      })
     end
 
     private
-
     def merge_categories!(other)
       if other.key?("categories") && !other["categories"].nil?
-        other["categories"] = other["categories"].split if other["categories"].is_a?(String)
+        if other["categories"].is_a?(String)
+          other["categories"] = other["categories"].split
+        end
         other["categories"] = (data["categories"] || []) | other["categories"]
       end
     end
 
+    private
     def merge_date!(source)
       if data.key?("date")
         data["date"] = Utils.parse_date(
@@ -430,6 +435,7 @@ module Jekyll
       end
     end
 
+    private
     def merge_defaults
       defaults = @site.frontmatter_defaults.all(
         relative_path,
@@ -438,6 +444,7 @@ module Jekyll
       merge_data!(defaults, :source => "front matter defaults") unless defaults.empty?
     end
 
+    private
     def read_content(opts)
       self.content = File.read(path, Utils.merged_file_read_opts(site, opts))
       if content =~ YAML_FRONT_MATTER_REGEXP
@@ -447,6 +454,7 @@ module Jekyll
       end
     end
 
+    private
     def read_post_data
       populate_title
       populate_categories
@@ -454,6 +462,7 @@ module Jekyll
       generate_excerpt
     end
 
+    private
     def handle_read_error(error)
       if error.is_a? Psych::SyntaxError
         Jekyll.logger.error "Error:", "YAML Exception reading #{path}: #{error.message}"
@@ -466,6 +475,7 @@ module Jekyll
       end
     end
 
+    private
     def populate_title
       if relative_path =~ DATE_FILENAME_MATCHER
         date, slug, ext = Regexp.last_match.captures
@@ -481,14 +491,18 @@ module Jekyll
       data["ext"]   ||= ext
     end
 
+    private
     def modify_date(date)
       if !data["date"] || data["date"].to_i == site.time.to_i
         merge_data!({ "date" => date }, :source => "filename")
       end
     end
 
+    private
     def generate_excerpt
-      data["excerpt"] ||= Jekyll::Excerpt.new(self) if generate_excerpt?
+      if generate_excerpt?
+        data["excerpt"] ||= Jekyll::Excerpt.new(self)
+      end
     end
   end
 end

lib/jekyll/drops/collection_drop.rb

@@ -7,8 +7,9 @@ module Jekyll
 
       mutable false
 
-      def_delegator  :@obj, :write?, :output
-      def_delegators :@obj, :label, :docs, :files, :directory, :relative_directory
+      def_delegator :@obj, :write?, :output
+      def_delegators :@obj, :label, :docs, :files, :directory,
+                            :relative_directory
 
       private def_delegator :@obj, :metadata, :fallback_data
 

lib/jekyll/drops/drop.rb

@@ -15,7 +15,11 @@ module Jekyll
       #
       # Returns the mutability of the class
       def self.mutable(is_mutable = nil)
-        @is_mutable = is_mutable || false
+        @is_mutable = if is_mutable
+                        is_mutable
+                      else
+                        false
+                      end
       end
 
       def self.mutable?
@@ -169,7 +173,7 @@ module Jekyll
       end
 
       def merge(other, &block)
-        dup.tap do |me|
+        self.dup.tap do |me|
           if block.nil?
             me.merge!(other)
           else

lib/jekyll/drops/site_drop.rb

@@ -8,7 +8,8 @@ module Jekyll
       mutable false
 
       def_delegator  :@obj, :site_data, :data
-      def_delegators :@obj, :time, :pages, :static_files, :documents, :tags, :categories
+      def_delegators :@obj, :time, :pages, :static_files, :documents,
+                            :tags, :categories
 
       private def_delegator :@obj, :config, :fallback_data
 

lib/jekyll/drops/unified_payload_drop.rb

@@ -17,7 +17,6 @@ module Jekyll
       end
 
       private
-
       def fallback_data
         @fallback_data ||= {}
       end

lib/jekyll/drops/url_drop.rb

@@ -80,7 +80,6 @@ module Jekyll
       end
 
       private
-
       def fallback_data
         {}
       end

lib/jekyll/entry_filter.rb

@@ -31,7 +31,12 @@ module Jekyll
 
     def filter(entries)
       entries.reject do |e|
-        special?(e) || backup?(e) || excluded?(e) || symlink?(e) unless included?(e)
+        # Reject this entry if it is a symlink.
+        next true if symlink?(e)
+        # Do not reject this entry if it is included.
+        next false if included?(e)
+        # Reject this entry if it is special, a backup file, or excluded.
+        special?(e) || backup?(e) || excluded?(e)
       end
     end
 

lib/jekyll/excerpt.rb

@@ -8,11 +8,10 @@ module Jekyll
     attr_accessor :content, :ext
     attr_writer   :output
 
-    def_delegators :@doc,
-                   :site, :name, :ext, :extname,
-                   :collection, :related_posts,
-                   :coffeescript_file?, :yaml_file?,
-                   :url, :next_doc, :previous_doc
+    def_delegators :@doc, :site, :name, :ext, :extname,
+                          :collection, :related_posts,
+                          :coffeescript_file?, :yaml_file?,
+                          :url, :next_doc, :previous_doc
 
     private :coffeescript_file?, :yaml_file?
 
@@ -49,14 +48,14 @@ module Jekyll
     #
     # Returns the relative_path for the doc this excerpt belongs to with #excerpt appended
     def relative_path
-      @relative_path ||= File.join(doc.relative_path, "#excerpt")
+      File.join(doc.relative_path, "#excerpt")
     end
 
     # Check if excerpt includes a string
     #
     # Returns true if the string passed in
     def include?(something)
-      (output&.include?(something)) || content.include?(something)
+      (output && output.include?(something)) || content.include?(something)
     end
 
     # The UID for this doc (useful in feeds).
@@ -77,7 +76,7 @@ module Jekyll
 
     # Returns the shorthand String identifier of this doc.
     def inspect
-      "<Excerpt: #{id}>"
+      "<Excerpt: #{self.id}>"
     end
 
     def output
@@ -89,7 +88,6 @@ module Jekyll
     end
 
     def render_with_liquid?
-      return false if data["render_with_liquid"] == false
       !(coffeescript_file? || yaml_file? || !Utils.has_liquid_construct?(content))
     end
 
@@ -162,18 +160,19 @@ module Jekyll
       Liquid::Template.tags[tag_name].superclass == Liquid::Block
     rescue NoMethodError
       Jekyll.logger.error "Error:",
-                          "A Liquid tag in the excerpt of #{doc.relative_path} couldn't be parsed."
+        "A Liquid tag in the excerpt of #{doc.relative_path} couldn't be " \
+        "parsed."
       raise
     end
 
     def print_build_warning
       Jekyll.logger.warn "Warning:", "Excerpt modified in #{doc.relative_path}!"
       Jekyll.logger.warn "",
-                         "Found a Liquid block containing separator '#{doc.excerpt_separator}'" \
-                         " and has been modified with the appropriate closing tag."
+        "Found a Liquid block containing separator '#{doc.excerpt_separator}' and has " \
+        "been modified with the appropriate closing tag."
       Jekyll.logger.warn "",
-                         "Feel free to define a custom excerpt or excerpt_separator in the" \
-                         " document's Front Matter if the generated excerpt is unsatisfactory."
+        "Feel free to define a custom excerpt or excerpt_separator in the document's " \
+        "Front Matter if the generated excerpt is unsatisfactory."
     end
   end
 end

lib/jekyll/external.rb

@@ -9,7 +9,6 @@ module Jekyll
       #
       def blessed_gems
         %w(
-          jekyll-compose
           jekyll-docs
           jekyll-import
         )
@@ -58,13 +57,13 @@ module Jekyll
             Jekyll.logger.debug "Requiring:", name.to_s
             require name
           rescue LoadError => e
-            Jekyll.logger.error "Dependency Error:", <<~MSG
-              Yikes! It looks like you don't have #{name} or one of its dependencies installed.
-              In order to use Jekyll as currently configured, you'll need to install this gem.
+            Jekyll.logger.error "Dependency Error:", <<-MSG
+Yikes! It looks like you don't have #{name} or one of its dependencies installed.
+In order to use Jekyll as currently configured, you'll need to install this gem.
 
-              The full error message from Ruby is: '#{e.message}'
+The full error message from Ruby is: '#{e.message}'
 
-              If you run into trouble, you can find helpful resources at https://jekyllrb.com/help/!
+If you run into trouble, you can find helpful resources at https://jekyllrb.com/help/!
             MSG
             raise Jekyll::Errors::MissingDependencyException, name
           end

lib/jekyll/filters.rb

@@ -225,7 +225,9 @@ module Jekyll
     #
     # Returns the filtered array of objects
     def sort(input, property = nil, nils = "first")
-      raise ArgumentError, "Cannot sort a null object." if input.nil?
+      if input.nil?
+        raise ArgumentError, "Cannot sort a null object."
+      end
       if property.nil?
         input.sort
       else
@@ -299,40 +301,35 @@ module Jekyll
     # We also utilize the Schwartzian transform to make this more efficient.
     def sort_input(input, property, order)
       input.map { |item| [item_property(item, property), item] }
-        .sort! do |a_info, b_info|
-          a_property = a_info.first
-          b_property = b_info.first
+        .sort! do |apple_info, orange_info|
+          apple_property = apple_info.first
+          orange_property = orange_info.first
 
-          if !a_property.nil? && b_property.nil?
+          if !apple_property.nil? && orange_property.nil?
             - order
-          elsif a_property.nil? && !b_property.nil?
+          elsif apple_property.nil? && !orange_property.nil?
             + order
           else
-            a_property <=> b_property || a_property.to_s <=> b_property.to_s
+            apple_property <=> orange_property
           end
         end
         .map!(&:last)
     end
 
+    private
     def item_property(item, property)
       if item.respond_to?(:to_liquid)
         property.to_s.split(".").reduce(item.to_liquid) do |subvalue, attribute|
-          parse_sort_input(subvalue[attribute])
+          subvalue[attribute]
         end
       elsif item.respond_to?(:data)
-        parse_sort_input(item.data[property.to_s])
+        item.data[property.to_s]
       else
-        parse_sort_input(item[property.to_s])
+        item[property.to_s]
       end
     end
 
-    # return numeric values as numbers for proper sorting
-    def parse_sort_input(property)
-      number_like = %r!\A\s*-?(?:\d+\.?\d*|\.\d+)\s*\Z!
-      return property.to_f if property =~ number_like
-      property
-    end
-
+    private
     def as_liquid(item)
       case item
       when Hash
@@ -356,6 +353,7 @@ module Jekyll
     end
 
     # Parse a string to a Liquid Condition
+    private
     def parse_condition(exp)
       parser = Liquid::Parser.new(exp)
       left_expr = parser.expression
@@ -372,6 +370,7 @@ module Jekyll
 
       condition
     end
+
   end
 end
 

lib/jekyll/filters/date_filters.rb

@@ -64,7 +64,6 @@ module Jekyll
       end
 
       private
-
       # month_type: Notations that evaluate to 'Month' via `Time#strftime` ("%b", "%B")
       # type: nil (default) or "ordinal"
       # style: nil (default) or "US"
@@ -82,6 +81,7 @@ module Jekyll
         time.strftime("%d #{month_type} %Y")
       end
 
+      private
       def ordinal(number)
         return "th" if (11..13).cover?(number)
 
@@ -93,11 +93,12 @@ module Jekyll
         end
       end
 
+      private
       def time(input)
         date = Liquid::Utils.to_date(input)
         unless date.respond_to?(:to_time)
           raise Errors::InvalidDateError,
-                "Invalid Date: '#{input.inspect}' is not a valid datetime."
+            "Invalid Date: '#{input.inspect}' is not a valid datetime."
         end
         date.to_time.dup.localtime
       end

lib/jekyll/filters/grouping_filters.rb

@@ -41,15 +41,16 @@ module Jekyll
       end
 
       private
-
       def parse_expression(str)
         Liquid::Variable.new(str, Liquid::ParseContext.new)
       end
 
+      private
       def groupable?(element)
         element.respond_to?(:group_by)
       end
 
+      private
       def grouped_array(groups)
         groups.each_with_object([]) do |item, array|
           array << {

lib/jekyll/filters/url_filters.rb

@@ -57,6 +57,7 @@ module Jekyll
         return input if input.nil? || input.empty? || input.start_with?("/")
         "/#{input}"
       end
+
     end
   end
 end

lib/jekyll/frontmatter_defaults.rb

@@ -122,7 +122,9 @@ module Jekyll
 
     def path_is_subpath?(path, parent_path)
       path.ascend do |ascended_path|
-        return true if ascended_path.to_s == parent_path.to_s
+        if ascended_path.to_s == parent_path.to_s
+          return true
+        end
       end
 
       false

lib/jekyll/hooks.rb

@@ -77,7 +77,9 @@ module Jekyll
           "following hooks #{@registry[owner].keys.inspect}"
       end
 
-      raise Uncallable, "Hooks must respond to :call" unless block.respond_to? :call
+      unless block.respond_to? :call
+        raise Uncallable, "Hooks must respond to :call"
+      end
 
       insert_hook owner, event, priority, &block
     end

lib/jekyll/liquid_extensions.rb

@@ -2,6 +2,7 @@
 
 module Jekyll
   module LiquidExtensions
+
     # Lookup a Liquid variable in the given context.
     #
     # context  - the Liquid context in question.
@@ -18,5 +19,6 @@ module Jekyll
 
       lookup || variable
     end
+
   end
 end

lib/jekyll/liquid_renderer.rb

@@ -21,7 +21,12 @@ module Jekyll
     end
 
     def file(filename)
+      Jekyll.logger.info "FILENAME:", filename
       filename.match(filename_regex)
+
+      Jekyll.logger.info "CAPTURES:", Regexp.last_match.captures
+      puts
+
       filename =
         if Regexp.last_match(1) == theme_dir("")
           ::File.join(::File.basename(Regexp.last_match(1)), Regexp.last_match(2))
@@ -53,7 +58,7 @@ module Jekyll
     private
 
     def filename_regex
-      @filename_regex ||= %r!\A(#{source_dir}/|#{theme_dir}/|/*)(.*)!i
+      @filename_regex ||= %r!\A(#{source_dir}/|#{theme_dir}/|\W*)(.*)!i
     end
 
     def new_profile_hash

lib/jekyll/liquid_renderer/file.rb

@@ -10,9 +10,7 @@ module Jekyll
 
       def parse(content)
         measure_time do
-          @template = Jekyll::Cache.new("Jekyll::LiquidRenderer::File").getset(content) do
-            Liquid::Template.parse(content, :line_numbers => true)
-          end
+          @template = Liquid::Template.parse(content, :line_numbers => true)
         end
 
         self
@@ -26,7 +24,6 @@ module Jekyll
         end
       end
 
-      # This method simply 'rethrows any error' before attempting to render the template.
       def render!(*args)
         measure_time do
           measure_bytes do

lib/jekyll/liquid_renderer/table.rb

@@ -1,98 +1,96 @@
 # frozen_string_literal: true
 
 module Jekyll
-  class LiquidRenderer
-    class Table
-      def initialize(stats)
-        @stats = stats
+  class LiquidRenderer::Table
+    def initialize(stats)
+      @stats = stats
+    end
+
+    def to_s(num_of_rows = 50)
+      data = data_for_table(num_of_rows)
+      widths = table_widths(data)
+      generate_table(data, widths)
+    end
+
+    private
+
+    def generate_table(data, widths)
+      str = String.new("\n")
+
+      table_head = data.shift
+      str << generate_row(table_head, widths)
+      str << generate_table_head_border(table_head, widths)
+
+      data.each do |row_data|
+        str << generate_row(row_data, widths)
       end
 
-      def to_s(num_of_rows = 50)
-        data = data_for_table(num_of_rows)
-        widths = table_widths(data)
-        generate_table(data, widths)
+      str << "\n"
+      str
+    end
+
+    def generate_table_head_border(row_data, widths)
+      str = String.new("")
+
+      row_data.each_index do |cell_index|
+        str << "-" * widths[cell_index]
+        str << "-+-" unless cell_index == row_data.length - 1
       end
 
-      private
+      str << "\n"
+      str
+    end
 
-      def generate_table(data, widths)
-        str = +"\n"
+    def generate_row(row_data, widths)
+      str = String.new("")
 
-        table_head = data.shift
-        str << generate_row(table_head, widths)
-        str << generate_table_head_border(table_head, widths)
+      row_data.each_with_index do |cell_data, cell_index|
+        str << if cell_index.zero?
+                 cell_data.ljust(widths[cell_index], " ")
+               else
+                 cell_data.rjust(widths[cell_index], " ")
+               end
 
-        data.each do |row_data|
-          str << generate_row(row_data, widths)
+        str << " | " unless cell_index == row_data.length - 1
+      end
+
+      str << "\n"
+      str
+    end
+
+    def table_widths(data)
+      widths = []
+
+      data.each do |row|
+        row.each_with_index do |cell, index|
+          widths[index] = [cell.length, widths[index]].compact.max
         end
-
-        str << "\n"
-        str
       end
 
-      def generate_table_head_border(row_data, widths)
-        str = +""
+      widths
+    end
 
-        row_data.each_index do |cell_index|
-          str << "-" * widths[cell_index]
-          str << "-+-" unless cell_index == row_data.length - 1
-        end
+    def data_for_table(num_of_rows)
+      sorted = @stats.sort_by { |_, file_stats| -file_stats[:time] }
+      sorted = sorted.slice(0, num_of_rows)
 
-        str << "\n"
-        str
+      table = [%w(Filename Count Bytes Time)]
+
+      sorted.each do |filename, file_stats|
+        row = []
+        row << filename
+        row << file_stats[:count].to_s
+        row << format_bytes(file_stats[:bytes])
+        row << format("%.3f", file_stats[:time])
+        table << row
       end
 
-      def generate_row(row_data, widths)
-        str = +""
+      table
+    end
 
-        row_data.each_with_index do |cell_data, cell_index|
-          str << if cell_index.zero?
-                   cell_data.ljust(widths[cell_index], " ")
-                 else
-                   cell_data.rjust(widths[cell_index], " ")
-                 end
-
-          str << " | " unless cell_index == row_data.length - 1
-        end
-
-        str << "\n"
-        str
-      end
-
-      def table_widths(data)
-        widths = []
-
-        data.each do |row|
-          row.each_with_index do |cell, index|
-            widths[index] = [cell.length, widths[index]].compact.max
-          end
-        end
-
-        widths
-      end
-
-      def data_for_table(num_of_rows)
-        sorted = @stats.sort_by { |_, file_stats| -file_stats[:time] }
-        sorted = sorted.slice(0, num_of_rows)
-
-        table = [%w(Filename Count Bytes Time)]
-
-        sorted.each do |filename, file_stats|
-          row = []
-          row << filename
-          row << file_stats[:count].to_s
-          row << format_bytes(file_stats[:bytes])
-          row << format("%.3f", file_stats[:time])
-          table << row
-        end
-
-        table
-      end
-
-      def format_bytes(bytes)
-        bytes /= 1024.0
-        format("%.2fK", bytes)
-      end
+    def format_bytes(bytes)
+      bytes /= 1024.0
+      format("%.2fK", bytes)
     end
   end
 end

lib/jekyll/log_adapter.rb

@@ -29,9 +29,7 @@ module Jekyll
     #
     # Returns nothing
     def log_level=(level)
-      writer.level = level if level.is_a?(Integer) && level.between?(0, 3)
-      writer.level = LOG_LEVELS[level] ||
-        raise(ArgumentError, "unknown log level")
+      writer.level = LOG_LEVELS.fetch(level)
       @level = level
     end
 
@@ -43,7 +41,6 @@ module Jekyll
         self.log_level = :debug
       end
       debug "Logging at level:", LOG_LEVELS.key(writer.level).to_s
-      debug "Jekyll Version:", Jekyll::VERSION
     end
 
     # Public: Print a debug message

lib/jekyll/page.rb

@@ -11,6 +11,8 @@ module Jekyll
 
     alias_method :extname, :ext
 
+    FORWARD_SLASH = "/".freeze
+
     # Attributes for Liquid templates
     ATTRIBUTES_FOR_LIQUID = %w(
       content
@@ -62,11 +64,11 @@ module Jekyll
     #
     # Returns the String destination directory.
     def dir
-      if url.end_with?("/")
+      if url.end_with?(FORWARD_SLASH)
         url
       else
         url_dir = File.dirname(url)
-        url_dir.end_with?("/") ? url_dir : "#{url_dir}/"
+        url_dir.end_with?(FORWARD_SLASH) ? url_dir : "#{url_dir}/"
       end
     end
 
@@ -95,11 +97,11 @@ module Jekyll
     #
     # Returns the String url.
     def url
-      @url ||= URL.new(
+      @url ||= URL.new({
         :template     => template,
         :placeholders => url_placeholders,
-        :permalink    => permalink
-      ).to_s
+        :permalink    => permalink,
+      }).to_s
     end
 
     # Returns a hash of URL placeholder names (as symbols) mapping to the

lib/jekyll/plugin.rb

@@ -13,7 +13,7 @@ module Jekyll
     #
 
     def self.inherited(const)
-      catch_inheritance(const) do |const_|
+      return catch_inheritance(const) do |const_|
         catch_inheritance(const_)
       end
     end
@@ -23,7 +23,9 @@ module Jekyll
     def self.catch_inheritance(const)
       const.define_singleton_method :inherited do |const_|
         (@children ||= Set.new).add const_
-        yield const_ if block_given?
+        if block_given?
+          yield const_
+        end
       end
     end
 
@@ -46,7 +48,9 @@ module Jekyll
     # Returns the Symbol priority.
     def self.priority(priority = nil)
       @priority ||= nil
-      @priority = priority if priority && PRIORITIES.key?(priority)
+      if priority && PRIORITIES.key?(priority)
+        @priority = priority
+      end
       @priority || :normal
     end
 
@@ -58,7 +62,9 @@ module Jekyll
     #
     # Returns the safety Boolean.
     def self.safe(safe = nil)
-      @safe = safe unless defined?(@safe) && safe.nil?
+      unless defined?(@safe) && safe.nil?
+        @safe = safe
+      end
       @safe || false
     end
 
@@ -68,7 +74,7 @@ module Jekyll
     #
     # Returns -1, 0, 1.
     def self.<=>(other)
-      PRIORITIES[other.priority] <=> PRIORITIES[priority]
+      PRIORITIES[other.priority] <=> PRIORITIES[self.priority]
     end
 
     # Spaceship is priority [higher -> lower]

lib/jekyll/reader.rb

@@ -76,7 +76,9 @@ module Jekyll
       dot_dirs.each do |file|
         dir_path = site.in_source_dir(dir, file)
         rel_path = File.join(dir, file)
-        @site.reader.read_directories(rel_path) unless @site.dest.chomp("/") == dir_path
+        unless @site.dest.chomp("/") == dir_path
+          @site.reader.read_directories(rel_path)
+        end
       end
     end
 

lib/jekyll/readers/data_reader.rb

@@ -54,14 +54,16 @@ module Jekyll
     def read_data_file(path)
       case File.extname(path).downcase
       when ".csv"
-        CSV.read(path,
-                 :headers  => true,
-                 :encoding => site.config["encoding"]).map(&:to_hash)
+        CSV.read(path, {
+          :headers  => true,
+          :encoding => site.config["encoding"],
+        }).map(&:to_hash)
       when ".tsv"
-        CSV.read(path,
-                 :col_sep  => "\t",
-                 :headers  => true,
-                 :encoding => site.config["encoding"]).map(&:to_hash)
+        CSV.read(path, {
+          :col_sep  => "\t",
+          :headers  => true,
+          :encoding => site.config["encoding"],
+        }).map(&:to_hash)
       else
         SafeYAML.load_file(path)
       end

lib/jekyll/readers/layout_reader.rb

@@ -63,7 +63,9 @@ module Jekyll
 
     def layout_directory_in_cwd
       dir = Jekyll.sanitized_path(Dir.pwd, site.config["layouts_dir"])
-      dir if File.directory?(dir) && !site.safe
+      if File.directory?(dir) && !site.safe
+        dir
+      end
     end
   end
 end

lib/jekyll/readers/post_reader.rb

@@ -62,9 +62,10 @@ module Jekyll
       @site.reader.get_entries(dir, magic_dir).map do |entry|
         next unless entry =~ matcher
         path = @site.in_source_dir(File.join(dir, magic_dir, entry))
-        Document.new(path,
-                     :site       => @site,
-                     :collection => @site.posts)
+        Document.new(path, {
+          :site       => @site,
+          :collection => @site.posts,
+        })
       end.reject(&:nil?)
     end
   end

lib/jekyll/readers/theme_assets_reader.rb

@@ -8,7 +8,7 @@ module Jekyll
     end
 
     def read
-      return unless site.theme&.assets_path
+      return unless site.theme && site.theme.assets_path
 
       Find.find(site.theme.assets_path) do |path|
         next if File.directory?(path)
@@ -21,7 +21,6 @@ module Jekyll
     end
 
     private
-
     def read_theme_asset(path)
       base = site.theme.root
       dir = File.dirname(path.sub("#{site.theme.root}/", ""))
@@ -29,18 +28,18 @@ module Jekyll
 
       if Utils.has_yaml_header?(path)
         append_unless_exists site.pages,
-                             Jekyll::Page.new(site, base, dir, name)
+          Jekyll::Page.new(site, base, dir, name)
       else
         append_unless_exists site.static_files,
-                             Jekyll::StaticFile.new(site, base, "/#{dir}", name)
+          Jekyll::StaticFile.new(site, base, "/#{dir}", name)
       end
     end
 
     def append_unless_exists(haystack, new_item)
       if haystack.any? { |file| file.relative_path == new_item.relative_path }
         Jekyll.logger.debug "Theme:",
-                            "Ignoring #{new_item.relative_path} in theme due to existing file " \
-                            "with that path in site."
+          "Ignoring #{new_item.relative_path} in theme due to existing file " \
+          "with that path in site."
         return
       end
 

lib/jekyll/regenerator.rb

@@ -28,7 +28,9 @@ module Jekyll
         regenerate_document?(document)
       else
         source_path = document.respond_to?(:path) ? document.path : nil
-        dest_path = document.destination(@site.dest) if document.respond_to?(:destination)
+        dest_path = if document.respond_to?(:destination)
+                      document.destination(@site.dest)
+                    end
         source_modified_or_dest_missing?(source_path, dest_path)
       end
     end
@@ -87,7 +89,9 @@ module Jekyll
       return true if path.nil?
 
       # Check for path in cache
-      return cache[path] if cache.key? path
+      if cache.key? path
+        return cache[path]
+      end
 
       if metadata[path]
         # If we have seen this file before,
@@ -161,6 +165,7 @@ module Jekyll
         end
     end
 
+    private
     def regenerate_page?(document)
       document.asset_file? || document.data["regenerate"] ||
         source_modified_or_dest_missing?(
@@ -168,6 +173,7 @@ module Jekyll
         )
     end
 
+    private
     def regenerate_document?(document)
       !document.write? || document.data["regenerate"] ||
         source_modified_or_dest_missing?(
@@ -175,11 +181,14 @@ module Jekyll
         )
     end
 
+    private
     def existing_file_modified?(path)
       # If one of this file dependencies have been modified,
       # set the regeneration bit for both the dependency and the file to true
       metadata[path]["deps"].each do |dependency|
-        return cache[dependency] = cache[path] = true if modified?(dependency)
+        if modified?(dependency)
+          return cache[dependency] = cache[path] = true
+        end
       end
 
       if File.exist?(path) && metadata[path]["mtime"].eql?(File.mtime(path))

lib/jekyll/renderer.rb

@@ -101,8 +101,8 @@ module Jekyll
           converter.convert output
         rescue StandardError => e
           Jekyll.logger.error "Conversion error:",
-                              "#{converter.class} encountered an error while "\
-                              "converting '#{document.relative_path}':"
+            "#{converter.class} encountered an error while "\
+            "converting '#{document.relative_path}':"
           Jekyll.logger.error("", e.to_s)
           raise e
         end
@@ -121,13 +121,13 @@ module Jekyll
       template = site.liquid_renderer.file(path).parse(content)
       template.warnings.each do |e|
         Jekyll.logger.warn "Liquid Warning:",
-                           LiquidRenderer.format_error(e, path || document.relative_path)
+          LiquidRenderer.format_error(e, path || document.relative_path)
       end
       template.render!(payload, info)
     # rubocop: disable RescueException
     rescue Exception => e
       Jekyll.logger.error "Liquid Exception:",
-                          LiquidRenderer.format_error(e, path || document.relative_path)
+        LiquidRenderer.format_error(e, path || document.relative_path)
       raise e
     end
     # rubocop: enable RescueException
@@ -166,12 +166,11 @@ module Jekyll
       output
     end
 
-    private
-
     # Checks if the layout specified in the document actually exists
     #
     # layout - the layout to check
     # Returns nothing
+    private
     def validate_layout(layout)
       if invalid_layout?(layout)
         Jekyll.logger.warn(
@@ -188,6 +187,7 @@ module Jekyll
     # Render layout content into document.output
     #
     # Returns String rendered content
+    private
     def render_layout(output, layout, info)
       payload["content"] = output
       payload["layout"]  = Utils.deep_merge_hashes(layout.data, payload["layout"] || {})
@@ -200,6 +200,7 @@ module Jekyll
       )
     end
 
+    private
     def add_regenerator_dependencies(layout)
       return unless document.write?
       site.regenerator.add_dependency(
@@ -211,14 +212,18 @@ module Jekyll
     # Set page content to payload and assign pager if document has one.
     #
     # Returns nothing
+    private
     def assign_pages!
       payload["page"] = document.to_liquid
-      payload["paginator"] = (document.pager.to_liquid if document.respond_to?(:pager))
+      payload["paginator"] = if document.respond_to?(:pager)
+                               document.pager.to_liquid
+                             end
     end
 
     # Set related posts to payload if document is a post.
     #
     # Returns nothing
+    private
     def assign_current_document!
       payload["site"].current_document = document
     end
@@ -226,16 +231,21 @@ module Jekyll
     # Set highlighter prefix and suffix
     #
     # Returns nothing
+    private
     def assign_highlighter_options!
       payload["highlighter_prefix"] = converters.first.highlighter_prefix
       payload["highlighter_suffix"] = converters.first.highlighter_suffix
     end
 
+    private
     def assign_layout_data!
       layout = layouts[document.data["layout"]]
-      payload["layout"] = Utils.deep_merge_hashes(layout.data, payload["layout"] || {}) if layout
+      if layout
+        payload["layout"] = Utils.deep_merge_hashes(layout.data, payload["layout"] || {})
+      end
     end
 
+    private
     def permalink_ext
       document_permalink = document.permalink
       if document_permalink && !document_permalink.end_with?("/")
@@ -244,6 +254,7 @@ module Jekyll
       end
     end
 
+    private
     def converter_output_ext
       if output_exts.size == 1
         output_exts.last
@@ -252,12 +263,14 @@ module Jekyll
       end
     end
 
+    private
     def output_exts
       @output_exts ||= converters.map do |c|
         c.output_ext(document.extname)
       end.compact
     end
 
+    private
     def liquid_options
       @liquid_options ||= site.config["liquid"]
     end

lib/jekyll/site.rb

@@ -44,8 +44,8 @@ module Jekyll
       @config = config.clone
 
       %w(safe lsi highlighter baseurl exclude include future unpublished
-         show_drafts limit_posts keep_files).each do |opt|
-        send("#{opt}=", config[opt])
+        show_drafts limit_posts keep_files).each do |opt|
+        self.send("#{opt}=", config[opt])
       end
 
       # keep using `gems` to avoid breaking change
@@ -98,9 +98,10 @@ module Jekyll
       @liquid_renderer.reset
       @site_cleaner = nil
 
-      raise ArgumentError, "limit_posts must be a non-negative number" if limit_posts.negative?
+      if limit_posts < 0
+        raise ArgumentError, "limit_posts must be a non-negative number"
+      end
 
-      Jekyll::Cache.clear_if_config_changed config
       Jekyll::Hooks.trigger :site, :after_reset, self
     end
 
@@ -123,7 +124,7 @@ module Jekyll
       Pathname.new(source).ascend do |path|
         if path == dest_pathname
           raise Errors::FatalException,
-                "Destination directory cannot be or contain the Source directory."
+            "Destination directory cannot be or contain the Source directory."
         end
       end
     end
@@ -173,7 +174,7 @@ module Jekyll
         start = Time.now
         generator.generate(self)
         Jekyll.logger.debug "Generating:",
-                            "#{generator.class} finished in #{Time.now - start} seconds."
+          "#{generator.class} finished in #{Time.now - start} seconds."
       end
     end
 
@@ -233,7 +234,7 @@ module Jekyll
       # array of posts ) then sort each array in reverse order.
       hash = Hash.new { |h, key| h[key] = [] }
       posts.docs.each do |p|
-        p.data[post_attr]&.each { |t| hash[t] << p }
+        p.data[post_attr].each { |t| hash[t] << p } if p.data[post_attr]
       end
       hash.each_value { |posts| posts.sort!.reverse! }
       hash
@@ -302,10 +303,10 @@ module Jekyll
     def relative_permalinks_are_deprecated
       if config["relative_permalinks"]
         Jekyll.logger.abort_with "Since v3.0, permalinks for pages" \
-                                 " in subfolders must be relative to the" \
-                                 " site source directory, not the parent" \
-                                 " directory. Check https://jekyllrb.com/docs/upgrading/"\
-                                 " for more info."
+                                " in subfolders must be relative to the" \
+                                " site source directory, not the parent" \
+                                " directory. Check https://jekyllrb.com/docs/upgrading/"\
+                                " for more info."
       end
     end
 
@@ -402,15 +403,14 @@ module Jekyll
       @collections_path ||= dir_str.empty? ? source : in_source_dir(dir_str)
     end
 
-    private
-
     # Limits the current posts; removes the posts which exceed the limit_posts
     #
     # Returns nothing
+    private
     def limit_posts!
-      if limit_posts.positive?
+      if limit_posts > 0
         limit = posts.docs.length < limit_posts ? posts.docs.length : limit_posts
-        posts.docs = posts.docs[-limit, limit]
+        self.posts.docs = posts.docs[-limit, limit]
       end
     end
 
@@ -418,15 +418,18 @@ module Jekyll
     # already exist.
     #
     # Returns The Cleaner
+    private
     def site_cleaner
       @site_cleaner ||= Cleaner.new(self)
     end
 
+    private
     def configure_plugins
       self.plugin_manager = Jekyll::PluginManager.new(self)
       self.plugins        = plugin_manager.plugins_path
     end
 
+    private
     def configure_theme
       self.theme = nil
       return if config["theme"].nil?
@@ -441,17 +444,20 @@ module Jekyll
         end
     end
 
+    private
     def configure_include_paths
       @includes_load_paths = Array(in_source_dir(config["includes_dir"].to_s))
-      @includes_load_paths << theme.includes_path if theme&.includes_path
+      @includes_load_paths << theme.includes_path if theme && theme.includes_path
     end
 
+    private
     def configure_file_read_opts
       self.file_read_opts = {}
-      file_read_opts[:encoding] = config["encoding"] if config["encoding"]
+      self.file_read_opts[:encoding] = config["encoding"] if config["encoding"]
       self.file_read_opts = Jekyll::Utils.merged_file_read_opts(self, {})
     end
 
+    private
     def render_docs(payload)
       collections.each_value do |collection|
         collection.docs.each do |document|
@@ -460,12 +466,14 @@ module Jekyll
       end
     end
 
+    private
     def render_pages(payload)
       pages.flatten.each do |page|
         render_regenerated(page, payload)
       end
     end
 
+    private
     def render_regenerated(document, payload)
       return unless regenerator.regenerate?(document)
       document.output = Jekyll::Renderer.new(self, document, payload).run

lib/jekyll/static_file.rb

@@ -133,10 +133,10 @@ module Jekyll
       @url ||= if @collection.nil?
                  relative_path
                else
-                 ::Jekyll::URL.new(
+                 ::Jekyll::URL.new({
                    :template     => @collection.url_template,
-                   :placeholders => placeholders
-                 )
+                   :placeholders => placeholders,
+                 })
                end.to_s.chomp("/")
     end
 
@@ -152,7 +152,6 @@ module Jekyll
     end
 
     private
-
     def copy_file(dest_path)
       if @site.safe || Jekyll.env == "production"
         FileUtils.cp(path, dest_path)

lib/jekyll/stevenson.rb

@@ -16,7 +16,9 @@ module Jekyll
       severity ||= UNKNOWN
       @logdev = logdevice(severity)
 
-      return true if @logdev.nil? || severity < @level
+      if @logdev.nil? || severity < @level
+        return true
+      end
       progname ||= @progname
       if message.nil?
         if block_given?

lib/jekyll/tags/highlight.rb

@@ -18,38 +18,35 @@ module Jekyll
           @lang = Regexp.last_match(1).downcase
           @highlight_options = parse_options(Regexp.last_match(2))
         else
-          raise SyntaxError, <<~MSG
-            Syntax Error in tag 'highlight' while parsing the following markup:
+          raise SyntaxError, <<-MSG
+Syntax Error in tag 'highlight' while parsing the following markup:
 
-            #{markup}
+  #{markup}
 
-            Valid syntax: highlight <lang> [linenos]
-          MSG
+Valid syntax: highlight <lang> [linenos]
+MSG
         end
       end
 
       def render(context)
         prefix = context["highlighter_prefix"] || ""
         suffix = context["highlighter_suffix"] || ""
-        key = super.to_s
-        cache.getset(key) do
-          code = key.gsub(%r!\A(\n|\r)+|(\n|\r)+\z!, "")
+        code = super.to_s.gsub(%r!\A(\n|\r)+|(\n|\r)+\z!, "")
 
-          is_safe = !!context.registers[:site].safe
+        is_safe = !!context.registers[:site].safe
 
-          output =
-            case context.registers[:site].highlighter
-            when "pygments"
-              render_pygments(code, is_safe)
-            when "rouge"
-              render_rouge(code)
-            else
-              render_codehighlighter(code)
-            end
+        output =
+          case context.registers[:site].highlighter
+          when "pygments"
+            render_pygments(code, is_safe)
+          when "rouge"
+            render_rouge(code)
+          else
+            render_codehighlighter(code)
+          end
 
-          rendered_output = add_code_tag(output)
-          prefix + rendered_output + suffix
-        end
+        rendered_output = add_code_tag(output)
+        prefix + rendered_output + suffix
       end
 
       def sanitized_opts(opts, is_safe)
@@ -70,10 +67,6 @@ module Jekyll
 
       OPTIONS_REGEX = %r!(?:\w="[^"]*"|\w=\w|\w)+!
 
-      def cache
-        Jekyll::Cache.new("Jekyll::Tags::HighlightBlock")
-      end
-
       def parse_options(input)
         options = {}
         return options if input.empty?
@@ -82,7 +75,7 @@ module Jekyll
         input.scan(OPTIONS_REGEX) do |opt|
           key, value = opt.split("=")
           # If a quoted list, convert to array
-          if value&.include?('"')
+          if value && value.include?('"')
             value.delete!('"')
             value = value.split
           end
@@ -103,14 +96,14 @@ module Jekyll
         )
 
         if highlighted_code.nil?
-          Jekyll.logger.error <<~MSG
-            There was an error highlighting your code:
+          Jekyll.logger.error <<-MSG
+There was an error highlighting your code:
 
-            #{code}
+#{code}
 
-            While attempting to convert the above code, Pygments.rb returned an unacceptable value.
-            This is usually a timeout problem solved by running `jekyll build` again.
-          MSG
+While attempting to convert the above code, Pygments.rb returned an unacceptable value.
+This is usually a timeout problem solved by running `jekyll build` again.
+MSG
           raise ArgumentError, "Pygments.rb returned an unacceptable value "\
           "when attempting to highlight some code."
         end
@@ -119,8 +112,7 @@ module Jekyll
       end
 
       def render_rouge(code)
-        require "rouge"
-        formatter = ::Rouge::Formatters::HTMLLegacy.new(
+        formatter = Jekyll::Utils::Rouge.html_formatter(
           :line_numbers => @highlight_options[:linenos],
           :wrap         => false,
           :css_class    => "highlight",

lib/jekyll/tags/include.rb

@@ -2,6 +2,15 @@
 
 module Jekyll
   module Tags
+    class IncludeTagError < StandardError
+      attr_accessor :path
+
+      def initialize(msg, path)
+        super(msg)
+        @path = path
+      end
+    end
+
     class IncludeTag < Liquid::Tag
       VALID_SYNTAX = %r!
         ([\w-]+)\s*=\s*
@@ -55,31 +64,31 @@ module Jekyll
 
       def validate_file_name(file)
         if file =~ INVALID_SEQUENCES || file !~ VALID_FILENAME_CHARS
-          raise ArgumentError, <<~MSG
-            Invalid syntax for include tag. File contains invalid characters or sequences:
+          raise ArgumentError, <<-MSG
+Invalid syntax for include tag. File contains invalid characters or sequences:
 
-              #{file}
+  #{file}
 
-            Valid syntax:
+Valid syntax:
 
-              #{syntax_example}
+  #{syntax_example}
 
-          MSG
+MSG
         end
       end
 
       def validate_params
         unless @params =~ FULL_VALID_SYNTAX
-          raise ArgumentError, <<~MSG
-            Invalid syntax for include tag:
+          raise ArgumentError, <<-MSG
+Invalid syntax for include tag:
 
-            #{@params}
+  #{@params}
 
-            Valid syntax:
+Valid syntax:
 
-            #{syntax_example}
+  #{syntax_example}
 
-          MSG
+MSG
         end
       end
 
@@ -90,7 +99,13 @@ module Jekyll
 
       # Render the variable if required
       def render_variable(context)
-        Liquid::Template.parse(@file).render(context) if @file =~ VARIABLE_SYNTAX
+        if @file =~ VARIABLE_SYNTAX
+          partial = context.registers[:site]
+            .liquid_renderer
+            .file("(variable)")
+            .parse(@file)
+          partial.render!(context)
+        end
       end
 
       def tag_includes_dirs(context)
@@ -132,7 +147,7 @@ module Jekyll
       end
 
       def add_include_to_dependency(site, path, context)
-        if context.registers[:page]&.key?("path")
+        if context.registers[:page] && context.registers[:page].key?("path")
           site.regenerator.add_dependency(
             site.in_source_dir(context.registers[:page]["path"]),
             path