mojombo-jekyll 0.5.0 → 0.5.1

data/History.txt

@@ -1,3 +1,15 @@
+== 0.5.1
+  * Major Enhancements
+    * Next/previous posts in site payload [github.com/pantulis, github.com/tomo]
+    * Permalink templating system
+    * Moved most of the README out to the GitHub wiki
+    * Exclude option in configuration so specified files won't be brought over with generated site [github.com/duritong]
+  * Bug Fixes
+    * Making sure config.yaml references are all gone, using only config.yml
+    * Fixed syntax highlighting breaking for UTF-8 code [github.com/henrik]
+    * Worked around RDiscount bug that prevents Markdown from getting parsed after highlight [github.com/henrik]
+    * CGI escaped post titles [github.com/Chrononaut]
+
 == 0.5.0 / 2009-04-07
   * Minor Enhancements
     * Ability to set post categories via YAML [github.com/qrush]

data/README.textile

@@ -1,523 +1,32 @@
 h1. Jekyll
 
-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.
+By Tom Preston-Werner, Nick Quaranto, and many awesome contributors!
 
-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.
+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. This is also the engine behind "GitHub Pages":http://pages.github.com, which you can use to host your project's page or blog right here from GitHub.
 
-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.
+h2. Getting Started
 
-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>.
+* "Install":http://wiki.github.com/mojombo/jekyll/install the gem
+* Read up about its "Usage":http://wiki.github.com/mojombo/jekyll/usage and "Configuration":http://wiki.github.com/mojombo/jekyll/configuration
+* Take a gander at some existing "Sites":http://wiki.github.com/mojombo/jekyll/sites
+* Fork and "Contribute":http://wiki.github.com/mojombo/jekyll/contribute your own modifications
 
-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.
+h2. Diving In
 
-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>.
+* "Migrate":http://wiki.github.com/mojombo/jekyll/blog-migrations from your previous system
+* Learn how the "YAML Front Matter":http://wiki.github.com/mojombo/jekyll/yaml-front-matter works
+* Put information on your site with "Template Data":http://wiki.github.com/mojombo/jekyll/template-data
+* Customize the "Permalinks":http://wiki.github.com/mojombo/jekyll/permalinks your posts are generated with
+* Use the built-in "Liquid Extensions":http://wiki.github.com/mojombo/jekyll/liquid-extensions to make your life easier
 
-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.
+h2. Dependencies
 
-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
-
-h3. Autobuild
-
-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
-
-h3. Related Posts
-
-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
-
-h3. Code Highlighting
-
-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
-
-h3. Markdown Processor
-
-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
-
-h3. Local Server
-
-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]
-
-h3. Permalink Style
-
-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.
-
-If you want WordPress-style pretty URLs that leave off the .html, you can
-change the permalink style to 'pretty' and directories corresponding to the
-date parts and post name will be made and an index.html will be placed in the
-leaf directory resulting in URLs like 2008/11/17/blogging-like-a-hacker/.
-
-  $ jekyll --permalink [date|none|pretty]
-
-h2. Configuration File
-
-All of the options listed above can be specified on a site-by-site basis in
-a '_config.yml' file at the root of the site's source. As the filename
-suggests, the configuration is given in "YAML":http://www.yaml.org/. As
-well as all of the options discussed in the last section, there are a few
-additional options:
-
-  destination: [PATH]           # Specify where the site should be rendered
-  markdown: [maruku|rdiscount]  # Which markdown renderer to use?
-
-  maruku:               # This is a YAML hash for Maruku settings
-    use_divs: [BOOLEAN] # Use the div element Maruku extension
-    use_tex:  [BOOLEAN] # Use the LaTeX extension to Maruku
-    png_dir:  [PATH]    # Where should the math PNGs be stored?
-    png_url:  [URL]     # A relative URL for the PNGs
-
-The default configuration is shown below as in YAML format: 
-
-  destination: ./_site
-  auto:        false
-  lsi:         false
-  server_port: 4000
-  pygments:    false
-  markdown:    maruku
-  permalink:   date
-
-  maruku:
-    use_tex:    false
-    use_divs:   false
-    png_dir:    images/latex
-    png_url:    /images/latex
-
-Parameters set in a configuration file override the default values. Parameters
-set using command line options override both the default values and those set
-in a configuration file.
-
-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
+* RedCloth 4.1.0: Textile support. This version obeys <notextile> tags. The latest version will still work, but tests will fail.
+* Liquid: Templating system
+* Classifier: Generating related posts
+* Maruku: Default markdown engine
+* Directory Watcher: Auto-regeneration of sites
+* Open4: Talking to pygments for syntax highlighting
 
 h2. License
 
@@ -525,21 +34,8 @@ h2. 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:
+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 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.
+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.

data/Rakefile

@@ -15,7 +15,7 @@ begin
     s.rubyforge_project = "jekyll"
     s.files.exclude 'test/dest'
     s.test_files.exclude 'test/dest'
-    s.add_dependency('RedCloth', '>= 4.0.4')
+    s.add_dependency('RedCloth', '= 4.1.0')
     s.add_dependency('liquid', '>= 1.9.0')
     s.add_dependency('classifier', '>= 1.3.1')
     s.add_dependency('maruku', '>= 0.5.9')

data/VERSION.yml

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

data/bin/jekyll

@@ -10,7 +10,7 @@ Basic Command Line Usage:
   jekyll <path to write generated site>                    # . -> <path>
   jekyll <path to source> <path to write generated site>   # <path> -> <path>
 
-  Configuration is read from '<source>/_config.yaml' but can be overriden
+  Configuration is read from '<source>/_config.yml' but can be overriden
   using the following options:
 
 HELP
@@ -137,4 +137,4 @@ if options['server']
 
   trap("INT") { s.shutdown }
   t.join()
-end
+end

data/lib/jekyll.rb

@@ -27,7 +27,7 @@ require 'jekyll/tags/include'
 require 'jekyll/albino'
 
 module Jekyll
-  # Default options. Overriden by values in _config.yaml or command-line opts.
+  # Default options. Overriden by values in _config.yml or command-line opts.
   # (Strings rather symbols used for compatability with YAML)
   DEFAULTS = {
     'auto'         => false,
@@ -61,7 +61,7 @@ module Jekyll
     # then, we need to know where to look for _config.yml
     source = override['source'] || Jekyll::DEFAULTS['source']
 
-    # Get configuration from <source>/_config.yaml
+    # Get configuration from <source>/_config.yml
     config = {}
     config_file = File.join(source, '_config.yml')
     begin

data/lib/jekyll/albino.rb

@@ -56,7 +56,7 @@ class Albino
 
   def initialize(target, lexer = :text, format = :html)
     @target  = File.exists?(target) ? File.read(target) : target rescue target
-    @options = { :l => lexer, :f => format }
+    @options = { :l => lexer, :f => format, :O => 'encoding=utf-8' }
   end
 
   def execute(command)
@@ -71,7 +71,9 @@ class Albino
   end
 
   def colorize(options = {})
-    execute @@bin + convert_options(options)
+    html = execute(@@bin + convert_options(options))
+    # Work around an RDiscount bug: http://gist.github.com/97682
+    html.to_s.sub(%r{</pre></div>\Z}, "</pre>\n</div>")
   end
   alias_method :to_s, :colorize
 

data/lib/jekyll/filters.rb

@@ -18,7 +18,11 @@ module Jekyll
     end
 
     def xml_escape(input)
-      input.gsub("&", "&amp;").gsub("<", "&lt;").gsub(">", "&gt;")
+      CGI.escapeHTML(input)
+    end
+
+    def cgi_escape(input)
+      CGI::escape(input)
     end
 
     def number_of_words(input)

data/lib/jekyll/post.rb

@@ -18,9 +18,12 @@ module Jekyll
       name =~ MATCHER
     end
 
-    attr_accessor :site
-    attr_accessor :date, :slug, :ext, :categories, :topics, :published
-    attr_accessor :data, :content, :output
+    attr_accessor :site, :date, :slug, :ext, :topics, :published, :data, :content, :output
+    attr_writer :categories
+
+    def categories
+      @categories ||= []
+    end
 
     # Initialize this Post instance.
     #   +site+ is the Site
@@ -88,16 +91,7 @@ module Jekyll
     #
     # Returns <String>
     def dir
-      if permalink
-        permalink.to_s.split("/")[0..-2].join("/") + '/'
-      else
-        prefix = self.categories.empty? ? '' : '/' + self.categories.join('/')
-        if [:date, :pretty].include?(self.site.permalink_style)
-          prefix + date.strftime("/%Y/%m/%d/")
-        else
-          prefix + '/'
-        end
-      end
+      File.dirname(url)
     end
 
     # The full path and filename of the post.
@@ -109,13 +103,35 @@ module Jekyll
       self.data && self.data['permalink']
     end
 
+    def template
+      case self.site.permalink_style
+      when :pretty
+        "/:categories/:year/:month/:day/:title"
+      when :none
+        "/:categories/:title.html"
+      when :date
+        "/:categories/:year/:month/:day/:title.html"
+      else
+        self.site.permalink_style.to_s
+      end
+    end
+
     # The generated relative url of this post
     # e.g. /2008/11/05/my-awesome-post.html
     #
     # Returns <String>
     def url
-      ext = self.site.permalink_style == :pretty ? '' : '.html'
-      permalink || self.id + ext
+      return permalink if permalink
+
+      @url ||= {
+        "year"       => date.strftime("%Y"),
+        "month"      => date.strftime("%m"),
+        "day"        => date.strftime("%d"),
+        "title"      => CGI.escape(slug),
+        "categories" => categories.sort.join('/')
+      }.inject(template) { |result, token|
+        result.gsub(/:#{token.first}/, token.last)
+      }.gsub(/\/\//, "/")
     end
 
     # The UID for this post (useful in feeds)
@@ -123,7 +139,7 @@ module Jekyll
     #
     # Returns <String>
     def id
-      self.dir + self.slug
+      File.join(self.dir, self.slug)
     end
 
     # Calculate related posts.
@@ -172,9 +188,10 @@ module Jekyll
     def write(dest)
       FileUtils.mkdir_p(File.join(dest, dir))
 
-      path = File.join(dest, self.url)
+      # The url needs to be unescaped in order to preserve the correct filename
+      path = File.join(dest, CGI.unescape(self.url))
 
-      if self.site.permalink_style == :pretty
+      if template[/\.html$/].nil?
         FileUtils.mkdir_p(path)
         path = File.join(path, "index.html")
       end
@@ -194,12 +211,33 @@ module Jekyll
         "id" => self.id,
         "topics" => self.topics,
         "categories" => self.categories,
+        "next" => self.next,
+        "previous" => self.previous,
         "content" => self.content }.deep_merge(self.data)
     end
 
     def inspect
       "<Post: #{self.id}>"
     end
+
+    def next
+      pos = self.site.posts.index(self)
+
+      if pos && pos < self.site.posts.length-1
+        self.site.posts[pos+1]
+      else
+        nil
+      end
+    end
+
+    def previous
+      pos = self.site.posts.index(self)
+      if pos && pos > 0
+        self.site.posts[pos-1]
+      else
+        nil
+      end
+    end
   end
 
 end

data/lib/jekyll/site.rb

@@ -1,7 +1,7 @@
 module Jekyll
 
   class Site
-    attr_accessor :config, :layouts, :posts, :categories
+    attr_accessor :config, :layouts, :posts, :categories, :exclude
     attr_accessor :source, :dest, :lsi, :pygments, :permalink_style
 
     # Initialize the site
@@ -16,6 +16,7 @@ module Jekyll
       self.lsi             = config['lsi']
       self.pygments        = config['pygments']
       self.permalink_style = config['permalink'].to_sym
+      self.exclude         = config['exclude'] || []
 
       self.reset
       self.setup
@@ -41,7 +42,6 @@ module Jekyll
               RDiscount.new(content).to_html
             end
 
-            puts 'Using rdiscount for Markdown'
           rescue LoadError
             puts 'You must have the rdiscount gem installed first'
           end
@@ -130,12 +130,13 @@ module Jekyll
         end
       end
 
+      self.posts.sort!
+
       # second pass renders each post now that full site payload is available
       self.posts.each do |post|
         post.render(self.layouts, site_payload)
       end
 
-      self.posts.sort!
       self.categories.values.map { |cats| cats.sort! { |a, b| b <=> a} }
     rescue Errno::ENOENT => e
       # ignore missing layout dir
@@ -228,11 +229,9 @@ module Jekyll
     def filter_entries(entries)
       entries = entries.reject do |e|
         unless ['_posts', '.htaccess'].include?(e)
-          # Reject backup/hidden
-          ['.', '_', '#'].include?(e[0..0]) or e[-1..-1] == '~'
+          ['.', '_', '#'].include?(e[0..0]) || e[-1..-1] == '~' || self.exclude.include?(e)
         end
       end
     end
-
   end
 end

data/lib/jekyll/tags/highlight.rb

@@ -30,9 +30,9 @@ module Jekyll
     end
 
     def render_pygments(context, code)
-      if context["content_type"] == :markdown
+      if context["content_type"] == "markdown"
         return "\n" + Albino.new(code, @lang).to_s(@options) + "\n"
-      elsif context["content_type"] == :textile
+      elsif context["content_type"] == "textile"
         return "<notextile>" + Albino.new(code, @lang).to_s(@options) + "</notextile>"
       else
         return Albino.new(code, @lang).to_s(@options)

data/test/helper.rb

@@ -1,3 +1,6 @@
+require 'rubygems'
+gem 'RedCloth', '= 4.1.0'
+
 require File.join(File.dirname(__FILE__), *%w[.. lib jekyll])
 
 require 'test/unit'

data/test/source/_posts/2009-03-12-hash-#1.markdown

@@ -0,0 +1,6 @@
+---
+layout: default
+title: Hash #1
+---
+
+Hashes are nice

data/test/test_filters.rb

@@ -37,5 +37,13 @@ class TestFilters < Test::Unit::TestCase
       assert_equal "AT&amp;T", @filter.xml_escape("AT&T")
       assert_equal "&lt;code&gt;command &amp;lt;filename&amp;gt;&lt;/code&gt;", @filter.xml_escape("<code>command &lt;filename&gt;</code>")
     end
+
+    should "escape space as plus" do
+      assert_equal "my+things", @filter.cgi_escape("my things")
+    end
+
+    should "escape special characters" do
+      assert_equal "hey%21", @filter.cgi_escape("hey!")
+    end
   end
 end

data/test/test_generated_site.rb

@@ -18,7 +18,7 @@ class TestGeneratedSite < Test::Unit::TestCase
     end
 
     should "render post.content" do
-      latest_post = Dir[source_dir('_posts', '*')].last
+      latest_post = Dir[source_dir('_posts', '*')].sort.last
       post = Post.new(@site, source_dir, '', File.basename(latest_post))
       post.transform
       assert @index.include?(post.content)

data/test/test_post.rb

@@ -25,6 +25,7 @@ class TestPost < Test::Unit::TestCase
       assert !Post.valid?("blah")
     end
 
+
     context "processing posts" do
       setup do
         @post = Post.allocate
@@ -41,6 +42,8 @@ class TestPost < Test::Unit::TestCase
         assert_equal Time.parse("2008-10-19"), @post.date
         assert_equal "foo-bar", @post.slug
         assert_equal ".textile", @post.ext
+        assert_equal "/2008/10/19", @post.dir
+        assert_equal "/2008/10/19/foo-bar", @post.id
       end
 
       should "create url based on date and title" do
@@ -49,16 +52,101 @@ class TestPost < Test::Unit::TestCase
         assert_equal "/2008/10/19/foo-bar.html", @post.url
       end
 
-      should "respect permalink" do
+      should "CGI escape urls" do
+        @post.categories = []
+        @post.process("2009-03-12-hash-#1.markdown")
+        assert_equal "/2009/03/12/hash-%231.html", @post.url
+        assert_equal "/2009/03/12/hash-#1", @post.id
+      end
+
+      should "respect permalink in yaml front matter" do
         file = "2008-12-03-permalinked-post.textile"
         @post.process(file)
         @post.read_yaml(@source, file)
 
         assert_equal "my_category/permalinked-post", @post.permalink
-        assert_equal "my_category/", @post.dir
+        assert_equal "my_category", @post.dir
         assert_equal "my_category/permalinked-post", @post.url
       end
 
+      context "with site wide permalink" do
+        setup do
+          @post.categories = []
+        end
+
+        context "with unspecified (date) style" do
+          setup do
+            @post.process(@fake_file)
+          end
+
+          should "process the url correctly" do
+            assert_equal "/:categories/:year/:month/:day/:title.html", @post.template
+            assert_equal "/2008/10/19/foo-bar.html", @post.url
+          end
+        end
+
+        context "with unspecified (date) style and a category" do
+          setup do
+            @post.categories << "beer"
+            @post.process(@fake_file)
+          end
+
+          should "process the url correctly" do
+            assert_equal "/:categories/:year/:month/:day/:title.html", @post.template
+            assert_equal "/beer/2008/10/19/foo-bar.html", @post.url
+          end
+        end
+
+        context "with unspecified (date) style and categories" do
+          setup do
+            @post.categories << "food"
+            @post.categories << "beer"
+            @post.process(@fake_file)
+          end
+
+          should "process the url correctly" do
+            assert_equal "/:categories/:year/:month/:day/:title.html", @post.template
+            assert_equal "/beer/food/2008/10/19/foo-bar.html", @post.url
+          end
+        end
+
+        context "with none style" do
+          setup do
+            @post.site.permalink_style = :none
+            @post.process(@fake_file)
+          end
+
+          should "process the url correctly" do
+            assert_equal "/:categories/:title.html", @post.template
+            assert_equal "/foo-bar.html", @post.url
+          end
+        end
+
+        context "with pretty style" do
+          setup do
+            @post.site.permalink_style = :pretty
+            @post.process(@fake_file)
+          end
+
+          should "process the url correctly" do
+            assert_equal "/:categories/:year/:month/:day/:title", @post.template
+            assert_equal "/2008/10/19/foo-bar", @post.url
+          end
+        end
+
+        context "with prefix style and no extension" do
+          setup do
+            @post.site.permalink_style = "/prefix/:title"
+            @post.process(@fake_file)
+          end
+
+          should "process the url correctly" do
+            assert_equal "/prefix/:title", @post.template
+            assert_equal "/prefix/foo-bar", @post.url
+          end
+        end
+      end
+
       should "read yaml front-matter" do
         @post.read_yaml(@source, @real_file)
 
@@ -75,6 +163,32 @@ class TestPost < Test::Unit::TestCase
       end
     end
 
+    context "when in a site" do
+      setup do
+        clear_dest
+        stub(Jekyll).configuration { Jekyll::DEFAULTS }
+        @site = Site.new(Jekyll.configuration)
+        @site.posts = [setup_post('2008-02-02-published.textile'),
+                       setup_post('2009-01-27-categories.textile')]
+      end
+
+      should "have next post" do
+        assert_equal(@site.posts.last, @site.posts.first.next)
+      end
+
+      should "have previous post" do
+        assert_equal(@site.posts.first, @site.posts.last.previous)
+      end
+
+      should "not have previous post if first" do
+        assert_equal(nil, @site.posts.first.previous)
+      end
+
+      should "not have next post if last" do
+        assert_equal(nil, @site.posts.last.next)
+      end
+    end
+
     context "initializing posts" do
       should "publish when published yaml is no specified" do
         post = setup_post("2008-02-02-published.textile")
@@ -118,6 +232,16 @@ class TestPost < Test::Unit::TestCase
           assert File.exists?(File.join(dest_dir, '2008', '10', '18', 'foo-bar.html'))
         end
 
+        should "write properly without html extension" do
+          post = setup_post("2008-10-18-foo-bar.textile")
+          post.site.permalink_style = ":title"
+          do_render(post)
+          post.write(dest_dir)
+
+          assert File.directory?(dest_dir)
+          assert File.exists?(File.join(dest_dir, 'foo-bar', 'index.html'))
+        end
+
         should "insert data" do
           post = setup_post("2008-11-21-complex.textile")
           do_render(post)

data/test/test_site.rb

@@ -53,5 +53,13 @@ class TestSite < Test::Unit::TestCase
       assert_equal %w[foo.markdown bar.markdown baz.markdown], @site.filter_entries(ent1)
       assert_equal ent2, @site.filter_entries(ent2)
     end
+
+    should "filter entries with exclude" do
+      excludes = %w[README TODO]
+      includes = %w[index.html site.css]
+
+      @site.exclude = excludes
+      assert_equal includes, @site.filter_entries(excludes + includes)
+    end
   end
 end

data/test/test_tags.rb

@@ -1,35 +1,116 @@
 require File.dirname(__FILE__) + '/helper'
 
 class TestTags < Test::Unit::TestCase
-  context "tagging" do
-    setup do
-      @content = <<CONTENT
+
+  def create_post(content, override = {}, markdown = true)
+    stub(Jekyll).configuration do
+      Jekyll::DEFAULTS.merge({'pygments' => true}).merge(override)
+    end
+    site = Site.new(Jekyll.configuration)
+    info = { :filters => [Jekyll::Filters], :registers => { :site => site } }
+
+    if markdown
+      payload = {"content_type" => "markdown"}
+    else
+      payload = {"content_type" => "textile"}
+    end
+
+    @result = Liquid::Template.parse(content).render(payload, info)
+
+    if markdown
+      @result = site.markdown(@result)
+    else
+      @result = site.textile(@result)
+    end
+  end
+
+  def fill_post(code, override = {})
+    content = <<CONTENT
 ---
-layout: post
 title: This is a test
-
 ---
+
 This document results in a markdown error with maruku
 
-{% highlight ruby %}
-puts "hi"
+{% highlight text %}
+#{code}
+{% endhighlight %}
+CONTENT
+    create_post(content, override)
+  end
+
+  context "post content has highlight tag" do
+    setup do
+      fill_post("test")
+    end
+
+    should "not cause a markdown error" do
+      assert_no_match /markdown\-html\-error/, @result
+    end
+
+    should "render markdown with pygments line handling" do
+      assert_match %{<pre>test\n</pre>}, @result
+    end
+  end
 
-puts "bye"
+  context "post content has highlight tag with UTF character" do
+    setup do
+      fill_post("Æ")
+    end
+
+    should "render markdown with pygments line handling" do
+      assert_match %{<pre>Æ\n</pre>}, @result
+    end
+  end
+
+  context "simple post with markdown and pre tags" do
+    setup do
+      @content = <<CONTENT
+---
+title: Maruku vs. RDiscount
+---
+
+_FIGHT!_
+
+{% highlight ruby %}
+puts "3..2..1.."
 {% endhighlight %}
 
+*FINISH HIM*
 CONTENT
     end
 
-    should "render markdown with pygments line handling" do
-      stub(Jekyll).configuration do
-        Jekyll::DEFAULTS.merge({'pygments' => true})
+    context "using Textile" do
+      setup do
+        create_post(@content, {}, false)
+      end
+
+      # Broken in RedCloth 4.1.9
+      should "not textilize highlight block" do
+        assert_no_match %r{3\.\.2\.\.1\.\.&quot;</span><br />}, @result
+      end
+    end
+
+    context "using Maruku" do
+      setup do
+        create_post(@content)
       end
-      site = Site.new(Jekyll.configuration)
-      info = { :filters => [Jekyll::Filters], :registers => { :site => site } }
 
-      result = Liquid::Template.parse(@content).render({}, info)
-      result = site.markdown(result)
-      assert_no_match(/markdown\-html\-error/,result)
+      should "parse correctly" do
+        assert_match %r{<em>FIGHT!</em>}, @result
+        assert_match %r{<em>FINISH HIM</em>}, @result
+      end
+    end
+
+    context "using RDiscount" do
+      setup do
+        create_post(@content, 'markdown' => 'rdiscount')
+      end
+
+      should "parse correctly" do
+        assert_match %r{<em>FIGHT!</em>}, @result
+        assert_match %r{<em>FINISH HIM</em>}, @result
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mojombo-jekyll
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-07 00:00:00 -07:00
+date: 2009-05-06 00:00:00 -07:00
 default_executable: jekyll
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -18,9 +18,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 4.0.4
+        version: 4.1.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: liquid
@@ -116,6 +116,7 @@ files:
 - test/source/_posts/2009-01-27-array-categories.textile
 - test/source/_posts/2009-01-27-categories.textile
 - test/source/_posts/2009-01-27-category.textile
+- test/source/_posts/2009-03-12-hash-#1.markdown
 - test/source/category/_posts/2008-9-23-categories.textile
 - test/source/css/screen.css
 - test/source/foo/_posts/bar/2008-12-12-topical-post.textile