jekyll 0.11.2 → 0.12.0

data/lib/jekyll/tags/highlight.rb

@@ -3,14 +3,19 @@ module Jekyll
   class HighlightBlock < Liquid::Block
     include Liquid::StandardFilters
 
-    # We need a language, but the linenos argument is optional.
-    SYNTAX = /(\w+)\s?([\w\s=]+)*/
+    # The regular expression syntax checker. Start with the language specifier.
+    # Follow that by zero or more space separated options that take one of two
+    # forms:
+    #
+    # 1. name
+    # 2. name=value
+    SYNTAX = /^([a-zA-Z0-9.+#-]+)((\s+\w+(=\w+)?)*)$/
 
     def initialize(tag_name, markup, tokens)
       super
-      if markup =~ SYNTAX
+      if markup.strip =~ SYNTAX
         @lang = $1
-        if defined? $2
+        if defined?($2) && $2 != ''
           tmp_options = {}
           $2.split.each do |opt|
             key, value = opt.split('=')
@@ -23,7 +28,7 @@ module Jekyll
             end
             tmp_options[key] = value
           end
-          tmp_options = tmp_options.to_a.collect { |opt| opt.join('=') }
+          tmp_options = tmp_options.to_a.sort.collect { |opt| opt.join('=') }
           # additional options to pass to Albino
           @options = { 'O' => tmp_options.join(',') }
         else
@@ -43,7 +48,13 @@ module Jekyll
     end
 
     def render_pygments(context, code)
-      output = add_code_tags(Albino.new(code, @lang).to_s(@options), @lang)
+      @options[:encoding] = 'utf-8'
+
+      output = add_code_tags(
+        Pygments.highlight(code, :lexer => @lang, :options => @options),
+        @lang
+      )
+
       output = context["pygments_prefix"] + output if context["pygments_prefix"]
       output = output + context["pygments_suffix"] if context["pygments_suffix"]
       output

data/lib/jekyll/tags/post_url.rb

@@ -0,0 +1,38 @@
+module Jekyll
+
+  class PostComparer
+    MATCHER = /^(.+\/)*(\d+-\d+-\d+)-(.*)$/
+
+    attr_accessor :date, :slug
+
+    def initialize(name)
+      who, cares, date, slug = *name.match(MATCHER)
+      @slug = slug
+      @date = Time.parse(date)
+    end
+  end
+
+  class PostUrl < Liquid::Tag
+    def initialize(tag_name, post, tokens)
+      super
+      @orig_post = post.strip
+      @post = PostComparer.new(@orig_post)
+    end
+
+    def render(context)
+      site = context.registers[:site]
+      
+      site.posts.each do |p|
+        if p == @post
+          return p.url
+        end
+      end
+
+      puts "ERROR: post_url: \"#{@orig_post}\" could not be found"
+
+      return "#"
+    end
+  end
+end
+
+Liquid::Template.register_tag('post_url', Jekyll::PostUrl)

data/test/fixtures/broken_front_matter1.erb

@@ -0,0 +1,5 @@
+# Some stuff on the first line
+---
+test: good
+---
+Real content starts here

data/test/fixtures/front_matter.erb

@@ -0,0 +1,4 @@
+---
+test: good
+---
+Real content starts here

data/test/test_convertible.rb

@@ -0,0 +1,22 @@
+require 'helper'
+require 'ostruct'
+
+class TestConvertible < Test::Unit::TestCase
+  context "yaml front-matter" do
+    setup do
+      @convertible = OpenStruct.new
+      @convertible.extend Jekyll::Convertible
+      @base = File.expand_path('../fixtures', __FILE__)
+    end
+
+    should "parse the front-matter correctly" do
+      ret = @convertible.read_yaml(@base, 'front_matter.erb')
+      assert_equal({'test' => 'good'}, ret)
+    end
+
+    should "not parse if the front-matter is not at the start of the file" do
+      ret = @convertible.read_yaml(@base, 'broken_front_matter1.erb')
+      assert_equal({}, ret)
+    end
+  end
+end

data/test/test_kramdown.rb

@@ -3,21 +3,31 @@ require 'helper'
 class TestKramdown < Test::Unit::TestCase
   context "kramdown" do
     setup do
-      config = {
+      @config = {
         'markdown' => 'kramdown',
         'kramdown' => {
           'auto_ids'      => false,
           'footnote_nr'   => 1,
           'entity_output' => 'as_char',
-          'toc_levels'    => '1..6'
+          'toc_levels'    => '1..6',
+          'smart_quotes'  => 'lsquo,rsquo,ldquo,rdquo'
         }
       }
-      @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
+      markdown = MarkdownConverter.new(@config)
+      assert_equal "<h1>Some Header</h1>", markdown.convert('# Some Header #').strip
+    end
+
+    should "convert quotes to smart quotes" do
+      markdown = MarkdownConverter.new(@config)
+      assert_equal "<p>&ldquo;Pit&rsquo;hy&rdquo;</p>", markdown.convert(%{"Pit'hy"}).strip
+
+      override = { 'kramdown' => { 'smart_quotes' => 'lsaquo,rsaquo,laquo,raquo' } }
+      markdown = MarkdownConverter.new(@config.deep_merge(override))
+      assert_equal "<p>&laquo;Pit&rsaquo;hy&raquo;</p>", markdown.convert(%{"Pit'hy"}).strip
     end
   end
 end

data/test/test_post.rb

@@ -141,6 +141,19 @@ class TestPost < Test::Unit::TestCase
           end
         end
 
+        context "with space (categories)" do
+          setup do
+            @post.categories << "French cuisine"
+            @post.categories << "Belgian beer"
+            @post.process(@fake_file)
+          end
+
+          should "process the url correctly" do
+            assert_equal "/:categories/:year/:month/:day/:title.html", @post.template
+            assert_equal "/French%20cuisine/Belgian%20beer/2008/09/09/foo-bar.html", @post.url
+          end
+        end
+
         context "with none style" do
           setup do
             @post.site.permalink_style = :none

data/test/test_rdiscount.rb

@@ -5,8 +5,8 @@ class TestRdiscount < Test::Unit::TestCase
   context "rdiscount" do
     setup do
       config = {
-        'rdiscount' => { 'extensions' => ['smart'] },
-        'markdown' => 'rdiscount'
+        'markdown' => 'rdiscount',
+        'rdiscount' => { 'extensions' => ['smart', 'generate_toc'], 'toc_token' => '{:toc}' }
       }
       @markdown = MarkdownConverter.new config
     end
@@ -14,5 +14,9 @@ class TestRdiscount < Test::Unit::TestCase
     should "pass rdiscount extensions" do
       assert_equal "<p>&ldquo;smart&rdquo;</p>", @markdown.convert('"smart"').strip
     end
+
+    should "render toc" do
+      assert_equal "<h1 id=\"Header+1\">Header 1</h1>\n\n<h2 id=\"Header+2\">Header 2</h2>\n\n<p>\n <ul>\n <li><a href=\"#Header+1\">Header 1</a>\n  <ul>\n  <li><a href=\"#Header+2\">Header 2</a>  </li>\n  </ul>\n </li>\n </ul>\n\n</p>", @markdown.convert("# Header 1\n\n## Header 2\n\n{:toc}").strip
+    end
   end
 end

data/test/test_redcarpet.rb

@@ -1,10 +1,10 @@
-require File.dirname(__FILE__) + '/helper'
+require 'helper'
 
 class TestRedcarpet < Test::Unit::TestCase
   context "redcarpet" do
     setup do
       config = {
-        'redcarpet' => { 'extensions' => ['smart'] },
+        'redcarpet' => { 'extensions' => ['smart', 'strikethrough', 'filter_html'] },
         'markdown' => 'redcarpet'
       }
       @markdown = MarkdownConverter.new config
@@ -14,8 +14,26 @@ class TestRedcarpet < Test::Unit::TestCase
       assert_equal "<h1>Some Header</h1>", @markdown.convert('# Some Header #').strip
     end
     
-    should "pass redcarpet extensions" do
+    should "pass redcarpet SmartyPants options" do
       assert_equal "<p>&ldquo;smart&rdquo;</p>", @markdown.convert('"smart"').strip
     end
+
+    should "pass redcarpet extensions" do
+      assert_equal "<p><del>deleted</del></p>", @markdown.convert('~~deleted~~').strip
+    end
+
+    should "pass redcarpet render options" do
+      assert_equal "<p><strong>bad code not here</strong>: i am bad</p>", @markdown.convert('**bad code not here**: <script>i am bad</script>').strip
+    end
+
+    should "render fenced code blocks" do
+      assert_equal "<div class=\"highlight\"><pre><code class=\"ruby\"><span class=\"nb\">puts</span> <span class=\"s2\">&quot;Hello world&quot;</span>\n</code></pre></div>", @markdown.convert(
+        <<-EOS
+```ruby
+puts "Hello world"
+```
+EOS
+      ).strip  
+    end
   end
 end

data/test/test_redcloth.rb

@@ -0,0 +1,86 @@
+require File.dirname(__FILE__) + '/helper'
+
+class TestRedCloth < Test::Unit::TestCase
+
+  context "RedCloth default (no explicit config) hard_breaks enabled" do
+    setup do
+      @textile = TextileConverter.new
+    end
+    
+    should "preserve single line breaks in HTML output" do 
+      assert_equal "<p>line1<br />\nline2</p>", @textile.convert("p. line1\nline2").strip
+    end
+  end
+
+  context "Default hard_breaks enabled w/ redcloth section, no hard_breaks value" do
+    setup do
+      config = {
+        'redcloth'      => {}
+        }
+      @textile = TextileConverter.new config
+    end
+    
+    should "preserve single line breaks in HTML output" do 
+      assert_equal "<p>line1<br />\nline2</p>", @textile.convert("p. line1\nline2").strip
+    end
+  end
+
+  context "RedCloth with hard_breaks enabled" do
+    setup do
+      config = {
+        'redcloth'      => {
+          'hard_breaks' => true # default
+        }
+      }
+      @textile = TextileConverter.new config
+    end
+    
+    should "preserve single line breaks in HTML output" do 
+      assert_equal "<p>line1<br />\nline2</p>", @textile.convert("p. line1\nline2").strip
+    end
+  end
+
+  context "RedCloth with hard_breaks disabled" do
+    setup do
+      config = {
+        'redcloth'      => {
+          'hard_breaks' => false
+        }
+      }
+      @textile = TextileConverter.new config
+    end
+
+    should "not generate break tags in HTML output" do
+      assert_equal "<p>line1\nline2</p>", @textile.convert("p. line1\nline2").strip
+    end
+  end
+
+  context "RedCloth w/no_span_caps set to false" do
+    setup do
+      config = {
+        'redcloth'       => {
+          'no_span_caps' => false
+        }
+      }
+      @textile = TextileConverter.new config
+    end
+    should "generate span tags around capitalized words" do
+      assert_equal "<p><span class=\"caps\">NSC</span></p>", @textile.convert("NSC").strip
+    end
+  end
+
+  context "RedCloth w/no_span_caps set to true" do
+    setup do
+      config = {
+        'redcloth'       => {
+          'no_span_caps' => true
+        }
+      }
+      @textile = TextileConverter.new config
+    end
+
+    should "not generate span tags around capitalized words" do
+      assert_equal "<p>NSC</p>", @textile.convert("NSC").strip
+    end
+  end
+end

data/test/test_site.rb

@@ -1,6 +1,32 @@
 require 'helper'
 
 class TestSite < Test::Unit::TestCase
+  context "configuring sites" do
+    should "have an array for plugins by default" do
+      site = Site.new(Jekyll::DEFAULTS)
+      assert_equal [File.join(Dir.pwd, '_plugins')], site.plugins
+    end
+
+    should "have an array for plugins if passed as a string" do
+      site = Site.new(Jekyll::DEFAULTS.merge({'plugins' => '/tmp/plugins'}))
+      assert_equal ['/tmp/plugins'], site.plugins
+    end
+
+    should "have an array for plugins if passed as an array" do
+      site = Site.new(Jekyll::DEFAULTS.merge({'plugins' => ['/tmp/plugins', '/tmp/otherplugins']}))
+      assert_equal ['/tmp/plugins', '/tmp/otherplugins'], site.plugins
+    end
+
+    should "have an empty array for plugins if nothing is passed" do
+      site = Site.new(Jekyll::DEFAULTS.merge({'plugins' => []}))
+      assert_equal [], site.plugins
+    end
+
+    should "have an empty array for plugins if nil is passed" do
+      site = Site.new(Jekyll::DEFAULTS.merge({'plugins' => nil}))
+      assert_equal [], site.plugins
+    end
+  end
   context "creating sites" do
     setup do
       stub(Jekyll).configuration do
@@ -126,12 +152,20 @@ class TestSite < Test::Unit::TestCase
 
     should "filter entries with exclude" do
       excludes = %w[README TODO]
-      includes = %w[index.html site.css]
+      files = %w[index.html site.css .htaccess]
 
       @site.exclude = excludes
-      assert_equal includes, @site.filter_entries(excludes + includes)
+      assert_equal files, @site.filter_entries(excludes + files)
     end
     
+    should "not filter entries within include" do
+      includes = %w[_index.html .htaccess]
+      files = %w[index.html _index.html .htaccess]
+
+      @site.include = includes
+      assert_equal files, @site.filter_entries(files)
+    end
+
     context 'with orphaned files in destination' do
       setup do
         clear_dest

data/test/test_tags.rb

@@ -6,9 +6,14 @@ class TestTags < Test::Unit::TestCase
 
   def create_post(content, override = {}, converter_class = Jekyll::MarkdownConverter)
     stub(Jekyll).configuration do
-      Jekyll::DEFAULTS.merge({'pygments' => true}).merge(override)
+      Jekyll::DEFAULTS.deep_merge({'pygments' => true}).deep_merge(override)
     end
     site = Site.new(Jekyll.configuration)
+
+    if override['read_posts']
+      site.read_posts('')
+    end
+
     info = { :filters => [Jekyll::Filters], :registers => { :site => site } }
     @converter = site.converters.find { |c| c.class == converter_class }
     payload = { "pygments_prefix" => @converter.pygments_prefix,
@@ -31,6 +36,41 @@ CONTENT
     create_post(content, override)
   end
 
+  context "language name" do
+    should "match only the required set of chars" do
+      r = Jekyll::HighlightBlock::SYNTAX
+      assert_match r, "ruby"
+      assert_match r, "c#"
+      assert_match r, "xml+cheetah"
+      assert_match r, "x.y"
+      assert_match r, "coffee-script"
+
+      assert_no_match r, "blah^"
+
+      assert_match r, "ruby key=val"
+      assert_match r, "ruby a=b c=d"
+    end
+  end
+
+  context "initialized tag" do
+    should "work" do
+      tag = Jekyll::HighlightBlock.new('highlight', 'ruby ', ["test", "{% endhighlight %}", "\n"])
+      assert_equal({}, tag.instance_variable_get(:@options))
+
+      tag = Jekyll::HighlightBlock.new('highlight', 'ruby linenos ', ["test", "{% endhighlight %}", "\n"])
+      assert_equal({'O' => "linenos=inline"}, tag.instance_variable_get(:@options))
+
+      tag = Jekyll::HighlightBlock.new('highlight', 'ruby linenos=table ', ["test", "{% endhighlight %}", "\n"])
+      assert_equal({'O' => "linenos=table"}, tag.instance_variable_get(:@options))
+
+      tag = Jekyll::HighlightBlock.new('highlight', 'ruby linenos=table nowrap', ["test", "{% endhighlight %}", "\n"])
+      assert_equal({'O' => "linenos=table,nowrap=true"}, tag.instance_variable_get(:@options))
+
+      tag = Jekyll::HighlightBlock.new('highlight', 'ruby linenos=table cssclass=hl', ["test", "{% endhighlight %}", "\n"])
+      assert_equal({'O' => "cssclass=hl,linenos=table"}, tag.instance_variable_get(:@options))
+    end
+  end
+
   context "post content has highlight tag" do
     setup do
       fill_post("test")
@@ -137,4 +177,25 @@ CONTENT
       end
     end
   end
+
+  context "simple page with post linking" do
+    setup do
+      content = <<CONTENT
+---
+title: Post linking
+---
+
+{% post_url 2008-11-21-complex %}
+CONTENT
+      create_post(content, {'permalink' => 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true})
+    end
+
+    should "not cause an error" do
+      assert_no_match /markdown\-html\-error/, @result
+    end
+
+    should "have the url to the \"complex\" post from 2008-11-21" do
+      assert_match %r{/2008/11/21/complex/}, @result
+    end
+  end
 end