jekyll 0.7.0 → 0.8.0

data/History.txt

@@ -1,3 +1,16 @@
+== 0.8.0 / 2010-11-22
+  * Minor Enhancements
+    * Add wordpress.com importer (#207)
+    * Add --limit-posts cli option (#212)
+    * Add uri_escape filter (#234)
+    * Add --base-url cli option (#235)
+    * Improve MT migrator (#238)
+    * Add kramdown support (#239)
+  * Bug Fixes
+    * Fixed filename basename generation (#208)
+    * Set mode to UTF8 on Sequel connections (#237)
+    * Prevent _includes dir from being a symlink
+
 == 0.7.0 / 2010-08-24
   * Minor Enhancements
     * Add support for rdiscount extensions (#173)

data/bin/jekyll

@@ -40,6 +40,10 @@ opts = OptionParser.new do |opts|
     options['server_port'] = port unless port.nil?
   end
 
+  opts.on("--base-url [BASE_URL]", "Serve website from a given base URL (default '/'") do |baseurl|
+      options['baseurl'] = baseurl
+  end
+
   opts.on("--lsi", "Use LSI for better related posts") do
     options['lsi'] = true
   end
@@ -52,6 +56,10 @@ opts = OptionParser.new do |opts|
     options['markdown'] = 'rdiscount'
   end
 
+  opts.on("--kramdown", "Use kramdown gem for Markdown") do
+    options['markdown'] = 'kramdown'
+  end
+
   opts.on("--time [TIME]", "Time to generate the site for") do |time|
     options['time'] = Time.parse(time)
   end
@@ -78,6 +86,16 @@ opts = OptionParser.new do |opts|
     end
   end
 
+  opts.on("--limit_posts [MAX_POSTS]", "Limit the number of posts to publish") do |limit_posts|
+    begin
+      options['limit_posts'] = limit_posts.to_i
+      raise ArgumentError if options['limit_posts'] < 1
+    rescue
+      puts 'you must specify a number of posts by page bigger than 0'
+      exit 0
+    end
+  end
+
   opts.on("--url [URL]", "Set custom site.url") do |url|
     options['url'] = url
   end
@@ -166,9 +184,9 @@ if options['server']
 
   s = HTTPServer.new(
     :Port            => options['server_port'],
-    :DocumentRoot    => destination,
     :MimeTypes       => mime_types
   )
+  s.mount(options['baseurl'], HTTPServlet::FileHandler, destination)
   t = Thread.new {
     s.start
   }

data/features/create_sites.feature

@@ -89,6 +89,6 @@ Feature: Create sites
     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
+    When I debug jekyll
     Then the _site directory should exist
-    And I should see "Basic Site with include tag: Generated by Jekyll" in "_site/index.html"
+    And I should see "Basic Site with include tag: Generated by Jekyll" in "_site/index.html"

data/features/site_configuration.feature

@@ -48,6 +48,13 @@ Feature: Site configuration
     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
+    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"
@@ -101,3 +108,19 @@ Feature: Site configuration
     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: 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  | 3/27/2009 | An article about apples |
+      | Oranges | 4/1/2009  | An article about oranges |
+      | Bananas | 4/5/2009  | An article about bananas |
+    When I run jekyll
+    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

data/jekyll.gemspec

@@ -4,8 +4,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'jekyll'
-  s.version           = '0.7.0'
-  s.date              = '2010-08-24'
+  s.version           = '0.8.0'
+  s.date              = '2010-11-22'
   s.rubyforge_project = 'jekyll'
 
   s.summary     = "A simple, blog aware, static site generator."
@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('rr', [">= 4.2.1"])
   s.add_development_dependency('cucumber', [">= 4.2.1"])
   s.add_development_dependency('RedCloth', [">= 4.2.1"])
+  s.add_development_dependency('kramdown', [">= 0.12.0"])
 
   # = MANIFEST =
   s.files = %w[
@@ -71,6 +72,7 @@ Gem::Specification.new do |s|
     lib/jekyll/migrators/mt.rb
     lib/jekyll/migrators/textpattern.rb
     lib/jekyll/migrators/typo.rb
+    lib/jekyll/migrators/wordpress.com.rb
     lib/jekyll/migrators/wordpress.rb
     lib/jekyll/page.rb
     lib/jekyll/plugin.rb
@@ -80,6 +82,7 @@ Gem::Specification.new do |s|
     lib/jekyll/tags/highlight.rb
     lib/jekyll/tags/include.rb
     test/helper.rb
+    test/source/.htaccess
     test/source/_includes/sig.markdown
     test/source/_layouts/default.html
     test/source/_layouts/simple.html
@@ -110,6 +113,7 @@ Gem::Specification.new do |s|
     test/source/category/_posts/2008-9-23-categories.textile
     test/source/contacts.html
     test/source/css/screen.css
+    test/source/deal.with.dots.html
     test/source/foo/_posts/bar/2008-12-12-topical-post.textile
     test/source/index.html
     test/source/sitemap.xml
@@ -120,6 +124,7 @@ Gem::Specification.new do |s|
     test/test_core_ext.rb
     test/test_filters.rb
     test/test_generated_site.rb
+    test/test_kramdown.rb
     test/test_page.rb
     test/test_pager.rb
     test/test_post.rb

data/lib/jekyll.rb

@@ -45,7 +45,7 @@ require_all 'jekyll/generators'
 require_all 'jekyll/tags'
 
 module Jekyll
-  VERSION = '0.7.0'
+  VERSION = '0.8.0'
 
   # Default options. Overriden by values in _config.yml or command-line opts.
   # (Strings rather symbols used for compatability with YAML).
@@ -74,6 +74,22 @@ module Jekyll
     },
     'rdiscount'    => {
       'extensions' => []
+    },
+    'kramdown'        => {
+      'auto_ids'      => true,
+      'footnote_nr'   => 1,
+      'entity_output' => 'as_char',
+      'toc_levels'    => '1..6',
+      'use_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'
+      }
     }
   }
 

data/lib/jekyll/converters/markdown.rb

@@ -10,6 +10,14 @@ module Jekyll
       return if @setup
       # Set the Markdown interpreter (and Maruku self.config, if necessary)
       case @config['markdown']
+        when 'kramdown'
+          begin
+            require 'kramdown'
+          rescue LoadError
+            STDERR.puts 'You are missing a library required for Markdown. Please run:'
+            STDERR.puts '  $ [sudo] gem install kramdown'
+            raise FatalException.new("Missing dependency: kramdown")
+          end
         when 'rdiscount'
           begin
             require 'rdiscount'
@@ -52,7 +60,7 @@ module Jekyll
           end
         else
           STDERR.puts "Invalid Markdown processor: #{@config['markdown']}"
-          STDERR.puts "  Valid options are [ maruku | rdiscount ]"
+          STDERR.puts "  Valid options are [ maruku | rdiscount | kramdown ]"
           raise FatalException.new("Invalid Markdown process: #{@config['markdown']}")
       end
       @setup = true
@@ -69,6 +77,31 @@ module Jekyll
     def convert(content)
       setup
       case @config['markdown']
+        when 'kramdown'
+          # Check for use of coderay
+          if @config['kramdown']['use_coderay']
+            Kramdown::Document.new(content, {
+              :auto_ids      => @config['kramdown']['auto_ids'],
+              :footnote_nr   => @config['kramdown']['footnote_nr'],
+              :entity_output => @config['kramdown']['entity_output'],
+              :toc_levels    => @config['kramdown']['toc_levels'],
+
+              :coderay_wrap               => @config['kramdown']['coderay']['coderay_wrap'],
+              :coderay_line_numbers       => @config['kramdown']['coderay']['coderay_line_numbers'],
+              :coderay_line_number_start  => @config['kramdown']['coderay']['coderay_line_number_start'],
+              :coderay_tab_width          => @config['kramdown']['coderay']['coderay_tab_width'],
+              :coderay_bold_every         => @config['kramdown']['coderay']['coderay_bold_every'],
+              :coderay_css                => @config['kramdown']['coderay']['coderay_css']
+            }).to_html
+          else
+            # not using coderay
+            Kramdown::Document.new(content, {
+              :auto_ids      => @config['kramdown']['auto_ids'],
+              :footnote_nr   => @config['kramdown']['footnote_nr'],
+              :entity_output => @config['kramdown']['entity_output'],
+              :toc_levels    => @config['kramdown']['toc_levels']
+            }).to_html
+          end
         when 'rdiscount'
           RDiscount.new(content, *@rdiscount_extensions).to_html
         when 'maruku'

data/lib/jekyll/filters.rb

@@ -1,3 +1,5 @@
+require 'uri'
+
 module Jekyll
 
   module Filters
@@ -25,6 +27,10 @@ module Jekyll
       CGI::escape(input)
     end
 
+    def uri_escape(input)
+      URI.escape(input)
+    end
+
     def number_of_words(input)
       input.split.length
     end

data/lib/jekyll/migrators/mephisto.rb

@@ -40,7 +40,7 @@ module Jekyll
     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)
+      db = Sequel.mysql(dbname, :user => user, :password => pass, :host => host, :encoding => 'utf8')
 
       FileUtils.mkdir_p "_posts"
 

data/lib/jekyll/migrators/mt.rb

@@ -5,6 +5,7 @@
 require 'rubygems'
 require 'sequel'
 require 'fileutils'
+require 'yaml'
 
 # NOTE: This converter requires Sequel and the MySQL gems.
 # The MySQL gem can be difficult to install on OS X. Once you have MySQL
@@ -17,19 +18,20 @@ module Jekyll
     # 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"
+    QUERY = "SELECT entry_id, entry_basename, entry_text, entry_text_more, entry_authored_on, entry_title, entry_convert_breaks FROM mt_entry"
 
     def self.process(dbname, user, pass, host = 'localhost')
-      db = Sequel.mysql(dbname, :user => user, :password => pass, :host => host)
+      db = Sequel.mysql(dbname, :user => user, :password => pass, :host => host, :encoding => 'utf8')
 
       FileUtils.mkdir_p "_posts"
 
       db[QUERY].each do |post|
         title = post[:entry_title]
-        slug = post[:entry_basename]
-        date = post[:entry_created_on]
+        slug = post[:entry_basename].gsub(/_/, '-')
+        date = post[:entry_authored_on]
         content = post[:entry_text]
         more_content = post[:entry_text_more]
+        entry_convert_breaks = post[:entry_convert_breaks]
 
         # Be sure to include the body and extended body.
         if more_content != nil
@@ -39,12 +41,13 @@ module Jekyll
         # 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"
+        name = [date.year, date.month, date.day, slug].join('-') + '.' + self.suffix(entry_convert_breaks)
 
         data = {
            'layout' => 'post',
            'title' => title.to_s,
            'mt_id' => post[:entry_id],
+           'date' => date
          }.delete_if { |k,v| v.nil? || v == ''}.to_yaml
 
         File.open("_posts/#{name}", "w") do |f|
@@ -53,7 +56,22 @@ module Jekyll
           f.puts content
         end
       end
+    end
 
+    def self.suffix(entry_type)
+      if entry_type.nil? || entry_type.include?("markdown")
+          # The markdown plugin I have saves this as "markdown_with_smarty_pants", so I just look for "markdown".
+          "markdown"
+        elsif entry_type.include?("textile")
+          # This is saved as "textile_2" on my installation of MT 5.1.
+          "textile"
+        elsif entry_type == "0" || entry_type.include?("richtext")
+          # richtext looks to me like it's saved as HTML, so I include it here.
+          "html"
+        else
+          # Other values might need custom work.
+          entry_type
+      end
     end
   end
 end

data/lib/jekyll/migrators/textpattern.rb

@@ -17,7 +17,7 @@ module Jekyll
     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)
+      db = Sequel.mysql(dbname, :user => user, :password => pass, :host => host, :encoding => 'utf8')
 
       FileUtils.mkdir_p "_posts"
 

data/lib/jekyll/migrators/typo.rb

@@ -22,7 +22,7 @@ module Jekyll
 
     def self.process dbname, user, pass, host='localhost'
       FileUtils.mkdir_p '_posts'
-      db = Sequel.mysql dbname, :user => user, :password => pass, :host => host
+      db = Sequel.mysql(dbname, :user => user, :password => pass, :host => host, :encoding => 'utf8')
       db[SQL].each do |post|
         next unless post[:state] =~ /Published/
 

data/lib/jekyll/migrators/wordpress.com.rb

@@ -0,0 +1,38 @@
+require 'rubygems'
+require 'hpricot'
+require 'fileutils'
+
+# This importer takes a wordpress.xml file,
+# which can be exported from your 
+# wordpress.com blog (/wp-admin/export.php)
+
+module Jekyll
+  module WordpressDotCom
+    def self.process(filename = "wordpress.xml")
+      FileUtils.mkdir_p "_posts"
+      posts = 0
+
+			doc = Hpricot::XML(File.read(filename))
+			
+			(doc/:channel/:item).each do |item|
+				title = item.at(:title).inner_text
+				name = "#{Date.parse((doc/:channel/:item).first.at(:pubDate).inner_text).to_s("%Y-%m-%d")}-#{title.downcase.gsub('[^a-z0-9]', '-')}.html"
+				
+				File.open("_posts/#{name}", "w") do |f|
+          f.puts <<-HEADER
+---
+layout: post
+title: #{title}
+---
+ 
+HEADER
+          f.puts item.at('content:encoded').inner_text
+        end
+
+				posts += 1
+			end
+
+			"Imported #{posts} posts"
+    end
+  end
+end

data/lib/jekyll/migrators/wordpress.rb

@@ -19,7 +19,7 @@ module Jekyll
     QUERY = "select post_title, post_name, post_date, post_content, post_excerpt, ID, guid 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)
+      db = Sequel.mysql(dbname, :user => user, :password => pass, :host => host, :encoding => 'utf8')
 
       FileUtils.mkdir_p "_posts"
 

data/lib/jekyll/page.rb

@@ -71,7 +71,7 @@ module Jekyll
     # Returns nothing
     def process(name)
       self.ext = File.extname(name)
-      self.basename = name.split('.')[0..-2].first
+      self.basename = name[0 .. -self.ext.length-1]
     end
 
     # Add any necessary layouts to this post

data/lib/jekyll/site.rb

@@ -3,7 +3,8 @@ module Jekyll
   class Site
     attr_accessor :config, :layouts, :posts, :pages, :static_files,
                   :categories, :exclude, :source, :dest, :lsi, :pygments,
-                  :permalink_style, :tags, :time, :future, :safe, :plugins
+                  :permalink_style, :tags, :time, :future, :safe, :plugins, :limit_posts
+
     attr_accessor :converters, :generators
 
     # Initialize the site
@@ -22,6 +23,7 @@ module Jekyll
       self.permalink_style = config['permalink'].to_sym
       self.exclude         = config['exclude'] || []
       self.future          = config['future']
+      self.limit_posts     = config['limit_posts'] || nil
 
       self.reset
       self.setup
@@ -39,6 +41,8 @@ module Jekyll
       self.static_files    = []
       self.categories      = Hash.new { |hash, key| hash[key] = [] }
       self.tags            = Hash.new { |hash, key| hash[key] = [] }
+
+      raise ArgumentError, "Limit posts must be nil or >= 1" if !self.limit_posts.nil? && self.limit_posts < 1
     end
 
     def setup
@@ -122,6 +126,9 @@ module Jekyll
       end
 
       self.posts.sort!
+
+      # limit the posts if :limit_posts option is set
+      self.posts = self.posts[-limit_posts, limit_posts] if limit_posts
     end
 
     def generate

data/lib/jekyll/tags/include.rb

@@ -7,11 +7,17 @@ module Jekyll
     end
 
     def render(context)
+      includes_dir = File.join(context.registers[:site].source, '_includes')
+
+      if File.symlink?(includes_dir)
+        return "Includes directory '#{includes_dir}' cannot be a symlink"
+      end
+
       if @file !~ /^[a-zA-Z0-9_\/\.-]+$/ || @file =~ /\.\// || @file =~ /\/\./
         return "Include file '#{@file}' contains invalid characters or sequences"
       end
 
-      Dir.chdir(File.join(context.registers[:site].source, '_includes')) do
+      Dir.chdir(includes_dir) do
         choices = Dir['**/*'].reject { |x| File.symlink?(x) }
         if choices.include?(@file)
           source = File.read(@file)

data/test/helper.rb

@@ -5,6 +5,7 @@ require File.join(File.dirname(__FILE__), *%w[.. lib jekyll])
 
 require 'RedCloth'
 require 'rdiscount'
+require 'kramdown'
 
 require 'test/unit'
 require 'redgreen'

data/test/source/.htaccess

@@ -0,0 +1,8 @@
+---
+layout: nil
+---
+ErrorDocument 404 /404.html
+ErrorDocument 500 /500.html
+{% for post in site.posts %}
+  # {{ post.url }}
+{% endfor %}

data/test/source/deal.with.dots.html

@@ -0,0 +1,7 @@
+---
+title: Deal with dots
+permalink: /deal.with.dots/
+---
+
+Let's test if jekyll deals properly with dots.
+

data/test/test_filters.rb

@@ -45,5 +45,9 @@ class TestFilters < Test::Unit::TestCase
     should "escape special characters" do
       assert_equal "hey%21", @filter.cgi_escape("hey!")
     end
+
+    should "escape space as %20" do
+      assert_equal "my%20things", @filter.uri_escape("my things")
+    end
   end
 end

data/test/test_generated_site.rb

@@ -41,4 +41,32 @@ class TestGeneratedSite < Test::Unit::TestCase
       assert File.exists?(dest_dir('/contacts.html'))
     end
   end
+
+  context "generating limited posts" do
+    setup do
+      clear_dest
+      stub(Jekyll).configuration do
+        Jekyll::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'limit_posts' => 5})
+      end
+
+      @site = Site.new(Jekyll.configuration)
+      @site.process
+      @index = File.read(dest_dir('index.html'))
+    end
+
+    should "generate only the specified number of posts" do
+      assert_equal 5, @site.posts.size
+    end
+
+    should "ensure limit posts is 1 or more" do
+      assert_raise ArgumentError do
+        clear_dest
+        stub(Jekyll).configuration do
+          Jekyll::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'limit_posts' => 0})
+        end
+
+        @site = Site.new(Jekyll.configuration)
+      end
+    end
+  end
 end

data/test/test_kramdown.rb

@@ -0,0 +1,23 @@
+require File.dirname(__FILE__) + '/helper'
+
+class TestKramdown < Test::Unit::TestCase
+  context "kramdown" do
+    setup do
+      config = {
+        'markdown' => 'kramdown',
+        'kramdown' => {
+          'auto_ids'      => false,
+          'footnote_nr'   => 1,
+          'entity_output' => 'as_char',
+          'toc_levels'    => '1..6'
+        }
+      }
+      @markdown = MarkdownConverter.new config
+    end
+
+    # http://kramdown.rubyforge.org/converter/html.html#options
+    should "pass kramdown options" do
+      assert_equal "<h1>Some Header</h1>", @markdown.convert('# Some Header #').strip
+    end
+  end
+end

data/test/test_page.rb

@@ -16,13 +16,23 @@ class TestPage < Test::Unit::TestCase
       stub(Jekyll).configuration { Jekyll::DEFAULTS }
       @site = Site.new(Jekyll.configuration)
     end
-    
+
     context "processing pages" do
       should "create url based on filename" do
         @page = setup_page('contacts.html')
         assert_equal "/contacts.html", @page.url
       end
 
+      should "deal properly with extensions" do
+        @page = setup_page('deal.with.dots.html')
+        assert_equal ".html", @page.ext
+      end
+
+      should "deal properly with dots" do
+        @page = setup_page('deal.with.dots.html')
+        assert_equal "deal.with.dots", @page.basename
+      end
+
       context "with pretty url style" do
         setup do
           @site.permalink_style = :pretty
@@ -61,7 +71,7 @@ class TestPage < Test::Unit::TestCase
       setup do
         clear_dest
       end
-      
+
       should "write properly" do
         page = setup_page('contacts.html')
         do_render(page)
@@ -73,14 +83,14 @@ class TestPage < Test::Unit::TestCase
 
       should "write properly without html extension" do
         page = setup_page('contacts.html')
-        page.site.permalink_style = :pretty 
+        page.site.permalink_style = :pretty
         do_render(page)
         page.write(dest_dir)
 
         assert File.directory?(dest_dir)
         assert File.exists?(File.join(dest_dir, 'contacts', 'index.html'))
       end
-      
+
       should "write properly with extension different from html" do
         page = setup_page("sitemap.xml")
         page.site.permalink_style = :pretty
@@ -92,7 +102,16 @@ class TestPage < Test::Unit::TestCase
         assert File.directory?(dest_dir)
         assert File.exists?(File.join(dest_dir,'sitemap.xml'))
       end
+
+      should "write dotfiles properly" do
+        page = setup_page('.htaccess')
+        do_render(page)
+        page.write(dest_dir)
+
+        assert File.directory?(dest_dir)
+        assert File.exists?(File.join(dest_dir, '.htaccess'))
+      end
     end
 
-  end 
+  end
 end

data/test/test_tags.rb

@@ -112,5 +112,16 @@ CONTENT
         assert_match %r{<em>FINISH HIM</em>}, @result
       end
     end
+
+    context "using Kramdown" do
+      setup do
+        create_post(@content, 'markdown' => 'kramdown')
+      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,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jekyll
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 63
   prerelease: false
   segments: 
   - 0
-  - 7
+  - 8
   - 0
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-24 00:00:00 -07:00
+date: 2010-11-22 00:00:00 -08:00
 default_executable: jekyll
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -162,6 +162,22 @@ dependencies:
         version: 4.2.1
   type: :development
   version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: kramdown
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 47
+        segments: 
+        - 0
+        - 12
+        - 0
+        version: 0.12.0
+  type: :development
+  version_requirements: *id010
 description: Jekyll is a simple, blog aware, static site generator.
 email: tom@mojombo.com
 executables: 
@@ -207,6 +223,7 @@ files:
 - lib/jekyll/migrators/mt.rb
 - lib/jekyll/migrators/textpattern.rb
 - lib/jekyll/migrators/typo.rb
+- lib/jekyll/migrators/wordpress.com.rb
 - lib/jekyll/migrators/wordpress.rb
 - lib/jekyll/page.rb
 - lib/jekyll/plugin.rb
@@ -216,6 +233,7 @@ files:
 - lib/jekyll/tags/highlight.rb
 - lib/jekyll/tags/include.rb
 - test/helper.rb
+- test/source/.htaccess
 - test/source/_includes/sig.markdown
 - test/source/_layouts/default.html
 - test/source/_layouts/simple.html
@@ -246,6 +264,7 @@ files:
 - test/source/category/_posts/2008-9-23-categories.textile
 - test/source/contacts.html
 - test/source/css/screen.css
+- test/source/deal.with.dots.html
 - test/source/foo/_posts/bar/2008-12-12-topical-post.textile
 - test/source/index.html
 - test/source/sitemap.xml
@@ -256,6 +275,7 @@ files:
 - test/test_core_ext.rb
 - test/test_filters.rb
 - test/test_generated_site.rb
+- test/test_kramdown.rb
 - test/test_page.rb
 - test/test_pager.rb
 - test/test_post.rb
@@ -301,6 +321,7 @@ test_files:
 - test/test_core_ext.rb
 - test/test_filters.rb
 - test/test_generated_site.rb
+- test/test_kramdown.rb
 - test/test_page.rb
 - test/test_pager.rb
 - test/test_post.rb