Regenerated gemspec for version 0.4.5

Conflicts:
	README.textile
	lib/jekyll/post.rb
	test/test_post.rb

.gitignore

@@ -1,17 +1,5 @@
-Gemfile.lock
-test/dest
+test/dest/
 *.gem
 pkg/
 *.swp
 *~
-_site/
-.bundle/
-.DS_Store
-bbin/
-gh-pages/
-site/_site/
-coverage
-.ruby-version
-.sass-cache
-tmp/stackprof-*
-.jekyll-metadata

.travis.yml

@@ -1,26 +0,0 @@
-language: ruby
-cache: bundler
-sudo: false
-rvm:
-- 2.2
-- 2.1
-- 2.0
-env:
-  matrix:
-  - TEST_SUITE=test
-  - TEST_SUITE=cucumber
-before_script: bundle update
-script: script/cibuild
-notifications:
-  irc:
-    on_success: change
-    on_failure: change
-    channels:
-    - irc.freenode.org#jekyll
-    template:
-    - "%{repository}#%{build_number} (%{branch}) %{message} %{build_url}"
-  email:
-    on_success: never
-    on_failure: never
-  slack:
-    secure: dNdKk6nahNURIUbO3ULhA09/vTEQjK0fNbgjVjeYPEvROHgQBP1cIP3AJy8aWs8rl5Yyow4YGEilNRzKPz18AsFptVXofpwyqcBxaCfmHP809NX5PHBaadydveLm+TNVao2XeLXSWu+HUNAYO1AanCUbJSEyJTju347xCBGzESU=

CONTRIBUTING.markdown

@@ -1,91 +0,0 @@
-Contribute
-==========
-
-So you've got an awesome idea to throw into Jekyll. Great! Please keep the
-following in mind:
-
-* **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).
-* 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,
-  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.
-* Please do your best to submit **small pull requests**. The easier the proposed
-  change is to review, the more likely it will be merged.
-* When submitting a pull request, please make judicious use of the pull request
-  body. A description of what changes were made, the motivations behind the
-  changes and [any tasks completed or left to complete](http://git.io/gfm-tasks)
-  will also speed up review time.
-
-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!
-
-    $ bundle
-
-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
-
-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` ).
-* 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`.
-* 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
-  does and the why you think it should be merged.
-
-Updating Documentation
-----------------------
-
-We want the Jekyll documentation to be the best it can be. We've
-open-sourced our docs and we welcome any pull requests if you find it
-lacking.
-
-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
-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.
-
-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.
-* 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.
-* Please don't tag your GitHub issue with [fix], [feature], etc. The maintainers
-  actively read the issues and will label it once they come across it.
-
-Finally...
-----------
-
-Thanks! Hacking on Jekyll should be fun. If you find any of this hard to figure
-out, let us know so we can improve our process or documentation!

Gemfile

@@ -1,29 +0,0 @@
-source 'https://rubygems.org'
-gemspec
-
-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")
-
-if ENV['BENCHMARK']
-  gem 'benchmark-ips'
-  gem 'rbtrace'
-  gem 'stackprof'
-end

History.txt

@@ -0,0 +1,105 @@
+==
+  * Minor Enhancements
+    * Ability to set post categories via YAML [github.com/qrush]
+    * Ability to set prevent a post from publishing via YAML [github.com/qrush]
+    * Add textilize filter [github.com/willcodeforfoo]
+  * Bug Fixes
+    * Use block syntax of popen4 to ensure that subprocesses are properly disposed [github.com/jqr]
+
+== 0.4.1
+  * Minor Enhancements
+    * Changed date format on wordpress converter (zeropadding) [github.com/dysinger]
+  * Bug Fixes
+    * Add jekyll binary as executable to gemspec [github.com/dysinger]
+
+== 0.4.0 / 2009-02-03
+  * Major Enhancements
+    * Switch to Jeweler for packaging tasks
+  * Minor Enhancements
+    * Type importer [github.com/codeslinger]
+    * site.topics accessor [github.com/baz]
+    * Add array_to_sentence_string filter [github.com/mchung]
+    * Add a converter for textpattern [github.com/PerfectlyNormal]
+    * Add a working Mephisto / MySQL converter [github.com/ivey]
+    * Allowing .htaccess files to be copied over into the generated site [github.com/briandoll]
+    * Add option to not put file date in permalink URL [github.com/mreid]
+    * Add line number capabilities to highlight blocks [github.com/jcon]
+  * Bug Fixes
+    * Fix permalink behavior [github.com/cavalle]
+    * Fixed an issue with pygments, markdown, and newlines [github.com/zpinter]
+    * Ampersands need to be escaped [github.com/pufuwozu, github.com/ap]
+    * Test and fix the site.categories hash [github.com/zzot]
+    * Fix site payload available to files [github.com/matrix9180]
+
+== 0.3.0 / 2008-12-24
+  * Major Enhancements
+    * Added --server option to start a simple WEBrick server on destination directory [github.com/johnreilly and github.com/mchung]
+  * Minor Enhancements
+    * Added post categories based on directories containing _posts [github.com/mreid]
+    * Added post topics based on directories underneath _posts
+    * Added new date filter that shows the full month name [github.com/mreid]
+    * Merge Post's YAML front matter into its to_liquid payload [github.com/remi]
+    * Restrict includes to regular files underneath _includes
+  * Bug Fixes
+    * Change YAML delimiter matcher so as to not chew up 2nd level markdown headers [github.com/mreid]
+    * Fix bug that meant page data (such as the date) was not available in templates [github.com/mreid]
+    * Properly reject directories in _layouts
+
+== 0.2.1 / 2008-12-15
+  * Major Changes
+    * Use Maruku (pure Ruby) for Markdown by default [github.com/mreid]
+    * Allow use of RDiscount with --rdiscount flag
+  * Minor Enhancements
+    * Don't load directory_watcher unless it's needed [github.com/pjhyett]
+
+== 0.2.0 / 2008-12-14
+  * Major Changes
+    * related_posts is now found in site.related_posts
+
+== 0.1.6 / 2008-12-13
+  * Major Features
+    * Include files in _includes with {% include x.textile %}
+
+== 0.1.5 / 2008-12-12
+  * Major Features
+    * Code highlighting with Pygments if --pygments is specified
+    * Disable true LSI by default, enable with --lsi
+  * Minor Enhancements
+    * Output informative message if RDiscount is not available [github.com/JackDanger]
+  * Bug Fixes
+    * Prevent Jekyll from picking up the output directory as a source [github.com/JackDanger]
+    * Skip related_posts when there is only one post [github.com/JackDanger]
+
+== 0.1.4 / 2008-12-08
+  * Bug Fixes
+    * DATA does not work properly with rubygems
+
+== 0.1.3 / 2008-12-06
+  * Major Features
+    * Markdown support [github.com/vanpelt]
+    * Mephisto and CSV converters [github.com/vanpelt]
+    * Code hilighting [github.com/vanpelt]
+    * Autobuild
+  * Bug Fixes
+    * Accept both \r\n and \n in YAML header [github.com/vanpelt]
+
+== 0.1.2 / 2008-11-22
+  * Major Features
+    * Add a real "related posts" implementation using Classifier
+  * Command Line Changes
+    * Allow cli to be called with 0, 1, or 2 args intuiting dir paths
+      if they are omitted
+
+== 0.1.1 / 2008-11-22
+  * Minor Additions
+    * Posts now support introspectional data e.g. {{ page.url }}
+
+== 0.1.0 / 2008-11-05
+  * First release
+    * Converts posts written in Textile
+    * Converts regular site pages
+    * Simple copy of binary files
+
+== 0.0.0 / 2008-10-19
+  * Birthday!
+

LICENSE

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2008-2014 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
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

README.markdown

@@ -1,36 +0,0 @@
-# [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)
-
-By Tom Preston-Werner, Nick Quaranto, Parker Moore, and many [awesome contributors](https://github.com/jekyll/jekyll/graphs/contributors)!
-
-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.
-
-## Philosophy
-
-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.
-
-## 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/).
-
-## Diving In
-
-* [Migrate](http://import.jekyllrb.com/docs/home/) from your previous system
-* Learn how the [YAML Front Matter](http://jekyllrb.com/docs/frontmatter/) works
-* Put information on your site with [Variables](http://jekyllrb.com/docs/variables/)
-* Customize the [Permalinks](http://jekyllrb.com/docs/permalinks/) your posts are generated with
-* Use the built-in [Liquid Extensions](http://jekyllrb.com/docs/templates/) to make your life easier
-* Use custom [Plugins](http://jekyllrb.com/docs/plugins/) to generate content specific to your site
-
-## License
-
-See [LICENSE](https://github.com/jekyll/jekyll/blob/master/LICENSE).

README.textile

@@ -0,0 +1,499 @@
+h1. Jekyll LOL
+
+Jekyll is a simple, blog aware, static site generator. It takes a template
+directory (representing the raw form of a website), runs it through Textile or
+Markdown and Liquid converters, and spits out a complete, static website
+suitable for serving with Apache or your favorite web server. Visit
+"http://tom.preston-werner.com":http://tom.preston-werner.com to see an
+example of a Jekyll generated blog.
+
+Some more changes...
+
+To understand how this all works, open up my
+"TPW":http://github.com/mojombo/tpw repo in a new browser window. I'll be
+referencing the code there.
+
+Take a look at
+"index.html":http://github.com/mojombo/tpw/tree/master/index.html. This file
+represents the homepage of the site. At the top of the file is a chunk of YAML
+that contains metadata about the file. This data tells Jekyll what layout to
+give the file, what the page's title should be, etc. In this case, I specify
+that the "default" template should be used. You can find the layout files in
+the "_layouts":http://github.com/mojombo/tpw/tree/master/_layouts directory.
+If you open
+"default.html":http://github.com/mojombo/tpw/tree/master/_layouts/default.html
+you can see that the homepage is constructed by wrapping index.html with this
+layout.
+
+You'll also notice Liquid templating code in these files.
+"Liquid":http://www.liquidmarkup.org/ is a simple, extensible templating
+language that makes it easy to embed data in your templates. For my homepage I
+wanted to have a list of all my blog posts. Jekyll hands me a Hash containing
+various data about my site. A reverse chronological list of all my blog posts
+can be found in <code>site.posts</code>. Each post, in turn, contains various
+fields such as <code>title</code> and <code>date</code>.
+
+Jekyll gets the list of blog posts by parsing the files in any
+"_posts":http://github.com/mojombo/tpw/tree/master/_posts directory found in
+subdirectories below the root. 
+Each post's filename contains (by default) the publishing date and slug (what shows up in the
+URL) that the final HTML file should have. Open up the file corresponding to a
+blog post:
+"2008-11-17-blogging-like-a-hacker.textile":http://github.com/mojombo/tpw/tree/master/_posts/2008-11-17-blogging-like-a-hacker.textile.
+GitHub renders textile files by default, so to better understand the file,
+click on the
+"raw":http://github.com/mojombo/tpw/tree/master/_posts/2008-11-17-blogging-like-a-hacker.textile?raw=true
+view to see the original file. Here I've specified the <code>post</code>
+layout. If you look at that file you'll see an example of a nested layout.
+Layouts can contain other layouts allowing you a great deal of flexibility in
+how pages are assembled. In my case I use a nested layout in order to show
+related posts for each blog entry. The YAML also specifies the post's title
+which is then embedded in the post's body via Liquid.
+
+Posts are handled in a special way by Jekyll. The date you specify in the
+filename is used to construct the URL in the generated site. The example post,
+for instance, ends up at
+<code>http://tom.preston-werner.com/2008/11/17/blogging-like-a-hacker.html</code>.
+
+Categories for posts are derived from the directory structure the posts were
+found within. A post that appears in the directory foo/bar/_posts is placed in
+the categories 'foo' and 'bar'. By selecting posts from particular categories
+in your Liquid templates, you will be able to host multiple blogs within a
+site.
+
+Files that do not reside in directories prefixed with an underscore are
+mirrored into a corresponding directory structure in the generated site. If a
+file does not have a YAML preface, it is not run through the Liquid
+interpreter. Binary files are copied over unmodified.
+
+Jekyll is still a very young project. I've only developed the exact
+functionality that I've needed. As time goes on I'd like to see the project
+mature and support additional features. If you end up using Jekyll for your
+own blog, drop me a line and let me know what you'd like to see in future
+versions. Better yet, fork the project over at GitHub and hack in the features
+yourself!
+
+h2. Example Proto-Site
+
+My own personal site/blog is generated with Jekyll.
+
+The proto-site repo
+("http://github.com/mojombo/tpw":http://github.com/mojombo/tpw) is converted
+into the actual site
+("http://tom.preston-werner.com/":http://tom.preston-werner.com)
+
+h2. Install
+
+The best way to install Jekyll is via RubyGems:
+
+  $ sudo gem install mojombo-jekyll -s http://gems.github.com/
+
+Jekyll requires the gems `directory_watcher`, `liquid`, `open4`, 
+and `maruku` (for markdown support). These are automatically
+installed by the gem install command.
+
+Maruku comes with optional support for LaTeX to PNG rendering via
+"blahtex":http://gva.noekeon.org/blahtexml/ (Version 0.6) which must be in
+your $PATH along with `dvips`. 
+
+(NOTE: the version of maruku I am using is `remi-maruku` on GitHub as it
+does not assume a fixed location for `dvips`.)
+
+h2. Run
+
+  $ cd /path/to/proto/site
+  $ jekyll
+
+This will generate the site and place it in /path/to/proto/site/_site. If
+you'd like the generated site placed somewhere else:
+
+  $ jekyll /path/to/place/generated/site
+
+And if you don't want to be in the proto site root to run Jekyll:
+
+  $ jekyll /path/to/proto/site /path/to/place/generated/site
+
+h2. Run Options
+
+There is an autobuild feature that will regenerate your site if any of the
+files change. The autobuild feature can be used on any of the invocations:
+
+  $ jekyll --auto
+
+By default, the "related posts" functionality will produce crappy results.
+In order to get high quality results with a true LSI algorithm, you must
+enable it (it may take some time to run if you have many posts):
+
+  $ jekyll --lsi
+
+For static code highlighting, you can install Pygments (see below) and then
+use that to make your code blocks look pretty. To activate Pygments support
+during the conversion:
+
+  $ jekyll --pygments
+
+By default, Jekyll uses "Maruku":http://maruku.rubyforge.org (pure Ruby) for
+Markdown support. If you'd like to use RDiscount (faster, but requires
+compilation), you must install it (gem install rdiscount) and then you can
+have it used instead:
+
+  $ jekyll --rdiscount
+
+As another alternative, just because to make it a hat trick, you can also
+use BlueCloth (gem install bluecloth).
+
+  $ jekyll --bluecloth
+  
+When previewing complex sites locally, simply opening the site in a web 
+browser (using file://) can cause problems with links that are relative to
+the site root (e.g., "/stylesheets/style.css"). To get around this, Jekyll
+can launch a simple WEBrick server (works well in conjunction with --auto).
+Default port is 4000:
+
+  $ jekyll --server [PORT]
+
+By default, the permalink for each post begins with its date in 'YYYY/MM/DD'
+format. If you do not wish to have the date appear in the URL of each post, 
+you can change the permalink style to 'none' so that only the 'slug' part of
+the filename is used. For example, with the permalink style set to 'none' the
+file '2009-01-01-happy-new-year.markdown' will have a permalink like
+'http://yoursite.com/happy-new-year.html'. The date of the post will still be
+read from the filename (and is required!) to be used elsewhere in Jekyll.
+Also supported is the permalink format shortdate, which will use the YYYY/M/D
+for days and months < 10.
+Example usage:
+
+  $ jekyll --permalink none
+
+h2. Data
+
+Jekyll traverses your site looking for files to process. Any files with YAML
+front matter (see below) are subject to processing. For each of these files,
+Jekyll makes a variety of data available to the pages via the Liquid
+templating system. The following is a reference of the available data.
+
+h3. Global
+
+  site
+    Sitewide information.
+
+  page
+    For Posts, this is the union of the data in the YAML front matter and the
+    computed data (such as URL and date). For regular pages, this is just the
+    YAML front matter.
+
+  content
+    In layout files, this contains the content of the subview(s). In Posts or
+    Pages, this is undefined.
+
+h3. Site
+
+  site.time
+    The current Time (when you run the jekyll command).
+
+  site.posts
+    A reverse chronological list of all Posts.
+
+  site.related_posts
+    If the page being processed is a Post, this contains a list of up to ten
+    related Posts. By default, these are low quality but fast to compute. For
+    high quality but slow to compute results, run the jekyll command with the 
+    --lsi (latent semantic indexing) option.
+
+  site.categories.CATEGORY
+    The list of all Posts in category CATEGORY.
+
+h3. Post
+
+  post.title
+    The title of the Post.
+
+  post.url
+    The URL of the Post without the domain.
+    e.g. /2008/12/14/my-post.html
+
+  post.date
+    The Date assigned to the Post.
+
+  post.id
+    An identifier unique to the Post (useful in RSS feeds).
+    e.g. /2008/12/14/my-post
+
+  post.categories
+    The list of categories to which this post belongs. Categories are
+    derived from the directory structure above the _posts directory. For
+    example, a post at /work/code/_posts/2008-12-24-closures.textile
+    would have this field set to ['work', 'code'].
+
+  post.topics
+    The list of topics for this Post. Topics are derived from the directory
+    structure beneath the _posts directory. For example, a post at
+    /_posts/music/metal/2008-12-24-metalocalypse.textile would have this field
+    set to ['music', 'metal'].
+
+  post.content
+    The content of the Post.
+
+h2. YAML Front Matter
+
+Any files that contain a YAML front matter block will be processed by Jekyll
+as special files. The front matter must be the first thing in the file and
+takes the form of:
+
+<pre>
+---
+layout: post
+title: Blogging Like a Hacker
+---
+</pre>
+
+Between the triple-dashed lines, you can set predefined variables (see below
+for a reference) or custom data of your own.
+
+h3. Predefined Global Variables
+
+  layout
+    If set, this specifies the layout file to use. Use the layout file
+    name without file extension. Layout files must be placed in the
+    <code>_layouts</code> directory.
+
+h3. Predefined Post Variables
+
+  permalink
+    If you need your processed URLs to be something other than the default
+    /year/month/day/title.html then you can set this variable and it will
+    be used as the final URL.
+
+  published
+    Set to false if you don't want a post to show up when the site is 
+    generated.
+
+  category/categories
+    Instead of placing posts inside of folders, you can specify one or more
+    categories that the post belongs to. When the site is generated the post
+    will act as though it had been set with these categories normally.
+
+h3. Custom Variables
+
+Any variables in the front matter that are not predefined are mixed into the
+data that is sent to the Liquid templating engine during the conversion. For
+instance, if you set a <code>title</code>, you can use that in your layout to
+set the page title:
+
+<pre>
+<title>{{ page.title }}</title>
+</pre>
+
+h2. Filters, Tags, and Blocks
+
+In addition to the built-in Liquid filters, tags, and blocks, Jekyll provides
+some additional items that you can use in your site.
+
+h3. Date to XML Schema (Filter)
+
+Convert a Time into XML Schema format.
+
+  {{ site.time | date_to_xmlschema }}
+
+becomes
+
+  2008-11-17T13:07:54-08:00
+
+h3. XML Escape (Filter)
+
+Escape some text for use in XML.
+
+  {{ post.content | xml_escape }}
+
+h3. Number of Words (Filter)
+
+Count the number of words in some text.
+
+  {{ post.content | number_of_words }}
+
+becomes
+
+  1337
+
+h3. Array to Sentence String
+
+Convert an array into a sentence.
+
+  {{ page.tags | array_to_sentence_string }}
+
+becomes
+
+  foo, bar, and baz
+  
+h3. Textilize
+
+Convert a Textile-formatted string into HTML, formatted via RedCloth
+
+  {{ page.excerpt | textilize }}
+
+h3. Include (Tag)
+
+If you have small page fragments that you wish to include in multiple places
+on your site, you can use the <code>include</code> tag.
+
+<pre>{% include sig.textile %}</pre>
+
+Jekyll expects all include files to be placed in an <code>_includes</code>
+directory at the root of your source dir. So this will embed the contents of
+<code>/path/to/proto/site/_includes/sig.textile</code> into the calling file.
+
+h3. Code Highlighting (Block)
+
+Jekyll has built in support for syntax highlighting of over "100
+languages":http://pygments.org/languages/ via "Pygments":http://pygments.org/.
+In order to take advantage of this you'll need to have Pygments installed, and
+the pygmentize binary must be in your path. When you run Jekyll, make sure you
+run it with Pygments support:
+
+  $ jekyll --pygments
+
+To denote a code block that should be highlighted:
+
+<pre>
+{% highlight ruby %}
+def foo
+  puts 'foo'
+end
+{% endhighlight %}
+</pre>
+
+The argument to <code>highlight</code> is the language identifier. To find the
+appropriate identifier to use for your favorite language, look for the "short
+name" on the "Lexers":http://pygments.org/docs/lexers/ page.
+
+There is a second argument to <code>highlight</code> called
+<code>linenos</code> that is optional. Including the <code>linenos</code>
+argument will force the highlighted code to include line numbers. For
+instance, the following code block would include line numbers next to each
+line:
+
+<pre>
+{% highlight ruby linenos %}
+def foo
+  puts 'foo'
+end
+{% endhighlight %}
+</pre>
+
+In order for the highlighting to show up, you'll need to include a
+highlighting stylesheet. For an example stylesheet you can look at
+"syntax.css":http://github.com/mojombo/tpw/tree/master/css/syntax.css. These
+are the same styles as used by GitHub and you are free to use them for your
+own site. If you use linenos, you might want to include an additional CSS
+class definition for <code>lineno</code> in syntax.css to distinguish the line
+numbers from the highlighted code.
+
+h2. Categories
+
+Posts are placed into categories based on the directory structure they are
+found within (see above for an example). The categories can be accessed from
+within a Liquid template as follows:
+
+<pre>
+{% for post in site.categories.foo %}
+  <li><span>{{ post.date | date_to_string }}</span> - {{ post.title }}</li>
+{% endfor %}
+</pre>
+
+This would list all the posts in the category 'foo' by date and title.
+
+The posts within each category are sorted in reverse chronological order.
+
+h2. Blog migrations
+
+h3. Movable Type
+
+To migrate your MT blog into Jekyll, you'll need read access to the database.
+The lib/jekyll/converters/mt.rb module provides a simple convert to create
+.markdown files in a _posts directory based on the entries contained therein.
+
+  $ export DB=my_mtdb
+  $ export USER=dbuser
+  $ export PASS=dbpass
+  $ ruby -r './lib/jekyll/converters/mt' -e 'Jekyll::MT.process( \
+    "#{ENV["DB"]}", "#{ENV["USER"]}", "#{ENV["PASS"]}")'
+
+You may need to adjust the SQL query used to retrieve MT entries. Left alone,
+it will attempt to pull all entries across all blogs regardless of status.
+Please check the results and verify the posts before publishing.
+
+h3. Typo 4+
+
+To migrate your Typo blog into Jekyll, you'll need read access to the MySQL
+database. The lib/jekyll/converters/typo.rb module provides a simple convert 
+to create .html, .textile, or .markdown files in a _posts directory based on 
+the entries contained therein.
+
+  $ export DB=my_typo_db
+  $ export USER=dbuser
+  $ export PASS=dbpass
+  $ ruby -r './lib/jekyll/converters/typo' -e 'Jekyll::Typo.process( \
+    "#{ENV["DB"]}", "#{ENV["USER"]}", "#{ENV["PASS"]}")'
+
+You may need to adjust the code used to filter Typo entries. Left alone,
+it will attempt to pull all entries across all blogs that were published.
+This code also has only been tested with Typo version 4+. Previous versions
+of Typo may not convert correctly. Please check the results and verify the 
+posts before publishing.
+
+h3. TextPattern 4
+
+To migrate your TextPattern blog into Jekyll, you'll need read access to the MySQL
+database. The lib/jekyll/converters/textpattern.rb module provides a simple convert to create .textile files in a _posts directory based on 
+the entries contained therein.
+
+  $ ruby -r './lib/jekyll/converters/textpattern' -e 'Jekyll::TextPattern.process( \
+    "database_name", "username", "password", "hostname")'
+
+The hostname defaults to _localhost_, all other variables are needed
+You may need to adjust the code used to filter entries. Left alone,
+it will attempt to pull all entries that are live or sticky.
+
+h2. Contribute
+
+If you'd like to hack on Jekyll, start by forking my repo on GitHub:
+
+http://github.com/mojombo/jekyll
+
+To get all of the dependencies, install the gem first. The best way to get
+your changes merged back into core is as follows:
+
+# Clone down your fork
+# Create a topic branch to contain your change
+# Hack away
+# Add tests and make sure everything still passes by running `rake`
+# If you are adding new functionality, document it in README.textile
+# Do not change the version number, I will do that on my end
+# If necessary, rebase your commits into logical chunks, without errors
+# Push the branch up to GitHub
+# Send me (mojombo) a pull request for your branch
+
+h2. License
+
+(The MIT License)
+
+Copyright (c) 2008 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 in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Rakefile

@@ -1,307 +1,76 @@
-require 'rubygems'
 require 'rake'
-require 'rdoc'
-require 'date'
-require 'yaml'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), *%w[lib]))
-require 'jekyll/version'
-
-#############################################################################
-#
-# Helper functions
-#
-#############################################################################
-
-def name
-  @name ||= File.basename(Dir['*.gemspec'].first, ".*")
-end
-
-def version
-  Jekyll::VERSION
-end
-
-def gemspec_file
-  "#{name}.gemspec"
-end
-
-def gem_file
-  "#{name}-#{version}.gem"
-end
-
-def normalize_bullets(markdown)
-  markdown.gsub(/\n\s{2}\*{1}/, "\n-")
-end
-
-def linkify_prs(markdown)
-  markdown.gsub(/#(\d+)/) do |word|
-    "[#{word}]({{ site.repository }}/issues/#{word.delete("#")})"
-  end
-end
-
-def linkify_users(markdown)
-  markdown.gsub(/(@\w+)/) do |username|
-    "[#{username}](https://github.com/#{username.delete("@")})"
-  end
-end
-
-def linkify(markdown)
-  linkify_users(linkify_prs(markdown))
-end
-
-def liquid_escape(markdown)
-  markdown.gsub(/(`{[{%].+[}%]}`)/, "{% raw %}\\1{% endraw %}")
-end
-
-def custom_release_header_anchors(markdown)
-  header_regexp = /^(\d{1,2})\.(\d{1,2})\.(\d{1,2}) \/ \d{4}-\d{2}-\d{2}/
-  section_regexp = /^### \w+ \w+$/
-  markdown.split(/^##\s/).map do |release_notes|
-    _, major, minor, patch = *release_notes.match(header_regexp)
-    release_notes
-      .gsub(header_regexp, "\\0\n{: #v\\1-\\2-\\3}")
-      .gsub(section_regexp) { |section| "#{section}\n{: ##{sluffigy(section)}-v#{major}-#{minor}-#{patch}}" }
-  end.join("\n## ")
-end
-
-def sluffigy(header)
-  header.gsub(/#/, '').strip.downcase.gsub(/\s+/, '-')
-end
-
-def remove_head_from_history(markdown)
-  index = markdown =~ /^##\s+\d+\.\d+\.\d+/
-  markdown[index..-1]
-end
-
-def converted_history(markdown)
-  remove_head_from_history(
-    custom_release_header_anchors(
-      liquid_escape(
-        linkify(
-          normalize_bullets(markdown)))))
-end
-
-#############################################################################
-#
-# Standard tasks
-#
-#############################################################################
-
-multitask :default => [:test, :features]
-
 require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
+require 'rake/rdoctask'
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |s|
+    s.name = "jekyll"
+    s.summary = %Q{Jekyll is a simple, blog aware, static site generator.}
+    s.email = "tom@mojombo.com"
+    s.homepage = "http://github.com/mojombo/jekyll"
+    s.description = "Jekyll is a simple, blog aware, static site generator."
+    s.authors = ["Tom Preston-Werner"]
+    s.rubyforge_project = "jekyll"
+    s.files = FileList["[A-Z]*", "{bin,lib,test}/**/*"]
+    s.add_dependency('RedCloth', '>= 4.0.4')
+    s.add_dependency('liquid', '>= 1.9.0')
+    s.add_dependency('classifier', '>= 1.3.1')
+    s.add_dependency('maruku', '>= 0.5.9')
+    s.add_dependency('directory_watcher', '>= 1.1.1')
+    s.add_dependency('open4', '>= 0.9.6')
+    s.executables = "jekyll"
+  end
+rescue LoadError
+  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+end
+
+Rake::TestTask.new do |t|
+  t.libs << 'lib'
+  t.pattern = 'test/**/test_*.rb'
+  t.verbose = false
 end
 
-require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "#{name} #{version}"
+  rdoc.title    = 'jekyll'
+  rdoc.options << '--line-numbers' << '--inline-source'
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
 begin
-  require 'cucumber/rake/task'
-  Cucumber::Rake::Task.new(:features) do |t|
-    t.profile = "travis"
-  end
-  Cucumber::Rake::Task.new(:"features:html", "Run Cucumber features and produce HTML output") do |t|
-    t.profile = "html_report"
+  require 'rcov/rcovtask'
+  Rcov::RcovTask.new do |t|
+    t.libs << 'test'
+    t.test_files = FileList['test/**/test_*.rb']
+    t.verbose = true
   end
 rescue LoadError
-  desc 'Cucumber rake task not available'
-  task :features do
-    abort 'Cucumber rake task is not available. Be sure to install cucumber as a gem or plugin'
-  end
 end
 
+task :default => :test
+
+# console
+
 desc "Open an irb session preloaded with this library"
 task :console do
-  sh "irb -rubygems -r ./lib/#{name}.rb"
+  sh "irb -rubygems -I lib -r jekyll.rb"
 end
 
-#############################################################################
-#
-# Site tasks - http://jekyllrb.com
-#
-#############################################################################
+# converters
 
-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)
+namespace :convert do
+  desc "Migrate from mephisto in the current directory"
+  task :mephisto do
+    sh %q(ruby -r './lib/jekyll/converters/mephisto' -e 'Jekyll::Mephisto.postgres(:database => "#{ENV["DB"]}")')
   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")
-    })
+  desc "Migrate from Movable Type in the current directory"
+  task :mt do
+    sh %q(ruby -r './lib/jekyll/converters/mt' -e 'Jekyll::MT.process("#{ENV["DB"]}", "#{ENV["USER"]}", "#{ENV["PASS"]}")')
   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
+  desc "Migrate from Typo in the current directory"
+  task :typo do
+    sh %q(ruby -r './lib/jekyll/converters/typo' -e 'Jekyll::Typo.process("#{ENV["DB"]}", "#{ENV["USER"]}", "#{ENV["PASS"]}")')
   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

TODO

@@ -0,0 +1,3 @@
+[x] Easier configuration of Maruka and blahtex directories [mdreid]
+[x] Accurate "related posts" calculator
+[x] Autobuild

VERSION.yml

@@ -0,0 +1,4 @@
+--- 
+:major: 0
+:minor: 4
+:patch: 5

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/flat-map

@@ -1,17 +0,0 @@
-require 'benchmark/ips'
-
-enum = (0..50).to_a
-nested = enum.map { |i| [i] }
-
-def do_thing(blah)
-  blah * 1
-end
-
-Benchmark.ips do |x|
-  x.report('.map.flatten with nested arrays') { nested.map { |i| do_thing(i) }.flatten(1) }
-  x.report('.flat_map with nested arrays')    { nested.flat_map { |i| do_thing(i) } }
-
-  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/hash-fetch

@@ -1,9 +0,0 @@
-require 'benchmark/ips'
-
-h = {:bar => 'uco'}
-
-Benchmark.ips do |x|
-  x.report('fetch with no block') { h.fetch(:bar, (0..9).to_a)    }
-  x.report('fetch with a block')  { h.fetch(:bar) { (0..9).to_a } }
-  x.report('brackets with an ||') { h[:bar] || (0..9).to_a        }
-end

benchmark/jekyll-sanitize-path

@@ -1,46 +0,0 @@
-#!/usr/bin/env ruby
-
-require_relative '../lib/jekyll'
-require 'benchmark/ips'
-
-base_directory = Dir.pwd
-
-Benchmark.ips do |x|
-  #
-  # Does not include the base_directory
-  #
-  x.report('with no questionable path') do
-    Jekyll.sanitized_path(base_directory, '')
-  end
-  x.report('with a single-part questionable path') do
-    Jekyll.sanitized_path(base_directory, 'thingy')
-  end
-  x.report('with a multi-part questionable path') do
-    Jekyll.sanitized_path(base_directory, 'thingy/in/my/soup')
-  end
-  x.report('with a single-part traversal path') do
-    Jekyll.sanitized_path(base_directory, '../thingy')
-  end
-  x.report('with a multi-part traversal path') do
-    Jekyll.sanitized_path(base_directory, '../thingy/in/my/../../soup')
-  end
-
-  #
-  # Including the base_directory
-  #
-  x.report('with the exact same paths') do
-    Jekyll.sanitized_path(base_directory, base_directory)
-  end
-  x.report('with a single-part absolute path including the base_directory') do
-    Jekyll.sanitized_path(base_directory, File.join(base_directory, 'thingy'))
-  end
-  x.report('with a multi-part absolute path including the base_directory') do
-    Jekyll.sanitized_path(base_directory, File.join(base_directory, 'thingy/in/my/soup'))
-  end
-  x.report('with a single-part traversal path including the base_directory') do
-    Jekyll.sanitized_path(base_directory, File.join(base_directory, 'thingy/..'))
-  end
-  x.report('with a multi-part traversal path including the base_directory') do
-    Jekyll.sanitized_path(base_directory, File.join('thingy/in/my/../../soup'))
-  end
-end

benchmark/proc-call-vs-yield

@@ -1,14 +0,0 @@
-require 'benchmark/ips'
-
-def fast
-  yield
-end
-
-def slow(&block)
-  block.call
-end
-
-Benchmark.ips do |x|
-  x.report('yield') { fast { (0..9).to_a } }
-  x.report('block.call') { slow { (0..9).to_a } }
-end

benchmark/sequential-assignment

@@ -1,11 +0,0 @@
-require 'benchmark/ips'
-
-Benchmark.ips do |x|
-  x.report('parallel assignment') do
-    a, b = 1, 2
-  end
-  x.report('multi-line assignment') do
-    a = 1
-    b = 2
-  end
-end

benchmark/string-concat

@@ -1,8 +0,0 @@
-require 'benchmark/ips'
-
-url = "http://jekyllrb.com"
-
-Benchmark.ips do |x|
-  x.report('+=') { url += '/' }
-  x.report('<<') { url << '/' }
-end

benchmark/string-replacement

@@ -1,13 +0,0 @@
-require 'benchmark/ips'
-
-def str
-  'http://baruco.org/2014/some-talk-with-some-amount-of-value'
-end
-
-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') }
-end

benchmark/symbol-to-proc

@@ -1,6 +0,0 @@
-require 'benchmark/ips'
-
-Benchmark.ips do |x|
-  x.report('block')  { (1..100).map { |i| i.to_s } }
-  x.report('&:to_s') { (1..100).map(&:to_s) }
-end

bin/jekyll

@@ -1,40 +1,146 @@
 #!/usr/bin/env ruby
-STDOUT.sync = true
 
-$:.unshift File.join(File.dirname(__FILE__), *%w{ .. lib })
+$:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
+help = <<HELP
+Jekyll is a blog-aware, static site generator.
+
+Basic Command Line Usage:
+  jekyll                                                   # . -> ./_site
+  jekyll <path to write generated site>                    # . -> <path>
+  jekyll <path to source> <path to write generated site>   # <path> -> <path>
+    
+  Options:
+HELP
+
+require 'optparse'
 require 'jekyll'
-require 'mercenary'
 
-Jekyll::External.require_if_present(
-  Jekyll::External.blessed_gems
-)
+options = {}
 
-Jekyll::PluginManager.require_from_bundler
+opts = OptionParser.new do |opts|
+  opts.banner = help
 
-Jekyll::Deprecator.process(ARGV)
-
-Mercenary.program(:jekyll) do |p|
-  p.version Jekyll::VERSION
-  p.description 'Jekyll is a blog-aware, static site generator in Ruby'
-  p.syntax 'jekyll <subcommand> [options]'
-
-  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)'
-
-  Jekyll::Command.subclasses.each { |c| c.init_with_program(p) }
-
-  p.action do |args, options|
-    if args.empty?
-      Jekyll.logger.error "A subcommand is required."
-      puts p
-    else
-      unless p.has_command?(args.first)
-        Jekyll.logger.abort_with "Invalid command. Use --help for more information"
-      end
+  opts.on("--auto", "Auto-regenerate") do
+    options[:auto] = true
+  end
+  
+  opts.on("--server [PORT]", "Start web server (default port 4000)") do |port|
+    options[:server] = true
+    options[:server_port] = port || 4000
+  end
+  
+  opts.on("--lsi", "Use LSI for better related posts") do
+    Jekyll.lsi = true
+  end
+  
+  opts.on("--pygments", "Use pygments to highlight code") do
+    Jekyll.pygments = true
+  end
+  
+  opts.on("--rdiscount", "Use rdiscount gem for Markdown") do
+    begin
+      require 'rdiscount'
+      Jekyll.markdown_proc = Proc.new { |x| RDiscount.new(x).to_html }
+      puts 'Using rdiscount for Markdown'
+    rescue LoadError
+      puts 'You must have the rdiscount gem installed first'
     end
   end
+
+  opts.on("--bluecloth", "Use bluecloth gem for Markdown") do
+    begin
+      require 'bluecloth'
+      Jekyll.markdown_proc = Proc.new { |x| BlueCloth.new(x).to_html }
+      puts 'Using BlueCloth for Markdown'
+    rescue LoadError
+      puts 'You must have the BlueCloth gem installed first'
+    end
+  end
+  
+  opts.on("--permalink [TYPE]", "Use 'date' (default) for YYYY/MM/DD") do |style| 
+    Jekyll.permalink_style = (style || 'date').to_sym
+  end
+  
+  opts.on("--version", "Display current version") do
+    puts "Jekyll " + Jekyll.version
+    exit 0
+  end
 end
+
+opts.parse!
+
+def clean(dest)
+  FileUtils.rm_rf(dest)
+  FileUtils.mkdir_p(dest)
+end
+
+def globs(source)
+  Dir.chdir(source) do
+    dirs = Dir['*'].select { |x| File.directory?(x) }
+    dirs -= ['_site']
+    dirs = dirs.map { |x| "#{x}/**/*" }
+    dirs += ['*']
+  end
+end
+
+source = nil
+destination = nil
+
+case ARGV.size
+  when 0
+    source = '.'
+    destination = File.join('.', '_site')
+  when 1
+    source = '.'
+    destination = ARGV[0]
+  when 2
+    source = ARGV[0]
+    destination = ARGV[1]
+  else
+    puts "Invalid options. Run `jekyll --help` for assistance."
+    exit(1)
+end
+
+if options[:auto]
+  require 'directory_watcher'
+
+  puts "Auto-regenerating enabled: #{source} -> #{destination}"
+  
+  dw = DirectoryWatcher.new(source)
+  dw.interval = 1
+  dw.glob = globs(source)
+  
+  dw.add_observer do |*args|
+    t = Time.now.strftime("%Y-%m-%d %H:%M:%S")
+    puts "[#{t}] regeneration: #{args.size} files changed"
+    Jekyll.process(source, destination)
+  end
+  
+  dw.start
+  
+  unless options[:server]
+    loop { sleep 1000 }
+  end
+else
+  Jekyll.process(source, destination)
+  puts "Successfully generated site in #{destination}"
+end
+
+if options[:server]
+  require 'webrick'
+  include WEBrick
+  
+  FileUtils.mkdir_p(destination)
+
+  s = HTTPServer.new(
+    :Port            => options[:server_port],
+    :DocumentRoot    => destination
+  )
+  t = Thread.new {
+    s.start
+  }
+  
+  trap("INT") { s.shutdown }
+  t.join()
+end

features/collections.feature

@@ -1,145 +0,0 @@
-Feature: Collections
-  As a hacker who likes to structure content
-  I want to be able to create collections of similar information
-  And render them
-
-  Scenario: Unrendered collection
-    Given I have an "index.html" page that contains "Collections: {{ site.methods }}"
-    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"
-    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 }}"
-    And I have fixture collections
-    And I have a "_config.yml" file with content:
-    """
-    collections:
-      methods:
-        output: true
-        foo:   bar
-    """
-    When I run jekyll build
-    Then the _site directory should exist
-    And I should see "Collections: {\"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"
-
-  Scenario: Rendered collection at a custom URL
-    Given I have an "index.html" page that contains "Collections: {{ site.collections }}"
-    And I have fixture collections
-    And I have a "_config.yml" file with content:
-    """
-    collections:
-      methods:
-        output: true
-        permalink: /:collection/:path/
-    """
-    When I run jekyll build
-    Then 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 }}"
-    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:
-    """
-    collections:
-      methods:
-        output: true
-        foo:   bar
-    """
-    When I run jekyll build
-    Then the _site directory should exist
-    And I should see "Collections: {\"methods" 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"
-
-  Scenario: Collections specified as an array
-    Given I have an "index.html" page that contains "Collections: {% for method in site.methods %}{{ method.relative_path }} {% endfor %}"
-    And I have fixture collections
-    And I have a "_config.yml" file with content:
-    """
-    collections:
-    - methods
-    """
-    When I run jekyll build
-    Then 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
-    Given I have an "index.html" page that contains "Collections: {% for method in site.methods %}{{ method.relative_path }} {% endfor %}"
-    And I have fixture collections
-    And I have a "_config.yml" file with content:
-    """
-    collections:
-    - methods
-    """
-    When I run jekyll build
-    Then 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
-    Given I have an "index.html" page that contains "All documents: {% for doc in site.documents %}{{ doc.relative_path }} {% endfor %}"
-    And I have fixture collections
-    And I have a "_config.yml" file with content:
-    """
-    collections:
-    - methods
-    """
-    When I run jekyll build
-    Then 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
-    Given I have an "index.html" page that contains "First document's output: {{ site.documents.first.output }}"
-    And I have fixture collections
-    And I have a "_config.yml" file with content:
-    """
-    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"
-
-  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 }}"
-    And I have fixture collections
-    And I have a "_config.yml" file with content:
-    """
-    collections:
-    - methods
-    """
-    When I run jekyll build
-    Then the _site directory should exist
-    And I should see "Item count: 1" 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 }}"
-    And I have fixture collections
-    And I have a "_config.yml" file with content:
-    """
-    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"
-
-  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 %}"
-    And I have fixture collections
-    And I have a "_config.yml" file with content:
-    """
-    collections:
-    - methods
-    """
-    When I run jekyll build
-    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"

features/create_sites.feature

@@ -1,158 +0,0 @@
-Feature: Create sites
-  As a hacker who likes to blog
-  I want to be able to make a static site
-  In order to share my awesome ideas with the interwebs
-
-  Scenario: Blank site
-    Given I do not have a "test_blank" directory
-    When I run jekyll new test_blank --blank
-    Then the test_blank/_layouts directory should exist
-    And the test_blank/_posts directory should exist
-    And the "test_blank/index.html" file should exist
-
-  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
-    And I should see "Basic Site" in "_site/index.html"
-
-  Scenario: Basic site with a post
-    Given I have a _posts directory
-    And I have the following post:
-      | title   | date       | content          |
-      | Hackers | 2009-03-27 | My First Exploit |
-    When I run jekyll build
-    Then 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
-    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
-    And I should see "Page Layout: Basic Site with Layout" in "_site/index.html"
-
-  Scenario: Basic site with layout and a post
-    Given I have a _layouts directory
-    And I have a _posts directory
-    And I have the following posts:
-      | 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
-    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
-    Given I have a _layouts directory
-    And I have a _posts directory
-    And I have the following posts:
-      | title    | date       | layout      | content                               |
-      | 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
-    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
-    Given I have a _layouts directory
-    And I have a page layout that contains "Page {{ page.title }}: {{ content }}"
-    And I have a post layout that contains "Post {{ page.title }}: {{ content }}"
-    And I have an "index.html" page with layout "page" that contains "Site contains {{ site.pages.size }} pages and {{ site.posts.size }} posts"
-    And I have a blog directory
-    And I have a "blog/index.html" page with layout "page" that contains "blog category index page"
-    And I have an "about.html" file that contains "No replacement {{ site.posts.size }}"
-    And I have an "another_file" file that contains ""
-    And I have a _posts directory
-    And I have the following posts:
-      | title  | date       | layout | content             |
-      | entry1 | 2009-03-27 | post   | content for entry1. |
-      | entry2 | 2009-04-27 | post   | content for entry2. |
-    And I have a category/_posts directory
-    And I have the following posts in "category":
-      | title  | date       | layout | content             |
-      | 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
-    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"
-    And I should see "Page : blog category index page" in "_site/blog/index.html"
-    And I should see "Post entry1: <p>content for entry1.</p>" in "_site/2009/03/27/entry1.html"
-    And I should see "Post entry2: <p>content for entry2.</p>" in "_site/2009/04/27/entry2.html"
-    And I should see "Post entry3: <p>content for entry3.</p>" in "_site/category/2009/05/27/entry3.html"
-    And I should see "Post entry4: <p>content for entry4.</p>" in "_site/category/2009/06/27/entry4.html"
-
-  Scenario: Basic site with include tag
-    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
-    And I should see "Basic Site with include tag: Generated by Jekyll" in "_site/index.html"
-
-  Scenario: Basic site with subdir include tag
-    Given I have a _includes directory
-    And I have an "_includes/about.textile" file that contains "Generated by Jekyll"
-    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
-    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
-    Given I have a _includes directory
-    And I have an "_includes/about.textile" file that contains "Generated by {% include jekyll.textile %}"
-    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
-    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 %}"
-    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. |
-    When I run jekyll build
-    Then the _site directory should exist
-    And I should see "URL: /2020/01/31/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
-    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
-    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"
-    When I run jekyll build
-    Then the _site/test directory should exist
-    And I should see "some other stuff" in "_site/test/index.html"
-
-  Scenario: Basic site with unpublished page
-    Given I have an "index.html" page with title "index" that contains "Published page"
-    And I have a "public.html" page with published "true" that contains "Explicitly published page"
-    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
-    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
-    And the "_site/index.html" file should exist
-    And the "_site/public.html" file should exist
-    And the "_site/secret.html" file should exist

features/data.feature

@@ -1,119 +0,0 @@
-Feature: Data
-  In order to use well-formatted data in my blog
-  As a blog's user
-  I want to use _data directory in my site
-
-  Scenario: autoload *.yaml files in _data directory
-    Given I have a _data directory
-    And I have a "_data/products.yaml" file with content:
-      """
-      - name: sugar
-        price: 5.3
-      - name: salt
-        price: 2.5
-      """
-    And I have an "index.html" page that contains "{% for product in site.data.products %}{{product.name}}{% endfor %}"
-    When I run jekyll build
-    Then the "_site/index.html" file should exist
-    And I should see "sugar" in "_site/index.html"
-    And I should see "salt" in "_site/index.html"
-
-  Scenario: autoload *.yml files in _data directory
-    Given I have a _data directory
-    And I have a "_data/members.yml" file with content:
-      """
-      - name: Jack
-        age: 28
-      - name: Leon
-        age: 34
-      """
-    And I have an "index.html" page that contains "{% for member in site.data.members %}{{member.name}}{% endfor %}"
-    When I run jekyll build
-    Then the "_site/index.html" file should exist
-    And I should see "Jack" in "_site/index.html"
-    And I should see "Leon" in "_site/index.html"
-
-  Scenario: autoload *.json files in _data directory
-    Given I have a _data directory
-    And I have a "_data/members.json" file with content:
-      """
-      [{"name": "Jack", "age": 28},{"name": "Leon", "age": 34}]
-      """
-    And I have an "index.html" page that contains "{% for member in site.data.members %}{{member.name}}{% endfor %}"
-    When I run jekyll build
-    Then the "_site/index.html" file should exist
-    And I should see "Jack" in "_site/index.html"
-    And I should see "Leon" in "_site/index.html"
-
-  Scenario: autoload *.csv files in _data directory
-    Given I have a _data directory
-    And I have a "_data/members.csv" file with content:
-      """
-      name,age
-      Jack,28
-      Leon,34
-      """
-    And I have an "index.html" page that contains "{% for member in site.data.members %}{{member.name}}{% endfor %}"
-    When I run jekyll build
-    Then the "_site/index.html" file should exist
-    And I should see "Jack" in "_site/index.html"
-    And I should see "Leon" in "_site/index.html"
-
-  Scenario: autoload *.yml files in _data directory with space in file name
-    Given I have a _data directory
-    And I have a "_data/team members.yml" file with content:
-      """
-      - name: Jack
-        age: 28
-      - name: Leon
-        age: 34
-      """
-    And I have an "index.html" page that contains "{% for member in site.data.team_members %}{{member.name}}{% endfor %}"
-    When I run jekyll build
-    Then the "_site/index.html" file should exist
-    And I should see "Jack" in "_site/index.html"
-    And I should see "Leon" in "_site/index.html"
-
-  Scenario: autoload *.yaml files in subdirectories in _data directory
-    Given I have a _data directory
-    And I have a _data/categories directory
-    And I have a "_data/categories/dairy.yaml" file with content:
-      """
-      name: Dairy Products
-      """
-    And I have an "index.html" page that contains "{{ site.data.categories.dairy.name }}"
-    When I run jekyll build
-    Then the "_site/index.html" file should exist
-    And I should see "Dairy Products" in "_site/index.html"
-
-  Scenario: folders should have precedence over files with the same name
-    Given I have a _data directory
-    And I have a _data/categories directory
-    And I have a "_data/categories/dairy.yaml" file with content:
-      """
-      name: Dairy Products
-      """
-    And I have a "_data/categories.yaml" file with content:
-      """
-      dairy:
-        name: Should not display this
-      """
-    And I have an "index.html" page that contains "{{ site.data.categories.dairy.name }}"
-    When I run jekyll build
-    Then the "_site/index.html" file should exist
-    And I should see "Dairy Products" in "_site/index.html"
-
-  Scenario: should be backward compatible with site.data in _config.yml
-    Given I have a "_config.yml" file with content:
-      """
-      data:
-        - name: Jack
-          age: 28
-        - name: Leon
-          age: 34
-      """
-    And I have an "index.html" page that contains "{% for member in site.data %}{{member.name}}{% endfor %}"
-    When I run jekyll build
-    Then the "_site/index.html" file should exist
-    And I should see "Jack" in "_site/index.html"
-    And I should see "Leon" in "_site/index.html"

features/drafts.feature

@@ -1,46 +0,0 @@
-Feature: Draft Posts
-  As a hacker who likes to blog
-  I want to be able to preview drafts locally
-  In order to see if they look alright before publishing
-
-  Scenario: Preview a draft
-    Given I have a configuration file with "permalink" set to "none"
-    And I have a _drafts directory
-    And I have the following draft:
-      | title  | date       | layout  | content        |
-      | Recipe | 2009-03-27 | default | Not baked yet. |
-    When I run jekyll build --drafts
-    Then the _site directory should exist
-    And I should see "Not baked yet." in "_site/recipe.html"
-
-  Scenario: Don't preview a draft
-    Given I have a configuration file with "permalink" set to "none"
-    And I have an "index.html" page that contains "Totally index"
-    And I have a _drafts directory
-    And I have the following draft:
-      | title  | date       | layout  | content        |
-      | Recipe | 2009-03-27 | default | Not baked yet. |
-    When I run jekyll build
-    Then the _site directory should exist
-    And the "_site/recipe.html" file should not exist
-
-  Scenario: Don't preview a draft that is not published
-    Given I have a configuration file with "permalink" set to "none"
-    And I have an "index.html" page that contains "Totally index"
-    And I have a _drafts directory
-    And I have the following draft:
-      | 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
-    And the "_site/recipe.html" file should not exist
-
-  Scenario: Use page.path variable
-    Given I have a configuration file with "permalink" set to "none"
-    And I have a _drafts directory
-    And I have the following draft:
-      | 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"

features/embed_filters.feature

@@ -1,107 +0,0 @@
-Feature: Embed filters
-  As a hacker who likes to blog
-  I want to be able to transform text inside a post or page
-  In order to perform cool stuff in my posts
-
-  Scenario: Convert date to XML schema
-    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 "{{ site.time | date_to_xmlschema }}"
-    When I run jekyll build
-    Then 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
-    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 "{{ page.title | xml_escape }}"
-    When I run jekyll build
-    Then the _site directory should exist
-    And I should see "Star & Wars" in "_site/2009/03/27/star-wars.html"
-
-  Scenario: Calculate number of words
-    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 "{{ content | xml_escape }}"
-    When I run jekyll build
-    Then 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
-    Given I have a _posts directory
-    And I have a _layouts directory
-    And I have the following post:
-      | title     | date       | layout  | tags                   | content                                     |
-      | 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
-    And I should see "scifi, movies, and force" in "_site/2009/03/27/star-wars.html"
-
-  Scenario: Textilize 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 }}"
-    When I run jekyll build
-    Then 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
-    Given I have a _layouts directory
-    And I have the following page:
-      | title  | layout  | value | content   |
-      | Page-1 | default | 8     | Something |
-    And I have the following page:
-      | title  | layout  | value | content   |
-      | 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
-    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 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 |
-    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
-    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 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 |
-    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
-    And I should see exactly "The rule of 3: Fly, Run, Jump," in "_site/bird.html"

features/frontmatter_defaults.feature

@@ -1,138 +0,0 @@
-Feature: frontmatter defaults
-  Scenario: Use default for frontmatter variables internally
-    Given I have a _layouts directory
-    And I have a pretty layout that contains "THIS IS THE LAYOUT: {{content}}"
-
-    And I have a _posts directory
-    And I have the following post:
-      | title             | date       | content          |
-      | default layout    | 2013-09-11 | just some post   |
-    And I have an "index.html" page with title "some title" that contains "just some page"
-
-    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
-    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"
-
-  Scenario: Use default for frontmatter variables in Liquid
-    Given I have a _posts directory
-    And I have the following post:
-      | title        | date       | content                                          |
-      | default data | 2013-09-11 | <p>{{page.custom}}</p><div>{{page.author}}</div> |
-    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"
-    And I should see "just some special data by Ben" in "_site/index.html"
-
-  Scenario: Override frontmatter defaults by path
-    Given I have a _layouts directory
-    And I have a root layout that contains "root: {{ content }}"
-    And I have a subfolder layout that contains "subfolder: {{ content }}"
-
-    And I have a _posts directory
-    And I have the following post:
-      | title | date       | content               |
-      | about | 2013-10-14 | info on {{page.description}} |
-    And I have a special/_posts directory
-    And I have the following post in "special":
-      | title | date       | path  | content               |
-      | about | 2013-10-14 | local | info on {{page.description}} |
-
-    And I have an "index.html" page with title "overview" that contains "Overview for {{page.description}}"
-    And I have an "special/index.html" page with title "section overview" that contains "Overview for {{page.description}}"
-
-    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
-    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: Override frontmatter defaults by type
-    Given I have a _posts directory
-    And I have the following post:
-      | title          | date       | content |
-      | this is a post | 2013-10-14 | blabla  |
-    And I have an "index.html" page that contains "interesting stuff"
-    And I have a configuration file with "defaults" set to "[{scope: {path: "", type: "post"}, values: {permalink: "/post.html"}}, {scope: {path: "", type: "page"}, values: {permalink: "/page.html"}}, {scope: {path: ""}, values: {permalink: "/perma.html"}}]"
-    When I run jekyll build
-    Then I should see "blabla" in "_site/post.html"
-    And I should see "interesting stuff" in "_site/page.html"
-    But the "_site/perma.html" file should not exist
-
-  Scenario: Actual frontmatter overrides defaults
-    Given I have a _posts directory
-    And I have the following post:
-      | title    | date       | permalink         | author   | content                   |
-      | override | 2013-10-14 | /frontmatter.html | some guy | a blog by {{page.author}} |
-    And I have an "index.html" page with permalink "override.html" that contains "nothing"
-    And I have a configuration file with "defaults" set to "[{scope: {path: ""}, values: {permalink: "/perma.html", author: "Chris"}}]"
-    When I run jekyll build
-    Then I should see "a blog by some guy" in "_site/frontmatter.html"
-    And I should see "nothing" in "_site/override.html"
-    But the "_site/perma.html" file should not exist
-
-  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: 
-    """
-    ---
-    ---
-    Value: {{ page.myval }}
-    """
-    And I have a "_config.yml" file with content:
-    """
-      collections:
-        slides:
-          output: true
-      defaults:
-        -
-          scope:
-            path: ""
-            type: slides
-          values:
-            myval: "Test"
-    """
-    When I run jekyll build
-    Then 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: 
-    """
-    ---
-    myval: Override
-    ---
-    Value: {{ page.myval }}
-    """
-    And I have a "_config.yml" file with content:
-    """
-      collections:
-        slides:
-          output: true
-      defaults:
-        -
-          scope:
-            path: ""
-            type: slides
-          values:
-            myval: "Test"
-    """
-    When I run jekyll build
-    Then the _site directory should exist
-    And I should see "Value: Override" in "_site/slides/slide2.html"
-
-  Scenario: Deep merge frontmatter defaults
-    Given I have an "index.html" page with fruit "{orange: 1}" that contains "Fruits: {{ page.fruit.orange | plus: page.fruit.apple }}"
-    And I have a configuration file with "defaults" set to "[{scope: {path: ""}, values: {fruit: {apple: 2}}}]"
-    When I run jekyll build
-    Then I should see "Fruits: 3" in "_site/index.html"

features/include_tag.feature

@@ -1,79 +0,0 @@
-Feature: Include tags
-  In order to share their content across several pages
-  As a hacker who likes to blog
-  I want to be able to include files in my blog posts
-
-  Scenario: Include a file with parameters
-    Given I have an _includes directory
-    And I have an "_includes/header.html" file that contains "<header>My awesome blog header: {{include.param}}</header>"
-    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 %}                                    |
-    When I run jekyll build
-    Then 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"
-    And I should see "<li>start = tomorrow</li>" in "_site/2013/03/21/list-multiple-parameters.html"
-    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>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"
-
-  Scenario: Include a file from a variable
-    Given I have an _includes directory
-    And I have an "_includes/snippet.html" file that contains "a snippet"
-    And I have an "_includes/parametrized.html" file that contains "works with {{include.what}}"
-    And I have a configuration file with:
-    | key           | value             |
-    | include_file1 | snippet.html      |
-    | 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
-    And I should see "a snippet that works with parameters" in "_site/index.html"
-
-  Scenario: Include a variable file in a loop
-    Given I have an _includes directory
-    And I have an "_includes/one.html" file that contains "one"
-    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
-    And I should see "one two" in "_site/index.html"
-
-  Scenario: Include a file with variables and filters
-    Given I have an _includes directory
-    And I have an "_includes/one.html" file that contains "one included"
-    And I have a configuration file with:
-    | key          | value |
-    | 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
-    And I should see "one included" in "_site/index.html"
-
-  Scenario: Include a file with partial variables
-    Given I have an _includes directory
-    And I have an "_includes/one.html" file that contains "one included"
-    And I have a configuration file with:
-    | key          | value |
-    | 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
-    And I should see "one included" in "_site/index.html"

features/incremental_rebuild.feature

@@ -1,60 +0,0 @@
-Feature: Incremental rebuild
-  As an impatient hacker who likes to blog
-  I want to be able to make a static site
-  Without waiting too long for it to build
-
-  Scenario: Produce correct output site
-    Given I have a _layouts directory
-    And I have a _posts directory
-    And I have the following posts:
-      | 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
-    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
-    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
-    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
-    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
-    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
-    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
-    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
-    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
-    And I should see "Basic Site with include tag: Regenerated by Jekyll" in "_site/index.html"

features/markdown.feature

@@ -1,67 +0,0 @@
-Feature: Markdown
-  As a hacker who likes to blog
-  I want to be able to make a static site
-  In order to share my awesome ideas with the interwebs
-
-  Scenario: Markdown in list on index
-    Given I have a configuration file with "paginate" set to "5"
-    And I have an "index.html" page that contains "Index - {% for post in site.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
-    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"
-    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
-    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

@@ -1,82 +0,0 @@
-Feature: Site pagination
-  In order to paginate my blog
-  As a blog's user
-  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>"
-    And I have a _layouts directory
-    And I have an "index.html" page that contains "{{ paginator.posts.size }}"
-    And I have a _posts directory
-    And I have the following posts:
-      | title     | date       | layout  | content                                |
-      | Wargames  | 2009-03-27 | default | The only winning move is not to play.  |
-      | Wargames2 | 2009-04-27 | default | The only winning move is not to play2. |
-      | Wargames3 | 2009-05-27 | default | The only winning move is not to play3. |
-      | Wargames4 | 2009-06-27 | default | The only winning move is not to play4. |
-    When I run jekyll build
-    Then the _site/page<exist> directory should exist
-    And the "_site/page<exist>/index.html" file should exist
-    And I should see "<posts>" in "_site/page<exist>/index.html"
-    And the "_site/page<not_exist>/index.html" file should not exist
-
-    Examples:
-      | num | exist | posts | not_exist |
-      | 1   | 4     | 1     | 5         |
-      | 2   | 2     | 2     | 3         |
-      | 3   | 2     | 1     | 3         |
-
-  Scenario Outline: Setting a custom pagination path
-    Given I have a configuration file with:
-      | key           | value                          |
-      | paginate      | 1                              |
-      | paginate_path | /blog/page-:num                |
-      | permalink     | /blog/:year/:month/:day/:title |
-    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
-    And I have the following posts:
-      | title     | date       | layout  | content                                |
-      | Wargames  | 2009-03-27 | default | The only winning move is not to play.  |
-      | Wargames2 | 2009-04-27 | default | The only winning move is not to play2. |
-      | Wargames3 | 2009-05-27 | default | The only winning move is not to play3. |
-      | Wargames4 | 2009-06-27 | default | The only winning move is not to play4. |
-    When I run jekyll build
-    Then the _site/blog/page-<exist> directory should exist
-    And the "_site/blog/page-<exist>/index.html" file should exist
-    And I should see "<posts>" in "_site/blog/page-<exist>/index.html"
-    And the "_site/blog/page-<not_exist>/index.html" file should not exist
-
-    Examples:
-      | exist | posts | not_exist |
-      | 2     | 1     | 5         |
-      | 3     | 1     | 6         |
-      | 4     | 1     | 7         |
-
-  Scenario Outline: Setting a custom pagination path without an index.html in it
-    Given I have a configuration file with:
-      | key           | value                          |
-      | paginate      | 1                              |
-      | paginate_path | /blog/page/:num                |
-      | permalink     | /blog/:year/:month/:day/:title |
-    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!"
-    And I have a _posts directory
-    And I have the following posts:
-      | title     | date       | layout  | content                                |
-      | Wargames  | 2009-03-27 | default | The only winning move is not to play.  |
-      | Wargames2 | 2009-04-27 | default | The only winning move is not to play2. |
-      | Wargames3 | 2009-05-27 | default | The only winning move is not to play3. |
-      | Wargames4 | 2009-06-27 | default | The only winning move is not to play4. |
-    When I run jekyll build
-    Then the _site/blog/page/<exist> directory should exist
-    And the "_site/blog/page/<exist>/index.html" file should exist
-    And I should see "<posts>" in "_site/blog/page/<exist>/index.html"
-    And the "_site/blog/page/<not_exist>/index.html" file should not exist
-
-    Examples:
-      | exist | posts | not_exist |
-      | 2     | 1     | 5         |
-      | 3     | 1     | 6         |
-      | 4     | 1     | 7         |

features/permalinks.feature

@@ -1,95 +0,0 @@
-Feature: Fancy permalinks
-  As a hacker who likes to blog
-  I want to be able to set permalinks
-  In order to make my blog URLs awesome
-
-  Scenario: Use none permalink schema
-    Given I have a _posts directory
-    And I have the following post:
-      | title                 | date       | content          |
-      | 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
-    And I should see "Totally nothing." in "_site/none-permalink-schema.html"
-
-  Scenario: Use pretty permalink schema
-    Given I have a _posts directory
-    And I have the following post:
-      | title                   | date       | content            |
-      | 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
-    And I should see "Totally wordpress." in "_site/2009/03/27/pretty-permalink-schema/index.html"
-
-  Scenario: Use pretty permalink schema for pages
-    Given I have an "index.html" page that contains "Totally index"
-    And I have an "awesome.html" page that contains "Totally awesome"
-    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
-    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"
-
-  Scenario: Use custom permalink schema with prefix
-    Given I have a _posts directory
-    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"
-    When I run jekyll build
-    Then 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
-    Given I have a _posts directory
-    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 "/:categories/:title.html"
-    When I run jekyll build
-    Then 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
-    Given I have a _posts directory
-    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 "/:month-:day-:year/:title.html"
-    When I run jekyll build
-    Then the _site directory should exist
-    And I should see "Totally custom." in "_site/03-27-2009/custom-permalink-schema.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 |
-    When I run jekyll build
-    Then 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"
-
-  Scenario: Use per-post ending in .html
-    Given I have a _posts directory
-    And I have the following post:
-      | 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
-    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
-    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 |
-    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"

features/plugins.feature

@@ -1,34 +0,0 @@
-Feature: Configuring and using plugins
-  As a hacker
-  I want to specify my own plugins that can modify Jekyll's behaviour
-
-  Scenario: Add a gem-based plugin
-    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
-    And I should see "Whatever" in "_site/index.html"
-    And I should see "this is a test" in "_site/test.txt"
-
-  Scenario: Add an empty whitelist to restrict all gems
-    Given I have an "index.html" file that contains "Whatever"
-    And I have a configuration file with:
-      | key       | value                |
-      | gems      | [jekyll_test_plugin] |
-      | whitelist | []                   |
-    When I run jekyll build --safe
-    Then the _site directory should exist
-    And I should see "Whatever" in "_site/index.html"
-    And the "_site/test.txt" file should not exist
-
-  Scenario: Add a whitelist to restrict some gems but allow others
-    Given I have an "index.html" file that contains "Whatever"
-    And I have a configuration file with:
-      | key       | value                                              |
-      | gems      | [jekyll_test_plugin, jekyll_test_plugin_malicious] |
-      | whitelist | [jekyll_test_plugin]                               |
-    When I run jekyll build --safe
-    Then 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

@@ -1,261 +0,0 @@
-Feature: Post data
-  As a hacker who likes to blog
-  I want to be able to embed data into my posts
-  In order to make the posts slightly dynamic
-
-  Scenario: Use post.title variable
-    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 | 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
-    And I should see "Post title: Star Wars" in "_site/2009/03/27/star-wars.html"
-
-  Scenario: Use post.url variable
-    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 | 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
-    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
-    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 | 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
-    And I should see "Post date: 27 Mar 2009" in "_site/2009/03/27/star-wars.html"
-
-  Scenario: Use post.id variable
-    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 | 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
-    And I should see "Post id: /2009/03/27/star-wars" in "_site/2009/03/27/star-wars.html"
-
-  Scenario: Use post.content variable
-    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 | 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
-    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
-    Given I have a movies directory
-    And I have a movies/_posts directory
-    And I have a _layouts directory
-    And I have the following post in "movies":
-      | title     | date       | layout | content                 |
-      | 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
-    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
-    Given I have a movies directory
-    And I have a movies/_posts directory
-    And I have a _layouts directory
-    And I have the following post in "movies":
-      | title     | date       | layout | category | content                 |
-      | 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
-    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
-    Given I have a movies directory
-    And I have a movies/_posts directory
-    And I have a _layouts directory
-    And I have the following post in "movies":
-      | title     | date       | layout | categories        | content                 |
-      | 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
-    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
-    Given I have a movies directory
-    And I have a movies/_posts directory
-    And I have a _layouts directory
-    And I have the following post in "movies":
-      | title     | date       | layout | category | content                 |
-      | 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"
-
-  Scenario: Use post.tags variable
-    Given I have a _posts directory
-    And I have a _layouts directory
-    And I have the following post:
-      | title     | date       | layout | tag   | content                 |
-      | 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
-    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
-    Given I have a scifi directory
-    And I have a scifi/movies directory
-    And I have a scifi/movies/_posts directory
-    And I have a _layouts directory
-    And I have the following post in "scifi/movies":
-      | title     | date       | layout | content                 |
-      | 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"
-
-  Scenario: Use post.categories variable when categories are in folders with mixed case
-    Given I have a scifi directory
-    And I have a scifi/Movies directory
-    And I have a scifi/Movies/_posts directory
-    And I have a _layouts directory
-    And I have the following post in "scifi/Movies":
-      | title     | date       | layout | content                 |
-      | 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"
-
-  Scenario: Use post.categories variable when category is in YAML
-    Given I have a _posts directory
-    And I have a _layouts directory
-    And I have the following post:
-      | title     | date       | layout | category | content                 |
-      | 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"
-
-  Scenario: Use post.categories variable when category is in YAML and is mixed-case
-    Given I have a _posts directory
-    And I have a _layouts directory
-    And I have the following post:
-      | title     | date       | layout | category | content                 |
-      | 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"
-
-  Scenario: Use post.categories variable when categories are in YAML
-    Given I have a _posts directory
-    And I have a _layouts directory
-    And I have the following post:
-      | title     | date       | layout | categories          | content                 |
-      | 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
-    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
-    Given I have a _posts directory
-    And I have a _layouts directory
-    And I have the following post:
-      | title     | date       | layout | categories           | content                 |
-      | 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
-    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
-    Given I have a _posts directory
-    And I have a _layouts directory
-    And I have the following posts:
-      | title     | date       | layout | categories          | content                     |
-      | Star Wars | 2009-03-27 | simple | ['scifi', 'Movies'] | Luke, I am your father.     |
-      | 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"
-
-  Scenario Outline: Use page.path variable
-    Given I have a <dir>/_posts directory
-    And I have the following post in "<dir>":
-      | 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
-    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:
-      | dir        | path_prefix |
-      | .          |             |
-      | dir        | dir/        |
-      | dir/nested | dir/nested/ |
-
-  Scenario: 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 }} |
-    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"
-
-  Scenario: Disable a post from being published
-    Given I have a _posts directory
-    And I have an "index.html" file that contains "Published!"
-    And I have the following post:
-      | 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
-    And the "_site/2009/03/27/star-wars.html" file should not exist
-    And I should see "Published!" in "_site/index.html"
-
-  Scenario: Use a custom variable
-    Given I have a _posts directory
-    And I have a _layouts directory
-    And I have the following post:
-      | title     | date       | layout | author      | content                 |
-      | 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
-    And I should see "Post author: Darth Vader" in "_site/2009/03/27/star-wars.html"
-
-  Scenario: Previous and next posts title
-    Given I have a _posts directory
-    And I have a _layouts directory
-    And I have the following posts:
-      | title            | date       | layout  | author      | content                 |
-      | Star Wars        | 2009-03-27 | ordered | Darth Vader | Luke, I am your father. |
-      | Some like it hot | 2009-04-27 | ordered | Osgood      | Nobody is perfect.      |
-      | 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
-    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

@@ -1,50 +0,0 @@
-Feature: Post excerpts
-  As a hacker who likes to blog
-  I want to be able to make a static site
-  In order to share my awesome ideas with the interwebs
-  But some people can only focus for a few moments
-  So just give them a taste
-
-  Scenario: An excerpt without a layout
-    Given I have an "index.html" page that contains "{% for post in site.posts %}{{ post.excerpt }}{% endfor %}"
-    And I have a _posts directory
-    And I have the following posts:
-      | title  | date       | layout | content             |
-      | entry1 | 2007-12-31 | post   | content for entry1. |
-    When I run jekyll build
-    Then 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
-    Given I have an "index.html" page that contains "{% for post in site.posts %}{{ post.excerpt }}{% endfor %}"
-    And I have a _posts directory
-    And I have a _layouts directory
-    And I have a post layout that contains "{{ page.excerpt }}"
-    And I have the following posts:
-      | title  | date       | layout | content             |
-      | entry1 | 2007-12-31 | post   | content for entry1. |
-    When I run jekyll build
-    Then 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/2007/12/31/entry1.html"
-    And I should see exactly "<p>content for entry1.</p>" in "_site/index.html"
-
-  Scenario: An excerpt from a post with a layout which has context
-    Given I have an "index.html" page that contains "{% for post in site.posts %}{{ post.excerpt }}{% endfor %}"
-    And I have a _posts directory
-    And I have a _layouts directory
-    And I have a post layout that contains "<html><head></head><body>{{ page.excerpt }}</body></html>"
-    And I have the following posts:
-      | title  | date       | layout | content             |
-      | entry1 | 2007-12-31 | post   | content for entry1. |
-    When I run jekyll build
-    Then 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"

features/rendering.feature

@@ -1,35 +0,0 @@
-Feature: Rendering
-  As a hacker who likes to blog
-  I want to be able to make a static site
-  In order to share my awesome ideas with the interwebs
-  But I want to make it as simply as possible
-  So render with Liquid and place in Layouts
-
-  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
-    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 simple layout that contains "{{ content }}Ahoy, indeed!"
-    When I run jekyll build
-    Then 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"
-
-  Scenario: Render liquid in Sass
-    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
-    And I should see ".foo-bar {\n  color: red; }" in "_site/index.css"
-
-  Scenario: Render liquid in 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
-    And I should see "hey = 'for cicada';" in "_site/index.js"

features/site_configuration.feature

@@ -1,252 +0,0 @@
-Feature: Site configuration
-  As a hacker who likes to blog
-  I want to be able to configure jekyll
-  In order to make setting up a site easier
-
-  Scenario: Change source directory
-    Given I have a blank site in "_sourcedir"
-    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
-    And I should see "Changing source directory" in "_site/index.html"
-
-  Scenario: Change destination directory
-    Given I have an "index.html" file that contains "Changing destination directory"
-    And I have a configuration file with "destination" set to "_mysite"
-    When I run jekyll build
-    Then the _mysite directory should exist
-    And I should see "Changing destination directory" in "_mysite/index.html"
-
-  Scenario Outline: Similarly named source and destination
-    Given I have a blank site in "<source>"
-    And I have an "<source>/index.md" page that contains "markdown"
-    And I have a configuration file with:
-    | key         | value    |
-    | source      | <source> |
-    | destination | <dest>   |
-    When I run jekyll build
-    Then the <source> directory should exist
-    And the "<dest>/index.html" file should <file_exist> exist
-    And I should see "markdown" in "<source>/index.md"
-
-    Examples:
-      | source        | dest        | file_exist |
-      | mysite_source | mysite      |            |
-      | mysite        | mysite_dest |            |
-      | mysite/       | mysite      | not        |
-      | mysite        | ./mysite    | not        |
-      | mysite/source | mysite      | not        |
-      | mysite        | mysite/dest |            |
-
-  Scenario: Exclude files inline
-    Given I have an "Rakefile" file that contains "I want to be excluded"
-    And I have an "README" file that contains "I want to be excluded"
-    And I have an "index.html" file that contains "I want to be included"
-    And I have a configuration file with "exclude" set to "['Rakefile', 'README']"
-    When I run jekyll build
-    Then I should see "I want to be included" in "_site/index.html"
-    And the "_site/Rakefile" file should not exist
-    And the "_site/README" file should not exist
-
-  Scenario: Exclude files with YAML array
-    Given I have an "Rakefile" file that contains "I want to be excluded"
-    And I have an "README" file that contains "I want to be excluded"
-    And I have an "index.html" file that contains "I want to be included"
-    And I have a configuration file with "exclude" set to:
-      | value    |
-      | README   |
-      | Rakefile |
-    When I run jekyll build
-    Then I should see "I want to be included" in "_site/index.html"
-    And the "_site/Rakefile" file should not exist
-    And the "_site/README" file should not exist
-
-  Scenario: Use RDiscount for markup
-    Given I have an "index.markdown" page that contains "[Google](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
-    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
-    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
-    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
-    And I should see "Hello world!" in "_site/index.html"
-    And I should see "class=\"highlight\"" in "_site/index.html"
-
-  Scenario: Highlight code with rouge
-    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
-    And I should see "Hello world!" in "_site/index.html"
-    And I should see "class=\"highlight\"" in "_site/index.html"
-
-  Scenario: Rouge renders code block once
-    Given I have a configuration file with "highlighter" set to "rouge"
-    And I have a _posts directory
-    And I have the following post:
-      | title | date             | layout  | content                                      |
-      | foo   | 2014-04-27 11:34 | default | {% highlight text %} test {% endhighlight %} |
-    When I run jekyll build
-    Then I should not see "highlight(.*)highlight" in "_site/2014/04/27/foo.html"
-
-  Scenario: Set time and no future dated posts
-    Given I have a _layouts directory
-    And I have a page layout that contains "Page Layout: {{ site.posts.size }} on {{ site.time | date: "%Y-%m-%d" }}"
-    And I have a post layout that contains "Post Layout: {{ content }}"
-    And I have an "index.html" page with layout "page" that contains "site index page"
-    And I have a configuration file with:
-      | key         | value        |
-      | time        | 2010-01-01   |
-      | future      | false        |
-    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
-    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
-
-  Scenario: Set time and future dated posts allowed
-    Given I have a _layouts directory
-    And I have a page layout that contains "Page Layout: {{ site.posts.size }} on {{ site.time | date: "%Y-%m-%d" }}"
-    And I have a post layout that contains "Post Layout: {{ content }}"
-    And I have an "index.html" page with layout "page" that contains "site index page"
-    And I have a configuration file with:
-      | key         | value        |
-      | time        | 2010-01-01   |
-      | future      | true         |
-    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
-    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"
-
-    Scenario: Generate proper dates with explicitly set timezone (same as posts' time)
-      Given I have a _layouts directory
-      And I have a page layout that contains "Page Layout: {{ site.posts.size }}"
-      And I have a post layout that contains "Post Layout: {{ content }} built at {{ page.date | date_to_xmlschema }}"
-      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    | America/New_York |
-      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. |
-      When I run jekyll build
-      Then 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"
-
-    Scenario: Generate proper dates with explicitly set timezone (different than posts' time)
-      Given I have a _layouts directory
-      And I have a page layout that contains "Page Layout: {{ site.posts.size }}"
-      And I have a post layout that contains "Post Layout: {{ content }} built at {{ page.date | date_to_xmlschema }}"
-      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 |
-      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. |
-      When I run jekyll build
-      Then 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"
-
-  Scenario: Limit the number of posts generated by most recent date
-    Given I have a _posts directory
-    And I have a configuration file with:
-      | key         | value       |
-      | limit_posts | 2           |
-    And I have the following posts:
-      | title   | date       | content                  |
-      | Apples  | 2009-03-27 | An article about apples  |
-      | 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
-    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
-
-  Scenario: Copy over normally excluded files when they are explicitly included
-    Given I have a ".gitignore" file that contains ".DS_Store"
-    And I have an ".htaccess" file that contains "SomeDirective"
-    And I have a configuration file with "include" set to:
-      | value      |
-      | .gitignore |
-      | .foo       |
-    When I run jekyll build
-    Then the _site directory should exist
-    And I should see ".DS_Store" in "_site/.gitignore"
-    And the "_site/.htaccess" file should not exist
-
-  Scenario: Using a different layouts directory
-    Given I have a _theme directory
-    And I have a page theme that contains "Page Layout: {{ site.posts.size }} on {{ site.time | date: "%Y-%m-%d" }}"
-    And I have a post theme that contains "Post Layout: {{ content }}"
-    And I have an "index.html" page with layout "page" that contains "site index page"
-    And I have a configuration file with:
-      | key         | value        |
-      | time        | 2010-01-01   |
-      | future      | true         |
-      | layouts     | _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
-    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"
-
-  Scenario: arbitrary file reads via layouts
-    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
-    And I should see "FOO" in "_site/index.html"
-    And I should not see " " in "_site/index.html"

features/site_data.feature

@@ -1,107 +0,0 @@
-Feature: Site data
-  As a hacker who likes to blog
-  I want to be able to embed data into my site
-  In order to make the site slightly dynamic
-
-  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
-    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
-    And I should see "Source path: <path>" in "_site/<path>"
-
-    Examples:
-      | dir        | path                 |
-      | .          | index.html           |
-      | dir        | dir/about.html       |
-      | dir/nested | dir/nested/page.html |
-
-  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
-    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
-    And I should see today's time in "_site/index.html"
-
-  Scenario: Use site.posts variable for latest post
-    Given I have a _posts directory
-    And I have an "index.html" page that contains "{{ site.posts.first.title }}: {{ site.posts.first.url }}"
-    And I have the following posts:
-      | title       | date       | content        |
-      | First Post  | 2009-03-25 | My First Post  |
-      | 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
-    And I should see "Third Post: /2009/03/27/third-post.html" in "_site/index.html"
-
-  Scenario: Use site.posts variable in a loop
-    Given I have a _posts directory
-    And I have an "index.html" page that contains "{% for post in site.posts %} {{ post.title }} {% endfor %}"
-    And I have the following posts:
-      | title       | date       | content        |
-      | First Post  | 2009-03-25 | My First Post  |
-      | 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
-    And I should see "Third Post  Second Post  First Post" in "_site/index.html"
-
-  Scenario: Use site.categories.code variable
-    Given I have a _posts directory
-    And I have an "index.html" page that contains "{% for post in site.categories.code %} {{ post.title }} {% endfor %}"
-    And I have the following posts:
-      | title          | date       | category | content            |
-      | 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
-    And I should see "Awesome Hack" in "_site/index.html"
-
-  Scenario: Use site.tags variable
-    Given I have a _posts directory
-    And I have an "index.html" page that contains "{% for post in site.tags.beer %} {{ post.content }} {% endfor %}"
-    And I have the following posts:
-      | title          | date       | tag  | content      |
-      | Delicious Beer | 2009-03-26 | beer | 1) Yuengling |
-    When I run jekyll build
-    Then the _site directory should exist
-    And I should see "Yuengling" in "_site/index.html"
-
-  Scenario: Order Posts by name when on the same date
-  Given I have a _posts directory
-  And I have an "index.html" page that contains "{% for post in site.posts %}{{ post.title }}:{{ post.previous.title}},{{ post.next.title}} {% endfor %}"
-  And I have the following posts:
-    | title | date       | content |
-    | first | 2009-02-26 | first   |
-    | A     | 2009-03-26 | A       |
-    | B     | 2009-03-26 | B       |
-    | C     | 2009-03-26 | C       |
-    | last  | 2009-04-26 | last    |
-  When I run jekyll build
-  Then 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
-    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
-    And I should see "\d+\.\d+\.\d+" in "_site/index.html"

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/overview.rb

@@ -1,147 +0,0 @@
-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
-      include FileUtils
-      include Cucumber::Formatter::Console
-      include Cucumber::Formatter::Io
-      include Gherkin::Formatter::Escaping
-      attr_writer :indent
-      attr_reader :runtime
-
-      def initialize(runtime, path_or_io, options)
-        @runtime, @io, @options = runtime, ensure_io(path_or_io, "pretty"), options
-        @exceptions = []
-        @indent = 0
-        @prefixes = options[:prefixes] || {}
-        @delayed_messages = []
-      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 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
-      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)
-      end
-
-      def scenario_name(keyword, name, file_colon_line, source_indent)
-        print_feature_element_name(keyword, name, file_colon_line, source_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)
-        @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]
-      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)
-        @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
-        @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)
-        print_snippets(@options)
-        print_passing_wip(@options)
-      end
-    end
-  end
-end

jekyll.gemspec

@@ -1,48 +1,50 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'jekyll/version'
+# -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.specification_version = 2 if s.respond_to? :specification_version=
-  s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
-  s.rubygems_version = '2.2.2'
-  s.required_ruby_version = '>= 2.0.0'
+  s.name = %q{jekyll}
+  s.version = "0.4.5"
 
-  s.name          = 'jekyll'
-  s.version       = Jekyll::VERSION
-  s.license       = 'MIT'
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Tom Preston-Werner"]
+  s.date = %q{2009-03-08}
+  s.default_executable = %q{jekyll}
+  s.description = %q{Jekyll is a simple, blog aware, static site generator.}
+  s.email = %q{tom@mojombo.com}
+  s.executables = ["jekyll"]
+  s.files = ["History.txt", "Rakefile", "README.textile", "TODO", "VERSION.yml", "bin/jekyll", "lib/jekyll", "lib/jekyll/albino.rb", "lib/jekyll/converters", "lib/jekyll/converters/csv.rb", "lib/jekyll/converters/mephisto.rb", "lib/jekyll/converters/mt.rb", "lib/jekyll/converters/textpattern.rb", "lib/jekyll/converters/typo.rb", "lib/jekyll/converters/wordpress.rb", "lib/jekyll/convertible.rb", "lib/jekyll/core_ext.rb", "lib/jekyll/filters.rb", "lib/jekyll/layout.rb", "lib/jekyll/page.rb", "lib/jekyll/post.rb", "lib/jekyll/site.rb", "lib/jekyll/tags", "lib/jekyll/tags/highlight.rb", "lib/jekyll/tags/include.rb", "lib/jekyll.rb", "test/dest", "test/dest/2008", "test/dest/2008/10", "test/dest/2008/10/18", "test/dest/2008/10/18/foo-bar.html", "test/dest/2008/11", "test/dest/2008/11/21", "test/dest/2008/11/21/complex.html", "test/dest/2008/12", "test/dest/2008/12/13", "test/dest/2008/12/13/include.html", "test/dest/2009", "test/dest/2009/01", "test/dest/2009/01/27", "test/dest/2009/01/27/no-categories.html", "test/dest/2009/01/27/no-topics.html", "test/dest/2009/01/27/topic.html", "test/dest/2009/01/27/topics.html", "test/dest/_posts", "test/dest/_posts/2008-02-02-not-published.html", "test/dest/_posts/2008-02-02-published.html", "test/dest/_posts/2008-10-18-foo-bar.html", "test/dest/_posts/2008-11-21-complex.html", "test/dest/_posts/2008-12-03-permalinked-post.html", "test/dest/_posts/2008-12-13-include.html", "test/dest/_posts/2009-01-27-categories.html", "test/dest/_posts/2009-01-27-category.html", "test/dest/_posts/2009-01-27-no-categories.html", "test/dest/_posts/2009-01-27-no-topics.html", "test/dest/_posts/2009-01-27-topic.html", "test/dest/_posts/2009-01-27-topics.html", "test/dest/category", "test/dest/category/2008", "test/dest/category/2008/09", "test/dest/category/2008/09/23", "test/dest/category/2008/09/23/categories.html", "test/dest/category/_posts", "test/dest/category/_posts/2008-9-23-categories.html", "test/dest/css", "test/dest/css/screen.css", "test/dest/foo", "test/dest/foo/2008", "test/dest/foo/2008/12", "test/dest/foo/2008/12/12", "test/dest/foo/2008/12/12/topical-post.html", "test/dest/foo/2009", "test/dest/foo/2009/01", "test/dest/foo/2009/01/27", "test/dest/foo/2009/01/27/category.html", "test/dest/foo/_posts", "test/dest/foo/_posts/bar", "test/dest/foo/_posts/bar/2008-12-12-topical-post.html", "test/dest/foo/bar", "test/dest/foo/bar/baz", "test/dest/foo/bar/baz/2009", "test/dest/foo/bar/baz/2009/01", "test/dest/foo/bar/baz/2009/01/27", "test/dest/foo/bar/baz/2009/01/27/categories.html", "test/dest/index.html", "test/dest/my_category", "test/dest/my_category/permalinked-post", "test/dest/publish_test", "test/dest/publish_test/2008", "test/dest/publish_test/2008/02", "test/dest/publish_test/2008/02/02", "test/dest/publish_test/2008/02/02/published.html", "test/dest/z_category", "test/dest/z_category/2008", "test/dest/z_category/2008/09", "test/dest/z_category/2008/09/23", "test/dest/z_category/2008/09/23/categories.html", "test/dest/z_category/_posts", "test/dest/z_category/_posts/2008-9-23-categories.html", "test/helper.rb", "test/source", "test/source/_includes", "test/source/_includes/sig.markdown", "test/source/_layouts", "test/source/_layouts/default.html", "test/source/_layouts/simple.html", "test/source/_posts", "test/source/_posts/2008-02-02-not-published.textile", "test/source/_posts/2008-02-02-published.textile", "test/source/_posts/2008-10-18-foo-bar.textile", "test/source/_posts/2008-11-21-complex.textile", "test/source/_posts/2008-12-03-permalinked-post.textile", "test/source/_posts/2008-12-13-include.markdown", "test/source/_posts/2009-01-27-categories.textile", "test/source/_posts/2009-01-27-category.textile", "test/source/_posts/2009-01-27-no-categories.textile", "test/source/_posts/2009-01-27-no-topics.textile", "test/source/_posts/2009-01-27-topic.textile", "test/source/_posts/2009-01-27-topics.textile", "test/source/category", "test/source/category/_posts", "test/source/category/_posts/2008-9-23-categories.textile", "test/source/css", "test/source/css/screen.css", "test/source/foo", "test/source/foo/_posts", "test/source/foo/_posts/bar", "test/source/foo/_posts/bar/2008-12-12-topical-post.textile", "test/source/index.html", "test/source/z_category", "test/source/z_category/_posts", "test/source/z_category/_posts/2008-9-23-categories.textile", "test/suite.rb", "test/test_filters.rb", "test/test_generated_site.rb", "test/test_jekyll.rb", "test/test_post.rb", "test/test_site.rb", "test/test_tags.rb"]
+  s.has_rdoc = true
+  s.homepage = %q{http://github.com/mojombo/jekyll}
+  s.rdoc_options = ["--inline-source", "--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{jekyll}
+  s.rubygems_version = %q{1.3.1}
+  s.summary = %q{Jekyll is a simple, blog aware, static site generator.}
 
-  s.summary       = 'A simple, blog aware, static site generator.'
-  s.description   = 'Jekyll is a simple, blog aware, static site generator.'
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 2
 
-  s.authors       = ['Tom Preston-Werner']
-  s.email         = 'tom@mojombo.com'
-  s.homepage      = 'https://github.com/jekyll/jekyll'
-
-  all_files       = `git ls-files -z`.split("\x0")
-  s.files         = all_files.grep(%r{^(bin|lib)/})
-  s.executables   = all_files.grep(%r{^bin/}) { |f| File.basename(f) }
-  s.require_paths = ['lib']
-
-  s.rdoc_options = ['--charset=UTF-8']
-  s.extra_rdoc_files = %w[README.markdown LICENSE]
-
-  s.add_runtime_dependency('liquid',    '~> 3.0')
-  s.add_runtime_dependency('kramdown',  '~> 1.3')
-  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('jekyll-sass-converter', '~> 1.0')
-  s.add_runtime_dependency('jekyll-watch', '~> 1.1')
-  s.add_runtime_dependency('classifier-reborn', '~> 2.0')
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<RedCloth>, [">= 4.0.4"])
+      s.add_runtime_dependency(%q<liquid>, [">= 1.9.0"])
+      s.add_runtime_dependency(%q<classifier>, [">= 1.3.1"])
+      s.add_runtime_dependency(%q<maruku>, [">= 0.5.9"])
+      s.add_runtime_dependency(%q<directory_watcher>, [">= 1.1.1"])
+      s.add_runtime_dependency(%q<open4>, [">= 0.9.6"])
+    else
+      s.add_dependency(%q<RedCloth>, [">= 4.0.4"])
+      s.add_dependency(%q<liquid>, [">= 1.9.0"])
+      s.add_dependency(%q<classifier>, [">= 1.3.1"])
+      s.add_dependency(%q<maruku>, [">= 0.5.9"])
+      s.add_dependency(%q<directory_watcher>, [">= 1.1.1"])
+      s.add_dependency(%q<open4>, [">= 0.9.6"])
+    end
+  else
+    s.add_dependency(%q<RedCloth>, [">= 4.0.4"])
+    s.add_dependency(%q<liquid>, [">= 1.9.0"])
+    s.add_dependency(%q<classifier>, [">= 1.3.1"])
+    s.add_dependency(%q<maruku>, [">= 0.5.9"])
+    s.add_dependency(%q<directory_watcher>, [">= 1.1.1"])
+    s.add_dependency(%q<open4>, [">= 0.9.6"])
+  end
 end

lib/jekyll.rb

@@ -1,179 +1,67 @@
-$:.unshift File.dirname(__FILE__) # For use/testing when no gem is installed
-
-# Require all of the Ruby files in the given directory.
-#
-# path - The String relative path from here to the directory.
-#
-# Returns nothing.
-def require_all(path)
-  glob = File.join(File.dirname(__FILE__), path, '*.rb')
-  Dir[glob].each do |f|
-    require f
-  end
-end
+$:.unshift File.dirname(__FILE__)     # For use/testing when no gem is installed
 
 # rubygems
 require 'rubygems'
 
-# stdlib
+# core
 require 'fileutils'
 require 'time'
-require 'English'
-require 'pathname'
-require 'logger'
-require 'set'
+require 'yaml'
+
+# stdlib
 
 # 3rd party
-require 'safe_yaml/load'
 require 'liquid'
-require 'kramdown'
-require 'colorator'
+require 'redcloth'
+begin
+  require 'maruku'
+  require 'maruku/ext/math'
+  # Switch off MathML output
+  MaRuKu::Globals[:html_math_output_mathml] = false
+  MaRuKu::Globals[:html_math_engine] = 'none'
 
-SafeYAML::OPTIONS[:suppress_warnings] = true
-Liquid::Template.error_mode = :strict
-
-module Jekyll
-
-  # internal requires
-  autoload :Cleaner,             'jekyll/cleaner'
-  autoload :Collection,          'jekyll/collection'
-  autoload :Configuration,       'jekyll/configuration'
-  autoload :Convertible,         'jekyll/convertible'
-  autoload :Deprecator,          'jekyll/deprecator'
-  autoload :Document,            'jekyll/document'
-  autoload :Draft,               'jekyll/draft'
-  autoload :EntryFilter,         'jekyll/entry_filter'
-  autoload :Errors,              'jekyll/errors'
-  autoload :Excerpt,             'jekyll/excerpt'
-  autoload :External,            'jekyll/external'
-  autoload :Filters,             'jekyll/filters'
-  autoload :FrontmatterDefaults, 'jekyll/frontmatter_defaults'
-  autoload :Layout,              'jekyll/layout'
-  autoload :LayoutReader,        'jekyll/layout_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 :RelatedPosts,        'jekyll/related_posts'
-  autoload :Renderer,            'jekyll/renderer'
-  autoload :Site,                'jekyll/site'
-  autoload :StaticFile,          'jekyll/static_file'
-  autoload :Stevenson,           'jekyll/stevenson'
-  autoload :URL,                 'jekyll/url'
-  autoload :Utils,               'jekyll/utils'
-  autoload :VERSION,             'jekyll/version'
-
-  # extensions
-  require 'jekyll/plugin'
-  require 'jekyll/converter'
-  require 'jekyll/generator'
-  require 'jekyll/command'
-  require 'jekyll/liquid_extensions'
-
-  class << self
-    # Public: Tells you which Jekyll environment you are building in so you can skip tasks
-    # if you need to.  This is useful when doing expensive compression tasks on css and
-    # images and allows you to skip that when working in development.
-
-    def env
-      ENV["JEKYLL_ENV"] || "development"
-    end
-
-    # Public: Generate a Jekyll configuration Hash by merging the default
-    # options with anything in _config.yml, and adding the given options on top.
-    #
-    # override - A Hash of config directives that override any options in both
-    #            the defaults and the config file. See Jekyll::Configuration::DEFAULTS for a
-    #            list of option names and their defaults.
-    #
-    # Returns the final configuration Hash.
-    def configuration(override = Hash.new)
-      config = Configuration[Configuration::DEFAULTS]
-      override = Configuration[override].stringify_keys
-      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
-    end
-
-    # Public: Set the TZ environment variable to use the timezone specified
-    #
-    # timezone - the IANA Time Zone
-    #
-    # Returns nothing
-    def set_timezone(timezone)
-      ENV['TZ'] = timezone
-    end
-
-    # Public: Fetch the logger instance for this Jekyll process.
-    #
-    # Returns the LogAdapter instance.
-    def logger
-      @logger ||= LogAdapter.new(Stevenson.new, (ENV["JEKYLL_LOG_LEVEL"] || :info).to_sym)
-    end
-
-    # Public: Set the log writer.
-    #         New log writer must respond to the same methods
-    #         as Ruby's interal Logger.
-    #
-    # writer - the new Logger-compatible log transport
-    #
-    # Returns the new logger.
-    def logger=(writer)
-      @logger = LogAdapter.new(writer)
-    end
-
-    # Public: An array of sites
-    #
-    # Returns the Jekyll sites created.
-    def sites
-      @sites ||= []
-    end
-
-    # Public: Ensures the questionable path is prefixed with the base directory
-    #         and prepends the questionable path with the base directory if false.
-    #
-    # base_directory - the directory with which to prefix the questionable path
-    # questionable_path - the path we're unsure about, and want prefixed
-    #
-    # Returns the sanitized path.
-    def sanitized_path(base_directory, questionable_path)
-      return base_directory if base_directory.eql?(questionable_path)
-
-      clean_path = File.expand_path(questionable_path, "/")
-      clean_path = clean_path.sub(/\A\w\:\//, '/')
-
-      unless clean_path.start_with?(base_directory.sub(/\A\w\:\//, '/'))
-        File.join(base_directory, clean_path)
-      else
-        clean_path
-      end
-    end
-
-    # Conditional optimizations
-    Jekyll::External.require_if_present('liquid-c')
-
-  end
+  # 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] =  'blahtex'
+  MaRuKu::Globals[:html_png_dir] = 'images/latex'
+  MaRuKu::Globals[:html_png_url] = '/images/latex/'
+rescue LoadError
+  puts "The maruku gem is required for markdown support!"
 end
 
-require_all 'jekyll/commands'
-require_all 'jekyll/converters'
-require_all 'jekyll/converters/markdown'
-require_all 'jekyll/generators'
-require_all 'jekyll/tags'
+# internal requires
+require 'jekyll/core_ext'
+require 'jekyll/site'
+require 'jekyll/convertible'
+require 'jekyll/layout'
+require 'jekyll/page'
+require 'jekyll/post'
+require 'jekyll/filters'
+require 'jekyll/tags/highlight'
+require 'jekyll/tags/include'
+require 'jekyll/albino'
 
-# 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
-])
+module Jekyll
+  class << self
+    attr_accessor :source, :dest, :lsi, :pygments, :markdown_proc, :content_type, :permalink_style
+  end
+  
+  Jekyll.lsi = false
+  Jekyll.pygments = false
+  Jekyll.markdown_proc = Proc.new { |x| Maruku.new(x).to_html }
+  Jekyll.permalink_style = :date
+  
+  def self.process(source, dest)
+    require 'classifier' if Jekyll.lsi
+    
+    Jekyll.source = source
+    Jekyll.dest = dest
+    Jekyll::Site.new(source, dest).process
+  end
+  
+  def self.version
+    yml = YAML.load(File.read(File.join(File.dirname(__FILE__), *%w[.. VERSION.yml])))
+    "#{yml[:major]}.#{yml[:minor]}.#{yml[:patch]}"
+  end
+end

lib/jekyll/albino.rb

@@ -0,0 +1,119 @@
+##
+# Wrapper for the Pygments command line tool, pygmentize.
+#
+# Pygments: http://pygments.org/
+#
+# Assumes pygmentize is in the path.  If not, set its location
+# with Albino.bin = '/path/to/pygmentize'
+#
+# Use like so:
+#
+#   @syntaxer = Albino.new('/some/file.rb', :ruby)
+#   puts @syntaxer.colorize
+#
+# This'll print out an HTMLized, Ruby-highlighted version
+# of '/some/file.rb'.
+#
+# To use another formatter, pass it as the third argument:
+#
+#   @syntaxer = Albino.new('/some/file.rb', :ruby, :bbcode)
+#   puts @syntaxer.colorize
+#
+# You can also use the #colorize class method:
+#
+#   puts Albino.colorize('/some/file.rb', :ruby)
+#
+# Another also: you get a #to_s, for somewhat nicer use in Rails views.
+#
+#   ... helper file ...
+#   def highlight(text)
+#     Albino.new(text, :ruby)
+#   end
+#
+#   ... view file ...
+#   <%= highlight text %>
+#
+# The default lexer is 'text'.  You need to specify a lexer yourself;
+# because we are using STDIN there is no auto-detect.
+#
+# To see all lexers and formatters available, run `pygmentize -L`.
+#
+# Chris Wanstrath // chris@ozmm.org 
+#         GitHub // http://github.com
+#
+require 'open4'
+
+class Albino
+  @@bin = Rails.development? ? 'pygmentize' : '/usr/bin/pygmentize' rescue 'pygmentize'
+
+  def self.bin=(path)
+    @@bin = path
+  end
+
+  def self.colorize(*args)
+    new(*args).colorize
+  end
+
+  def initialize(target, lexer = :text, format = :html)
+    @target  = File.exists?(target) ? File.read(target) : target rescue target
+    @options = { :l => lexer, :f => format }
+  end
+
+  def execute(command)
+    output = ''
+    Open4.popen4(command) do |pid, stdin, stdout, stderr|
+      stdin.puts @target
+      stdin.close
+      output = stdout.read.strip
+    end
+    output
+  end
+
+  def colorize(options = {})
+    execute @@bin + convert_options(options)
+  end
+  alias_method :to_s, :colorize
+
+  def convert_options(options = {})
+    @options.merge(options).inject('') do |string, (flag, value)|
+      string + " -#{flag} #{value}"
+    end
+  end
+end
+
+if $0 == __FILE__
+  require 'rubygems'
+  require 'test/spec'
+  require 'mocha'
+  begin require 'redgreen'; rescue LoadError; end
+
+  context "Albino" do
+    setup do
+      @syntaxer = Albino.new(__FILE__, :ruby)
+    end
+
+    specify "defaults to text" do
+      syntaxer = Albino.new(__FILE__)
+      syntaxer.expects(:execute).with('pygmentize -f html -l text').returns(true)
+      syntaxer.colorize
+    end
+
+    specify "accepts options" do
+      @syntaxer.expects(:execute).with('pygmentize -f html -l ruby').returns(true)
+      @syntaxer.colorize
+    end
+
+    specify "works with strings" do
+      syntaxer = Albino.new('class New; end', :ruby)
+      assert_match %r(highlight), syntaxer.colorize
+    end
+
+    specify "aliases to_s" do
+      assert_equal @syntaxer.colorize, @syntaxer.to_s
+    end
+
+    specify "class method colorize" do
+      assert_equal @syntaxer.colorize, Albino.colorize(__FILE__, :ruby)
+    end
+  end
+end

lib/jekyll/cleaner.rb

@@ -1,103 +0,0 @@
-require 'set'
-
-module Jekyll
-  class Site
-    # Handles the cleanup of a site's destination before it is built.
-    class Cleaner
-      attr_reader :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) if @site.full_rebuild?
-      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.metadata.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
-        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 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 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
-    end
-  end
-end

lib/jekyll/collection.rb

@@ -1,187 +0,0 @@
-module Jekyll
-  class Collection
-    attr_reader :site, :label, :metadata
-
-    # Create a new Collection.
-    #
-    # site - the site to which this collection belongs.
-    # label - the name of the collection
-    #
-    # Returns nothing.
-    def initialize(site, label)
-      @site     = site
-      @label    = sanitize_label(label)
-      @metadata = extract_metadata
-    end
-
-    # Fetch the Documents in this collection.
-    # Defaults to an empty array if no documents have been read in.
-    #
-    # Returns an array of Jekyll::Document objects.
-    def docs
-      @docs ||= []
-    end
-
-    # Fetch the static files in this collection.
-    # Defaults to an empty array if no static files have been read in.
-    #
-    # Returns an array of Jekyll::StaticFile objects.
-    def files
-      @files ||= []
-    end
-
-    # Read the allowed documents into the collection's array of docs.
-    #
-    # Returns the sorted array of docs.
-    def read
-      filtered_entries.each do |file_path|
-        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.read
-          docs << doc if site.publisher.publish?(doc)
-        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)
-        end
-      end
-      docs.sort!
-    end
-
-    # All the entries in this collection.
-    #
-    # 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?
-      @entries ||=
-        Dir.glob(collection_dir("**", "*.*")).map do |entry|
-          entry["#{collection_dir}/"] = ''; entry
-        end
-    end
-
-    # Filtered version of the entries in this collection.
-    # See `Jekyll::EntryFilter#filter` for more information.
-    #
-    # Returns a list of filtered entry paths.
-    def filtered_entries
-      return Array.new unless exists?
-      @filtered_entries ||=
-        Dir.chdir(directory) do
-          entry_filter.filter(entries).reject do |f|
-            path = collection_dir(f)
-            File.directory?(path) || (File.symlink?(f) && site.safe)
-          end
-        end
-    end
-
-    # The directory for this Collection, relative to the site source.
-    #
-    # Returns a String containing the directory name where the collection
-    #   is stored on the filesystem.
-    def relative_directory
-      @relative_directory ||= "_#{label}"
-    end
-
-    # The full path to the directory containing the collection.
-    #
-    # Returns a String containing th directory name where the collection
-    #   is stored on the filesystem.
-    def directory
-      @directory ||= site.in_source_dir(relative_directory)
-    end
-
-    # The full path to the directory containing the collection, with
-    #   optional subpaths.
-    #
-    # *files - (optional) any other path pieces relative to the
-    #           directory to append to the path
-    #
-    # Returns a String containing th directory name where the collection
-    #   is stored on the filesystem.
-    def collection_dir(*files)
-      return directory if files.empty?
-      site.in_source_dir(relative_directory, *files)
-    end
-
-    # Checks whether the directory "exists" for this collection.
-    # The directory must exist on the filesystem and must not be a symlink
-    #   if in safe mode.
-    #
-    # Returns false if the directory doesn't exist or if it's a symlink
-    #   and we're in safe mode.
-    def exists?
-      File.directory?(directory) && !(File.symlink?(directory) && site.safe)
-    end
-
-    # The entry filter for this collection.
-    # Creates an instance of Jekyll::EntryFilter.
-    #
-    # Returns the instance of Jekyll::EntryFilter for this collection.
-    def entry_filter
-      @entry_filter ||= Jekyll::EntryFilter.new(site, relative_directory)
-    end
-
-    # An inspect string.
-    #
-    # Returns the inspect string
-    def inspect
-      "#<Jekyll::Collection @label=#{label} docs=#{docs}>"
-    end
-
-    # Produce a sanitized label name
-    # Label names may not contain anything but alphanumeric characters,
-    #   underscores, and hyphens.
-    #
-    # label - the possibly-unsafe label
-    #
-    # Returns a sanitized version of the label.
-    def sanitize_label(label)
-      label.gsub(/[^a-z0-9_\-\.]/i, '')
-    end
-
-    # Produce a representation of this Collection for use in Liquid.
-    # Exposes two attributes:
-    #   - label
-    #   - docs
-    #
-    # 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
-      })
-    end
-
-    # Whether the collection's documents ought to be written as individual
-    #   files in the output.
-    #
-    # Returns true if the 'write' metadata is true, false otherwise.
-    def write?
-      !!metadata['output']
-    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")
-    end
-
-    # Extract options for this collection from the site configuration.
-    #
-    # Returns the metadata for this collection
-    def extract_metadata
-      if site.config['collections'].is_a?(Hash)
-        site.config['collections'][label] || Hash.new
-      else
-        {}
-      end
-    end
-  end
-end

lib/jekyll/command.rb

@@ -1,67 +0,0 @@
-module Jekyll
-  class Command
-
-    class << self
-
-      # A list of subclasses of Jekyll::Command
-      def subclasses
-        @subclasses ||= []
-      end
-
-      # Keep a list of subclasses of Jekyll::Command every time it's inherited
-      # Called automatically.
-      #
-      # base - the subclass
-      #
-      # Returns nothing
-      def inherited(base)
-        subclasses << base
-        super(base)
-      end
-
-      # Run Site#process and catch errors
-      #
-      # site - the Jekyll::Site object
-      #
-      # Returns nothing
-      def process_site(site)
-        site.process
-      rescue Jekyll::Errors::FatalException => e
-        Jekyll.logger.error "ERROR:", "YOUR SITE COULD NOT BE BUILT:"
-        Jekyll.logger.error "", "------------------------------------"
-        Jekyll.logger.error "", e.message
-        exit(1)
-      end
-
-      # Create a full Jekyll configuration with the options passed in as overrides
-      #
-      # options - the configuration overrides
-      #
-      # Returns a full Jekyll configuration
-      def configuration_from_options(options)
-        Jekyll.configuration(options)
-      end
-
-      # Add common options to a command for building configuration
-      #
-      # c - the Jekyll::Command to add these options to
-      #
-      # Returns nothing
-      def add_build_options(c)
-        c.option 'config',  '--config CONFIG_FILE[,CONFIG_FILE2,...]', Array, 'Custom configuration file'
-        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'
-        c.option 'force_polling', '--force_polling', 'Force watch to use polling'
-        c.option 'lsi',     '--lsi', 'Use LSI for improved related posts'
-        c.option 'show_drafts',  '-D', '--drafts', 'Render posts in the _drafts folder'
-        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.'
-      end
-
-    end
-
-  end
-end

lib/jekyll/commands/build.rb

@@ -1,77 +0,0 @@
-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|
-            c.syntax      'build [options]'
-            c.description 'Build your site'
-            c.alias :b
-
-            add_build_options(c)
-
-            c.action do |args, options|
-              options["serving"] = false
-              Jekyll::Commands::Build.process(options)
-            end
-          end
-        end
-
-        # 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']
-
-          options = configuration_from_options(options)
-          site = Jekyll::Site.new(options)
-
-          if options.fetch('skip_initial_build', false)
-            Jekyll.logger.warn "Build Warning:", "Skipping the initial build. This may result in an out-of-date site."
-          else
-            build(site, options)
-          end
-
-          if options.fetch('watch', false)
-            watch(site, options)
-          else
-            Jekyll.logger.info "Auto-regeneration:", "disabled. Use --watch to enable."
-          end
-        end
-
-        # Build your Jekyll site.
-        #
-        # site - the Jekyll::Site instance to build
-        # options - A Hash of options passed to the command
-        #
-        # Returns nothing.
-        def build(site, options)
-          source      = options['source']
-          destination = options['destination']
-          full_build  = options['full_rebuild']
-          Jekyll.logger.info "Source:", source
-          Jekyll.logger.info "Destination:", destination
-          Jekyll.logger.info "Incremental build:", (full_build ? "disabled" : "enabled")
-          Jekyll.logger.info "Generating..."
-          process_site(site)
-          Jekyll.logger.info "", "done."
-        end
-
-        # Private: Watch for file changes and rebuild the site.
-        #
-        # site - A Jekyll::Site instance
-        # options - A Hash of options passed to the command
-        #
-        # Returns nothing.
-        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

@@ -1,42 +0,0 @@
-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({})
-            end
-          end
-        end
-
-        def process(options)
-          options = configuration_from_options(options)
-          destination = options['destination']
-          metadata_file = File.join(options['source'], '.jekyll-metadata')
-
-          if File.directory? destination
-            Jekyll.logger.info "Cleaning #{destination}..."
-            FileUtils.rm_rf(destination)
-            Jekyll.logger.info "", "done."
-          else
-            Jekyll.logger.info "Nothing to do for #{destination}."
-          end
-
-          if File.file? metadata_file
-            Jekyll.logger.info "Removing #{metadata_file}..."
-            FileUtils.rm_rf(metadata_file)
-            Jekyll.logger.info "", "done."
-          else
-            Jekyll.logger.info "Nothing to do for #{metadata_file}."
-          end
-        end
-
-      end
-    end
-  end
-end

lib/jekyll/commands/doctor.rb

@@ -1,84 +0,0 @@
-module Jekyll
-  module Commands
-    class Doctor < Command
-      class << self
-
-        def init_with_program(prog)
-          prog.command(:doctor) do |c|
-            c.syntax 'doctor'
-            c.description 'Search site and print specific deprecation warnings'
-            c.alias(:hyde)
-
-            c.option '--config CONFIG_FILE[,CONFIG_FILE2,...]', Array, 'Custom configuration file'
-
-            c.action do |args, options|
-              Jekyll::Commands::Doctor.process(options)
-            end
-          end
-        end
-
-        def process(options)
-          site = Jekyll::Site.new(configuration_from_options(options))
-          site.read
-
-          if healthy?(site)
-            Jekyll.logger.info "Your test results", "are in. Everything looks fine."
-          else
-            abort
-          end
-        end
-
-        def healthy?(site)
-          [
-            !deprecated_relative_permalinks(site),
-            !conflicting_urls(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
-          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.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
-          end
-          conflicting_urls
-        end
-
-        private
-
-        def collect_urls(urls, things, destination)
-          things.each do |thing|
-            dest = thing.destination(destination)
-            if urls[dest]
-              urls[dest] << thing.path
-            else
-              urls[dest] = [thing.path]
-            end
-          end
-          urls
-        end
-
-      end
-
-    end
-  end
-end

lib/jekyll/commands/help.rb

@@ -1,33 +0,0 @@
-module Jekyll
-  module Commands
-    class Help < Command
-      class << self
-
-        def init_with_program(prog)
-          prog.command(:help) do |c|
-            c.syntax 'help [subcommand]'
-            c.description 'Show the help message, optionally for a given subcommand.'
-
-            c.action do |args, _|
-              cmd = (args.first || "").to_sym
-              if args.empty?
-                puts prog
-              elsif prog.has_command? cmd
-                puts prog.commands[cmd]
-              else
-                invalid_command(prog, cmd)
-                abort
-              end
-            end
-          end
-        end
-
-        def invalid_command(prog, cmd)
-          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
-end

lib/jekyll/commands/new.rb

@@ -1,82 +0,0 @@
-require 'erb'
-
-module Jekyll
-  module Commands
-    class New < Command
-      class << self 
-        def init_with_program(prog)
-          prog.command(:new) do |c|
-            c.syntax 'new PATH'
-            c.description 'Creates a new Jekyll site scaffold in PATH'
-
-            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
-          end
-        end
-
-        def process(args, options = {})
-          raise ArgumentError.new('You must specify a path.') if args.empty?
-
-          new_blog_path = File.expand_path(args.join(" "), Dir.pwd)
-          FileUtils.mkdir_p new_blog_path
-          if preserve_source_location?(new_blog_path, options)
-            Jekyll.logger.abort_with "Conflict:", "#{new_blog_path} exists and is not empty."
-          end
-
-          if options["blank"]
-            create_blank_site new_blog_path
-          else
-            create_sample_files new_blog_path
-
-            File.open(File.expand_path(initialized_post_name, new_blog_path), "w") do |f|
-              f.write(scaffold_post_content)
-            end
-          end
-
-          Jekyll.logger.info "New jekyll site installed in #{new_blog_path}."
-        end
-
-        def create_blank_site(path)
-          Dir.chdir(path) do
-            FileUtils.mkdir(%w(_layouts _posts _drafts))
-            FileUtils.touch("index.html")
-          end
-        end
-
-        def scaffold_post_content
-          ERB.new(File.read(File.expand_path(scaffold_path, site_template))).result
-        end
-
-        # Internal: Gets the filename of the sample post to be created
-        #
-        # Returns the filename of the sample post, as a String
-        def initialized_post_name
-          "_posts/#{Time.now.strftime('%Y-%m-%d')}-welcome-to-jekyll.markdown"
-        end
-
-        private
-
-        def preserve_source_location?(path, options)
-          !options["force"] && !Dir["#{path}/**/*"].empty?
-        end
-
-        def create_sample_files(path)
-          FileUtils.cp_r site_template + '/.', path
-          FileUtils.rm File.expand_path(scaffold_path, path)
-        end
-
-        def site_template
-          File.expand_path("../../site_template", File.dirname(__FILE__))
-        end
-
-        def scaffold_path
-          "_posts/0000-00-00-welcome-to-jekyll.markdown.erb"
-        end
-      end  
-    end
-  end
-end

lib/jekyll/commands/serve.rb

@@ -1,136 +0,0 @@
-# -*- encoding: utf-8 -*-
-module Jekyll
-  module Commands
-    class Serve < Command
-
-      class << self
-
-        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
-
-            add_build_options(c)
-
-            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)
-            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']
-          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
-        end
-
-        def setup(destination)
-          require 'webrick'
-
-          FileUtils.mkdir_p(destination)
-
-          # monkey patch WEBrick using custom 404 page (/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'))
-              end
-            end
-          end
-        end
-
-        def webrick_options(config)
-          opts = {
-            :BindAddress        => config['host'],
-            :DirectoryIndex     => %w(index.html index.htm index.cgi index.rhtml index.xml),
-            :DocumentRoot       => config['destination'],
-            :DoNotReverseLookup => true,
-            :MimeTypes          => mime_types,
-            :Port               => config['port'],
-            :StartCallback      => start_callback(config['detach'])
-          }
-
-          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
-
-          opts
-        end
-
-        def start_callback(detached)
-          unless detached
-            Proc.new { Jekyll.logger.info "Server running...", "press ctrl-c to stop." }
-          end
-        end
-
-        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
-          WEBrick::Config::FileHandler.merge({
-            :FancyIndexing     => true,
-            :NondisclosureName => ['.ht*','~*']
-          })
-        end
-
-      end
-
-    end
-  end
-end

lib/jekyll/configuration.rb

@@ -1,283 +0,0 @@
-# encoding: UTF-8
-
-module Jekyll
-  class Configuration < Hash
-
-    # Default options. Overridden by values in _config.yml.
-    # Strings rather than symbols are used for compatibility with YAML.
-    DEFAULTS = {
-      # Where things are
-      'source'        => Dir.pwd,
-      'destination'   => File.join(Dir.pwd, '_site'),
-      'plugins'       => '_plugins',
-      'layouts'       => '_layouts',
-      'data_source'   =>  '_data',
-      'collections'   => nil,
-
-      # Handling Reading
-      'safe'          => false,
-      'include'       => ['.htaccess'],
-      'exclude'       => [],
-      '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
-      'unpublished'   => false,
-
-      # Plugins
-      'whitelist'     => [],
-      'gems'          => [],
-
-      # Conversion
-      'markdown'      => 'kramdown',
-      'highlighter'   => 'pygments',
-      'lsi'           => false,
-      'excerpt_separator' => "\n\n",
-
-      # Serving
-      'detach'        => false,          # default to not detaching the server
-      'port'          => '4000',
-      '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,
-      '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' => []
-      },
-
-      'redcarpet' => {
-        'extensions' => []
-      },
-
-      'kramdown' => {
-        'auto_ids'       => true,
-        'footnote_nr'    => 1,
-        'entity_output'  => 'as_char',
-        'toc_levels'     => '1..6',
-        '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
-      }
-    }
-
-    # 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) }
-    end
-
-    # Public: Directory of the Jekyll source folder
-    #
-    # override - the command-line options hash
-    #
-    # Returns the path to the Jekyll source directory
-    def source(override)
-      override['source'] || self['source'] || DEFAULTS['source']
-    end
-
-    def quiet?(override = {})
-      override['quiet'] || self['quiet'] || DEFAULTS['quiet']
-    end
-
-    def safe_load_file(filename)
-      case File.extname(filename)
-      when /\.toml/i
-        TOML.load_file(filename)
-      when /\.ya?ml/i
-        SafeYAML.load_file(filename)
-      else
-        raise ArgumentError, "No parser for '#{filename}' is available. Use a .toml or .y(a)ml file instead."
-      end
-    end
-
-    # Public: Generate list of configuration files from the override
-    #
-    # override - the command-line options hash
-    #
-    # Returns an Array of config files
-    def config_files(override)
-      # Be quiet quickly.
-      Jekyll.logger.log_level = :error if quiet?(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}")
-        end
-        config_files = Jekyll.sanitized_path(source(override), "_config.#{default}")
-        @default_config_file = true
-      end
-      config_files = [config_files] unless config_files.is_a? Array
-      config_files
-    end
-
-    # Public: Read configuration and return merged Hash
-    #
-    # file - the path to the YAML file to be read in
-    #
-    # 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)
-      Jekyll.logger.info "Configuration file:", file
-      next_config
-    rescue SystemCallError
-      if @default_config_file
-        Jekyll.logger.warn "Configuration file:", "none"
-        {}
-      else
-        Jekyll.logger.error "Fatal:", "The configuration file '#{file}' could not be found."
-        raise LoadError, "The Configuration file '#{file}' could not be found."
-      end
-    end
-
-    # Public: Read in a list of configuration files and merge with this hash
-    #
-    # files - the list of configuration file paths
-    #
-    # Returns the full configuration, with the defaults overridden by the values in the
-    # configuration files
-    def read_config_files(files)
-      configuration = clone
-
-      begin
-        files.each do |config_file|
-          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. " +
-                     "Using defaults (and options)."
-        $stderr.puts "#{err}"
-      end
-
-      configuration.fix_common_issues.backwards_compatibilize
-    end
-
-    # Public: Split a CSV string into an array containing its values
-    #
-    # csv - the string of comma-separated values
-    #
-    # Returns an array of the values contained in the CSV
-    def csv_to_array(csv)
-      csv.split(",").map(&:strip)
-    end
-
-    # Public: Ensure the proper options are set in the configuration to allow for
-    # backwards-compatibility with Jekyll pre-1.0
-    #
-    # Returns the backwards-compatible configuration
-    def backwards_compatibilize
-      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"+
-                            " --[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'" +
-                            " 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
-
-      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', " +
-                            "'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" +
-            " as a list of comma-separated values."
-          config[option] = csv_to_array(config[option])
-        end
-        config[option].map!(&:to_s)
-      end
-
-      if (config['kramdown'] || {}).key?('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."
-      end
-      config
-    end
-
-    def fix_common_issues
-      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" +
-          " positive integer or nil. It's currently set to '#{config['paginate'].inspect}'."
-        config['paginate'] = nil
-      end
-
-      config
-    end
-  end
-end

lib/jekyll/converter.rb

@@ -1,48 +0,0 @@
-module Jekyll
-  class Converter < Plugin
-    # Public: Get or set the highlighter prefix. When an argument is specified,
-    # the prefix will be set. If no argument is specified, the current prefix
-    # will be returned.
-    #
-    # highlighter_prefix - The String prefix (default: nil).
-    #
-    # Returns the String prefix.
-    def self.highlighter_prefix(highlighter_prefix = nil)
-      @highlighter_prefix = highlighter_prefix if highlighter_prefix
-      @highlighter_prefix
-    end
-
-    # Public: Get or set the highlighter suffix. When an argument is specified,
-    # the suffix will be set. If no argument is specified, the current suffix
-    # will be returned.
-    #
-    # highlighter_suffix - The String suffix (default: nil).
-    #
-    # Returns the String suffix.
-    def self.highlighter_suffix(highlighter_suffix = nil)
-      @highlighter_suffix = highlighter_suffix if highlighter_suffix
-      @highlighter_suffix
-    end
-
-    # Initialize the converter.
-    #
-    # Returns an initialized Converter.
-    def initialize(config = {})
-      @config = config
-    end
-
-    # Get the highlighter prefix.
-    #
-    # Returns the String prefix.
-    def highlighter_prefix
-      self.class.highlighter_prefix
-    end
-
-    # Get the highlighter suffix.
-    #
-    # Returns the String suffix.
-    def highlighter_suffix
-      self.class.highlighter_suffix
-    end
-  end
-end

lib/jekyll/converters/csv.rb

@@ -0,0 +1,26 @@
+module Jekyll
+  module CSV
+    #Reads a csv with title, permalink, body, published_at, and filter.
+    #It creates a post file for each row in the csv
+    def self.process(file = "posts.csv")
+      FileUtils.mkdir_p "_posts"
+      posts = 0
+      FasterCSV.foreach(file) do |row|
+        next if row[0] == "title"
+        posts += 1
+        name = row[3].split(" ")[0]+"-"+row[1]+(row[4] =~ /markdown/ ? ".markdown" : ".textile")
+        File.open("_posts/#{name}", "w") do |f|
+          f.puts <<-HEADER
+---
+layout: post
+title: #{row[0]}
+---
+
+          HEADER
+          f.puts row[2]
+        end
+      end
+      "Created #{posts} posts!"
+    end
+  end
+end

lib/jekyll/converters/identity.rb

@@ -1,21 +0,0 @@
-module Jekyll
-  module Converters
-    class Identity < Converter
-      safe true
-
-      priority :lowest
-
-      def matches(ext)
-        true
-      end
-
-      def output_ext(ext)
-        ext
-      end
-
-      def convert(content)
-        content
-      end
-    end
-  end
-end

lib/jekyll/converters/markdown.rb

@@ -1,83 +0,0 @@
-module Jekyll
-  module Converters
-    class Markdown < Converter
-      safe true
-
-      highlighter_prefix "\n"
-      highlighter_suffix "\n"
-
-      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
-        @setup = true
-      end
-
-      def valid_processors
-        %w[
-          maruku
-          rdiscount
-          kramdown
-          redcarpet
-        ] + third_party_processors
-      end
-
-      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
-        )
-      end
-
-      def matches(ext)
-        ext =~ extname_matches_regexp
-      end
-
-      def output_ext(ext)
-        ".html"
-      end
-
-      def convert(content)
-        setup
-        @parser.convert(content)
-      end
-
-      private
-
-      # 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)
-      end
-    end
-  end
-end

lib/jekyll/converters/markdown/kramdown_parser.rb

@@ -1,29 +0,0 @@
-module Jekyll
-  module Converters
-    class Markdown
-      class KramdownParser
-        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")
-        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
-        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

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

lib/jekyll/converters/markdown/redcarpet_parser.rb

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

lib/jekyll/converters/mephisto.rb

@@ -0,0 +1,79 @@
+# Quickly hacked together my Michael Ivey
+# Based on mt.rb by Nick Gerakines, open source and publically
+# available under the MIT license. Use this module at your own risk.
+
+require 'rubygems'
+require 'sequel'
+require 'fastercsv'
+require 'fileutils'
+require File.join(File.dirname(__FILE__),"csv.rb")
+
+# NOTE: This converter requires Sequel and the MySQL gems.
+# The MySQL gem can be difficult to install on OS X. Once you have MySQL
+# installed, running the following commands should work:
+# $ sudo gem install sequel
+# $ sudo gem install mysql -- --with-mysql-config=/usr/local/mysql/bin/mysql_config
+ 
+module Jekyll
+  module Mephisto
+    #Accepts a hash with database config variables, exports mephisto posts into a csv
+    #export PGPASSWORD if you must
+    def self.postgres(c)
+      sql = <<-SQL
+      BEGIN;
+      CREATE TEMP TABLE jekyll AS
+        SELECT title, permalink, body, published_at, filter FROM contents
+        WHERE user_id = 1 AND type = 'Article' ORDER BY published_at;
+      COPY jekyll TO STDOUT WITH CSV HEADER;
+      ROLLBACK;
+      SQL
+      command = %Q(psql -h #{c[:host] || "localhost"} -c "#{sql.strip}" #{c[:database]} #{c[:username]} -o #{c[:filename] || "posts.csv"})
+      puts command
+      `#{command}`
+      CSV.process
+    end
+
+    # This query will pull blog posts from all entries across all blogs. If
+    # you've got unpublished, deleted or otherwise hidden posts please sift
+    # through the created posts to make sure nothing is accidently published.
+
+    QUERY = "SELECT id, permalink, body, published_at, title FROM contents WHERE user_id = 1 AND type = 'Article' AND published_at IS NOT NULL ORDER BY published_at"
+ 
+    def self.process(dbname, user, pass, host = 'localhost')
+      db = Sequel.mysql(dbname, :user => user, :password => pass, :host => host)
+      
+      FileUtils.mkdir_p "_posts"
+            
+      db[QUERY].each do |post|
+        title = post[:title]
+        slug = post[:permalink]
+        date = post[:published_at]
+        content = post[:body]
+#         more_content = ''
+        
+        # Be sure to include the body and extended body.
+#         if more_content != nil
+#           content = content + " \n" + more_content
+#         end
+        
+        # Ideally, this script would determine the post format (markdown, html
+        # , etc) and create files with proper extensions. At this point it
+        # just assumes that markdown will be acceptable.
+        name = [date.year, date.month, date.day, slug].join('-') + ".markdown"
+
+        data = {
+           'layout' => 'post',
+           'title' => title.to_s,
+           'mt_id' => post[:entry_id],
+         }.delete_if { |k,v| v.nil? || v == ''}.to_yaml
+ 
+        File.open("_posts/#{name}", "w") do |f|
+          f.puts data
+          f.puts "---"
+          f.puts content
+        end
+      end
+ 
+    end
+  end
+end

lib/jekyll/converters/mt.rb

@@ -0,0 +1,59 @@
+# Created by Nick Gerakines, open source and publically available under the
+# MIT license. Use this module at your own risk.
+# I'm an Erlang/Perl/C++ guy so please forgive my dirty ruby.
+
+require 'rubygems'
+require 'sequel'
+require 'fileutils'
+
+# NOTE: This converter requires Sequel and the MySQL gems.
+# The MySQL gem can be difficult to install on OS X. Once you have MySQL
+# installed, running the following commands should work:
+# $ sudo gem install sequel
+# $ sudo gem install mysql -- --with-mysql-config=/usr/local/mysql/bin/mysql_config
+ 
+module Jekyll
+  module MT
+    # This query will pull blog posts from all entries across all blogs. If
+    # you've got unpublished, deleted or otherwise hidden posts please sift
+    # through the created posts to make sure nothing is accidently published.
+    QUERY = "SELECT entry_id, entry_basename, entry_text, entry_text_more, entry_created_on, entry_title FROM mt_entry"
+ 
+    def self.process(dbname, user, pass, host = 'localhost')
+      db = Sequel.mysql(dbname, :user => user, :password => pass, :host => host)
+      
+      FileUtils.mkdir_p "_posts"
+            
+      db[QUERY].each do |post|
+        title = post[:entry_title]
+        slug = post[:entry_basename]
+        date = post[:entry_created_on]
+        content = post[:entry_text]
+        more_content = post[:entry_text_more]
+        
+        # Be sure to include the body and extended body.
+        if more_content != nil
+          content = content + " \n" + more_content
+        end
+        
+        # Ideally, this script would determine the post format (markdown, html
+        # , etc) and create files with proper extensions. At this point it
+        # just assumes that markdown will be acceptable.
+        name = [date.year, date.month, date.day, slug].join('-') + ".markdown"
+
+        data = {
+           'layout' => 'post',
+           'title' => title.to_s,
+           'mt_id' => post[:entry_id],
+         }.delete_if { |k,v| v.nil? || v == ''}.to_yaml
+ 
+        File.open("_posts/#{name}", "w") do |f|
+          f.puts data
+          f.puts "---"
+          f.puts content
+        end
+      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/converters/textpattern.rb

@@ -0,0 +1,50 @@
+require 'rubygems'
+require 'sequel'
+require 'fileutils'
+
+# NOTE: This converter requires Sequel and the MySQL gems.
+# The MySQL gem can be difficult to install on OS X. Once you have MySQL
+# installed, running the following commands should work:
+# $ sudo gem install sequel
+# $ sudo gem install mysql -- --with-mysql-config=/usr/local/mysql/bin/mysql_config
+
+module Jekyll
+  module TextPattern
+    # Reads a MySQL database via Sequel and creates a post file for each post.
+    # The only posts selected are those with a status of 4 or 5, which means "live"
+    # and "sticky" respectively.
+    # Other statuses is 1 => draft, 2 => hidden and 3 => pending
+    QUERY = "select Title, url_title, Posted, Body, Keywords from textpattern where Status = '4' or Status = '5'"
+
+    def self.process(dbname, user, pass, host = 'localhost')
+      db = Sequel.mysql(dbname, :user => user, :password => pass, :host => host)
+      
+      FileUtils.mkdir_p "_posts"
+            
+      db[QUERY].each do |post|
+        # Get required fields and construct Jekyll compatible name
+        title = post[:Title]
+        slug = post[:url_title]
+        date = post[:Posted]
+        content = post[:Body]
+        
+        name = [date.strftime("%Y-%m-%d"), slug].join('-') + ".textile"
+
+        # Get the relevant fields as a hash, delete empty fields and convert
+        # to YAML for the header        
+        data = {
+           'layout' => 'post',
+           'title' => title.to_s,
+           'tags' => post[:Keywords].split(',')
+         }.delete_if { |k,v| v.nil? || v == ''}.to_yaml
+
+        # Write out the data and content to file
+        File.open("_posts/#{name}", "w") do |f|
+          f.puts data
+          f.puts "---"
+          f.puts content
+        end
+      end
+    end
+  end
+end

lib/jekyll/converters/typo.rb

@@ -0,0 +1,49 @@
+# Author: Toby DiPasquale <toby@cbcg.net>
+require 'fileutils'
+require 'rubygems'
+require 'sequel'
+ 
+module Jekyll
+  module Typo
+    # this SQL *should* work for both MySQL and PostgreSQL, but I haven't 
+    # tested PostgreSQL yet (as of 2008-12-16)
+    SQL = <<-EOS
+    SELECT c.id id,
+           c.title title, 
+           c.permalink slug, 
+           c.body body,
+           c.published_at date, 
+           c.state state,
+           COALESCE(tf.name, 'html') filter
+      FROM contents c 
+           LEFT OUTER JOIN text_filters tf
+                        ON c.text_filter_id = tf.id 
+    EOS
+
+    def self.process dbname, user, pass, host='localhost'
+      FileUtils.mkdir_p '_posts'
+      db = Sequel.mysql dbname, :user => user, :password => pass, :host => host
+      db[SQL].each do |post|
+        next unless post[:state] =~ /Published/
+
+        name = [ sprintf("%.04d", post[:date].year),
+                 sprintf("%.02d", post[:date].month),
+                 sprintf("%.02d", post[:date].day),
+                 post[:slug].strip ].join('-')
+        # Can have more than one text filter in this field, but we just want 
+        # the first one for this
+        name += '.' + post[:filter].split(' ')[0]
+
+        File.open("_posts/#{name}", 'w') do |f|
+          f.puts({ 'layout'   => 'post',
+                   'title'    => post[:title].to_s,
+                   'typo_id'  => post[:id]
+                 }.delete_if { |k, v| v.nil? || v == '' }.to_yaml)
+          f.puts '---'
+          f.puts post[:body].delete("\r")
+        end
+      end
+    end
+
+  end   # module Typo
+end   # module Jekyll

lib/jekyll/converters/wordpress.rb

@@ -0,0 +1,55 @@
+require 'rubygems'
+require 'sequel'
+require 'fileutils'
+
+# NOTE: This converter requires Sequel and the MySQL gems.
+# The MySQL gem can be difficult to install on OS X. Once you have MySQL
+# installed, running the following commands should work:
+# $ sudo gem install sequel
+# $ sudo gem install mysql -- --with-mysql-config=/usr/local/mysql/bin/mysql_config
+
+module Jekyll
+  module WordPress
+
+    # Reads a MySQL database via Sequel and creates a post file for each
+    # post in wp_posts that has post_status = 'publish'.
+    # This restriction is made because 'draft' posts are not guaranteed to
+    # have valid dates.
+    QUERY = "select * from wp_posts where post_status = 'publish' and post_type = 'post'"
+
+    def self.process(dbname, user, pass, host = 'localhost')
+      db = Sequel.mysql(dbname, :user => user, :password => pass, :host => host)
+
+      FileUtils.mkdir_p "_posts"
+
+      db[QUERY].each do |post|
+        # Get required fields and construct Jekyll compatible name
+        title = post[:post_title]
+        slug = post[:post_name]
+        date = post[:post_date]
+        content = post[:post_content]
+
+        name = "%02d-%02d-%02d-%s.markdown" % [date.year, date.month, date.day,
+                                               slug]
+
+        # Get the relevant fields as a hash, delete empty fields and convert
+        # to YAML for the header
+        data = {
+           'layout' => 'post',
+           'title' => title.to_s,
+           'excerpt' => post[:post_excerpt].to_s,
+           'wordpress_id' => post[:ID],
+           'wordpress_url' => post[:guid]
+         }.delete_if { |k,v| v.nil? || v == ''}.to_yaml
+
+        # Write out the data and content to file
+        File.open("_posts/#{name}", "w") do |f|
+          f.puts data
+          f.puts "---"
+          f.puts content
+        end
+      end
+
+    end
+  end
+end

lib/jekyll/convertible.rb

@@ -1,282 +1,70 @@
-# encoding: UTF-8
-
-require 'set'
-
-# Convertible provides methods for converting a pagelike item
-# from a certain type of markup into actual content
-#
-# Requires
-#   self.site -> Jekyll::Site
-#   self.content
-#   self.content=
-#   self.data=
-#   self.ext=
-#   self.output=
-#   self.name
-#   self.path
-#   self.type -> :page, :post or :draft
-
 module Jekyll
   module Convertible
-    # Returns the contents as a String.
+    # Return the contents as a string
     def to_s
-      content || ''
+      self.content || ''
     end
-
-    # Whether the file is published or not, as indicated in YAML front-matter
-    def published?
-      !(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.
-    # name - The String filename of the file.
-    # opts - optional parameter to File.read, default at site configs
-    #
-    # Returns nothing.
-    def read_yaml(base, name, opts = {})
-      begin
-        self.content = File.read(site.in_source_dir(base, name),
-                                 merged_file_read_opts(opts))
-        if content =~ /\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)/m
-          self.content = $POSTMATCH
-          self.data = SafeYAML.load($1)
-        end
-      rescue SyntaxError => e
-        Jekyll.logger.warn "YAML Exception reading #{File.join(base, name)}: #{e.message}"
-      rescue Exception => e
-        Jekyll.logger.warn "Error reading file #{File.join(base, name)}: #{e.message}"
-      end
-
-      self.data ||= {}
-    end
-
-    # Transform the contents based on the content type.
-    #
-    # Returns the transformed contents.
-    def transform
-      converters.reduce(content) do |output, converter|
-        begin
-          converter.convert output
-        rescue => e
-          Jekyll.logger.error "Conversion error:", "#{converter.class} encountered an error while converting '#{path}':"
-          Jekyll.logger.error("", e.to_s)
-          raise e
-        end
-      end
-    end
-
-    # Determine the extension depending on content_type.
-    #
-    # 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
-    end
-
-    # Determine which converter to use based on this convertible's
-    # extension.
-    #
-    # Returns the Converter instance.
-    def converters
-      @converters ||= site.converters.select { |c| c.matches(ext) }.sort
-    end
-
-    # Render Liquid in the content
-    #
-    # content - the raw Liquid content to render
-    # payload - the payload for Liquid
-    # info    - the info for Liquid
-    #
-    # Returns the converted content
-    def render_liquid(content, payload, info, path = nil)
-      Liquid::Template.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
-    rescue Exception => e
-      Jekyll.logger.error "Liquid Exception:", "#{e.message} in #{path || self.path}"
-      raise e
-    end
-
-    # Convert this Convertible's data to a Hash suitable for use by Liquid.
-    #
-    # Returns the Hash representation of this Convertible.
-    def to_liquid(attrs = nil)
-      further_data = Hash[(attrs || self.class::ATTRIBUTES_FOR_LIQUID).map { |attribute|
-        [attribute, send(attribute)]
-      }]
-
-      defaults = site.frontmatter_defaults.all(relative_path, type)
-      Utils.deep_merge_hashes defaults, Utils.deep_merge_hashes(data, further_data)
-    end
-
-    # The type of a document,
-    #   i.e., its classname downcase'd and to_sym'd.
-    #
-    # Returns the type of self.
-    def type
-      if is_a?(Draft)
-        :drafts
-      elsif is_a?(Post)
-        :posts
-      elsif is_a?(Page)
-        :pages
-      end
-    end
-
-    # Determine whether the document is an asset file.
-    # Asset files include CoffeeScript files and Sass/SCSS files.
-    #
-    # Returns true if the extname belongs to the set of extensions
-    #   that asset files use.
-    def asset_file?
-      sass_file? || coffeescript_file?
-    end
-
-    # Determine whether the document is a Sass file.
-    #
-    # Returns true if extname == .sass or .scss, false otherwise.
-    def sass_file?
-      %w[.sass .scss].include?(ext)
-    end
-
-    # Determine whether the document is a CoffeeScript file.
-    #
-    # Returns true if extname == .coffee, false otherwise.
-    def coffeescript_file?
-      '.coffee'.eql?(ext)
-    end
-
-    # Determine whether the file should be rendered with Liquid.
-    #
-    # Always returns true.
-    def render_with_liquid?
-      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.
-    def place_in_layout?
-      !asset_file?
-    end
-
-    # Checks if the layout specified in the document actually exists
-    #
-    # layout - the layout to check
-    #
-    # Returns true if the layout is invalid, false if otherwise
-    def invalid_layout?(layout)
-      !data["layout"].nil? && layout.nil? && !(self.is_a? Jekyll::Excerpt)
-    end
-
-    # Recursively render layouts
-    #
-    # layouts - a list of the layouts
-    # payload - the payload for Liquid
-    # info    - the info for Liquid
+    
+    # Read the YAML frontmatter
+    #   +base+ is the String path to the dir containing the file
+    #   +name+ is the String filename of the file
     #
     # Returns nothing
-    def render_all_layouts(layouts, payload, info)
-      # recursively render layouts
-      layout = layouts[data["layout"]]
-
-      Jekyll.logger.warn("Build Warning:", "Layout '#{data["layout"]}' requested in #{path} does not exist.") if invalid_layout? layout
-
-      used = Set.new([layout])
-
-      while layout
-        payload = Utils.deep_merge_hashes(payload, {"content" => output, "page" => layout.data})
-
-        self.output = render_liquid(layout.content,
-                                         payload,
-                                         info,
-                                         File.join(site.config['layouts'], layout.name))
-
-        # Add layout to dependency tree
-        site.metadata.add_dependency(
-          site.in_source_dir(path),
-          site.in_source_dir(layout.path)
-        )
-
-        if layout = layouts[layout.data["layout"]]
-          if used.include?(layout)
-            layout = nil # avoid recursive chain
-          else
-            used << layout
-          end
-        end
+    def read_yaml(base, name)
+      self.content = File.read(File.join(base, name))
+      
+      if self.content =~ /^(---\s*\n.*?)\n---\s*\n/m
+        self.content = self.content[($1.size + 5)..-1]
+        
+        self.data = YAML.load($1)
       end
     end
-
-    # Add any necessary layouts to this convertible document.
+    
+    # Transform the contents based on the file extension.
     #
-    # payload - The site payload Hash.
-    # layouts - A Hash of {"name" => "layout"}.
+    # Returns nothing
+    def transform
+      case Jekyll.content_type
+      when :textile
+        self.ext = ".html"
+        self.content = RedCloth.new(self.content).to_html
+      when :markdown
+        self.ext = ".html"
+        self.content = Jekyll.markdown_proc.call(self.content)
+      end
+    end
+    
+    def determine_content_type
+      case self.ext[1..-1]
+      when /textile/i
+        return :textile
+      when /markdown/i, /mkdn/i, /md/i
+        return :markdown
+      end      
+      return :unknown
+    end
+    
+    # Add any necessary layouts to this convertible document
+    #   +layouts+ is a Hash of {"name" => "layout"}
+    #   +site_payload+ is the site payload hash
     #
-    # Returns nothing.
+    # Returns nothing
     def do_layout(payload, layouts)
-      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?
-      self.content = transform
-
+      Jekyll.content_type = self.determine_content_type
+      self.content = Liquid::Template.parse(self.content).render(payload, [Jekyll::Filters])
+      self.transform
+      
       # output keeps track of what will finally be written
-      self.output = content
-
-      render_all_layouts(layouts, payload, info) if place_in_layout?
-    end
-
-    # Write the generated page file to the destination directory.
-    #
-    # dest - The String path to the destination dir.
-    #
-    # Returns nothing.
-    def write(dest)
-      path = destination(dest)
-      FileUtils.mkdir_p(File.dirname(path))
-      File.open(path, 'wb') do |f|
-        f.write(output)
-      end
-    end
-
-    # Accessor for data properties by Liquid.
-    #
-    # property - The String name of the property to retrieve.
-    #
-    # Returns the String value or nil if the property isn't included.
-    def [](property)
-      if self.class::ATTRIBUTES_FOR_LIQUID.include?(property)
-        send(property)
-      else
-        data[property]
+      self.output = self.content
+      
+      # recursively render layouts
+      layout = layouts[self.data["layout"]]
+      while layout
+        payload = payload.deep_merge({"content" => self.output, "page" => layout.data})
+        self.output = Liquid::Template.parse(layout.content).render(payload, [Jekyll::Filters])
+        
+        layout = layouts[layout.data["layout"]]
       end
     end
   end

lib/jekyll/core_ext.rb

@@ -0,0 +1,22 @@
+class Hash
+  # Merges self with another hash, recursively.
+  # 
+  # This code was lovingly stolen from some random gem:
+  # http://gemjack.com/gems/tartan-0.1.1/classes/Hash.html
+  # 
+  # Thanks to whoever made it.
+  def deep_merge(hash)
+    target = dup
+    
+    hash.keys.each do |key|
+      if hash[key].is_a? Hash and self[key].is_a? Hash
+        target[key] = target[key].deep_merge(hash[key])
+        next
+      end
+      
+      target[key] = hash[key]
+    end
+    
+    target
+  end
+end

lib/jekyll/deprecator.rb

@@ -1,44 +0,0 @@
-module Jekyll
-  module Deprecator
-    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, "--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'."
-      arg_is_present? args, "--no-auto", "To disable auto-replication, simply leave off \
-                          the '--watch' switch."
-      arg_is_present? args, "--pygments", "The 'pygments'settings has been removed in \
-                          favour of 'highlighter'."
-      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."
-    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."
-      end
-    end
-
-    def arg_is_present?(args, deprecated_argument, message)
-      if args.include?(deprecated_argument)
-        deprecation_message(message)
-      end
-    end
-
-    def deprecation_message(message)
-      Jekyll.logger.error "Deprecation:", message
-    end
-
-    def defaults_deprecate_type(old, current)
-      Jekyll.logger.warn "Defaults:", "The '#{old}' type has become '#{current}'."
-      Jekyll.logger.warn "Defaults:", "Please update your front-matter defaults to use 'type: #{current}'."
-    end
-
-  end
-end

lib/jekyll/document.rb

@@ -1,287 +0,0 @@
-# encoding: UTF-8
-
-module Jekyll
-  class Document
-    include Comparable
-
-    attr_reader   :path, :site, :extname
-    attr_accessor :content, :collection, :output
-
-    # Create a new Document.
-    #
-    # site - the Jekyll::Site instance to which this Document belongs
-    # path - the path to the file
-    #
-    # Returns nothing.
-    def initialize(path, relations)
-      @site = relations[:site]
-      @path = path
-      @extname = File.extname(path)
-      @collection = relations[:collection]
-      @has_yaml_header = nil
-    end
-
-    # Fetch the Document's data.
-    #
-    # Returns a Hash containing the data. An empty hash is returned if
-    #   no data was read.
-    def data
-      @data ||= Hash.new
-    end
-
-    # The path to the document, relative to the site source.
-    #
-    # Returns a String path which represents the relative path
-    #   from the site source to this document
-    def relative_path
-      @relative_path ||= Pathname.new(path).relative_path_from(Pathname.new(site.source)).to_s
-    end
-
-    # The base filename of the document, without the file extname.
-    #
-    # Returns the basename without the file extname.
-    def basename_without_ext
-      @basename_without_ext ||= File.basename(path, '.*')
-    end
-
-    # The base filename of the document.
-    #
-    # Returns the base filename of the document.
-    def basename
-      @basename ||= File.basename(path)
-    end
-
-    # Produces a "cleaned" relative path.
-    # The "cleaned" relative path is the relative path without the extname
-    #   and with the collection's directory removed as well.
-    # This method is useful when building the URL of the document.
-    #
-    # Examples:
-    #   When relative_path is "_methods/site/generate.md":
-    #     cleaned_relative_path
-    #     # => "/site/generate"
-    #
-    # 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, "")
-    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)
-    end
-
-    # Determine whether the document is an asset file.
-    # Asset files include CoffeeScript files and Sass/SCSS files.
-    #
-    # Returns true if the extname belongs to the set of extensions
-    #   that asset files use.
-    def asset_file?
-      sass_file? || coffeescript_file?
-    end
-
-    # Determine whether the document is a Sass file.
-    #
-    # Returns true if extname == .sass or .scss, false otherwise.
-    def sass_file?
-      %w[.sass .scss].include?(extname)
-    end
-
-    # Determine whether the document is a CoffeeScript file.
-    #
-    # Returns true if extname == .coffee, false otherwise.
-    def coffeescript_file?
-      '.coffee'.eql?(extname)
-    end
-
-    # Determine whether the file should be rendered with Liquid.
-    #
-    # Returns false if the document is either an asset file or a yaml file,
-    #   true otherwise.
-    def render_with_liquid?
-      !(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,
-    #   true otherwise.
-    def place_in_layout?
-      !(asset_file? || yaml_file?)
-    end
-
-    # The URL template where the document would be accessible.
-    #
-    # Returns the URL template for the document.
-    def url_template
-      collection.url_template
-    end
-
-    # Construct a Hash of key-value pairs which contain a mapping between
-    #   a key in the URL template and the corresponding value for this document.
-    #
-    # 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)
-      }
-    end
-
-    # The permalink for this Document.
-    # Permalink is set via the data Hash.
-    #
-    # Returns the permalink or nil if no permalink was set in the data.
-    def permalink
-      data && data.is_a?(Hash) && data['permalink']
-    end
-
-    # The computed URL for the document. See `Jekyll::URL#to_s` for more details.
-    #
-    # Returns the computed URL for the document.
-    def url
-      @url = URL.new({
-        template:     url_template,
-        placeholders: url_placeholders,
-        permalink:    permalink
-      }).to_s
-    end
-
-    # The full path to the output file.
-    #
-    # base_directory - the base path of the output directory
-    #
-    # Returns the full path to the output file of this document.
-    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 =~ /\/$/
-      path
-    end
-
-    # Write the generated Document file to the destination directory.
-    #
-    # dest - The String path to the destination dir.
-    #
-    # Returns nothing.
-    def write(dest)
-      path = destination(dest)
-      FileUtils.mkdir_p(File.dirname(path))
-      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
-    end
-
-    # Whether the file is published or not, as indicated in YAML front-matter
-    #
-    # Returns true if the 'published' key is specified in the YAML front-matter and not `false`.
-    def published?
-      !(data.key?('published') && data['published'] == false)
-    end
-
-    # Read in the file and assign the content and data based on the file contents.
-    # Merge the frontmatter of the file with the frontmatter default
-    # values
-    #
-    # Returns nothing.
-    def read(opts = {})
-      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
-          end
-        rescue SyntaxError => e
-          puts "YAML Exception reading #{path}: #{e.message}"
-        rescue Exception => e
-          puts "Error reading file #{path}: #{e.message}"
-        end
-      end
-    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
-    end
-
-    # The inspect string for this document.
-    # Includes the relative path and the collection label.
-    #
-    # Returns the inspect string for this document.
-    def inspect
-      "#<Jekyll::Document #{relative_path} collection=#{collection.label}>"
-    end
-
-    # The string representation for this document.
-    #
-    # Returns the content of the document
-    def to_s
-      content || ''
-    end
-
-    # Compare this document against another document.
-    # Comparison is a comparison between the 2 paths of the documents.
-    #
-    # 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
-    end
-
-    # Determine whether this document should be written.
-    # Based on the Collection to which it belongs.
-    #
-    # True if the document has a collection and if that collection's #write?
-    #   method returns true, otherwise false.
-    def write?
-      collection && collection.write?
-    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/entry_filter.rb

@@ -1,72 +0,0 @@
-module Jekyll
-  class EntryFilter
-    SPECIAL_LEADING_CHARACTERS = ['.', '_', '#'].freeze
-
-    attr_reader :site
-
-    def initialize(site, base_directory = nil)
-      @site = site
-      @base_directory = derive_base_directory(@site, base_directory.to_s.dup)
-    end
-
-    def base_directory
-      @base_directory.to_s
-    end
-
-    def derive_base_directory(site, base_dir)
-      if base_dir.start_with?(site.source)
-        base_dir[site.source] = ""
-      end
-      base_dir
-    end
-
-    def relative_to_source(entry)
-      File.join(base_directory, entry)
-    end
-
-    def filter(entries)
-      entries.reject do |e|
-        unless included?(e)
-          special?(e) || backup?(e) || excluded?(e) || symlink?(e)
-        end
-      end
-    end
-
-    def included?(entry)
-      glob_include?(site.include, entry)
-    end
-
-    def special?(entry)
-      SPECIAL_LEADING_CHARACTERS.include?(entry[0..0]) ||
-        SPECIAL_LEADING_CHARACTERS.include?(File.basename(entry)[0..0])
-    end
-
-    def backup?(entry)
-      entry[-1..-1] == '~'
-    end
-
-    def excluded?(entry)
-      excluded = glob_include?(site.exclude, relative_to_source(entry))
-      Jekyll.logger.debug "EntryFilter:", "excluded?(#{relative_to_source(entry)}) ==> #{excluded}"
-      excluded
-    end
-
-    def symlink?(entry)
-      File.symlink?(entry) && site.safe
-    end
-
-    def ensure_leading_slash(path)
-      path[0..0] == "/" ? path : "/#{path}"
-    end
-
-    # Returns true if path matches against any glob pattern.
-    # Look for more detail about glob pattern in method File::fnmatch.
-    def glob_include?(enum, e)
-      entry = ensure_leading_slash(e)
-      enum.any? do |exp|
-        item = ensure_leading_slash(exp)
-        File.fnmatch?(item, entry) || entry.start_with?(item)
-      end
-    end
-  end
-end

lib/jekyll/errors.rb

@@ -1,9 +0,0 @@
-module Jekyll
-  module Errors
-    class FatalException < RuntimeError
-    end
-
-    class MissingDependencyException < FatalException
-    end
-  end
-end

lib/jekyll/excerpt.rb

@@ -1,114 +0,0 @@
-require 'forwardable'
-
-module Jekyll
-  class Excerpt
-    include Convertible
-    extend Forwardable
-
-    attr_accessor :post
-    attr_accessor :content, :output, :ext
-
-    def_delegator :@post, :site, :site
-    def_delegator :@post, :name, :name
-    def_delegator :@post, :ext,  :ext
-
-    # 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(post)
-      self.post = post
-      self.content = extract_excerpt(post.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
-    #
-    # Returns Hash of post data
-    def data
-      @data ||= post.data.dup
-      @data.delete("layout")
-      @data
-    end
-
-    # 'Path' of the excerpt.
-    #
-    # Returns the path for the post this excerpt belongs to with #excerpt appended
-    def path
-      File.join(post.path, "#excerpt")
-    end
-
-    # Check if excerpt includes a string
-    #
-    # Returns true if the string passed in
-    def include?(something)
-      (output && output.include?(something)) || content.include?(something)
-    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(post.dir, post.slug, "#excerpt")
-    end
-
-    def to_s
-      output || content
-    end
-
-    # Returns the shorthand String identifier of this Post.
-    def inspect
-      "<Excerpt: #{self.id}>"
-    end
-
-    protected
-
-    # Internal: Extract excerpt from the content
-    #
-    # By default excerpt is your first paragraph of a post: everything before
-    # the first two new lines:
-    #
-    #     ---
-    #     title: Example
-    #     ---
-    #
-    #     First paragraph with [link][1].
-    #
-    #     Second paragraph.
-    #
-    #     [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
-    # 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:
-    #
-    #     # 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:
-    #
-    #     First paragraph with [link][1].
-    #
-    #     [1]: http://example.com/
-    #
-    # 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)
-
-      "" << head << "\n\n" << tail.scan(/^\[[^\]]+\]:.+$/).join("\n")
-    end
-  end
-end

lib/jekyll/external.rb

@@ -1,59 +0,0 @@
-module Jekyll
-  module External
-    class << self
-
-      #
-      # Gems that, if installed, should be loaded.
-      # Usually contain subcommands.
-      #
-      def blessed_gems
-        %w{
-          jekyll-docs
-          jekyll-import
-        }
-      end
-
-      #
-      # Require a gem or file if it's present, otherwise silently fail.
-      #
-      # names - a string gem name or array of gem names
-      #
-      def require_if_present(names)
-        Array(names).each do |name|
-          begin
-            require name
-          rescue LoadError
-            Jekyll.logger.debug "Couldn't load #{name}. Skipping."
-            false
-          end
-        end
-      end
-
-      #
-      # Require a gem or gems. If it's not present, show a very nice error
-      # message that explains everything and is much more helpful than the
-      # normal LoadError.
-      #
-      # names - a string gem name or array of gem names
-      #
-      def require_with_graceful_fail(names)
-        Array(names).each do |name|
-          begin
-            require name
-          rescue LoadError => e
-            Jekyll.logger.error "Dependency Error:", <<-MSG
-Yikes! It looks like you don't have #{name} or one of its dependencies installed.
-In order to use Jekyll as currently configured, you'll need to install this gem.
-
-The full error message from Ruby is: '#{e.message}'
-
-If you run into trouble, you can find helpful resources at http://jekyllrb.com/help/!
-            MSG
-            raise Jekyll::Errors::MissingDependencyException.new(name)
-          end
-        end
-      end
-
-    end
-  end
-end

lib/jekyll/filters.rb

@@ -1,173 +1,30 @@
-require 'uri'
-require 'json'
-
 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)
+      RedCloth.new(input).to_html
     end
-
-    # Convert a Markdown string into HTML output.
-    #
-    # input - The Markdown String to convert.
-    #
-    # Returns the HTML formatted String.
-    def markdownify(input)
-      site = @context.registers[:site]
-      converter = site.find_converter_instance(Jekyll::Converters::Markdown)
-      converter.convert(input)
-    end
-
-    # Convert a Sass string into CSS output.
-    #
-    # input - The Sass String to convert.
-    #
-    # Returns the CSS formatted String.
-    def sassify(input)
-      site = @context.registers[:site]
-      converter = site.find_converter_instance(Jekyll::Converters::Sass)
-      converter.convert(input)
-    end
-
-    # Convert a Scss string into CSS output.
-    #
-    # input - The Scss String to convert.
-    #
-    # Returns the CSS formatted String.
-    def scssify(input)
-      site = @context.registers[:site]
-      converter = site.find_converter_instance(Jekyll::Converters::Scss)
-      converter.convert(input)
-    end
-
-    # Slugify a filename or title.
-    #
-    # input - The filename or title to slugify.
-    #
-    # 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)
-    end
-
-    # Format a date in short format e.g. "27 Jan 2011".
-    #
-    # date - the Time to format.
-    #
-    # Returns the formatting String.
+    
     def date_to_string(date)
-      time(date).strftime("%d %b %Y")
+      date.strftime("%d %b %Y")
     end
 
-    # Format a date in long format e.g. "27 January 2011".
-    #
-    # date - The Time to format.
-    #
-    # Returns the formatted String.
     def date_to_long_string(date)
-      time(date).strftime("%d %B %Y")
+      date.strftime("%d %B %Y")
     end
-
-    # Format a date for use in XML.
-    #
-    # date - The Time to format.
-    #
-    # Examples
-    #
-    #   date_to_xmlschema(Time.now)
-    #   # => "2011-04-24T20:34:46+08:00"
-    #
-    # Returns the formatted String.
+    
     def date_to_xmlschema(date)
-      time(date).xmlschema
+      date.xmlschema
     end
-
-    # Format a date according to RFC-822
-    #
-    # date - The Time to format.
-    #
-    # Examples
-    #
-    #   date_to_rfc822(Time.now)
-    #   # => "Sun, 24 Apr 2011 12:34:46 +0000"
-    #
-    # Returns the formatted String.
-    def date_to_rfc822(date)
-      time(date).rfc822
-    end
-
-    # XML escape a string for use. Replaces any special characters with
-    # appropriate HTML entity replacements.
-    #
-    # input - The String to escape.
-    #
-    # Examples
-    #
-    #   xml_escape('foo "bar" <baz>')
-    #   # => "foo &quot;bar&quot; &lt;baz&gt;"
-    #
-    # Returns the escaped String.
+    
     def xml_escape(input)
-      CGI.escapeHTML(input.to_s)
+      input.gsub("&", "&amp;").gsub("<", "&lt;").gsub(">", "&gt;")
     end
-
-    # CGI escape a string for use in a URL. Replaces any special characters
-    # with appropriate %XX replacements.
-    #
-    # input - The String to escape.
-    #
-    # Examples
-    #
-    #   cgi_escape('foo,bar;baz?')
-    #   # => "foo%2Cbar%3Bbaz%3F"
-    #
-    # Returns the escaped String.
-    def cgi_escape(input)
-      CGI::escape(input)
-    end
-
-    # URI escape a string.
-    #
-    # input - The String to escape.
-    #
-    # Examples
-    #
-    #   uri_escape('foo, bar \\baz?')
-    #   # => "foo,%20bar%20%5Cbaz?"
-    #
-    # Returns the escaped String.
-    def uri_escape(input)
-      URI.escape(input)
-    end
-
-    # Count the number of words in the input string.
-    #
-    # input - The String on which to operate.
-    #
-    # Returns the Integer word count.
+    
     def number_of_words(input)
       input.split.length
     end
-
-    # Join an array of things into a string by separating with commas and the
-    # word "and" for the last one.
-    #
-    # array - The Array of Strings to join.
-    #
-    # Examples
-    #
-    #   array_to_sentence_string(["apples", "oranges", "grapes"])
-    #   # => "apples, oranges, and grapes"
-    #
-    # Returns the formatted String.
+    
     def array_to_sentence_string(array)
       connector = "and"
       case array.length
@@ -182,170 +39,5 @@ module Jekyll
       end
     end
 
-    # Convert the input into json string
-    #
-    # input - The Array or Hash to be converted
-    #
-    # Returns the converted json string
-    def jsonify(input)
-      as_liquid(input).to_json
-    end
-
-    # Group an array of items by a property
-    #
-    # input - the inputted Enumerable
-    # property - the property
-    #
-    # Returns an array of Hashes, each looking something like this:
-    #  {"name"  => "larry"
-    #   "items" => [...] } # all the items where `property` == "larry"
-    def group_by(input, property)
-      if groupable?(input)
-        input.group_by do |item|
-          item_property(item, property).to_s
-        end.inject([]) do |memo, i|
-          memo << {"name" => i.first, "items" => i.last}
-        end
-      else
-        input
-      end
-    end
-
-    # Filter an array of objects
-    #
-    # input - the object array
-    # property - property within each object to filter by
-    # value - desired value
-    #
-    # Returns the filtered array of objects
-    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 }
-    end
-
-    # Sort an array of objects
-    #
-    # input - the object array
-    # property - property within each object to filter by
-    # nils ('first' | 'last') - nils appear before or after non-nil values
-    #
-    # Returns the filtered array of objects
-    def sort(input, property = nil, nils = "first")
-      if property.nil?
-        input.sort
-      else
-        case
-        when nils == "first"
-          order = - 1
-        when nils == "last"
-          order = + 1
-        else
-          raise ArgumentError.new("Invalid nils order: " +
-            "'#{nils}' is not a valid nils order. It must be 'first' or 'last'.")
-        end
-
-        input.sort { |apple, orange|
-          apple_property = item_property(apple, property)
-          orange_property = item_property(orange, property)
-
-          if !apple_property.nil? && orange_property.nil?
-            - order
-          elsif apple_property.nil? && !orange_property.nil?
-            + order
-          else
-            apple_property <=> orange_property
-          end
-        }
-      end
-    end
-
-    def pop(array, input = 1)
-      return array unless array.is_a?(Array)
-      new_ary = array.dup
-      new_ary.pop(input.to_i || 1)
-      new_ary
-    end
-
-    def push(array, input)
-      return array unless array.is_a?(Array)
-      new_ary = array.dup
-      new_ary.push(input)
-      new_ary
-    end
-
-    def shift(array, input = 1)
-      return array unless array.is_a?(Array)
-      new_ary = array.dup
-      new_ary.shift(input.to_i || 1)
-      new_ary
-    end
-
-    def unshift(array, input)
-      return array unless array.is_a?(Array)
-      new_ary = array.dup
-      new_ary.unshift(input)
-      new_ary
-    end
-
-    # Convert an object into its String representation for debugging
-    #
-    # input - The Object to be converted
-    #
-    # Returns a String representation of the object.
-    def inspect(input)
-      CGI.escapeHTML(input.inspect)
-    end
-
-    private
-    def time(input)
-      case input
-      when Time
-        input
-      when String
-        Time.parse(input) rescue Time.at(input.to_i)
-      when Numeric
-        Time.at(input)
-      else
-        Jekyll.logger.error "Invalid Date:", "'#{input}' is not a valid datetime."
-        exit(1)
-      end.localtime
-    end
-
-    def groupable?(element)
-      element.respond_to?(:group_by)
-    end
-
-    def item_property(item, property)
-      if item.respond_to?(:to_liquid)
-        item.to_liquid[property.to_s]
-      elsif item.respond_to?(:data)
-        item.data[property.to_s]
-      else
-        item[property.to_s]
-      end
-    end
-
-    def as_liquid(item)
-      case item
-      when Hash
-        pairs = item.map { |k, v| as_liquid([k, v]) }
-        Hash[pairs]
-      when Array
-        item.map{ |i| as_liquid(i) }
-      else
-        if item.respond_to?(:to_liquid)
-          liquidated = item.to_liquid
-          # prevent infinite recursion for simple types (which return `self`)
-          if liquidated == item
-            item
-          else
-            as_liquid(liquidated)
-          end
-        else
-          item
-        end
-      end
-    end
-  end
+  end  
 end

lib/jekyll/frontmatter_defaults.rb

@@ -1,180 +0,0 @@
-module Jekyll
-  # This class handles custom defaults for YAML frontmatter settings.
-  # These are set in _config.yml and apply both to internal use (e.g. layout)
-  # and the data available to liquid.
-  #
-  # It is exposed via the frontmatter_defaults method on the site class.
-  class FrontmatterDefaults
-    # Initializes a new instance.
-    def initialize(site)
-      @site = site
-    end
-
-    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
-    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
-    # type - a symbol indicating whether a :page, a :post or a :draft calls this method
-    #
-    # Returns the default value or nil if none was found
-    def find(path, type, setting)
-      value = nil
-      old_scope = nil
-
-      matching_sets(path, type).each do |set|
-        if set['values'].key?(setting) && has_precedence?(old_scope, set['scope'])
-          value = set['values'][setting]
-          old_scope = set['scope']
-        end
-      end
-      value
-    end
-
-    # Collects a hash with all default values for a page or post
-    #
-    # path - the relative path of the page or post
-    # type - a symbol indicating the type (:post, :page or :draft)
-    #
-    # Returns a hash with all default values (an empty hash if there are none)
-    def all(path, type)
-      defaults = {}
-      old_scope = nil
-      matching_sets(path, type).each do |set|
-        if has_precedence?(old_scope, set['scope'])
-          defaults = Utils.deep_merge_hashes(defaults, set['values'])
-          old_scope = set['scope']
-        else
-          defaults = Utils.deep_merge_hashes(set['values'], defaults)
-        end
-      end
-      defaults
-    end
-
-    private
-
-    # Checks if a given default setting scope matches the given path and type
-    #
-    # scope - the hash indicating the scope, as defined in _config.yml
-    # path - the path to check for
-    # type - the type (:post, :page or :draft) to check for
-    #
-    # Returns true if the scope applies to the given path and type
-    def applies?(scope, path, type)
-      applies_path?(scope, path) && applies_type?(scope, type)
-    end
-
-    def applies_path?(scope, path)
-      return true if !scope.has_key?('path') || scope['path'].empty?
-
-      scope_path = Pathname.new(scope['path'])
-      Pathname.new(sanitize_path(path)).ascend do |path|
-        if path == scope_path
-          return true
-        end
-      end
-    end
-
-    # Determines whether the scope applies to type.
-    # The scope applies to the type if:
-    #   1. no 'type' is specified
-    #   2. the 'type' in the scope is the same as the type asked about
-    #
-    # scope - the Hash defaults set being asked about application
-    # type  - the type of the document being processed / asked about
-    #         its defaults.
-    #
-    # Returns true if either of the above conditions are satisfied,
-    #   otherwise returns false
-    def applies_type?(scope, type)
-      !scope.key?('type') || scope['type'].eql?(type.to_s)
-    end
-
-    # Checks if a given set of default values is valid
-    #
-    # set - the default value hash, as defined in _config.yml
-    #
-    # Returns true if the set is valid and can be used in this class
-    def valid?(set)
-      set.is_a?(Hash) && set['values'].is_a?(Hash)
-    end
-
-    # Determines if a new scope has precedence over an old one
-    #
-    # old_scope - the old scope hash, or nil if there's none
-    # new_scope - the new scope hash
-    #
-    # Returns true if the new scope has precedence over the older
-    def has_precedence?(old_scope, new_scope)
-      return true if old_scope.nil?
-
-      new_path = sanitize_path(new_scope['path'])
-      old_path = sanitize_path(old_scope['path'])
-
-      if new_path.length != old_path.length
-        new_path.length >= old_path.length
-      elsif new_scope.key? 'type'
-        true
-      else
-        !old_scope.key? 'type'
-      end
-    end
-
-    # Collects a list of sets that match the given path and type
-    #
-    # Returns an array of hashes
-    def matching_sets(path, type)
-      valid_sets.select do |set|
-        !set.has_key?('scope') || applies?(set['scope'], path, type)
-      end
-    end
-
-    # Returns a list of valid sets
-    #
-    # This is not cached to allow plugins to modify the configuration
-    # and have their changes take effect
-    #
-    # Returns an array of hashes
-    def valid_sets
-      sets = @site.config['defaults']
-      return [] unless sets.is_a?(Array)
-
-      sets.map do |set|
-        if valid?(set)
-          update_deprecated_types(set)
-        else
-          Jekyll.logger.warn "Defaults:", "An invalid front-matter default set was found:"
-          Jekyll.logger.warn "#{set}"
-          nil
-        end
-      end.compact
-    end
-
-    # Sanitizes the given path by removing a leading and addding a trailing slash
-    def sanitize_path(path)
-      if path.nil? || path.empty?
-        ""
-      else
-        path.gsub(/\A\//, '').gsub(/([^\/])\z/, '\1/')
-      end
-    end
-  end
-end

lib/jekyll/generator.rb

@@ -1,4 +0,0 @@
-module Jekyll
-  class Generator < Plugin
-  end
-end

lib/jekyll/layout.rb

@@ -1,49 +1,33 @@
 module Jekyll
+
   class Layout
     include Convertible
-
-    # Gets the Site object.
-    attr_reader :site
-
-    # Gets the name of this layout.
-    attr_reader :name
-
-    # Gets the path to this layout.
-    attr_reader :path
-
-    # Gets/Sets the extension of this layout.
+    
     attr_accessor :ext
-
-    # Gets/Sets the Hash that holds the metadata for this layout.
-    attr_accessor :data
-
-    # Gets/Sets the content of this layout.
-    attr_accessor :content
-
+    attr_accessor :data, :content
+    
     # Initialize a new Layout.
+    #   +base+ is the String path to the <source>
+    #   +name+ is the String filename of the post file
     #
-    # site - The Site.
-    # base - The String path to the source.
-    # name - The String filename of the post file.
-    def initialize(site, base, name)
-      @site = site
+    # Returns <Page>
+    def initialize(base, name)
       @base = base
       @name = name
-      @path = site.in_source_dir(base, name)
-
+      
       self.data = {}
-
-      process(name)
-      read_yaml(base, name)
+      
+      self.process(name)
+      self.read_yaml(base, name)
     end
-
-    # Extract information from the layout filename.
+    
+    # Extract information from the layout filename
+    #   +name+ is the String filename of the layout file
     #
-    # name - The String filename of the layout file.
-    #
-    # Returns nothing.
+    # Returns nothing
     def process(name)
       self.ext = File.extname(name)
     end
   end
-end
+
+end

lib/jekyll/layout_reader.rb

@@ -1,53 +0,0 @@
-module Jekyll
-  class LayoutReader
-    attr_reader :site
-    def initialize(site)
-      @site = site
-      @layouts = {}
-    end
-
-    def read
-      layout_entries.each do |f|
-        @layouts[layout_name(f)] = Layout.new(site, layout_directory, f)
-      end
-
-      @layouts
-    end
-
-    def layout_directory
-      @layout_directory ||= (layout_directory_in_cwd || layout_directory_inside_source)
-    end
-
-    private
-
-    def layout_entries
-      entries = []
-      within(layout_directory) do
-        entries = EntryFilter.new(site).filter(Dir['**/*.*'])
-      end
-      entries
-    end
-
-    def layout_name(file)
-      file.split(".")[0..-2].join(".")
-    end
-
-    def within(directory)
-      return unless File.exist?(directory)
-      Dir.chdir(directory) { yield }
-    end
-
-    def layout_directory_inside_source
-      site.in_source_dir(site.config['layouts'])
-    end
-
-    def layout_directory_in_cwd
-      dir = Jekyll.sanitized_path(Dir.pwd, site.config['layouts'])
-      if File.directory?(dir) && !site.safe
-        dir
-      else
-        nil
-      end
-    end
-  end
-end

lib/jekyll/liquid_extensions.rb

@@ -1,22 +0,0 @@
-module Jekyll
-  module LiquidExtensions
-
-    # Lookup a Liquid variable in the given context.
-    #
-    # context  - the Liquid context in question.
-    # variable - the variable name, as a string.
-    #
-    # Returns the value of the variable in the context
-    #   or the variable name if not found.
-    def lookup_variable(context, variable)
-      lookup = context
-
-      variable.split(".").each do |value|
-        lookup = lookup[value]
-      end
-
-      lookup || variable
-    end
-
-  end
-end

lib/jekyll/log_adapter.rb

@@ -1,105 +0,0 @@
-module Jekyll
-  class LogAdapter
-    attr_reader :writer, :messages
-
-    LOG_LEVELS = {
-      :debug => ::Logger::DEBUG,
-      :info  => ::Logger::INFO,
-      :warn  => ::Logger::WARN,
-      :error => ::Logger::ERROR
-    }
-
-    # Public: Create a new instance of Jekyll's log writer
-    #
-    # writer - Logger compatible instance
-    # log_level - (optional, symbol) the log level
-    #
-    # Returns nothing
-    def initialize(writer, level = :info)
-      @messages = []
-      @writer = writer
-      self.log_level = level
-    end
-
-    # Public: Set the log level on the writer
-    #
-    # level - (symbol) the log level
-    #
-    # Returns nothing
-    def log_level=(level)
-      writer.level = LOG_LEVELS.fetch(level)
-    end
-
-    # Public: Print a jekyll debug message
-    #
-    # topic - the topic of the message, e.g. "Configuration file", "Deprecation", etc.
-    # message - the message detail
-    #
-    # Returns nothing
-    def debug(topic, message = nil)
-      writer.debug(message(topic, message))
-    end
-
-    # Public: Print a jekyll message
-    #
-    # topic - the topic of the message, e.g. "Configuration file", "Deprecation", etc.
-    # message - the message detail
-    #
-    # Returns nothing
-    def info(topic, message = nil)
-      writer.info(message(topic, message))
-    end
-
-    # Public: Print a jekyll message
-    #
-    # topic - the topic of the message, e.g. "Configuration file", "Deprecation", etc.
-    # message - the message detail
-    #
-    # Returns nothing
-    def warn(topic, message = nil)
-      writer.warn(message(topic, message))
-    end
-
-    # Public: Print a jekyll error message
-    #
-    # topic - the topic of the message, e.g. "Configuration file", "Deprecation", etc.
-    # message - the message detail
-    #
-    # Returns nothing
-    def error(topic, message = nil)
-      writer.error(message(topic, message))
-    end
-
-    # Public: Print a Jekyll 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)
-    #
-    # Returns nothing
-    def abort_with(topic, message = nil)
-      error(topic, message)
-      abort
-    end
-
-    # Internal: Build a Jekyll topic method
-    #
-    # topic - the topic of the message, e.g. "Configuration file", "Deprecation", etc.
-    # message - the message detail
-    #
-    # Returns the formatted message
-    def message(topic, message)
-      msg = formatted_topic(topic) + message.to_s.gsub(/\s+/, ' ')
-      messages << msg
-      msg
-    end
-
-    # Internal: Format the topic
-    #
-    # topic - the topic of the message, e.g. "Configuration file", "Deprecation", etc.
-    #
-    # Returns the formatted topic statement
-    def formatted_topic(topic)
-      "#{topic} ".rjust(20)
-    end
-  end
-end

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 +0,0 @@
--# These are the same MIME types that GitHub Pages uses as of 26 January 2014
-
-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

lib/jekyll/page.rb

@@ -1,167 +1,64 @@
 module Jekyll
+
   class Page
     include Convertible
-
-    attr_writer :dir
-    attr_accessor :site, :pager
-    attr_accessor :name, :ext, :basename
+    
+    attr_accessor :ext
     attr_accessor :data, :content, :output
-
-    # Attributes for Liquid templates
-    ATTRIBUTES_FOR_LIQUID = %w[
-      content
-      dir
-      name
-      path
-      url
-    ]
-
+    
     # Initialize a new Page.
+    #   +base+ is the String path to the <source>
+    #   +dir+ is the String path between <source> and the file
+    #   +name+ is the String filename of the file
     #
-    # site - The Site object.
-    # base - The String path to the source.
-    # dir  - The String path between the source and the file.
-    # name - The String filename of the file.
-    def initialize(site, base, dir, name)
-      @site = site
+    # Returns <Page>
+    def initialize(base, dir, name)
       @base = base
-      @dir  = dir
+      @dir = dir
       @name = name
-
-
-      process(name)
-      read_yaml(File.join(base, dir), name)
-
-      data.default_proc = proc do |hash, key|
-        site.frontmatter_defaults.find(File.join(dir, name), type, key)
-      end
+      
+      self.data = {}
+      
+      self.process(name)
+      self.read_yaml(File.join(base, dir), name)
+      #self.transform
     end
-
-    # The generated directory into which the page will be placed
-    # upon generation. This is derived from the permalink or, if
-    # permalink is absent, we be '/'
+    
+    # Extract information from the page filename
+    #   +name+ is the String filename of the page file
     #
-    # Returns the String destination directory.
-    def dir
-      url[-1, 1] == '/' ? url : File.dirname(url)
-    end
-
-    # The full path and filename of the post. Defined in the YAML of the post
-    # body.
-    #
-    # 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
-    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
-        "/:path/:basename:output_ext"
-      end
-    end
-
-    # The generated relative url of this page. e.g. /about.html.
-    #
-    # 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
-      {
-        :path       => @dir,
-        :basename   => basename,
-        :output_ext => output_ext
-      }
-    end
-
-    # Extract information from the page filename.
-    #
-    # name - The String filename of the page file.
-    #
-    # Returns nothing.
+    # Returns nothing
     def process(name)
       self.ext = File.extname(name)
-      self.basename = name[0 .. -ext.length - 1]
     end
-
+    
     # Add any necessary layouts to this post
+    #   +layouts+ is a Hash of {"name" => "layout"}
+    #   +site_payload+ is the site payload hash
     #
-    # layouts      - The Hash of {"name" => "layout"}.
-    # site_payload - The site payload Hash.
-    #
-    # Returns nothing.
+    # Returns nothing
     def render(layouts, site_payload)
-      payload = Utils.deep_merge_hashes({
-        "page" => to_liquid,
-        'paginator' => pager.to_liquid
-      }, site_payload)
-
+      payload = {"page" => self.data}.deep_merge(site_payload)
       do_layout(payload, layouts)
     end
-
-    # The path to the source file
+    
+    # Write the generated page file to the destination directory.
+    #   +dest+ is the String path to the destination dir
     #
-    # Returns the path to the source file
-    def path
-      data.fetch('path') { relative_path.sub(/\A\//, '') }
-    end
-
-    # The path to the page source file, relative to the site source
-    def relative_path
-      File.join(*[@dir, @name].map(&:to_s).reject(&:empty?))
-    end
-
-    # Obtain destination path.
-    #
-    # dest - The String path to the destination dir.
-    #
-    # 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
-    end
-
-    # Returns the object as a debug String.
-    def inspect
-      "#<Jekyll:Page @name=#{name.inspect}>"
-    end
-
-    # Returns the Boolean of whether this Page is HTML or not.
-    def html?
-      output_ext == '.html'
-    end
-
-    # Returns the Boolean of whether this Page is an index file or not.
-    def index?
-      basename == 'index'
-    end
-
-    def uses_relative_permalinks
-      permalink && !@dir.empty? && site.config['relative_permalinks']
+    # Returns nothing
+    def write(dest)
+      FileUtils.mkdir_p(File.join(dest, @dir))
+      
+      name = @name
+      if self.ext != ""
+        name = @name.split(".")[0..-2].join('.') + self.ext
+      end
+      
+      path = File.join(dest, @dir, name)
+      File.open(path, 'w') do |f|
+        f.write(self.output)
+      end
     end
   end
-end
+
+end

lib/jekyll/plugin.rb

@@ -1,77 +0,0 @@
-module Jekyll
-  class Plugin
-    PRIORITIES = { :lowest => -100,
-                   :low => -10,
-                   :normal => 0,
-                   :high => 10,
-                   :highest => 100 }
-
-    # 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
-      end
-      descendants
-    end
-
-    # Get or set the priority of this plugin. When called without an
-    # argument it returns the priority. When an argument is given, it will
-    # set the priority.
-    #
-    # priority - The Symbol priority (default: nil). Valid options are:
-    #            :lowest, :low, :normal, :high, :highest
-    #
-    # Returns the Symbol priority.
-    def self.priority(priority = nil)
-      @priority ||= nil
-      if priority && PRIORITIES.key?(priority)
-        @priority = priority
-      end
-      @priority || :normal
-    end
-
-    # Get or set the safety of this plugin. When called without an argument
-    # it returns the safety. When an argument is given, it will set the
-    # safety.
-    #
-    # safe - The Boolean safety (default: nil).
-    #
-    # Returns the safety Boolean.
-    def self.safe(safe = nil)
-      if safe
-        @safe = safe
-      end
-      @safe || false
-    end
-
-    # Spaceship is priority [higher -> lower]
-    #
-    # other - The class to be compared.
-    #
-    # Returns -1, 0, 1.
-    def self.<=>(other)
-      PRIORITIES[other.priority] <=> PRIORITIES[self.priority]
-    end
-
-    # Spaceship is priority [higher -> lower]
-    #
-    # other - The class to be compared.
-    #
-    # Returns -1, 0, 1.
-    def <=>(other)
-      self.class <=> other.class
-    end
-
-    # Initialize a new plugin. This should be overridden by the subclass.
-    #
-    # config - The Hash of configuration options.
-    #
-    # Returns a new instance.
-    def initialize(config = {})
-      # no-op for default
-    end
-  end
-end

lib/jekyll/plugin_manager.rb

@@ -1,92 +0,0 @@
-module Jekyll
-  class PluginManager
-    attr_reader :site
-
-    # Create an instance of this class.
-    #
-    # site - the instance of Jekyll::Site we're concerned with
-    #
-    # Returns nothing
-    def initialize(site)
-      @site = site
-    end
-
-    # Require all the plugins which are allowed.
-    #
-    # Returns nothing
-    def conscientious_require
-      require_plugin_files
-      require_gems
-    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
-    end
-
-    def self.require_from_bundler
-      if !ENV["JEKYLL_NO_BUNDLER_REQUIRE"] && File.file?("Gemfile")
-        require "bundler"
-        Bundler.setup # puts all groups on the load path
-        required_gems = Bundler.require(:jekyll_plugins) # requires the gems in this group only
-        Jekyll.logger.debug("PluginManager:", "Required #{required_gems.map(&:name).join(', ')}")
-        ENV["JEKYLL_NO_BUNDLER_REQUIRE"] = "true"
-        true
-      else
-        false
-      end
-    rescue LoadError, Bundler::GemfileNotFound
-      false
-    end
-
-    # Check whether a gem plugin is allowed to be used during this build.
-    #
-    # gem_name - the name of the gem
-    #
-    # Returns true if the gem name is in the whitelist or if the site is not
-    #   in safe mode.
-    def plugin_allowed?(gem_name)
-      !site.safe || whitelist.include?(gem_name)
-    end
-
-    # Build an array of allowed plugin gem names.
-    #
-    # Returns an array of strings, each string being the name of a gem name
-    #   that is allowed to be used.
-    def whitelist
-      @whitelist ||= Array[site.config['whitelist']].flatten
-    end
-
-    # Require all .rb files if safe mode is off
-    #
-    # 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
-        end
-      end
-    end
-
-    # Public: Setup the plugin search path
-    #
-    # 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'])]
-      else
-        Array(site.config['plugins']).map { |d| File.expand_path(d) }
-      end
-    end
-
-  end
-end

lib/jekyll/post.rb

@@ -1,313 +1,202 @@
 module Jekyll
+
   class Post
     include Comparable
     include Convertible
-
-    # Valid post name regex.
+        
+    class << self
+      attr_accessor :lsi
+    end
+    
     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
+    #   2008-11-05-my-awesome-post.textile
     #
-    # Returns true if valid, false if not.
+    # Returns <Bool>
     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
-
+    
+    attr_accessor :date, :slug, :ext, :categories, :topics, :published
+    attr_accessor :data, :content, :output
+    attr_accessor :previous, :next
+    
     # Initialize this Post instance.
+    #   +base+ is the String path to the dir containing the post file
+    #   +name+ is the String filename of the post file
+    #   +categories+ is an Array of Strings for the categories for this post
     #
-    # 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)
+    # Returns <Post>
+    def initialize(source, dir, name)
+      @base = File.join(source, dir, '_posts')
       @name = name
+      
+      self.categories = dir.split('/').reject { |x| x.empty? }
+      
+      parts = name.split('/')
+      self.topics = parts.size > 1 ? parts[0..-2] : []
+      
+      self.process(name)
+      self.read_yaml(@base, name)
 
-      self.categories = dir.downcase.split('/').reject { |x| x.empty? }
-      process(name)
-      read_yaml(@base, name)
+			if self.data.has_key?('published') && self.data['published'] == false
+				self.published = false
+			else
+				self.published = true
+			end
 
-      data.default_proc = proc do |hash, key|
-        site.frontmatter_defaults.find(File.join(dir, name), type, key)
+      self.data['topics'] = if self.topics.empty?
+        if self.data.has_key?('topic')
+          self.topics << self.data['topic']
+        elsif self.data.has_key?('topics')
+          self.topics = (self.data['topics'] || "").split
+        end
       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
+      
+      self.data['categories'] = if self.categories.empty?
+        if self.data.has_key?('category')
+          self.categories << self.data['category']
+        elsif self.data.has_key?('categories')
+          self.categories = (self.data['categories'] || "").split
+        end
       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.
+    
+    # Spaceship is based on Post#date
     #
     # Returns -1, 0, 1
     def <=>(other)
-      cmp = self.date <=> other.date
-      if 0 == cmp
-       cmp = self.slug <=> other.slug
-      end
-      return cmp
+      self.date <=> other.date
     end
-
-    # Extract information from the post filename.
+    
+    # Extract information from the post filename
+    #   +name+ is the String filename of the post file
     #
-    # name - The String filename of the post file.
-    #
-    # Returns nothing.
+    # 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.date = Time.parse(date)
       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.
+    # e.g. "/2008/11/05/" if the permalink style is :date, otherwise nothing
     #
-    # Returns the String directory.
+    # Returns <String>
     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"
+      if permalink
+        permalink.to_s.split("/")[0..-2].join("/") + '/'
       else
-        site.permalink_style.to_s
+        prefix = self.categories.empty? ? '' : '/' + self.categories.join('/')
+        case Jekyll.permalink_style
+        when :date
+          prefix + date.strftime("/%Y/%m/%d/")
+        when :shortdate
+          prefix + "/#{date.year}/#{date.month}/#{date.day}/"
+        else
+          prefix + '/'
+        end
       end
     end
-
-    # The generated relative url of this post.
+    
+    # The full path and filename of the post.
+    # Defined in the YAML of the post body
+    # (Optional)
     #
-    # Returns the String url.
+    # Returns <String>
+    def permalink
+      self.data && self.data['permalink']
+    end
+    
+    # The generated relative url of this post
+    # e.g. /2008/11/05/my-awesome-post.html
+    #
+    # Returns <String>
     def url
-      @url ||= URL.new({
-        :template => template,
-        :placeholders => url_placeholders,
-        :permalink => permalink
-      }).to_s
+      permalink || self.dir + self.slug + ".html"
     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).
+    
+    # The UID for this post (useful in feeds)
     # e.g. /2008/11/05/my-awesome-post
     #
-    # Returns the String UID.
+    # Returns <String>
     def id
-      File.join(dir, slug)
+      self.dir + self.slug
     end
-
+        
     # Calculate related posts.
     #
-    # Returns an Array of related Posts.
+    # Returns [<Post>]
     def related_posts(posts)
-      Jekyll::RelatedPosts.new(self).build
-    end
+      return [] unless posts.size > 1
+      
+      if Jekyll.lsi
+        self.class.lsi ||= begin
+          puts "Running the classifier... this could take a while."
+          lsi = Classifier::LSI.new
+          posts.each { |x| $stdout.print(".");$stdout.flush;lsi.add_item(x) }
+          puts ""
+          lsi
+        end
 
-    # Add any necessary layouts to this post.
+        related = self.class.lsi.find_related(self.content, 11)
+        related - [self]
+      else
+        (posts - [self])[0..9]
+      end
+    end
+    
+    # Add any necessary layouts to this post
+    #   +layouts+ is a Hash of {"name" => "layout"}
+    #   +site_payload+ is the site payload hash
     #
-    # layouts      - A Hash of {"name" => "layout"}.
-    # site_payload - The site payload hash.
-    #
-    # Returns nothing.
+    # Returns nothing
     def render(layouts, site_payload)
       # construct payload
-      payload = Utils.deep_merge_hashes({
+      payload =
+      {
         "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, {})
+        "page" => self.to_liquid,
+        "previous" => self.previous,
+        "next" => self.next
+      }
+      payload = payload.deep_merge(site_payload)
+      
+      do_layout(payload, layouts)
+    end
+    
+    # Write the generated post file to the destination directory.
+    #   +dest+ is the String path to the destination dir
+    #
+    # Returns nothing
+    def write(dest)
+      FileUtils.mkdir_p(File.join(dest, dir))
+      
+      path = File.join(dest, self.url)
+      File.open(path, 'w') do |f|
+        f.write(self.output)
       end
-
-      do_layout(payload.merge({"page" => to_liquid}), layouts)
     end
-
-    # Obtain destination path.
+    
+    # Convert this post into a Hash for use in Liquid templates.
     #
-    # 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
+    # Returns <Hash>
+    def to_liquid
+      { "title" => self.data["title"] || self.slug.split('-').select {|w| w.capitalize! || w }.join(' '),
+        "url" => self.url,
+        "date" => self.date,
+        "id" => self.id,
+        "topics" => self.topics,
+        "content" => self.content }.deep_merge(self.data)
     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?)
+      "<Post: #{self.id}>"
     end
   end
+
 end

lib/jekyll/publisher.rb

@@ -1,21 +0,0 @@
-module Jekyll
-  class Publisher
-    def initialize(site)
-      @site = site
-    end
-
-    def publish?(thing)
-      can_be_published?(thing) && !hidden_in_the_future?(thing)
-    end
-
-    private
-
-    def can_be_published?(thing)
-      thing.data.fetch('published', true) || @site.unpublished
-    end
-
-    def hidden_in_the_future?(thing)
-      thing.is_a?(Post) && !@site.future && thing.date > @site.time
-    end
-  end
-end

lib/jekyll/related_posts.rb

@@ -1,58 +0,0 @@
-module Jekyll
-  class RelatedPosts
-
-    class << self
-      attr_accessor :lsi
-    end
-
-    attr_reader :post, :site
-
-    def initialize(post)
-      @post = post
-      @site = post.site
-      require 'classifier-reborn' if site.lsi
-    end
-
-    def build
-      return [] unless site.posts.size > 1
-
-      if site.lsi
-        build_index
-        lsi_related_posts
-      else
-        most_recent_posts
-      end
-    end
-
-
-    def build_index
-      self.class.lsi ||= begin
-        lsi = ClassifierReborn::LSI.new(:auto_rebuild => false)
-        display("Populating LSI...")
-
-        site.posts.each do |x|
-          lsi.add_item(x)
-        end
-
-        display("Rebuilding index...")
-        lsi.build_index
-        display("")
-        lsi
-      end
-    end
-
-    def lsi_related_posts
-      self.class.lsi.find_related(post.content, 11) - [post]
-    end
-
-    def most_recent_posts
-      @most_recent_posts ||= (site.posts.reverse - [post]).first(10)
-    end
-
-    def display(output)
-      $stdout.print("\n")
-      $stdout.print(Jekyll.logger.formatted_topic(output))
-      $stdout.flush
-    end
-  end
-end

lib/jekyll/renderer.rb

@@ -1,161 +0,0 @@
-# encoding: UTF-8
-
-module Jekyll
-  class Renderer
-
-    attr_reader :document, :site, :site_payload
-
-    def initialize(site, document, site_payload = nil)
-      @site         = site
-      @document     = document
-      @site_payload = site_payload
-    end
-
-    # Determine which converters to use based on this document's
-    # extension.
-    #
-    # Returns an array of Converter instances.
-    def converters
-      @converters ||= site.converters.select { |c| c.matches(document.extname) }
-    end
-
-    # Determine the extname the outputted file should have
-    #
-    # Returns the output extname including the leading period.
-    def output_ext
-      converters.first.output_ext(document.extname)
-    end
-
-    ######################
-    ## DAT RENDER THO
-    ######################
-
-    def run
-      payload = Utils.deep_merge_hashes({
-        "page" => document.to_liquid
-      }, site_payload || site.site_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
-
-      output = document.content
-
-      if document.render_with_liquid?
-        output = render_liquid(output, payload, info)
-      end
-
-      output = convert(output)
-      document.content = output
-
-      if document.place_in_layout?
-        place_in_layouts(
-          output,
-          payload,
-          info
-        )
-      else
-        output
-      end
-    end
-
-    # Convert the given content using the converters which match this renderer's document.
-    #
-    # content - the raw, unconverted content
-    #
-    # Returns the converted content.
-    def convert(content)
-      converters.reduce(content) do |output, converter|
-        begin
-          converter.convert output
-        rescue => e
-          Jekyll.logger.error "Conversion error:", "#{converter.class} encountered an error while converting '#{document.relative_path}':"
-          Jekyll.logger.error("", e.to_s)
-          raise e
-        end
-      end
-    end
-
-    # Render the given content with the payload and info
-    #
-    # content -
-    # payload -
-    # info    -
-    # path    - (optional) the path to the file, for use in ex
-    #
-    # Returns the content, rendered by Liquid.
-    def render_liquid(content, payload, info, path = nil)
-      Liquid::Template.parse(content).render!(payload, info)
-    rescue Tags::IncludeTagError => e
-      Jekyll.logger.error "Liquid Exception:", "#{e.message} in #{e.path}, included in #{path || document.relative_path}"
-      raise e
-    rescue Exception => e
-      Jekyll.logger.error "Liquid Exception:", "#{e.message} in #{path || document.relative_path}"
-      raise e
-    end
-
-    # Checks if the layout specified in the document actually exists
-    #
-    # layout - the layout to check
-    #
-    # Returns true if the layout is invalid, false if otherwise
-    def invalid_layout?(layout)
-      !document.data["layout"].nil? && layout.nil?
-    end
-
-    # Render layouts and place given content inside.
-    #
-    # content - the content to be placed in the layout
-    #
-    #
-    # Returns the content placed in the Liquid-rendered layouts
-    def place_in_layouts(content, payload, info)
-      output = content.dup
-      layout = site.layouts[document.data["layout"]]
-
-      Jekyll.logger.warn("Build Warning:", "Layout '#{document.data["layout"]}' requested in #{document.relative_path} does not exist.") if invalid_layout? layout
-
-      used   = Set.new([layout])
-
-      while layout
-        payload = Utils.deep_merge_hashes(
-          payload,
-          {
-            "content" => output,
-            "page"    => document.to_liquid,
-            "layout"  => layout.data
-          }
-        )
-
-        output = render_liquid(
-          layout.content,
-          payload,
-          info,
-          File.join(site.config['layouts'], layout.name)
-        )
-
-        # Add layout to dependency tree
-        site.metadata.add_dependency(
-          site.in_source_dir(document.path),
-          site.in_source_dir(layout.path)
-        ) if document.write?
-
-        if layout = site.layouts[layout.data["layout"]]
-          if used.include?(layout)
-            layout = nil # avoid recursive chain
-          else
-            used << layout
-          end
-        end
-      end
-
-      output
-    end
-
-  end
-end

lib/jekyll/site.rb

@@ -1,522 +1,173 @@
-# encoding: UTF-8
-require 'csv'
-
 module Jekyll
+  
   class Site
-    attr_reader   :source, :dest, :config
-    attr_accessor :layouts, :posts, :pages, :static_files,
-                  :exclude, :include, :lsi, :highlighter, :permalink_style,
-                  :time, :future, :unpublished, :safe, :plugins, :limit_posts,
-                  :show_drafts, :keep_files, :baseurl, :data, :file_read_opts,
-                  :gems, :plugin_manager
-
-    attr_accessor :converters, :generators
-    attr_reader   :metadata
-
-    # Public: Initialize a new Site.
+    attr_accessor :source, :dest
+    attr_accessor :layouts, :posts, :categories
+    
+    # Initialize the site
+    #   +source+ is String path to the source directory containing
+    #            the proto-site
+    #   +dest+ is the String path to the directory where the generated
+    #          site should be written
     #
-    # config - A Hash containing site configuration details.
-    def initialize(config)
-      @config = config.clone
-
-      %w[safe lsi highlighter baseurl exclude include future unpublished
-        show_drafts limit_posts keep_files gems].each do |opt|
-        self.send("#{opt}=", config[opt])
-      end
-
-      # Source and destination may not be changed after the site has been created.
-      @source              = File.expand_path(config['source']).freeze
-      @dest                = File.expand_path(config['destination']).freeze
-
-      # Build metadata
-      @metadata = Metadata.new(self)
-
-      self.plugin_manager = Jekyll::PluginManager.new(self)
-      self.plugins        = plugin_manager.plugins_path
-
-      self.file_read_opts = {}
-      self.file_read_opts[:encoding] = config['encoding'] if config['encoding']
-
-      self.permalink_style = config['permalink'].to_sym
-
-      Jekyll.sites << self
-
-      reset
-      setup
-    end
-
-    # Public: Read, process, and write this Site to output.
-    #
-    # Returns nothing.
-    def process
-      reset
-      read
-      generate
-      render
-      cleanup
-      write
-    end
-
-    # Reset Site details.
-    #
-    # Returns nothing
-    def reset
-      self.time = (config['time'] ? Utils.parse_date(config['time'].to_s, "Invalid time in _config.yml.") : Time.now)
+    # Returns <Site>
+    def initialize(source, dest)
+      self.source = source
+      self.dest = dest
       self.layouts = {}
       self.posts = []
-      self.pages = []
-      self.static_files = []
-      self.data = {}
-      @collections = nil
-
-      if limit_posts < 0
-        raise ArgumentError, "limit_posts must be a non-negative number"
-      end
+      self.categories = Hash.new { |hash, key| hash[key] = Array.new }
     end
-
-    # Load necessary libraries, plugins, converters, and generators.
+    
+    # Do the actual work of processing the site and generating the
+    # real deal.
     #
-    # Returns nothing.
-    def setup
-      ensure_not_in_dest
-
-      plugin_manager.conscientious_require
-
-      self.converters = instantiate_subclasses(Jekyll::Converter)
-      self.generators = instantiate_subclasses(Jekyll::Generator)
+    # Returns nothing
+    def process
+      self.read_layouts
+      self.transform_pages
+      self.write_posts
     end
-
-    # Check that the destination dir isn't the source dir or a directory
-    # parent to the source dir.
-    def ensure_not_in_dest
-      dest_pathname = Pathname.new(dest)
-      Pathname.new(source).ascend do |path|
-        if path == dest_pathname
-          raise Errors::FatalException.new "Destination directory cannot be or contain the Source directory."
-        end
-      end
-    end
-
-    # Public: Prefix a given path with the source directory.
+    
+    # Read all the files in <source>/_layouts except backup files
+    # (end with "~") into memory for later use.
     #
-    # paths - (optional) path elements to a file or directory within the
-    #         source directory
-    #
-    # Returns a path which is prefixed with the source directory.
-    def in_source_dir(*paths)
-      paths.reduce(source) do |base, path|
-        Jekyll.sanitized_path(base, path)
-      end
-    end
-
-    # Public: Prefix a given path with the destination directory.
-    #
-    # paths - (optional) path elements to a file or directory within the
-    #         destination directory
-    #
-    # Returns a path which is prefixed with the destination directory.
-    def in_dest_dir(*paths)
-      paths.reduce(dest) do |base, path|
-        Jekyll.sanitized_path(base, path)
-      end
-    end
-
-    # The list of collections and their corresponding Jekyll::Collection instances.
-    # If config['collections'] is set, a new instance is created for each item in the collection.
-    # If config['collections'] is not set, a new hash is returned.
-    #
-    # Returns a Hash containing collection name-to-instance pairs.
-    def collections
-      @collections ||= Hash[collection_names.map { |coll| [coll, Jekyll::Collection.new(self, coll)] } ]
-    end
-
-    # The list of collection names.
-    #
-    # Returns an array of collection names from the configuration,
-    #   or an empty array if the `collections` key is not set.
-    def collection_names
-      case config['collections']
-      when Hash
-        config['collections'].keys
-      when Array
-        config['collections']
-      when nil
-        []
-      else
-        raise ArgumentError, "Your `collections` key must be a hash or an array."
-      end
-    end
-
-    # Read Site data from disk and load it into internal data structures.
-    #
-    # Returns nothing.
-    def read
-      self.layouts = LayoutReader.new(self).read
-      read_directories
-      read_data(config['data_source'])
-      read_collections
-    end
-
-    # Recursively traverse directories to find posts, 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 = in_source_dir(dir)
-      entries = Dir.chdir(base) { filter_entries(Dir.entries('.'), base) }
-
-      read_posts(dir)
-      read_drafts(dir) if show_drafts
-      posts.sort!
-      limit_posts! if limit_posts > 0 # limit the posts if :limit_posts option is set
-
+    # Returns nothing
+    def read_layouts
+      base = File.join(self.source, "_layouts")
+      entries = Dir.entries(base)
+      entries = entries.reject { |e| e[-1..-1] == '~' }
+      entries = entries.reject { |e| File.directory?(File.join(base, e)) }
+      
       entries.each do |f|
-        f_abs = in_source_dir(base, f)
-        if File.directory?(f_abs)
-          f_rel = File.join(dir, f)
-          read_directories(f_rel) unless dest.sub(/\/$/, '') == f_abs
-        elsif Utils.has_yaml_header?(f_abs)
-          page = Page.new(self, source, dir, f)
-          pages << page if publisher.publish?(page)
-        else
-          static_files << StaticFile.new(self, source, dir, f)
-        end
+        name = f.split(".")[0..-2].join(".")
+        self.layouts[name] = Layout.new(base, f)
       end
-
-      pages.sort_by!(&:name)
-      static_files.sort_by!(&:relative_path)
+    rescue Errno::ENOENT => e
+      # ignore missing layout dir
     end
-
-    # Read all the files in <source>/<dir>/_posts and create a new Post
-    # object with each one.
+    
+    # Read all the files in <base>/_posts except backup files (end with "~")
+    # and create a new Post object with each one.
     #
-    # dir - The String relative path of the directory to read.
-    #
-    # Returns nothing.
+    # Returns nothing
     def read_posts(dir)
-      posts = read_content(dir, '_posts', Post)
+      base = File.join(self.source, dir, '_posts')
+      
+      entries = []
+      Dir.chdir(base) { entries = Dir['**/*'] }
+      entries = entries.reject { |e| e[-1..-1] == '~' }
+      entries = entries.reject { |e| File.directory?(File.join(base, e)) }
 
-      posts.each do |post|
-        aggregate_post_info(post) if publisher.publish?(post)
-      end
-    end
+      # first pass processes, but does not yet render post content
+      entries.each do |f|
+        if Post.valid?(f)
+          post = Post.new(self.source, dir, f)
 
-    # Read all the files in <source>/<dir>/_drafts and create a new Post
-    # object with each one.
-    #
-    # dir - The String relative path of the directory to read.
-    #
-    # Returns nothing.
-    def read_drafts(dir)
-      drafts = read_content(dir, '_drafts', Draft)
-
-      drafts.each do |draft|
-        if draft.published?
-          aggregate_post_info(draft)
+          if post.published
+            self.posts << post
+            post.categories.each { |c| self.categories[c] << post }
+          end
         end
       end
-    end
 
-    def read_content(dir, magic_dir, klass)
-      get_entries(dir, magic_dir).map do |entry|
-        klass.new(self, source, dir, entry) if klass.valid?(entry)
-      end.reject do |entry|
-        entry.nil?
+      self.posts.sort!
+      
+      # second pass renders each post now that full site payload is available
+      self.posts.each_with_index do |post, idx|
+        post.previous = posts[idx - 1] unless idx - 1 < 0
+        post.next = posts[idx + 1] unless idx + 1 >= posts.size
+        post.render(self.layouts, site_payload)
       end
+      
+      self.categories.values.map { |cats| cats.sort! { |a, b| b <=> a} }
+    rescue Errno::ENOENT => e
+      # ignore missing layout dir
     end
-
-    # Read and parse all yaml files under <source>/<dir>
+    
+    # Write each post to <dest>/<year>/<month>/<day>/<slug>
     #
     # Returns nothing
-    def read_data(dir)
-      base = in_source_dir(dir)
-      read_data_to(base, self.data)
+    def write_posts
+      self.posts.each do |post|
+        post.write(self.dest)
+      end
     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.
+    
+    # Copy all regular files from <source> to <dest>/ ignoring
+    # any files/directories that are hidden or backup files (start
+    # with "." or end with "~") or contain site content (start with "_")
+    # unless they are "_posts" directories or web server files such as
+    # '.htaccess'
+    #   The +dir+ String is a relative path used to call this method
+    #            recursively as it descends through directories
     #
     # Returns nothing
-    def read_data_to(dir, data)
-      return unless File.directory?(dir) && (!safe || !File.symlink?(dir))
-
-      entries = Dir.chdir(dir) do
-        Dir['*.{yaml,yml,json,csv}'] + Dir['*'].select { |fn| File.directory?(fn) }
+    def transform_pages(dir = '')
+      base = File.join(self.source, dir)
+      entries = Dir.entries(base)
+      entries = entries.reject { |e| e[-1..-1] == '~' }
+      entries = entries.reject do |e|
+        (e != '_posts') and ['.', '_'].include?(e[0..0]) unless ['.htaccess'].include?(e)
       end
+      directories = entries.select { |e| File.directory?(File.join(base, e)) }
+      files = entries.reject { |e| File.directory?(File.join(base, e)) }
 
-      entries.each do |entry|
-        path = in_source_dir(dir, entry)
-        next if File.symlink?(path) && safe
-
-        key = sanitize_filename(File.basename(entry, '.*'))
-        if File.directory?(path)
-          read_data_to(path, data[key] = {})
-        else
-          case File.extname(path).downcase
-          when '.csv'
-            data[key] = CSV.read(path, :headers => true).map(&:to_hash)
+      # we need to make sure to process _posts *first* otherwise they 
+      # might not be available yet to other templates as {{ site.posts }}
+      if entries.include?('_posts')
+        entries.delete('_posts')
+        read_posts(dir)
+      end
+      [directories, files].each do |entries|
+        entries.each do |f|
+          if File.directory?(File.join(base, f))
+            next if self.dest.sub(/\/$/, '') == File.join(base, f)
+            transform_pages(File.join(dir, f))
           else
-            data[key] = SafeYAML.load_file(path)
+            first3 = File.open(File.join(self.source, dir, f)) { |fd| fd.read(3) }
+        
+            if first3 == "---"
+              # file appears to have a YAML header so process it as a page
+              page = Page.new(self.source, dir, f)
+              page.render(self.layouts, site_payload)
+              page.write(self.dest)
+            else
+              # otherwise copy the file without transforming it
+              FileUtils.mkdir_p(File.join(self.dest, dir))
+              FileUtils.cp(File.join(self.source, dir, f), File.join(self.dest, dir, f))
+            end
           end
         end
       end
     end
 
-    # Read in all collections specified in the configuration
+    # Constructs a hash map of Posts indexed by the specified Post attribute
     #
-    # Returns nothing.
-    def read_collections
-      collections.each do |_, collection|
-        collection.read unless collection.label.eql?("data")
-      end
-    end
-
-    # Run each of the Generators.
-    #
-    # Returns nothing.
-    def generate
-      generators.each do |generator|
-        generator.generate(self)
-      end
-    end
-
-    # Render the site to the destination.
-    #
-    # Returns nothing.
-    def render
-      relative_permalinks_deprecation_method
-
-      payload = site_payload
-      collections.each do |label, collection|
-        collection.docs.each do |document|
-          document.output = Jekyll::Renderer.new(self, document, payload).run if document.regenerate?
-        end
-      end
-
-      payload = site_payload
-      [posts, pages].flatten.each do |page_or_post|
-        page_or_post.render(layouts, payload) if page_or_post.regenerate?
-      end
-    rescue Errno::ENOENT => e
-      # ignore missing layout dir
-    end
-
-    # Remove orphaned files and empty directories in destination.
-    #
-    # Returns nothing.
-    def cleanup
-      site_cleaner.cleanup!
-    end
-
-    # Write static files, pages, and posts.
-    #
-    # Returns nothing.
-    def write
-      each_site_file { |item|
-        item.write(dest) if item.regenerate?
-      }
-      metadata.write unless full_rebuild?
-    end
-
-    # Construct a Hash of Posts indexed by the specified Post attribute.
-    #
-    # post_attr - The String name of the Post attribute.
-    #
-    # Examples
-    #
-    #   post_attr_hash('categories')
-    #   # => { 'tech' => [<Post A>, <Post B>],
-    #   #      'ruby' => [<Post B>] }
-    #
-    # Returns the Hash: { attr => posts } where
-    #   attr  - One of the values for the requested attribute.
-    #   posts - The Array of Posts with the given attr value.
+    # Returns {post_attr => [<Post>]}
     def post_attr_hash(post_attr)
-      # Build a hash map based on the specified post attribute ( post attr =>
-      # array of posts ) then sort each array in reverse order.
-      hash = Hash.new { |h, key| h[key] = [] }
-      posts.each { |p| p.send(post_attr.to_sym).each { |t| hash[t] << p } }
-      hash.values.each { |posts| posts.sort!.reverse! }
-      hash
+      # Build a hash map based on the specified post attribute ( post attr => array of posts )
+      # then sort each array in reverse order
+      hash = Hash.new { |hash, key| hash[key] = Array.new }
+      self.posts.each { |p| p.send(post_attr.to_sym).each { |t| hash[t] << p } }
+      hash.values.map { |sortme| sortme.sort! { |a, b| b <=> a} }
+      return hash
     end
 
-    def tags
-      post_attr_hash('tags')
-    end
-
-    def categories
-      post_attr_hash('categories')
-    end
-
-    # Prepare site data for site payload. The method maintains backward compatibility
-    # if the key 'data' is already used in _config.yml.
+    # The Hash payload containing site-wide data
     #
-    # Returns the Hash to be hooked to site.data.
-    def site_data
-      config['data'] || data
-    end
-
-    # The Hash payload containing site-wide data.
-    #
-    # Returns the Hash: { "site" => data } where data is a Hash with keys:
-    #   "time"       - The Time as specified in the configuration or the
-    #                  current time if none was specified.
-    #   "posts"      - The Array of Posts, sorted chronologically by post date
-    #                  and then title.
-    #   "pages"      - The Array of all Pages.
-    #   "html_pages" - The Array of HTML Pages.
-    #   "categories" - The Hash of category values and Posts.
-    #                  See Site#post_attr_hash for type info.
-    #   "tags"       - The Hash of tag values and Posts.
-    #                  See Site#post_attr_hash for type info.
+    # Returns {"site" => {"time" => <Time>,
+    #                     "posts" => [<Post>],
+    #                     "categories" => [<Post>],
+    #                     "topics" => [<Post>] }}
     def site_payload
-      {
-        "jekyll" => {
-          "version" => Jekyll::VERSION,
-          "environment" => Jekyll.env
-        },
-        "site"   => Utils.deep_merge_hashes(config,
-          Utils.deep_merge_hashes(Hash[collections.map{|label, coll| [label, coll.docs]}], {
-            "time"         => time,
-            "posts"        => posts.sort { |a, b| b <=> a },
-            "pages"        => pages,
-            "static_files" => static_files,
-            "html_pages"   => pages.select { |page| page.html? || page.url.end_with?("/") },
-            "categories"   => post_attr_hash('categories'),
-            "tags"         => post_attr_hash('tags'),
-            "collections"  => collections,
-            "documents"    => documents,
-            "data"         => site_data
-        }))
-      }
-    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.
-    #
-    # Returns the Array of filtered entries.
-    def filter_entries(entries, base_directory = nil)
-      EntryFilter.new(self, base_directory).filter(entries)
-    end
-
-    # Get the implementation class for the given Converter.
-    #
-    # klass - The Class of the Converter to fetch.
-    #
-    # Returns the Converter instance implementing the given Converter.
-    def find_converter_instance(klass)
-      converters.find { |c| c.class == klass } || proc { raise "No converter for #{klass}" }.call
-    end
-
-    # Create array of instances of the subclasses of the class or module
-    #   passed in as argument.
-    #
-    # klass - class or module containing the subclasses which should be
-    #         instantiated
-    #
-    # Returns array of instances of subclasses of parameter
-    def instantiate_subclasses(klass)
-      klass.descendants.select do |c|
-        !safe || c.safe
-      end.sort.map do |c|
-        c.new(config)
-      end
-    end
-
-    # Read the entries from a particular directory for processing
-    #
-    # dir - The String relative path of the directory to read
-    # subfolder - The String directory to read
-    #
-    # Returns the list of entries to process
-    def get_entries(dir, subfolder)
-      base = in_source_dir(dir, subfolder)
-      return [] unless File.exist?(base)
-      entries = Dir.chdir(base) { filter_entries(Dir['**/*'], base) }
-      entries.delete_if { |e| File.directory?(in_source_dir(base, e)) }
-    end
-
-    # Aggregate post information
-    #
-    # post - The Post object to aggregate information for
-    #
-    # Returns nothing
-    def aggregate_post_info(post)
-      posts << post
-    end
-
-    def relative_permalinks_deprecation_method
-      if config['relative_permalinks'] && has_relative_page?
-        Jekyll.logger.warn "Deprecation:", "Since v2.0, permalinks for pages" +
-                                            " in subfolders must be relative to the" +
-                                            " site source directory, not the parent" +
-                                            " directory. Check http://jekyllrb.com/docs/upgrading/"+
-                                            " for more info."
-      end
-    end
-
-    def docs_to_write
-      documents.select(&:write?)
-    end
-
-    def documents
-      collections.reduce(Set.new) do |docs, (_, collection)|
-        docs + collection.docs + collection.files
-      end.to_a
-    end
-
-    def each_site_file
-      %w(posts pages static_files docs_to_write).each do |type|
-        send(type).each do |item|
-          yield item
-        end
-      end
-    end
-
-    def frontmatter_defaults
-      @frontmatter_defaults ||= FrontmatterDefaults.new(self)
-    end
-
-    # Whether to perform a full rebuild without metadata
-    #
-    # Returns a Boolean: true for a full rebuild, false for normal build
-    def full_rebuild?(override = {})
-      override['full_rebuild'] || config['full_rebuild']
-    end
-
-    def publisher
-      @publisher ||= Publisher.new(self)
-    end
-
-    private
-
-    def has_relative_page?
-      pages.any? { |page| page.uses_relative_permalinks }
-    end
-
-    def limit_posts!
-      limit = posts.length < limit_posts ? posts.length : limit_posts
-      self.posts = posts[-limit, limit]
-    end
-
-    def site_cleaner
-      @site_cleaner ||= Cleaner.new(self)
-    end
-
-    def sanitize_filename(name)
-      name.gsub!(/[^\w\s_-]+/, '')
-      name.gsub!(/(^|\b\s)\s+($|\s?\b)/, '\\1\\2')
-      name.gsub(/\s+/, '_')
+      {"site" => {
+        "time" => Time.now, 
+        "posts" => self.posts.sort { |a,b| b <=> a },
+        "categories" => post_attr_hash('categories'),
+        "topics" => post_attr_hash('topics')
+      }}
     end
   end
+
 end

lib/jekyll/static_file.rb

@@ -1,104 +0,0 @@
-module Jekyll
-  class StaticFile
-    # The cache of last modification times [path] -> mtime.
-    @@mtimes = Hash.new
-
-    attr_reader :relative_path
-
-    # Initialize a new StaticFile.
-    #
-    # site - The Site.
-    # base - The String path to the <source>.
-    # dir  - The String path between <source> and the file.
-    # name - The String filename of the file.
-    def initialize(site, base, dir, name, collection = nil)
-      @site = site
-      @base = base
-      @dir  = dir
-      @name = name
-      @collection = collection
-      @relative_path = File.join(*[@dir, @name].compact)
-    end
-
-    # Returns source file path.
-    def path
-      File.join(*[@base, @dir, @name].compact)
-    end
-
-    def extname
-      File.extname(path)
-    end
-
-    # Obtain destination path.
-    #
-    # dest - The String path to the destination dir.
-    #
-    # Returns destination file path.
-    def destination(dest)
-      @site.in_dest_dir(*[dest, destination_rel_dir, @name].compact)
-    end
-
-    def destination_rel_dir
-      if @collection
-        @dir.gsub(/\A_/, '')
-      else
-        @dir
-      end
-    end
-
-    # Returns last modification time for this file.
-    def mtime
-      File.stat(path).mtime.to_i
-    end
-
-    # Is source path modified?
-    #
-    # Returns true if modified since last write.
-    def modified?
-      @@mtimes[path] != mtime
-    end
-
-    # Whether to write the file to the filesystem
-    #
-    # Returns true.
-    def write?
-      true
-    end
-
-    alias_method :regenerate?, :write?
-
-    # Write the static file to the destination directory (if modified).
-    #
-    # dest - The String path to the destination dir.
-    #
-    # Returns false if the file was not modified since last time (no-op).
-    def write(dest)
-      dest_path = destination(dest)
-
-      return false if File.exist?(dest_path) and !modified?
-      @@mtimes[path] = mtime
-
-      FileUtils.mkdir_p(File.dirname(dest_path))
-      FileUtils.rm(dest_path) if File.exist?(dest_path)
-      FileUtils.cp(path, dest_path)
-
-      true
-    end
-
-    # Reset the mtimes cache (for testing purposes).
-    #
-    # Returns nothing.
-    def self.reset_cache
-      @@mtimes = Hash.new
-      nil
-    end
-
-    def to_liquid
-      {
-        "path"          => File.join("", relative_path),
-        "modified_time" => mtime.to_s,
-        "extname"       => File.extname(relative_path)
-      }
-    end
-  end
-end

lib/jekyll/stevenson.rb

@@ -1,58 +0,0 @@
-module Jekyll
-  class Stevenson < ::Logger
-    def initialize
-      @progname = nil
-      @level = DEBUG
-      @default_formatter = Formatter.new
-      @logdev = $stdout
-      @formatter = proc do |severity, datetime, progname, msg|
-        "#{msg}"
-      end
-    end
-
-    def add(severity, message = nil, progname = nil, &block)
-      severity ||= UNKNOWN
-      @logdev = set_logdevice(severity)
-
-      if @logdev.nil? or severity < @level
-        return true
-      end
-      progname ||= @progname
-      if message.nil?
-        if block_given?
-          message = yield
-        else
-          message = progname
-          progname = @progname
-        end
-      end
-      @logdev.puts(
-        format_message(format_severity(severity), Time.now, progname, message))
-      true
-    end
-
-    # Log a +WARN+ message
-    def warn(progname = nil, &block)
-      add(WARN, nil, progname.yellow, &block)
-    end
-
-    # Log an +ERROR+ message
-    def error(progname = nil, &block)
-      add(ERROR, nil, progname.red, &block)
-    end
-
-    def close
-      # No LogDevice in use
-    end
-
-    private
-
-    def set_logdevice(severity)
-      if severity > INFO
-        $stderr
-      else
-        $stdout
-      end
-    end
-  end
-end

lib/jekyll/tags/highlight.rb

@@ -1,125 +1,53 @@
 module Jekyll
-  module Tags
-    class HighlightBlock < Liquid::Block
-      include Liquid::StandardFilters
-
-      # The regular expression syntax checker. Start with the language specifier.
-      # Follow that by zero or more space separated options that take one of three
-      # forms: name, name=value, or name="<quoted list>"
-      #
-      # <quoted list> is a space-separated list of numbers
-      SYNTAX = /^([a-zA-Z0-9.+#-]+)((\s+\w+(=(\w+|"([0-9]+\s)*[0-9]+"))?)*)$/
-
-      def initialize(tag_name, markup, tokens)
-        super
-        if markup.strip =~ SYNTAX
-          @lang = $1.downcase
+  
+  class HighlightBlock < Liquid::Block
+    include Liquid::StandardFilters
+    # we need a language, but the linenos argument is optional.
+    SYNTAX = /(\w+)\s?(:?linenos)?\s?/
+    
+    def initialize(tag_name, markup, tokens)
+      super
+      if markup =~ SYNTAX
+        @lang = $1
+        if defined? $2
+          # additional options to pass to Albino.
+          @options = { 'O' => 'linenos=inline' }
+        else
           @options = {}
-          if defined?($2) && $2 != ''
-            # Split along 3 possible forms -- key="<quoted list>", key=value, or key
-            $2.scan(/(?:\w="[^"]*"|\w=\w|\w)+/) do |opt|
-              key, value = opt.split('=')
-              # If a quoted list, convert to array
-              if value && value.include?("\"")
-                  value.gsub!(/"/, "")
-                  value = value.split
-              end
-              @options[key.to_sym] = value || true
-            end
-          end
-          @options[:linenos] = "inline" if @options.key?(:linenos) and @options[:linenos] == true
-        else
-          raise SyntaxError.new <<-eos
-Syntax Error in tag 'highlight' while parsing the following markup:
-
-  #{markup}
-
-Valid syntax: highlight <lang> [linenos]
-eos
         end
+      else
+        raise SyntaxError.new("Syntax Error in 'highlight' - Valid syntax: highlight <lang> [linenos]")
       end
-
-      def render(context)
-        prefix = context["highlighter_prefix"] || ""
-        suffix = context["highlighter_suffix"] || ""
-        code = super.to_s.strip
-
-        is_safe = !!context.registers[:site].safe
-
-        output =
-          case context.registers[:site].highlighter
-            when 'pygments'
-              render_pygments(code, is_safe)
-            when 'rouge'
-              render_rouge(code)
-            else
-              render_codehighlighter(code)
-            end
-
-        rendered_output = add_code_tag(output)
-        prefix + rendered_output + suffix
+    end
+  
+    def render(context)
+      if Jekyll.pygments
+        render_pygments(context, super.to_s)
+      else
+        render_codehighlighter(context, super.to_s)
       end
-
-      def sanitized_opts(opts, is_safe)
-        if is_safe
-          Hash[[
-            [:startinline, opts.fetch(:startinline, nil)],
-            [:hl_linenos,  opts.fetch(:hl_linenos, nil)],
-            [:linenos,     opts.fetch(:linenos, nil)],
-            [:encoding,    opts.fetch(:encoding, 'utf-8')],
-            [:cssclass,    opts.fetch(:cssclass, nil)]
-          ].reject {|f| f.last.nil? }]
-        else
-          opts
-        end
+    end
+    
+    def render_pygments(context, code)
+      if Jekyll.content_type == :markdown
+        return "\n" + Albino.new(code, @lang).to_s(@options) + "\n"
+      else
+        "<notextile>" + Albino.new(code, @lang).to_s(@options) + "</notextile>"
       end
-
-      def render_pygments(code, is_safe)
-        require 'pygments'
-
-        @options[:encoding] = 'utf-8'
-
-        highlighted_code = Pygments.highlight(
-          code,
-          :lexer   => @lang,
-          :options => sanitized_opts(@options, is_safe)
-        )
-
-        if highlighted_code.nil?
-          Jekyll.logger.error "There was an error highlighting your code:"
-          puts
-          Jekyll.logger.error code
-          puts
-          Jekyll.logger.error "While attempting to convert the above code, Pygments.rb" +
-            " returned an unacceptable value."
-          Jekyll.logger.error "This is usually a timeout problem solved by running `jekyll build` again."
-          raise ArgumentError.new("Pygments.rb returned an unacceptable value when attempting to highlight some code.")
-        end
-
-        highlighted_code
-      end
-
-      def render_rouge(code)
-        require 'rouge'
-        formatter = Rouge::Formatters::HTML.new(line_numbers: @options[:linenos], wrap: false)
-        lexer = Rouge::Lexer.find_fancy(@lang, code) || Rouge::Lexers::PlainText
-        code = formatter.format(lexer.lex(code))
-        "<div class=\"highlight\"><pre>#{code}</pre></div>"
-      end
-
-      def render_codehighlighter(code)
-        "<div class=\"highlight\"><pre>#{h(code).strip}</pre></div>"
-      end
-
-      def add_code_tag(code)
-        # Add nested <code> tags to code blocks
-        code = code.sub(/<pre>\n*/,'<pre><code class="language-' + @lang.to_s.gsub("+", "-") + '" data-lang="' + @lang.to_s + '">')
-        code = code.sub(/\n*<\/pre>/,"</code></pre>")
-        code.strip
-      end
-
+    end
+    
+    def render_codehighlighter(context, code)
+    #The div is required because RDiscount blows ass
+      <<-HTML
+<div>
+  <pre>
+    <code class='#{@lang}'>#{h(code).strip}</code>
+  </pre>
+</div>
+      HTML
     end
   end
+  
 end
 
-Liquid::Template.register_tag('highlight', Jekyll::Tags::HighlightBlock)
+Liquid::Template.register_tag('highlight', Jekyll::HighlightBlock)

lib/jekyll/tags/include.rb

@@ -1,186 +1,31 @@
-# encoding: UTF-8
-
 module Jekyll
-  module Tags
-    class IncludeTagError < StandardError
-      attr_accessor :path
-
-      def initialize(msg, path)
-        super(msg)
-        @path = path
-      end
+  
+  class IncludeTag < Liquid::Tag
+    def initialize(tag_name, file, tokens)
+      super
+      @file = file.strip
     end
-
-    class IncludeTag < Liquid::Tag
-
-      attr_reader :includes_dir
-
-      VALID_SYNTAX = /([\w-]+)\s*=\s*(?:"([^"\\]*(?:\\.[^"\\]*)*)"|'([^'\\]*(?:\\.[^'\\]*)*)'|([\w\.-]+))/
-      VARIABLE_SYNTAX = /(?<variable>[^{]*\{\{\s*(?<name>[\w\-\.]+)\s*(\|.*)?\}\}[^\s}]*)(?<params>.*)/
-
-      class << self
-        def source_cache
-          @@source_cache ||= {}
-        end
+    
+    def render(context)
+      if @file !~ /^[a-zA-Z0-9_\/\.-]+$/ || @file =~ /\.\// || @file =~ /\/\./
+        return "Include file '#{@file}' contains invalid characters or sequences"
       end
-
-      def initialize(tag_name, markup, tokens)
-        super
-        @includes_dir = tag_includes_dir
-        matched = markup.strip.match(VARIABLE_SYNTAX)
-        if matched
-          @file = matched['variable'].strip
-          @params = matched['params'].strip
-        else
-          @file, @params = markup.strip.split(' ', 2);
-        end
-        validate_params if @params
-        @tag_name = tag_name
-      end
-
-      def syntax_example
-        "{% #{@tag_name} file.ext param='value' param2='value' %}"
-      end
-
-      def parse_params(context)
-        params = {}
-        markup = @params
-
-        while match = VALID_SYNTAX.match(markup) do
-          markup = markup[match.end(0)..-1]
-
-          value = if match[2]
-            match[2].gsub(/\\"/, '"')
-          elsif match[3]
-            match[3].gsub(/\\'/, "'")
-          elsif match[4]
-            context[match[4]]
-          end
-
-          params[match[1]] = value
-        end
-        params
-      end
-
-      def validate_file_name(file)
-        if file !~ /^[a-zA-Z0-9_\/\.-]+$/ || file =~ /\.\// || file =~ /\/\./
-            raise ArgumentError.new <<-eos
-Invalid syntax for include tag. File contains invalid characters or sequences:
-
-  #{file}
-
-Valid syntax:
-
-  #{syntax_example}
-
-eos
-        end
-      end
-
-      def validate_params
-        full_valid_syntax = Regexp.compile('\A\s*(?:' + VALID_SYNTAX.to_s + '(?=\s|\z)\s*)*\z')
-        unless @params =~ full_valid_syntax
-          raise ArgumentError.new <<-eos
-Invalid syntax for include tag:
-
-  #{@params}
-
-Valid syntax:
-
-  #{syntax_example}
-
-eos
-        end
-      end
-
-      # Grab file read opts in the context
-      def file_read_opts(context)
-        context.registers[:site].file_read_opts
-      end
-
-      # Render the variable if required
-      def render_variable(context)
-        if @file.match(VARIABLE_SYNTAX)
-          partial = Liquid::Template.parse(@file)
-          partial.render!(context)
-        end
-      end
-
-      def tag_includes_dir
-        '_includes'
-      end
-
-      def render(context)
-        site = context.registers[:site]
-        dir = resolved_includes_dir(context)
-
-        file = render_variable(context) || @file
-        validate_file_name(file)
-
-        path = File.join(dir, file)
-        validate_path(path, dir, site.safe)
-
-        # Add include to dependency tree
-        if context.registers[:page] and context.registers[:page].has_key? "path"
-          site.metadata.add_dependency(
-            site.in_source_dir(context.registers[:page]["path"]),
-            path
-          )
-        end
-
-        begin
-          partial = Liquid::Template.parse(source(path, context))
-
+      
+      Dir.chdir(File.join(Jekyll.source, '_includes')) do
+        choices = Dir['**/*'].reject { |x| File.symlink?(x) }
+        if choices.include?(@file)
+          source = File.read(@file)
+          partial = Liquid::Template.parse(source)
           context.stack do
-            context['include'] = parse_params(context) if @params
-            partial.render!(context)
+            partial.render(context)
           end
-        rescue => e
-          raise IncludeTagError.new e.message, File.join(@includes_dir, @file)
+        else
+          "Included file '#{@file}' not found in _includes directory"
         end
       end
-
-      def resolved_includes_dir(context)
-        File.join(File.realpath(context.registers[:site].source), @includes_dir)
-      end
-
-      def validate_path(path, dir, safe)
-        if safe && !realpath_prefixed_with?(path, dir)
-          raise IOError.new "The included file '#{path}' should exist and should not be a symlink"
-        elsif !File.exist?(path)
-          raise IOError.new "Included file '#{path_relative_to_source(dir, path)}' not found"
-        end
-      end
-
-      def path_relative_to_source(dir, path)
-        File.join(@includes_dir, path.sub(Regexp.new("^#{dir}"), ""))
-      end
-
-      def realpath_prefixed_with?(path, dir)
-        File.exist?(path) && File.realpath(path).start_with?(dir)
-      end
-
-      # This method allows to modify the file content by inheriting from the class.
-      def source(file, context)
-        self.class.source_cache[file] ||= File.read(file, file_read_opts(context))
-      end
-    end
-
-    class IncludeRelativeTag < IncludeTag
-      def tag_includes_dir
-        '.'
-      end
-
-      def page_path(context)
-        context.registers[:page].nil? ? includes_dir : File.dirname(context.registers[:page]["path"])
-      end
-
-      def resolved_includes_dir(context)
-        context.registers[:site].in_source_dir(page_path(context))
-      end
     end
   end
+  
 end
 
-Liquid::Template.register_tag('include', Jekyll::Tags::IncludeTag)
-Liquid::Template.register_tag('include_relative', Jekyll::Tags::IncludeRelativeTag)
+Liquid::Template.register_tag('include', Jekyll::IncludeTag)

lib/jekyll/tags/post_url.rb

@@ -1,91 +0,0 @@
-module Jekyll
-  module Tags
-    class PostComparer
-      MATCHER = /^(.+\/)*(\d+-\d+-\d+)-(.*)$/
-
-      attr_reader :path, :date, :slug, :name
-
-      def initialize(name)
-        @name = name
-        all, @path, @date, @slug = *name.sub(/^\//, "").match(MATCHER)
-        raise ArgumentError.new("'#{name}' does not contain valid date and/or title.") unless all
-
-        @name_regex = /^#{path}#{date}-#{slug}\.[^.]+/
-      end
-
-      def ==(other)
-        other.name.match(@name_regex)
-      end
-
-      def deprecated_equality(other)
-        date = Utils.parse_date(name, "'#{name}' does not contain valid date and/or title.")
-        slug == post_slug(other) &&
-          date.year  == other.date.year &&
-          date.month == other.date.month &&
-          date.day   == other.date.day
-      end
-
-      private
-      # Construct the directory-aware post slug for a Jekyll::Post
-      #
-      # other - the Jekyll::Post
-      #
-      # Returns the post slug with the subdirectory (relative to _posts)
-      def post_slug(other)
-        path = other.name.split("/")[0...-1].join("/")
-        if path.nil? || path == ""
-          other.slug
-        else
-          path + '/' + other.slug
-        end
-      end
-    end
-
-    class PostUrl < Liquid::Tag
-      def initialize(tag_name, post, tokens)
-        super
-        @orig_post = post.strip
-        begin
-          @post = PostComparer.new(@orig_post)
-        rescue
-          raise ArgumentError.new <<-eos
-Could not parse name of post "#{@orig_post}" in tag 'post_url'.
-
-Make sure the post exists and the name is correct.
-eos
-        end
-      end
-
-      def render(context)
-        site = context.registers[:site]
-
-        site.posts.each do |p|
-          if @post == p
-            return p.url
-          end
-        end
-
-        # New matching method did not match, fall back to old method
-        # with deprecation warning if this matches
-
-        site.posts.each do |p|
-          if @post.deprecated_equality p
-            Jekyll::Deprecator.deprecation_message "A call to '{{ post_url #{name} }}' did not match " +
-              "a post using the new matching method of checking name " +
-              "(path-date-slug) equality. Please make sure that you " +
-              "change this tag to match the post's name exactly."
-            return p.url
-          end
-        end
-
-        raise ArgumentError.new <<-eos
-Could not find post "#{@orig_post}" in tag 'post_url'.
-
-Make sure the post exists and the name is correct.
-eos
-      end
-    end
-  end
-end
-
-Liquid::Template.register_tag('post_url', Jekyll::Tags::PostUrl)