Release 💎 3.1.6

3.1: Add ability to render drops as JSON

.codeclimate.yml

@@ -0,0 +1,29 @@
+engines:
+  rubocop: { enabled: true  }
+  fixme:   { enabled: false }
+exclude_paths:
+- .rubocop.yml
+- .codeclimate.yml
+- .travis.yml
+- .gitignore
+- .rspec
+
+- Gemfile.lock
+- CHANGELOG.{md,markdown,txt,textile}
+- CONTRIBUTING.{md,markdown,txt,textile}
+- readme.{md,markdown,txt,textile}
+- README.{md,markdown,txt,textile}
+- Readme.{md,markdown,txt,textile}
+- ReadMe.{md,markdown,txt,textile}
+- COPYING
+- LICENSE
+
+- site/**/*
+- test/**/*
+- vendor/**/*
+- features/**/*
+- script/**/*
+- spec/**/*
+ratings:
+  paths:
+  - lib/**/*.rb

.gitignore

@@ -1,17 +1,22 @@
-Gemfile.lock
-test/dest
 *.gem
-pkg/
 *.swp
 *~
-_site/
-.bundle/
 .DS_Store
-bbin/
-gh-pages/
-site/_site/
-coverage
+.analysis
+.bundle/
+.byebug_history
+.jekyll-metadata
+.ruby-gemset
 .ruby-version
 .sass-cache
-tmp/stackprof-*
-.jekyll-metadata
+/test/source/file_name.txt
+/vendor
+Gemfile.lock
+_site/
+bbin/
+coverage
+gh-pages/
+pkg/
+site/_site/
+test/dest
+tmp/*

.jrubyrc

@@ -0,0 +1,3 @@
+backtrace.mask=true
+backtrace.color=true
+backtrace.style=mri

.rubocop.yml

@@ -0,0 +1,80 @@
+Metrics/MethodLength: { Max:  24 }
+Metrics/ClassLength:  { Max: 240 }
+Metrics/ModuleLength: { Max: 240 }
+Metrics/LineLength:   { Max: 112 }
+Metrics/CyclomaticComplexity: { Max: 8 }
+Metrics/PerceivedComplexity: { Max: 8 }
+Metrics/ParameterLists: { Max: 4 }
+Metrics/MethodLength: { Max: 24 }
+Metrics/AbcSize: { Max: 20 }
+
+Style/IndentHash: { EnforcedStyle: consistent }
+Style/HashSyntax: { EnforcedStyle: hash_rockets }
+Style/SignalException: { EnforcedStyle: only_raise }
+Style/AlignParameters: { EnforcedStyle: with_fixed_indentation }
+Style/StringLiteralsInInterpolation: { EnforcedStyle: double_quotes }
+Style/MultilineMethodCallIndentation: { EnforcedStyle: indented }
+Style/MultilineOperationIndentation: { EnforcedStyle: indented }
+Style/FirstParameterIndentation: { EnforcedStyle: consistent }
+Style/StringLiterals: { EnforcedStyle: double_quotes }
+Style/RegexpLiteral: { EnforcedStyle: slashes }
+Style/IndentArray: { EnforcedStyle: consistent }
+Style/ExtraSpacing: { AllowForAlignment: true }
+
+Style/PercentLiteralDelimiters:
+  PreferredDelimiters:
+    '%q': '{}'
+    '%Q': '{}'
+    '%r': '!!'
+    '%s': '()'
+    '%w': '()'
+    '%W': '()'
+    '%x': '()'
+
+Style/AlignArray:                     { Enabled: false }
+Style/StringLiterals:                 { Enabled: false }
+Style/Documentation:                  { Enabled: false }
+Style/DoubleNegation:                 { Enabled: false }
+Style/UnneededCapitalW:               { Enabled: false }
+Style/EmptyLinesAroundModuleBody:     { Enabled: false }
+Style/EmptyLinesAroundAccessModifier: { Enabled: false }
+Style/BracesAroundHashParameters:     { Enabled: false }
+Style/SpaceInsideBrackets:            { Enabled: false }
+Style/IfUnlessModifier:               { Enabled: false }
+Style/ModuleFunction:                 { Enabled: false }
+Style/RescueModifier:                 { Enabled: false }
+Style/GuardClause:                    { Enabled: false }
+Style/FileName:                       { Enabled: false }
+Lint/UselessAccessModifier:           { Enabled: false }
+Style/SpaceAroundOperators:           { Enabled: false }
+Style/RedundantReturn:                { Enabled: false }
+Style/SingleLineMethods:              { Enabled: false }
+
+AllCops:
+  TargetRubyVersion: 2.0
+  Include:
+  - lib/**/*.rb
+
+  Exclude:
+  - .rubocop.yml
+  - .codeclimate.yml
+  - .travis.yml
+  - .gitignore
+  - .rspec
+
+  - Gemfile.lock
+  - CHANGELOG.{md,markdown,txt,textile}
+  - CONTRIBUTING.{md,markdown,txt,textile}
+  - readme.{md,markdown,txt,textile}
+  - README.{md,markdown,txt,textile}
+  - Readme.{md,markdown,txt,textile}
+  - ReadMe.{md,markdown,txt,textile}
+  - COPYING
+  - LICENSE
+
+  - site/**/*
+  - test/**/*
+  - vendor/**/*
+  - features/**/*
+  - script/**/*
+  - spec/**/*

.travis.yml

@@ -1,26 +1,49 @@
-language: ruby
+before_script: bundle update
+bundler_args: --without benchmark:site:development
+script: script/cibuild
 cache: bundler
+language: ruby
 sudo: false
+
 rvm:
-- 2.2
-- 2.1
-- 2.0
+  - &ruby1 2.3.0
+  - &ruby2 2.2.4
+  - &ruby3 2.1.8
+  - &ruby4 2.0.0-p648
+  - &jruby jruby-9.0.4.0
+  - &rhead ruby-head
+
+matrix:
+  fast_finish: true
+  allow_failures:
+    - rvm: *jruby
+    - rvm: *rhead
 env:
   matrix:
-  - TEST_SUITE=test
-  - TEST_SUITE=cucumber
-before_script: bundle update
-script: script/cibuild
+    - TEST_SUITE=test
+    - TEST_SUITE=cucumber
+
 notifications:
   irc:
-    on_success: change
-    on_failure: change
-    channels:
-    - irc.freenode.org#jekyll
-    template:
-    - "%{repository}#%{build_number} (%{branch}) %{message} %{build_url}"
+    template: "%{repository}#%{build_number} (%{branch}) %{message} %{build_url}"
+    channels: irc.freenode.org#jekyll
+
   email:
-    on_success: never
-    on_failure: never
+    recipients:
+      - jordon@envygeeks.io
+
   slack:
-    secure: dNdKk6nahNURIUbO3ULhA09/vTEQjK0fNbgjVjeYPEvROHgQBP1cIP3AJy8aWs8rl5Yyow4YGEilNRzKPz18AsFptVXofpwyqcBxaCfmHP809NX5PHBaadydveLm+TNVao2XeLXSWu+HUNAYO1AanCUbJSEyJTju347xCBGzESU=
+    secure: "\
+      dNdKk6nahNURIUbO3ULhA09/vTEQjK0fNbgjVjeYPEvROHgQBP1cIP3AJy8aWs8rl5Yyow4Y\
+      GEilNRzKPz18AsFptVXofpwyqcBxaCfmHP809NX5PHBaadydveLm+TNVao2XeLXSWu+HUNAY\
+      O1AanCUbJSEyJTju347xCBGzESU=\
+    "
+
+addons:
+  code_climate:
+    repo_token:
+      secure: "\
+        mAuvDu+nrzB8dOaLqsublDGt423mGRyZYM3vsrXh4Tf1sT+L1PxsRzU4gLmcV27HtX2Oq9\
+        DA4vsRURfABU0fIhwYkQuZqEcA3d8TL36BZcGEshG6MQ2AmnYsmFiTcxqV5bmlElHEqQuT\
+        5SUFXLafgZPBnL0qDwujQcHukID41sE=\
+      "

CONDUCT.markdown

@@ -0,0 +1,49 @@
+# Contributor Code of Conduct
+
+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.
+
+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
+* Personal attacks
+* Trolling or insulting/derogatory comments
+* Public or private harassment
+* Publishing other's private information, such as physical or electronic
+  addresses, without explicit permission
+* Other unethical or unprofessional conduct
+
+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.
+
+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.
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community.
+
+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 is adapted from the [Contributor Covenant][homepage],
+version 1.3.0, available at
+[http://contributor-covenant.org/version/1/3/0/][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/3/0/

CONTRIBUTING.markdown

@@ -4,18 +4,19 @@ Contribute
 So you've got an awesome idea to throw into Jekyll. Great! Please keep the
 following in mind:
 
+* **Use https://talk.jekyllrb.com for non-technical or indirect Jekyll questions that are not bugs.**
 * **Contributions will not be accepted without tests or necessary documentation updates.**
 * If you're creating a small fix or patch to an existing feature, just a simple
   test will do. Please stay in the confines of the current test suite and use
   [Shoulda](https://github.com/thoughtbot/shoulda/tree/master) and
-  [RR](https://github.com/rr/rr).
+  [RSpec-Mocks](https://github.com/rspec/rspec-mocks).
 * If it's a brand new feature, make sure to create a new
   [Cucumber](https://github.com/cucumber/cucumber/) feature and reuse steps
   where appropriate. Also, whipping up some documentation in your fork's `site`
   would be appreciated, and once merged it will be transferred over to the main
   `site`, jekyllrb.com.
 * If your contribution changes any Jekyll behavior, make sure to update the
-  documentation. It lives in `site/docs`. If the docs are missing information,
+  documentation. It lives in `site/_docs`. If the docs are missing information,
   please feel free to add it in. Great docs make a great project!
 * Please follow the [GitHub Ruby Styleguide](https://github.com/styleguide/ruby)
   when modifying Ruby code.
@@ -30,16 +31,25 @@ Test Dependencies
 -----------------
 
 To run the test suite and build the gem you'll need to install Jekyll's
-dependencies. Jekyll uses Bundler, so a quick run of the bundle command and
-you're all set!
+dependencies. Simply run this command to get all setup:
 
-    $ bundle
+    $ script/bootstrap
 
 Before you start, run the tests and make sure that they pass (to confirm your
 environment is configured properly):
 
-    $ bundle exec rake test
-    $ bundle exec rake features
+    $ script/cibuild
+
+If you are only updating a file in `test/`, you can use the command:
+
+    $ script/test test/blah_test.rb
+
+If you are only updating a `.feature` file, you can use the command:
+
+    $ script/cucumber features/blah.feature
+
+Both `script/test` and `script/cucumber` can be run without arguments to
+run its entire respective suite.
 
 Workflow
 --------
@@ -47,10 +57,10 @@ Workflow
 Here's the most direct way to get your work merged into the project:
 
 * Fork the project.
-* Clone down your fork ( `git clone git@github.com:<username>/jekyll.git` ).
+* Clone down your fork ( `git clone git@github.com:[username]/jekyll.git` ).
 * Create a topic branch to contain your change ( `git checkout -b my_awesome_feature` ).
 * Hack away, add tests. Not necessarily in that order.
-* Make sure everything still passes by running `rake`.
+* Make sure everything still passes by running `script/cibuild`.
 * If necessary, rebase your commits into logical chunks, without errors.
 * Push the branch up ( `git push origin my_awesome_feature` ).
 * Create a pull request against jekyll/jekyll and describe what your change
@@ -67,17 +77,22 @@ You can find the documentation for jekyllrb.com in the
 [site](https://github.com/jekyll/jekyll/tree/master/site) directory of
 Jekyll's repo on GitHub.com.
 
-All documentation pull requests should be directed at `master`.  Pull
+All documentation pull requests should be directed at `master`. Pull
 requests directed at another branch will not be accepted.
 
 The [Jekyll wiki](https://github.com/jekyll/jekyll/wiki) on GitHub
 can be freely updated without a pull request as all GitHub users have access.
 
+If you want to add your plugin to the
+[list of plugins](http://jekyllrb.com/docs/plugins/#available-plugins),
+please submit a pull request modifying the
+[plugins page source file](site/_docs/plugins.md) by adding a
+link to your plugin under the proper subheading depending upon its type.
+
 Gotchas
 -------
 
-* If you want to bump the gem version, please put that in a separate commit.
-  This way, the maintainers can control when the gem gets released.
+* Please do not bump the gem version in your pull requests.
 * Try to keep your patch(es) based from the latest commit on jekyll/jekyll.
   The easier it is to apply your work, the less work the maintainers have to do,
   which is always a good thing.

Gemfile

@@ -1,29 +1,84 @@
-source 'https://rubygems.org'
-gemspec
+source "https://rubygems.org"
+gemspec :name => "jekyll"
 
-gem 'rake', '~> 10.1'
-gem 'rdoc', '~> 3.11'
-gem 'redgreen', '~> 1.2'
-gem 'shoulda', '~> 3.5'
-gem 'rr', '~> 1.1'
-gem 'cucumber', '1.3.18'
-gem 'RedCloth', '~> 4.2'
-gem 'maruku', '~> 0.7.0'
-gem 'rdiscount', '~> 1.6'
-gem 'launchy', '~> 2.3'
-gem 'simplecov', '~> 0.9'
-gem 'simplecov-gem-adapter', '~> 1.0.1'
-gem 'mime-types', '~> 1.5'
-gem 'activesupport', '~> 3.2.13'
-gem 'jekyll_test_plugin'
-gem 'jekyll_test_plugin_malicious'
-gem 'rouge', '~> 1.7'
-gem 'liquid-c', '~> 0.0.3'
-gem 'minitest' if RUBY_PLATFORM =~ /cygwin/
-gem 'test-unit' if RUBY_PLATFORM =~ /cygwin/ || RUBY_VERSION.start_with?("2.2")
+gem "rake", "~> 10.1"
+group :development do
+  gem "launchy", "~> 2.3"
+  gem "rubocop", "~> 0.40"
+  gem "pry"
 
-if ENV['BENCHMARK']
-  gem 'benchmark-ips'
-  gem 'rbtrace'
-  gem 'stackprof'
+  unless RUBY_ENGINE == "jruby"
+    gem "pry-byebug"
+  end
+end
+
+#
+
+group :test do
+  gem "cucumber", "~> 2.1"
+  gem "jekyll_test_plugin"
+  gem "jekyll_test_plugin_malicious"
+  gem "codeclimate-test-reporter"
+  gem "rspec-mocks"
+  gem "nokogiri"
+  gem "rspec"
+end
+
+#
+
+group :test_legacy do
+  if RUBY_PLATFORM =~ /cygwin/ || RUBY_VERSION.start_with?("2.2")
+    gem 'test-unit'
+  end
+
+  gem "redgreen"
+  gem "simplecov"
+  gem "minitest-reporters"
+  gem "minitest-profile"
+  gem "minitest"
+  gem "shoulda"
+end
+
+#
+
+group :benchmark do
+  if ENV["BENCHMARK"]
+    gem "ruby-prof"
+    gem "benchmark-ips"
+    gem "stackprof"
+    gem "rbtrace"
+  end
+end
+
+#
+
+group :jekyll_optional_dependencies do
+  gem "toml", "~> 0.1.0"
+  gem "coderay", "~> 1.1.0"
+  gem "jekyll-docs", path: '../docs' if Dir.exist?('../docs') && ENV["JEKYLL_VERSION"]
+  gem "jekyll-gist", "~> 1.0"
+  gem "jekyll-feed", "~> 0.1.3"
+  gem "jekyll-coffeescript", "~> 1.0"
+  gem "jekyll-redirect-from", "~> 0.9.1"
+  gem "jekyll-paginate", "~> 1.0"
+  gem "mime-types", "~> 3.0"
+  gem "kramdown", "~> 1.9"
+  gem "rdoc", "~> 4.2"
+
+  platform :ruby, :mswin, :mingw do
+    gem "rdiscount", "~> 2.0"
+    gem "pygments.rb", "~> 0.6.0"
+    gem "redcarpet", "~> 3.2", ">= 3.2.3"
+    gem "classifier-reborn", "~> 2.0"
+    gem "liquid-c", "~> 3.0"
+  end
+end
+
+#
+
+group :site do
+  if ENV["PROOF"]
+    gem "html-proofer", "~> 2.0"
+  end
+  gem "jemoji"
 end

ISSUE_TEMPLATE.md

@@ -0,0 +1,20 @@
+###### What version of Jekyll are you using (`jekyll -v`)?
+
+
+
+###### What operating system are you using?
+
+
+
+###### What did you do?
+(Please include the content causing the issue, any relevant configuration settings, and the command you ran)
+
+
+
+###### What did you expect to see?
+
+
+
+###### What did you see instead?
+
+

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2008-2014 Tom Preston-Werner
+Copyright (c) 2008-2016 Tom Preston-Werner
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.markdown

@@ -1,12 +1,18 @@
 # [Jekyll](http://jekyllrb.com/)
 
-[![Gem Version](https://img.shields.io/gem/v/jekyll.svg)](https://rubygems.org/gems/jekyll)
-[![Build Status](https://img.shields.io/travis/jekyll/jekyll/master.svg)](https://travis-ci.org/jekyll/jekyll)
-[![Code Climate](https://img.shields.io/codeclimate/github/jekyll/jekyll.svg)](https://codeclimate.com/github/jekyll/jekyll)
-[![Dependency Status](https://img.shields.io/gemnasium/jekyll/jekyll.svg)](https://gemnasium.com/jekyll/jekyll)
-[![Security](https://hakiri.io/github/jekyll/jekyll/master.svg)](https://hakiri.io/github/jekyll/jekyll/master)
+[![Gem Version](https://img.shields.io/gem/v/jekyll.svg)][ruby-gems]
+[![Build Status](https://travis-ci.org/jekyll/jekyll.svg?branch=master)][travis]
+[![Test Coverage](https://codeclimate.com/github/jekyll/jekyll/badges/coverage.svg)][coverage]
+[![Code Climate](https://codeclimate.com/github/jekyll/jekyll/badges/gpa.svg)][codeclimate]
+[![Dependency Status](https://gemnasium.com/jekyll/jekyll.svg)][gemnasium]
+[![Security](https://hakiri.io/github/jekyll/jekyll/master.svg)][hakiri]
 
-By Tom Preston-Werner, Nick Quaranto, Parker Moore, and many [awesome contributors](https://github.com/jekyll/jekyll/graphs/contributors)!
+[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
+[travis]: https://travis-ci.org/jekyll/jekyll
 
 Jekyll is a simple, blog-aware, static site generator perfect for personal, project, or organization sites. Think of it like a file-based CMS, without all the complexity. Jekyll takes your content, renders Markdown and Liquid templates, and spits out a complete, static website ready to be served by Apache, Nginx or another web server. Jekyll is the engine behind [GitHub Pages](http://pages.github.com), which you can use to host sites right from your GitHub repositories.
 
@@ -14,13 +20,29 @@ Jekyll is a simple, blog-aware, static site generator perfect for personal, proj
 
 Jekyll does what you tell it to do — no more, no less. It doesn't try to outsmart users by making bold assumptions, nor does it burden them with needless complexity and configuration. Put simply, Jekyll gets out of your way and allows you to concentrate on what truly matters: your content.
 
+## Having trouble with OS X El Capitan?
+
+See: http://jekyllrb.com/docs/troubleshooting/#jekyll-amp-mac-os-x-1011
+
 ## Getting Started
 
 * [Install](http://jekyllrb.com/docs/installation/) the gem
 * Read up about its [Usage](http://jekyllrb.com/docs/usage/) and [Configuration](http://jekyllrb.com/docs/configuration/)
 * Take a gander at some existing [Sites](https://wiki.github.com/jekyll/jekyll/sites)
 * Fork and [Contribute](http://jekyllrb.com/docs/contributing/) your own modifications
-* Have questions? Check out [`#jekyll` on irc.freenode.net](https://botbot.me/freenode/jekyll/).
+* Have questions? Check out our official forum community [Jekyll Talk](https://talk.jekyllrb.com/) or [`#jekyll` on irc.freenode.net](https://botbot.me/freenode/jekyll/)
+
+## Code of Conduct
+
+In order to have a more open and welcoming community, Jekyll adheres to a
+[code of conduct](CONDUCT.markdown) adapted from the Ruby on Rails code of
+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 a maintainer (@parkr, @envygeeks, or @mattr-) know
+and we will address it as soon as possible.
 
 ## Diving In
 

Rakefile

@@ -7,6 +7,8 @@ require 'yaml'
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), *%w[lib]))
 require 'jekyll/version'
 
+Dir.glob('rake/**.rake').each { |f| import f }
+
 #############################################################################
 #
 # Helper functions
@@ -14,19 +16,23 @@ require 'jekyll/version'
 #############################################################################
 
 def name
-  @name ||= File.basename(Dir['*.gemspec'].first, ".*")
+  "jekyll"
 end
 
 def version
   Jekyll::VERSION
 end
 
+def docs_name
+  "#{name}-docs"
+end
+
 def gemspec_file
   "#{name}.gemspec"
 end
 
 def gem_file
-  "#{name}-#{version}.gem"
+  "#{name}-#{Gem::Version.new(version).to_s}.gem"
 end
 
 def normalize_bullets(markdown)
@@ -89,6 +95,7 @@ end
 
 multitask :default => [:test, :features]
 
+task :spec => :test
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
@@ -123,185 +130,3 @@ desc "Open an irb session preloaded with this library"
 task :console do
   sh "irb -rubygems -r ./lib/#{name}.rb"
 end
-
-#############################################################################
-#
-# Site tasks - http://jekyllrb.com
-#
-#############################################################################
-
-namespace :site do
-  desc "Generate and view the site locally"
-  task :preview do
-    require "launchy"
-    require "jekyll"
-
-    # Yep, it's a hack! Wait a few seconds for the Jekyll site to generate and
-    # then open it in a browser. Someday we can do better than this, I hope.
-    Thread.new do
-      sleep 4
-      puts "Opening in browser..."
-      Launchy.open("http://localhost:4000")
-    end
-
-    # Generate the site in server mode.
-    puts "Running Jekyll..."
-    options = {
-      "source"      => File.expand_path("site"),
-      "destination" => File.expand_path("site/_site"),
-      "watch"       => true,
-      "serving"     => true
-    }
-    Jekyll::Commands::Build.process(options)
-    Jekyll::Commands::Serve.process(options)
-  end
-
-  desc "Generate the site"
-  task :generate => [:history, :version_file] do
-    require "jekyll"
-    Jekyll::Commands::Build.process({
-      "source"      => File.expand_path("site"),
-      "destination" => File.expand_path("site/_site")
-    })
-  end
-
-  desc "Update normalize.css library to the latest version and minify"
-  task :update_normalize_css do
-    Dir.chdir("site/_sass") do
-      sh 'curl "http://necolas.github.io/normalize.css/latest/normalize.css" -o "normalize.scss"'
-      sh 'sass "normalize.scss":"_normalize.scss" --style compressed'
-      rm ['normalize.scss', Dir.glob('*.map')].flatten
-    end
-  end
-
-  desc "Commit the local site to the gh-pages branch and publish to GitHub Pages"
-  task :publish => [:history, :version_file] do
-    # Ensure the gh-pages dir exists so we can generate into it.
-    puts "Checking for gh-pages dir..."
-    unless File.exist?("./gh-pages")
-      puts "Creating gh-pages dir..."
-      sh "git clone git@github.com:jekyll/jekyll gh-pages"
-    end
-
-    # Ensure latest gh-pages branch history.
-    Dir.chdir('gh-pages') do
-      sh "git checkout gh-pages"
-      sh "git pull origin gh-pages"
-    end
-
-    # Proceed to purge all files in case we removed a file in this release.
-    puts "Cleaning gh-pages directory..."
-    purge_exclude = %w[
-      gh-pages/.
-      gh-pages/..
-      gh-pages/.git
-    ]
-    FileList["gh-pages/{*,.*}"].exclude(*purge_exclude).each do |path|
-      sh "rm -rf #{path}"
-    end
-
-    # Copy site to gh-pages dir.
-    puts "Copying site to gh-pages branch..."
-    copy_exclude = %w[
-      site/.
-      site/..
-      site/.jekyll-metadata
-      site/_site
-    ]
-    FileList["site/{*,.*}"].exclude(*copy_exclude).each do |path|
-      sh "cp -R #{path} gh-pages/"
-    end
-
-    # Change any configuration settings for production.
-    config = YAML.load_file("gh-pages/_config.yml")
-    config.merge!({'sass' => {'style' => 'compressed'}})
-    File.write('gh-pages/_config.yml', YAML.dump(config))
-
-    # Commit and push.
-    puts "Committing and pushing to GitHub Pages..."
-    sha = `git log`.match(/[a-z0-9]{40}/)[0]
-    Dir.chdir('gh-pages') do
-      sh "git add ."
-      sh "git commit --allow-empty -m 'Updating to #{sha}.'"
-      sh "git push origin gh-pages"
-    end
-    puts 'Done.'
-  end
-
-  desc "Create a nicely formatted history page for the jekyll site based on the repo history."
-  task :history do
-    if File.exist?("History.markdown")
-      history_file = File.read("History.markdown")
-      front_matter = {
-        "layout" => "docs",
-        "title" => "History",
-        "permalink" => "/docs/history/",
-        "prev_section" => "contributing"
-      }
-      Dir.chdir('site/_docs/') do
-        File.open("history.md", "w") do |file|
-          file.write("#{front_matter.to_yaml}---\n\n")
-          file.write(converted_history(history_file))
-        end
-      end
-    else
-      abort "You seem to have misplaced your History.markdown file. I can haz?"
-    end
-  end
-
-  desc "Write the site latest_version.txt file"
-  task :version_file do
-    File.open('site/latest_version.txt', 'wb') { |f| f.write(version) }
-  end
-
-  namespace :releases do
-    desc "Create new release post"
-    task :new, :version do |t, args|
-      raise "Specify a version: rake site:releases:new['1.2.3']" unless args.version
-      today = Time.new.strftime('%Y-%m-%d')
-      release = args.version.to_s
-      filename = "site/_posts/#{today}-jekyll-#{release.split('.').join('-')}-released.markdown"
-
-      File.open(filename, "wb") do |post|
-        post.puts("---")
-        post.puts("layout: news_item")
-        post.puts("title: 'Jekyll #{release} Released'")
-        post.puts("date: #{Time.new.strftime('%Y-%m-%d %H:%M:%S %z')}")
-        post.puts("author: ")
-        post.puts("version: #{release}")
-        post.puts("categories: [release]")
-        post.puts("---")
-        post.puts
-        post.puts
-      end
-
-      puts "Created #{filename}"
-    end
-  end
-end
-
-#############################################################################
-#
-# Packaging tasks
-#
-#############################################################################
-
-desc "Release #{name} v#{version}"
-task :release => :build do
-  unless `git branch` =~ /^\* master$/
-    puts "You must be on the master branch to release!"
-    exit!
-  end
-  sh "git commit --allow-empty -m 'Release :gem: #{version}'"
-  sh "git tag v#{version}"
-  sh "git push origin master"
-  sh "git push origin v#{version}"
-  sh "gem push pkg/#{name}-#{version}.gem"
-end
-
-desc "Build #{name} v#{version} into pkg/"
-task :build do
-  mkdir_p "pkg"
-  sh "gem build #{gemspec_file}"
-  sh "mv #{gem_file} pkg"
-end

benchmark/cached-includes.rb

@@ -1,32 +0,0 @@
-require 'benchmark/ips'
-require 'jekyll'
-
-site = Jekyll::Site.new(Jekyll.configuration({
-  'source' => File.expand_path('../site', __dir__),
-  'destination' => File.expand_path('../site/_site', __dir__)
-}))
-payload = Jekyll::Utils.deep_merge_hashes(
-  site.site_payload,
-  { 'site' => {'page' => site.pages.first.to_liquid } }
-)
-info = {
-  filters:   [Jekyll::Filters],
-  registers: { :site => site, :page => payload['page'] }
-}
-
-class WithoutCacheInclude < Jekyll::Tags::IncludeTag
-  def source(file, context)
-    File.read(file, file_read_opts(context))
-  end
-end
-
-Liquid::Template.register_tag('include_woc', WithoutCacheInclude)
-
-def parse(tag, payload, info)
-  Liquid::Template.parse("{% #{tag} footer.html %}").render!(payload, info)
-end
-
-Benchmark.ips do |x|
-  x.report('cached')   { parse 'include', payload, info }
-  x.report('uncached') { parse 'include_woc', payload, info }
-end

benchmark/end-with-vs-regexp

@@ -0,0 +1,15 @@
+require 'benchmark/ips'
+
+Benchmark.ips do |x|
+  path_without_ending_slash = '/some/very/very/long/path/to/a/file/i/like'
+  x.report('no slash regexp')    { path_without_ending_slash =~ /\/$/ }
+  x.report('no slash end_with?') { path_without_ending_slash.end_with?("/")  }
+  x.report('no slash [-1, 1]') { path_without_ending_slash[-1, 1] == "/"  }
+end
+
+Benchmark.ips do |x|
+  path_with_ending_slash = '/some/very/very/long/path/to/a/file/i/like/'
+  x.report('slash regexp')    { path_with_ending_slash =~ /\/$/ }
+  x.report('slash end_with?') { path_with_ending_slash.end_with?("/")  }
+  x.report('slash [-1, 1]')   { path_with_ending_slash[-1, 1] == "/"  }
+end

benchmark/file-dir-ensure-trailing-slash

@@ -0,0 +1,54 @@
+#!/usr/bin/env ruby
+require 'benchmark/ips'
+
+# For this pull request, which changes Page#dir
+# https://github.com/jekyll/jekyll/pull/4403
+
+FORWARD_SLASH = '/'.freeze
+
+def pre_pr(url)
+  url[-1, 1] == FORWARD_SLASH ? url : File.dirname(url)
+end
+
+def pr(url)
+  if url.end_with?(FORWARD_SLASH)
+    url
+  else
+    url_dir = File.dirname(url)
+    url_dir.end_with?(FORWARD_SLASH) ? url_dir : "#{url_dir}/"
+  end
+end
+
+def envygeeks(url)
+  return url if url.end_with?(FORWARD_SLASH) || url == FORWARD_SLASH
+
+  url = File.dirname(url)
+  url == FORWARD_SLASH ? url : "#{url}/"
+end
+
+# Just a slash
+Benchmark.ips do |x|
+  path = '/'
+  x.report("pre_pr:#{path}")    { pre_pr(path) }
+  x.report("pr:#{path}")        { pr(path) }
+  x.report("envygeeks:#{path}") { pr(path) }
+  x.compare!
+end
+
+# No trailing slash
+Benchmark.ips do |x|
+  path = '/some/very/very/long/path/to/a/file/i/like'
+  x.report("pre_pr:#{path}")    { pre_pr(path) }
+  x.report("pr:#{path}")        { pr(path) }
+  x.report("envygeeks:#{path}") { pr(path) }
+  x.compare!
+end
+
+# No trailing slash
+Benchmark.ips do |x|
+  path = '/some/very/very/long/path/to/a/file/i/like/'
+  x.report("pre_pr:#{path}")    { pre_pr(path) }
+  x.report("pr:#{path}")        { pr(path) }
+  x.report("envygeeks:#{path}") { pr(path) }
+  x.compare!
+end

benchmark/flat-map

@@ -14,4 +14,3 @@ Benchmark.ips do |x|
   x.report('.map.flatten with no nested arrays') { enum.map { |i| do_thing(i) }.flatten(1) }
   x.report('.flat_map with no nested arrays')    { enum.flat_map { |i| do_thing(i) } }
 end
-

benchmark/string-replacement

@@ -8,6 +8,6 @@ Benchmark.ips do |x|
   x.report('#tr')    { str.tr('some', 'a')    }
   x.report('#gsub')  { str.gsub('some', 'a')  }
   x.report('#gsub!') { str.gsub!('some', 'a') }
-  x.report('#sub')   { str.sub('some', 'a')  }
-  x.report('#sub!')  { str.sub!('some', 'a') }
+  x.report('#sub')   { str.sub('some', 'a')   }
+  x.report('#sub!')  { str.sub!('some', 'a')  }
 end

bin/jekyll

@@ -1,15 +1,11 @@
 #!/usr/bin/env ruby
 STDOUT.sync = true
 
-$:.unshift File.join(File.dirname(__FILE__), *%w{ .. lib })
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), *%w( .. lib ))
 
 require 'jekyll'
 require 'mercenary'
 
-Jekyll::External.require_if_present(
-  Jekyll::External.blessed_gems
-)
-
 Jekyll::PluginManager.require_from_bundler
 
 Jekyll::Deprecator.process(ARGV)
@@ -22,18 +18,33 @@ Mercenary.program(:jekyll) do |p|
   p.option 'source', '-s', '--source [DIR]', 'Source directory (defaults to ./)'
   p.option 'destination', '-d', '--destination [DIR]', 'Destination directory (defaults to ./_site)'
   p.option 'safe', '--safe', 'Safe mode (defaults to false)'
-  p.option 'plugins', '-p', '--plugins PLUGINS_DIR1[,PLUGINS_DIR2[,...]]', Array, 'Plugins directory (defaults to ./_plugins)'
-  p.option 'layouts', '--layouts DIR', String, 'Layouts directory (defaults to ./_layouts)'
+  p.option 'plugins_dir', '-p', '--plugins PLUGINS_DIR1[,PLUGINS_DIR2[,...]]', Array, 'Plugins directory (defaults to ./_plugins)'
+  p.option 'layouts_dir', '--layouts DIR', String, 'Layouts directory (defaults to ./_layouts)'
+  p.option 'profile', '--profile', 'Generate a Liquid rendering profile'
+
+  Jekyll::External.require_if_present(Jekyll::External.blessed_gems) do |g|
+    cmd = g.split('-').last
+    p.command(cmd.to_sym) do |c|
+      c.syntax cmd
+      c.action do
+        Jekyll.logger.abort_with "You must install the '#{g}' gem to use the 'jekyll #{cmd}' command."
+      end
+    end
+  end
 
   Jekyll::Command.subclasses.each { |c| c.init_with_program(p) }
 
-  p.action do |args, options|
+  p.action do |args, _|
     if args.empty?
       Jekyll.logger.error "A subcommand is required."
       puts p
+      abort
     else
-      unless p.has_command?(args.first)
-        Jekyll.logger.abort_with "Invalid command. Use --help for more information"
+      subcommand = args.first
+      unless p.has_command? subcommand
+        Jekyll.logger.abort_with "fatal: 'jekyll #{args.first}' could not" \
+          " be found. You may need to install the jekyll-#{args.first} gem" \
+          " or a related gem to be able to use this subcommand."
       end
     end
   end

features/collections.feature

@@ -8,13 +8,14 @@ Feature: Collections
     And I have fixture collections
     And I have a configuration file with "collections" set to "['methods']"
     When I run jekyll build
-    Then the _site directory should exist
-    And I should see "Collections: <p>Use <code>Jekyll.configuration</code> to build a full configuration for use w/Jekyll.</p>\n\n<p>Whatever: foo.bar</p>\n<p>Signs are nice</p>\n<p><code>Jekyll.sanitized_path</code> is used to make sure your path is in your source.</p>\n<p>Run your generators! default</p>\n<p>Page without title.</p>\n<p>Run your generators! default</p>" in "_site/index.html"
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "Collections: <p>Use <code class=\"highlighter-rouge\">Jekyll.configuration</code> to build a full configuration for use w/Jekyll.</p>\n\n<p>Whatever: foo.bar</p>\n<p>Signs are nice</p>\n<p><code class=\"highlighter-rouge\">Jekyll.sanitized_path</code> is used to make sure your path is in your source.</p>\n<p>Run your generators! default</p>\n<p>Page without title.</p>\n<p>Run your generators! default</p>" in "_site/index.html"
     And the "_site/methods/configuration.html" file should not exist
 
   Scenario: Rendered collection
-    Given I have an "index.html" page that contains "Collections: {{ site.collections }}"
-    And I have an "collection_metadata.html" page that contains "Methods metadata: {{ site.collections.methods.foo }} {{ site.collections.methods }}"
+    Given I have an "index.html" page that contains "Collections: output => {{ site.collections[0].output }} label => {{ site.collections[0].label }}"
+    And I have an "collection_metadata.html" page that contains "Methods metadata: {{ site.collections[0].foo }} {{ site.collections[0] }}"
     And I have fixture collections
     And I have a "_config.yml" file with content:
     """
@@ -24,8 +25,10 @@ Feature: Collections
         foo:   bar
     """
     When I run jekyll build
-    Then the _site directory should exist
-    And I should see "Collections: {\"methods" in "_site/index.html"
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "Collections: output => true" in "_site/index.html"
+    And I should see "label => methods" in "_site/index.html"
     And I should see "Methods metadata: bar" in "_site/collection_metadata.html"
     And I should see "<p>Whatever: foo.bar</p>" in "_site/methods/configuration.html"
 
@@ -40,11 +43,12 @@ Feature: Collections
         permalink: /:collection/:path/
     """
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "<p>Whatever: foo.bar</p>" in "_site/methods/configuration/index.html"
 
   Scenario: Rendered document in a layout
-    Given I have an "index.html" page that contains "Collections: {{ site.collections }}"
+    Given I have an "index.html" page that contains "Collections: output => {{ site.collections[0].output }} label => {{ site.collections[0].label }} foo => {{ site.collections[0].foo }}"
     And I have a default layout that contains "<div class='title'>Tom Preston-Werner</div> {{content}}"
     And I have fixture collections
     And I have a "_config.yml" file with content:
@@ -55,8 +59,11 @@ Feature: Collections
         foo:   bar
     """
     When I run jekyll build
-    Then the _site directory should exist
-    And I should see "Collections: {\"methods" in "_site/index.html"
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "Collections: output => true" in "_site/index.html"
+    And I should see "label => methods" in "_site/index.html"
+    And I should see "foo => bar" in "_site/index.html"
     And I should see "<p>Run your generators! default</p>" in "_site/methods/site/generate.html"
     And I should see "<div class='title'>Tom Preston-Werner</div>" in "_site/methods/site/generate.html"
 
@@ -69,7 +76,8 @@ Feature: Collections
     - methods
     """
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Collections: _methods/configuration.md _methods/escape-\+ #%20\[\].md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/um_hi.md" in "_site/index.html"
 
   Scenario: Collections specified as an hash
@@ -81,7 +89,8 @@ Feature: Collections
     - methods
     """
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Collections: _methods/configuration.md _methods/escape-\+ #%20\[\].md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/um_hi.md" in "_site/index.html"
 
   Scenario: All the documents
@@ -93,7 +102,8 @@ Feature: Collections
     - methods
     """
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "All documents: _methods/configuration.md _methods/escape-\+ #%20\[\].md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/um_hi.md" in "_site/index.html"
 
   Scenario: Documents have an output attribute, which is the converted HTML
@@ -105,8 +115,9 @@ Feature: Collections
     - methods
     """
     When I run jekyll build
-    Then the _site directory should exist
-    And I should see "First document's output: <p>Use <code>Jekyll.configuration</code> to build a full configuration for use w/Jekyll.</p>\n\n<p>Whatever: foo.bar</p>" in "_site/index.html"
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "First document's output: <p>Use <code class=\"highlighter-rouge\">Jekyll.configuration</code> to build a full configuration for use w/Jekyll.</p>\n\n<p>Whatever: foo.bar</p>" in "_site/index.html"
 
   Scenario: Filter documents by where
     Given I have an "index.html" page that contains "{% assign items = site.methods | where: 'whatever','foo.bar' %}Item count: {{ items.size }}"
@@ -117,8 +128,9 @@ Feature: Collections
     - methods
     """
     When I run jekyll build
-    Then the _site directory should exist
-    And I should see "Item count: 1" in "_site/index.html"
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "Item count: 2" in "_site/index.html"
 
   Scenario: Sort by title
     Given I have an "index.html" page that contains "{% assign items = site.methods | sort: 'title' %}1. of {{ items.size }}: {{ items.first.output }}"
@@ -129,8 +141,9 @@ Feature: Collections
     - methods
     """
     When I run jekyll build
-    Then the _site directory should exist
-    And I should see "1. of 6: <p>Page without title.</p>" in "_site/index.html"
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "1. of 7: <p>Page without title.</p>" in "_site/index.html"
 
   Scenario: Sort by relative_path
     Given I have an "index.html" page that contains "Collections: {% assign methods = site.methods | sort: 'relative_path' %}{% for method in methods %}{{ method.title }}, {% endfor %}"
@@ -141,5 +154,22 @@ Feature: Collections
     - methods
     """
     When I run jekyll build
+    Then I should get a zero exit status
     Then the _site directory should exist
-    And I should see "Collections: Jekyll.configuration, Jekyll.escape, Jekyll.sanitized_path, Site#generate, , Site#generate," in "_site/index.html"
+    And I should see "Collections: Jekyll.configuration, Jekyll.escape, Jekyll.sanitized_path, Site#generate, Initialize, Site#generate, YAML with Dots," in "_site/index.html"
+
+  Scenario: Rendered collection with date/dateless filename
+    Given I have an "index.html" page that contains "Collections: {% for method in site.thanksgiving %}{{ method.title }} {% endfor %}"
+    And I have fixture collections
+    And I have a "_config.yml" file with content:
+    """
+    collections:
+      thanksgiving:
+        output: true
+    """
+    When I run jekyll build
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "Thanksgiving Black Friday" in "_site/index.html"
+    And I should see "Happy Thanksgiving" in "_site/thanksgiving/2015-11-26-thanksgiving.html"
+    And I should see "Black Friday" in "_site/thanksgiving/black-friday.html"

features/create_sites.feature

@@ -13,7 +13,8 @@ Feature: Create sites
   Scenario: Basic site
     Given I have an "index.html" file that contains "Basic Site"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Basic Site" in "_site/index.html"
 
   Scenario: Basic site with a post
@@ -22,7 +23,8 @@ Feature: Create sites
       | title   | date       | content          |
       | Hackers | 2009-03-27 | My First Exploit |
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "My First Exploit" in "_site/2009/03/27/hackers.html"
 
   Scenario: Basic site with layout and a page
@@ -30,7 +32,8 @@ Feature: Create sites
     And I have an "index.html" page with layout "default" that contains "Basic Site with Layout"
     And I have a default layout that contains "Page Layout: {{ content }}"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Page Layout: Basic Site with Layout" in "_site/index.html"
 
   Scenario: Basic site with layout and a post
@@ -41,7 +44,8 @@ Feature: Create sites
       | Wargames | 2009-03-27 | default | The only winning move is not to play. |
     And I have a default layout that contains "Post Layout: {{ content }}"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Post Layout: <p>The only winning move is not to play.</p>" in "_site/2009/03/27/wargames.html"
 
   Scenario: Basic site with layout inside a subfolder and a post
@@ -52,7 +56,8 @@ Feature: Create sites
       | Wargames | 2009-03-27 | post/simple | The only winning move is not to play. |
     And I have a post/simple layout that contains "Post Layout: {{ content }}"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Post Layout: <p>The only winning move is not to play.</p>" in "_site/2009/03/27/wargames.html"
 
   Scenario: Basic site with layouts, pages, posts and files
@@ -75,7 +80,8 @@ Feature: Create sites
       | entry3 | 2009-05-27 | post   | content for entry3. |
       | entry4 | 2009-06-27 | post   | content for entry4. |
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Page : Site contains 2 pages and 4 posts" in "_site/index.html"
     And I should see "No replacement \{\{ site.posts.size \}\}" in "_site/about.html"
     And I should see "" in "_site/another_file"
@@ -90,7 +96,8 @@ Feature: Create sites
     And I have an "index.html" page that contains "Basic Site with include tag: {% include about.textile %}"
     And I have an "_includes/about.textile" file that contains "Generated by Jekyll"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Basic Site with include tag: Generated by Jekyll" in "_site/index.html"
 
   Scenario: Basic site with subdir include tag
@@ -99,7 +106,8 @@ Feature: Create sites
     And I have an info directory
     And I have an "info/index.html" page that contains "Basic Site with subdir include tag: {% include about.textile %}"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Basic Site with subdir include tag: Generated by Jekyll" in "_site/info/index.html"
 
   Scenario: Basic site with nested include tag
@@ -108,31 +116,35 @@ Feature: Create sites
     And I have an "_includes/jekyll.textile" file that contains "Jekyll"
     And I have an "index.html" page that contains "Basic Site with include tag: {% include about.textile %}"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Basic Site with include tag: Generated by Jekyll" in "_site/index.html"
 
   Scenario: Basic site with internal post linking
-    Given I have an "index.html" page that contains "URL: {% post_url 2020-01-31-entry2 %}"
+    Given I have an "index.html" page that contains "URL: {% post_url 2008-01-01-entry2 %}"
     And I have a configuration file with "permalink" set to "pretty"
     And I have a _posts directory
     And I have the following posts:
       | title  | date       | layout | content             |
       | entry1 | 2007-12-31 | post   | content for entry1. |
-      | entry2 | 2020-01-31 | post   | content for entry2. |
+      | entry2 | 2008-01-01 | post   | content for entry2. |
     When I run jekyll build
-    Then the _site directory should exist
-    And I should see "URL: /2020/01/31/entry2/" in "_site/index.html"
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "URL: /2008/01/01/entry2/" in "_site/index.html"
 
   Scenario: Basic site with whitelisted dotfile
     Given I have an ".htaccess" file that contains "SomeDirective"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "SomeDirective" in "_site/.htaccess"
 
   Scenario: File was replaced by a directory
     Given I have a "test" file that contains "some stuff"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     When I delete the file "test"
     Given I have a test directory
     And I have a "test/index.html" file that contains "some other stuff"
@@ -146,13 +158,31 @@ Feature: Create sites
     And I have a "secret.html" page with published "false" that contains "Unpublished page"
 
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And the "_site/index.html" file should exist
     And the "_site/public.html" file should exist
     But the "_site/secret.html" file should not exist
 
     When I run jekyll build --unpublished
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And the "_site/index.html" file should exist
     And the "_site/public.html" file should exist
     And the "_site/secret.html" file should exist
+
+  Scenario: Basic site with page with future date
+    Given I have a _posts directory
+    And I have the following post:
+      | title  | date       | layout | content             |
+      | entry1 | 2020-12-31 | post   | content for entry1. |
+      | entry2 | 2007-12-31 | post   | content for entry2. |
+    When I run jekyll build
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "content for entry2" in "_site/2007/12/31/entry2.html"
+    And the "_site/2020/12/31/entry1.html" file should not exist
+    When I run jekyll build --future
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And the "_site/2020/12/31/entry1.html" file should exist

features/drafts.feature

@@ -10,7 +10,8 @@ Feature: Draft Posts
       | title  | date       | layout  | content        |
       | Recipe | 2009-03-27 | default | Not baked yet. |
     When I run jekyll build --drafts
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Not baked yet." in "_site/recipe.html"
 
   Scenario: Don't preview a draft
@@ -21,7 +22,8 @@ Feature: Draft Posts
       | title  | date       | layout  | content        |
       | Recipe | 2009-03-27 | default | Not baked yet. |
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And the "_site/recipe.html" file should not exist
 
   Scenario: Don't preview a draft that is not published
@@ -32,7 +34,8 @@ Feature: Draft Posts
       | title  | date       | layout  | published | content        |
       | Recipe | 2009-03-27 | default | false     | Not baked yet. |
     When I run jekyll build --drafts
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And the "_site/recipe.html" file should not exist
 
   Scenario: Use page.path variable
@@ -42,5 +45,6 @@ Feature: Draft Posts
       | title  | date       | layout | content                    |
       | Recipe | 2009-03-27 | simple | Post path: {{ page.path }} |
     When I run jekyll build --drafts
-    Then the _site directory should exist
-    And I should see "Post path: _drafts/recipe.textile" in "_site/recipe.html"
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "Post path: _drafts/recipe.markdown" in "_site/recipe.html"

features/embed_filters.feature

@@ -11,7 +11,8 @@ Feature: Embed filters
       | Star Wars | 2009-03-27 | default | These aren't the droids you're looking for. |
     And I have a default layout that contains "{{ site.time | date_to_xmlschema }}"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see today's date in "_site/2009/03/27/star-wars.html"
 
   Scenario: Escape text for XML
@@ -20,11 +21,10 @@ Feature: Embed filters
     And I have the following post:
       | title       | date       | layout  | content                                     |
       | Star & Wars | 2009-03-27 | default | These aren't the droids you're looking for. |
-
-
     And I have a default layout that contains "{{ page.title | xml_escape }}"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Star & Wars" in "_site/2009/03/27/star-wars.html"
 
   Scenario: Calculate number of words
@@ -33,9 +33,10 @@ Feature: Embed filters
     And I have the following post:
       | title     | date       | layout  | content                                     |
       | Star Wars | 2009-03-27 | default | These aren't the droids you're looking for. |
-    And I have a default layout that contains "{{ content | xml_escape }}"
+    And I have a default layout that contains "{{ content | number_of_words }}"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "7" in "_site/2009/03/27/star-wars.html"
 
   Scenario: Convert an array into a sentence
@@ -46,18 +47,20 @@ Feature: Embed filters
       | Star Wars | 2009-03-27 | default | [scifi, movies, force] | These aren't the droids you're looking for. |
     And I have a default layout that contains "{{ page.tags | array_to_sentence_string }}"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "scifi, movies, and force" in "_site/2009/03/27/star-wars.html"
 
-  Scenario: Textilize a given string
+  Scenario: Markdownify a given string
     Given I have a _posts directory
     And I have a _layouts directory
     And I have the following post:
       | title     | date       | layout  | content                                     |
       | Star Wars | 2009-03-27 | default | These aren't the droids you're looking for. |
-    And I have a default layout that contains "By {{ '_Obi-wan_' | textilize }}"
+    And I have a default layout that contains "By {{ '_Obi-wan_' | markdownify }}"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "By <p><em>Obi-wan</em></p>" in "_site/2009/03/27/star-wars.html"
 
   Scenario: Sort by an arbitrary variable
@@ -70,38 +73,37 @@ Feature: Embed filters
       | Page-2 | default | 6     | Something |
     And I have a default layout that contains "{{ site.pages | sort:'value' | map:'title' | join:', ' }}"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see exactly "Page-2, Page-1" in "_site/page-1.html"
     And I should see exactly "Page-2, Page-1" in "_site/page-2.html"
 
   Scenario: Sort pages by the title
     Given I have a _layouts directory
+    And I have the following pages:
+      | title | layout  | content |
+      | Dog   | default | Run     |
+      | Bird  | default | Fly     |
     And I have the following page:
-      | title | layout | content |
-      | Dog | default | Run |
-    And I have the following page:
-      | title | layout | content |
-      | Bird | default | Fly |
-    And I have the following page:
-      | layout | content |
-      | default | Jump |
+      | layout  | content |
+      | default | Jump    |
     And I have a default layout that contains "{% assign sorted_pages = site.pages | sort: 'title' %}The rule of {{ sorted_pages.size }}: {% for p in sorted_pages %}{{ p.content | strip_html | strip_newlines }}, {% endfor %}"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see exactly "The rule of 3: Jump, Fly, Run," in "_site/bird.html"
 
   Scenario: Sort pages by the title ordering pages without title last
     Given I have a _layouts directory
+    And I have the following pages:
+      | title | layout  | content |
+      | Dog   | default | Run     |
+      | Bird  | default | Fly     |
     And I have the following page:
-      | title | layout | content |
-      | Dog | default | Run |
-    And I have the following page:
-      | title | layout | content |
-      | Bird | default | Fly |
-    And I have the following page:
-      | layout | content |
-      | default | Jump |
+      | layout  | content |
+      | default | Jump    |
     And I have a default layout that contains "{% assign sorted_pages = site.pages | sort: 'title', 'last' %}The rule of {{ sorted_pages.size }}: {% for p in sorted_pages %}{{ p.content | strip_html | strip_newlines }}, {% endfor %}"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see exactly "The rule of 3: Fly, Run, Jump," in "_site/bird.html"

features/frontmatter_defaults.feature

@@ -12,7 +12,8 @@ Feature: frontmatter defaults
     And I have a configuration file with "defaults" set to "[{scope: {path: ""}, values: {layout: "pretty"}}]"
 
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "THIS IS THE LAYOUT: <p>just some post</p>" in "_site/2013/09/11/default-layout.html"
     And I should see "THIS IS THE LAYOUT: just some page" in "_site/index.html"
 
@@ -24,8 +25,9 @@ Feature: frontmatter defaults
     And I have an "index.html" page that contains "just {{page.custom}} by {{page.author}}"
     And I have a configuration file with "defaults" set to "[{scope: {path: ""}, values: {custom: "some special data", author: "Ben"}}]"
     When I run jekyll build
-    Then the _site directory should exist
-    And I should see "<p>some special data</p><div>Ben</div>" in "_site/2013/09/11/default-data.html"
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "<p>some special data</p>\n<div>Ben</div>" in "_site/2013/09/11/default-data.html"
     And I should see "just some special data by Ben" in "_site/index.html"
 
   Scenario: Override frontmatter defaults by path
@@ -48,12 +50,56 @@ Feature: frontmatter defaults
     And I have a configuration file with "defaults" set to "[{scope: {path: "special"}, values: {layout: "subfolder", description: "the special section"}}, {scope: {path: ""}, values: {layout: "root", description: "the webpage"}}]"
 
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "root: <p>info on the webpage</p>" in "_site/2013/10/14/about.html"
     And I should see "subfolder: <p>info on the special section</p>" in "_site/special/2013/10/14/about.html"
     And I should see "root: Overview for the webpage" in "_site/index.html"
     And I should see "subfolder: Overview for the special section" in "_site/special/index.html"
 
+  Scenario: Use frontmatter variables by relative path
+    Given I have a _layouts directory
+    And I have a main layout that contains "main: {{ content }}"
+
+    And I have a _posts directory
+    And I have the following post:
+      | title | date       | content                               |
+      | about | 2013-10-14 | content of site/2013/10/14/about.html |
+    And I have a special/_posts directory
+    And I have the following post in "special":
+      | title  | date       | path  | content                                        |
+      | about1 | 2013-10-14 | local | content of site/special/2013/10/14/about1.html |
+      | about2 | 2013-10-14 | local | content of site/special/2013/10/14/about2.html |
+
+    And I have a configuration file with "defaults" set to "[{scope: {path: "special"}, values: {layout: "main"}}, {scope: {path: "special/_posts"}, values: {layout: "main"}}, {scope: {path: "_posts"}, values: {layout: "main"}}]"
+
+    When I run jekyll build
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "main: <p>content of site/2013/10/14/about.html</p>" in "_site/2013/10/14/about.html"
+    And I should see "main: <p>content of site/special/2013/10/14/about1.html</p>" in "_site/special/2013/10/14/about1.html"
+    And I should see "main: <p>content of site/special/2013/10/14/about2.html</p>" in "_site/special/2013/10/14/about2.html"
+
+  Scenario: Use frontmatter scopes for subdirectories
+    Given I have a _layouts directory
+    And I have a main layout that contains "main: {{ content }}"
+
+    And I have a _posts/en directory
+    And I have the following post under "en":
+      | title | date       | content                               |
+      | helloworld | 2014-09-01 | {{page.lang}} is the current language |
+    And I have a _posts/de directory
+    And I have the following post under "de":
+      | title  | date       | content                                        |
+      | hallowelt | 2014-09-01 | {{page.lang}} is the current language |
+
+    And I have a configuration file with "defaults" set to "[{scope: {path: "_posts/en"}, values: {layout: "main", lang: "en"}}, {scope: {path: "_posts/de"}, values: {layout: "main", lang: "de"}}]"
+
+    When I run jekyll build
+    Then the _site directory should exist
+    And I should see "main: <p>en is the current language</p>" in "_site/2014/09/01/helloworld.html"
+    And I should see "main: <p>de is the current language</p>" in "_site/2014/09/01/hallowelt.html"
+
   Scenario: Override frontmatter defaults by type
     Given I have a _posts directory
     And I have the following post:
@@ -78,10 +124,19 @@ Feature: frontmatter defaults
     And I should see "nothing" in "_site/override.html"
     But the "_site/perma.html" file should not exist
 
+  Scenario: Define permalink default for posts
+    Given I have a _posts directory
+    And I have the following post:
+      | title          | date       | category | content |
+      | testpost       | 2013-10-14 | blog     | blabla  |
+    And I have a configuration file with "defaults" set to "[{scope: {path: "", type: "posts"}, values: {permalink: "/:categories/:title/"}}]"
+    When I run jekyll build
+    Then I should see "blabla" in "_site/blog/testpost/index.html"
+
   Scenario: Use frontmatter defaults in collections
     Given I have a _slides directory
     And I have a "index.html" file that contains "nothing"
-    And I have a "_slides/slide1.html" file with content: 
+    And I have a "_slides/slide1.html" file with content:
     """
     ---
     ---
@@ -101,13 +156,14 @@ Feature: frontmatter defaults
             myval: "Test"
     """
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Value: Test" in "_site/slides/slide1.html"
 
   Scenario: Override frontmatter defaults inside a collection
     Given I have a _slides directory
     And I have a "index.html" file that contains "nothing"
-    And I have a "_slides/slide2.html" file with content: 
+    And I have a "_slides/slide2.html" file with content:
     """
     ---
     myval: Override
@@ -128,7 +184,8 @@ Feature: frontmatter defaults
             myval: "Test"
     """
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Value: Override" in "_site/slides/slide2.html"
 
   Scenario: Deep merge frontmatter defaults

features/hooks.feature

@@ -0,0 +1,335 @@
+Feature: Hooks
+  As a plugin author
+  I want to be able to run code during various stages of the build process
+
+  Scenario: Run some code after site reset
+    Given I have a _plugins directory
+    And I have a "_plugins/ext.rb" file with content:
+    """
+    Jekyll::Hooks.register :site, :after_reset do |site|
+      pageklass = Class.new(Jekyll::Page) do
+        def initialize(site, base)
+          @site = site
+          @base = base
+          @data = {}
+          @dir = '/'
+          @name = 'foo.html'
+          @content = 'mytinypage'
+
+          self.process(@name)
+        end
+      end
+
+      site.pages << pageklass.new(site, site.source)
+    end
+    """
+    When I run jekyll build
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "mytinypage" in "_site/foo.html"
+
+  Scenario: Modify the payload before rendering the site
+    Given I have a _plugins directory
+    And I have a "index.html" page that contains "{{ site.injected }}!"
+    And I have a "_plugins/ext.rb" file with content:
+    """
+    Jekyll::Hooks.register :site, :pre_render do |site, payload|
+      payload['site']['injected'] = 'myparam'
+    end
+    """
+    When I run jekyll build
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "myparam!" in "_site/index.html"
+
+  Scenario: Modify the site contents after reading
+    Given I have a _plugins directory
+    And I have a "page1.html" page that contains "page1"
+    And I have a "page2.html" page that contains "page2"
+    And I have a "_plugins/ext.rb" file with content:
+    """
+    Jekyll::Hooks.register :site, :post_read do |site|
+      site.pages.delete_if { |p| p.name == 'page1.html' }
+    end
+    """
+    When I run jekyll build
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And the "_site/page1.html" file should not exist
+    And I should see "page2" in "_site/page2.html"
+
+  Scenario: Work with the site files after they've been written to disk
+    Given I have a _plugins directory
+    And I have a "_plugins/ext.rb" file with content:
+    """
+    Jekyll::Hooks.register :site, :post_write do |site|
+      firstpage = site.pages.first
+      content = File.read firstpage.destination(site.dest)
+      File.write(File.join(site.dest, 'firstpage.html'), content)
+    end
+    """
+    And I have a "page1.html" page that contains "page1"
+    When I run jekyll build
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "page1" in "_site/firstpage.html"
+
+  Scenario: Alter a page right after it is initialized
+    Given I have a _plugins directory
+    And I have a "_plugins/ext.rb" file with content:
+    """
+    Jekyll::Hooks.register :pages, :post_init do |page|
+      page.name = 'renamed.html'
+      page.process(page.name)
+    end
+    """
+    And I have a "page1.html" page that contains "page1"
+    When I run jekyll build
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "page1" in "_site/renamed.html"
+
+  Scenario: Alter the payload for one page but not another
+    Given I have a _plugins directory
+    And I have a "_plugins/ext.rb" file with content:
+    """
+    Jekyll::Hooks.register :pages, :pre_render do |page, payload|
+      payload['page']['myparam'] = 'special' if page.name == 'page1.html'
+    end
+    """
+    And I have a "page1.html" page that contains "{{ page.myparam }}"
+    And I have a "page2.html" page that contains "{{ page.myparam }}"
+    When I run jekyll build
+    Then I should see "special" in "_site/page1.html"
+    And I should not see "special" in "_site/page2.html"
+
+  Scenario: Modify page contents before writing to disk
+    Given I have a _plugins directory
+    And I have a "index.html" page that contains "WRAP ME"
+    And I have a "_plugins/ext.rb" file with content:
+    """
+    Jekyll::Hooks.register :pages, :post_render do |page|
+      page.output = "{{{{{ #{page.output.chomp} }}}}}"
+    end
+    """
+    When I run jekyll build
+    Then I should see "{{{{{ WRAP ME }}}}}" in "_site/index.html"
+
+  Scenario: Work with a page after writing it to disk
+    Given I have a _plugins directory
+    And I have a "index.html" page that contains "HELLO FROM A PAGE"
+    And I have a "_plugins/ext.rb" file with content:
+    """
+    Jekyll::Hooks.register :pages, :post_write do |page|
+      require 'fileutils'
+      filename = page.destination(page.site.dest)
+      FileUtils.mv(filename, "#{filename}.moved")
+    end
+    """
+    When I run jekyll build
+    Then I should see "HELLO FROM A PAGE" in "_site/index.html.moved"
+
+  Scenario: Alter a post right after it is initialized
+    Given I have a _plugins directory
+    And I have a "_plugins/ext.rb" file with content:
+    """
+    Jekyll::Hooks.register :posts, :post_init do |post|
+      post.data['harold'] = "content for entry1.".tr!('abcdefghijklmnopqrstuvwxyz',
+            'nopqrstuvwxyzabcdefghijklm')
+    end
+    """
+    And I have a _posts directory
+    And I have the following posts:
+      | title  | date       | layout | content               |
+      | entry1 | 2015-03-14 | nil    | {{ page.harold }} |
+    When I run jekyll build
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "pbagrag sbe ragel1." in "_site/2015/03/14/entry1.html"
+
+  Scenario: Alter the payload for certain posts
+    Given I have a _plugins directory
+    And I have a "_plugins/ext.rb" file with content:
+    """
+    # Add myvar = 'old' to posts before 2015-03-15, and myvar = 'new' for
+    # others
+    Jekyll::Hooks.register :posts, :pre_render do |post, payload|
+      if post.date < Time.new(2015, 3, 15)
+        payload['myvar'] = 'old'
+      else
+        payload['myvar'] = 'new'
+      end
+    end
+    """
+    And I have a _posts directory
+    And I have the following posts:
+      | title  | date       | layout | content          |
+      | entry1 | 2015-03-14 | nil    | {{ myvar }} post |
+      | entry2 | 2015-03-15 | nil    | {{ myvar }} post |
+    When I run jekyll build
+    Then I should see "old post" in "_site/2015/03/14/entry1.html"
+    And I should see "new post" in "_site/2015/03/15/entry2.html"
+
+  Scenario: Modify post contents before writing to disk
+    Given I have a _plugins directory
+    And I have a "_plugins/ext.rb" file with content:
+    """
+    # Replace content after rendering
+    Jekyll::Hooks.register :posts, :post_render do |post|
+      post.output.gsub! /42/, 'the answer to life, the universe and everything'
+    end
+    """
+    And I have a _posts directory
+    And I have the following posts:
+      | title  | date       | layout | content             |
+      | entry1 | 2015-03-14 | nil    | {{ 6 \| times: 7 }} |
+      | entry2 | 2015-03-15 | nil    | {{ 6 \| times: 8 }} |
+    When I run jekyll build
+    Then I should see "the answer to life, the universe and everything" in "_site/2015/03/14/entry1.html"
+    And I should see "48" in "_site/2015/03/15/entry2.html"
+
+  Scenario: Work with a post after writing it to disk
+    Given I have a _plugins directory
+    And I have a "_plugins/ext.rb" file with content:
+    """
+    # Log all post filesystem writes
+    Jekyll::Hooks.register :posts, :post_write do |post|
+      filename = post.destination(post.site.dest)
+      open('_site/post-build.log', 'a') do |f|
+        f.puts "Wrote #{filename} at #{Time.now}"
+      end
+    end
+    """
+    And I have a _posts directory
+    And I have the following posts:
+      | title  | date       | layout | content   |
+      | entry1 | 2015-03-14 | nil    | entry one |
+      | entry2 | 2015-03-15 | nil    | entry two |
+    When I run jekyll build
+    Then I should see "_site/2015/03/14/entry1.html at" in "_site/post-build.log"
+    Then I should see "_site/2015/03/15/entry2.html at" in "_site/post-build.log"
+
+  Scenario: Register a hook on multiple owners at the same time
+    Given I have a _plugins directory
+    And I have a "_plugins/ext.rb" file with content:
+    """
+    Jekyll::Hooks.register [:pages, :posts], :post_render do |owner|
+      owner.output = "{{{{{ #{owner.output.chomp} }}}}}"
+    end
+    """
+    And I have a "index.html" page that contains "WRAP ME"
+    And I have a _posts directory
+    And I have the following posts:
+      | title  | date       | layout | content   |
+      | entry1 | 2015-03-14 | nil    | entry one |
+    When I run jekyll build
+    Then I should see "{{{{{ WRAP ME }}}}}" in "_site/index.html"
+    And I should see "{{{{{ <p>entry one</p> }}}}}" in "_site/2015/03/14/entry1.html"
+
+  Scenario: Allow hooks to have a named priority
+    Given I have a _plugins directory
+    And I have a "_plugins/ext.rb" file with content:
+    """
+    Jekyll::Hooks.register :pages, :post_render, priority: :normal do |owner|
+      # first normal runs second
+      owner.output = "1 #{owner.output.chomp}"
+    end
+    Jekyll::Hooks.register :pages, :post_render, priority: :high do |owner|
+      # high runs last
+      owner.output = "2 #{owner.output.chomp}"
+    end
+    Jekyll::Hooks.register :pages, :post_render do |owner|
+      # second normal runs third (normal is default)
+      owner.output = "3 #{owner.output.chomp}"
+    end
+    Jekyll::Hooks.register :pages, :post_render, priority: :low do |owner|
+      # low runs first
+      owner.output = "4 #{owner.output.chomp}"
+    end
+    """
+    And I have a "index.html" page that contains "WRAP ME"
+    When I run jekyll build
+    Then I should see "2 3 1 4 WRAP ME" in "_site/index.html"
+
+  Scenario: Alter a document right after it is initialized
+    Given I have a _plugins directory
+    And I have a "_plugins/ext.rb" file with content:
+    """
+    Jekyll::Hooks.register :documents, :pre_render do |doc, payload|
+      doc.data['text'] = doc.data['text'] << ' are belong to us'
+    end
+    """
+    And I have a "_config.yml" file that contains "collections: [ memes ]"
+    And I have a _memes directory
+    And I have a "_memes/doc1.md" file with content:
+    """
+    ---
+    text: all your base
+    ---
+    """
+    And I have an "index.md" file with content:
+    """
+    ---
+    ---
+    {{ site.memes.first.text }}
+    """
+    When I run jekyll build
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "all your base are belong to us" in "_site/index.html"
+
+  Scenario: Update a document after rendering it, but before writing it to disk
+    Given I have a _plugins directory
+    And I have a "_plugins/ext.rb" file with content:
+    """
+    Jekyll::Hooks.register :documents, :post_render do |doc|
+      doc.output.gsub! /<p>/, '<p class="meme">'
+    end
+    """
+    And I have a "_config.yml" file with content:
+    """
+    collections:
+      memes:
+        output: true
+    """
+    And I have a _memes directory
+    And I have a "_memes/doc1.md" file with content:
+    """
+    ---
+    text: all your base are belong to us
+    ---
+    {{ page.text }}
+    """
+    When I run jekyll build
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "<p class=\"meme\">all your base are belong to us" in "_site/memes/doc1.html"
+
+  Scenario: Perform an action after every document is written
+    Given I have a _plugins directory
+    And I have a "_plugins/ext.rb" file with content:
+    """
+    Jekyll::Hooks.register :documents, :post_write do |doc|
+      open('_site/document-build.log', 'a') do |f|
+        f.puts "Wrote document #{doc.collection.docs.index doc} at #{Time.now}"
+      end
+    end
+    """
+    And I have a "_config.yml" file with content:
+    """
+    collections:
+      memes:
+        output: true
+    """
+    And I have a _memes directory
+    And I have a "_memes/doc1.md" file with content:
+    """
+    ---
+    text: all your base are belong to us
+    ---
+    {{ page.text }}
+    """
+    When I run jekyll build
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "Wrote document 0" in "_site/document-build.log"

features/include_tag.feature

@@ -9,17 +9,18 @@ Feature: Include tags
     And I have an "_includes/params.html" file that contains "Parameters:<ul>{% for param in include %}<li>{{param[0]}} = {{param[1]}}</li>{% endfor %}</ul>"
     And I have an "_includes/ignore.html" file that contains "<footer>My blog footer</footer>"
     And I have a _posts directory
-    And I have the following post:
-      | title                               | date       | layout  | content                                                                                                                 |
-      | Include Files                       | 2013-03-21 | default | {% include header.html param="myparam" %}                                                                               |
-      | Ignore params if unused             | 2013-03-21 | default | {% include ignore.html date="today" %}                                                                                  |
-      | List multiple parameters            | 2013-03-21 | default | {% include params.html date="today" start="tomorrow" %}                                                                 |
-      | Dont keep parameters                | 2013-03-21 | default | {% include ignore.html param="test" %}\n{% include header.html %}                                                       |
-      | Allow params with spaces and quotes | 2013-04-07 | default | {% include params.html cool="param with spaces" super="\"quoted\"" single='has "quotes"' escaped='\'single\' quotes' %} |
-      | Parameter syntax                    | 2013-04-12 | default | {% include params.html param1_or_2="value" %}                                                                           |
-      | Pass a variable                     | 2013-06-22 | default | {% assign var = 'some text' %}{% include params.html local=var layout=page.layout %}                                    |
+    And I have the following posts:
+      | title                               | date       | type | content                                                                                                                 |
+      | Include Files                       | 2013-03-21 | html | {% include header.html param="myparam" %}                                                                               |
+      | Ignore params if unused             | 2013-03-21 | html | {% include ignore.html date="today" %}                                                                                  |
+      | List multiple parameters            | 2013-03-21 | html | {% include params.html date="today" start="tomorrow" %}                                                                 |
+      | Dont keep parameters                | 2013-03-21 | html | {% include ignore.html param="test" %}\n{% include header.html %}                                                       |
+      | Allow params with spaces and quotes | 2013-04-07 | html | {% include params.html cool="param with spaces" super="\\"quoted\\"" single='has "quotes"' escaped='\\'single\\' quotes' %} |
+      | Parameter syntax                    | 2013-04-12 | html | {% include params.html param1_or_2="value" %}                                                                           |
+      | Pass a variable                     | 2013-06-22 | html | {% assign var = 'some text' %}{% include params.html local=var title=page.title %}                                    |
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "<header>My awesome blog header: myparam</header>" in "_site/2013/03/21/include-files.html"
     And I should not see "myparam" in "_site/2013/03/21/ignore-params-if-unused.html"
     And I should see "<li>date = today</li>" in "_site/2013/03/21/list-multiple-parameters.html"
@@ -27,12 +28,12 @@ Feature: Include tags
     And I should not see "<header>My awesome blog header: myparam</header>" in "_site/2013/03/21/dont-keep-parameters.html"
     But I should see "<header>My awesome blog header: </header>" in "_site/2013/03/21/dont-keep-parameters.html"
     And I should see "<li>cool = param with spaces</li>" in "_site/2013/04/07/allow-params-with-spaces-and-quotes.html"
-    And I should see "<li>super = &#8220;quoted&#8221;</li>" in "_site/2013/04/07/allow-params-with-spaces-and-quotes.html"
-    And I should see "<li>single = has &#8220;quotes&#8221;</li>" in "_site/2013/04/07/allow-params-with-spaces-and-quotes.html"
-    And I should see "<li>escaped = &#8216;single&#8217; quotes</li>" in "_site/2013/04/07/allow-params-with-spaces-and-quotes.html"
+    And I should see "<li>super = \"quoted\"</li>" in "_site/2013/04/07/allow-params-with-spaces-and-quotes.html"
+    And I should see "<li>single = has \"quotes\"</li>" in "_site/2013/04/07/allow-params-with-spaces-and-quotes.html"
+    And I should see "<li>escaped = 'single' quotes</li>" in "_site/2013/04/07/allow-params-with-spaces-and-quotes.html"
     And I should see "<li>param1_or_2 = value</li>" in "_site/2013/04/12/parameter-syntax.html"
     And I should see "<li>local = some text</li>" in "_site/2013/06/22/pass-a-variable.html"
-    And I should see "<li>layout = default</li>" in "_site/2013/06/22/pass-a-variable.html"
+    And I should see "<li>title = Pass a variable</li>" in "_site/2013/06/22/pass-a-variable.html"
 
   Scenario: Include a file from a variable
     Given I have an _includes directory
@@ -44,7 +45,8 @@ Feature: Include tags
     | include_file2 | parametrized.html |
     And I have an "index.html" page that contains "{% include {{site.include_file1}} %} that {% include {{site.include_file2}} what='parameters' %}"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "a snippet that works with parameters" in "_site/index.html"
 
   Scenario: Include a variable file in a loop
@@ -53,7 +55,8 @@ Feature: Include tags
     And I have an "_includes/two.html" file that contains "two"
     And I have an "index.html" page with files "[one.html, two.html]" that contains "{% for file in page.files %}{% include {{file}} %} {% endfor %}"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "one two" in "_site/index.html"
 
   Scenario: Include a file with variables and filters
@@ -64,7 +67,8 @@ Feature: Include tags
     | include_file | one   |
     And I have an "index.html" page that contains "{% include {{ site.include_file | append: '.html' }} %}"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "one included" in "_site/index.html"
 
   Scenario: Include a file with partial variables
@@ -75,5 +79,28 @@ Feature: Include tags
     | include_file | one   |
     And I have an "index.html" page that contains "{% include {{ site.include_file }}.html %}"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "one included" in "_site/index.html"
+
+  Scenario: Include a file and rebuild when include content is changed
+    Given I have an _includes directory
+    And I have an "_includes/one.html" file that contains "include"
+    And I have an "index.html" page that contains "{% include one.html %}"
+    When I run jekyll build
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "include" in "_site/index.html"
+    When I wait 1 second
+    Then I have an "_includes/one.html" file that contains "include content changed"
+    When I run jekyll build
+    Then I should see "include content changed" in "_site/index.html"
+
+  Scenario: Include a file with multiple variables
+    Given I have an _includes directory
+    And I have an "_includes/header-en.html" file that contains "include"
+    And I have an "index.html" page that contains "{% assign name = 'header' %}{% assign locale = 'en' %}{% include {{name}}-{{locale}}.html %}"
+    When I run jekyll build
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "include" in "_site/index.html"

features/incremental_rebuild.feature

@@ -10,51 +10,59 @@ Feature: Incremental rebuild
       | title    | date       | layout  | content                               |
       | Wargames | 2009-03-27 | default | The only winning move is not to play. |
     And I have a default layout that contains "Post Layout: {{ content }}"
-    When I run jekyll build
-    Then the _site directory should exist
+    When I run jekyll build -I
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Post Layout: <p>The only winning move is not to play.</p>" in "_site/2009/03/27/wargames.html"
-    When I run jekyll build
-    Then the _site directory should exist
+    When I run jekyll build -I
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Post Layout: <p>The only winning move is not to play.</p>" in "_site/2009/03/27/wargames.html"
 
   Scenario: Generate a metadata file
     Given I have an "index.html" file that contains "Basic Site"
-    When I run jekyll build
+    When I run jekyll build -I
     Then the ".jekyll-metadata" file should exist
 
   Scenario: Rebuild when content is changed
     Given I have an "index.html" file that contains "Basic Site"
-    When I run jekyll build
-    Then the _site directory should exist
+    When I run jekyll build -I
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Basic Site" in "_site/index.html"
     When I wait 1 second
     Then I have an "index.html" file that contains "Bacon Site"
-    When I run jekyll build
-    Then the _site directory should exist
+    When I run jekyll build -I
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Bacon Site" in "_site/index.html"
 
   Scenario: Rebuild when layout is changed
     Given I have a _layouts directory
     And I have an "index.html" page with layout "default" that contains "Basic Site with Layout"
     And I have a default layout that contains "Page Layout: {{ content }}"
-    When I run jekyll build
-    Then the _site directory should exist
+    When I run jekyll build -I
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Page Layout: Basic Site with Layout" in "_site/index.html"
     When I wait 1 second
     Then I have a default layout that contains "Page Layout Changed: {{ content }}"
-    When I run jekyll build --full-rebuild
-    Then the _site directory should exist
+    When I run jekyll build
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Page Layout Changed: Basic Site with Layout" in "_site/index.html"
 
   Scenario: Rebuild when an include is changed
     Given I have a _includes directory
     And I have an "index.html" page that contains "Basic Site with include tag: {% include about.textile %}"
     And I have an "_includes/about.textile" file that contains "Generated by Jekyll"
-    When I run jekyll build
-    Then the _site directory should exist
+    When I run jekyll build -I
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Basic Site with include tag: Generated by Jekyll" in "_site/index.html"
     When I wait 1 second
     Then I have an "_includes/about.textile" file that contains "Regenerated by Jekyll"
-    When I run jekyll build
-    Then the _site directory should exist
+    When I run jekyll build -I
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Basic Site with include tag: Regenerated by Jekyll" in "_site/index.html"

features/layout_data.feature

@@ -0,0 +1,70 @@
+Feature: Layout data
+  As a hacker who likes to avoid repetition
+  I want to be able to embed data into my layouts
+  In order to make the layouts slightly dynamic
+
+  Scenario: Use custom layout data
+    Given I have a _layouts directory
+    And I have a "_layouts/custom.html" file with content:
+      """
+      ---
+      foo: my custom data
+      ---
+      {{ content }} foo: {{ layout.foo }}
+      """
+    And I have an "index.html" page with layout "custom" that contains "page content"
+    When I run jekyll build
+    Then the "_site/index.html" file should exist
+    And I should see "page content\n foo: my custom data" in "_site/index.html"
+
+  Scenario: Inherit custom layout data
+    Given I have a _layouts directory
+    And I have a "_layouts/custom.html" file with content:
+      """
+      ---
+      layout: base
+      foo: my custom data
+      ---
+      {{ content }}
+      """
+    And I have a "_layouts/base.html" file with content:
+      """
+      {{ content }} foo: {{ layout.foo }}
+      """
+    And I have an "index.html" page with layout "custom" that contains "page content"
+    When I run jekyll build
+    Then the "_site/index.html" file should exist
+    And I should see "page content\n foo: my custom data" in "_site/index.html"
+
+  Scenario: Inherit custom layout data and clear when not present
+    Given I have a _layouts directory
+    And I have a "_layouts/default.html" file with content:
+      """
+      ---
+      bar: i'm default
+      ---
+      {{ content }} foo: '{{ layout.foo }}' bar: '{{ layout.bar }}'
+      """
+    And I have a "_layouts/special.html" file with content:
+      """
+      ---
+      layout: default
+      foo: my special data
+      bar: im special
+      ---
+      {{ content }}
+      """
+    And I have a "_layouts/page.html" file with content:
+      """
+      ---
+      layout: default
+      bar: im page
+      ---
+      {{ content }}
+      """
+    And I have an "index.html" page with layout "special" that contains "page content"
+    And I have an "jekyll.html" page with layout "page" that contains "page content"
+    When I run jekyll build
+    Then the "_site/index.html" file should exist
+    And I should see "page content\n foo: 'my special data' bar: 'im special'" in "_site/index.html"
+    And I should see "page content\n foo: '' bar: 'im page'" in "_site/jekyll.html"

features/markdown.feature

@@ -11,57 +11,24 @@ Feature: Markdown
       | title   | date       | content    | type     |
       | Hackers | 2009-03-27 | # My Title | markdown |
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Index" in "_site/index.html"
     And I should see "<h1 id=\"my-title\">My Title</h1>" in "_site/2009/03/27/hackers.html"
     And I should see "<h1 id=\"my-title\">My Title</h1>" in "_site/index.html"
 
   Scenario: Markdown in pagination on index
-    Given I have a configuration file with "paginate" set to "5"
+    Given I have a configuration file with:
+      | key      | value             |
+      | paginate | 5                 |
+      | gems     | [jekyll-paginate] |
     And I have an "index.html" page that contains "Index - {% for post in paginator.posts %} {{ post.content }} {% endfor %}"
     And I have a _posts directory
     And I have the following post:
       | title   | date       | content    | type     |
       | Hackers | 2009-03-27 | # My Title | markdown |
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Index" in "_site/index.html"
     And I should see "<h1 id=\"my-title\">My Title</h1>" in "_site/index.html"
-
-  Scenario: Maruku fenced codeblocks
-    Given I have a configuration file with "markdown" set to "maruku"
-    And I have an "index.markdown" file with content:
-       """
-       ---
-       title: My title
-       ---
-
-       # My title
-
-       ```
-       My awesome code
-       ```
-       """
-    When I run jekyll build
-    Then the _site directory should exist
-    And I should see "My awesome code" in "_site/index.html"
-    And I should see "<pre><code>My awesome code</code></pre>" in "_site/index.html"
-
-  Scenario: Maruku fenced codeblocks with syntax highlighting
-    Given I have a configuration file with "markdown" set to "maruku"
-    And I have an "index.markdown" file with content:
-       """
-       ---
-       title: My title
-       ---
-
-       # My title
-
-       ```ruby
-       puts "My awesome string"
-       ```
-       """
-    When I run jekyll build
-    Then the _site directory should exist
-    And I should see "My awesome string" in "_site/index.html"
-    And I should see "<pre class="ruby"><code class="ruby">puts &quot;My awesome string&quot;</code></pre>" in "_site/index.html"

features/pagination.feature

@@ -4,7 +4,10 @@ Feature: Site pagination
   I want divide the posts in several pages
 
   Scenario Outline: Paginate with N posts per page
-    Given I have a configuration file with "paginate" set to "<num>"
+    Given I have a configuration file with:
+      | key      | value             |
+      | paginate | <num>             |
+      | gems     | [jekyll-paginate] |
     And I have a _layouts directory
     And I have an "index.html" page that contains "{{ paginator.posts.size }}"
     And I have a _posts directory
@@ -32,6 +35,7 @@ Feature: Site pagination
       | paginate      | 1                              |
       | paginate_path | /blog/page-:num                |
       | permalink     | /blog/:year/:month/:day/:title |
+      | gems          | [jekyll-paginate]              |
     And I have a blog directory
     And I have an "blog/index.html" page that contains "{{ paginator.posts.size }}"
     And I have a _posts directory
@@ -59,6 +63,7 @@ Feature: Site pagination
       | paginate      | 1                              |
       | paginate_path | /blog/page/:num                |
       | permalink     | /blog/:year/:month/:day/:title |
+      | gems          | [jekyll-paginate]              |
     And I have a blog directory
     And I have an "blog/index.html" page that contains "{{ paginator.posts.size }}"
     And I have an "index.html" page that contains "Don't pick me!"

features/permalinks.feature

@@ -10,7 +10,8 @@ Feature: Fancy permalinks
       | None Permalink Schema | 2009-03-27 | Totally nothing. |
     And I have a configuration file with "permalink" set to "none"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Totally nothing." in "_site/none-permalink-schema.html"
 
   Scenario: Use pretty permalink schema
@@ -20,7 +21,8 @@ Feature: Fancy permalinks
       | Pretty Permalink Schema | 2009-03-27 | Totally wordpress. |
     And I have a configuration file with "permalink" set to "pretty"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Totally wordpress." in "_site/2009/03/27/pretty-permalink-schema/index.html"
 
   Scenario: Use pretty permalink schema for pages
@@ -29,7 +31,8 @@ Feature: Fancy permalinks
     And I have an "sitemap.xml" page that contains "Totally uhm, sitemap"
     And I have a configuration file with "permalink" set to "pretty"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Totally index" in "_site/index.html"
     And I should see "Totally awesome" in "_site/awesome/index.html"
     And I should see "Totally uhm, sitemap" in "_site/sitemap.xml"
@@ -39,9 +42,10 @@ Feature: Fancy permalinks
     And I have the following post:
       | title                   | category | date       | content         |
       | Custom Permalink Schema | stuff    | 2009-03-27 | Totally custom. |
-    And I have a configuration file with "permalink" set to "/blog/:year/:month/:day/:title"
+    And I have a configuration file with "permalink" set to "/blog/:year/:month/:day/:title/"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Totally custom." in "_site/blog/2009/03/27/custom-permalink-schema/index.html"
 
   Scenario: Use custom permalink schema with category
@@ -51,7 +55,8 @@ Feature: Fancy permalinks
       | Custom Permalink Schema | stuff    | 2009-03-27 | Totally custom. |
     And I have a configuration file with "permalink" set to "/:categories/:title.html"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Totally custom." in "_site/stuff/custom-permalink-schema.html"
 
   Scenario: Use custom permalink schema with squished date
@@ -61,16 +66,32 @@ Feature: Fancy permalinks
       | Custom Permalink Schema | stuff    | 2009-03-27 | Totally custom. |
     And I have a configuration file with "permalink" set to "/:month-:day-:year/:title.html"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Totally custom." in "_site/03-27-2009/custom-permalink-schema.html"
 
+  Scenario: Use custom permalink schema with date and time
+    Given I have a _posts directory
+    And I have the following post:
+      | title                   | category | date                | content         |
+      | Custom Permalink Schema | stuff    | 2009-03-27 22:31:07 | Totally custom. |
+    And I have a configuration file with:
+      | key         | value              |
+      | permalink   | "/:year:month:day:hour:minute:second.html" |
+      | timezone    | UTC                |
+    When I run jekyll build
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "Totally custom." in "_site/20090327223107.html"
+
   Scenario: Use per-post permalink
     Given I have a _posts directory
     And I have the following post:
       | title     | date       | permalink       | content |
-      | Some post | 2013-04-14 | /custom/posts/1 | bla bla |
+      | Some post | 2013-04-14 | /custom/posts/1/ | bla bla |
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And the _site/custom/posts/1 directory should exist
     And I should see "bla bla" in "_site/custom/posts/1/index.html"
 
@@ -80,16 +101,44 @@ Feature: Fancy permalinks
       | title     | date       | permalink               | content |
       | Some post | 2013-04-14 | /custom/posts/some.html | bla bla |
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And the _site/custom/posts directory should exist
     And I should see "bla bla" in "_site/custom/posts/some.html"
 
-  Scenario: Use per-post ending in .htm
+  Scenario: Use pretty permalink schema with cased file name
     Given I have a _posts directory
-    And I have the following post:
-      | title     | date       | permalink               | content |
-      | Some post | 2013-04-14 | /custom/posts/some.htm  | bla bla |
+    And I have an "_posts/2009-03-27-Pretty-Permalink-Schema.md" page that contains "Totally wordpress"
+    And I have a configuration file with "permalink" set to "pretty"
     When I run jekyll build
-    Then the _site directory should exist
-    And the _site/custom/posts directory should exist
-    And I should see "bla bla" in "_site/custom/posts/some.htm"
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "Totally wordpress." in "_site/2009/03/27/Pretty-Permalink-Schema/index.html"
+
+  Scenario: Use custom permalink schema with cased file name
+    Given I have a _posts directory
+    And I have an "_posts/2009-03-27-Custom-Schema.md" page with title "Custom Schema" that contains "Totally awesome"
+    And I have a configuration file with "permalink" set to "/:year/:month/:day/:slug/"
+    When I run jekyll build
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "Totally awesome" in "_site/2009/03/27/custom-schema/index.html"
+
+  Scenario: Use pretty permalink schema with title containing underscore
+    Given I have a _posts directory
+    And I have an "_posts/2009-03-27-Custom_Schema.md" page with title "Custom Schema" that contains "Totally awesome"
+    And I have a configuration file with "permalink" set to "pretty"
+    When I run jekyll build
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "Totally awesome" in "_site/2009/03/27/Custom_Schema/index.html"
+
+  Scenario: Use a non-HTML file extension in the permalink
+    Given I have a _posts directory
+    And I have an "_posts/2016-01-18-i-am-php.md" page with permalink "/2016/i-am-php.php" that contains "I am PHP"
+    And I have a "i-am-also-php.md" page with permalink "/i-am-also-php.php" that contains "I am also PHP"
+    When I run jekyll build
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "I am PHP" in "_site/2016/i-am-php.php"
+    And I should see "I am also PHP" in "_site/i-am-also-php.php"

features/plugins.feature

@@ -6,7 +6,8 @@ Feature: Configuring and using plugins
     Given I have an "index.html" file that contains "Whatever"
     And I have a configuration file with "gems" set to "[jekyll_test_plugin]"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Whatever" in "_site/index.html"
     And I should see "this is a test" in "_site/test.txt"
 
@@ -17,7 +18,8 @@ Feature: Configuring and using plugins
       | gems      | [jekyll_test_plugin] |
       | whitelist | []                   |
     When I run jekyll build --safe
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Whatever" in "_site/index.html"
     And the "_site/test.txt" file should not exist
 
@@ -28,7 +30,8 @@ Feature: Configuring and using plugins
       | gems      | [jekyll_test_plugin, jekyll_test_plugin_malicious] |
       | whitelist | [jekyll_test_plugin]                               |
     When I run jekyll build --safe
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Whatever" in "_site/index.html"
     And the "_site/test.txt" file should exist
     And I should see "this is a test" in "_site/test.txt"

features/post_data.feature

@@ -11,7 +11,8 @@ Feature: Post data
       | Star Wars | 2009-03-27 | simple | Luke, I am your father. |
     And I have a simple layout that contains "Post title: {{ page.title }}"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Post title: Star Wars" in "_site/2009/03/27/star-wars.html"
 
   Scenario: Use post.url variable
@@ -22,7 +23,8 @@ Feature: Post data
       | Star Wars | 2009-03-27 | simple | Luke, I am your father. |
     And I have a simple layout that contains "Post url: {{ page.url }}"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Post url: /2009/03/27/star-wars.html" in "_site/2009/03/27/star-wars.html"
 
   Scenario: Use post.date variable
@@ -33,9 +35,24 @@ Feature: Post data
       | Star Wars | 2009-03-27 | simple | Luke, I am your father. |
     And I have a simple layout that contains "Post date: {{ page.date | date_to_string }}"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Post date: 27 Mar 2009" in "_site/2009/03/27/star-wars.html"
 
+  Scenario: Use post.date variable with invalid
+    Given I have a _posts directory
+    And I have a "_posts/2016-01-01-test.md" page with date "tuesday" that contains "I have a bad date."
+    When I run jekyll build
+    Then the _site directory should not exist
+    And I should see "Document '_posts/2016-01-01-test.md' does not have a valid date in the YAML front matter." in the build output
+
+  Scenario: Invalid date in filename
+    Given I have a _posts directory
+    And I have a "_posts/2016-22-01-test.md" page that contains "I have a bad date."
+    When I run jekyll build
+    Then the _site directory should not exist
+    And I should see "Document '_posts/2016-22-01-test.md' does not have a valid date in the filename." in the build output
+
   Scenario: Use post.id variable
     Given I have a _posts directory
     And I have a _layouts directory
@@ -44,7 +61,8 @@ Feature: Post data
       | Star Wars | 2009-03-27 | simple | Luke, I am your father. |
     And I have a simple layout that contains "Post id: {{ page.id }}"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Post id: /2009/03/27/star-wars" in "_site/2009/03/27/star-wars.html"
 
   Scenario: Use post.content variable
@@ -55,7 +73,8 @@ Feature: Post data
       | Star Wars | 2009-03-27 | simple | Luke, I am your father. |
     And I have a simple layout that contains "Post content: {{ content }}"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Post content: <p>Luke, I am your father.</p>" in "_site/2009/03/27/star-wars.html"
 
   Scenario: Use post.categories variable when category is in a folder
@@ -67,7 +86,8 @@ Feature: Post data
       | Star Wars | 2009-03-27 | simple | Luke, I am your father. |
     And I have a simple layout that contains "Post category: {{ page.categories }}"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Post category: movies" in "_site/movies/2009/03/27/star-wars.html"
 
   Scenario: Use post.categories variable when category is in a folder and has category in YAML
@@ -79,7 +99,8 @@ Feature: Post data
       | Star Wars | 2009-03-27 | simple | film     | Luke, I am your father. |
     And I have a simple layout that contains "Post category: {{ page.categories }}"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Post category: movies" in "_site/movies/film/2009/03/27/star-wars.html"
 
   Scenario: Use post.categories variable when category is in a folder and has categories in YAML
@@ -91,7 +112,8 @@ Feature: Post data
       | Star Wars | 2009-03-27 | simple | [film, scifi]     | Luke, I am your father. |
     And I have a simple layout that contains "Post category: {{ page.categories }}"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Post category: movies" in "_site/movies/film/scifi/2009/03/27/star-wars.html"
 
   Scenario: Use post.categories variable when category is in a folder and duplicated category is in YAML
@@ -103,7 +125,8 @@ Feature: Post data
       | Star Wars | 2009-03-27 | simple | movies   | Luke, I am your father. |
     And I have a simple layout that contains "Post category: {{ page.categories }}"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Post category: movies" in "_site/movies/2009/03/27/star-wars.html"
 
   Scenario: Use post.tags variable
@@ -114,7 +137,8 @@ Feature: Post data
       | Star Wars | 2009-05-18 | simple | twist | Luke, I am your father. |
     And I have a simple layout that contains "Post tags: {{ page.tags }}"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Post tags: twist" in "_site/2009/05/18/star-wars.html"
 
   Scenario: Use post.categories variable when categories are in folders
@@ -127,7 +151,8 @@ Feature: Post data
       | Star Wars | 2009-03-27 | simple | Luke, I am your father. |
     And I have a simple layout that contains "Post categories: {{ page.categories | array_to_sentence_string }}"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Post categories: scifi and movies" in "_site/scifi/movies/2009/03/27/star-wars.html"
 
   Scenario: Use post.categories variable when categories are in folders with mixed case
@@ -140,8 +165,9 @@ Feature: Post data
       | Star Wars | 2009-03-27 | simple | Luke, I am your father. |
     And I have a simple layout that contains "Post categories: {{ page.categories | array_to_sentence_string }}"
     When I run jekyll build
-    Then the _site directory should exist
-    And I should see "Post categories: scifi and movies" in "_site/scifi/movies/2009/03/27/star-wars.html"
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "Post categories: scifi and Movies" in "_site/scifi/movies/2009/03/27/star-wars.html"
 
   Scenario: Use post.categories variable when category is in YAML
     Given I have a _posts directory
@@ -151,7 +177,8 @@ Feature: Post data
       | Star Wars | 2009-03-27 | simple | movies   | Luke, I am your father. |
     And I have a simple layout that contains "Post category: {{ page.categories }}"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Post category: movies" in "_site/movies/2009/03/27/star-wars.html"
 
   Scenario: Use post.categories variable when category is in YAML and is mixed-case
@@ -162,8 +189,9 @@ Feature: Post data
       | Star Wars | 2009-03-27 | simple | Movies   | Luke, I am your father. |
     And I have a simple layout that contains "Post category: {{ page.categories }}"
     When I run jekyll build
-    Then the _site directory should exist
-    And I should see "Post category: movies" in "_site/movies/2009/03/27/star-wars.html"
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "Post category: Movies" in "_site/movies/2009/03/27/star-wars.html"
 
   Scenario: Use post.categories variable when categories are in YAML
     Given I have a _posts directory
@@ -173,7 +201,8 @@ Feature: Post data
       | Star Wars | 2009-03-27 | simple | ['scifi', 'movies'] | Luke, I am your father. |
     And I have a simple layout that contains "Post categories: {{ page.categories | array_to_sentence_string }}"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Post categories: scifi and movies" in "_site/scifi/movies/2009/03/27/star-wars.html"
 
   Scenario: Use post.categories variable when categories are in YAML and are duplicated
@@ -184,7 +213,28 @@ Feature: Post data
       | Star Wars | 2009-03-27 | simple | ['movies', 'movies'] | Luke, I am your father. |
     And I have a simple layout that contains "Post category: {{ page.categories }}"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "Post category: movies" in "_site/movies/2009/03/27/star-wars.html"
+
+  Scenario: Superdirectories of _posts applied to post.categories
+    Given I have a movies/_posts directory
+    And I have a "movies/_posts/2009-03-27-star-wars.html" page with layout "simple" that contains "hi"
+    And I have a _layouts directory
+    And I have a simple layout that contains "Post category: {{ page.categories }}"
+    When I run jekyll build
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "Post category: movies" in "_site/movies/2009/03/27/star-wars.html"
+
+  Scenario: Subdirectories of _posts not applied to post.categories
+    Given I have a movies/_posts/scifi directory
+    And I have a "movies/_posts/scifi/2009-03-27-star-wars.html" page with layout "simple" that contains "hi"
+    And I have a _layouts directory
+    And I have a simple layout that contains "Post category: {{ page.categories }}"
+    When I run jekyll build
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Post category: movies" in "_site/movies/2009/03/27/star-wars.html"
 
   Scenario: Use post.categories variable when categories are in YAML with mixed case
@@ -196,9 +246,10 @@ Feature: Post data
       | Star Trek | 2013-03-17 | simple | ['SciFi', 'movies'] | Jean Luc, I am your father. |
     And I have a simple layout that contains "Post categories: {{ page.categories | array_to_sentence_string }}"
     When I run jekyll build
-    Then the _site directory should exist
-    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"
+    Then I should get a zero exit status
+    And the _site directory should exist
+    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 Outline: Use page.path variable
     Given I have a <dir>/_posts directory
@@ -206,7 +257,8 @@ Feature: Post data
       | title   | type | date       | content                      |
       | my-post | html | 2013-04-12 | Source path: {{ page.path }} |
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Source path: <path_prefix>_posts/2013-04-12-my-post.html" in "_site/<dir>/2013/04/12/my-post.html"
 
     Examples:
@@ -215,14 +267,15 @@ Feature: Post data
       | dir        | dir/        |
       | dir/nested | dir/nested/ |
 
-  Scenario: Override page.path variable
+  Scenario: Cannot override page.path variable
     Given I have a _posts directory
     And I have the following post:
       | title    | date       | path               | content                      |
-      | override | 2013-04-12 | override-path.html | Custom path: {{ page.path }} |
+      | override | 2013-04-12 | override-path.html | Non-custom path: {{ page.path }} |
     When I run jekyll build
-    Then the _site directory should exist
-    And I should see "Custom path: override-path.html" in "_site/2013/04/12/override.html"
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "Non-custom path: _posts/2013-04-12-override.markdown" in "_site/2013/04/12/override.html"
 
   Scenario: Disable a post from being published
     Given I have a _posts directory
@@ -231,7 +284,8 @@ Feature: Post data
       | title     | date       | layout | published | content                 |
       | Star Wars | 2009-03-27 | simple | false     | Luke, I am your father. |
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And the "_site/2009/03/27/star-wars.html" file should not exist
     And I should see "Published!" in "_site/index.html"
 
@@ -243,9 +297,22 @@ Feature: Post data
       | Star Wars | 2009-03-27 | simple | Darth Vader | Luke, I am your father. |
     And I have a simple layout that contains "Post author: {{ page.author }}"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Post author: Darth Vader" in "_site/2009/03/27/star-wars.html"
 
+  Scenario: Use a variable which is a reserved keyword in Ruby
+    Given I have a _posts directory
+    And I have a _layouts directory
+    And I have the following post:
+      | title   | date       | layout | class     | content                 |
+      | My post | 2016-01-21 | simple | kewl-post | Luke, I am your father. |
+    And I have a simple layout that contains "{{page.title}} has class {{page.class}}"
+    When I run jekyll build
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And I should see "My post has class kewl-post" in "_site/2016/01/21/my-post.html"
+
   Scenario: Previous and next posts title
     Given I have a _posts directory
     And I have a _layouts directory
@@ -256,6 +323,7 @@ Feature: Post data
       | Terminator       | 2009-05-27 | ordered | Arnold      | Sayonara, baby          |
     And I have a ordered layout that contains "Previous post: {{ page.previous.title }} and next post: {{ page.next.title }}"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "next post: Some like it hot" in "_site/2009/03/27/star-wars.html"
     And I should see "Previous post: Some like it hot" in "_site/2009/05/27/terminator.html"

features/post_excerpts.feature

@@ -12,7 +12,8 @@ Feature: Post excerpts
       | title  | date       | layout | content             |
       | entry1 | 2007-12-31 | post   | content for entry1. |
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see exactly "<p>content for entry1.</p>" in "_site/index.html"
 
   Scenario: An excerpt from a post with a layout
@@ -24,7 +25,8 @@ Feature: Post excerpts
       | title  | date       | layout | content             |
       | entry1 | 2007-12-31 | post   | content for entry1. |
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And the _site/2007 directory should exist
     And the _site/2007/12 directory should exist
     And the _site/2007/12/31 directory should exist
@@ -41,10 +43,11 @@ Feature: Post excerpts
       | title  | date       | layout | content             |
       | entry1 | 2007-12-31 | post   | content for entry1. |
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And the _site/2007 directory should exist
     And the _site/2007/12 directory should exist
     And the _site/2007/12/31 directory should exist
     And the "_site/2007/12/31/entry1.html" file should exist
-    And I should see exactly "<p>content for entry1.</p>" in "_site/index.html"
-    And I should see exactly "<html><head></head><body><p>content for entry1.</p></body></html>" in "_site/2007/12/31/entry1.html"
+    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"

features/rendering.feature

@@ -5,19 +5,29 @@ Feature: Rendering
   But I want to make it as simply as possible
   So render with Liquid and place in Layouts
 
+  Scenario: When receiving bad Liquid
+    Given I have a "index.html" page with layout "simple" that contains "{% include invalid.html %}"
+    And   I have a simple layout that contains "{{ content }}"
+    When  I run jekyll build
+    Then  I should get a non-zero exit-status
+    And   I should see "Liquid Exception" in the build output
+
   Scenario: Render Liquid and place in layout
     Given I have a "index.html" page with layout "simple" that contains "Hi there, Jekyll {{ jekyll.environment }}!"
     And I have a simple layout that contains "{{ content }}Ahoy, indeed!"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Hi there, Jekyll development!\nAhoy, indeed" in "_site/index.html"
 
   Scenario: Don't place asset files in layout
     Given I have an "index.scss" page with layout "simple" that contains ".foo-bar { color:black; }"
     And I have an "index.coffee" page with layout "simple" that contains "whatever()"
+    And I have a configuration file with "gems" set to "[jekyll-coffeescript]"
     And I have a simple layout that contains "{{ content }}Ahoy, indeed!"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should not see "Ahoy, indeed!" in "_site/index.css"
     And I should not see "Ahoy, indeed!" in "_site/index.js"
 
@@ -25,11 +35,21 @@ Feature: Rendering
     Given I have an "index.scss" page that contains ".foo-bar { color:{{site.color}}; }"
     And I have a configuration file with "color" set to "red"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see ".foo-bar {\n  color: red; }" in "_site/index.css"
 
-  Scenario: Render liquid in CoffeeScript
+  Scenario: Not render liquid in CoffeeScript without explicitly including jekyll-coffeescript
     Given I have an "index.coffee" page with animal "cicada" that contains "hey='for {{page.animal}}'"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
+    And the "_site/index.js" file should not exist
+
+  Scenario: Render liquid in CoffeeScript with jekyll-coffeescript enabled
+    Given I have an "index.coffee" page with animal "cicada" that contains "hey='for {{page.animal}}'"
+    And I have a configuration file with "gems" set to "[jekyll-coffeescript]"
+    When I run jekyll build
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "hey = 'for cicada';" in "_site/index.js"

features/site_configuration.feature

@@ -8,7 +8,8 @@ Feature: Site configuration
     And I have an "_sourcedir/index.html" file that contains "Changing source directory"
     And I have a configuration file with "source" set to "_sourcedir"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Changing source directory" in "_site/index.html"
 
   Scenario: Change destination directory
@@ -66,34 +67,31 @@ Feature: Site configuration
     Given I have an "index.markdown" page that contains "[Google](http://google.com)"
     And I have a configuration file with "markdown" set to "rdiscount"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "<a href=\"http://google.com\">Google</a>" in "_site/index.html"
 
   Scenario: Use Kramdown for markup
     Given I have an "index.markdown" page that contains "[Google](http://google.com)"
     And I have a configuration file with "markdown" set to "kramdown"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "<a href=\"http://google.com\">Google</a>" in "_site/index.html"
 
   Scenario: Use Redcarpet for markup
     Given I have an "index.markdown" page that contains "[Google](http://google.com)"
     And I have a configuration file with "markdown" set to "redcarpet"
     When I run jekyll build
-    Then the _site directory should exist
-    And I should see "<a href=\"http://google.com\">Google</a>" in "_site/index.html"
-
-  Scenario: Use Maruku for markup
-    Given I have an "index.markdown" page that contains "[Google](http://google.com)"
-    And I have a configuration file with "markdown" set to "maruku"
-    When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "<a href=\"http://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
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Hello world!" in "_site/index.html"
     And I should see "class=\"highlight\"" in "_site/index.html"
 
@@ -101,7 +99,8 @@ Feature: Site configuration
     Given I have an "index.html" page that contains "{% highlight ruby %} puts 'Hello world!' {% endhighlight %}"
     And I have a configuration file with "highlighter" set to "rouge"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Hello world!" in "_site/index.html"
     And I should see "class=\"highlight\"" in "_site/index.html"
 
@@ -129,7 +128,8 @@ Feature: Site configuration
       | entry1 | 2007-12-31 | post   | content for entry1. |
       | entry2 | 2020-01-31 | post   | content for entry2. |
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Page Layout: 1 on 2010-01-01" in "_site/index.html"
     And I should see "Post Layout: <p>content for entry1.</p>" in "_site/2007/12/31/entry1.html"
     And the "_site/2020/01/31/entry2.html" file should not exist
@@ -149,7 +149,8 @@ Feature: Site configuration
       | entry1 | 2007-12-31 | post   | content for entry1. |
       | entry2 | 2020-01-31 | post   | content for entry2. |
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Page Layout: 2 on 2010-01-01" in "_site/index.html"
     And I should see "Post Layout: <p>content for entry1.</p>" in "_site/2007/12/31/entry1.html"
     And I should see "Post Layout: <p>content for entry2.</p>" in "_site/2020/01/31/entry2.html"
@@ -168,10 +169,11 @@ Feature: Site configuration
         | entry1    | 2013-04-09 23:22 -0400 | post    | content for entry1. |
         | entry2    | 2013-04-10 03:14 -0400 | post    | content for entry2. |
       When I run jekyll build
-      Then the _site directory should exist
+      Then I should get a zero exit status
+    And the _site directory should exist
       And I should see "Page Layout: 2" in "_site/index.html"
-      And I should see "Post Layout: <p>content for entry1.</p> built at 2013-04-09T23:22:00-04:00" in "_site/2013/04/09/entry1.html"
-      And I should see "Post Layout: <p>content for entry2.</p> built at 2013-04-10T03:14:00-04:00" in "_site/2013/04/10/entry2.html"
+      And I should see "Post Layout: <p>content for entry1.</p>\n built at 2013-04-09T23:22:00-04:00" in "_site/2013/04/09/entry1.html"
+      And I should see "Post Layout: <p>content for entry2.</p>\n built at 2013-04-10T03:14:00-04:00" in "_site/2013/04/10/entry2.html"
 
     Scenario: Generate proper dates with explicitly set timezone (different than posts' time)
       Given I have a _layouts directory
@@ -180,19 +182,20 @@ Feature: Site configuration
       And I have an "index.html" page with layout "page" that contains "site index page"
       And I have a configuration file with:
         | key         | value               |
-        | timezone    | Australia/Melbourne |
+        | timezone    | Pacific/Honolulu    |
       And I have a _posts directory
       And I have the following posts:
         | title     | date                   | layout  | content             |
-        | entry1    | 2013-04-09 23:22 -0400 | post    | content for entry1. |
-        | entry2    | 2013-04-10 03:14 -0400 | post    | content for entry2. |
+        | entry1    | 2013-04-09 23:22 +0400 | post    | content for entry1. |
+        | entry2    | 2013-04-10 03:14 +0400 | post    | content for entry2. |
       When I run jekyll build
-      Then the _site directory should exist
+      Then I should get a zero exit status
+    And the _site directory should exist
       And I should see "Page Layout: 2" in "_site/index.html"
-      And the "_site/2013/04/10/entry1.html" file should exist
-      And the "_site/2013/04/10/entry2.html" file should exist
-      And I should see escaped "Post Layout: <p>content for entry1.</p> built at 2013-04-10T13:22:00+10:00" in "_site/2013/04/10/entry1.html"
-      And I should see escaped "Post Layout: <p>content for entry2.</p> built at 2013-04-10T17:14:00+10:00" in "_site/2013/04/10/entry2.html"
+      And the "_site/2013/04/09/entry1.html" file should exist
+      And the "_site/2013/04/09/entry2.html" file should exist
+      And I should see "Post Layout: <p>content for entry1.</p>\n built at 2013-04-09T09:22:00-10:00" in "_site/2013/04/09/entry1.html"
+      And I should see "Post Layout: <p>content for entry2.</p>\n built at 2013-04-09T13:14:00-10:00" in "_site/2013/04/09/entry2.html"
 
   Scenario: Limit the number of posts generated by most recent date
     Given I have a _posts directory
@@ -205,7 +208,8 @@ Feature: Site configuration
       | Oranges | 2009-04-01 | An article about oranges |
       | Bananas | 2009-04-05 | An article about bananas |
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And the "_site/2009/04/05/bananas.html" file should exist
     And the "_site/2009/04/01/oranges.html" file should exist
     And the "_site/2009/03/27/apples.html" file should not exist
@@ -218,7 +222,8 @@ Feature: Site configuration
       | .gitignore |
       | .foo       |
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see ".DS_Store" in "_site/.gitignore"
     And the "_site/.htaccess" file should not exist
 
@@ -231,14 +236,15 @@ Feature: Site configuration
       | key         | value        |
       | time        | 2010-01-01   |
       | future      | true         |
-      | layouts     | _theme       |
+      | layouts_dir | _theme       |
     And I have a _posts directory
     And I have the following posts:
       | title  | date       | layout | content             |
       | entry1 | 2007-12-31 | post   | content for entry1. |
       | entry2 | 2020-01-31 | post   | content for entry2. |
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Page Layout: 2 on 2010-01-01" in "_site/index.html"
     And I should see "Post Layout: <p>content for entry1.</p>" in "_site/2007/12/31/entry1.html"
     And I should see "Post Layout: <p>content for entry2.</p>" in "_site/2020/01/31/entry2.html"
@@ -247,6 +253,7 @@ Feature: Site configuration
     Given I have an "index.html" page with layout "page" that contains "FOO"
     And I have a "_config.yml" file that contains "layouts: '../../../../../../../../../../../../../../usr/include'"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "FOO" in "_site/index.html"
     And I should not see " " in "_site/index.html"

features/site_data.feature

@@ -6,14 +6,16 @@ Feature: Site data
   Scenario: Use page variable in a page
     Given I have an "contact.html" page with title "Contact" that contains "{{ page.title }}: email@example.com"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Contact: email@example.com" in "_site/contact.html"
 
   Scenario Outline: Use page.path variable in a page
     Given I have a <dir> directory
     And I have a "<path>" page that contains "Source path: {{ page.path }}"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Source path: <path>" in "_site/<path>"
 
     Examples:
@@ -25,13 +27,15 @@ Feature: Site data
   Scenario: Override page.path
     Given I have an "override.html" page with path "custom-override.html" that contains "Custom path: {{ page.path }}"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Custom path: custom-override.html" in "_site/override.html"
 
   Scenario: Use site.time variable
     Given I have an "index.html" page that contains "{{ site.time }}"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see today's time in "_site/index.html"
 
   Scenario: Use site.posts variable for latest post
@@ -43,7 +47,8 @@ Feature: Site data
       | Second Post | 2009-03-26 | My Second Post |
       | Third Post  | 2009-03-27 | My Third Post  |
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Third Post: /2009/03/27/third-post.html" in "_site/index.html"
 
   Scenario: Use site.posts variable in a loop
@@ -55,7 +60,8 @@ Feature: Site data
       | Second Post | 2009-03-26 | My Second Post |
       | Third Post  | 2009-03-27 | My Third Post  |
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Third Post  Second Post  First Post" in "_site/index.html"
 
   Scenario: Use site.categories.code variable
@@ -66,7 +72,8 @@ Feature: Site data
       | Awesome Hack   | 2009-03-26 | code     | puts 'Hello World' |
       | Delicious Beer | 2009-03-26 | food     | 1) Yuengling       |
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Awesome Hack" in "_site/index.html"
 
   Scenario: Use site.tags variable
@@ -76,7 +83,8 @@ Feature: Site data
       | title          | date       | tag  | content      |
       | Delicious Beer | 2009-03-26 | beer | 1) Yuengling |
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "Yuengling" in "_site/index.html"
 
   Scenario: Order Posts by name when on the same date
@@ -90,18 +98,21 @@ Feature: Site data
     | C     | 2009-03-26 | C       |
     | last  | 2009-04-26 | last    |
   When I run jekyll build
-  Then the _site directory should exist
+  Then I should get a zero exit status
+    And the _site directory should exist
   And I should see "last:C, C:B,last B:A,C A:first,B first:,A" in "_site/index.html"
 
   Scenario: Use configuration date in site payload
     Given I have an "index.html" page that contains "{{ site.url }}"
     And I have a configuration file with "url" set to "http://example.com"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "http://example.com" in "_site/index.html"
 
   Scenario: Access Jekyll version via jekyll.version
     Given I have an "index.html" page that contains "{{ jekyll.version }}"
     When I run jekyll build
-    Then the _site directory should exist
+    Then I should get a zero exit status
+    And the _site directory should exist
     And I should see "\d+\.\d+\.\d+" in "_site/index.html"

features/step_definitions.rb

@@ -0,0 +1,245 @@
+Before do
+  FileUtils.mkdir_p(Paths.test_dir) unless Paths.test_dir.directory?
+  Dir.chdir(Paths.test_dir)
+end
+
+#
+
+After do
+  Paths.test_dir.rmtree if Paths.test_dir.exist?
+  Paths.output_file.delete if Paths.output_file.exist?
+  Paths.status_file.delete if Paths.status_file.exist?
+  Dir.chdir(Paths.test_dir.parent)
+end
+
+#
+
+Given %r{^I have a blank site in "(.*)"$} do |path|
+  if !File.exist?(path)
+    then FileUtils.mkdir_p(path)
+  end
+end
+
+#
+
+Given %r{^I do not have a "(.*)" directory$} do |path|
+  Paths.test_dir.join(path).directory?
+end
+
+#
+
+Given %r{^I have an? "(.*)" page(?: with (.*) "(.*)")? that contains "(.*)"$} do |file, key, value, text|
+  File.write(file, Jekyll::Utils.strip_heredoc(<<-DATA))
+    ---
+    #{key || 'layout'}: #{value || 'nil'}
+    ---
+
+    #{text}
+  DATA
+end
+
+#
+
+Given %r{^I have an? "(.*)" file that contains "(.*)"$} do |file, text|
+  File.write(file, text)
+end
+
+#
+
+Given %r{^I have an? (.*) (layout|theme) that contains "(.*)"$} do |name, type, text|
+  folder = type == "layout" ? "_layouts" : "_theme"
+
+  destination_file = Pathname.new(File.join(folder, "#{name}.html"))
+  FileUtils.mkdir_p(destination_file.parent) unless destination_file.parent.directory?
+  File.write(destination_file, text)
+end
+
+#
+
+Given %r{^I have an? "(.*)" file with content:$} do |file, text|
+  File.write(file, text)
+end
+
+#
+
+Given %r{^I have an? (.*) directory$} do |dir|
+  if !File.directory?(dir)
+    then FileUtils.mkdir_p(dir)
+  end
+end
+
+#
+
+Given %r{^I have the following (draft|page|post)s?(?: (in|under) "([^"]+)")?:$} do |status, direction, folder, table|
+  table.hashes.each do |input_hash|
+    title = slug(input_hash["title"])
+    ext = input_hash["type"] || "markdown"
+    filename = filename = "#{title}.#{ext}" if %w(draft page).include?(status)
+    before, after = location(folder, direction)
+    dest_folder = "_drafts" if status == "draft"
+    dest_folder = "_posts"  if status ==  "post"
+    dest_folder = "" if status == "page"
+
+    if status == "post"
+      parsed_date = Time.xmlschema(input_hash['date']) rescue Time.parse(input_hash['date'])
+      filename = "#{parsed_date.strftime('%Y-%m-%d')}-#{title}.#{ext}"
+    end
+
+    path = File.join(before, dest_folder, after, filename)
+    File.write(path, file_content_from_hash(input_hash))
+  end
+end
+
+#
+
+Given %r{^I have a configuration file with "(.*)" set to "(.*)"$} do |key, value|
+  config = if source_dir.join("_config.yml").exist?
+    SafeYAML.load_file(source_dir.join("_config.yml"))
+  else
+    {}
+  end
+  config[key] = YAML.load(value)
+  File.write("_config.yml", YAML.dump(config))
+end
+
+#
+
+Given %r{^I have a configuration file with:$} do |table|
+  table.hashes.each do |row|
+    step %(I have a configuration file with "#{row["key"]}" set to "#{row["value"]}")
+  end
+end
+
+#
+
+Given %r{^I have a configuration file with "([^\"]*)" set to:$} do |key, table|
+  File.open("_config.yml", "w") do |f|
+    f.write("#{key}:\n")
+    table.hashes.each do |row|
+      f.write("- #{row["value"]}\n")
+    end
+  end
+end
+
+#
+
+Given %r{^I have fixture collections$} do
+  FileUtils.cp_r Paths.source_dir.join("test", "source", "_methods"), source_dir
+  FileUtils.cp_r Paths.source_dir.join("test", "source", "_thanksgiving"), source_dir
+end
+
+#
+
+Given %r{^I wait (\d+) second(s?)$} do |time, plural|
+  sleep(time.to_f)
+end
+
+#
+
+When %r{^I run jekyll(.*)$} do |args|
+  run_jekyll(args)
+  if args.include?("--verbose") || ENV["DEBUG"]
+    $stderr.puts "\n#{jekyll_run_output}\n"
+  end
+end
+
+#
+
+When %r{^I run bundle(.*)$} do |args|
+  run_bundle(args)
+  if args.include?("--verbose") || ENV['DEBUG']
+    $stderr.puts "\n#{jekyll_run_output}\n"
+  end
+end
+
+#
+
+When %r{^I change "(.*)" to contain "(.*)"$} do |file, text|
+  File.open(file, "a") do |f|
+    f.write(text)
+  end
+end
+
+#
+
+When %r{^I delete the file "(.*)"$} do |file|
+  File.delete(file)
+end
+
+#
+
+Then %r{^the (.*) directory should +(not )?exist$} do |dir, negative|
+  if negative.nil?
+    expect(Pathname.new(dir)).to exist
+  else
+    expect(Pathname.new(dir)).to_not exist
+  end
+end
+
+#
+Then %r{^I should (not )?see "(.*)" in "(.*)"$} do |negative, text, file|
+  step %(the "#{file}" file should exist)
+  regexp = Regexp.new(text, Regexp::MULTILINE)
+  if negative.nil? || negative.empty?
+    expect(file_contents(file)).to match regexp
+  else
+    expect(file_contents(file)).not_to match regexp
+  end
+end
+
+#
+
+Then %r{^I should see exactly "(.*)" in "(.*)"$} do |text, file|
+  step %(the "#{file}" file should exist)
+  expect(file_contents(file).strip).to eq text
+end
+
+#
+
+Then %r{^I should see escaped "(.*)" in "(.*)"$} do |text, file|
+  step %(I should see "#{Regexp.escape(text)}" in "#{file}")
+end
+
+#
+
+Then %r{^the "(.*)" file should +(not )?exist$} do |file, negative|
+  if negative.nil?
+    expect(Pathname.new(file)).to exist
+  else
+    expect(Pathname.new(file)).to_not exist
+  end
+end
+
+#
+
+Then %r{^I should see today's time in "(.*)"$} do |file|
+  step %(I should see "#{seconds_agnostic_time(Time.now)}" in "#{file}")
+end
+
+#
+
+Then %r{^I should see today's date in "(.*)"$} do |file|
+  step %(I should see "#{Date.today.to_s}" in "#{file}")
+end
+
+#
+
+Then %r{^I should (not )?see "(.*)" in the build output$} do |negative, text|
+  if negative.nil? || negative.empty?
+    expect(jekyll_run_output).to match Regexp.new(text)
+  else
+    expect(jekyll_run_output).not_to match Regexp.new(text)
+  end
+end
+
+#
+
+Then %r{^I should get a zero exit(?:\-| )status$} do
+  step %(I should see "EXIT STATUS: 0" in the build output)
+end
+
+#
+
+Then %r{^I should get a non-zero exit(?:\-| )status$} do
+  step %(I should not see "EXIT STATUS: 0" in the build output)
+end

features/step_definitions/jekyll_steps.rb

@@ -1,221 +0,0 @@
-def file_content_from_hash(input_hash)
-  matter_hash = input_hash.reject { |k, v| k == "content" }
-  matter = matter_hash.map { |k, v| "#{k}: #{v}\n" }.join.chomp
-
-  content = if input_hash['input'] && input_hash['filter']
-    "{{ #{input_hash['input']} | #{input_hash['filter']} }}"
-  else
-    input_hash['content']
-  end
-
-  <<EOF
----
-#{matter}
----
-#{content}
-EOF
-end
-
-Before do
-  FileUtils.mkdir_p(TEST_DIR) unless File.exist?(TEST_DIR)
-  Dir.chdir(TEST_DIR)
-end
-
-After do
-  FileUtils.rm_rf(TEST_DIR)   if File.exist?(TEST_DIR)
-  FileUtils.rm(JEKYLL_COMMAND_OUTPUT_FILE) if File.exist?(JEKYLL_COMMAND_OUTPUT_FILE)
-  Dir.chdir(File.dirname(TEST_DIR))
-end
-
-World(Test::Unit::Assertions)
-
-Given /^I have a blank site in "(.*)"$/ do |path|
-  FileUtils.mkdir_p(path) unless File.exist?(path)
-end
-
-Given /^I do not have a "(.*)" directory$/ do |path|
-  File.directory?("#{TEST_DIR}/#{path}")
-end
-
-# Like "I have a foo file" but gives a yaml front matter so jekyll actually processes it
-Given /^I have an? "(.*)" page(?: with (.*) "(.*)")? that contains "(.*)"$/ do |file, key, value, text|
-  File.open(file, 'w') do |f|
-    f.write <<EOF
----
-#{key || 'layout'}: #{value || 'nil'}
----
-#{text}
-EOF
-  end
-end
-
-Given /^I have an? "(.*)" file that contains "(.*)"$/ do |file, text|
-  File.open(file, 'w') do |f|
-    f.write(text)
-  end
-end
-
-Given /^I have an? (.*) (layout|theme) that contains "(.*)"$/ do |name, type, text|
-  folder = if type == 'layout'
-    '_layouts'
-  else
-    '_theme'
-  end
-  destination_file = File.join(folder, name + '.html')
-  destination_path = File.dirname(destination_file)
-  unless File.exist?(destination_path)
-    FileUtils.mkdir_p(destination_path)
-  end
-  File.open(destination_file, 'w') do |f|
-    f.write(text)
-  end
-end
-
-Given /^I have an? "(.*)" file with content:$/ do |file, text|
-  File.open(file, 'w') do |f|
-    f.write(text)
-  end
-end
-
-Given /^I have an? (.*) directory$/ do |dir|
-  FileUtils.mkdir_p(dir)
-end
-
-Given /^I have the following (draft|page|post)s?(?: (in|under) "([^"]+)")?:$/ do |status, direction, folder, table|
-  table.hashes.each do |input_hash|
-    title = slug(input_hash['title'])
-    ext = input_hash['type'] || 'textile'
-    before, after = location(folder, direction)
-
-    case status
-    when "draft"
-      dest_folder = '_drafts'
-      filename = "#{title}.#{ext}"
-    when "page"
-      dest_folder = ''
-      filename = "#{title}.#{ext}"
-    when "post"
-      parsed_date = Time.xmlschema(input_hash['date']) rescue Time.parse(input_hash['date'])
-      dest_folder = '_posts'
-      filename = "#{parsed_date.strftime('%Y-%m-%d')}-#{title}.#{ext}"
-    end
-
-    path = File.join(before, dest_folder, after, filename)
-    File.open(path, 'w') do |f|
-      f.write file_content_from_hash(input_hash)
-    end
-  end
-end
-
-Given /^I have a configuration file with "(.*)" set to "(.*)"$/ do |key, value|
-  File.open('_config.yml', 'w') do |f|
-    f.write("#{key}: #{value}\n")
-  end
-end
-
-Given /^I have a configuration file with:$/ do |table|
-  File.open('_config.yml', 'w') do |f|
-    table.hashes.each do |row|
-      f.write("#{row["key"]}: #{row["value"]}\n")
-    end
-  end
-end
-
-Given /^I have a configuration file with "([^\"]*)" set to:$/ do |key, table|
-  File.open('_config.yml', 'w') do |f|
-    f.write("#{key}:\n")
-    table.hashes.each do |row|
-      f.write("- #{row["value"]}\n")
-    end
-  end
-end
-
-Given /^I have fixture collections$/ do
-  FileUtils.cp_r File.join(JEKYLL_SOURCE_DIR, "test", "source", "_methods"), source_dir
-end
-
-Given /^I wait (\d+) second(s?)$/ do |time, plural|
-  sleep(time.to_f)
-end
-
-##################
-#
-# Changing stuff
-#
-##################
-
-When /^I run jekyll(.*)$/ do |args|
-  status = run_jekyll(args)
-  if args.include?("--verbose") || ENV['DEBUG']
-    puts jekyll_run_output
-  end
-end
-
-When /^I run bundle(.*)$/ do |args|
-  status = run_bundle(args)
-  if args.include?("--verbose") || ENV['DEBUG']
-    puts jekyll_run_output
-  end
-end
-
-When /^I change "(.*)" to contain "(.*)"$/ do |file, text|
-  File.open(file, 'a') do |f|
-    f.write(text)
-  end
-end
-
-When /^I delete the file "(.*)"$/ do |file|
-  File.delete(file)
-end
-
-Then /^the (.*) directory should +exist$/ do |dir|
-  assert File.directory?(dir), "The directory \"#{dir}\" does not exist"
-end
-
-Then /^the (.*) directory should not exist$/ do |dir|
-  assert !File.directory?(dir), "The directory \"#{dir}\" exists"
-end
-
-Then /^I should see "(.*)" in "(.*)"$/ do |text, file|
-  assert_match Regexp.new(text, Regexp::MULTILINE), file_contents(file)
-end
-
-Then /^I should see exactly "(.*)" in "(.*)"$/ do |text, file|
-  assert_equal text, file_contents(file).strip
-end
-
-Then /^I should not see "(.*)" in "(.*)"$/ do |text, file|
-  assert_no_match Regexp.new(text, Regexp::MULTILINE), file_contents(file)
-end
-
-Then /^I should see escaped "(.*)" in "(.*)"$/ do |text, file|
-  assert_match Regexp.new(Regexp.escape(text)), file_contents(file)
-end
-
-Then /^the "(.*)" file should +exist$/ do |file|
-  file_does_exist = File.file?(file)
-  unless file_does_exist
-    all_steps_to_path(file).each do |dir|
-      STDERR.puts ""
-      STDERR.puts "Dir #{dir}:"
-      STDERR.puts Dir["#{dir}/**/*"]
-    end
-  end
-  assert file_does_exist, "The file \"#{file}\" does not exist.\n"
-end
-
-Then /^the "(.*)" file should not exist$/ do |file|
-  assert !File.exist?(file), "The file \"#{file}\" exists"
-end
-
-Then /^I should see today's time in "(.*)"$/ do |file|
-  assert_match Regexp.new(seconds_agnostic_time(Time.now)), file_contents(file)
-end
-
-Then /^I should see today's date in "(.*)"$/ do |file|
-  assert_match Regexp.new(Date.today.to_s), file_contents(file)
-end
-
-Then /^I should see "(.*)" in the build output$/ do |text|
-  assert_match Regexp.new(text), jekyll_run_output
-end

features/support/env.rb

@@ -1,86 +0,0 @@
-require 'fileutils'
-require 'posix-spawn'
-require 'rr'
-require 'test/unit'
-require 'time'
-
-JEKYLL_SOURCE_DIR = File.dirname(File.dirname(File.dirname(__FILE__)))
-TEST_DIR    = File.expand_path(File.join('..', '..', 'tmp', 'jekyll'), File.dirname(__FILE__))
-JEKYLL_PATH = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'bin', 'jekyll'))
-JEKYLL_COMMAND_OUTPUT_FILE = File.join(File.dirname(TEST_DIR), 'jekyll_output.txt')
-
-def source_dir(*files)
-  File.join(TEST_DIR, *files)
-end
-
-def all_steps_to_path(path)
-  source = Pathname.new(source_dir('_site')).expand_path
-  dest   = Pathname.new(path).expand_path
-  paths  = []
-  dest.ascend do |f|
-    break if f.eql? source
-    paths.unshift f.to_s
-  end
-  paths
-end
-
-def jekyll_output_file
-  JEKYLL_COMMAND_OUTPUT_FILE
-end
-
-def jekyll_run_output
-  File.read(jekyll_output_file) if File.file?(jekyll_output_file)
-end
-
-def run_bundle(args)
-  child = run_in_shell('bundle', *args.strip.split(' '))
-end
-
-def run_jekyll(args)
-  child = run_in_shell(JEKYLL_PATH, *args.strip.split(' '), "--trace")
-  child.status.exitstatus == 0
-end
-
-def run_in_shell(*args)
-  POSIX::Spawn::Child.new *args, :out => [JEKYLL_COMMAND_OUTPUT_FILE, "w"]
-end
-
-def slug(title)
-  if title
-    title.downcase.gsub(/[^\w]/, " ").strip.gsub(/\s+/, '-')
-  else
-    Time.now.strftime("%s%9N") # nanoseconds since the Epoch
-  end
-end
-
-def location(folder, direction)
-  if folder
-    before = folder if direction == "in"
-    after = folder if direction == "under"
-  end
-  [before || '.', after || '.']
-end
-
-def file_contents(path)
-  File.open(path) do |file|
-    file.readlines.join # avoid differences with \n and \r\n line endings
-  end
-end
-
-def seconds_agnostic_datetime(datetime = Time.now)
-  date, time, zone = datetime.to_s.split(" ")
-  time = seconds_agnostic_time(time)
-  [
-    Regexp.escape(date),
-    "#{time}:\\d{2}",
-    Regexp.escape(zone)
-  ].join("\\ ")
-end
-
-def seconds_agnostic_time(time)
-  if time.is_a? Time
-    time = time.strftime("%H:%M:%S")
-  end
-  hour, minutes, _ = time.split(":")
-  "#{hour}:#{minutes}"
-end

features/support/formatter.rb

@@ -2,140 +2,177 @@ require 'fileutils'
 require 'colorator'
 require 'cucumber/formatter/console'
 require 'cucumber/formatter/io'
-require 'gherkin/formatter/escaping'
 
-module Features
-  module Support
-    # The formatter used for <tt>--format pretty</tt> (the default formatter).
-    #
-    # This formatter prints features to plain text - exactly how they were parsed,
-    # just prettier. That means with proper indentation and alignment of table columns.
-    #
-    # If the output is STDOUT (and not a file), there are bright colours to watch too.
-    #
-    class Overview
+module Jekyll
+  module Cucumber
+    class Formatter
+      attr_accessor :indent, :runtime
+      include ::Cucumber::Formatter::Console
+      include ::Cucumber::Formatter::Io
       include FileUtils
-      include Cucumber::Formatter::Console
-      include Cucumber::Formatter::Io
-      include Gherkin::Formatter::Escaping
-      attr_writer :indent
-      attr_reader :runtime
+
+      CHARS = {
+        :failed    => "\u2718".red,
+        :pending   => "\u203D".yellow,
+        :undefined => "\u2718".red,
+        :passed    => "\u2714".green,
+        :skipped   => "\u203D".blue
+      }
+
+      #
 
       def initialize(runtime, path_or_io, options)
-        @runtime, @io, @options = runtime, ensure_io(path_or_io, "pretty"), options
-        @exceptions = []
-        @indent = 0
+        @runtime = runtime
+        @snippets_input = []
+        @io = ensure_io(path_or_io)
         @prefixes = options[:prefixes] || {}
         @delayed_messages = []
+        @options = options
+        @exceptions = []
+        @indent = 0
       end
 
+      #
+
       def before_features(features)
         print_profile_information
       end
 
+      #
+
       def after_features(features)
         @io.puts
         print_summary(features)
       end
 
+      #
+
       def before_feature(feature)
         @exceptions = []
         @indent = 0
       end
 
-      def comment_line(comment_line)
-      end
+      #
 
-      def after_tags(tags)
-      end
+      def tag_name(tag_name); end
+      def comment_line(comment_line); end
+      def after_feature_element(feature_element); end
+      def after_tags(tags); end
 
-      def tag_name(tag_name)
-      end
+      #
 
       def before_feature_element(feature_element)
         @indent = 2
         @scenario_indent = 2
       end
 
-      def after_feature_element(feature_element)
-      end
+      #
 
       def before_background(background)
-        @indent = 2
         @scenario_indent = 2
         @in_background = true
+        @indent = 2
       end
 
+      #
+
       def after_background(background)
         @in_background = nil
       end
 
-      def background_name(keyword, name, file_colon_line, source_indent)
-        print_feature_element_name(keyword, name, file_colon_line, source_indent)
+      #
+
+      def background_name(keyword, name, source_line, indend)
+        print_feature_element_name(
+          keyword, name, source_line, indend
+        )
       end
 
-      def scenario_name(keyword, name, file_colon_line, source_indent)
-        print_feature_element_name(keyword, name, file_colon_line, source_indent)
+      #
+
+      def scenario_name(keyword, name, source_line, indent)
+        print_feature_element_name(
+          keyword, name, source_line, indent
+        )
       end
 
+      #
+
       def before_step(step)
         @current_step = step
       end
 
-      def before_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background, file_colon_line)
+      #
+
+      def before_step_result(keyword, step_match, multiline_arg, status, exception, \
+          source_indent, background, file_colon_line)
+
         @hide_this_step = false
         if exception
           if @exceptions.include?(exception)
             @hide_this_step = true
             return
           end
+
           @exceptions << exception
         end
+
         if status != :failed && @in_background ^ background
           @hide_this_step = true
           return
         end
+
         @status = status
       end
 
-      CHARS = {
-        :failed    => "x".red,
-        :pending   => "?".yellow,
-        :undefined => "x".red,
-        :passed    => ".".green,
-        :skipped   => "-".blue
-      }
+      #
 
       def step_name(keyword, step_match, status, source_indent, background, file_colon_line)
         @io.print CHARS[status]
+        @io.print " "
       end
 
+      #
+
       def exception(exception, status)
         return if @hide_this_step
+
         @io.puts
         print_exception(exception, status, @indent)
         @io.flush
       end
 
-      private
+      #
 
-      def print_feature_element_name(keyword, name, file_colon_line, source_indent)
+      def after_test_step(test_step, result)
+        collect_snippet_data(
+          test_step, result
+        )
+      end
+
+      #
+
+      private
+      def print_feature_element_name(keyword, name, source_line, indent)
         @io.puts
-        names = name.empty? ? [name] : name.split("\n")
-        line = "  #{keyword}: #{names[0]}"
-        if @options[:source]
-          line_comment = "#{file_colon_line}"
-          @io.print(line_comment)
-        end
+
+        names = name.empty? ? [name] : name.each_line.to_a
+        line  = "  #{keyword}: #{names[0]}"
+
+        @io.print(source_line) if @options[:source]
         @io.print(line)
         @io.print " "
         @io.flush
       end
 
+      #
+
       def cell_prefix(status)
         @prefixes[status]
       end
 
+      #
+
       def print_summary(features)
         @io.puts
         print_stats(features, @options)

features/support/helpers.rb

@@ -0,0 +1,161 @@
+require "fileutils"
+require "jekyll/utils"
+require "open3"
+require "time"
+require "safe_yaml/load"
+
+class Paths
+  SOURCE_DIR = Pathname.new(File.expand_path("../..", __dir__))
+  def self.test_dir; source_dir.join("tmp", "jekyll"); end
+  def self.output_file; test_dir.join("jekyll_output.txt"); end
+  def self.status_file; test_dir.join("jekyll_status.txt"); end
+  def self.jekyll_bin; source_dir.join("bin", "jekyll"); end
+  def self.source_dir; SOURCE_DIR; end
+end
+
+#
+
+def file_content_from_hash(input_hash)
+  matter_hash = input_hash.reject { |k, v| k == "content" }
+  matter = matter_hash.map do |k, v| "#{k}: #{v}\n"
+  end
+
+  matter = matter.join.chomp
+  content = \
+  if !input_hash['input'] || !input_hash['filter']
+    then input_hash['content']
+    else "{{ #{input_hash['input']} | " \
+      "#{input_hash['filter']} }}"
+  end
+
+  Jekyll::Utils.strip_heredoc(<<-EOF)
+    ---
+    #{matter.gsub(
+      /\n/, "\n    "
+    )}
+    ---
+    #{content}
+  EOF
+end
+
+#
+
+def source_dir(*files)
+  return Paths.test_dir(*files)
+end
+
+#
+
+def all_steps_to_path(path)
+  source = source_dir
+  dest = Pathname.new(path).expand_path
+  paths  = []
+
+  dest.ascend do |f|
+    break if f == source
+    paths.unshift f.to_s
+  end
+
+  paths
+end
+
+#
+
+def jekyll_run_output
+  if Paths.output_file.file?
+    then return Paths.output_file.read
+  end
+end
+
+#
+
+def jekyll_run_status
+  if Paths.status_file.file?
+    then return Paths.status_file.read
+  end
+end
+
+#
+
+def run_bundle(args)
+  run_in_shell("bundle", *args.strip.split(' '))
+end
+
+#
+
+def run_jekyll(args)
+  args = args.strip.split(" ") # Shellwords?
+  process = run_in_shell(Paths.jekyll_bin.to_s, *args, "--trace")
+  process.exitstatus == 0
+end
+
+#
+
+def run_in_shell(*args)
+  i, o, e, p = Open3.popen3(*args)
+  out = o.read.strip
+  err = e.read.strip
+
+  [i, o, e].each do |m|
+    m.close
+  end
+
+  File.write(Paths.status_file, p.value.exitstatus)
+  File.open(Paths.output_file, "wb") do |f|
+    f.puts "$ " << args.join(" ")
+    f.puts out
+    f.puts err
+    f.puts "EXIT STATUS: #{p.value.exitstatus}"
+  end
+
+  p.value
+end
+
+#
+
+def slug(title = nil)
+  if !title
+    then Time.now.strftime("%s%9N") # nanoseconds since the Epoch
+    else title.downcase.gsub(/[^\w]/, " ").strip.gsub(/\s+/, '-')
+  end
+end
+
+#
+
+def location(folder, direction)
+  if folder
+    before = folder if direction ==    "in"
+    after  = folder if direction == "under"
+  end
+
+  [before || '.',
+    after || '.']
+end
+
+#
+
+def file_contents(path)
+  return Pathname.new(path).read
+end
+
+#
+
+def seconds_agnostic_datetime(datetime = Time.now)
+  date, time, zone = datetime.to_s.split(" ")
+  time = seconds_agnostic_time(time)
+
+  [
+    Regexp.escape(date),
+    "#{time}:\\d{2}",
+    Regexp.escape(zone)
+  ] \
+  .join("\\ ")
+end
+
+#
+
+def seconds_agnostic_time(time)
+  time = time.strftime("%H:%M:%S") if time.is_a?(Time)
+  hour, minutes, _ = time.split(":")
+  "#{hour}:#{minutes}"
+end

jekyll.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.homepage      = 'https://github.com/jekyll/jekyll'
 
   all_files       = `git ls-files -z`.split("\x0")
-  s.files         = all_files.grep(%r{^(bin|lib)/})
+  s.files         = all_files.grep(%r{^(bin|lib)/|^.rubocop.yml$})
   s.executables   = all_files.grep(%r{^bin/}) { |f| File.basename(f) }
   s.require_paths = ['lib']
 
@@ -33,16 +33,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('mercenary', '~> 0.3.3')
   s.add_runtime_dependency('safe_yaml', '~> 1.0')
   s.add_runtime_dependency('colorator', '~> 0.1')
-
-  # Before 3.0 drops, phase the following gems out as dev dependencies
-  # and gracefully handle their absence.
-  s.add_runtime_dependency('pygments.rb', '~> 0.6.0')
-  s.add_runtime_dependency('redcarpet', '~> 3.1')
-  s.add_runtime_dependency('toml', '~> 0.1.0')
-  s.add_runtime_dependency('jekyll-paginate', '~> 1.0')
-  s.add_runtime_dependency('jekyll-gist', '~> 1.0')
-  s.add_runtime_dependency('jekyll-coffeescript', '~> 1.0')
+  s.add_runtime_dependency('rouge', '~> 1.7')
   s.add_runtime_dependency('jekyll-sass-converter', '~> 1.0')
   s.add_runtime_dependency('jekyll-watch', '~> 1.1')
-  s.add_runtime_dependency('classifier-reborn', '~> 2.0')
 end

lib/jekyll.rb

@@ -1,4 +1,4 @@
-$:.unshift File.dirname(__FILE__) # For use/testing when no gem is installed
+$LOAD_PATH.unshift File.dirname(__FILE__) # For use/testing when no gem is installed
 
 # Require all of the Ruby files in the given directory.
 #
@@ -7,7 +7,7 @@ $:.unshift File.dirname(__FILE__) # For use/testing when no gem is installed
 # Returns nothing.
 def require_all(path)
   glob = File.join(File.dirname(__FILE__), path, '*.rb')
-  Dir[glob].each do |f|
+  Dir[glob].sort.each do |f|
     require f
   end
 end
@@ -16,6 +16,7 @@ end
 require 'rubygems'
 
 # stdlib
+require 'forwardable'
 require 'fileutils'
 require 'time'
 require 'English'
@@ -30,10 +31,8 @@ require 'kramdown'
 require 'colorator'
 
 SafeYAML::OPTIONS[:suppress_warnings] = true
-Liquid::Template.error_mode = :strict
 
 module Jekyll
-
   # internal requires
   autoload :Cleaner,             'jekyll/cleaner'
   autoload :Collection,          'jekyll/collection'
@@ -48,16 +47,23 @@ module Jekyll
   autoload :External,            'jekyll/external'
   autoload :Filters,             'jekyll/filters'
   autoload :FrontmatterDefaults, 'jekyll/frontmatter_defaults'
+  autoload :Hooks,               'jekyll/hooks'
   autoload :Layout,              'jekyll/layout'
-  autoload :LayoutReader,        'jekyll/layout_reader'
+  autoload :CollectionReader,    'jekyll/readers/collection_reader'
+  autoload :DataReader,          'jekyll/readers/data_reader'
+  autoload :LayoutReader,        'jekyll/readers/layout_reader'
+  autoload :PostReader,          'jekyll/readers/post_reader'
+  autoload :PageReader,          'jekyll/readers/page_reader'
+  autoload :StaticFileReader,    'jekyll/readers/static_file_reader'
   autoload :LogAdapter,          'jekyll/log_adapter'
-  autoload :Metadata,            'jekyll/metadata'
   autoload :Page,                'jekyll/page'
   autoload :PluginManager,       'jekyll/plugin_manager'
-  autoload :Post,                'jekyll/post'
   autoload :Publisher,           'jekyll/publisher'
+  autoload :Reader,              'jekyll/reader'
+  autoload :Regenerator,         'jekyll/regenerator'
   autoload :RelatedPosts,        'jekyll/related_posts'
   autoload :Renderer,            'jekyll/renderer'
+  autoload :LiquidRenderer,      'jekyll/liquid_renderer'
   autoload :Site,                'jekyll/site'
   autoload :StaticFile,          'jekyll/static_file'
   autoload :Stevenson,           'jekyll/stevenson'
@@ -90,17 +96,15 @@ module Jekyll
     #
     # Returns the final configuration Hash.
     def configuration(override = Hash.new)
-      config = Configuration[Configuration::DEFAULTS]
-      override = Configuration[override].stringify_keys
+      config = Configuration.new
       unless override.delete('skip_config_files')
         config = config.read_config_files(config.config_files(override))
       end
 
       # Merge DEFAULTS < _config.yml < override
-      config = Utils.deep_merge_hashes(config, override).stringify_keys
-      set_timezone(config['timezone']) if config['timezone']
-
-      config
+      Configuration.from(Utils.deep_merge_hashes(config, override)).tap do |config|
+        set_timezone(config['timezone']) if config['timezone']
+      end
     end
 
     # Public: Set the TZ environment variable to use the timezone specified
@@ -127,7 +131,7 @@ module Jekyll
     #
     # Returns the new logger.
     def logger=(writer)
-      @logger = LogAdapter.new(writer)
+      @logger = LogAdapter.new(writer, (ENV["JEKYLL_LOG_LEVEL"] || :info).to_sym)
     end
 
     # Public: An array of sites
@@ -147,33 +151,29 @@ module Jekyll
     def sanitized_path(base_directory, questionable_path)
       return base_directory if base_directory.eql?(questionable_path)
 
+      questionable_path.insert(0, '/') if questionable_path.start_with?('~')
       clean_path = File.expand_path(questionable_path, "/")
-      clean_path = clean_path.sub(/\A\w\:\//, '/')
+      clean_path.sub!(/\A\w\:\//, '/')
 
-      unless clean_path.start_with?(base_directory.sub(/\A\w\:\//, '/'))
-        File.join(base_directory, clean_path)
-      else
+      if clean_path.start_with?(base_directory.sub(/\A\w\:\//, '/'))
         clean_path
+      else
+        File.join(base_directory, clean_path)
       end
     end
 
     # Conditional optimizations
     Jekyll::External.require_if_present('liquid-c')
-
   end
 end
 
+require "jekyll/drops/drop"
+require "jekyll/drops/document_drop"
 require_all 'jekyll/commands'
 require_all 'jekyll/converters'
 require_all 'jekyll/converters/markdown'
+require_all 'jekyll/drops'
 require_all 'jekyll/generators'
 require_all 'jekyll/tags'
 
-# Eventually remove these for 3.0 as non-core
-Jekyll::External.require_with_graceful_fail(%w[
-  toml
-  jekyll-paginate
-  jekyll-gist
-  jekyll-coffeescript
-  jekyll-sass-converter
-])
+require 'jekyll-sass-converter'

lib/jekyll/cleaner.rb

@@ -1,103 +1,105 @@
 require 'set'
 
 module Jekyll
-  class Site
-    # Handles the cleanup of a site's destination before it is built.
-    class Cleaner
-      attr_reader :site
+  # Handles the cleanup of a site's destination before it is built.
+  class Cleaner
+    HIDDEN_FILE_REGEX = /\/\.{1,2}$/
+    attr_reader :site
 
-      def initialize(site)
-        @site = site
+    def initialize(site)
+      @site = site
+    end
+
+    # Cleans up the site's destination directory
+    def cleanup!
+      FileUtils.rm_rf(obsolete_files)
+      FileUtils.rm_rf(metadata_file) unless @site.incremental?
+    end
+
+    private
+
+    # Private: The list of files and directories to be deleted during cleanup process
+    #
+    # Returns an Array of the file and directory paths
+    def obsolete_files
+      (existing_files - new_files - new_dirs + replaced_files).to_a
+    end
+
+    # Private: The metadata file storing dependency tree and build history
+    #
+    # Returns an Array with the metdata file as the only item
+    def metadata_file
+      [site.regenerator.metadata_file]
+    end
+
+    # Private: The list of existing files, apart from those included in keep_files and hidden files.
+    #
+    # Returns a Set with the file paths
+    def existing_files
+      files = Set.new
+      regex = keep_file_regex
+      dirs = keep_dirs
+
+      Utils.safe_glob(site.in_dest_dir, ["**", "*"], File::FNM_DOTMATCH).each do |file|
+        next if file =~ HIDDEN_FILE_REGEX || file =~ regex || dirs.include?(file)
+        files << file
       end
 
-      # Cleans up the site's destination directory
-      def cleanup!
-        FileUtils.rm_rf(obsolete_files)
-        FileUtils.rm_rf(metadata_file) if @site.full_rebuild?
-      end
+      files
+    end
 
-      private
+    # Private: The list of files to be created when site is built.
+    #
+    # Returns a Set with the file paths
+    def new_files
+      files = Set.new
+      site.each_site_file { |item| files << item.destination(site.dest) }
+      files
+    end
 
-      # Private: The list of files and directories to be deleted during cleanup process
-      #
-      # Returns an Array of the file and directory paths
-      def obsolete_files
-        (existing_files - new_files - new_dirs + replaced_files).to_a
-      end
+    # Private: The list of directories to be created when site is built.
+    # These are the parent directories of the files in #new_files.
+    #
+    # Returns a Set with the directory paths
+    def new_dirs
+      new_files.map { |file| parent_dirs(file) }.flatten.to_set
+    end
 
-      # Private: The metadata file storing dependency tree and build history
-      #
-      # Returns an Array with the metdata file as the only item
-      def metadata_file
-        [site.metadata.metadata_file]
+    # Private: The list of parent directories of a given file
+    #
+    # Returns an Array with the directory paths
+    def parent_dirs(file)
+      parent_dir = File.dirname(file)
+      if parent_dir == site.dest
+        []
+      else
+        [parent_dir] + parent_dirs(parent_dir)
       end
+    end
 
-      # Private: The list of existing files, apart from those included in keep_files and hidden files.
-      #
-      # Returns a Set with the file paths
-      def existing_files
-        files = Set.new
-        Dir.glob(site.in_dest_dir("**", "*"), File::FNM_DOTMATCH) do |file|
-          files << file unless file =~ /\/\.{1,2}$/ || file =~ keep_file_regex || keep_dirs.include?(file)
-        end
-        files
-      end
+    # Private: The list of existing files that will be replaced by a directory during build
+    #
+    # Returns a Set with the file paths
+    def replaced_files
+      new_dirs.select { |dir| File.file?(dir) }.to_set
+    end
 
-      # Private: The list of files to be created when site is built.
-      #
-      # Returns a Set with the file paths
-      def new_files
-        files = Set.new
-        site.each_site_file { |item| files << item.destination(site.dest) }
-        files
-      end
+    # Private: The list of directories that need to be kept because they are parent directories
+    # of files specified in keep_files
+    #
+    # Returns a Set with the directory paths
+    def keep_dirs
+      site.keep_files.map { |file| parent_dirs(site.in_dest_dir(file)) }.flatten.to_set
+    end
 
-      # Private: The list of directories to be created when site is built.
-      # These are the parent directories of the files in #new_files.
-      #
-      # Returns a Set with the directory paths
-      def new_dirs
-        new_files.map { |file| parent_dirs(file) }.flatten.to_set
-      end
-
-      # Private: The list of parent directories of a given file
-      #
-      # Returns an Array with the directory paths
-      def parent_dirs(file)
-        parent_dir = File.dirname(file)
-        if parent_dir == site.dest
-          []
-        else
-          [parent_dir] + parent_dirs(parent_dir)
-        end
-      end
-
-      # Private: The list of existing files that will be replaced by a directory during build
-      #
-      # Returns a Set with the file paths
-      def replaced_files
-        new_dirs.select { |dir| File.file?(dir) }.to_set
-      end
-
-      # Private: The list of directories that need to be kept because they are parent directories
-      # of files specified in keep_files
-      #
-      # Returns a Set with the directory paths
-      def keep_dirs
-        site.keep_files.map { |file| parent_dirs(site.in_dest_dir(file)) }.flatten.to_set
-      end
-
-      # Private: Creates a regular expression from the config's keep_files array
-      #
-      # Examples
-      #   ['.git','.svn'] creates the following regex: /\/(\.git|\/.svn)/
-      #
-      # Returns the regular expression
-      def keep_file_regex
-        or_list = site.keep_files.join("|")
-        pattern = "\/(#{or_list.gsub(".", "\.")})"
-        Regexp.new pattern
-      end
+    # Private: Creates a regular expression from the config's keep_files array
+    #
+    # Examples
+    #   ['.git','.svn'] creates the following regex: /\/(\.git|\/.svn)/
+    #
+    # Returns the regular expression
+    def keep_file_regex
+      Regexp.union(site.keep_files)
     end
   end
 end

lib/jekyll/collection.rb

@@ -1,6 +1,7 @@
 module Jekyll
   class Collection
     attr_reader :site, :label, :metadata
+    attr_writer :docs
 
     # Create a new Collection.
     #
@@ -22,6 +23,23 @@ module Jekyll
       @docs ||= []
     end
 
+    # Override of normal respond_to? to match method_missing's logic for
+    # looking in @data.
+    def respond_to?(method, include_private = false)
+      docs.respond_to?(method.to_sym, include_private) || super
+    end
+
+    # Override of method_missing to check in @data for the key.
+    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}."
+        Jekyll.logger.warn "", "Called by #{caller.first}."
+        docs.public_send(method.to_sym, *args, &blck)
+      else
+        super
+      end
+    end
+
     # Fetch the static files in this collection.
     # Defaults to an empty array if no static files have been read in.
     #
@@ -38,9 +56,13 @@ module Jekyll
         full_path = collection_dir(file_path)
         next if File.directory?(full_path)
         if Utils.has_yaml_header? full_path
-          doc = Jekyll::Document.new(full_path, { site: site, collection: self })
+          doc = Jekyll::Document.new(full_path, { :site => site, :collection => self })
           doc.read
-          docs << doc if site.publisher.publish?(doc)
+          if site.publisher.publish?(doc) || !write?
+            docs << doc
+          else
+            Jekyll.logger.debug "Skipped From Publishing:", doc.relative_path
+          end
         else
           relative_dir = Jekyll.sanitized_path(relative_directory, File.dirname(file_path)).chomp("/.")
           files << StaticFile.new(site, site.source, relative_dir, File.basename(full_path), self)
@@ -54,10 +76,11 @@ module Jekyll
     # Returns an Array of file paths to the documents in this collection
     #   relative to the collection's directory
     def entries
-      return Array.new unless exists?
+      return [] unless exists?
       @entries ||=
-        Dir.glob(collection_dir("**", "*.*")).map do |entry|
-          entry["#{collection_dir}/"] = ''; entry
+        Utils.safe_glob(collection_dir, ["**", "*.*"]).map do |entry|
+          entry["#{collection_dir}/"] = ''
+          entry
         end
     end
 
@@ -66,7 +89,7 @@ module Jekyll
     #
     # Returns a list of filtered entry paths.
     def filtered_entries
-      return Array.new unless exists?
+      return [] unless exists?
       @filtered_entries ||=
         Dir.chdir(directory) do
           entry_filter.filter(entries).reject do |f|
@@ -148,14 +171,7 @@ module Jekyll
     #
     # Returns a representation of this collection for use in Liquid.
     def to_liquid
-      metadata.merge({
-        "label"     => label,
-        "docs"      => docs,
-        "files"     => files,
-        "directory" => directory,
-        "output"    => write?,
-        "relative_directory" => relative_directory
-      })
+      Drops::CollectionDrop.new self
     end
 
     # Whether the collection's documents ought to be written as individual
@@ -163,14 +179,16 @@ module Jekyll
     #
     # Returns true if the 'write' metadata is true, false otherwise.
     def write?
-      !!metadata['output']
+      !!metadata.fetch('output', false)
     end
 
     # The URL template to render collection's documents at.
     #
     # Returns the URL template to render collection's documents at.
     def url_template
-      metadata.fetch('permalink', "/:collection/:path:output_ext")
+      @url_template ||= metadata.fetch('permalink') do
+        Utils.add_permalink_suffix("/:collection/:path", site.permalink_style)
+      end
     end
 
     # Extract options for this collection from the site configuration.
@@ -178,7 +196,7 @@ module Jekyll
     # Returns the metadata for this collection
     def extract_metadata
       if site.config['collections'].is_a?(Hash)
-        site.config['collections'][label] || Hash.new
+        site.config['collections'][label] || {}
       else
         {}
       end

lib/jekyll/command.rb

@@ -1,8 +1,6 @@
 module Jekyll
   class Command
-
     class << self
-
       # A list of subclasses of Jekyll::Command
       def subclasses
         @subclasses ||= []
@@ -49,6 +47,8 @@ module Jekyll
       # Returns nothing
       def add_build_options(c)
         c.option 'config',  '--config CONFIG_FILE[,CONFIG_FILE2,...]', Array, 'Custom configuration file'
+        c.option 'destination', '-d', '--destination DESTINATION', 'The current folder will be generated into DESTINATION'
+        c.option 'source', '-s', '--source SOURCE', 'Custom source directory'
         c.option 'future',  '--future', 'Publishes posts with a future date'
         c.option 'limit_posts', '--limit_posts MAX_POSTS', Integer, 'Limits the number of posts to parse and publish'
         c.option 'watch',   '-w', '--[no-]watch', 'Watch for changes and rebuild'
@@ -58,10 +58,8 @@ module Jekyll
         c.option 'unpublished', '--unpublished', 'Render posts that were marked as unpublished'
         c.option 'quiet',   '-q', '--quiet', 'Silence output.'
         c.option 'verbose', '-V', '--verbose', 'Print verbose output.'
-        c.option 'full_rebuild', '-f', '--full-rebuild', 'Disable incremental rebuild.'
+        c.option 'incremental', '-I', '--incremental', 'Enable incremental rebuild.'
       end
-
     end
-
   end
 end

lib/jekyll/commands/build.rb

@@ -1,9 +1,7 @@
 module Jekyll
   module Commands
     class Build < Command
-
       class << self
-
         # Create the Mercenary command for the Jekyll CLI for this Command
         def init_with_program(prog)
           prog.command(:build) do |c|
@@ -13,7 +11,7 @@ module Jekyll
 
             add_build_options(c)
 
-            c.action do |args, options|
+            c.action do |_, options|
               options["serving"] = false
               Jekyll::Commands::Build.process(options)
             end
@@ -23,7 +21,8 @@ module Jekyll
         # Build your jekyll site
         # Continuously watch if `watch` is set to true in the config.
         def process(options)
-          Jekyll.logger.log_level = :error if options['quiet']
+          # Adjust verbosity quickly
+          Jekyll.logger.adjust_verbosity(options)
 
           options = configuration_from_options(options)
           site = Jekyll::Site.new(options)
@@ -34,7 +33,9 @@ module Jekyll
             build(site, options)
           end
 
-          if options.fetch('watch', false)
+          if options.fetch('detach', false)
+            Jekyll.logger.info "Auto-regeneration:", "disabled when running server detached."
+          elsif options.fetch('watch', false)
             watch(site, options)
           else
             Jekyll.logger.info "Auto-regeneration:", "disabled. Use --watch to enable."
@@ -48,15 +49,16 @@ module Jekyll
         #
         # Returns nothing.
         def build(site, options)
+          t = Time.now
           source      = options['source']
           destination = options['destination']
-          full_build  = options['full_rebuild']
+          incremental = options['incremental']
           Jekyll.logger.info "Source:", source
           Jekyll.logger.info "Destination:", destination
-          Jekyll.logger.info "Incremental build:", (full_build ? "disabled" : "enabled")
+          Jekyll.logger.info "Incremental build:", (incremental ? "enabled" : "disabled. Enable with --incremental")
           Jekyll.logger.info "Generating..."
           process_site(site)
-          Jekyll.logger.info "", "done."
+          Jekyll.logger.info "", "done in #{(Time.now - t).round(3)} seconds."
         end
 
         # Private: Watch for file changes and rebuild the site.
@@ -65,13 +67,11 @@ module Jekyll
         # options - A Hash of options passed to the command
         #
         # Returns nothing.
-        def watch(site, options)
+        def watch(_site, options)
           External.require_with_graceful_fail 'jekyll-watch'
           Jekyll::Watcher.watch(options)
         end
-
       end # end of class << self
-
     end
   end
 end

lib/jekyll/commands/clean.rb

@@ -2,14 +2,15 @@ module Jekyll
   module Commands
     class Clean < Command
       class << self
-
         def init_with_program(prog)
           prog.command(:clean) do |c|
             c.syntax 'clean [subcommand]'
             c.description 'Clean the site (removes site output and metadata file) without building.'
 
-            c.action do |args, _|
-              Jekyll::Commands::Clean.process({})
+            add_build_options(c)
+
+            c.action do |_, options|
+              Jekyll::Commands::Clean.process(options)
             end
           end
         end
@@ -35,7 +36,6 @@ module Jekyll
             Jekyll.logger.info "Nothing to do for #{metadata_file}."
           end
         end
-
       end
     end
   end

lib/jekyll/commands/doctor.rb

@@ -2,7 +2,6 @@ module Jekyll
   module Commands
     class Doctor < Command
       class << self
-
         def init_with_program(prog)
           prog.command(:doctor) do |c|
             c.syntax 'doctor'
@@ -11,7 +10,7 @@ module Jekyll
 
             c.option '--config CONFIG_FILE[,CONFIG_FILE2,...]', Array, 'Custom configuration file'
 
-            c.action do |args, options|
+            c.action do |_, options|
               Jekyll::Commands::Doctor.process(options)
             end
           end
@@ -30,41 +29,66 @@ module Jekyll
 
         def healthy?(site)
           [
+            fsnotify_buggy?(site),
             !deprecated_relative_permalinks(site),
-            !conflicting_urls(site)
+            !conflicting_urls(site),
+            !urls_only_differ_by_case(site)
           ].all?
         end
 
         def deprecated_relative_permalinks(site)
-          contains_deprecated_pages = false
-          site.pages.each do |page|
-            if page.uses_relative_permalinks
-              Jekyll.logger.warn "Deprecation:", "'#{page.path}' uses relative" +
-                                  " permalinks which will be deprecated in" +
-                                  " Jekyll v2.0.0 and beyond."
-              contains_deprecated_pages = true
-            end
+          if site.config['relative_permalinks']
+            Jekyll::Deprecator.deprecation_message "Your site still uses relative" \
+                                " permalinks, which was removed in" \
+                                " Jekyll v3.0.0."
+            return true
           end
-          contains_deprecated_pages
         end
 
         def conflicting_urls(site)
           conflicting_urls = false
           urls = {}
           urls = collect_urls(urls, site.pages, site.dest)
-          urls = collect_urls(urls, site.posts, site.dest)
+          urls = collect_urls(urls, site.posts.docs, site.dest)
           urls.each do |url, paths|
-            if paths.size > 1
-              conflicting_urls = true
-              Jekyll.logger.warn "Conflict:", "The URL '#{url}' is the destination" +
-                " for the following pages: #{paths.join(", ")}"
-            end
+            next unless paths.size > 1
+            conflicting_urls = true
+            Jekyll.logger.warn "Conflict:", "The URL '#{url}' is the destination" \
+              " for the following pages: #{paths.join(", ")}"
           end
           conflicting_urls
         end
 
-        private
+        def fsnotify_buggy?(_site)
+          return true unless Utils::Platforms.osx?
+          if Dir.pwd != `pwd`.strip
+            Jekyll.logger.error "  " + <<-STR.strip.gsub(/\n\s+/, "\n  ")
+              We have detected that there might be trouble using fsevent on your
+              operating system, you can read https://github.com/thibaudgg/rb-fsevent/wiki/no-fsevents-fired-(OSX-bug)
+              for possible work arounds or you can work around it immediately
+              with `--force-polling`.
+            STR
 
+            false
+          end
+
+          true
+        end
+
+        def urls_only_differ_by_case(site)
+          urls_only_differ_by_case = false
+          urls = case_insensitive_urls(site.pages + site.docs_to_write, site.dest)
+          urls.each do |case_insensitive_url, real_urls|
+            next unless real_urls.uniq.size > 1
+            urls_only_differ_by_case = true
+            Jekyll.logger.warn "Warning:", "The following URLs only differ" \
+              " by case. On a case-insensitive file system one of the URLs" \
+              " will be overwritten by the other: #{real_urls.join(", ")}"
+          end
+          urls_only_differ_by_case
+        end
+
+        private
         def collect_urls(urls, things, destination)
           things.each do |thing|
             dest = thing.destination(destination)
@@ -77,8 +101,14 @@ module Jekyll
           urls
         end
 
+        def case_insensitive_urls(things, destination)
+          things.inject({}) do |memo, thing|
+            dest = thing.destination(destination)
+            (memo[dest.downcase] ||= []) << dest
+            memo
+          end
+        end
       end
-
     end
   end
 end

lib/jekyll/commands/help.rb

@@ -2,7 +2,6 @@ module Jekyll
   module Commands
     class Help < Command
       class << self
-
         def init_with_program(prog)
           prog.command(:help) do |c|
             c.syntax 'help [subcommand]'
@@ -26,7 +25,6 @@ module Jekyll
           Jekyll.logger.error "Error:", "Hmm... we don't know what the '#{cmd}' command is."
           Jekyll.logger.info  "Valid commands:", prog.commands.keys.join(", ")
         end
-
       end
     end
   end

lib/jekyll/commands/new.rb

@@ -3,7 +3,7 @@ require 'erb'
 module Jekyll
   module Commands
     class New < Command
-      class << self 
+      class << self
         def init_with_program(prog)
           prog.command(:new) do |c|
             c.syntax 'new PATH'
@@ -11,7 +11,7 @@ module Jekyll
 
             c.option 'force', '--force', 'Force creation even if PATH already exists'
             c.option 'blank', '--blank', 'Creates scaffolding but with empty files'
-            
+
             c.action do |args, options|
               Jekyll::Commands::New.process(args, options)
             end
@@ -76,7 +76,7 @@ module Jekyll
         def scaffold_path
           "_posts/0000-00-00-welcome-to-jekyll.markdown.erb"
         end
-      end  
+      end
     end
   end
 end

lib/jekyll/commands/serve.rb

@@ -1,136 +1,205 @@
-# -*- encoding: utf-8 -*-
 module Jekyll
   module Commands
     class Serve < Command
-
       class << self
+        COMMAND_OPTIONS = {
+          "ssl_cert" => ["--ssl-cert [CERT]", "X.509 (SSL) certificate."],
+          "host"     => ["host", "-H", "--host [HOST]", "Host to bind to"],
+          "open_url" => ["-o", "--open-url", "Launch your browser with your site."],
+          "detach"   => ["-B", "--detach", "Run the server in the background (detach)"],
+          "ssl_key"  => ["--ssl-key [KEY]", "X.509 (SSL) Private Key."],
+          "port"     => ["-P", "--port [PORT]", "Port to listen on"],
+          "baseurl"  => ["-b", "--baseurl [URL]", "Base URL"],
+          "skip_initial_build" => ["skip_initial_build", "--skip-initial-build",
+            "Skips the initial site build which occurs before the server is started."]
+        }
+
+        #
 
         def init_with_program(prog)
-          prog.command(:serve) do |c|
-            c.syntax 'serve [options]'
-            c.description 'Serve your site locally'
-            c.alias :server
-            c.alias :s
+          prog.command(:serve) do |cmd|
+            cmd.description "Serve your site locally"
+            cmd.syntax "serve [options]"
+            cmd.alias :server
+            cmd.alias :s
 
-            add_build_options(c)
+            add_build_options(cmd)
+            COMMAND_OPTIONS.each do |key, val|
+              cmd.option key, *val
+            end
 
-            c.option 'detach', '-B', '--detach', 'Run the server in the background (detach)'
-            c.option 'port', '-P', '--port [PORT]', 'Port to listen on'
-            c.option 'host', '-H', '--host [HOST]', 'Host to bind to'
-            c.option 'baseurl', '-b', '--baseurl [URL]', 'Base URL'
-            c.option 'skip_initial_build', '--skip-initial-build', 'Skips the initial site build which occurs before the server is started.'
-
-            c.action do |args, options|
-              options["serving"] = true
-              options["watch"] = true unless options.key?("watch")
-              Jekyll::Commands::Build.process(options)
-              Jekyll::Commands::Serve.process(options)
+            cmd.action do |_, opts|
+              opts["serving"] = true
+              opts["watch"  ] = true unless opts.key?("watch")
+              Build.process(opts)
+              Serve.process(opts)
             end
           end
         end
 
-        # Boot up a WEBrick server which points to the compiled site's root.
-        def process(options)
-          options = configuration_from_options(options)
-          destination = options['destination']
+        #
+
+        def process(opts)
+          opts = configuration_from_options(opts)
+          destination = opts["destination"]
           setup(destination)
 
-          s = WEBrick::HTTPServer.new(webrick_options(options))
-          s.unmount("")
-
-          s.mount(
-            options['baseurl'],
-            WEBrick::HTTPServlet::FileHandler,
-            destination,
-            file_handler_options
-          )
-
-          Jekyll.logger.info "Server address:", server_address(s, options)
-
-          if options['detach'] # detach the server
-            pid = Process.fork { s.start }
-            Process.detach(pid)
-            Jekyll.logger.info "Server detached with pid '#{pid}'.", "Run `kill -9 #{pid}' to stop the server."
-          else # create a new server thread, then join it with current terminal
-            t = Thread.new { s.start }
-            trap("INT") { s.shutdown }
-            t.join
-          end
+          server = WEBrick::HTTPServer.new(webrick_opts(opts)).tap { |o| o.unmount("") }
+          server.mount(opts["baseurl"], Servlet, destination, file_handler_opts)
+          Jekyll.logger.info "Server address:", server_address(server, opts)
+          launch_browser server, opts if opts["open_url"]
+          boot_or_detach server, opts
         end
 
+        # Do a base pre-setup of WEBRick so that everything is in place
+        # 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 'webrick'
+          require_relative "serve/servlet"
 
           FileUtils.mkdir_p(destination)
-
-          # monkey patch WEBrick using custom 404 page (/404.html)
-          if File.exist?(File.join(destination, '404.html'))
+          if File.exist?(File.join(destination, "404.html"))
             WEBrick::HTTPResponse.class_eval do
               def create_error_page
-                @header['content-type'] = "text/html; charset=UTF-8"
-                @body = IO.read(File.join(@config[:DocumentRoot], '404.html'))
+                @header["Content-Type"] = "text/html; charset=UTF-8"
+                @body = IO.read(File.join(@config[:DocumentRoot], "404.html"))
               end
             end
           end
         end
 
-        def webrick_options(config)
+        #
+
+        private
+        def webrick_opts(opts)
           opts = {
-            :BindAddress        => config['host'],
-            :DirectoryIndex     => %w(index.html index.htm index.cgi index.rhtml index.xml),
-            :DocumentRoot       => config['destination'],
+            :JekyllOptions      => opts,
             :DoNotReverseLookup => true,
             :MimeTypes          => mime_types,
-            :Port               => config['port'],
-            :StartCallback      => start_callback(config['detach'])
+            :DocumentRoot       => opts["destination"],
+            :StartCallback      => start_callback(opts["detach"]),
+            :BindAddress        => opts["host"],
+            :Port               => opts["port"],
+            :DirectoryIndex     => %W(
+              index.htm
+              index.html
+              index.rhtml
+              index.cgi
+              index.xml
+            )
           }
 
-          if config['verbose']
-            opts.merge!({
-              :Logger => WEBrick::Log.new($stdout, WEBrick::Log::DEBUG)
-            })
-          else
-            opts.merge!({
-              :AccessLog => [],
-              :Logger => WEBrick::Log.new([], WEBrick::Log::WARN)
-            })
-          end
-
+          enable_ssl(opts)
+          enable_logging(opts)
           opts
         end
 
-        def start_callback(detached)
-          unless detached
-            Proc.new { Jekyll.logger.info "Server running...", "press ctrl-c to stop." }
-          end
-        end
+        # Recreate NondisclosureName under utf-8 circumstance
 
-        def mime_types
-          mime_types_file = File.expand_path('../mime.types', File.dirname(__FILE__))
-          WEBrick::HTTPUtils::load_mime_types(mime_types_file)
-        end
-
-        def server_address(server, options)
-          baseurl = "#{options['baseurl']}/" if options['baseurl']
-          [
-            "http://",
-            server.config[:BindAddress],
-            ":",
-            server.config[:Port],
-            baseurl || ""
-          ].map(&:to_s).join("")
-        end
-
-        # recreate NondisclosureName under utf-8 circumstance
-        def file_handler_options
+        private
+        def file_handler_opts
           WEBrick::Config::FileHandler.merge({
             :FancyIndexing     => true,
-            :NondisclosureName => ['.ht*','~*']
+            :NondisclosureName => [
+              '.ht*', '~*'
+            ]
           })
         end
 
-      end
+        #
 
+        private
+        def server_address(server, opts)
+          "%{prefix}://%{address}:%{port}%{baseurl}" % {
+            :prefix => server.config[:SSLEnable] ? "https" : "http",
+            :baseurl => opts["baseurl"] ? "#{opts["baseurl"]}/" : "",
+            :address => server.config[:BindAddress],
+            :port => server.config[:Port]
+          }
+        end
+
+        #
+
+        private
+        def launch_browser(server, opts)
+          command =
+            if Utils::Platforms.windows?
+              "start"
+            elsif Utils::Platforms.osx?
+              "open"
+            else
+              "xdg-open"
+            end
+          system command, server_address(server, opts)
+        end
+
+        # 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
+              server.start
+            end
+
+            Process.detach(pid)
+            Jekyll.logger.info "Server detached with pid '#{pid}'.", \
+              "Run `pkill -f jekyll' or `kill -9 #{pid}' to stop the server."
+          else
+            t = Thread.new { server.start }
+            trap("INT") { server.shutdown }
+            t.join
+          end
+        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)
+          opts[:Logger] = WEBrick::Log.new($stdout, level)
+        end
+
+        # 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)
+          return if !opts[:JekyllOptions]["ssl_cert"] && !opts[:JekyllOptions]["ssl_key"]
+          if !opts[:JekyllOptions]["ssl_cert"] || !opts[:JekyllOptions]["ssl_key"]
+            raise RuntimeError, "--ssl-cert or --ssl-key missing."
+          end
+
+          require "openssl"
+          require "webrick/https"
+          source_key = Jekyll.sanitized_path(opts[:JekyllOptions]["source"], opts[:JekyllOptions]["ssl_key" ])
+          source_certificate = Jekyll.sanitized_path(opts[:JekyllOptions]["source"], opts[:JekyllOptions]["ssl_cert"])
+          opts[:SSLCertificate] = OpenSSL::X509::Certificate.new(File.read(source_certificate))
+          opts[:SSLPrivateKey ] = OpenSSL::PKey::RSA.new(File.read(source_key))
+          opts[:SSLEnable] = true
+        end
+
+        private
+        def start_callback(detached)
+          unless detached
+            proc do
+              Jekyll.logger.info("Server running...", "press ctrl-c to stop.")
+            end
+          end
+        end
+
+        private
+        def mime_types
+          file = File.expand_path('../mime.types', File.dirname(__FILE__))
+          WEBrick::HTTPUtils.load_mime_types(file)
+        end
+      end
     end
   end
 end

lib/jekyll/commands/serve/servlet.rb

@@ -0,0 +1,61 @@
+require "webrick"
+
+module Jekyll
+  module Commands
+    class Serve
+      class Servlet < WEBrick::HTTPServlet::FileHandler
+        DEFAULTS = {
+          "Cache-Control" => "private, max-age=0, proxy-revalidate, " \
+            "no-store, no-cache, must-revalidate"
+        }
+
+        def initialize(server, root, callbacks)
+          # So we can access them easily.
+          @jekyll_opts = server.config[:JekyllOptions]
+          set_defaults
+          super
+        end
+
+        # Add the ability to tap file.html the same way that Nginx does on our
+        # Docker images (or on GitHub Pages.) The difference is that we might end
+        # up with a different preference on which comes first.
+
+        def search_file(req, res, basename)
+          # /file.* > /file/index.html > /file.html
+          super || super(req, res, "#{basename}.html")
+        end
+
+        #
+
+        def do_GET(req, res)
+          rtn = super
+          validate_and_ensure_charset(req, res)
+          res.header.merge!(@headers)
+          rtn
+        end
+
+        #
+
+        private
+        def validate_and_ensure_charset(_req, res)
+          key = res.header.keys.grep(/content-type/i).first
+          typ = res.header[key]
+
+          unless typ =~ /;\s*charset=/
+            res.header[key] = "#{typ}; charset=#{@jekyll_opts["encoding"]}"
+          end
+        end
+
+        #
+
+        private
+        def set_defaults
+          hash_ = @jekyll_opts.fetch("webrick", {}).fetch("headers", {})
+          DEFAULTS.each_with_object(@headers = hash_) do |(key, val), hash|
+            hash[key] = val unless hash.key?(key)
+          end
+        end
+      end
+    end
+  end
+end

lib/jekyll/configuration.rb

@@ -2,32 +2,30 @@
 
 module Jekyll
   class Configuration < Hash
-
     # Default options. Overridden by values in _config.yml.
     # Strings rather than symbols are used for compatibility with YAML.
-    DEFAULTS = {
+    DEFAULTS = Configuration[{
       # Where things are
       'source'        => Dir.pwd,
       'destination'   => File.join(Dir.pwd, '_site'),
-      'plugins'       => '_plugins',
-      'layouts'       => '_layouts',
-      'data_source'   =>  '_data',
-      'collections'   => nil,
+      'plugins_dir'   => '_plugins',
+      'layouts_dir'   => '_layouts',
+      'data_dir'      => '_data',
+      'includes_dir'  => '_includes',
+      'collections'   => {},
 
       # Handling Reading
       'safe'          => false,
       'include'       => ['.htaccess'],
       'exclude'       => [],
-      'keep_files'    => ['.git','.svn'],
+      'keep_files'    => ['.git', '.svn'],
       'encoding'      => 'utf-8',
       'markdown_ext'  => 'markdown,mkdown,mkdn,mkd,md',
-      'textile_ext'   => 'textile',
-      'full_rebuild'  => false,
 
       # Filtering Content
       'show_drafts'   => nil,
       'limit_posts'   => 0,
-      'future'        => true,           # remove and make true just default
+      'future'        => false,
       'unpublished'   => false,
 
       # Plugins
@@ -36,9 +34,10 @@ module Jekyll
 
       # Conversion
       'markdown'      => 'kramdown',
-      'highlighter'   => 'pygments',
+      'highlighter'   => 'rouge',
       'lsi'           => false,
       'excerpt_separator' => "\n\n",
+      'incremental'   => false,
 
       # Serving
       'detach'        => false,          # default to not detaching the server
@@ -46,26 +45,15 @@ module Jekyll
       'host'          => '127.0.0.1',
       'baseurl'       => '',
 
-      # Backwards-compatibility options
-      'relative_permalinks' => false,
-
       # Output Configuration
       'permalink'     => 'date',
       'paginate_path' => '/page:num',
       'timezone'      => nil,           # use the local timezone
 
       'quiet'         => false,
+      'verbose'       => false,
       'defaults'      => [],
 
-      'maruku' => {
-        'use_tex'    => false,
-        'use_divs'   => false,
-        'png_engine' => 'blahtex',
-        'png_dir'    => 'images/latex',
-        'png_url'    => '/images/latex',
-        'fenced_code_blocks' => true
-      },
-
       'rdiscount' => {
         'extensions' => []
       },
@@ -76,32 +64,41 @@ module Jekyll
 
       'kramdown' => {
         'auto_ids'       => true,
-        'footnote_nr'    => 1,
-        'entity_output'  => 'as_char',
         'toc_levels'     => '1..6',
+        'entity_output'  => 'as_char',
         'smart_quotes'   => 'lsquo,rsquo,ldquo,rdquo',
-        'enable_coderay' => false,
-
-        'coderay' => {
-          'coderay_wrap'              => 'div',
-          'coderay_line_numbers'      => 'inline',
-          'coderay_line_number_start' => 1,
-          'coderay_tab_width'         => 4,
-          'coderay_bold_every'        => 10,
-          'coderay_css'               => 'style'
-        }
-      },
-
-      'redcloth' => {
-        'hard_breaks' => true
+        'input'          => "GFM",
+        'hard_wrap'      => false,
+        'footnote_nr'    => 1
       }
-    }
+    }.map { |k, v| [k, v.freeze] }].freeze
+
+    class << self
+      # Static: Produce a Configuration ready for use in a Site.
+      # It takes the input, fills in the defaults where values do not
+      # exist, and patches common issues including migrating options for
+      # backwards compatiblity. Except where a key or value is being fixed,
+      # the user configuration will override the defaults.
+      #
+      # user_config - a Hash or Configuration of overrides.
+      #
+      # Returns a Configuration filled with defaults and fixed for common
+      # problems and backwards-compatibility.
+      def from(user_config)
+        Utils.deep_merge_hashes(DEFAULTS, Configuration[user_config].stringify_keys).
+          fix_common_issues.add_default_collections
+      end
+    end
 
     # Public: Turn all keys into string
     #
     # Return a copy of the hash where all its keys are strings
     def stringify_keys
-      reduce({}) { |hsh,(k,v)| hsh.merge(k.to_s => v) }
+      reduce({}) { |hsh, (k, v)| hsh.merge(k.to_s => v) }
+    end
+
+    def get_config_value_with_override(config_key, override)
+      override[config_key] || self[config_key] || DEFAULTS[config_key]
     end
 
     # Public: Directory of the Jekyll source folder
@@ -110,19 +107,26 @@ module Jekyll
     #
     # Returns the path to the Jekyll source directory
     def source(override)
-      override['source'] || self['source'] || DEFAULTS['source']
+      get_config_value_with_override('source', override)
     end
 
-    def quiet?(override = {})
-      override['quiet'] || self['quiet'] || DEFAULTS['quiet']
+    def quiet(override = {})
+      get_config_value_with_override('quiet', override)
     end
+    alias_method :quiet?, :quiet
+
+    def verbose(override = {})
+      get_config_value_with_override('verbose', override)
+    end
+    alias_method :verbose?, :verbose
 
     def safe_load_file(filename)
       case File.extname(filename)
       when /\.toml/i
+        Jekyll::External.require_with_graceful_fail('toml') unless defined?(TOML)
         TOML.load_file(filename)
       when /\.ya?ml/i
-        SafeYAML.load_file(filename)
+        SafeYAML.load_file(filename) || {}
       else
         raise ArgumentError, "No parser for '#{filename}' is available. Use a .toml or .y(a)ml file instead."
       end
@@ -134,14 +138,14 @@ module Jekyll
     #
     # Returns an Array of config files
     def config_files(override)
-      # Be quiet quickly.
-      Jekyll.logger.log_level = :error if quiet?(override)
+      # Adjust verbosity quickly
+      Jekyll.logger.adjust_verbosity(:quiet => quiet?(override), :verbose => verbose?(override))
 
       # Get configuration from <source>/_config.yml or <source>/<config_file>
       config_files = override.delete('config')
       if config_files.to_s.empty?
-        default = %w[yml yaml].find(Proc.new { 'yml' }) do |ext|
-          File.exists? Jekyll.sanitized_path(source(override), "_config.#{ext}")
+        default = %w(yml yaml).find(-> { 'yml' }) do |ext|
+          File.exist?(Jekyll.sanitized_path(source(override), "_config.#{ext}"))
         end
         config_files = Jekyll.sanitized_path(source(override), "_config.#{default}")
         @default_config_file = true
@@ -157,7 +161,7 @@ module Jekyll
     # Returns this configuration, overridden by the values in the file
     def read_config_file(file)
       next_config = safe_load_file(file)
-      raise ArgumentError.new("Configuration file: (INVALID) #{file}".yellow) unless next_config.is_a?(Hash)
+      check_config_is_hash!(next_config, file)
       Jekyll.logger.info "Configuration file:", file
       next_config
     rescue SystemCallError
@@ -181,16 +185,17 @@ module Jekyll
 
       begin
         files.each do |config_file|
+          next if config_file.nil? or config_file.empty?
           new_config = read_config_file(config_file)
           configuration = Utils.deep_merge_hashes(configuration, new_config)
         end
       rescue ArgumentError => err
-        Jekyll.logger.warn "WARNING:", "Error reading configuration. " +
+        Jekyll.logger.warn "WARNING:", "Error reading configuration. " \
                      "Using defaults (and options)."
         $stderr.puts "#{err}"
       end
 
-      configuration.fix_common_issues.backwards_compatibilize
+      configuration.fix_common_issues.backwards_compatibilize.add_default_collections
     end
 
     # Public: Split a CSV string into an array containing its values
@@ -210,61 +215,60 @@ module Jekyll
       config = clone
       # Provide backwards-compatibility
       if config.key?('auto') || config.key?('watch')
-        Jekyll.logger.warn "Deprecation:", "Auto-regeneration can no longer" +
-                            " be set from your configuration file(s). Use the"+
+        Jekyll::Deprecator.deprecation_message "Auto-regeneration can no longer" \
+                            " be set from your configuration file(s). Use the"\
                             " --[no-]watch/-w command-line option instead."
         config.delete('auto')
         config.delete('watch')
       end
 
       if config.key? 'server'
-        Jekyll.logger.warn "Deprecation:", "The 'server' configuration option" +
-                            " is no longer accepted. Use the 'jekyll serve'" +
+        Jekyll::Deprecator.deprecation_message "The 'server' configuration option" \
+                            " is no longer accepted. Use the 'jekyll serve'" \
                             " subcommand to serve your site with WEBrick."
         config.delete('server')
       end
 
-      if config.key? 'server_port'
-        Jekyll.logger.warn "Deprecation:", "The 'server_port' configuration option" +
-                            " has been renamed to 'port'. Please update your config" +
-                            " file accordingly."
-        # copy but don't overwrite:
-        config['port'] = config['server_port'] unless config.key?('port')
-        config.delete('server_port')
-      end
+      renamed_key 'server_port', 'port', config
+      renamed_key 'plugins', 'plugins_dir', config
+      renamed_key 'layouts', 'layouts_dir', config
+      renamed_key 'data_source', 'data_dir', config
 
       if config.key? 'pygments'
-        Jekyll.logger.warn "Deprecation:", "The 'pygments' configuration option" +
-                            " has been renamed to 'highlighter'. Please update your" +
-                            " config file accordingly. The allowed values are 'rouge', " +
+        Jekyll::Deprecator.deprecation_message "The 'pygments' configuration option" \
+                            " has been renamed to 'highlighter'. Please update your" \
+                            " config file accordingly. The allowed values are 'rouge', " \
                             "'pygments' or null."
 
         config['highlighter'] = 'pygments' if config['pygments']
         config.delete('pygments')
       end
 
-      %w[include exclude].each do |option|
-        if config.fetch(option, []).is_a?(String)
-          Jekyll.logger.warn "Deprecation:", "The '#{option}' configuration option" +
-            " must now be specified as an array, but you specified" +
-            " a string. For now, we've treated the string you provided" +
+      %w(include exclude).each do |option|
+        if config[option].is_a?(String)
+          Jekyll::Deprecator.deprecation_message "The '#{option}' configuration option" \
+            " must now be specified as an array, but you specified" \
+            " a string. For now, we've treated the string you provided" \
             " 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
 
       if (config['kramdown'] || {}).key?('use_coderay')
-        Jekyll::Deprecator.deprecation_message "Please change 'use_coderay'" +
+        Jekyll::Deprecator.deprecation_message "Please change 'use_coderay'" \
           " to 'enable_coderay' in your configuration file."
         config['kramdown']['use_coderay'] = config['kramdown'].delete('enable_coderay')
       end
 
       if config.fetch('markdown', 'kramdown').to_s.downcase.eql?("maruku")
-        Jekyll::Deprecator.deprecation_message "You're using the 'maruku' " +
-          "Markdown processor. Maruku support has been deprecated and will " +
-          "be removed in 3.0.0. We recommend you switch to Kramdown."
+        Jekyll.logger.abort_with "Error:", "You're using the 'maruku' " \
+          "Markdown processor, which has been removed as of 3.0.0. " \
+          "We recommend you switch to Kramdown. To do this, replace " \
+          "`markdown: maruku` with `markdown: kramdown` in your " \
+          "`_config.yml` file."
       end
+
       config
     end
 
@@ -272,12 +276,73 @@ module Jekyll
       config = clone
 
       if config.key?('paginate') && (!config['paginate'].is_a?(Integer) || config['paginate'] < 1)
-        Jekyll.logger.warn "Config Warning:", "The `paginate` key must be a" +
+        Jekyll.logger.warn "Config Warning:", "The `paginate` key must be a" \
           " positive integer or nil. It's currently set to '#{config['paginate'].inspect}'."
         config['paginate'] = nil
       end
 
       config
     end
+
+    def add_default_collections
+      config = clone
+
+      # It defaults to `{}`, so this is only if someone sets it to null manually.
+      return config if config['collections'].nil?
+
+      # Ensure we have a hash.
+      if config['collections'].is_a?(Array)
+        config['collections'] = Hash[config['collections'].map { |c| [c, {}] }]
+      end
+
+      config['collections'] = Utils.deep_merge_hashes(
+        { 'posts' => {} }, config['collections']
+      ).tap do |collections|
+        collections['posts']['output'] = true
+        if config['permalink']
+          collections['posts']['permalink'] ||= style_to_permalink(config['permalink'])
+        end
+      end
+
+      config
+    end
+
+    def renamed_key(old, new, config, _ = nil)
+      if config.key?(old)
+        Jekyll::Deprecator.deprecation_message "The '#{old}' configuration" \
+          "option has been renamed to '#{new}'. Please update your config " \
+          "file accordingly."
+        config[new] = config.delete(old)
+      end
+    end
+
+    private
+
+    def style_to_permalink(permalink_style)
+      case permalink_style.to_sym
+      when :pretty
+        "/:categories/:year/:month/:day/:title/"
+      when :none
+        "/:categories/:title:output_ext"
+      when :date
+        "/:categories/:year/:month/:day/:title:output_ext"
+      when :ordinal
+        "/:categories/:year/:y_day/:title:output_ext"
+      else
+        permalink_style.to_s
+      end
+    end
+
+    # Private: Checks if a given config is a hash
+    #
+    # extracted_config - the value to check
+    # file - the file from which the config was extracted
+    #
+    # Raises an ArgumentError if given config is not a hash
+    def check_config_is_hash!(extracted_config, file)
+      unless extracted_config.is_a?(Hash)
+        raise ArgumentError.new("Configuration file: (INVALID) #{file}".yellow)
+      end
+    end
   end
 end

lib/jekyll/converters/identity.rb

@@ -5,7 +5,7 @@ module Jekyll
 
       priority :lowest
 
-      def matches(ext)
+      def matches(_ext)
         true
       end
 

lib/jekyll/converters/markdown.rb

@@ -1,63 +1,62 @@
 module Jekyll
   module Converters
     class Markdown < Converter
-      safe true
-
       highlighter_prefix "\n"
       highlighter_suffix "\n"
+      safe true
 
       def setup
         return if @setup
-        @parser =
-          case @config['markdown'].downcase
-            when 'redcarpet' then RedcarpetParser.new(@config)
-            when 'kramdown'  then KramdownParser.new(@config)
-            when 'rdiscount' then RDiscountParser.new(@config)
-            when 'maruku'    then MarukuParser.new(@config)
-          else
-            # So they can't try some tricky bullshit or go down the ancestor chain, I hope.
-            if allowed_custom_class?(@config['markdown'])
-              self.class.const_get(@config['markdown']).new(@config)
-            else
-              Jekyll.logger.error "Invalid Markdown Processor:", "#{@config['markdown']}"
-              Jekyll.logger.error "", "Valid options are [ #{valid_processors.join(" | ")} ]"
-              raise Errors::FatalException, "Invalid Markdown Processor: #{@config['markdown']}"
-            end
-          end
+        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"]
+          Jekyll.logger.error "", "Available processors are: #{valid_processors.join(", ")}"
+          raise Errors::FatalException, "Bailing out; invalid Markdown processor."
+        end
+
         @setup = true
       end
 
-      def valid_processors
-        %w[
-          maruku
-          rdiscount
-          kramdown
-          redcarpet
-        ] + third_party_processors
+      def get_processor
+        case @config["markdown"].downcase
+        when "redcarpet" then return RedcarpetParser.new(@config)
+        when "kramdown"  then return KramdownParser.new(@config)
+        when "rdiscount" then return RDiscountParser.new(@config)
+        else
+          get_custom_processor
+        end
       end
 
+      # Public: Provides you with a list of processors, the ones we
+      # support internally and the ones that you have provided to us (if you
+      # are not in safe mode.)
+
+      def valid_processors
+        %W(rdiscount kramdown redcarpet) + third_party_processors
+      end
+
+      # Public: A list of processors that you provide via plugins.
+      # This is really only available if you are not in safe mode, if you are
+      # in safe mode (re: GitHub) then there will be none.
+
       def third_party_processors
-        self.class.constants - %w[
-          KramdownParser
-          MarukuParser
-          RDiscountParser
-          RedcarpetParser
-          PRIORITIES
-        ].map(&:to_sym)
-      end
-
-      def extname_matches_regexp
-        @extname_matches_regexp ||= Regexp.new(
-          '^\.(' + @config['markdown_ext'].gsub(',','|') +')$',
-          Regexp::IGNORECASE
+        self.class.constants - \
+        %w(KramdownParser RDiscountParser RedcarpetParser PRIORITIES).map(
+          &:to_sym
         )
       end
 
-      def matches(ext)
-        ext =~ extname_matches_regexp
+      def extname_list
+        @extname_list ||= @config['markdown_ext'].split(',').map do |e|
+          ".#{e.downcase}"
+        end
       end
 
-      def output_ext(ext)
+      def matches(ext)
+        extname_list.include?(ext.downcase)
+      end
+
+      def output_ext(_ext)
         ".html"
       end
 
@@ -67,16 +66,26 @@ module Jekyll
       end
 
       private
+      def get_custom_processor
+        converter_name = @config["markdown"]
+        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 markdown
-      # class name
+      # Private: Determine whether a class name is an allowed custom
+      #   markdown class name.
       #
       # parser_name - the name of the parser class
       #
-      # Returns true if the parser name contains only alphanumeric characters
-      # and is defined within Jekyll::Converters::Markdown
-      def allowed_custom_class?(parser_name)
-        parser_name !~ /[^A-Za-z0-9]/ && self.class.constants.include?(parser_name.to_sym)
+      # 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 !~ /[^A-Za-z0-9_]/ && self.class.constants.include?(
+          parser_name.to_sym
+        )
       end
     end
   end

lib/jekyll/converters/markdown/kramdown_parser.rb

@@ -1,28 +1,116 @@
+# Frozen-string-literal: true
+# Encoding: utf-8
+
 module Jekyll
   module Converters
     class Markdown
       class KramdownParser
+        CODERAY_DEFAULTS = {
+          "css"               => "style",
+          "bold_every"        => 10,
+          "line_numbers"      => "inline",
+          "line_number_start" => 1,
+          "tab_width"         => 4,
+          "wrap"              => "div"
+        }.freeze
+
         def initialize(config)
-          require 'kramdown'
-          @config = config
-        rescue LoadError
-          STDERR.puts 'You are missing a library required for Markdown. Please run:'
-          STDERR.puts '  $ [sudo] gem install kramdown'
-          raise Errors::FatalException.new("Missing dependency: kramdown")
+          Jekyll::External.require_with_graceful_fail "kramdown"
+          @main_fallback_highlighter = config["highlighter"] || "rouge"
+          @config = config["kramdown"] || {}
+          setup
+        end
+
+        # Setup and normalize the configuration:
+        #   * Create Kramdown if it doesn't exist.
+        #   * Set syntax_highlighter, detecting enable_coderay and merging highlighter if none.
+        #   * Merge kramdown[coderay] into syntax_highlighter_opts stripping coderay_.
+        #   * Make sure `syntax_highlighter_opts` exists.
+
+        def setup
+          @config["syntax_highlighter"] ||= highlighter
+          @config["syntax_highlighter_opts"] ||= {}
+          @config["coderay"] ||= {} # XXX: Legacy.
+          modernize_coderay_config
+          make_accessible
         end
 
         def convert(content)
-          # Check for use of coderay
-          if @config['kramdown']['enable_coderay']
-            %w[wrap line_numbers line_numbers_start tab_width bold_every css default_lang].each do |opt|
-              key = "coderay_#{opt}"
-              @config['kramdown'][key] = @config['kramdown']['coderay'][key] unless @config['kramdown'].key?(key)
-            end
-          end
-
-          Kramdown::Document.new(content, Utils.symbolize_hash_keys(@config['kramdown'])).to_html
+          Kramdown::Document.new(content, @config).to_html
         end
 
+        private
+        def make_accessible(hash = @config)
+          proc_ = proc { |hash_, key| hash_[key.to_s] if key.is_a?(Symbol) }
+          hash.default_proc = proc_
+
+          hash.each do |_, val|
+            make_accessible val if val.is_a?(
+              Hash
+            )
+          end
+        end
+
+        # config[kramdown][syntax_higlighter] > config[kramdown][enable_coderay] > config[highlighter]
+        # Where `enable_coderay` is now deprecated because Kramdown
+        # supports Rouge now too.
+
+        private
+        def highlighter
+          return @highlighter if @highlighter
+
+          if @config["syntax_highlighter"]
+            return @highlighter = @config[
+              "syntax_highlighter"
+            ]
+          end
+
+          @highlighter = begin
+            if @config.key?("enable_coderay") && @config["enable_coderay"]
+              Jekyll::Deprecator.deprecation_message "You are using 'enable_coderay', " \
+                "use syntax_highlighter: coderay in your configuration file."
+
+              "coderay"
+            else
+              @main_fallback_highlighter
+            end
+          end
+        end
+
+        private
+        def strip_coderay_prefix(hash)
+          hash.each_with_object({}) do |(key, val), hsh|
+            cleaned_key = key.gsub(/\Acoderay_/, "")
+
+            if key != cleaned_key
+              Jekyll::Deprecator.deprecation_message(
+                "You are using '#{key}'. Normalizing to #{cleaned_key}."
+              )
+            end
+
+            hsh[cleaned_key] = val
+          end
+        end
+
+        # 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
+          if highlighter == "coderay"
+            Jekyll::Deprecator.deprecation_message "You are using 'kramdown.coderay' in your configuration, " \
+              "please use 'syntax_highlighter_opts' instead."
+
+            @config["syntax_highlighter_opts"] = begin
+              strip_coderay_prefix(
+                @config["syntax_highlighter_opts"] \
+                  .merge(CODERAY_DEFAULTS) \
+                  .merge(@config["coderay"])
+              )
+            end
+          end
+        end
       end
     end
   end

lib/jekyll/converters/markdown/maruku_parser.rb

@@ -1,55 +0,0 @@
-module Jekyll
-  module Converters
-    class Markdown
-      class MarukuParser
-        def initialize(config)
-          require 'maruku'
-          @config = config
-          @errors = []
-          load_divs_library if @config['maruku']['use_divs']
-          load_blahtext_library if @config['maruku']['use_tex']
-
-          # allow fenced code blocks (new in Maruku 0.7.0)
-          MaRuKu::Globals[:fenced_code_blocks] = !!@config['maruku']['fenced_code_blocks']
-
-        rescue LoadError
-          STDERR.puts 'You are missing a library required for Markdown. Please run:'
-          STDERR.puts '  $ [sudo] gem install maruku'
-          raise Errors::FatalException.new("Missing dependency: maruku")
-        end
-
-        def load_divs_library
-          require 'maruku/ext/div'
-          STDERR.puts 'Maruku: Using extended syntax for div elements.'
-        end
-
-        def load_blahtext_library
-          require 'maruku/ext/math'
-          STDERR.puts "Maruku: Using LaTeX extension. Images in `#{@config['maruku']['png_dir']}`."
-
-          # Switch off MathML output
-          MaRuKu::Globals[:html_math_output_mathml] = false
-          MaRuKu::Globals[:html_math_engine] = 'none'
-
-          # Turn on math to PNG support with blahtex
-          # Resulting PNGs stored in `images/latex`
-          MaRuKu::Globals[:html_math_output_png] = true
-          MaRuKu::Globals[:html_png_engine] =  @config['maruku']['png_engine']
-          MaRuKu::Globals[:html_png_dir] = @config['maruku']['png_dir']
-          MaRuKu::Globals[:html_png_url] = @config['maruku']['png_url']
-        end
-
-        def print_errors_and_fail
-          print @errors.join
-          raise MaRuKu::Exception, "MaRuKu encountered problem(s) while converting your markup."
-        end
-
-        def convert(content)
-          converted = Maruku.new(content, :error_stream => @errors).to_html.strip
-          print_errors_and_fail unless @errors.empty?
-          converted
-        end
-      end
-    end
-  end
-end

lib/jekyll/converters/markdown/rdiscount_parser.rb

@@ -5,7 +5,7 @@ module Jekyll
         def initialize(config)
           Jekyll::External.require_with_graceful_fail "rdiscount"
           @config = config
-          @rdiscount_extensions = @config['rdiscount']['extensions'].map { |e| e.to_sym }
+          @rdiscount_extensions = @config['rdiscount']['extensions'].map(&:to_sym)
         end
 
         def convert(content)

lib/jekyll/converters/markdown/redcarpet_parser.rb

@@ -2,12 +2,12 @@ module Jekyll
   module Converters
     class Markdown
       class RedcarpetParser
-
         module CommonMethods
           def add_code_tags(code, lang)
             code = code.to_s
             code = code.sub(/<pre>/, "<pre><code class=\"language-#{lang}\" data-lang=\"#{lang}\">")
-            code = code.sub(/<\/pre>/,"</code></pre>")
+            code = code.sub(/<\/pre>/, "</code></pre>")
+            code
           end
         end
 
@@ -29,7 +29,7 @@ module Jekyll
           include CommonMethods
 
           def code_wrap(code)
-            "<div class=\"highlight\"><pre>#{CGI::escapeHTML(code)}</pre></div>"
+            "<figure class=\"highlight\"><pre>#{CGI::escapeHTML(code)}</pre></figure>"
           end
 
           def block_code(code, lang)
@@ -48,12 +48,11 @@ module Jekyll
           end
 
           protected
-          def rouge_formatter(lexer)
+          def rouge_formatter(_lexer)
             Rouge::Formatters::HTML.new(:wrap => false)
           end
         end
 
-
         def initialize(config)
           External.require_with_graceful_fail("redcarpet")
           @config = config
@@ -71,12 +70,12 @@ module Jekyll
             end
           when "rouge"
             Class.new(Redcarpet::Render::HTML) do
-              Jekyll::External.require_with_graceful_fail(%w[
+              Jekyll::External.require_with_graceful_fail(%w(
                 rouge
                 rouge/plugins/redcarpet
-              ])
+              ))
 
-              if Rouge.version < '1.3.0'
+              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
 

lib/jekyll/converters/smartypants.rb

@@ -0,0 +1,34 @@
+class Kramdown::Parser::SmartyPants < Kramdown::Parser::Kramdown
+  def initialize(source, options)
+    super
+    @block_parsers = [:block_html]
+    @span_parsers =  [:smart_quotes, :html_entity, :typographic_syms, :span_html]
+  end
+end
+
+module Jekyll
+  module Converters
+    class SmartyPants < Converter
+      safe true
+      priority :low
+
+      def initialize(config)
+        Jekyll::External.require_with_graceful_fail "kramdown"
+        @config = config["kramdown"].dup || {}
+        @config[:input] = :SmartyPants
+      end
+
+      def matches(_)
+        false
+      end
+
+      def output_ext(_)
+        nil
+      end
+
+      def convert(content)
+        Kramdown::Document.new(content, @config).to_html.chomp
+      end
+    end
+  end
+end

lib/jekyll/converters/textile.rb

@@ -1,56 +0,0 @@
-module Jekyll
-  module Converters
-    class Textile < Converter
-      safe true
-
-      highlighter_prefix '<notextile>'
-      highlighter_suffix '</notextile>'
-
-      def setup
-        return if @setup
-        require 'redcloth'
-        @setup = true
-      rescue LoadError
-        STDERR.puts 'You are missing a library required for Textile. Please run:'
-        STDERR.puts '  $ [sudo] gem install RedCloth'
-        raise Errors::FatalException.new("Missing dependency: RedCloth")
-      end
-
-      def extname_matches_regexp
-        @extname_matches_regexp ||= Regexp.new(
-          '(' + @config['textile_ext'].gsub(',','|') +')$',
-          Regexp::IGNORECASE
-        )
-      end
-
-      def matches(ext)
-        ext =~ extname_matches_regexp
-      end
-
-      def output_ext(ext)
-        ".html"
-      end
-
-      def convert(content)
-        setup
-
-        # Shortcut if config doesn't contain RedCloth section
-        return RedCloth.new(content).to_html if @config['redcloth'].nil?
-
-        # List of attributes defined on RedCloth
-        # (from https://github.com/jgarber/redcloth/blob/master/lib/redcloth/textile_doc.rb)
-        attrs = ['filter_classes', 'filter_html', 'filter_ids', 'filter_styles',
-                'hard_breaks', 'lite_mode', 'no_span_caps', 'sanitize_html']
-
-        r = RedCloth.new(content)
-
-        # Set attributes in r if they are NOT nil in the config
-        attrs.each do |attr|
-          r.instance_variable_set("@#{attr}".to_sym, @config['redcloth'][attr]) unless @config['redcloth'][attr].nil?
-        end
-
-        r.to_html
-      end
-    end
-  end
-end

lib/jekyll/convertible.rb

@@ -28,12 +28,6 @@ module Jekyll
       !(data.key?('published') && data['published'] == false)
     end
 
-    # Returns merged option hash for File.read of self.site (if exists)
-    # and a given param
-    def merged_file_read_opts(opts)
-      (site ? site.file_read_opts : {}).merge(opts)
-    end
-
     # Read the YAML frontmatter.
     #
     # base - The String path to the dir containing the file.
@@ -42,20 +36,39 @@ module Jekyll
     #
     # Returns nothing.
     def read_yaml(base, name, opts = {})
+      filename = File.join(base, name)
+
       begin
         self.content = File.read(site.in_source_dir(base, name),
-                                 merged_file_read_opts(opts))
+                                 Utils.merged_file_read_opts(site, opts))
         if content =~ /\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)/m
           self.content = $POSTMATCH
-          self.data = SafeYAML.load($1)
+          self.data = SafeYAML.load(Regexp.last_match(1))
         end
       rescue SyntaxError => e
-        Jekyll.logger.warn "YAML Exception reading #{File.join(base, name)}: #{e.message}"
+        Jekyll.logger.warn "YAML Exception reading #{filename}: #{e.message}"
       rescue Exception => e
-        Jekyll.logger.warn "Error reading file #{File.join(base, name)}: #{e.message}"
+        Jekyll.logger.warn "Error reading file #{filename}: #{e.message}"
       end
 
       self.data ||= {}
+
+      validate_data! filename
+      validate_permalink! filename
+
+      self.data
+    end
+
+    def validate_data!(filename)
+      unless self.data.is_a?(Hash)
+        raise Errors::InvalidYAMLFrontMatterError, "Invalid YAML front matter in #{filename}"
+      end
+    end
+
+    def validate_permalink!(filename)
+      if self.data['permalink'] && self.data['permalink'].size == 0
+        raise Errors::InvalidPermalinkError, "Invalid permalink in #{filename}"
+      end
     end
 
     # Transform the contents based on the content type.
@@ -78,13 +91,7 @@ module Jekyll
     # Returns the String extension for the output file.
     #   e.g. ".html" for an HTML output file.
     def output_ext
-      if converters.all? { |c| c.is_a?(Jekyll::Converters::Identity) }
-        ext
-      else
-        converters.map { |c|
-          c.output_ext(ext) unless c.is_a?(Jekyll::Converters::Identity)
-        }.compact.last
-      end
+      Jekyll::Renderer.new(site, self).output_ext
     end
 
     # Determine which converter to use based on this convertible's
@@ -102,8 +109,8 @@ module Jekyll
     # info    - the info for Liquid
     #
     # Returns the converted content
-    def render_liquid(content, payload, info, path = nil)
-      Liquid::Template.parse(content).render!(payload, info)
+    def render_liquid(content, payload, info, path)
+      site.liquid_renderer.file(path).parse(content).render!(payload, info)
     rescue Tags::IncludeTagError => e
       Jekyll.logger.error "Liquid Exception:", "#{e.message} in #{e.path}, included in #{path || self.path}"
       raise e
@@ -116,9 +123,9 @@ module Jekyll
     #
     # Returns the Hash representation of this Convertible.
     def to_liquid(attrs = nil)
-      further_data = Hash[(attrs || self.class::ATTRIBUTES_FOR_LIQUID).map { |attribute|
+      further_data = Hash[(attrs || self.class::ATTRIBUTES_FOR_LIQUID).map do |attribute|
         [attribute, send(attribute)]
-      }]
+      end]
 
       defaults = site.frontmatter_defaults.all(relative_path, type)
       Utils.deep_merge_hashes defaults, Utils.deep_merge_hashes(data, further_data)
@@ -129,11 +136,14 @@ module Jekyll
     #
     # Returns the type of self.
     def type
-      if is_a?(Draft)
-        :drafts
-      elsif is_a?(Post)
-        :posts
-      elsif is_a?(Page)
+      if is_a?(Page)
+        :pages
+      end
+    end
+
+    # returns the owner symbol for hook triggering
+    def hook_owner
+      if is_a?(Page)
         :pages
       end
     end
@@ -151,7 +161,7 @@ module Jekyll
     #
     # Returns true if extname == .sass or .scss, false otherwise.
     def sass_file?
-      %w[.sass .scss].include?(ext)
+      %w(.sass .scss).include?(ext)
     end
 
     # Determine whether the document is a CoffeeScript file.
@@ -168,15 +178,6 @@ module Jekyll
       true
     end
 
-    # Determine whether to regenerate the file based on metadata.
-    #
-    # Returns true if file needs to be regenerated
-    def regenerate?
-      asset_file? ||
-        data['regenerate'] ||
-        site.metadata.regenerate?(site.in_source_dir(relative_path))
-    end
-
     # Determine whether the file should be placed into layouts.
     #
     # Returns false if the document is an asset file.
@@ -208,16 +209,21 @@ module Jekyll
 
       used = Set.new([layout])
 
+      # Reset the payload layout data to ensure it starts fresh for each page.
+      payload["layout"] = nil
+
       while layout
-        payload = Utils.deep_merge_hashes(payload, {"content" => output, "page" => layout.data})
+        Jekyll.logger.debug "Rendering Layout:", path
+        payload["content"] = output
+        payload["layout"]  = Utils.deep_merge_hashes(layout.data, payload["layout"] || {})
 
         self.output = render_liquid(layout.content,
                                          payload,
                                          info,
-                                         File.join(site.config['layouts'], layout.name))
+                                         File.join(site.config['layouts_dir'], layout.name))
 
         # Add layout to dependency tree
-        site.metadata.add_dependency(
+        site.regenerator.add_dependency(
           site.in_source_dir(path),
           site.in_source_dir(layout.path)
         )
@@ -234,24 +240,34 @@ module Jekyll
 
     # Add any necessary layouts to this convertible document.
     #
-    # payload - The site payload Hash.
+    # payload - The site payload Drop or Hash.
     # layouts - A Hash of {"name" => "layout"}.
     #
     # Returns nothing.
     def do_layout(payload, layouts)
-      info = { :filters => [Jekyll::Filters], :registers => { :site => site, :page => payload['page'] } }
+      Jekyll.logger.debug "Rendering:", self.relative_path
+
+      Jekyll.logger.debug "Pre-Render Hooks:", self.relative_path
+      Jekyll::Hooks.trigger hook_owner, :pre_render, self, payload
+      info = { :filters => [Jekyll::Filters], :registers => { :site => site, :page => payload["page"] } }
 
       # render and transform content (this becomes the final content of the object)
       payload["highlighter_prefix"] = converters.first.highlighter_prefix
       payload["highlighter_suffix"] = converters.first.highlighter_suffix
 
-      self.content = render_liquid(content, payload, info) if render_with_liquid?
+      if render_with_liquid?
+        Jekyll.logger.debug "Rendering Liquid:", self.relative_path
+        self.content = render_liquid(content, payload, info, path)
+      end
+      Jekyll.logger.debug "Rendering Markup:", self.relative_path
       self.content = transform
 
       # output keeps track of what will finally be written
       self.output = content
 
       render_all_layouts(layouts, payload, info) if place_in_layout?
+      Jekyll.logger.debug "Post-Render Hooks:", self.relative_path
+      Jekyll::Hooks.trigger hook_owner, :post_render, self
     end
 
     # Write the generated page file to the destination directory.
@@ -265,6 +281,7 @@ module Jekyll
       File.open(path, 'wb') do |f|
         f.write(output)
       end
+      Jekyll::Hooks.trigger hook_owner, :post_write, self
     end
 
     # Accessor for data properties by Liquid.

lib/jekyll/deprecator.rb

@@ -3,9 +3,10 @@ module Jekyll
     extend self
 
     def process(args)
-      no_subcommand(args)
       arg_is_present? args, "--server", "The --server command has been replaced by the \
                           'serve' subcommand."
+      arg_is_present? args, "--serve", "The --server command has been replaced by the \
+                          'serve' subcommand."
       arg_is_present? args, "--no-server", "To build Jekyll without launching a server, \
                           use the 'build' subcommand."
       arg_is_present? args, "--auto", "The switch '--auto' has been replaced with '--watch'."
@@ -16,12 +17,13 @@ module Jekyll
       arg_is_present? args, "--paginate", "The 'paginate' setting can only be set in your \
                           config files."
       arg_is_present? args, "--url", "The 'url' setting can only be set in your config files."
+      no_subcommand(args)
     end
 
     def no_subcommand(args)
-      if args.size > 0 && args.first =~ /^--/ && !%w[--help --version].include?(args.first)
-        deprecation_message "Jekyll now uses subcommands instead of just \
-                            switches. Run `jekyll --help' to find out more."
+      if args.size > 0 && args.first =~ /^--/ && !%w(--help --version).include?(args.first)
+        deprecation_message "Jekyll now uses subcommands instead of just switches. Run `jekyll help` to find out more."
+        abort
       end
     end
 

lib/jekyll/document.rb

@@ -4,21 +4,39 @@ module Jekyll
   class Document
     include Comparable
 
-    attr_reader   :path, :site, :extname
-    attr_accessor :content, :collection, :output
+    attr_reader :path, :site, :extname, :collection
+    attr_accessor :content, :output
+
+    YAML_FRONT_MATTER_REGEXP = /\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)/m
+    DATELESS_FILENAME_MATCHER = /^(.+\/)*(.*)(\.[^.]+)$/
+    DATE_FILENAME_MATCHER = /^(.+\/)*(\d+-\d+-\d+)-(.*)(\.[^.]+)$/
 
     # Create a new Document.
     #
-    # site - the Jekyll::Site instance to which this Document belongs
     # path - the path to the file
+    # relations - a hash with keys :site and :collection, the values of which
+    #             are the Jekyll::Site and Jekyll::Collection to which this
+    #             Document belong.
     #
     # Returns nothing.
-    def initialize(path, relations)
+    def initialize(path, relations = {})
       @site = relations[:site]
       @path = path
       @extname = File.extname(path)
       @collection = relations[:collection]
       @has_yaml_header = nil
+
+      if draft?
+        categories_from_path("_drafts")
+      else
+        categories_from_path(collection.relative_directory)
+      end
+
+      data.default_proc = proc do |_, key|
+        site.frontmatter_defaults.find(relative_path, collection.label, key)
+      end
+
+      trigger_hooks(:post_init)
     end
 
     # Fetch the Document's data.
@@ -26,7 +44,40 @@ module Jekyll
     # Returns a Hash containing the data. An empty hash is returned if
     #   no data was read.
     def data
-      @data ||= Hash.new
+      @data ||= {}
+    end
+
+    # Merge some data in with this document's data.
+    #
+    # Returns the merged data.
+    def merge_data!(other, source: "YAML front matter")
+      if other.key?('categories') && !other['categories'].nil?
+        if other['categories'].is_a?(String)
+          other['categories'] = other['categories'].split(" ").map(&:strip)
+        end
+        other['categories'] = (data['categories'] || []) | other['categories']
+      end
+      Utils.deep_merge_hashes!(data, other)
+      if data.key?('date') && !data['date'].is_a?(Time)
+        data['date'] = Utils.parse_date(
+          data['date'].to_s,
+          "Document '#{relative_path}' does not have a valid date in the #{source}."
+        )
+      end
+      data
+    end
+
+    def date
+      data['date'] ||= site.time
+    end
+
+    # Returns whether the document is a draft. This is only the case if
+    # the document is in the 'posts' collection but in a different
+    # directory than '_posts'.
+    #
+    # Returns whether the document is a draft.
+    def draft?
+      data['draft'] ||= relative_path.index(collection.relative_directory).nil? && collection.label == "posts"
     end
 
     # The path to the document, relative to the site source.
@@ -37,6 +88,13 @@ module Jekyll
       @relative_path ||= Pathname.new(path).relative_path_from(Pathname.new(site.source)).to_s
     end
 
+    # The output extension of the document.
+    #
+    # Returns the output extension
+    def output_ext
+      Jekyll::Renderer.new(site, self).output_ext
+    end
+
     # The base filename of the document, without the file extname.
     #
     # Returns the basename without the file extname.
@@ -64,14 +122,14 @@ module Jekyll
     # Returns the cleaned relative path of the document.
     def cleaned_relative_path
       @cleaned_relative_path ||=
-        relative_path[0 .. -extname.length - 1].sub(collection.relative_directory, "")
+        relative_path[0..-extname.length - 1].sub(collection.relative_directory, "")
     end
 
     # Determine whether the document is a YAML file.
     #
     # Returns true if the extname is either .yml or .yaml, false otherwise.
     def yaml_file?
-      %w[.yaml .yml].include?(extname)
+      %w(.yaml .yml).include?(extname)
     end
 
     # Determine whether the document is an asset file.
@@ -87,7 +145,7 @@ module Jekyll
     #
     # Returns true if extname == .sass or .scss, false otherwise.
     def sass_file?
-      %w[.sass .scss].include?(extname)
+      %w(.sass .scss).include?(extname)
     end
 
     # Determine whether the document is a CoffeeScript file.
@@ -105,13 +163,6 @@ module Jekyll
       !(coffeescript_file? || yaml_file?)
     end
 
-    # Determine whether the document should be regenerated based on metadata.
-    #
-    # Returns true if the document needs to be regenerated.
-    def regenerate?
-      data['regenerate'] || site.metadata.regenerate?(path, write?)
-    end
-
     # Determine whether the file should be placed into layouts.
     #
     # Returns false if the document is either an asset file or a yaml file,
@@ -132,13 +183,7 @@ module Jekyll
     #
     # Returns the Hash of key-value pairs for replacement in the URL.
     def url_placeholders
-      {
-        collection: collection.label,
-        path:       cleaned_relative_path,
-        output_ext: Jekyll::Renderer.new(site, self).output_ext,
-        name:       Utils.slugify(basename_without_ext),
-        title:      Utils.slugify(data['title']) || Utils.slugify(basename_without_ext)
-      }
+      @url_placeholders ||= Drops::UrlDrop.new(self)
     end
 
     # The permalink for this Document.
@@ -154,12 +199,16 @@ module Jekyll
     # Returns the computed URL for the document.
     def url
       @url = URL.new({
-        template:     url_template,
-        placeholders: url_placeholders,
-        permalink:    permalink
+        :template => url_template,
+        :placeholders => url_placeholders,
+        :permalink => permalink
       }).to_s
     end
 
+    def [](key)
+      data[key]
+    end
+
     # The full path to the output file.
     #
     # base_directory - the base path of the output directory
@@ -168,7 +217,11 @@ module Jekyll
     def destination(base_directory)
       dest = site.in_dest_dir(base_directory)
       path = site.in_dest_dir(dest, URL.unescape_path(url))
-      path = File.join(path, "index.html") if url =~ /\/$/
+      if url.end_with? "/"
+        path = File.join(path, "index.html")
+      else
+        path << output_ext unless path.end_with? output_ext
+      end
       path
     end
 
@@ -183,16 +236,8 @@ module Jekyll
       File.open(path, 'wb') do |f|
         f.write(output)
       end
-    end
 
-    # Returns merged option hash for File.read of self.site (if exists)
-    # and a given param
-    #
-    # opts - override options
-    #
-    # Return the file read options hash.
-    def merged_file_read_opts(opts)
-      site ? site.file_read_opts.merge(opts) : opts
+      trigger_hooks(:post_write)
     end
 
     # Whether the file is published or not, as indicated in YAML front-matter
@@ -208,46 +253,86 @@ module Jekyll
     #
     # Returns nothing.
     def read(opts = {})
+      Jekyll.logger.debug "Reading:", relative_path
+
       if yaml_file?
         @data = SafeYAML.load_file(path)
       else
         begin
-          defaults = @site.frontmatter_defaults.all(url, collection.label.to_sym)
-          unless defaults.empty?
-            @data = defaults
-          end
-          @content = File.read(path, merged_file_read_opts(opts))
-          if content =~ /\A(---\s*\n.*?\n?)^(---\s*$\n?)/m
-            @content = $POSTMATCH
-            data_file = SafeYAML.load($1)
-            unless data_file.nil?
-              @data = Utils.deep_merge_hashes(defaults, data_file)
-            end
+          defaults = @site.frontmatter_defaults.all(relative_path, collection.label.to_sym)
+          merge_data!(defaults, source: "front matter defaults") unless defaults.empty?
+
+          self.content = File.read(path, Utils.merged_file_read_opts(site, opts))
+          if content =~ YAML_FRONT_MATTER_REGEXP
+            self.content = $POSTMATCH
+            data_file = SafeYAML.load(Regexp.last_match(1))
+            merge_data!(data_file, source: "YAML front matter") if data_file
           end
+
+          post_read
         rescue SyntaxError => e
-          puts "YAML Exception reading #{path}: #{e.message}"
+          Jekyll.logger.error "Error:", "YAML Exception reading #{path}: #{e.message}"
         rescue Exception => e
-          puts "Error reading file #{path}: #{e.message}"
+          if e.is_a? Jekyll::Errors::FatalException
+            raise e
+          end
+          Jekyll.logger.error "Error:", "could not read file #{path}: #{e.message}"
         end
       end
     end
 
+    def post_read
+      if relative_path =~ DATE_FILENAME_MATCHER
+        date, slug, ext = $2, $3, $4
+        if !data['date'] || data['date'].to_i == site.time.to_i
+          merge_data!({"date" => date}, source: "filename")
+        end
+      elsif relative_path =~ DATELESS_FILENAME_MATCHER
+        slug, ext = $2, $3
+      end
+
+      # Try to ensure the user gets a title.
+      data["title"] ||= Utils.titleize_slug(slug)
+      # Only overwrite slug & ext if they aren't specified.
+      data['slug'] ||= slug
+      data['ext']  ||= ext
+
+      populate_categories
+      populate_tags
+      generate_excerpt
+    end
+
+    # Add superdirectories of the special_dir to categories.
+    # In the case of es/_posts, 'es' is added as a category.
+    # In the case of _posts/es, 'es' is NOT added as a category.
+    #
+    # Returns nothing.
+    def categories_from_path(special_dir)
+      superdirs = relative_path.sub(/#{special_dir}(.*)/, '').split(File::SEPARATOR).reject do |c|
+        c.empty? || c.eql?(special_dir) || c.eql?(basename)
+      end
+      merge_data!({ 'categories' => superdirs }, source: "file path")
+    end
+
+    def populate_categories
+      merge_data!({
+        'categories' => (
+          Array(data['categories']) + Utils.pluralized_array_from_hash(data, 'category', 'categories')
+        ).map(&:to_s).flatten.uniq
+      })
+    end
+
+    def populate_tags
+      merge_data!({
+        "tags" => Utils.pluralized_array_from_hash(data, "tag", "tags").flatten
+      })
+    end
+
     # Create a Liquid-understandable version of this Document.
     #
     # Returns a Hash representing this Document's data.
     def to_liquid
-      if data.is_a?(Hash)
-        Utils.deep_merge_hashes data, {
-          "output"        => output,
-          "content"       => content,
-          "relative_path" => relative_path,
-          "path"          => relative_path,
-          "url"           => url,
-          "collection"    => collection.label
-        }
-      else
-        data
-      end
+      @to_liquid ||= Drops::DocumentDrop.new(self)
     end
 
     # The inspect string for this document.
@@ -262,7 +347,7 @@ module Jekyll
     #
     # Returns the content of the document
     def to_s
-      content || ''
+      output || content || 'NO CONTENT'
     end
 
     # Compare this document against another document.
@@ -270,8 +355,11 @@ module Jekyll
     #
     # Returns -1, 0, +1 or nil depending on whether this doc's path is less than,
     #   equal or greater than the other doc's path. See String#<=> for more details.
-    def <=>(anotherDocument)
-      path <=> anotherDocument.path
+    def <=>(other)
+      return nil unless other.respond_to?(:data)
+      cmp = data['date'] <=> other.data['date']
+      cmp = path <=> other.path if cmp.nil? || cmp == 0
+      cmp
     end
 
     # Determine whether this document should be written.
@@ -283,5 +371,77 @@ module Jekyll
       collection && collection.write?
     end
 
+    # The Document excerpt_separator, from the YAML Front-Matter or site
+    # default excerpt_separator value
+    #
+    # Returns the document excerpt_separator
+    def excerpt_separator
+      (data['excerpt_separator'] || site.config['excerpt_separator']).to_s
+    end
+
+    # Whether to generate an excerpt
+    #
+    # Returns true if the excerpt separator is configured.
+    def generate_excerpt?
+      !excerpt_separator.empty?
+    end
+
+    def next_doc
+      pos = collection.docs.index { |post| post.equal?(self) }
+      if pos && pos < collection.docs.length - 1
+        collection.docs[pos + 1]
+      else
+        nil
+      end
+    end
+
+    def previous_doc
+      pos = collection.docs.index { |post| post.equal?(self) }
+      if pos && pos > 0
+        collection.docs[pos - 1]
+      else
+        nil
+      end
+    end
+
+    def trigger_hooks(hook_name, *args)
+      Jekyll::Hooks.trigger collection.label.to_sym, hook_name, self, *args if collection
+      Jekyll::Hooks.trigger :documents, hook_name, self, *args
+    end
+
+    def id
+      @id ||= File.join(File.dirname(url), (data['slug'] || basename_without_ext).to_s)
+    end
+
+    # Calculate related posts.
+    #
+    # Returns an Array of related Posts.
+    def related_posts
+      Jekyll::RelatedPosts.new(self).build
+    end
+
+    # Override of normal respond_to? to match method_missing's logic for
+    # looking in @data.
+    def respond_to?(method, include_private = false)
+      data.key?(method.to_s) || super
+    end
+
+    # Override of method_missing to check in @data for the key.
+    def method_missing(method, *args, &blck)
+      if data.key?(method.to_s)
+        Jekyll.logger.warn "Deprecation:", "Document##{method} is now a key in the #data hash."
+        Jekyll.logger.warn "", "Called by #{caller.first}."
+        data[method.to_s]
+      else
+        super
+      end
+    end
+
+    private # :nodoc:
+    def generate_excerpt
+      if generate_excerpt?
+        data["excerpt"] ||= Jekyll::Excerpt.new(self)
+      end
+    end
   end
 end

lib/jekyll/draft.rb

@@ -1,40 +0,0 @@
-module Jekyll
-
-  class Draft < Post
-
-    # Valid post name regex (no date)
-    MATCHER = /^(.*)(\.[^.]+)$/
-
-    # Draft name validator. Draft filenames must be like:
-    # my-awesome-post.textile
-    #
-    # Returns true if valid, false if not.
-    def self.valid?(name)
-      name =~ MATCHER
-    end
-
-    # Get the full path to the directory containing the draft files
-    def containing_dir(dir)
-      site.in_source_dir(dir, '_drafts')
-    end
-
-    # The path to the draft source file, relative to the site source
-    def relative_path
-      File.join(@dir, '_drafts', @name)
-    end
-
-    # Extract information from the post filename.
-    #
-    # name - The String filename of the post file.
-    #
-    # Returns nothing.
-    def process(name)
-      m, slug, ext = *name.match(MATCHER)
-      self.date = File.mtime(File.join(@base, name))
-      self.slug = slug
-      self.ext = ext
-    end
-
-  end
-
-end

lib/jekyll/drops/collection_drop.rb

@@ -0,0 +1,22 @@
+# encoding: UTF-8
+
+module Jekyll
+  module Drops
+    class CollectionDrop < Drop
+      extend Forwardable
+
+      mutable false
+
+      def_delegator :@obj, :write?, :output
+      def_delegators :@obj, :label, :docs, :files, :directory,
+                            :relative_directory
+
+      def to_s
+        docs.to_s
+      end
+
+      private
+      def_delegator :@obj, :metadata, :fallback_data
+    end
+  end
+end

lib/jekyll/drops/document_drop.rb

@@ -0,0 +1,60 @@
+# encoding: UTF-8
+
+module Jekyll
+  module Drops
+    class DocumentDrop < Drop
+      extend Forwardable
+
+      NESTED_OBJECT_FIELD_BLACKLIST = %w{
+        content output excerpt next previous
+      }.freeze
+
+      mutable false
+
+      def_delegator :@obj, :relative_path, :path
+      def_delegators :@obj, :id, :output, :content, :to_s, :relative_path, :url
+
+      def collection
+        @obj.collection.label
+      end
+
+      def excerpt
+        fallback_data['excerpt'].to_s
+      end
+
+      def previous
+        @obj.previous_doc.to_liquid
+      end
+
+      def next
+        @obj.next_doc.to_liquid
+      end
+
+      # Generate a Hash for use in generating JSON.
+      # This is useful if fields need to be cleared before the JSON can generate.
+      #
+      # Returns a Hash ready for JSON generation.
+      def hash_for_json(state = nil)
+        to_h.tap do |hash|
+          if state && state.depth >= 2
+            hash["previous"] = collapse_document(hash["previous"]) if hash["previous"]
+            hash["next"]     = collapse_document(hash["next"]) if hash["next"]
+          end
+        end
+      end
+
+      # Generate a Hash which breaks the recursive chain.
+      # Certain fields which are normally available are omitted.
+      #
+      # Returns a Hash with only non-recursive fields present.
+      def collapse_document(doc)
+        doc.keys.each_with_object({}) do |(key, _), result|
+          result[key] = doc[key] unless NESTED_OBJECT_FIELD_BLACKLIST.include?(key)
+        end
+      end
+
+      private
+      def_delegator :@obj, :data, :fallback_data
+    end
+  end
+end

lib/jekyll/drops/drop.rb

@@ -0,0 +1,200 @@
+# encoding: UTF-8
+
+module Jekyll
+  module Drops
+    class Drop < Liquid::Drop
+      include Enumerable
+
+      NON_CONTENT_METHODS = [:fallback_data, :collapse_document].freeze
+
+      # Get or set whether the drop class is mutable.
+      # Mutability determines whether or not pre-defined fields may be
+      # overwritten.
+      #
+      # is_mutable - Boolean set mutability of the class (default: nil)
+      #
+      # Returns the mutability of the class
+      def self.mutable(is_mutable = nil)
+        if is_mutable
+          @is_mutable = is_mutable
+        else
+          @is_mutable = false
+        end
+      end
+
+      def self.mutable?
+        @is_mutable
+      end
+
+      # Create a new Drop
+      #
+      # obj - the Jekyll Site, Collection, or Document required by the
+      # drop.
+      #
+      # Returns nothing
+      def initialize(obj)
+        @obj = obj
+        @mutations = {} # only if mutable: true
+      end
+
+      # Access a method in the Drop or a field in the underlying hash data.
+      # If mutable, checks the mutations first. Then checks the methods,
+      # and finally check the underlying hash (e.g. document front matter)
+      # if all the previous places didn't match.
+      #
+      # key - the string key whose value to fetch
+      #
+      # Returns the value for the given key, or nil if none exists
+      def [](key)
+        if self.class.mutable? && @mutations.key?(key)
+          @mutations[key]
+        elsif self.class.invokable? key
+          public_send key
+        else
+          fallback_data[key]
+        end
+      end
+
+      # Set a field in the Drop. If mutable, sets in the mutations and
+      # returns. If not mutable, checks first if it's trying to override a
+      # Drop method and raises a DropMutationException if so. If not
+      # mutable and the key is not a method on the Drop, then it sets the
+      # key to the value in the underlying hash (e.g. document front
+      # matter)
+      #
+      # key - the String key whose value to set
+      # val - the Object to set the key's value to
+      #
+      # Returns the value the key was set to unless the Drop is not mutable
+      # and the key matches a method in which case it raises a
+      # DropMutationException.
+      def []=(key, val)
+        if respond_to?("#{key}=")
+          public_send("#{key}=", val)
+        elsif respond_to? key
+          if self.class.mutable?
+            @mutations[key] = val
+          else
+            raise Errors::DropMutationException, "Key #{key} cannot be set in the drop."
+          end
+        else
+          fallback_data[key] = val
+        end
+      end
+
+      # Generates a list of strings which correspond to content getter
+      # methods.
+      #
+      # Returns an Array of strings which represent method-specific keys.
+      def content_methods
+        @content_methods ||= (
+          self.class.instance_methods - Jekyll::Drops::Drop.instance_methods - NON_CONTENT_METHODS
+        ).map(&:to_s).reject do |method|
+          method.end_with?("=")
+        end
+      end
+
+      # Check if key exists in Drop
+      #
+      # key - the string key whose value to fetch
+      #
+      # Returns true if the given key is present
+      def key?(key)
+        if self.class.mutable && @mutations.key?(key)
+          true
+        else
+          respond_to?(key) || fallback_data.key?(key)
+        end
+      end
+
+      # Generates a list of keys with user content as their values.
+      # This gathers up the Drop methods and keys of the mutations and
+      # underlying data hashes and performs a set union to ensure a list
+      # of unique keys for the Drop.
+      #
+      # Returns an Array of unique keys for content for the Drop.
+      def keys
+        (content_methods |
+          @mutations.keys |
+          fallback_data.keys).flatten
+      end
+
+      # Generate a Hash representation of the Drop by resolving each key's
+      # value. It includes Drop methods, mutations, and the underlying object's
+      # data. See the documentation for Drop#keys for more.
+      #
+      # Returns a Hash with all the keys and values resolved.
+      def to_h
+        keys.each_with_object({}) do |(key, _), result|
+          result[key] = self[key]
+        end
+      end
+      alias_method :to_hash, :to_h
+
+      # Inspect the drop's keys and values through a JSON representation
+      # of its keys and values.
+      #
+      # Returns a pretty generation of the hash representation of the Drop.
+      def inspect
+        require 'json'
+        JSON.pretty_generate to_h
+      end
+
+      # Generate a Hash for use in generating JSON.
+      # This is useful if fields need to be cleared before the JSON can generate.
+      #
+      # Returns a Hash ready for JSON generation.
+      def hash_for_json(state = nil)
+        to_h
+      end
+
+      # Generate a JSON representation of the Drop.
+      #
+      # Returns a JSON representation of the Drop in a String.
+      def to_json(state = nil)
+        require 'json'
+        JSON.generate(hash_for_json(state), state)
+      end
+
+      # Collects all the keys and passes each to the block in turn.
+      #
+      # block - a block which accepts one argument, the key
+      #
+      # Returns nothing.
+      def each_key(&block)
+        keys.each(&block)
+      end
+
+      def each(&block)
+        each_key.each do |key|
+          yield key, self[key]
+        end
+      end
+
+      def merge(other, &block)
+        self.dup.tap do |me|
+          if block.nil?
+            me.merge!(other)
+          else
+            me.merge!(other, block)
+          end
+        end
+      end
+
+      def merge!(other)
+        other.each_key do |key|
+          if block_given?
+            self[key] = yield key, self[key], other[key]
+          else
+            if Utils.mergable?(self[key]) && Utils.mergable?(other[key])
+              self[key] = Utils.deep_merge_hashes(self[key], other[key])
+              next
+            end
+
+            self[key] = other[key] unless other[key].nil?
+          end
+        end
+      end
+    end
+  end
+end

lib/jekyll/drops/excerpt_drop.rb

@@ -0,0 +1,15 @@
+# encoding: UTF-8
+
+module Jekyll
+  module Drops
+    class ExcerptDrop < DocumentDrop
+      def layout
+        @obj.doc.data['layout']
+      end
+
+      def excerpt
+        nil
+      end
+    end
+  end
+end

lib/jekyll/drops/jekyll_drop.rb

@@ -0,0 +1,33 @@
+# encoding: UTF-8
+
+module Jekyll
+  module Drops
+    class JekyllDrop < Liquid::Drop
+      class << self
+        def global
+          @global ||= JekyllDrop.new
+        end
+      end
+
+      def version
+        Jekyll::VERSION
+      end
+
+      def environment
+        Jekyll.env
+      end
+
+      def to_h
+        @to_h ||= {
+          "version" => version,
+          "environment" => environment
+        }
+      end
+
+      def to_json(state = nil)
+        require 'json'
+        JSON.generate(to_h, state)
+      end
+    end
+  end
+end

lib/jekyll/drops/site_drop.rb

@@ -0,0 +1,38 @@
+# encoding: UTF-8
+
+module Jekyll
+  module Drops
+    class SiteDrop < Drop
+      extend Forwardable
+
+      mutable false
+
+      def_delegator  :@obj, :site_data, :data
+      def_delegators :@obj, :time, :pages, :static_files, :documents,
+                            :tags, :categories
+
+      def [](key)
+        if @obj.collections.key?(key) && key != "posts"
+          @obj.collections[key].docs
+        else
+          super(key)
+        end
+      end
+
+      def posts
+        @site_posts ||= @obj.posts.docs.sort { |a, b| b <=> a }
+      end
+
+      def html_pages
+        @site_html_pages ||= @obj.pages.select { |page| page.html? || page.url.end_with?("/") }
+      end
+
+      def collections
+        @site_collections ||= @obj.collections.values.sort_by(&:label).map(&:to_liquid)
+      end
+
+      private
+      def_delegator :@obj, :config, :fallback_data
+    end
+  end
+end

lib/jekyll/drops/unified_payload_drop.rb

@@ -0,0 +1,25 @@
+# encoding: UTF-8
+
+module Jekyll
+  module Drops
+    class UnifiedPayloadDrop < Drop
+      mutable true
+
+      attr_accessor :page, :layout, :content, :paginator
+      attr_accessor :highlighter_prefix, :highlighter_suffix
+
+      def jekyll
+        JekyllDrop.global
+      end
+
+      def site
+        @site_drop ||= SiteDrop.new(@obj)
+      end
+
+      private
+      def fallback_data
+        @fallback_data ||= {}
+      end
+    end
+  end
+end

lib/jekyll/drops/url_drop.rb

@@ -0,0 +1,83 @@
+# encoding: UTF-8
+
+module Jekyll
+  module Drops
+    class UrlDrop < Drop
+      extend Forwardable
+
+      mutable false
+
+      def_delegator :@obj, :cleaned_relative_path, :path
+      def_delegator :@obj, :output_ext, :output_ext
+
+      def collection
+        @obj.collection.label
+      end
+
+      def name
+        Utils.slugify(@obj.basename_without_ext)
+      end
+
+      def title
+        Utils.slugify(@obj.data['slug'], :mode => "pretty", :cased => true) ||
+          Utils.slugify(@obj.basename_without_ext, :mode => "pretty", :cased => true)
+      end
+
+      def slug
+        Utils.slugify(@obj.data['slug']) || Utils.slugify(@obj.basename_without_ext)
+      end
+
+      def categories
+        category_set = Set.new
+        Array(@obj.data['categories']).each do |category|
+          category_set << category.to_s.downcase
+        end
+        category_set.to_a.join('/')
+      end
+
+      def year
+        @obj.date.strftime("%Y")
+      end
+
+      def month
+        @obj.date.strftime("%m")
+      end
+
+      def day
+        @obj.date.strftime("%d")
+      end
+
+      def hour
+        @obj.date.strftime("%H")
+      end
+
+      def minute
+        @obj.date.strftime("%M")
+      end
+
+      def second
+        @obj.date.strftime("%S")
+      end
+
+      def i_day
+        @obj.date.strftime("%-d")
+      end
+
+      def i_month
+        @obj.date.strftime("%-m")
+      end
+
+      def short_month
+        @obj.date.strftime("%b")
+      end
+
+      def short_year
+        @obj.date.strftime("%y")
+      end
+
+      def y_day
+        @obj.date.strftime("%j")
+      end
+    end
+  end
+end

lib/jekyll/entry_filter.rb

@@ -47,7 +47,7 @@ module Jekyll
 
     def excluded?(entry)
       excluded = glob_include?(site.exclude, relative_to_source(entry))
-      Jekyll.logger.debug "EntryFilter:", "excluded?(#{relative_to_source(entry)}) ==> #{excluded}"
+      Jekyll.logger.debug "EntryFilter:", "excluded #{relative_to_source(entry)}" if excluded
       excluded
     end
 

lib/jekyll/errors.rb

@@ -1,9 +1,10 @@
 module Jekyll
   module Errors
-    class FatalException < RuntimeError
-    end
+    FatalException = Class.new(::RuntimeError)
 
-    class MissingDependencyException < FatalException
-    end
+    DropMutationException       = Class.new(FatalException)
+    InvalidPermalinkError       = Class.new(FatalException)
+    InvalidYAMLFrontMatterError = Class.new(FatalException)
+    MissingDependencyException  = Class.new(FatalException)
   end
 end

lib/jekyll/excerpt.rb

@@ -1,47 +1,42 @@
-require 'forwardable'
-
 module Jekyll
   class Excerpt
-    include Convertible
     extend Forwardable
 
-    attr_accessor :post
-    attr_accessor :content, :output, :ext
+    attr_accessor :doc
+    attr_accessor :content, :ext
+    attr_writer   :output
 
-    def_delegator :@post, :site, :site
-    def_delegator :@post, :name, :name
-    def_delegator :@post, :ext,  :ext
+    def_delegators :@doc, :site, :name, :ext, :relative_path, :extname,
+                          :render_with_liquid?, :collection, :related_posts, :url
 
-    # Initialize this Post instance.
+    # Initialize this Excerpt instance.
     #
-    # site       - The Site.
-    # base       - The String path to the dir containing the post file.
-    # name       - The String filename of the post file.
+    # doc - The Document.
     #
-    # Returns the new Post.
-    def initialize(post)
-      self.post = post
-      self.content = extract_excerpt(post.content)
+    # Returns the new Excerpt.
+    def initialize(doc)
+      self.doc = doc
+      self.content = extract_excerpt(doc.content)
     end
 
-    def to_liquid
-      post.to_liquid(post.class::EXCERPT_ATTRIBUTES_FOR_LIQUID)
-    end
-
-    # Fetch YAML front-matter data from related post, without layout key
+    # Fetch YAML front-matter data from related doc, without layout key
     #
-    # Returns Hash of post data
+    # Returns Hash of doc data
     def data
-      @data ||= post.data.dup
+      @data ||= doc.data.dup
       @data.delete("layout")
+      @data.delete("excerpt")
       @data
     end
 
+    def trigger_hooks(*)
+    end
+
     # 'Path' of the excerpt.
     #
-    # Returns the path for the post this excerpt belongs to with #excerpt appended
+    # Returns the path for the doc this excerpt belongs to with #excerpt appended
     def path
-      File.join(post.path, "#excerpt")
+      File.join(doc.path, "#excerpt")
     end
 
     # Check if excerpt includes a string
@@ -51,28 +46,40 @@ module Jekyll
       (output && output.include?(something)) || content.include?(something)
     end
 
-    # The UID for this post (useful in feeds).
-    # e.g. /2008/11/05/my-awesome-post
+    # The UID for this doc (useful in feeds).
+    # e.g. /2008/11/05/my-awesome-doc
     #
     # Returns the String UID.
     def id
-      File.join(post.dir, post.slug, "#excerpt")
+      "#{doc.id}#excerpt"
     end
 
     def to_s
       output || content
     end
 
-    # Returns the shorthand String identifier of this Post.
+    def to_liquid
+      Jekyll::Drops::ExcerptDrop.new(self)
+    end
+
+    # Returns the shorthand String identifier of this doc.
     def inspect
       "<Excerpt: #{self.id}>"
     end
 
+    def output
+      @output ||= Renderer.new(doc.site, self, site.site_payload).run
+    end
+
+    def place_in_layout?
+      false
+    end
+
     protected
 
     # Internal: Extract excerpt from the content
     #
-    # By default excerpt is your first paragraph of a post: everything before
+    # By default excerpt is your first paragraph of a doc: everything before
     # the first two new lines:
     #
     #     ---
@@ -86,16 +93,16 @@ module Jekyll
     #     [1]: http://example.com/
     #
     # This is fairly good option for Markdown and Textile files. But might cause
-    # problems for HTML posts (which is quite unusual for Jekyll). If default
+    # problems for HTML docs (which is quite unusual for Jekyll). If default
     # excerpt delimiter is not good for you, you might want to set your own via
     # configuration option `excerpt_separator`. For example, following is a good
-    # alternative for HTML posts:
+    # alternative for HTML docs:
     #
     #     # file: _config.yml
     #     excerpt_separator: "<!-- more -->"
     #
     # Notice that all markdown-style link references will be appended to the
-    # excerpt. So the example post above will have this excerpt source:
+    # excerpt. So the example doc above will have this excerpt source:
     #
     #     First paragraph with [link][1].
     #
@@ -104,11 +111,14 @@ module Jekyll
     # Excerpts are rendered same time as content is rendered.
     #
     # Returns excerpt String
-    def extract_excerpt(post_content)
-      separator     = site.config['excerpt_separator']
-      head, _, tail = post_content.to_s.partition(separator)
+    def extract_excerpt(doc_content)
+      head, _, tail = doc_content.to_s.partition(doc.excerpt_separator)
 
-      "" << head << "\n\n" << tail.scan(/^\[[^\]]+\]:.+$/).join("\n")
+      if tail.empty?
+        head
+      else
+        "" << head << "\n\n" << tail.scan(/^\[[^\]]+\]:.+$/).join("\n")
+      end
     end
   end
 end

lib/jekyll/external.rb

@@ -1,16 +1,15 @@
 module Jekyll
   module External
     class << self
-
       #
       # Gems that, if installed, should be loaded.
       # Usually contain subcommands.
       #
       def blessed_gems
-        %w{
+        %w(
           jekyll-docs
           jekyll-import
-        }
+        )
       end
 
       #
@@ -18,12 +17,13 @@ module Jekyll
       #
       # names - a string gem name or array of gem names
       #
-      def require_if_present(names)
+      def require_if_present(names, &block)
         Array(names).each do |name|
           begin
             require name
           rescue LoadError
             Jekyll.logger.debug "Couldn't load #{name}. Skipping."
+            block.call(name) if block
             false
           end
         end
@@ -39,6 +39,7 @@ module Jekyll
       def require_with_graceful_fail(names)
         Array(names).each do |name|
           begin
+            Jekyll.logger.debug "Requiring:", "#{name}"
             require name
           rescue LoadError => e
             Jekyll.logger.error "Dependency Error:", <<-MSG
@@ -53,7 +54,6 @@ If you run into trouble, you can find helpful resources at http://jekyllrb.com/h
           end
         end
       end
-
     end
   end
 end

lib/jekyll/filters.rb

@@ -1,19 +1,9 @@
 require 'uri'
 require 'json'
+require 'date'
 
 module Jekyll
   module Filters
-    # Convert a Textile string into HTML output.
-    #
-    # input - The Textile String to convert.
-    #
-    # Returns the HTML formatted String.
-    def textilize(input)
-      site = @context.registers[:site]
-      converter = site.find_converter_instance(Jekyll::Converters::Textile)
-      converter.convert(input)
-    end
-
     # Convert a Markdown string into HTML output.
     #
     # input - The Markdown String to convert.
@@ -25,6 +15,17 @@ module Jekyll
       converter.convert(input)
     end
 
+    # Convert a Markdown string into HTML output.
+    #
+    # input - The Markdown String to convert.
+    #
+    # Returns the HTML formatted String.
+    def smartify(input)
+      site = @context.registers[:site]
+      converter = site.find_converter_instance(Jekyll::Converters::SmartyPants)
+      converter.convert(input)
+    end
+
     # Convert a Sass string into CSS output.
     #
     # input - The Sass String to convert.
@@ -50,12 +51,12 @@ module Jekyll
     # Slugify a filename or title.
     #
     # input - The filename or title to slugify.
+    # mode - how string is slugified
     #
-    # Returns the given filename or title as a lowercase String, with every
-    # sequence of spaces and non-alphanumeric characters replaced with a
-    # hyphen.
-    def slugify(input)
-      Utils.slugify(input)
+    # Returns the given filename or title as a lowercase URL String.
+    # See Utils.slugify for more detail.
+    def slugify(input, mode=nil)
+      Utils.slugify(input, :mode => mode)
     end
 
     # Format a date in short format e.g. "27 Jan 2011".
@@ -204,7 +205,7 @@ module Jekyll
         input.group_by do |item|
           item_property(item, property).to_s
         end.inject([]) do |memo, i|
-          memo << {"name" => i.first, "items" => i.last}
+          memo << { "name" => i.first, "items" => i.last }
         end
       else
         input
@@ -221,7 +222,7 @@ module Jekyll
     def where(input, property, value)
       return input unless input.is_a?(Enumerable)
       input = input.values if input.is_a?(Hash)
-      input.select { |object| item_property(object, property) == value }
+      input.select { |object| item_property(object, property).to_s == value.to_s }
     end
 
     # Sort an array of objects
@@ -232,6 +233,9 @@ module Jekyll
     #
     # Returns the filtered array of objects
     def sort(input, property = nil, nils = "first")
+      if input.nil?
+        raise ArgumentError.new("Cannot sort a null object.")
+      end
       if property.nil?
         input.sort
       else
@@ -241,11 +245,11 @@ module Jekyll
         when nils == "last"
           order = + 1
         else
-          raise ArgumentError.new("Invalid nils order: " +
+          raise ArgumentError.new("Invalid nils order: " \
             "'#{nils}' is not a valid nils order. It must be 'first' or 'last'.")
         end
 
-        input.sort { |apple, orange|
+        input.sort do |apple, orange|
           apple_property = item_property(apple, property)
           orange_property = item_property(orange, property)
 
@@ -256,7 +260,7 @@ module Jekyll
           else
             apple_property <=> orange_property
           end
-        }
+        end
       end
     end
 
@@ -288,6 +292,16 @@ module Jekyll
       new_ary
     end
 
+    def sample(input, num = 1)
+      return input unless input.respond_to?(:sample)
+      n = num.to_i rescue 1
+      if n == 1
+        input.sample
+      else
+        input.sample(n)
+      end
+    end
+
     # Convert an object into its String representation for debugging
     #
     # input - The Object to be converted
@@ -302,6 +316,8 @@ module Jekyll
       case input
       when Time
         input
+      when Date
+        input.to_time
       when String
         Time.parse(input) rescue Time.at(input.to_i)
       when Numeric
@@ -332,7 +348,7 @@ module Jekyll
         pairs = item.map { |k, v| as_liquid([k, v]) }
         Hash[pairs]
       when Array
-        item.map{ |i| as_liquid(i) }
+        item.map { |i| as_liquid(i) }
       else
         if item.respond_to?(:to_liquid)
           liquidated = item.to_liquid

lib/jekyll/frontmatter_defaults.rb

@@ -13,23 +13,31 @@ module Jekyll
     def update_deprecated_types(set)
       return set unless set.key?('scope') && set['scope'].key?('type')
 
-      set['scope']['type'] = case set['scope']['type']
-      when 'page'
-        Deprecator.defaults_deprecate_type('page', 'pages')
-        'pages'
-      when 'post'
-        Deprecator.defaults_deprecate_type('post', 'posts')
-        'posts'
-      when 'draft'
-        Deprecator.defaults_deprecate_type('draft', 'drafts')
-        'drafts'
-      else
-        set['scope']['type']
-      end
+      set['scope']['type'] =
+        case set['scope']['type']
+        when 'page'
+          Deprecator.defaults_deprecate_type('page', 'pages')
+          'pages'
+        when 'post'
+          Deprecator.defaults_deprecate_type('post', 'posts')
+          'posts'
+        when 'draft'
+          Deprecator.defaults_deprecate_type('draft', 'drafts')
+          'drafts'
+        else
+          set['scope']['type']
+        end
 
       set
     end
 
+    def ensure_time!(set)
+      return set unless set.key?('values') && set['values'].key?('date')
+      return set if set['values']['date'].is_a?(Time)
+      set['values']['date'] = Utils.parse_date(set['values']['date'], "An invalid date format was found in a front-matter default set: #{set}")
+      set
+    end
+
     # Finds a default value for a given setting, filtered by path and type
     #
     # path - the path (relative to the source) of the page, post or :draft the default is used in
@@ -83,11 +91,11 @@ module Jekyll
     end
 
     def applies_path?(scope, path)
-      return true if !scope.has_key?('path') || scope['path'].empty?
+      return true if !scope.key?('path') || scope['path'].empty?
 
       scope_path = Pathname.new(scope['path'])
       Pathname.new(sanitize_path(path)).ascend do |path|
-        if path == scope_path
+        if path.to_s == scope_path.to_s
           return true
         end
       end
@@ -143,7 +151,7 @@ module Jekyll
     # Returns an array of hashes
     def matching_sets(path, type)
       valid_sets.select do |set|
-        !set.has_key?('scope') || applies?(set['scope'], path, type)
+        !set.key?('scope') || applies?(set['scope'], path, type)
       end
     end
 
@@ -159,7 +167,7 @@ module Jekyll
 
       sets.map do |set|
         if valid?(set)
-          update_deprecated_types(set)
+          ensure_time!(update_deprecated_types(set))
         else
           Jekyll.logger.warn "Defaults:", "An invalid front-matter default set was found:"
           Jekyll.logger.warn "#{set}"
@@ -168,12 +176,12 @@ module Jekyll
       end.compact
     end
 
-    # Sanitizes the given path by removing a leading and addding a trailing slash
+    # Sanitizes the given path by removing a leading and adding a trailing slash
     def sanitize_path(path)
       if path.nil? || path.empty?
         ""
       else
-        path.gsub(/\A\//, '').gsub(/([^\/])\z/, '\1/')
+        path.gsub(/\A\//, '').gsub(/([^\/])\z/, '\1')
       end
     end
   end

lib/jekyll/generator.rb

@@ -1,4 +1,3 @@
 module Jekyll
-  class Generator < Plugin
-  end
+  Generator = Class.new(Plugin)
 end

lib/jekyll/hooks.rb

@@ -0,0 +1,101 @@
+module Jekyll
+  module Hooks
+    DEFAULT_PRIORITY = 20
+
+    # compatibility layer for octopress-hooks users
+    PRIORITY_MAP = {
+      :low => 10,
+      :normal => 20,
+      :high => 30
+    }.freeze
+
+    # initial empty hooks
+    @registry = {
+      :site => {
+        :after_reset => [],
+        :post_read => [],
+        :pre_render => [],
+        :post_render => [],
+        :post_write => []
+      },
+      :pages => {
+        :post_init => [],
+        :pre_render => [],
+        :post_render => [],
+        :post_write => []
+      },
+      :posts => {
+        :post_init => [],
+        :pre_render => [],
+        :post_render => [],
+        :post_write => []
+      },
+      :documents => {
+        :post_init => [],
+        :pre_render => [],
+        :post_render => [],
+        :post_write => []
+      }
+    }
+
+    # map of all hooks and their priorities
+    @hook_priority = {}
+
+    NotAvailable = Class.new(RuntimeError)
+    Uncallable = Class.new(RuntimeError)
+
+    # register hook(s) to be called later, public API
+    def self.register(owners, event, priority: DEFAULT_PRIORITY, &block)
+      Array(owners).each do |owner|
+        register_one(owner, event, priority_value(priority), &block)
+      end
+    end
+
+    # Ensure the priority is a Fixnum
+    def self.priority_value(priority)
+      return priority if priority.is_a?(Fixnum)
+      PRIORITY_MAP[priority] || DEFAULT_PRIORITY
+    end
+
+    # register a single hook to be called later, internal API
+    def self.register_one(owner, event, priority, &block)
+      @registry[owner] ||={
+        :post_init => [],
+        :pre_render => [],
+        :post_render => [],
+        :post_write => []
+      }
+
+      unless @registry[owner][event]
+        raise NotAvailable, "Invalid hook. #{owner} supports only the " \
+          "following hooks #{@registry[owner].keys.inspect}"
+      end
+
+      unless block.respond_to? :call
+        raise Uncallable, "Hooks must respond to :call"
+      end
+
+      insert_hook owner, event, priority, &block
+    end
+
+    def self.insert_hook(owner, event, priority, &block)
+      @hook_priority[block] = "#{priority}.#{@hook_priority.size}".to_f
+      @registry[owner][event] << block
+    end
+
+    # interface for Jekyll core components to trigger hooks
+    def self.trigger(owner, event, *args)
+      # proceed only if there are hooks to call
+      return unless @registry[owner]
+      return unless @registry[owner][event]
+
+      # hooks to call for this owner and event
+      hooks = @registry[owner][event]
+
+      # sort and call hooks according to priority and load order
+      hooks.sort_by { |h| @hook_priority[h] }.each do |hook|
+        hook.call(*args)
+      end
+    end
+  end
+end

lib/jekyll/liquid_renderer.rb

@@ -0,0 +1,39 @@
+require 'jekyll/liquid_renderer/file'
+require 'jekyll/liquid_renderer/table'
+
+module Jekyll
+  class LiquidRenderer
+    def initialize(site)
+      @site = site
+      reset
+    end
+
+    def reset
+      @stats = {}
+    end
+
+    def file(filename)
+      filename = @site.in_source_dir(filename).sub(/\A#{Regexp.escape(@site.source)}\//, '')
+
+      LiquidRenderer::File.new(self, filename).tap do
+        @stats[filename] ||= {}
+        @stats[filename][:count] ||= 0
+        @stats[filename][:count] += 1
+      end
+    end
+
+    def increment_bytes(filename, bytes)
+      @stats[filename][:bytes] ||= 0
+      @stats[filename][:bytes] += bytes
+    end
+
+    def increment_time(filename, time)
+      @stats[filename][:time] ||= 0.0
+      @stats[filename][:time] += time
+    end
+
+    def stats_table(n = 50)
+      LiquidRenderer::Table.new(@stats).to_s(n)
+    end
+  end
+end

lib/jekyll/liquid_renderer/file.rb

@@ -0,0 +1,50 @@
+module Jekyll
+  class LiquidRenderer
+    class File
+      def initialize(renderer, filename)
+        @renderer = renderer
+        @filename = filename
+      end
+
+      def parse(content)
+        measure_time do
+          @template = Liquid::Template.parse(content, line_numbers: true)
+        end
+
+        self
+      end
+
+      def render(*args)
+        measure_time do
+          measure_bytes do
+            @template.render(*args)
+          end
+        end
+      end
+
+      def render!(*args)
+        measure_time do
+          measure_bytes do
+            @template.render!(*args)
+          end
+        end
+      end
+
+      private
+
+      def measure_bytes
+        yield.tap do |str|
+          @renderer.increment_bytes(@filename, str.bytesize)
+        end
+      end
+
+      def measure_time
+        before = Time.now
+        yield
+      ensure
+        after = Time.now
+        @renderer.increment_time(@filename, after - before)
+      end
+    end
+  end
+end

lib/jekyll/liquid_renderer/table.rb

@@ -0,0 +1,94 @@
+module Jekyll
+  class LiquidRenderer::Table
+    def initialize(stats)
+      @stats = stats
+    end
+
+    def to_s(n = 50)
+      data = data_for_table(n)
+      widths = table_widths(data)
+      generate_table(data, widths)
+    end
+
+    private
+
+    def generate_table(data, widths)
+      str = "\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
+
+      str << "\n"
+      str
+    end
+
+    def generate_table_head_border(row_data, widths)
+      str = ""
+
+      row_data.each_index do |cell_index|
+        str << '-' * widths[cell_index]
+        str << '-+-' unless cell_index == row_data.length-1
+      end
+
+      str << "\n"
+      str
+    end
+
+    def generate_row(row_data, widths)
+      str = ''
+
+      row_data.each_with_index do |cell_data, cell_index|
+        if cell_index == 0
+          str << cell_data.ljust(widths[cell_index], ' ')
+        else
+          str << 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(n)
+      sorted = @stats.sort_by { |_, file_stats| -file_stats[:time] }
+      sorted = sorted.slice(0, n)
+
+      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 << "%.3f" % file_stats[:time]
+        table << row
+      end
+
+      table
+    end
+
+    def format_bytes(bytes)
+      bytes /= 1024.0
+      "%.2fK" % bytes
+    end
+  end
+end

lib/jekyll/log_adapter.rb

@@ -9,7 +9,7 @@ module Jekyll
       :error => ::Logger::ERROR
     }
 
-    # Public: Create a new instance of Jekyll's log writer
+    # Public: Create a new instance of a log writer
     #
     # writer - Logger compatible instance
     # log_level - (optional, symbol) the log level
@@ -30,7 +30,17 @@ module Jekyll
       writer.level = LOG_LEVELS.fetch(level)
     end
 
-    # Public: Print a jekyll debug message
+    def adjust_verbosity(options = {})
+      # Quiet always wins.
+      if options[:quiet]
+        self.log_level = :error
+      elsif options[:verbose]
+        self.log_level = :debug
+      end
+      debug "Logging at level:", LOG_LEVELS.key(writer.level).to_s
+    end
+
+    # Public: Print a debug message
     #
     # topic - the topic of the message, e.g. "Configuration file", "Deprecation", etc.
     # message - the message detail
@@ -40,7 +50,7 @@ module Jekyll
       writer.debug(message(topic, message))
     end
 
-    # Public: Print a jekyll message
+    # Public: Print a message
     #
     # topic - the topic of the message, e.g. "Configuration file", "Deprecation", etc.
     # message - the message detail
@@ -50,7 +60,7 @@ module Jekyll
       writer.info(message(topic, message))
     end
 
-    # Public: Print a jekyll message
+    # Public: Print a message
     #
     # topic - the topic of the message, e.g. "Configuration file", "Deprecation", etc.
     # message - the message detail
@@ -60,7 +70,7 @@ module Jekyll
       writer.warn(message(topic, message))
     end
 
-    # Public: Print a jekyll error message
+    # Public: Print an error message
     #
     # topic - the topic of the message, e.g. "Configuration file", "Deprecation", etc.
     # message - the message detail
@@ -70,7 +80,7 @@ module Jekyll
       writer.error(message(topic, message))
     end
 
-    # Public: Print a Jekyll error message and immediately abort the process
+    # Public: Print an error message and immediately abort the process
     #
     # topic - the topic of the message, e.g. "Configuration file", "Deprecation", etc.
     # message - the message detail (can be omitted)
@@ -81,7 +91,7 @@ module Jekyll
       abort
     end
 
-    # Internal: Build a Jekyll topic method
+    # Internal: Build a topic method
     #
     # topic - the topic of the message, e.g. "Configuration file", "Deprecation", etc.
     # message - the message detail

lib/jekyll/metadata.rb

@@ -1,121 +0,0 @@
-module Jekyll
-  class Metadata
-    attr_reader :site, :metadata, :cache
-
-    def initialize(site)
-      @site = site
-
-      # Read metadata from file
-      read_metadata
-
-      # Initialize cache to an empty hash
-      @cache = {}
-    end
-
-    # Add a path to the metadata
-    #
-    # Returns true, also on failure.
-    def add(path)
-      return true unless File.exist?(path)
-
-      metadata[path] = {
-        "mtime" => File.mtime(path),
-        "deps" => []
-      }
-      cache[path] = true
-    end
-
-    # Force a path to regenerate
-    #
-    # Returns true.
-    def force(path)
-      cache[path] = true
-    end
-
-    # Clear the metadata and cache
-    #
-    # Returns nothing
-    def clear
-      @metadata = {}
-      @cache = {}
-    end
-
-    # Checks if a path should be regenerated
-    #
-    # Returns a boolean.
-    def regenerate?(path, add = true)
-      return true if disabled?
-
-      # Check for path in cache
-      if cache.has_key? path
-        return cache[path]
-      end
-
-      # Check path that exists in metadata
-      data = metadata[path]
-      if data
-        data["deps"].each do |dependency|
-          if regenerate?(dependency)
-            return cache[dependency] = cache[path] = true
-          end
-        end
-        if data["mtime"].eql? File.mtime(path)
-          return cache[path] = false
-        else
-          return !add || add(path)
-        end
-      end
-
-      # Path does not exist in metadata, add it
-      return !add || add(path)
-    end
-
-    # Add a dependency of a path
-    #
-    # Returns nothing.
-    def add_dependency(path, dependency)
-      return if (metadata[path].nil? || @disabled)
-
-      metadata[path]["deps"] << dependency unless metadata[path]["deps"].include? dependency
-      regenerate? dependency
-    end
-
-    # Write the metadata to disk
-    #
-    # Returns nothing.
-    def write
-      File.open(metadata_file, 'w') do |f|
-        f.write(metadata.to_yaml)
-      end
-    end
-
-    # Produce the absolute path of the metadata file
-    #
-    # Returns the String path of the file.
-    def metadata_file
-      site.in_source_dir('.jekyll-metadata')
-    end
-
-    # Check if metadata has been disabled
-    #
-    # Returns a Boolean (true for disabled, false for enabled).
-    def disabled?
-      @disabled = site.full_rebuild? if @disabled.nil?
-      @disabled
-    end
-
-    private
-
-    # Read metadata from the metadata file, if no file is found,
-    # initialize with an empty hash
-    #
-    # Returns the read metadata.
-    def read_metadata
-      @metadata = if !disabled? && File.file?(metadata_file)
-        SafeYAML.load(File.read(metadata_file))
-      else
-        {}
-      end
-    end
-  end
-end

lib/jekyll/mime.types

@@ -1,95 +1,800 @@
--# These are the same MIME types that GitHub Pages uses as of 26 January 2014
+# Woah there. Do not edit this file directly.
+# This file is generated automatically by script/vendor-mimes.
 
-text/html                             html htm shtml
-text/css                              css
-text/xml                              xml rss xsl xsd
-image/gif                             gif
-image/jpeg                            jpeg jpg
-application/x-javascript              js
-application/atom+xml                  atom
-application/json                      json geojson topojson
-
-text/mathml                           mml
-text/plain                            txt
-text/vnd.sun.j2me.app-descriptor      jad
-text/vnd.wap.wml                      wml
-text/x-component                      htc
-text/cache-manifest                   manifest appcache
-text/coffeescript                     coffee
-text/plain                            pde
-text/plain                            md markdown
-text/vcard                            vcf vcard
-
-image/png                             png
-image/svg+xml                         svg
-image/svg+xml                         svgz
-image/tiff                            tif tiff
-image/vnd.wap.wbmp                    wbmp
-image/x-icon                          ico
-image/x-jng                           jng
-image/x-ms-bmp                        bmp
-
-application/vnd.ms-fontobject         eot
-application/x-font-ttf                ttf
-application/x-font-woff               woff
-font/opentype                         otf
-
-application/java-archive              jar ear
-application/mac-binhex40              hqx
-application/msword                    doc
-application/pdf                       pdf
-application/postscript                ps eps ai
-application/rdf+xml                   rdf
-application/rtf                       rtf
-application/vnd.apple.pkpass          pkpass
-application/vnd.ms-excel              xls
-application/vnd.ms-powerpoint         ppt
-application/vnd.wap.wmlc              wmlc
-application/xhtml+xml                 xhtml
-application/x-cocoa                   cco
-application/x-chrome-extension        crx
-application/x-java-archive-diff       jardiff
-application/x-java-jnlp-file          jnlp
-application/x-makeself                run
-application/x-ms-application          application
-application/x-ms-manifest             manifest
-application/x-ms-vsto                 vsto
-application/x-ns-proxy-autoconfig     pac
-application/x-perl                    pl pm
-application/x-pilot                   prc pdb
-application/x-rar-compressed          rar
-application/x-redhat-package-manager  rpm
-application/x-sea                     sea
-application/x-shockwave-flash         swf
-application/x-stuffit                 sit
-application/x-tcl                     tcl tk
-application/x-web-app-manifest+json   webapp
-application/x-x509-ca-cert            der pem crt
-application/x-xpinstall               xpi
-application/x-zip                     war
-application/zip                       zip
-
-application/octet-stream              bin exe dll
-application/octet-stream              deb
-application/octet-stream              deploy
-application/octet-stream              dmg
-application/octet-stream              iso img
-application/octet-stream              msi msp msm
-
-audio/midi                            mid midi kar
-audio/mpeg                            mp3
-audio/x-realaudio                     ra
-audio/ogg                             ogg
-
-video/3gpp                            3gpp 3gp
-video/m4v                             m4v
-video/mp4                             mp4
-video/mpeg                            mpeg mpg
-video/ogg                             ogg ogv
-video/quicktime                       mov
-video/webm                            webm
-video/x-flv                           flv
-video/x-mng                           mng
-video/x-ms-asf                        asx asf
-video/x-ms-wmv                        wmv
-video/x-msvideo                       avi
+application/andrew-inset                                                  ez
+application/applixware                                                    aw
+application/atom+xml                                                      atom
+application/atomcat+xml                                                   atomcat
+application/atomsvc+xml                                                   atomsvc
+application/bdoc                                                          bdoc
+application/ccxml+xml                                                     ccxml
+application/cdmi-capability                                               cdmia
+application/cdmi-container                                                cdmic
+application/cdmi-domain                                                   cdmid
+application/cdmi-object                                                   cdmio
+application/cdmi-queue                                                    cdmiq
+application/cu-seeme                                                      cu
+application/dash+xml                                                      mdp
+application/davmount+xml                                                  davmount
+application/docbook+xml                                                   dbk
+application/dssc+der                                                      dssc
+application/dssc+xml                                                      xdssc
+application/ecmascript                                                    ecma
+application/emma+xml                                                      emma
+application/epub+zip                                                      epub
+application/exi                                                           exi
+application/font-tdpfr                                                    pfr
+application/font-woff                                                     woff
+application/font-woff2                                                    woff2
+application/gml+xml                                                       gml
+application/gpx+xml                                                       gpx
+application/gxf                                                           gxf
+application/hyperstudio                                                   stk
+application/inkml+xml                                                     ink inkml
+application/ipfix                                                         ipfix
+application/java-archive                                                  jar war ear
+application/java-serialized-object                                        ser
+application/java-vm                                                       class
+application/javascript                                                    js
+application/json                                                          json map
+application/json5                                                         json5
+application/jsonml+json                                                   jsonml
+application/ld+json                                                       jsonld
+application/lost+xml                                                      lostxml
+application/mac-binhex40                                                  hqx
+application/mac-compactpro                                                cpt
+application/mads+xml                                                      mads
+application/manifest+json                                                 webmanifest
+application/marc                                                          mrc
+application/marcxml+xml                                                   mrcx
+application/mathematica                                                   ma nb mb
+application/mathml+xml                                                    mathml
+application/mbox                                                          mbox
+application/mediaservercontrol+xml                                        mscml
+application/metalink+xml                                                  metalink
+application/metalink4+xml                                                 meta4
+application/mets+xml                                                      mets
+application/mods+xml                                                      mods
+application/mp21                                                          m21 mp21
+application/mp4                                                           mp4s m4p
+application/msword                                                        doc dot
+application/mxf                                                           mxf
+application/octet-stream                                                  bin dms lrf mar so dist distz pkg bpk dump elc deploy exe dll deb dmg iso img msi msp msm buffer
+application/oda                                                           oda
+application/oebps-package+xml                                             opf
+application/ogg                                                           ogx
+application/omdoc+xml                                                     omdoc
+application/onenote                                                       onetoc onetoc2 onetmp onepkg
+application/oxps                                                          oxps
+application/patch-ops-error+xml                                           xer
+application/pdf                                                           pdf
+application/pgp-encrypted                                                 pgp
+application/pgp-signature                                                 asc sig
+application/pics-rules                                                    prf
+application/pkcs10                                                        p10
+application/pkcs7-mime                                                    p7m p7c
+application/pkcs7-signature                                               p7s
+application/pkcs8                                                         p8
+application/pkix-attr-cert                                                ac
+application/pkix-cert                                                     cer
+application/pkix-crl                                                      crl
+application/pkix-pkipath                                                  pkipath
+application/pkixcmp                                                       pki
+application/pls+xml                                                       pls
+application/postscript                                                    ai eps ps
+application/prs.cww                                                       cww
+application/pskc+xml                                                      pskcxml
+application/rdf+xml                                                       rdf
+application/reginfo+xml                                                   rif
+application/relax-ng-compact-syntax                                       rnc
+application/resource-lists+xml                                            rl
+application/resource-lists-diff+xml                                       rld
+application/rls-services+xml                                              rs
+application/rpki-ghostbusters                                             gbr
+application/rpki-manifest                                                 mft
+application/rpki-roa                                                      roa
+application/rsd+xml                                                       rsd
+application/rss+xml                                                       rss
+application/rtf                                                           rtf
+application/sbml+xml                                                      sbml
+application/scvp-cv-request                                               scq
+application/scvp-cv-response                                              scs
+application/scvp-vp-request                                               spq
+application/scvp-vp-response                                              spp
+application/sdp                                                           sdp
+application/set-payment-initiation                                        setpay
+application/set-registration-initiation                                   setreg
+application/shf+xml                                                       shf
+application/smil+xml                                                      smi smil
+application/sparql-query                                                  rq
+application/sparql-results+xml                                            srx
+application/srgs                                                          gram
+application/srgs+xml                                                      grxml
+application/sru+xml                                                       sru
+application/ssdl+xml                                                      ssdl
+application/ssml+xml                                                      ssml
+application/tei+xml                                                       tei teicorpus
+application/thraud+xml                                                    tfi
+application/timestamped-data                                              tsd
+application/vnd.3gpp.pic-bw-large                                         plb
+application/vnd.3gpp.pic-bw-small                                         psb
+application/vnd.3gpp.pic-bw-var                                           pvb
+application/vnd.3gpp2.tcap                                                tcap
+application/vnd.3m.post-it-notes                                          pwn
+application/vnd.accpac.simply.aso                                         aso
+application/vnd.accpac.simply.imp                                         imp
+application/vnd.acucobol                                                  acu
+application/vnd.acucorp                                                   atc acutc
+application/vnd.adobe.air-application-installer-package+zip               air
+application/vnd.adobe.formscentral.fcdt                                   fcdt
+application/vnd.adobe.fxp                                                 fxp fxpl
+application/vnd.adobe.xdp+xml                                             xdp
+application/vnd.adobe.xfdf                                                xfdf
+application/vnd.ahead.space                                               ahead
+application/vnd.airzip.filesecure.azf                                     azf
+application/vnd.airzip.filesecure.azs                                     azs
+application/vnd.amazon.ebook                                              azw
+application/vnd.americandynamics.acc                                      acc
+application/vnd.amiga.ami                                                 ami
+application/vnd.android.package-archive                                   apk
+application/vnd.anser-web-certificate-issue-initiation                    cii
+application/vnd.anser-web-funds-transfer-initiation                       fti
+application/vnd.antix.game-component                                      atx
+application/vnd.apple.installer+xml                                       mpkg
+application/vnd.apple.mpegurl                                             m3u8
+application/vnd.aristanetworks.swi                                        swi
+application/vnd.astraea-software.iota                                     iota
+application/vnd.audiograph                                                aep
+application/vnd.blueice.multipass                                         mpm
+application/vnd.bmi                                                       bmi
+application/vnd.businessobjects                                           rep
+application/vnd.chemdraw+xml                                              cdxml
+application/vnd.chipnuts.karaoke-mmd                                      mmd
+application/vnd.cinderella                                                cdy
+application/vnd.claymore                                                  cla
+application/vnd.cloanto.rp9                                               rp9
+application/vnd.clonk.c4group                                             c4g c4d c4f c4p c4u
+application/vnd.cluetrust.cartomobile-config                              c11amc
+application/vnd.cluetrust.cartomobile-config-pkg                          c11amz
+application/vnd.commonspace                                               csp
+application/vnd.contact.cmsg                                              cdbcmsg
+application/vnd.cosmocaller                                               cmc
+application/vnd.crick.clicker                                             clkx
+application/vnd.crick.clicker.keyboard                                    clkk
+application/vnd.crick.clicker.palette                                     clkp
+application/vnd.crick.clicker.template                                    clkt
+application/vnd.crick.clicker.wordbank                                    clkw
+application/vnd.criticaltools.wbs+xml                                     wbs
+application/vnd.ctc-posml                                                 pml
+application/vnd.cups-ppd                                                  ppd
+application/vnd.curl.car                                                  car
+application/vnd.curl.pcurl                                                pcurl
+application/vnd.dart                                                      dart
+application/vnd.data-vision.rdz                                           rdz
+application/vnd.dece.data                                                 uvf uvvf uvd uvvd
+application/vnd.dece.ttml+xml                                             uvt uvvt
+application/vnd.dece.unspecified                                          uvx uvvx
+application/vnd.dece.zip                                                  uvz uvvz
+application/vnd.denovo.fcselayout-link                                    fe_launch
+application/vnd.dna                                                       dna
+application/vnd.dolby.mlp                                                 mlp
+application/vnd.dpgraph                                                   dpg
+application/vnd.dreamfactory                                              dfac
+application/vnd.ds-keypoint                                               kpxx
+application/vnd.dvb.ait                                                   ait
+application/vnd.dvb.service                                               svc
+application/vnd.dynageo                                                   geo
+application/vnd.ecowin.chart                                              mag
+application/vnd.enliven                                                   nml
+application/vnd.epson.esf                                                 esf
+application/vnd.epson.msf                                                 msf
+application/vnd.epson.quickanime                                          qam
+application/vnd.epson.salt                                                slt
+application/vnd.epson.ssf                                                 ssf
+application/vnd.eszigno3+xml                                              es3 et3
+application/vnd.ezpix-album                                               ez2
+application/vnd.ezpix-package                                             ez3
+application/vnd.fdf                                                       fdf
+application/vnd.fdsn.mseed                                                mseed
+application/vnd.fdsn.seed                                                 seed dataless
+application/vnd.flographit                                                gph
+application/vnd.fluxtime.clip                                             ftc
+application/vnd.framemaker                                                fm frame maker book
+application/vnd.frogans.fnc                                               fnc
+application/vnd.frogans.ltf                                               ltf
+application/vnd.fsc.weblaunch                                             fsc
+application/vnd.fujitsu.oasys                                             oas
+application/vnd.fujitsu.oasys2                                            oa2
+application/vnd.fujitsu.oasys3                                            oa3
+application/vnd.fujitsu.oasysgp                                           fg5
+application/vnd.fujitsu.oasysprs                                          bh2
+application/vnd.fujixerox.ddd                                             ddd
+application/vnd.fujixerox.docuworks                                       xdw
+application/vnd.fujixerox.docuworks.binder                                xbd
+application/vnd.fuzzysheet                                                fzs
+application/vnd.genomatix.tuxedo                                          txd
+application/vnd.geogebra.file                                             ggb
+application/vnd.geogebra.tool                                             ggt
+application/vnd.geometry-explorer                                         gex gre
+application/vnd.geonext                                                   gxt
+application/vnd.geoplan                                                   g2w
+application/vnd.geospace                                                  g3w
+application/vnd.gmx                                                       gmx
+application/vnd.google-earth.kml+xml                                      kml
+application/vnd.google-earth.kmz                                          kmz
+application/vnd.grafeq                                                    gqf gqs
+application/vnd.groove-account                                            gac
+application/vnd.groove-help                                               ghf
+application/vnd.groove-identity-message                                   gim
+application/vnd.groove-injector                                           grv
+application/vnd.groove-tool-message                                       gtm
+application/vnd.groove-tool-template                                      tpl
+application/vnd.groove-vcard                                              vcg
+application/vnd.hal+xml                                                   hal
+application/vnd.handheld-entertainment+xml                                zmm
+application/vnd.hbci                                                      hbci
+application/vnd.hhe.lesson-player                                         les
+application/vnd.hp-hpgl                                                   hpgl
+application/vnd.hp-hpid                                                   hpid
+application/vnd.hp-hps                                                    hps
+application/vnd.hp-jlyt                                                   jlt
+application/vnd.hp-pcl                                                    pcl
+application/vnd.hp-pclxl                                                  pclxl
+application/vnd.hydrostatix.sof-data                                      sfd-hdstx
+application/vnd.ibm.minipay                                               mpy
+application/vnd.ibm.modcap                                                afp listafp list3820
+application/vnd.ibm.rights-management                                     irm
+application/vnd.ibm.secure-container                                      sc
+application/vnd.iccprofile                                                icc icm
+application/vnd.igloader                                                  igl
+application/vnd.immervision-ivp                                           ivp
+application/vnd.immervision-ivu                                           ivu
+application/vnd.insors.igm                                                igm
+application/vnd.intercon.formnet                                          xpw xpx
+application/vnd.intergeo                                                  i2g
+application/vnd.intu.qbo                                                  qbo
+application/vnd.intu.qfx                                                  qfx
+application/vnd.ipunplugged.rcprofile                                     rcprofile
+application/vnd.irepository.package+xml                                   irp
+application/vnd.is-xpr                                                    xpr
+application/vnd.isac.fcs                                                  fcs
+application/vnd.jam                                                       jam
+application/vnd.jcp.javame.midlet-rms                                     rms
+application/vnd.jisp                                                      jisp
+application/vnd.joost.joda-archive                                        joda
+application/vnd.kahootz                                                   ktz ktr
+application/vnd.kde.karbon                                                karbon
+application/vnd.kde.kchart                                                chrt
+application/vnd.kde.kformula                                              kfo
+application/vnd.kde.kivio                                                 flw
+application/vnd.kde.kontour                                               kon
+application/vnd.kde.kpresenter                                            kpr kpt
+application/vnd.kde.kspread                                               ksp
+application/vnd.kde.kword                                                 kwd kwt
+application/vnd.kenameaapp                                                htke
+application/vnd.kidspiration                                              kia
+application/vnd.kinar                                                     kne knp
+application/vnd.koan                                                      skp skd skt skm
+application/vnd.kodak-descriptor                                          sse
+application/vnd.las.las+xml                                               lasxml
+application/vnd.llamagraphics.life-balance.desktop                        lbd
+application/vnd.llamagraphics.life-balance.exchange+xml                   lbe
+application/vnd.lotus-1-2-3                                               123
+application/vnd.lotus-approach                                            apr
+application/vnd.lotus-freelance                                           pre
+application/vnd.lotus-notes                                               nsf
+application/vnd.lotus-organizer                                           org
+application/vnd.lotus-screencam                                           scm
+application/vnd.lotus-wordpro                                             lwp
+application/vnd.macports.portpkg                                          portpkg
+application/vnd.mcd                                                       mcd
+application/vnd.medcalcdata                                               mc1
+application/vnd.mediastation.cdkey                                        cdkey
+application/vnd.mfer                                                      mwf
+application/vnd.mfmp                                                      mfm
+application/vnd.micrografx.flo                                            flo
+application/vnd.micrografx.igx                                            igx
+application/vnd.mif                                                       mif
+application/vnd.mobius.daf                                                daf
+application/vnd.mobius.dis                                                dis
+application/vnd.mobius.mbk                                                mbk
+application/vnd.mobius.mqy                                                mqy
+application/vnd.mobius.msl                                                msl
+application/vnd.mobius.plc                                                plc
+application/vnd.mobius.txf                                                txf
+application/vnd.mophun.application                                        mpn
+application/vnd.mophun.certificate                                        mpc
+application/vnd.mozilla.xul+xml                                           xul
+application/vnd.ms-artgalry                                               cil
+application/vnd.ms-cab-compressed                                         cab
+application/vnd.ms-excel                                                  xls xlm xla xlc xlt xlw
+application/vnd.ms-excel.addin.macroenabled.12                            xlam
+application/vnd.ms-excel.sheet.binary.macroenabled.12                     xlsb
+application/vnd.ms-excel.sheet.macroenabled.12                            xlsm
+application/vnd.ms-excel.template.macroenabled.12                         xltm
+application/vnd.ms-fontobject                                             eot
+application/vnd.ms-htmlhelp                                               chm
+application/vnd.ms-ims                                                    ims
+application/vnd.ms-lrm                                                    lrm
+application/vnd.ms-officetheme                                            thmx
+application/vnd.ms-pki.seccat                                             cat
+application/vnd.ms-pki.stl                                                stl
+application/vnd.ms-powerpoint                                             ppt pps pot
+application/vnd.ms-powerpoint.addin.macroenabled.12                       ppam
+application/vnd.ms-powerpoint.presentation.macroenabled.12                pptm
+application/vnd.ms-powerpoint.slide.macroenabled.12                       sldm
+application/vnd.ms-powerpoint.slideshow.macroenabled.12                   ppsm
+application/vnd.ms-powerpoint.template.macroenabled.12                    potm
+application/vnd.ms-project                                                mpp mpt
+application/vnd.ms-word.document.macroenabled.12                          docm
+application/vnd.ms-word.template.macroenabled.12                          dotm
+application/vnd.ms-works                                                  wps wks wcm wdb
+application/vnd.ms-wpl                                                    wpl
+application/vnd.ms-xpsdocument                                            xps
+application/vnd.mseq                                                      mseq
+application/vnd.musician                                                  mus
+application/vnd.muvee.style                                               msty
+application/vnd.mynfc                                                     taglet
+application/vnd.neurolanguage.nlu                                         nlu
+application/vnd.nitf                                                      ntf nitf
+application/vnd.noblenet-directory                                        nnd
+application/vnd.noblenet-sealer                                           nns
+application/vnd.noblenet-web                                              nnw
+application/vnd.nokia.n-gage.data                                         ngdat
+application/vnd.nokia.n-gage.symbian.install                              n-gage
+application/vnd.nokia.radio-preset                                        rpst
+application/vnd.nokia.radio-presets                                       rpss
+application/vnd.novadigm.edm                                              edm
+application/vnd.novadigm.edx                                              edx
+application/vnd.novadigm.ext                                              ext
+application/vnd.oasis.opendocument.chart                                  odc
+application/vnd.oasis.opendocument.chart-template                         otc
+application/vnd.oasis.opendocument.database                               odb
+application/vnd.oasis.opendocument.formula                                odf
+application/vnd.oasis.opendocument.formula-template                       odft
+application/vnd.oasis.opendocument.graphics                               odg
+application/vnd.oasis.opendocument.graphics-template                      otg
+application/vnd.oasis.opendocument.image                                  odi
+application/vnd.oasis.opendocument.image-template                         oti
+application/vnd.oasis.opendocument.presentation                           odp
+application/vnd.oasis.opendocument.presentation-template                  otp
+application/vnd.oasis.opendocument.spreadsheet                            ods
+application/vnd.oasis.opendocument.spreadsheet-template                   ots
+application/vnd.oasis.opendocument.text                                   odt
+application/vnd.oasis.opendocument.text-master                            odm
+application/vnd.oasis.opendocument.text-template                          ott
+application/vnd.oasis.opendocument.text-web                               oth
+application/vnd.olpc-sugar                                                xo
+application/vnd.oma.dd2+xml                                               dd2
+application/vnd.openofficeorg.extension                                   oxt
+application/vnd.openxmlformats-officedocument.presentationml.presentation pptx
+application/vnd.openxmlformats-officedocument.presentationml.slide        sldx
+application/vnd.openxmlformats-officedocument.presentationml.slideshow    ppsx
+application/vnd.openxmlformats-officedocument.presentationml.template     potx
+application/vnd.openxmlformats-officedocument.spreadsheetml.sheet         xlsx
+application/vnd.openxmlformats-officedocument.spreadsheetml.template      xltx
+application/vnd.openxmlformats-officedocument.wordprocessingml.document   docx
+application/vnd.openxmlformats-officedocument.wordprocessingml.template   dotx
+application/vnd.osgeo.mapguide.package                                    mgp
+application/vnd.osgi.dp                                                   dp
+application/vnd.osgi.subsystem                                            esa
+application/vnd.palm                                                      pdb pqa oprc
+application/vnd.pawaafile                                                 paw
+application/vnd.pg.format                                                 str
+application/vnd.pg.osasli                                                 ei6
+application/vnd.picsel                                                    efif
+application/vnd.pmi.widget                                                wg
+application/vnd.pocketlearn                                               plf
+application/vnd.powerbuilder6                                             pbd
+application/vnd.previewsystems.box                                        box
+application/vnd.proteus.magazine                                          mgz
+application/vnd.publishare-delta-tree                                     qps
+application/vnd.pvi.ptid1                                                 ptid
+application/vnd.quark.quarkxpress                                         qxd qxt qwd qwt qxl qxb
+application/vnd.realvnc.bed                                               bed
+application/vnd.recordare.musicxml                                        mxl
+application/vnd.recordare.musicxml+xml                                    musicxml
+application/vnd.rig.cryptonote                                            cryptonote
+application/vnd.rim.cod                                                   cod
+application/vnd.rn-realmedia                                              rm
+application/vnd.rn-realmedia-vbr                                          rmvb
+application/vnd.route66.link66+xml                                        link66
+application/vnd.sailingtracker.track                                      st
+application/vnd.seemail                                                   see
+application/vnd.sema                                                      sema
+application/vnd.semd                                                      semd
+application/vnd.semf                                                      semf
+application/vnd.shana.informed.formdata                                   ifm
+application/vnd.shana.informed.formtemplate                               itp
+application/vnd.shana.informed.interchange                                iif
+application/vnd.shana.informed.package                                    ipk
+application/vnd.simtech-mindmapper                                        twd twds
+application/vnd.smaf                                                      mmf
+application/vnd.smart.teacher                                             teacher
+application/vnd.solent.sdkm+xml                                           sdkm sdkd
+application/vnd.spotfire.dxp                                              dxp
+application/vnd.spotfire.sfs                                              sfs
+application/vnd.stardivision.calc                                         sdc
+application/vnd.stardivision.draw                                         sda
+application/vnd.stardivision.impress                                      sdd
+application/vnd.stardivision.math                                         smf
+application/vnd.stardivision.writer                                       sdw vor
+application/vnd.stardivision.writer-global                                sgl
+application/vnd.stepmania.package                                         smzip
+application/vnd.stepmania.stepchart                                       sm
+application/vnd.sun.xml.calc                                              sxc
+application/vnd.sun.xml.calc.template                                     stc
+application/vnd.sun.xml.draw                                              sxd
+application/vnd.sun.xml.draw.template                                     std
+application/vnd.sun.xml.impress                                           sxi
+application/vnd.sun.xml.impress.template                                  sti
+application/vnd.sun.xml.math                                              sxm
+application/vnd.sun.xml.writer                                            sxw
+application/vnd.sun.xml.writer.global                                     sxg
+application/vnd.sun.xml.writer.template                                   stw
+application/vnd.sus-calendar                                              sus susp
+application/vnd.svd                                                       svd
+application/vnd.symbian.install                                           sis sisx
+application/vnd.syncml+xml                                                xsm
+application/vnd.syncml.dm+wbxml                                           bdm
+application/vnd.syncml.dm+xml                                             xdm
+application/vnd.tao.intent-module-archive                                 tao
+application/vnd.tcpdump.pcap                                              pcap cap dmp
+application/vnd.tmobile-livetv                                            tmo
+application/vnd.trid.tpt                                                  tpt
+application/vnd.triscape.mxs                                              mxs
+application/vnd.trueapp                                                   tra
+application/vnd.ufdl                                                      ufd ufdl
+application/vnd.uiq.theme                                                 utz
+application/vnd.umajin                                                    umj
+application/vnd.unity                                                     unityweb
+application/vnd.uoml+xml                                                  uoml
+application/vnd.vcx                                                       vcx
+application/vnd.visio                                                     vsd vst vss vsw
+application/vnd.visionary                                                 vis
+application/vnd.vsf                                                       vsf
+application/vnd.wap.wbxml                                                 wbxml
+application/vnd.wap.wmlc                                                  wmlc
+application/vnd.wap.wmlscriptc                                            wmlsc
+application/vnd.webturbo                                                  wtb
+application/vnd.wolfram.player                                            nbp
+application/vnd.wordperfect                                               wpd
+application/vnd.wqd                                                       wqd
+application/vnd.wt.stf                                                    stf
+application/vnd.xara                                                      xar
+application/vnd.xfdl                                                      xfdl
+application/vnd.yamaha.hv-dic                                             hvd
+application/vnd.yamaha.hv-script                                          hvs
+application/vnd.yamaha.hv-voice                                           hvp
+application/vnd.yamaha.openscoreformat                                    osf
+application/vnd.yamaha.openscoreformat.osfpvg+xml                         osfpvg
+application/vnd.yamaha.smaf-audio                                         saf
+application/vnd.yamaha.smaf-phrase                                        spf
+application/vnd.yellowriver-custom-menu                                   cmp
+application/vnd.zul                                                       zir zirz
+application/vnd.zzazz.deck+xml                                            zaz
+application/voicexml+xml                                                  vxml
+application/widget                                                        wgt
+application/winhlp                                                        hlp
+application/wsdl+xml                                                      wsdl
+application/wspolicy+xml                                                  wspolicy
+application/x-7z-compressed                                               7z
+application/x-abiword                                                     abw
+application/x-ace-compressed                                              ace
+application/x-authorware-bin                                              aab x32 u32 vox
+application/x-authorware-map                                              aam
+application/x-authorware-seg                                              aas
+application/x-bcpio                                                       bcpio
+application/x-bittorrent                                                  torrent
+application/x-blorb                                                       blb blorb
+application/x-bzip                                                        bz
+application/x-bzip2                                                       bz2 boz
+application/x-cbr                                                         cbr cba cbt cbz cb7
+application/x-cdlink                                                      vcd
+application/x-cfs-compressed                                              cfs
+application/x-chat                                                        chat
+application/x-chess-pgn                                                   pgn
+application/x-chrome-extension                                            crx
+application/x-cocoa                                                       cco
+application/x-conference                                                  nsc
+application/x-cpio                                                        cpio
+application/x-csh                                                         csh
+application/x-debian-package                                              udeb
+application/x-dgc-compressed                                              dgc
+application/x-director                                                    dir dcr dxr cst cct cxt w3d fgd swa
+application/x-doom                                                        wad
+application/x-dtbncx+xml                                                  ncx
+application/x-dtbook+xml                                                  dtb
+application/x-dtbresource+xml                                             res
+application/x-dvi                                                         dvi
+application/x-envoy                                                       evy
+application/x-eva                                                         eva
+application/x-font-bdf                                                    bdf
+application/x-font-ghostscript                                            gsf
+application/x-font-linux-psf                                              psf
+application/x-font-otf                                                    otf
+application/x-font-pcf                                                    pcf
+application/x-font-snf                                                    snf
+application/x-font-ttf                                                    ttf ttc
+application/x-font-type1                                                  pfa pfb pfm afm
+application/x-freearc                                                     arc
+application/x-futuresplash                                                spl
+application/x-gca-compressed                                              gca
+application/x-glulx                                                       ulx
+application/x-gnumeric                                                    gnumeric
+application/x-gramps-xml                                                  gramps
+application/x-gtar                                                        gtar
+application/x-hdf                                                         hdf
+application/x-httpd-php                                                   php
+application/x-install-instructions                                        install
+application/x-java-archive-diff                                           jardiff
+application/x-java-jnlp-file                                              jnlp
+application/x-latex                                                       latex
+application/x-lua-bytecode                                                luac
+application/x-lzh-compressed                                              lzh lha
+application/x-makeself                                                    run
+application/x-mie                                                         mie
+application/x-mobipocket-ebook                                            prc mobi
+application/x-ms-application                                              application
+application/x-ms-shortcut                                                 lnk
+application/x-ms-wmd                                                      wmd
+application/x-ms-wmz                                                      wmz
+application/x-ms-xbap                                                     xbap
+application/x-msaccess                                                    mdb
+application/x-msbinder                                                    obd
+application/x-mscardfile                                                  crd
+application/x-msclip                                                      clp
+application/x-msdownload                                                  com bat
+application/x-msmediaview                                                 mvb m13 m14
+application/x-msmetafile                                                  wmf emf emz
+application/x-msmoney                                                     mny
+application/x-mspublisher                                                 pub
+application/x-msschedule                                                  scd
+application/x-msterminal                                                  trm
+application/x-mswrite                                                     wri
+application/x-netcdf                                                      nc cdf
+application/x-ns-proxy-autoconfig                                         pac
+application/x-nzb                                                         nzb
+application/x-perl                                                        pl pm
+application/x-pkcs12                                                      p12 pfx
+application/x-pkcs7-certificates                                          p7b spc
+application/x-pkcs7-certreqresp                                           p7r
+application/x-rar-compressed                                              rar
+application/x-redhat-package-manager                                      rpm
+application/x-research-info-systems                                       ris
+application/x-sea                                                         sea
+application/x-sh                                                          sh
+application/x-shar                                                        shar
+application/x-shockwave-flash                                             swf
+application/x-silverlight-app                                             xap
+application/x-sql                                                         sql
+application/x-stuffit                                                     sit
+application/x-stuffitx                                                    sitx
+application/x-subrip                                                      srt
+application/x-sv4cpio                                                     sv4cpio
+application/x-sv4crc                                                      sv4crc
+application/x-t3vm-image                                                  t3
+application/x-tads                                                        gam
+application/x-tar                                                         tar
+application/x-tcl                                                         tcl tk
+application/x-tex                                                         tex
+application/x-tex-tfm                                                     tfm
+application/x-texinfo                                                     texinfo texi
+application/x-tgif                                                        obj
+application/x-ustar                                                       ustar
+application/x-wais-source                                                 src
+application/x-web-app-manifest+json                                       webapp
+application/x-x509-ca-cert                                                der crt pem
+application/x-xfig                                                        fig
+application/x-xliff+xml                                                   xlf
+application/x-xpinstall                                                   xpi
+application/x-xz                                                          xz
+application/x-zmachine                                                    z1 z2 z3 z4 z5 z6 z7 z8
+application/xaml+xml                                                      xaml
+application/xcap-diff+xml                                                 xdf
+application/xenc+xml                                                      xenc
+application/xhtml+xml                                                     xhtml xht
+application/xml                                                           xml xsl xsd
+application/xml-dtd                                                       dtd
+application/xop+xml                                                       xop
+application/xproc+xml                                                     xpl
+application/xslt+xml                                                      xslt
+application/xspf+xml                                                      xspf
+application/xv+xml                                                        mxml xhvml xvml xvm
+application/yang                                                          yang
+application/yin+xml                                                       yin
+application/zip                                                           zip
+audio/adpcm                                                               adp
+audio/basic                                                               au snd
+audio/midi                                                                mid midi kar rmi
+audio/mp4                                                                 mp4a m4a
+audio/mpeg                                                                mpga mp2 mp2a mp3 m2a m3a
+audio/ogg                                                                 oga ogg spx
+audio/s3m                                                                 s3m
+audio/silk                                                                sil
+audio/vnd.dece.audio                                                      uva uvva
+audio/vnd.digital-winds                                                   eol
+audio/vnd.dra                                                             dra
+audio/vnd.dts                                                             dts
+audio/vnd.dts.hd                                                          dtshd
+audio/vnd.lucent.voice                                                    lvp
+audio/vnd.ms-playready.media.pya                                          pya
+audio/vnd.nuera.ecelp4800                                                 ecelp4800
+audio/vnd.nuera.ecelp7470                                                 ecelp7470
+audio/vnd.nuera.ecelp9600                                                 ecelp9600
+audio/vnd.rip                                                             rip
+audio/wav                                                                 wav
+audio/webm                                                                weba
+audio/x-aac                                                               aac
+audio/x-aiff                                                              aif aiff aifc
+audio/x-caf                                                               caf
+audio/x-flac                                                              flac
+audio/x-matroska                                                          mka
+audio/x-mpegurl                                                           m3u
+audio/x-ms-wax                                                            wax
+audio/x-ms-wma                                                            wma
+audio/x-pn-realaudio                                                      ram ra
+audio/x-pn-realaudio-plugin                                               rmp
+audio/xm                                                                  xm
+chemical/x-cdx                                                            cdx
+chemical/x-cif                                                            cif
+chemical/x-cmdf                                                           cmdf
+chemical/x-cml                                                            cml
+chemical/x-csml                                                           csml
+chemical/x-xyz                                                            xyz
+image/bmp                                                                 bmp
+image/cgm                                                                 cgm
+image/g3fax                                                               g3
+image/gif                                                                 gif
+image/ief                                                                 ief
+image/jpeg                                                                jpeg jpg jpe
+image/ktx                                                                 ktx
+image/png                                                                 png
+image/prs.btif                                                            btif
+image/sgi                                                                 sgi
+image/svg+xml                                                             svg svgz
+image/tiff                                                                tiff tif
+image/vnd.adobe.photoshop                                                 psd
+image/vnd.dece.graphic                                                    uvi uvvi uvg uvvg
+image/vnd.djvu                                                            djvu djv
+image/vnd.dvb.subtitle                                                    sub
+image/vnd.dwg                                                             dwg
+image/vnd.dxf                                                             dxf
+image/vnd.fastbidsheet                                                    fbs
+image/vnd.fpx                                                             fpx
+image/vnd.fst                                                             fst
+image/vnd.fujixerox.edmics-mmr                                            mmr
+image/vnd.fujixerox.edmics-rlc                                            rlc
+image/vnd.ms-modi                                                         mdi
+image/vnd.ms-photo                                                        wdp
+image/vnd.net-fpx                                                         npx
+image/vnd.wap.wbmp                                                        wbmp
+image/vnd.xiff                                                            xif
+image/webp                                                                webp
+image/x-3ds                                                               3ds
+image/x-cmu-raster                                                        ras
+image/x-cmx                                                               cmx
+image/x-freehand                                                          fh fhc fh4 fh5 fh7
+image/x-icon                                                              ico
+image/x-jng                                                               jng
+image/x-mrsid-image                                                       sid
+image/x-pcx                                                               pcx
+image/x-pict                                                              pic pct
+image/x-portable-anymap                                                   pnm
+image/x-portable-bitmap                                                   pbm
+image/x-portable-graymap                                                  pgm
+image/x-portable-pixmap                                                   ppm
+image/x-rgb                                                               rgb
+image/x-tga                                                               tga
+image/x-xbitmap                                                           xbm
+image/x-xpixmap                                                           xpm
+image/x-xwindowdump                                                       xwd
+message/rfc822                                                            eml mime
+model/iges                                                                igs iges
+model/mesh                                                                msh mesh silo
+model/vnd.collada+xml                                                     dae
+model/vnd.dwf                                                             dwf
+model/vnd.gdl                                                             gdl
+model/vnd.gtw                                                             gtw
+model/vnd.mts                                                             mts
+model/vnd.vtu                                                             vtu
+model/vrml                                                                wrl vrml
+model/x3d+binary                                                          x3db x3dbz
+model/x3d+vrml                                                            x3dv x3dvz
+model/x3d+xml                                                             x3d x3dz
+text/cache-manifest                                                       appcache manifest
+text/calendar                                                             ics ifb
+text/coffeescript                                                         coffee litcoffee
+text/css                                                                  css
+text/csv                                                                  csv
+text/hjson                                                                hjson
+text/html                                                                 html htm shtml
+text/jade                                                                 jade
+text/jsx                                                                  jsx
+text/less                                                                 less
+text/mathml                                                               mml
+text/n3                                                                   n3
+text/plain                                                                txt text conf def list log in ini
+text/prs.lines.tag                                                        dsc
+text/richtext                                                             rtx
+text/sgml                                                                 sgml sgm
+text/stylus                                                               stylus styl
+text/tab-separated-values                                                 tsv
+text/troff                                                                t tr roff man me ms
+text/turtle                                                               ttl
+text/uri-list                                                             uri uris urls
+text/vcard                                                                vcard
+text/vnd.curl                                                             curl
+text/vnd.curl.dcurl                                                       dcurl
+text/vnd.curl.mcurl                                                       mcurl
+text/vnd.curl.scurl                                                       scurl
+text/vnd.fly                                                              fly
+text/vnd.fmi.flexstor                                                     flx
+text/vnd.graphviz                                                         gv
+text/vnd.in3d.3dml                                                        3dml
+text/vnd.in3d.spot                                                        spot
+text/vnd.sun.j2me.app-descriptor                                          jad
+text/vnd.wap.wml                                                          wml
+text/vnd.wap.wmlscript                                                    wmls
+text/vtt                                                                  vtt
+text/x-asm                                                                s asm
+text/x-c                                                                  c cc cxx cpp h hh dic
+text/x-component                                                          htc
+text/x-fortran                                                            f for f77 f90
+text/x-handlebars-template                                                hbs
+text/x-java-source                                                        java
+text/x-lua                                                                lua
+text/x-markdown                                                           markdown md mkd
+text/x-nfo                                                                nfo
+text/x-opml                                                               opml
+text/x-pascal                                                             p pas
+text/x-processing                                                         pde
+text/x-sass                                                               sass
+text/x-scss                                                               scss
+text/x-setext                                                             etx
+text/x-sfv                                                                sfv
+text/x-uuencode                                                           uu
+text/x-vcalendar                                                          vcs
+text/x-vcard                                                              vcf
+text/yaml                                                                 yaml yml
+video/3gpp                                                                3gp 3gpp
+video/3gpp2                                                               3g2
+video/h261                                                                h261
+video/h263                                                                h263
+video/h264                                                                h264
+video/jpeg                                                                jpgv
+video/jpm                                                                 jpm jpgm
+video/mj2                                                                 mj2 mjp2
+video/mp2t                                                                ts
+video/mp4                                                                 mp4 mp4v mpg4
+video/mpeg                                                                mpeg mpg mpe m1v m2v
+video/ogg                                                                 ogv
+video/quicktime                                                           qt mov
+video/vnd.dece.hd                                                         uvh uvvh
+video/vnd.dece.mobile                                                     uvm uvvm
+video/vnd.dece.pd                                                         uvp uvvp
+video/vnd.dece.sd                                                         uvs uvvs
+video/vnd.dece.video                                                      uvv uvvv
+video/vnd.dvb.file                                                        dvb
+video/vnd.fvt                                                             fvt
+video/vnd.mpegurl                                                         mxu m4u
+video/vnd.ms-playready.media.pyv                                          pyv
+video/vnd.uvvu.mp4                                                        uvu uvvu
+video/vnd.vivo                                                            viv
+video/webm                                                                webm
+video/x-f4v                                                               f4v
+video/x-fli                                                               fli
+video/x-flv                                                               flv
+video/x-m4v                                                               m4v
+video/x-matroska                                                          mkv mk3d mks
+video/x-mng                                                               mng
+video/x-ms-asf                                                            asf asx
+video/x-ms-vob                                                            vob
+video/x-ms-wm                                                             wm
+video/x-ms-wmv                                                            wmv
+video/x-ms-wmx                                                            wmx
+video/x-ms-wvx                                                            wvx
+video/x-msvideo                                                           avi
+video/x-sgi-movie                                                         movie
+video/x-smv                                                               smv
+x-conference/x-cooltalk                                                   ice

lib/jekyll/page.rb

@@ -7,14 +7,27 @@ module Jekyll
     attr_accessor :name, :ext, :basename
     attr_accessor :data, :content, :output
 
+    alias_method :extname, :ext
+
+    FORWARD_SLASH = '/'.freeze
+
     # Attributes for Liquid templates
-    ATTRIBUTES_FOR_LIQUID = %w[
+    ATTRIBUTES_FOR_LIQUID = %w(
       content
       dir
       name
       path
       url
-    ]
+    )
+
+    # A set of extensions that are considered HTML or HTML-like so we
+    # should not alter them,  this includes .xhtml through XHTM5.
+
+    HTML_EXTENSIONS = %W(
+      .html
+      .xhtml
+      .htm
+    )
 
     # Initialize a new Page.
     #
@@ -28,13 +41,14 @@ module Jekyll
       @dir  = dir
       @name = name
 
-
       process(name)
       read_yaml(File.join(base, dir), name)
 
-      data.default_proc = proc do |hash, key|
+      data.default_proc = proc do |_, key|
         site.frontmatter_defaults.find(File.join(dir, name), type, key)
       end
+
+      Jekyll::Hooks.trigger :pages, :post_init, self
     end
 
     # The generated directory into which the page will be placed
@@ -43,7 +57,12 @@ module Jekyll
     #
     # Returns the String destination directory.
     def dir
-      url[-1, 1] == '/' ? url : File.dirname(url)
+      if url.end_with?(FORWARD_SLASH)
+        url
+      else
+        url_dir = File.dirname(url)
+        url_dir.end_with?(FORWARD_SLASH) ? url_dir : "#{url_dir}/"
+      end
     end
 
     # The full path and filename of the post. Defined in the YAML of the post
@@ -51,28 +70,19 @@ module Jekyll
     #
     # Returns the String permalink or nil if none has been set.
     def permalink
-      return nil if data.nil? || data['permalink'].nil?
-      if site.config['relative_permalinks']
-        File.join(@dir, data['permalink'])
-      else
-        data['permalink']
-      end
+      data.nil? ? nil : data['permalink']
     end
 
     # The template of the permalink.
     #
     # Returns the template String.
     def template
-      if site.permalink_style == :pretty
-        if index? && html?
-          "/:path/"
-        elsif html?
-          "/:path/:basename/"
-        else
-          "/:path/:basename:output_ext"
-        end
-      else
+      if !html?
         "/:path/:basename:output_ext"
+      elsif index?
+        "/:path/"
+      else
+        Utils.add_permalink_suffix("/:path/:basename", site.permalink_style)
       end
     end
 
@@ -104,7 +114,7 @@ module Jekyll
     # Returns nothing.
     def process(name)
       self.ext = File.extname(name)
-      self.basename = name[0 .. -ext.length - 1]
+      self.basename = name[0..-ext.length - 1]
     end
 
     # Add any necessary layouts to this post
@@ -114,12 +124,10 @@ module Jekyll
     #
     # Returns nothing.
     def render(layouts, site_payload)
-      payload = Utils.deep_merge_hashes({
-        "page" => to_liquid,
-        'paginator' => pager.to_liquid
-      }, site_payload)
+      site_payload["page"] = to_liquid
+      site_payload["paginator"] = pager.to_liquid
 
-      do_layout(payload, layouts)
+      do_layout(site_payload, layouts)
     end
 
     # The path to the source file
@@ -141,7 +149,8 @@ module Jekyll
     # Returns the destination file path String.
     def destination(dest)
       path = site.in_dest_dir(dest, URL.unescape_path(url))
-      path = File.join(path, "index.html") if url =~ /\/$/
+      path = File.join(path, "index") if url.end_with?("/")
+      path << output_ext unless path.end_with? output_ext
       path
     end
 
@@ -152,7 +161,7 @@ module Jekyll
 
     # Returns the Boolean of whether this Page is HTML or not.
     def html?
-      output_ext == '.html'
+      HTML_EXTENSIONS.include?(output_ext)
     end
 
     # Returns the Boolean of whether this Page is an index file or not.
@@ -160,8 +169,12 @@ module Jekyll
       basename == 'index'
     end
 
-    def uses_relative_permalinks
-      permalink && !@dir.empty? && site.config['relative_permalinks']
+    def trigger_hooks(hook_name, *args)
+      Jekyll::Hooks.trigger :pages, hook_name, self, *args
+    end
+
+    def write?
+      true
     end
   end
 end

lib/jekyll/plugin.rb

@@ -1,20 +1,39 @@
 module Jekyll
   class Plugin
-    PRIORITIES = { :lowest => -100,
-                   :low => -10,
-                   :normal => 0,
-                   :high => 10,
-                   :highest => 100 }
+    PRIORITIES = {
+      :low => -10,
+      :highest => 100,
+      :lowest => -100,
+      :normal => 0,
+      :high => 10
+    }
 
-    # Fetch all the subclasses of this class and its subclasses' subclasses.
     #
-    # Returns an array of descendant classes.
-    def self.descendants
-      descendants = []
-      ObjectSpace.each_object(singleton_class) do |k|
-        descendants.unshift k unless k == self
+
+    def self.inherited(const)
+      return catch_inheritance(const) do |const_|
+        catch_inheritance(const_)
       end
-      descendants
+    end
+
+    #
+
+    def self.catch_inheritance(const)
+      const.define_singleton_method :inherited do |const_|
+        (@children ||= Set.new).add const_
+        if block_given?
+          yield const_
+        end
+      end
+    end
+
+    #
+
+    def self.descendants
+      @children ||= Set.new
+      out = @children.map(&:descendants)
+      out << self unless superclass == Plugin
+      Set.new(out).flatten
     end
 
     # Get or set the priority of this plugin. When called without an

lib/jekyll/plugin_manager.rb

@@ -17,18 +17,14 @@ module Jekyll
     def conscientious_require
       require_plugin_files
       require_gems
+      deprecation_checks
     end
 
     # Require each of the gem plugins specified.
     #
     # Returns nothing.
     def require_gems
-      site.gems.each do |gem|
-        if plugin_allowed?(gem)
-          Jekyll.logger.debug("PluginManager:", "Requiring #{gem}")
-          require gem
-        end
-      end
+      Jekyll::External.require_with_graceful_fail(site.gems.select { |gem| plugin_allowed?(gem) })
     end
 
     def self.require_from_bundler
@@ -69,10 +65,9 @@ module Jekyll
     # Returns nothing.
     def require_plugin_files
       unless site.safe
-        plugins_path.each do |plugins|
-          Dir[File.join(plugins, "**", "*.rb")].sort.each do |f|
-            require f
-          end
+        plugins_path.each do |plugin_search_path|
+          plugin_files = Utils.safe_glob(plugin_search_path, File.join("**", "*.rb"))
+          Jekyll::External.require_with_graceful_fail(plugin_files)
         end
       end
     end
@@ -81,12 +76,20 @@ module Jekyll
     #
     # Returns an Array of plugin search paths
     def plugins_path
-      if (site.config['plugins'] == Jekyll::Configuration::DEFAULTS['plugins'])
-        [site.in_source_dir(site.config['plugins'])]
+      if site.config['plugins_dir'].eql? Jekyll::Configuration::DEFAULTS['plugins_dir']
+        [site.in_source_dir(site.config['plugins_dir'])]
       else
-        Array(site.config['plugins']).map { |d| File.expand_path(d) }
+        Array(site.config['plugins_dir']).map { |d| File.expand_path(d) }
       end
     end
 
+    def deprecation_checks
+      pagination_included = (site.config['gems'] || []).include?('jekyll-paginate') || defined?(Jekyll::Paginate)
+      if site.config['paginate'] && !pagination_included
+        Jekyll::Deprecator.deprecation_message "You appear to have pagination " \
+          "turned on, but you haven't included the `jekyll-paginate` gem. " \
+          "Ensure you have `gems: [jekyll-paginate]` in your configuration file."
+      end
+    end
   end
 end

lib/jekyll/post.rb

@@ -1,313 +0,0 @@
-module Jekyll
-  class Post
-    include Comparable
-    include Convertible
-
-    # Valid post name regex.
-    MATCHER = /^(.+\/)*(\d+-\d+-\d+)-(.*)(\.[^.]+)$/
-
-    EXCERPT_ATTRIBUTES_FOR_LIQUID = %w[
-      title
-      url
-      dir
-      date
-      id
-      categories
-      next
-      previous
-      tags
-      path
-    ]
-
-    # Attributes for Liquid templates
-    ATTRIBUTES_FOR_LIQUID = EXCERPT_ATTRIBUTES_FOR_LIQUID + %w[
-      content
-      excerpt
-    ]
-
-    # Post name validator. Post filenames must be like:
-    # 2008-11-05-my-awesome-post.textile
-    #
-    # Returns true if valid, false if not.
-    def self.valid?(name)
-      name =~ MATCHER
-    end
-
-    attr_accessor :site
-    attr_accessor :data, :extracted_excerpt, :content, :output, :ext
-    attr_accessor :date, :slug, :tags, :categories
-
-    attr_reader :name
-
-    # Initialize this Post instance.
-    #
-    # site       - The Site.
-    # base       - The String path to the dir containing the post file.
-    # name       - The String filename of the post file.
-    #
-    # Returns the new Post.
-    def initialize(site, source, dir, name)
-      @site = site
-      @dir = dir
-      @base = containing_dir(dir)
-      @name = name
-
-      self.categories = dir.downcase.split('/').reject { |x| x.empty? }
-      process(name)
-      read_yaml(@base, name)
-
-      data.default_proc = proc do |hash, key|
-        site.frontmatter_defaults.find(File.join(dir, name), type, key)
-      end
-
-      if data.key?('date')
-        self.date = Utils.parse_date(data["date"].to_s, "Post '#{relative_path}' does not have a valid date in the YAML front matter.")
-      end
-
-      populate_categories
-      populate_tags
-    end
-
-    def published?
-      if data.key?('published') && data['published'] == false
-        false
-      else
-        true
-      end
-    end
-
-    def populate_categories
-      categories_from_data = Utils.pluralized_array_from_hash(data, 'category', 'categories')
-      self.categories = (
-        Array(categories) + categories_from_data
-      ).map {|c| c.to_s.downcase}.flatten.uniq
-    end
-
-    def populate_tags
-      self.tags = Utils.pluralized_array_from_hash(data, "tag", "tags").flatten
-    end
-
-    # Get the full path to the directory containing the post files
-    def containing_dir(dir)
-      site.in_source_dir(dir, '_posts')
-    end
-
-    # Read the YAML frontmatter.
-    #
-    # base - The String path to the dir containing the file.
-    # name - The String filename of the file.
-    #
-    # Returns nothing.
-    def read_yaml(base, name)
-      super(base, name)
-      self.extracted_excerpt = extract_excerpt
-    end
-
-    # The post excerpt. This is either a custom excerpt
-    # set in YAML front matter or the result of extract_excerpt.
-    #
-    # Returns excerpt string.
-    def excerpt
-      data.fetch('excerpt') { extracted_excerpt.to_s }
-    end
-
-    # Public: the Post title, from the YAML Front-Matter or from the slug
-    #
-    # Returns the post title
-    def title
-      data.fetch('title') { titleized_slug }
-    end
-
-    # Turns the post slug into a suitable title
-    def titleized_slug
-      slug.split('-').select {|w| w.capitalize! || w }.join(' ')
-    end
-
-    # Public: the path to the post relative to the site source,
-    #         from the YAML Front-Matter or from a combination of
-    #         the directory it's in, "_posts", and the name of the
-    #         post file
-    #
-    # Returns the path to the file relative to the site source
-    def path
-      data.fetch('path') { relative_path.sub(/\A\//, '') }
-    end
-
-    # The path to the post source file, relative to the site source
-    def relative_path
-      File.join(*[@dir, "_posts", @name].map(&:to_s).reject(&:empty?))
-    end
-
-    # Compares Post objects. First compares the Post date. If the dates are
-    # equal, it compares the Post slugs.
-    #
-    # other - The other Post we are comparing to.
-    #
-    # Returns -1, 0, 1
-    def <=>(other)
-      cmp = self.date <=> other.date
-      if 0 == cmp
-       cmp = self.slug <=> other.slug
-      end
-      return cmp
-    end
-
-    # Extract information from the post filename.
-    #
-    # name - The String filename of the post file.
-    #
-    # Returns nothing.
-    def process(name)
-      m, cats, date, slug, ext = *name.match(MATCHER)
-      self.date = Utils.parse_date(date, "Post '#{relative_path}' does not have a valid date in the filename.")
-      self.slug = slug
-      self.ext = ext
-    end
-
-    # The generated directory into which the post will be placed
-    # upon generation. This is derived from the permalink or, if
-    # permalink is absent, set to the default date
-    # e.g. "/2008/11/05/" if the permalink style is :date, otherwise nothing.
-    #
-    # Returns the String directory.
-    def dir
-      File.dirname(url)
-    end
-
-    # The full path and filename of the post. Defined in the YAML of the post
-    # body (optional).
-    #
-    # Returns the String permalink.
-    def permalink
-      data && data['permalink']
-    end
-
-    def template
-      case site.permalink_style
-      when :pretty
-        "/:categories/:year/:month/:day/:title/"
-      when :none
-        "/:categories/:title.html"
-      when :date
-        "/:categories/:year/:month/:day/:title.html"
-      when :ordinal
-        "/:categories/:year/:y_day/:title.html"
-      else
-        site.permalink_style.to_s
-      end
-    end
-
-    # The generated relative url of this post.
-    #
-    # Returns the String url.
-    def url
-      @url ||= URL.new({
-        :template => template,
-        :placeholders => url_placeholders,
-        :permalink => permalink
-      }).to_s
-    end
-
-    # Returns a hash of URL placeholder names (as symbols) mapping to the
-    # desired placeholder replacements. For details see "url.rb"
-    def url_placeholders
-      {
-        :year        => date.strftime("%Y"),
-        :month       => date.strftime("%m"),
-        :day         => date.strftime("%d"),
-        :title       => slug,
-        :i_day       => date.strftime("%-d"),
-        :i_month     => date.strftime("%-m"),
-        :categories  => (categories || []).map { |c| c.to_s }.join('/'),
-        :short_month => date.strftime("%b"),
-        :short_year  => date.strftime("%y"),
-        :y_day       => date.strftime("%j"),
-        :output_ext  => output_ext
-      }
-    end
-
-    # The UID for this post (useful in feeds).
-    # e.g. /2008/11/05/my-awesome-post
-    #
-    # Returns the String UID.
-    def id
-      File.join(dir, slug)
-    end
-
-    # Calculate related posts.
-    #
-    # Returns an Array of related Posts.
-    def related_posts(posts)
-      Jekyll::RelatedPosts.new(self).build
-    end
-
-    # Add any necessary layouts to this post.
-    #
-    # layouts      - A Hash of {"name" => "layout"}.
-    # site_payload - The site payload hash.
-    #
-    # Returns nothing.
-    def render(layouts, site_payload)
-      # construct payload
-      payload = Utils.deep_merge_hashes({
-        "site" => { "related_posts" => related_posts(site_payload["site"]["posts"]) },
-        "page" => to_liquid(self.class::EXCERPT_ATTRIBUTES_FOR_LIQUID)
-      }, site_payload)
-
-      if generate_excerpt?
-        extracted_excerpt.do_layout(payload, {})
-      end
-
-      do_layout(payload.merge({"page" => to_liquid}), layouts)
-    end
-
-    # Obtain destination path.
-    #
-    # dest - The String path to the destination dir.
-    #
-    # Returns destination file path String.
-    def destination(dest)
-      # The url needs to be unescaped in order to preserve the correct filename
-      path = site.in_dest_dir(dest, URL.unescape_path(url))
-      path = File.join(path, "index.html") if path[/\.html?$/].nil?
-      path
-    end
-
-    # Returns the shorthand String identifier of this Post.
-    def inspect
-      "<Post: #{id}>"
-    end
-
-    def next
-      pos = site.posts.index {|post| post.equal?(self) }
-      if pos && pos < site.posts.length - 1
-        site.posts[pos + 1]
-      else
-        nil
-      end
-    end
-
-    def previous
-      pos = site.posts.index {|post| post.equal?(self) }
-      if pos && pos > 0
-        site.posts[pos - 1]
-      else
-        nil
-      end
-    end
-
-    protected
-
-    def extract_excerpt
-      if generate_excerpt?
-        Jekyll::Excerpt.new(self)
-      else
-        ""
-      end
-    end
-
-    def generate_excerpt?
-      !(site.config['excerpt_separator'].to_s.empty?)
-    end
-  end
-end

lib/jekyll/publisher.rb

@@ -15,7 +15,7 @@ module Jekyll
     end
 
     def hidden_in_the_future?(thing)
-      thing.is_a?(Post) && !@site.future && thing.date > @site.time
+      thing.respond_to?(:date) && !@site.future && thing.date.to_i > @site.time.to_i
     end
   end
-end
+end

lib/jekyll/reader.rb

@@ -0,0 +1,126 @@
+# encoding: UTF-8
+require 'csv'
+
+module Jekyll
+  class Reader
+    attr_reader :site
+
+    def initialize(site)
+      @site = site
+    end
+
+    # Read Site data from disk and load it into internal data structures.
+    #
+    # Returns nothing.
+    def read
+      @site.layouts = LayoutReader.new(site).read
+      read_directories
+      sort_files!
+      @site.data = DataReader.new(site).read(site.config['data_dir'])
+      CollectionReader.new(site).read
+    end
+
+    # Sorts posts, pages, and static files.
+    def sort_files!
+      site.collections.values.each { |c| c.docs.sort! }
+      site.pages.sort_by!(&:name)
+      site.static_files.sort_by!(&:relative_path)
+    end
+
+    # Recursively traverse directories to find pages and static files
+    # that will become part of the site according to the rules in
+    # filter_entries.
+    #
+    # dir - The String relative path of the directory to read. Default: ''.
+    #
+    # Returns nothing.
+    def read_directories(dir = '')
+      base = site.in_source_dir(dir)
+
+      dot = Dir.chdir(base) { filter_entries(Dir.entries('.'), base) }
+      dot_dirs = dot.select { |file| File.directory?(@site.in_source_dir(base, file)) }
+      dot_files = (dot - dot_dirs)
+      dot_pages = dot_files.select { |file| Utils.has_yaml_header?(@site.in_source_dir(base, file)) }
+      dot_static_files = dot_files - dot_pages
+
+      retrieve_posts(dir)
+      retrieve_dirs(base, dir, dot_dirs)
+      retrieve_pages(dir, dot_pages)
+      retrieve_static_files(dir, dot_static_files)
+    end
+
+    # Retrieves all the posts(posts/drafts) from the given directory
+    # and add them to the site and sort them.
+    #
+    # dir - The String representing the directory to retrieve the posts from.
+    #
+    # Returns nothing.
+    def retrieve_posts(dir)
+      site.posts.docs.concat(PostReader.new(site).read_posts(dir))
+      site.posts.docs.concat(PostReader.new(site).read_drafts(dir)) if site.show_drafts
+    end
+
+    # Recursively traverse directories with the read_directories function.
+    #
+    # base - The String representing the site's base directory.
+    # dir - The String representing the directory to traverse down.
+    # dot_dirs - The Array of subdirectories in the dir.
+    #
+    # Returns nothing.
+    def retrieve_dirs(_base, dir, dot_dirs)
+      dot_dirs.map 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.sub(/\/$/, '') == dir_path
+      end
+    end
+
+    # Retrieve all the pages from the current directory,
+    # add them to the site and sort them.
+    #
+    # dir - The String representing the directory retrieve the pages from.
+    # dot_pages - The Array of pages in the dir.
+    #
+    # Returns nothing.
+    def retrieve_pages(dir, dot_pages)
+      site.pages.concat(PageReader.new(site, dir).read(dot_pages))
+    end
+
+    # Retrieve all the static files from the current directory,
+    # add them to the site and sort them.
+    #
+    # dir - The directory retrieve the static files from.
+    # dot_static_files - The static files in the dir.
+    #
+    # Returns nothing.
+    def retrieve_static_files(dir, dot_static_files)
+      site.static_files.concat(StaticFileReader.new(site, dir).read(dot_static_files))
+    end
+
+    # Filter out any files/directories that are hidden or backup files (start
+    # with "." or "#" or end with "~"), or contain site content (start with "_"),
+    # or are excluded in the site configuration, unless they are web server
+    # files such as '.htaccess'.
+    #
+    # entries - The Array of String file/directory entries to filter.
+    # base_directory - The string representing the optional base directory.
+    #
+    # Returns the Array of filtered entries.
+    def filter_entries(entries, base_directory = nil)
+      EntryFilter.new(site, base_directory).filter(entries)
+    end
+
+    # Read the entries from a particular directory for processing
+    #
+    # dir - The String representing the relative path of the directory to read.
+    # subfolder - The String representing the directory to read.
+    #
+    # Returns the list of entries to process
+    def get_entries(dir, subfolder)
+      base = site.in_source_dir(dir, subfolder)
+      return [] unless File.exist?(base)
+      entries = Dir.chdir(base) { filter_entries(Dir['**/*'], base) }
+      entries.delete_if { |e| File.directory?(site.in_source_dir(base, e)) }
+    end
+  end
+end

lib/jekyll/readers/collection_reader.rb

@@ -0,0 +1,20 @@
+module Jekyll
+  class CollectionReader
+    SPECIAL_COLLECTIONS = %w(posts data).freeze
+
+    attr_reader :site, :content
+    def initialize(site)
+      @site = site
+      @content = {}
+    end
+
+    # Read in all collections specified in the configuration
+    #
+    # Returns nothing.
+    def read
+      site.collections.each do |_, collection|
+        collection.read unless SPECIAL_COLLECTIONS.include?(collection.label)
+      end
+    end
+  end
+end

lib/jekyll/readers/data_reader.rb

@@ -0,0 +1,69 @@
+module Jekyll
+  class DataReader
+    attr_reader :site, :content
+    def initialize(site)
+      @site = site
+      @content = {}
+    end
+
+    # Read all the files in <source>/<dir>/_drafts and create a new Draft
+    # object with each one.
+    #
+    # dir - The String relative path of the directory to read.
+    #
+    # Returns nothing.
+    def read(dir)
+      base = site.in_source_dir(dir)
+      read_data_to(base, @content)
+      @content
+    end
+
+    # Read and parse all yaml files under <dir> and add them to the
+    # <data> variable.
+    #
+    # dir - The string absolute path of the directory to read.
+    # data - The variable to which data will be added.
+    #
+    # Returns nothing
+    def read_data_to(dir, data)
+      return unless File.directory?(dir) && (!site.safe || !File.symlink?(dir))
+
+      entries = Dir.chdir(dir) do
+        Dir['*.{yaml,yml,json,csv}'] + Dir['*'].select { |fn| File.directory?(fn) }
+      end
+
+      entries.each do |entry|
+        path = @site.in_source_dir(dir, entry)
+        next if File.symlink?(path) && site.safe
+
+        key = sanitize_filename(File.basename(entry, '.*'))
+        if File.directory?(path)
+          read_data_to(path, data[key] = {})
+        else
+          data[key] = read_data_file(path)
+        end
+      end
+    end
+
+    # Determines how to read a data file.
+    #
+    # Returns the contents of the data file.
+    def read_data_file(path)
+      case File.extname(path).downcase
+      when '.csv'
+        CSV.read(path, {
+                         :headers => true,
+                         :encoding => site.config['encoding']
+                     }).map(&:to_hash)
+      else
+        SafeYAML.load_file(path)
+      end
+    end
+
+    def sanitize_filename(name)
+      name.gsub!(/[^\w\s-]+/, '')
+      name.gsub!(/(^|\b\s)\s+($|\s?\b)/, '\\1\\2')
+      name.gsub(/\s+/, '_')
+    end
+  end
+end

lib/jekyll/readers/layout_reader.rb

@@ -38,11 +38,11 @@ module Jekyll
     end
 
     def layout_directory_inside_source
-      site.in_source_dir(site.config['layouts'])
+      site.in_source_dir(site.config['layouts_dir'])
     end
 
     def layout_directory_in_cwd
-      dir = Jekyll.sanitized_path(Dir.pwd, site.config['layouts'])
+      dir = Jekyll.sanitized_path(Dir.pwd, site.config['layouts_dir'])
       if File.directory?(dir) && !site.safe
         dir
       else

lib/jekyll/readers/page_reader.rb

@@ -0,0 +1,21 @@
+module Jekyll
+  class PageReader
+    attr_reader :site, :dir, :unfiltered_content
+    def initialize(site, dir)
+      @site = site
+      @dir = dir
+      @unfiltered_content = []
+    end
+
+    # Read all the files in <source>/<dir>/ for Yaml header and create a new Page
+    # object for each file.
+    #
+    # dir - The String relative path of the directory to read.
+    #
+    # Returns an array of static pages.
+    def read(files)
+      files.map { |page| @unfiltered_content << Page.new(@site, @site.source, @dir, page) }
+      @unfiltered_content.select { |page| site.publisher.publish?(page) }
+    end
+  end
+end

lib/jekyll/readers/post_reader.rb

@@ -0,0 +1,62 @@
+module Jekyll
+  class PostReader
+    attr_reader :site, :unfiltered_content
+    def initialize(site)
+      @site = site
+    end
+
+    # Read all the files in <source>/<dir>/_drafts and create a new
+    # Document object with each one.
+    #
+    # dir - The String relative path of the directory to read.
+    #
+    # Returns nothing.
+    def read_drafts(dir)
+      read_publishable(dir, '_drafts', Document::DATELESS_FILENAME_MATCHER)
+    end
+
+    # Read all the files in <source>/<dir>/_posts and create a new Document
+    # object with each one.
+    #
+    # dir - The String relative path of the directory to read.
+    #
+    # Returns nothing.
+    def read_posts(dir)
+      read_publishable(dir, '_posts', Document::DATE_FILENAME_MATCHER)
+    end
+
+    # Read all the files in <source>/<dir>/<magic_dir> and create a new
+    # Document object with each one insofar as it matches the regexp matcher.
+    #
+    # dir - The String relative path of the directory to read.
+    #
+    # Returns nothing.
+    def read_publishable(dir, magic_dir, matcher)
+      read_content(dir, magic_dir, matcher).tap do |docs|
+        docs.each(&:read)
+      end.select do |doc|
+        site.publisher.publish?(doc)
+      end
+    end
+
+    # Read all the content files from <source>/<dir>/magic_dir
+    #   and return them with the type klass.
+    #
+    # dir - The String relative path of the directory to read.
+    # magic_dir - The String relative directory to <dir>,
+    #   looks for content here.
+    # klass - The return type of the content.
+    #
+    # Returns klass type of content files
+    def read_content(dir, magic_dir, matcher)
+      @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
+        })
+      end.reject(&:nil?)
+    end
+  end
+end