nirvdrum-jekyll 0.6.1 → 0.7.0

data/lib/jekyll/static_file.rb

@@ -0,0 +1,28 @@
+module Jekyll
+
+  class StaticFile
+    # Initialize a new StaticFile.
+    #   +site+ is the Site
+    #   +base+ is the String path to the <source>
+    #   +dir+ is the String path between <source> and the file
+    #   +name+ is the String filename of the file
+    #
+    # Returns <StaticFile>
+    def initialize(site, base, dir, name)
+      @site = site
+      @base = base
+      @dir  = dir
+      @name = name
+    end
+
+    # Write the static file to the destination directory.
+    #   +dest+ is the String path to the destination dir
+    #
+    # Returns nothing
+    def write(dest)
+      FileUtils.mkdir_p(File.join(dest, @dir))
+      FileUtils.cp(File.join(@base, @dir, @name), File.join(dest, @dir, @name))
+    end
+  end
+
+end

data/lib/jekyll/tags/highlight.rb

@@ -23,19 +23,18 @@ 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)
-      if context["content_type"] == "markdown"
-        return "\n" + Albino.new(code, @lang).to_s(@options) + "\n"
-      elsif context["content_type"] == "textile"
-        return "<notextile>" + Albino.new(code, @lang).to_s(@options) + "</notextile>"
-      else
-        return Albino.new(code, @lang).to_s(@options)
+      output = add_code_tags(Albino.new(code, @lang).to_s(@options), @lang)
+      case context["content_type"]
+        when "markdown" then "\n" + output + "\n"
+        when "textile" then "<notextile>" + output + "</notextile>"
+        else output
       end
     end
 
@@ -49,6 +48,13 @@ module Jekyll
 </div>
       HTML
     end
+    
+    def add_code_tags(code, lang)
+      # Add nested <code> tags to code blocks
+      code = code.sub(/<pre>/,'<pre><code class="' + lang + '">')
+      code = code.sub(/<\/pre>/,"</code></pre>")
+    end
+    
   end
 
 end

data/test/helper.rb

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

data/test/source/_posts/2009-01-27-empty-categories.textile

@@ -0,0 +1,7 @@
+---
+layout: default
+title: Category in YAML
+categories:
+---
+
+Best *post* ever

data/test/source/_posts/2009-01-27-empty-category.textile

@@ -0,0 +1,7 @@
+---
+layout: default
+title: Category in YAML
+category:
+---
+
+Best *post* ever

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

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

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

@@ -0,0 +1,6 @@
+---
+title: Some Tags
+tags:
+---
+
+Awesome!

data/test/source/_posts/2010-01-08-triple-dash.markdown

@@ -0,0 +1,5 @@
+---
+title: Foo --- Bar
+---
+
+Triple the fun!

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

@@ -0,0 +1,5 @@
+---
+date: 2010-01-10
+---
+
+Post with a front matter date

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

@@ -0,0 +1,5 @@
+---
+date: 2010-01-10 13:07:09
+---
+
+Post with a front matter time

data/test/test_configuration.rb

@@ -8,21 +8,21 @@ class TestConfiguration < Test::Unit::TestCase
 
     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}")
+      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}")
+      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}")
+      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

data/test/test_core_ext.rb

@@ -0,0 +1,66 @@
+require File.dirname(__FILE__) + '/helper'
+
+class TestCoreExt < Test::Unit::TestCase
+  context "hash" do
+
+    context "pluralized_array" do
+
+      should "return empty array with no values" do
+        data = {}
+        assert_equal [], data.pluralized_array('tag', 'tags')
+      end
+
+      should "return empty array with no matching values" do
+        data = { 'foo' => 'bar' }
+        assert_equal [], data.pluralized_array('tag', 'tags')
+      end
+
+      should "return empty array with matching nil singular" do
+        data = { 'foo' => 'bar', 'tag' => nil, 'tags' => ['dog', 'cat'] }
+        assert_equal [], data.pluralized_array('tag', 'tags')
+      end
+
+      should "return single value array with matching singular" do
+        data = { 'foo' => 'bar', 'tag' => 'dog', 'tags' => ['dog', 'cat'] }
+        assert_equal ['dog'], data.pluralized_array('tag', 'tags')
+      end
+
+      should "return single value array with matching singular with spaces" do
+        data = { 'foo' => 'bar', 'tag' => 'dog cat', 'tags' => ['dog', 'cat'] }
+        assert_equal ['dog cat'], data.pluralized_array('tag', 'tags')
+      end
+
+      should "return empty array with matching nil plural" do
+        data = { 'foo' => 'bar', 'tags' => nil }
+        assert_equal [], data.pluralized_array('tag', 'tags')
+      end
+
+      should "return empty array with matching empty array" do
+        data = { 'foo' => 'bar', 'tags' => [] }
+        assert_equal [], data.pluralized_array('tag', 'tags')
+      end
+
+      should "return single value array with matching plural with single string value" do
+        data = { 'foo' => 'bar', 'tags' => 'dog' }
+        assert_equal ['dog'], data.pluralized_array('tag', 'tags')
+      end
+
+      should "return multiple value array with matching plural with single string value with spaces" do
+        data = { 'foo' => 'bar', 'tags' => 'dog cat' }
+        assert_equal ['dog', 'cat'], data.pluralized_array('tag', 'tags')
+      end
+
+      should "return single value array with matching plural with single value array" do
+        data = { 'foo' => 'bar', 'tags' => ['dog'] }
+        assert_equal ['dog'], data.pluralized_array('tag', 'tags')
+      end
+
+      should "return multiple value array with matching plural with multiple value array" do
+        data = { 'foo' => 'bar', 'tags' => ['dog', 'cat'] }
+        assert_equal ['dog', 'cat'], data.pluralized_array('tag', 'tags')
+      end
+
+    end
+
+  end
+end

data/test/test_generated_site.rb

@@ -13,6 +13,10 @@ class TestGeneratedSite < Test::Unit::TestCase
       @index = File.read(dest_dir('index.html'))
     end
 
+    should "ensure post count is as expected" do
+      assert_equal 24, @site.posts.size
+    end
+
     should "insert site.posts into the index" do
       assert @index.include?("#{@site.posts.size} Posts")
     end

data/test/test_pager.rb

@@ -1,11 +1,38 @@
 require File.dirname(__FILE__) + '/helper'
 
 class TestPager < Test::Unit::TestCase
-  context "pagination enabled" do
+
+  should "calculate number of pages" do
+    assert_equal(0, Pager.calculate_pages([], '2'))
+    assert_equal(1, Pager.calculate_pages([1], '2'))
+    assert_equal(1, Pager.calculate_pages([1,2], '2'))
+    assert_equal(2, Pager.calculate_pages([1,2,3], '2'))
+    assert_equal(2, Pager.calculate_pages([1,2,3,4], '2'))
+    assert_equal(3, Pager.calculate_pages([1,2,3,4,5], '2'))
+  end
+
+  context "pagination disabled" do
+    setup do
+      stub(Jekyll).configuration do
+        Jekyll::DEFAULTS.merge({
+          'source'      => source_dir,
+          'destination' => dest_dir
+        })
+      end
+      @config = Jekyll.configuration
+    end
+
+    should "report that pagination is disabled" do
+      assert !Pager.pagination_enabled?(@config, 'index.html')
+    end
+
+  end
+
+  context "pagination enabled for 2" do
     setup do
       stub(Jekyll).configuration do
         Jekyll::DEFAULTS.merge({
-          'source'      => source_dir, 
+          'source'      => source_dir,
           'destination' => dest_dir,
           'paginate'    => 2
         })
@@ -13,35 +40,74 @@ class TestPager < Test::Unit::TestCase
 
       @config = Jekyll.configuration
       @site = Site.new(@config)
-      @posts = @site.read_posts('')
+      @site.process
+      @posts = @site.posts
     end
 
-    should "calculate number of pages" do
-      assert_equal(2, Pager.calculate_pages(@posts, @config['paginate']))
+    should "report that pagination is enabled" do
+      assert Pager.pagination_enabled?(@config, 'index.html')
     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) }
+    context "with 4 posts" do
+      setup do
+        @posts = @site.posts[1..4] # limit to 4
+      end
+
+      should "create first pager" do
+        pager = Pager.new(@config, 1, @posts)
+        assert_equal(2, 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(2, 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
+
     end
-    
-    should "report that pagination is enabled" do
-      assert Pager.pagination_enabled?(@config, 'index.html')
+
+    context "with 5 posts" do
+      setup do
+        @posts = @site.posts[1..5] # limit to 5
+      end
+
+      should "create first pager" do
+        pager = Pager.new(@config, 1, @posts)
+        assert_equal(2, pager.posts.size)
+        assert_equal(3, 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(2, pager.posts.size)
+        assert_equal(3, pager.total_pages)
+        assert_equal(1, pager.previous_page)
+        assert_equal(3, pager.next_page)
+      end
+
+      should "create third pager" do
+        pager = Pager.new(@config, 3, @posts)
+        assert_equal(1, pager.posts.size)
+        assert_equal(3, pager.total_pages)
+        assert_equal(2, pager.previous_page)
+        assert_nil(pager.next_page)
+      end
+
+      should "not create fourth pager" do
+        assert_raise(RuntimeError) { Pager.new(@config, 4, @posts) }
+      end
+
     end
   end
 end

data/test/test_post.rb

@@ -36,6 +36,7 @@ class TestPost < Test::Unit::TestCase
       end
 
       should "keep date, title, and markup type" do
+        @post.categories = []
         @post.process(@fake_file)
 
         assert_equal Time.parse("2008-10-19"), @post.date
@@ -77,7 +78,19 @@ class TestPost < Test::Unit::TestCase
           @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
+          assert_equal "This is the content", @post.content
+        end
+      end
+
+      context "with embedded triple dash" do
+        setup do
+          @real_file = "2010-01-08-triple-dash.markdown"
+        end
+        should "consume the embedded dashes" do
+          @post.read_yaml(@source, @real_file)
+
+          assert_equal({"title" => "Foo --- Bar"}, @post.data)
+          assert_equal "Triple the fun!", @post.content
         end
       end
 
@@ -118,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/10/19/foo-bar.html", @post.url
           end
         end
 
@@ -163,7 +176,7 @@ class TestPost < Test::Unit::TestCase
         @post.read_yaml(@source, @real_file)
 
         assert_equal({"title" => "Foo Bar", "layout" => "default"}, @post.data)
-        assert_equal "\nh1. {{ page.title }}\n\nBest *post* ever", @post.content
+        assert_equal "h1. {{ page.title }}\n\nBest *post* ever", @post.content
       end
 
       should "transform textile" do
@@ -212,6 +225,16 @@ class TestPost < Test::Unit::TestCase
         assert_equal false, post.published
       end
 
+      should "recognize date in yaml" do
+        post = setup_post("2010-01-09-date-override.textile")
+        assert_equal "/2010/01/10/date-override.html", post.url
+      end
+
+      should "recognize time in yaml" do
+        post = setup_post("2010-01-09-time-override.textile")
+        assert_equal "/2010/01/10/time-override.html", post.url
+      end
+
       should "recognize category in yaml" do
         post = setup_post("2009-01-27-category.textile")
         assert post.categories.include?('foo')
@@ -224,6 +247,16 @@ class TestPost < Test::Unit::TestCase
         assert post.categories.include?('baz')
       end
 
+      should "recognize empty category in yaml" do
+        post = setup_post("2009-01-27-empty-category.textile")
+        assert_equal [], post.categories
+      end
+
+      should "recognize empty categories in yaml" do
+        post = setup_post("2009-01-27-empty-categories.textile")
+        assert_equal [], post.categories
+      end
+
       should "recognize tag in yaml" do
         post = setup_post("2009-05-18-tag.textile")
         assert post.tags.include?('code')
@@ -236,6 +269,16 @@ class TestPost < Test::Unit::TestCase
         assert post.tags.include?('pizza')
       end
       
+      should "recognize empty tag in yaml" do
+        post = setup_post("2009-05-18-empty-tag.textile")
+        assert_equal [], post.tags
+      end
+
+      should "recognize empty tags in yaml" do
+        post = setup_post("2009-05-18-empty-tags.textile")
+        assert_equal [], post.tags
+      end
+
       should "allow no yaml" do
         post = setup_post("2009-06-22-no-yaml.textile")
         assert_equal "No YAML.", post.content