jekyll 0.5.7 → 0.6.0

data/lib/jekyll/tags/highlight.rb

@@ -4,15 +4,28 @@ module Jekyll
     include Liquid::StandardFilters
 
     # we need a language, but the linenos argument is optional.
-    SYNTAX = /(\w+)\s?(:?linenos)?\s?/
+    SYNTAX = /(\w+)\s?([\w\s=]+)*/
 
     def initialize(tag_name, markup, tokens)
       super
       if markup =~ SYNTAX
         @lang = $1
         if defined? $2
+          tmp_options = {}
+          $2.split.each do |opt|
+            key, value = opt.split('=')
+            if value.nil?
+              if key == 'linenos'
+                value = 'inline'
+              else
+                value = true
+              end
+            end
+            tmp_options[key] = value
+          end
+          tmp_options = tmp_options.to_a.collect { |opt| opt.join('=') }
           # additional options to pass to Albino.
-          @options = { 'O' => 'linenos=inline' }
+          @options = { 'O' => tmp_options.join(',') }
         else
           @options = {}
         end
@@ -23,19 +36,17 @@ module Jekyll
 
     def render(context)
       if context.registers[:site].pygments
-        render_pygments(context, super.to_s)
+        render_pygments(context, super.join)
       else
-        render_codehighlighter(context, super.to_s)
+        render_codehighlighter(context, super.join)
       end
     end
 
     def render_pygments(context, code)
       output = add_code_tags(Albino.new(code, @lang).to_s(@options), @lang)
-      if context["content_type"] == "markdown"
-        return "\n" + output + "\n"
-      elsif context["content_type"] == "textile"
-        return "<notextile>" + output + "</notextile>"
-      end
+      output = context["pygments_prefix"] + output if context["pygments_prefix"]
+      output = output + context["pygments_suffix"] if context["pygments_suffix"]
+      output
     end
 
     def render_codehighlighter(context, code)

data/test/helper.rb

@@ -3,6 +3,9 @@ gem 'RedCloth', '>= 4.2.1'
 
 require File.join(File.dirname(__FILE__), *%w[.. lib jekyll])
 
+require 'RedCloth'
+require 'rdiscount'
+
 require 'test/unit'
 require 'redgreen'
 require 'shoulda'
@@ -10,6 +13,9 @@ require 'rr'
 
 include Jekyll
 
+# Send STDERR into the void to suppress program output messages
+STDERR.reopen(test(?e, '/dev/null') ? '/dev/null' : 'NUL:')
+
 class Test::Unit::TestCase
   include RR::Adapters::TestUnit
 

data/test/source/_posts/2010-01-09-date-override.textile

@@ -3,3 +3,5 @@ date: 2010-01-10
 ---
 
 Post with a front matter date
+
+{{ page.date | date_to_string }}

data/test/source/_posts/2010-01-09-time-override.textile

@@ -3,3 +3,5 @@ date: 2010-01-10 13:07:09
 ---
 
 Post with a front matter time
+
+{{ page.date | date_to_string }}

data/test/source/_posts/2010-01-09-timezone-override.textile

@@ -0,0 +1,7 @@
+---
+date: 2010-01-10 13:07:09 +00:00
+---
+
+Post with a front matter time with timezone
+
+{{ page.date | date_to_string }}

data/test/source/_posts/2010-01-16-override-data.textile

@@ -0,0 +1,4 @@
+---
+date: 2010-01-10 13:07:09
+tags: A string
+---

data/test/source/sitemap.xml

@@ -2,22 +2,31 @@
 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">	
-  
+<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>
+    <loc>http://example.com</loc>
+    <lastmod>{{ site.time | date: "%Y-%m-%d" }}</lastmod>
+    <changefreq>daily</changefreq>
+    <priority>1.0</priority>
+  </url>
+
+  {% for post in site.posts %}
+  <url>
+    <loc>http://example.com{{ post.url }}/</loc>
+    <lastmod>{{ post.date | date: "%Y-%m-%d" }}</lastmod>
+    <changefreq>monthly</changefreq>
+    <priority>0.2</priority>
+  </url>
+  {% endfor %}
+
+  {% for page in site.html_pages %}
+  <url>
+    <loc>http://example.com{{ page.url }}</loc>
+    <lastmod>{{ site.time | date: "%Y-%m-%d" }}</lastmod>
+    {% if page.changefreq %}<changefreq>{{ page.changefreq }}</changefreq>{% endif %}
+    {% if page.priority %}<priority>{{ page.priority }}</priority>{% endif %}
+  </url>
+  {% endfor %}
+</urlset>

data/test/test_configuration.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/helper'
 class TestConfiguration < Test::Unit::TestCase
   context "loading configuration" do
     setup do
-      @path = './_config.yml'
+      @path = File.join(Dir.pwd, '_config.yml')
     end
 
     should "fire warning with no _config.yml" do

data/test/test_generated_site.rb

@@ -14,7 +14,7 @@ class TestGeneratedSite < Test::Unit::TestCase
     end
 
     should "ensure post count is as expected" do
-      assert_equal 24, @site.posts.size
+      assert_equal 26, @site.posts.size
     end
 
     should "insert site.posts into the index" do

data/test/test_post.rb

@@ -18,10 +18,10 @@ class TestPost < Test::Unit::TestCase
     end
 
     should "ensure valid posts are valid" do
-      assert Post.valid?("2008-10-19-foo-bar.textile")
-      assert Post.valid?("foo/bar/2008-10-19-foo-bar.textile")
+      assert Post.valid?("2008-09-09-foo-bar.textile")
+      assert Post.valid?("foo/bar/2008-09-09-foo-bar.textile")
 
-      assert !Post.valid?("lol2008-10-19-foo-bar.textile")
+      assert !Post.valid?("lol2008-09-09-foo-bar.textile")
       assert !Post.valid?("blah")
     end
 
@@ -31,7 +31,7 @@ class TestPost < Test::Unit::TestCase
         @post.site = @site
 
         @real_file = "2008-10-18-foo-bar.textile"
-        @fake_file = "2008-10-19-foo-bar.textile"
+        @fake_file = "2008-09-09-foo-bar.textile"
         @source = source_dir('_posts')
       end
 
@@ -39,17 +39,17 @@ class TestPost < Test::Unit::TestCase
         @post.categories = []
         @post.process(@fake_file)
 
-        assert_equal Time.parse("2008-10-19"), @post.date
+        assert_equal Time.parse("2008-09-09"), @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
+        assert_equal "/2008/09/09", @post.dir
+        assert_equal "/2008/09/09/foo-bar", @post.id
       end
 
       should "create url based on date and title" do
         @post.categories = []
         @post.process(@fake_file)
-        assert_equal "/2008/10/19/foo-bar.html", @post.url
+        assert_equal "/2008/09/09/foo-bar.html", @post.url
       end
 
       should "CGI escape urls" do
@@ -106,7 +106,7 @@ class TestPost < Test::Unit::TestCase
 
           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
+            assert_equal "/2008/09/09/foo-bar.html", @post.url
           end
         end
 
@@ -118,7 +118,7 @@ class TestPost < Test::Unit::TestCase
 
           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
+            assert_equal "/beer/2008/09/09/foo-bar.html", @post.url
           end
         end
 
@@ -131,7 +131,7 @@ class TestPost < Test::Unit::TestCase
 
           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
+            assert_equal "/food/beer/2008/09/09/foo-bar.html", @post.url
           end
         end
 
@@ -155,7 +155,18 @@ class TestPost < Test::Unit::TestCase
 
           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 "/2008/09/09/foo-bar/", @post.url
+          end
+        end
+
+        context "with custom date permalink" do
+          setup do
+            @post.site.permalink_style = '/:categories/:year/:i_month/:i_day/:title/'
+            @post.process(@fake_file)
+          end
+
+          should "process the url correctly" do
+            assert_equal "/2008/9/9/foo-bar/", @post.url
           end
         end
 
@@ -227,12 +238,37 @@ class TestPost < Test::Unit::TestCase
 
       should "recognize date in yaml" do
         post = setup_post("2010-01-09-date-override.textile")
+        do_render(post)
+        assert_equal Time, post.date.class
+        assert_equal Time, post.to_liquid["date"].class
         assert_equal "/2010/01/10/date-override.html", post.url
+        assert_equal "<p>Post with a front matter date</p>\n<p>10 Jan 2010</p>", post.output
       end
 
       should "recognize time in yaml" do
         post = setup_post("2010-01-09-time-override.textile")
+        do_render(post)
+        assert_equal Time, post.date.class
+        assert_equal Time, post.to_liquid["date"].class
         assert_equal "/2010/01/10/time-override.html", post.url
+        assert_equal "<p>Post with a front matter time</p>\n<p>10 Jan 2010</p>", post.output
+      end
+
+      should "recognize time with timezone in yaml" do
+        post = setup_post("2010-01-09-timezone-override.textile")
+        do_render(post)
+        assert_equal Time, post.date.class
+        assert_equal Time, post.to_liquid["date"].class
+        assert_equal "/2010/01/10/timezone-override.html", post.url
+        assert_equal "<p>Post with a front matter time with timezone</p>\n<p>10 Jan 2010</p>", post.output
+      end
+
+      should "to_liquid prioritizes post attributes over data" do
+        post = setup_post("2010-01-16-override-data.textile")
+        assert_equal Array, post.tags.class
+        assert_equal Array, post.to_liquid["tags"].class
+        assert_equal Time, post.date.class
+        assert_equal Time, post.to_liquid["date"].class
       end
 
       should "recognize category in yaml" do
@@ -333,6 +369,21 @@ class TestPost < Test::Unit::TestCase
 
           assert_equal "<<< <hr />\n<p>Tom Preston-Werner github.com/mojombo</p>\n\n<p>This <em>is</em> cool</p> >>>", post.output
         end
+
+        should "render date specified in front matter properly" do
+          post = setup_post("2010-01-09-date-override.textile")
+          do_render(post)
+
+          assert_equal "<p>Post with a front matter date</p>\n<p>10 Jan 2010</p>", post.output
+        end
+
+        should "render time specified in front matter properly" do
+          post = setup_post("2010-01-09-time-override.textile")
+          do_render(post)
+
+          assert_equal "<p>Post with a front matter time</p>\n<p>10 Jan 2010</p>", post.output
+        end
+
       end
     end
 

data/test/test_site.rb

@@ -22,6 +22,7 @@ class TestSite < Test::Unit::TestCase
       before_tags = @site.tags.length
       before_pages = @site.pages.length
       before_static_files = @site.static_files.length
+      before_time = @site.time
 
       @site.process
       assert_equal before_posts, @site.posts.length
@@ -30,6 +31,65 @@ class TestSite < Test::Unit::TestCase
       assert_equal before_tags, @site.tags.length
       assert_equal before_pages, @site.pages.length
       assert_equal before_static_files, @site.static_files.length
+      assert before_time <= @site.time
+    end
+
+    should "write only modified static files" do
+      clear_dest
+      StaticFile.reset_cache
+
+      @site.process
+      some_static_file = @site.static_files[0].path
+      dest = File.expand_path(@site.static_files[0].destination(@site.dest))
+      mtime1 = File.stat(dest).mtime.to_i # first run must generate dest file
+
+      # need to sleep because filesystem timestamps have best resolution in seconds
+      sleep 1
+      @site.process
+      mtime2 = File.stat(dest).mtime.to_i
+      assert_equal mtime1, mtime2
+
+      # simulate file modification by user
+      FileUtils.touch some_static_file
+
+      sleep 1
+      @site.process
+      mtime3 = File.stat(dest).mtime.to_i
+      assert_not_equal mtime2, mtime3 # must be regenerated!
+
+      sleep 1
+      @site.process
+      mtime4 = File.stat(dest).mtime.to_i
+      assert_equal mtime3, mtime4 # no modifications, so must be the same
+    end
+
+    should "write static files if not modified but missing in destination" do
+      clear_dest
+      StaticFile.reset_cache
+
+      @site.process
+      some_static_file = @site.static_files[0].path
+      dest = File.expand_path(@site.static_files[0].destination(@site.dest))
+      mtime1 = File.stat(dest).mtime.to_i # first run must generate dest file
+
+      # need to sleep because filesystem timestamps have best resolution in seconds
+      sleep 1
+      @site.process
+      mtime2 = File.stat(dest).mtime.to_i
+      assert_equal mtime1, mtime2
+
+      # simulate destination file deletion
+      File.unlink dest
+
+      sleep 1
+      @site.process
+      mtime3 = File.stat(dest).mtime.to_i
+      assert_not_equal mtime2, mtime3 # must be regenerated and differ!
+
+      sleep 1
+      @site.process
+      mtime4 = File.stat(dest).mtime.to_i
+      assert_equal mtime3, mtime4 # no modifications, so must be the same
     end
 
     should "read layouts" do
@@ -73,18 +133,20 @@ class TestSite < Test::Unit::TestCase
     end
     
     context 'with an invalid markdown processor in the configuration' do
-      
-      should 'give a meaningful error message' do
+      should 'not throw an error at initialization time' do
         bad_processor = 'not a processor name'
-        begin
+        assert_nothing_raised do
           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
       
+      should 'throw FatalException at process time' do
+        bad_processor = 'not a processor name'
+        s = Site.new(Jekyll.configuration.merge({ 'markdown' => bad_processor }))
+        assert_raise Jekyll::FatalException do
+          s.process
+        end
+      end
     end
     
   end

data/test/test_tags.rb

@@ -2,26 +2,18 @@ require File.dirname(__FILE__) + '/helper'
 
 class TestTags < Test::Unit::TestCase
 
-  def create_post(content, override = {}, markdown = true)
+  def create_post(content, override = {}, converter_class = Jekyll::MarkdownConverter)
     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
+    @converter = site.converters.find { |c| c.class == converter_class }
+    payload = { "pygments_prefix" => @converter.pygments_prefix,
+                "pygments_suffix" => @converter.pygments_suffix }
 
     @result = Liquid::Template.parse(content).render(payload, info)
-
-    if markdown
-      @result = site.markdown(@result)
-    else
-      @result = site.textile(@result)
-    end
+    @result = @converter.convert(@result)
   end
 
   def fill_post(code, override = {})
@@ -82,7 +74,7 @@ CONTENT
 
     context "using Textile" do
       setup do
-        create_post(@content, {}, false)
+        create_post(@content, {}, Jekyll::TextileConverter)
       end
 
       # Broken in RedCloth 4.1.9