PerfectlyNormal-jekyll 0.5.1 → 0.5.3

data/History.txt

@@ -1,4 +1,24 @@
-== 0.5.1
+== 0.5.3 / 2009-07-14
+  * Bug Fixes
+    * Solving the permalink bug where non-html files wouldn't work [github.com/jeffrydegrande]
+
+== 0.5.2 / 2009-06-24
+  * Enhancements
+    * Added --paginate option to the executable along with a paginator object for the payload [github.com/calavera]
+    * Upgraded RedCloth to 4.2.1, which makes <notextile> tags work once again.
+    * Configuration options set in config.yml are now available through the site payload [github.com/vilcans]
+    * Posts can now have an empty YAML front matter or none at all [github.com/bahuvrihi]
+  * Bug Fixes
+    * Fixing Ruby 1.9 issue that requires to_s on the err object [github.com/Chrononaut]
+    * Fixes for pagination and ordering posts on the same day [github.com/ujh]
+    * Made pages respect permalinks style and permalinks in yml front matter [github.com/eugenebolshakov]
+    * Index.html file should always have index.html permalink [github.com/eugenebolshakov]
+    * Added trailing slash to pretty permalink style so Apache is happy [github.com/eugenebolshakov]
+    * Bad markdown processor in config fails sooner and with better message [github.com/gcnovus]
+    * Allow CRLFs in yaml frontmatter [github.com/juretta]
+    * Added Date#xmlschema for Ruby versions < 1.9
+
+== 0.5.1 / 2009-05-06
   * Major Enhancements
     * Next/previous posts in site payload [github.com/pantulis, github.com/tomo]
     * Permalink templating system

data/README.textile

@@ -10,6 +10,7 @@ h2. Getting Started
 * 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
+* Have questions? Post them on the "Mailing List":http://groups.google.com/group/jekyll-rb
 
 h2. Diving In
 
@@ -21,7 +22,7 @@ h2. Diving In
 
 h2. Dependencies
 
-* RedCloth 4.1.0: Textile support. This version obeys @<notextile>@ tags. The latest version will still work, but tests will fail.
+* RedCloth: Textile support
 * Liquid: Templating system
 * Classifier: Generating related posts
 * Maruku: Default markdown engine

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.1.0')
+    s.add_dependency('RedCloth', '>= 4.2.1')
     s.add_dependency('liquid', '>= 1.9.0')
     s.add_dependency('classifier', '>= 1.3.1')
     s.add_dependency('maruku', '>= 0.5.9')
@@ -81,7 +81,7 @@ begin
   require 'cucumber/rake/task'
 
   Cucumber::Rake::Task.new(:features) do |t|
-    t.cucumber_opts = "--format pretty"
+    t.cucumber_opts = "--format progress"
   end
 rescue LoadError
   desc 'Cucumber rake task not available'

data/VERSION.yml

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

data/lib/jekyll.rb

@@ -63,14 +63,15 @@ module Jekyll
     source = override['source'] || Jekyll::DEFAULTS['source']
 
     # Get configuration from <source>/_config.yml
-    config = {}
     config_file = File.join(source, '_config.yml')
     begin
       config = YAML.load_file(config_file)
-      puts "Configuration from #{config_file}"
+      raise "Invalid configuration - #{config_file}" if !config.is_a?(Hash)
+      STDOUT.puts "Configuration from #{config_file}"
     rescue => err
-      puts "WARNING: Could not read configuration. Using defaults (and options)."
-      puts "\t" + err
+      STDERR.puts "WARNING: Could not read configuration. Using defaults (and options)."
+      STDERR.puts "\t" + err.to_s
+      config = {}
     end
 
     # Merge DEFAULTS < _config.yml < override

data/lib/jekyll/convertible.rb

@@ -17,12 +17,14 @@ module Jekyll
     # Returns nothing
     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]
-
+      
+      if self.content =~ /^(---\s*\n.*?\n?)(---.*?\n)/m
+        self.content = self.content[($1.size + $2.size)..-1]
+      
         self.data = YAML.load($1)
       end
+      
+      self.data ||= {}
     end
 
     # Transform the contents based on the file extension.

data/lib/jekyll/core_ext.rb

@@ -19,4 +19,12 @@ class Hash
 
     target
   end
-end
+end
+
+# Thanks, ActiveSupport!
+class Date
+  # Converts datetime to an appropriate format for use in XML
+  def xmlschema
+    strftime("%Y-%m-%dT%H:%M:%S%Z")
+  end if RUBY_VERSION < '1.9'
+end

data/lib/jekyll/page.rb

@@ -4,7 +4,7 @@ module Jekyll
     include Convertible
 
     attr_accessor :site
-    attr_accessor :ext
+    attr_accessor :name, :ext, :basename
     attr_accessor :data, :content, :output
 
     # Initialize a new Page.
@@ -17,14 +17,47 @@ module Jekyll
     def initialize(site, base, dir, name)
       @site = site
       @base = base
-      @dir = dir
+      @dir  = dir
       @name = name
 
-      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, set to '/'
+    #
+    # Returns <String>
+    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
+    # (Optional)
+    #
+    # Returns <String>
+    def permalink
+      self.data && self.data['permalink']
+    end
+
+    def template
+      if self.site.permalink_style == :pretty && !index?
+        "/:name/"
+      else
+        "/:name.html"
+      end
+    end
+
+    # The generated relative url of this page
+    # e.g. /about.html
+    #
+    # Returns <String>
+    def url
+      return permalink if permalink
+
+      @url ||= (ext == '.html') ? template.gsub(':name', basename) : "/#{name}"
     end
 
     # Extract information from the page filename
@@ -33,6 +66,7 @@ module Jekyll
     # Returns nothing
     def process(name)
       self.ext = File.extname(name)
+      self.basename = name.split('.')[0..-2].first
     end
 
     # Add any necessary layouts to this post
@@ -55,16 +89,24 @@ module Jekyll
       dest = File.join(dest, dest_suffix) if dest_suffix
       FileUtils.mkdir_p(dest)
 
-      name = @name
-      if self.ext != ""
-        name = @name.split(".")[0..-2].join('.') + self.ext
+      # The url needs to be unescaped in order to preserve the correct filename
+      path = File.join(dest, CGI.unescape(self.url))
+      if self.ext == '.html' && self.url[/\.html$/].nil?
+        FileUtils.mkdir_p(path)
+        path = File.join(path, "index.html")
       end
 
-      path = File.join(dest, name)
       File.open(path, 'w') do |f|
         f.write(self.output)
       end
     end
+
+    private
+
+      def index?
+        basename == 'index'
+      end
+
   end
 
-end
+end

data/lib/jekyll/pager.rb

@@ -0,0 +1,46 @@
+module Jekyll
+  class Pager
+    attr_reader :page, :per_page, :posts, :total_posts, :total_pages, :previous_page, :next_page
+
+    def self.calculate_pages(all_posts, per_page)
+      num_pages = all_posts.size / per_page.to_i
+      num_pages.abs + 1 if all_posts.size % per_page.to_i != 0
+      num_pages
+    end
+
+    def self.pagination_enabled?(config, file)
+      res = (file.to_s =~ /index.html/ && !config['paginate'].nil?)
+      res
+    end
+
+    def initialize(config, page, all_posts, num_pages = nil)
+      @page = page
+      @per_page = config['paginate'].to_i
+      @total_pages = num_pages || Pager.calculate_pages(all_posts, @per_page)
+
+      if @page > @total_pages
+        raise RuntimeError, "page number can't be greater than total pages: #{@page} > #{@total_pages}"
+      end
+
+      init = (@page - 1) * @per_page
+      offset = (init + @per_page - 1) >= all_posts.size ? all_posts.size : (init + @per_page - 1)
+
+      @total_posts = all_posts.size
+      @posts = all_posts[init..offset]
+      @previous_page = @page != 1 ? @page - 1 : nil
+      @next_page = @page != @total_pages ? @page + 1 : nil
+    end
+
+    def to_hash
+      {
+        'page' => page,
+        'per_page' => per_page,
+        'posts' => posts,
+        'total_posts' => total_posts,
+        'total_pages' => total_pages,
+        'previous_page' => previous_page,
+        'next_page' => next_page
+      }
+    end
+  end
+end

data/lib/jekyll/post.rb

@@ -18,7 +18,7 @@ module Jekyll
       name =~ MATCHER
     end
 
-    attr_accessor :site, :date, :slug, :ext, :topics, :published, :data, :content, :output
+    attr_accessor :site, :date, :slug, :ext, :published, :data, :content, :output, :tags
     attr_writer :categories
 
     def categories
@@ -38,10 +38,6 @@ module Jekyll
       @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)
 
@@ -51,6 +47,14 @@ module Jekyll
         self.published = true
       end
 
+      if self.data.has_key?("tag")
+        self.tags = [self.data["tag"]]
+      elsif self.data.has_key?("tags")
+        self.tags = self.data['tags']
+      else
+        self.tags = []
+      end
+
       if self.categories.empty?
         if self.data.has_key?('category')
           self.categories << self.data['category']
@@ -66,11 +70,15 @@ module Jekyll
       end
     end
 
-    # Spaceship is based on Post#date
+    # Spaceship is based on Post#date, slug
     #
     # Returns -1, 0, 1
     def <=>(other)
-      self.date <=> other.date
+      cmp = self.date <=> other.date
+      if 0 == cmp
+       cmp = self.slug <=> other.slug
+      end
+      return cmp
     end
 
     # Extract information from the post filename
@@ -106,7 +114,7 @@ module Jekyll
     def template
       case self.site.permalink_style
       when :pretty
-        "/:categories/:year/:month/:day/:title"
+        "/:categories/:year/:month/:day/:title/"
       when :none
         "/:categories/:title.html"
       when :date
@@ -128,7 +136,7 @@ module Jekyll
         "month"      => date.strftime("%m"),
         "day"        => date.strftime("%d"),
         "title"      => CGI.escape(slug),
-        "categories" => categories.sort.join('/')
+        "categories" => categories.join('/')
       }.inject(template) { |result, token|
         result.gsub(/:#{token.first}/, token.last)
       }.gsub(/\/\//, "/")
@@ -205,15 +213,15 @@ module Jekyll
     #
     # 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,
+      { "title"      => self.data["title"] || self.slug.split('-').select {|w| w.capitalize! || w }.join(' '),
+        "url"        => self.url,
+        "date"       => self.date,
+        "id"         => self.id,
         "categories" => self.categories,
-        "next" => self.next,
-        "previous" => self.previous,
-        "content" => self.content }.deep_merge(self.data)
+        "next"       => self.next,
+        "previous"   => self.previous,
+        "tags"       => self.tags,
+        "content"    => self.content }.deep_merge(self.data)
     end
 
     def inspect

data/lib/jekyll/site.rb

@@ -1,8 +1,8 @@
 module Jekyll
 
   class Site
-    attr_accessor :config, :layouts, :posts, :categories, :exclude
-    attr_accessor :source, :dest, :lsi, :pygments, :permalink_style
+    attr_accessor :config, :layouts, :posts, :categories, :exclude,
+                  :source, :dest, :lsi, :pygments, :permalink_style, :tags
 
     # Initialize the site
     #   +config+ is a Hash containing site configurations details
@@ -25,7 +25,8 @@ module Jekyll
     def reset
       self.layouts         = {}
       self.posts           = []
-      self.categories      = Hash.new { |hash, key| hash[key] = Array.new }
+      self.categories      = Hash.new { |hash, key| hash[key] = [] }
+      self.tags            = Hash.new { |hash, key| hash[key] = [] }
     end
 
     def setup
@@ -76,6 +77,8 @@ module Jekyll
           rescue LoadError
             puts "The maruku gem is required for markdown support!"
           end
+        else
+          raise "Invalid Markdown processor: '#{self.config['markdown']}' -- did you mean 'maruku' or 'rdiscount'?"
       end
     end
 
@@ -126,6 +129,7 @@ module Jekyll
           if post.published
             self.posts << post
             post.categories.each { |c| self.categories[c] << post }
+            post.tags.each { |c| self.tags[c] << post }
           end
         end
       end
@@ -137,7 +141,8 @@ module Jekyll
         post.render(self.layouts, site_payload)
       end
 
-      self.categories.values.map { |cats| cats.sort! { |a, b| b <=> a} }
+      self.categories.values.map { |ps| ps.sort! { |a, b| b <=> a} }
+      self.tags.values.map { |ps| ps.sort! { |a, b| b <=> a} }
     rescue Errno::ENOENT => e
       # ignore missing layout dir
     end
@@ -214,15 +219,13 @@ module Jekyll
     #
     # Returns {"site" => {"time" => <Time>,
     #                     "posts" => [<Post>],
-    #                     "categories" => [<Post>],
-    #                     "topics" => [<Post>] }}
+    #                     "categories" => [<Post>]}
     def site_payload
-      {"site" => {
-        "time" => Time.now,
-        "posts" => self.posts.sort { |a,b| b <=> a },
-        "categories" => post_attr_hash('categories'),
-        "topics" => post_attr_hash('topics')
-      }}
+      {"site" => self.config.merge({
+          "time"       => Time.now,
+          "posts"      => self.posts.sort { |a,b| b <=> a },
+          "categories" => post_attr_hash('categories'),
+          "tags"       => post_attr_hash('tags')})}
     end
 
     # Filter out any files/directories that are hidden or backup files (start
@@ -249,13 +252,11 @@ module Jekyll
     #                   "next_page" => <Number> }}
     def paginate_posts(file, dir)
       all_posts = self.posts.sort { |a,b| b <=> a }
-      page = Page.new(self, self.source, dir, file)
-
       pages = Pager.calculate_pages(all_posts, self.config['paginate'].to_i)
-
+      pages += 1
       (1..pages).each do |num_page|
         pager = Pager.new(self.config, num_page, all_posts, pages)
-
+        page = Page.new(self, self.source, dir, file)
         page.render(self.layouts, site_payload.merge({'paginator' => pager.to_hash}))
         suffix = "page#{num_page}" if num_page > 1
         page.write(self.dest, suffix)

data/test/helper.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-gem 'RedCloth', '= 4.1.0'
+gem 'RedCloth', '= 4.2.1'
 
 require File.join(File.dirname(__FILE__), *%w[.. lib jekyll])
 

data/test/source/_posts/2009-05-18-tag.textile

@@ -0,0 +1,6 @@
+---
+title: A Tag
+tag: code
+---
+
+Whoa.

data/test/source/_posts/2009-05-18-tags.textile

@@ -0,0 +1,9 @@
+---
+title: Some Tags
+tags:
+- food
+- cooking
+- pizza
+---
+
+Awesome!

data/test/source/_posts/2009-06-22-empty-yaml.textile

@@ -0,0 +1,3 @@
+---
+---
+Empty YAML.

data/test/source/_posts/2009-06-22-no-yaml.textile

@@ -0,0 +1 @@
+No YAML.

data/test/source/about.html

@@ -0,0 +1,6 @@
+---
+title: About
+permalink: /about/
+---
+
+About the site

data/test/source/contacts.html

@@ -0,0 +1,5 @@
+---
+title: Contact Information
+---
+
+Contact Information

data/test/source/sitemap.xml

@@ -0,0 +1,23 @@
+---
+layout: nil
+---
+<?xml version="1.0" encoding="UTF-8"?>
+<urlset 
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd" xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">	
+  
+  <url>
+		<loc>http://example.com</loc>
+		<lastmod>{{ site.time | date_to_xmlschema }}</lastmod>
+		<changefreq>daily</changefreq>
+		<priority>1.0</priority>
+	</url>
+	
+	{% for post in site.posts %}
+	<url>
+		<loc>http://example.com/{{ post.url }}/</loc>
+		<lastmod>{{ site.time }}</lastmod>
+		<changefreq>monthly</changefreq>
+		<priority>0.2</priority>
+	</url>
+	{% endfor %}
+</urlset>

data/test/source/win/_posts/2009-05-24-yaml-linebreak.markdown

@@ -0,0 +1,7 @@
+---
+layout: post
+title: "Test title"
+tag: "Ruby"
+---
+
+This is the content

data/test/test_configuration.rb

@@ -0,0 +1,29 @@
+require File.dirname(__FILE__) + '/helper'
+
+class TestConfiguration < Test::Unit::TestCase
+  context "loading configuration" do
+    setup do
+      @path = './_config.yml'
+    end
+
+    should "fire warning with no _config.yml" do
+      mock(YAML).load_file(@path) { raise "No such file or directory - #{@path}" }
+      mock(STDERR).puts("WARNING: Could not read configuration. Using defaults (and options).")
+      mock(STDERR).puts("\tNo such file or directory - #{@path}")
+      assert_equal Jekyll::DEFAULTS, Jekyll.configuration({})
+    end
+
+    should "load configuration as hash" do
+      mock(YAML).load_file(@path) { Hash.new }
+      mock(STDOUT).puts("Configuration from #{@path}")
+      assert_equal Jekyll::DEFAULTS, Jekyll.configuration({})
+    end
+
+    should "fire warning with bad config" do
+      mock(YAML).load_file(@path) { Array.new }
+      mock(STDERR).puts("WARNING: Could not read configuration. Using defaults (and options).")
+      mock(STDERR).puts("\tInvalid configuration - #{@path}")
+      assert_equal Jekyll::DEFAULTS, Jekyll.configuration({})
+    end
+  end
+end

data/test/test_generated_site.rb

@@ -17,11 +17,8 @@ class TestGeneratedSite < Test::Unit::TestCase
       assert @index.include?("#{@site.posts.size} Posts")
     end
 
-    should "render post.content" do
-      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)
+    should "render latest post's content" do
+      assert @index.include?(@site.posts.last.content)
     end
 
     should "hide unpublished posts" do
@@ -34,5 +31,10 @@ class TestGeneratedSite < Test::Unit::TestCase
     should "not copy _posts directory" do
       assert !File.exist?(dest_dir('_posts'))
     end
+
+    should "process other static files and generate correct permalinks" do
+      assert File.exists?(dest_dir('/about/index.html'))
+      assert File.exists?(dest_dir('/contacts.html'))
+    end
   end
 end

data/test/test_page.rb

@@ -0,0 +1,98 @@
+require File.dirname(__FILE__) + '/helper'
+
+class TestPage < Test::Unit::TestCase
+  def setup_page(file)
+    @page = Page.new(@site, source_dir, '', file)
+  end
+
+  def do_render(page)
+    layouts = { "default" => Layout.new(@site, source_dir('_layouts'), "simple.html")}
+    page.render(layouts, {"site" => {"posts" => []}})
+  end
+
+  context "A Page" do
+    setup do
+      clear_dest
+      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
+
+      context "with pretty url style" do
+        setup do
+          @site.permalink_style = :pretty
+        end
+
+        should "return dir correctly" do
+          @page = setup_page('contacts.html')
+          assert_equal '/contacts/', @page.dir
+        end
+
+        should "return dir correctly for index page" do
+          @page = setup_page('index.html')
+          assert_equal '/', @page.dir
+        end
+      end
+
+      context "with any other url style" do
+        should "return dir correctly" do
+          @site.permalink_style = nil
+          @page = setup_page('contacts.html')
+          assert_equal '/', @page.dir
+        end
+      end
+
+      should "respect permalink in yaml front matter" do
+        file = "about.html"
+        @page = setup_page(file)
+
+        assert_equal "/about/", @page.permalink
+        assert_equal @page.permalink, @page.url
+        assert_equal "/about/", @page.dir
+      end
+    end
+
+    context "rendering" do
+      setup do
+        clear_dest
+      end
+      
+      should "write properly" do
+        page = setup_page('contacts.html')
+        do_render(page)
+        page.write(dest_dir)
+
+        assert File.directory?(dest_dir)
+        assert File.exists?(File.join(dest_dir, 'contacts.html'))
+      end
+
+      should "write properly without html extension" do
+        page = setup_page('contacts.html')
+        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
+        do_render(page)
+        page.write(dest_dir)
+
+        assert_equal("/sitemap.xml", page.url)
+        assert_nil(page.url[/\.html$/])
+        assert File.directory?(dest_dir)
+        assert File.exists?(File.join(dest_dir,'sitemap.xml'))
+      end
+    end
+
+  end 
+end

data/test/test_pager.rb

@@ -0,0 +1,47 @@
+require File.dirname(__FILE__) + '/helper'
+
+class TestPager < Test::Unit::TestCase
+  context "pagination enabled" do
+    setup do
+      stub(Jekyll).configuration do
+        Jekyll::DEFAULTS.merge({
+          'source'      => source_dir, 
+          'destination' => dest_dir,
+          'paginate'    => 2
+        })
+      end
+
+      @config = Jekyll.configuration
+      @site = Site.new(@config)
+      @posts = @site.read_posts('')
+    end
+
+    should "calculate number of pages" do
+      assert_equal(2, Pager.calculate_pages(@posts, @config['paginate']))
+    end
+
+    should "create first pager" do
+      pager = Pager.new(@config, 1, @posts)
+      assert_equal(@config['paginate'].to_i, pager.posts.size)
+      assert_equal(2, pager.total_pages)
+      assert_nil(pager.previous_page)
+      assert_equal(2, pager.next_page)
+    end
+  
+    should "create second pager" do
+      pager = Pager.new(@config, 2, @posts)
+      assert_equal(@posts.size - @config['paginate'].to_i, pager.posts.size)
+      assert_equal(2, pager.total_pages)
+      assert_equal(1, pager.previous_page)
+      assert_nil(pager.next_page)
+    end
+    
+    should "not create third pager" do
+      assert_raise(RuntimeError) { Pager.new(@config, 3, @posts) }
+    end
+    
+    should "report that pagination is enabled" do
+      assert Pager.pagination_enabled?(@config, 'index.html')
+    end
+  end
+end

data/test/test_post.rb

@@ -25,7 +25,6 @@ class TestPost < Test::Unit::TestCase
       assert !Post.valid?("blah")
     end
 
-
     context "processing posts" do
       setup do
         @post = Post.allocate
@@ -69,6 +68,19 @@ class TestPost < Test::Unit::TestCase
         assert_equal "my_category/permalinked-post", @post.url
       end
 
+      context "with CRLF linebreaks" do
+        setup do
+          @real_file = "2009-05-24-yaml-linebreak.markdown"
+          @source = source_dir('win/_posts')
+        end
+        should "read yaml front-matter" do
+          @post.read_yaml(@source, @real_file)
+
+          assert_equal({"title" => "Test title", "layout" => "post", "tag" => "Ruby"}, @post.data)
+          assert_equal "\r\nThis is the content", @post.content
+        end
+      end
+
       context "with site wide permalink" do
         setup do
           @post.categories = []
@@ -129,8 +141,8 @@ class TestPost < Test::Unit::TestCase
           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
+            assert_equal "/:categories/:year/:month/:day/:title/", @post.template
+            assert_equal "/2008/10/19/foo-bar/", @post.url
           end
         end
 
@@ -212,6 +224,28 @@ class TestPost < Test::Unit::TestCase
         assert post.categories.include?('baz')
       end
 
+      should "recognize tag in yaml" do
+        post = setup_post("2009-05-18-tag.textile")
+        assert post.tags.include?('code')
+      end
+
+      should "recognize tags in yaml" do
+        post = setup_post("2009-05-18-tags.textile")
+        assert post.tags.include?('food')
+        assert post.tags.include?('cooking')
+        assert post.tags.include?('pizza')
+      end
+      
+      should "allow no yaml" do
+        post = setup_post("2009-06-22-no-yaml.textile")
+        assert_equal "No YAML.", post.content
+      end
+
+      should "allow empty yaml" do
+        post = setup_post("2009-06-22-empty-yaml.textile")
+        assert_equal "Empty YAML.", post.content
+      end
+
       context "rendering" do
         setup do
           clear_dest
@@ -262,7 +296,6 @@ class TestPost < Test::Unit::TestCase
     should "generate categories and topics" do
       post = Post.new(@site, File.join(File.dirname(__FILE__), *%w[source]), 'foo', 'bar/2008-12-12-topical-post.textile')
       assert_equal ['foo'], post.categories
-      assert_equal ['bar'], post.topics
     end
 
   end

data/test/test_site.rb

@@ -9,6 +9,10 @@ class TestSite < Test::Unit::TestCase
       @site = Site.new(Jekyll.configuration)
     end
 
+    should "have an empty tag hash by default" do
+      assert_equal Hash.new, @site.tags
+    end
+
     should "reset data before processing" do
       clear_dest
       @site.process
@@ -38,7 +42,7 @@ class TestSite < Test::Unit::TestCase
       @site.process
 
       posts = Dir[source_dir("**", "_posts", "*")]
-      categories = %w(bar baz category foo z_category publish_test).sort
+      categories = %w(bar baz category foo z_category publish_test win).sort
 
       assert_equal posts.size - 1, @site.posts.size
       assert_equal categories, @site.categories.keys.sort
@@ -61,5 +65,21 @@ class TestSite < Test::Unit::TestCase
       @site.exclude = excludes
       assert_equal includes, @site.filter_entries(excludes + includes)
     end
+    
+    context 'with an invalid markdown processor in the configuration' do
+      
+      should 'give a meaningful error message' do
+        bad_processor = 'not a processor name'
+        begin
+          Site.new(Jekyll.configuration.merge({ 'markdown' => bad_processor }))
+          flunk 'Invalid markdown processors should cause a failure on site creation'
+        rescue RuntimeError => e
+          assert e.to_s =~ /invalid|bad/i
+          assert e.to_s =~ %r{#{bad_processor}}
+        end
+      end
+      
+    end
+    
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: PerfectlyNormal-jekyll
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: 0.5.3
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-06 00:00:00 -07:00
+date: 2009-07-14 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.1.9
+        version: 4.2.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: liquid
@@ -99,6 +99,7 @@ files:
 - lib/jekyll/filters.rb
 - lib/jekyll/layout.rb
 - lib/jekyll/page.rb
+- lib/jekyll/pager.rb
 - lib/jekyll/post.rb
 - lib/jekyll/site.rb
 - lib/jekyll/tags/highlight.rb
@@ -117,18 +118,29 @@ files:
 - 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/_posts/2009-05-18-tag.textile
+- test/source/_posts/2009-05-18-tags.textile
+- test/source/_posts/2009-06-22-empty-yaml.textile
+- test/source/_posts/2009-06-22-no-yaml.textile
+- test/source/about.html
 - test/source/category/_posts/2008-9-23-categories.textile
+- test/source/contacts.html
 - test/source/css/screen.css
 - test/source/foo/_posts/bar/2008-12-12-topical-post.textile
 - test/source/index.html
+- test/source/sitemap.xml
+- test/source/win/_posts/2009-05-24-yaml-linebreak.markdown
 - test/source/z_category/_posts/2008-9-23-categories.textile
 - test/suite.rb
+- test/test_configuration.rb
 - test/test_filters.rb
 - test/test_generated_site.rb
+- test/test_page.rb
+- test/test_pager.rb
 - test/test_post.rb
 - test/test_site.rb
 - test/test_tags.rb
-has_rdoc: true
+has_rdoc: false
 homepage: http://github.com/mojombo/jekyll
 post_install_message: 
 rdoc_options: 
@@ -152,13 +164,16 @@ requirements: []
 rubyforge_project: jekyll
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Jekyll is a simple, blog aware, static site generator.
 test_files: 
-- test/helper.rb
+- test/test_page.rb
+- test/test_post.rb
+- test/test_pager.rb
+- test/test_configuration.rb
+- test/test_tags.rb
+- test/test_generated_site.rb
 - test/suite.rb
 - test/test_filters.rb
-- test/test_generated_site.rb
-- test/test_post.rb
+- test/helper.rb
 - test/test_site.rb
-- test/test_tags.rb