jekyll 0.4.1 → 0.5.1

data/test/test_generated_site.rb

@@ -1,22 +1,38 @@
 require File.dirname(__FILE__) + '/helper'
 
 class TestGeneratedSite < Test::Unit::TestCase
-  def setup
-    clear_dest
-    source = File.join(File.dirname(__FILE__), *%w[source])
-    @s = Site.new(source, dest_dir)
-    @s.process
-    @index = File.read(File.join(dest_dir, 'index.html'))
-  end
-  
-  def test_site_posts_in_index
-    # confirm that {{ site.posts }} is working
-    puts @s.posts.size
-    assert @index.include?("#{@s.posts.size} Posts")
-  end
+  context "generated sites" do
+    setup do
+      clear_dest
+      stub(Jekyll).configuration do
+        Jekyll::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir})
+      end
+
+      @site = Site.new(Jekyll.configuration)
+      @site.process
+      @index = File.read(dest_dir('index.html'))
+    end
+
+    should "insert site.posts into the index" do
+      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)
+    end
+
+    should "hide unpublished posts" do
+      published = Dir[dest_dir('publish_test/2008/02/02/*.html')].map {|f| File.basename(f)}
+
+      assert_equal 1, published.size
+      assert_equal "published.html", published.first
+    end
 
-  def test_post_content_in_index
-    # confirm that the {{ post.content }} is rendered OK
-    assert @index.include?('<p>This <em>is</em> cool</p>')
+    should "not copy _posts directory" do
+      assert !File.exist?(dest_dir('_posts'))
+    end
   end
 end

data/test/test_post.rb

@@ -1,113 +1,269 @@
 require File.dirname(__FILE__) + '/helper'
 
 class TestPost < Test::Unit::TestCase
-  def setup
-    
+  def setup_post(file)
+    Post.new(@site, source_dir, '', file)
   end
-  
-  def test_valid
-    assert Post.valid?("2008-10-19-foo-bar.textile")
-    assert Post.valid?("foo/bar/2008-10-19-foo-bar.textile")
-    
-    assert !Post.valid?("lol2008-10-19-foo-bar.textile")
-    assert !Post.valid?("blah")
-  end
-  
-  def test_process
-    p = Post.allocate
-    p.process("2008-10-19-foo-bar.textile")
-    
-    assert_equal Time.parse("2008-10-19"), p.date
-    assert_equal "foo-bar", p.slug
-    assert_equal ".textile", p.ext
-  end
-  
-  def test_url
-    p = Post.allocate
-    p.categories = []
-    p.process("2008-10-19-foo-bar.textile")
-    
-    assert_equal "/2008/10/19/foo-bar.html", p.url
-  end
-  
-  def test_permalink
-    p = Post.allocate
-    p.process("2008-12-03-permalinked-post.textile")
-    p.read_yaml(File.join(File.dirname(__FILE__), *%w[source _posts]), "2008-12-03-permalinked-post.textile")
 
-    assert_equal "my_category/permalinked-post", p.permalink
+  def do_render(post)
+    layouts = { "default" => Layout.new(@site, source_dir('_layouts'), "simple.html")}
+    post.render(layouts, {"site" => {"posts" => []}})
   end
 
-  def test_dir_respects_permalink
-    p = Post.allocate
-    p.process("2008-12-03-permalinked-post.textile")
-    p.read_yaml(File.join(File.dirname(__FILE__), *%w[source _posts]), "2008-12-03-permalinked-post.textile")
+  context "A Post" do
+    setup do
+      clear_dest
+      stub(Jekyll).configuration { Jekyll::DEFAULTS }
+      @site = Site.new(Jekyll.configuration)
+    end
 
-    assert_equal "my_category/", p.dir
-  end
-  
-  def test_url_respects_permalink
-    p = Post.allocate
-    p.process("2008-12-03-permalinked-post.textile")
-    p.read_yaml(File.join(File.dirname(__FILE__), *%w[source _posts]), "2008-12-03-permalinked-post.textile")
+    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_equal "my_category/permalinked-post", p.url
-  end
+      assert !Post.valid?("lol2008-10-19-foo-bar.textile")
+      assert !Post.valid?("blah")
+    end
+
+
+    context "processing posts" do
+      setup do
+        @post = Post.allocate
+        @post.site = @site
+
+        @real_file = "2008-10-18-foo-bar.textile"
+        @fake_file = "2008-10-19-foo-bar.textile"
+        @source = source_dir('_posts')
+      end
+
+      should "keep date, title, and markup type" do
+        @post.process(@fake_file)
+
+        assert_equal Time.parse("2008-10-19"), @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
+      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
+      end
+
+      should "CGI escape urls" do
+        @post.categories = []
+        @post.process("2009-03-12-hash-#1.markdown")
+        assert_equal "/2009/03/12/hash-%231.html", @post.url
+        assert_equal "/2009/03/12/hash-#1", @post.id
+      end
+
+      should "respect permalink in yaml front matter" do
+        file = "2008-12-03-permalinked-post.textile"
+        @post.process(file)
+        @post.read_yaml(@source, file)
+
+        assert_equal "my_category/permalinked-post", @post.permalink
+        assert_equal "my_category", @post.dir
+        assert_equal "my_category/permalinked-post", @post.url
+      end
+
+      context "with site wide permalink" do
+        setup do
+          @post.categories = []
+        end
+
+        context "with unspecified (date) style" do
+          setup do
+            @post.process(@fake_file)
+          end
+
+          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
+          end
+        end
+
+        context "with unspecified (date) style and a category" do
+          setup do
+            @post.categories << "beer"
+            @post.process(@fake_file)
+          end
+
+          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
+          end
+        end
+
+        context "with unspecified (date) style and categories" do
+          setup do
+            @post.categories << "food"
+            @post.categories << "beer"
+            @post.process(@fake_file)
+          end
+
+          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
+          end
+        end
+
+        context "with none style" do
+          setup do
+            @post.site.permalink_style = :none
+            @post.process(@fake_file)
+          end
+
+          should "process the url correctly" do
+            assert_equal "/:categories/:title.html", @post.template
+            assert_equal "/foo-bar.html", @post.url
+          end
+        end
+
+        context "with pretty style" do
+          setup do
+            @post.site.permalink_style = :pretty
+            @post.process(@fake_file)
+          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
+          end
+        end
+
+        context "with prefix style and no extension" do
+          setup do
+            @post.site.permalink_style = "/prefix/:title"
+            @post.process(@fake_file)
+          end
+
+          should "process the url correctly" do
+            assert_equal "/prefix/:title", @post.template
+            assert_equal "/prefix/foo-bar", @post.url
+          end
+        end
+      end
+
+      should "read yaml front-matter" do
+        @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
+      end
+
+      should "transform textile" do
+        @post.process(@real_file)
+        @post.read_yaml(@source, @real_file)
+        @post.transform
+
+        assert_equal "<h1>{{ page.title }}</h1>\n<p>Best <strong>post</strong> ever</p>", @post.content
+      end
+    end
+
+    context "when in a site" do
+      setup do
+        clear_dest
+        stub(Jekyll).configuration { Jekyll::DEFAULTS }
+        @site = Site.new(Jekyll.configuration)
+        @site.posts = [setup_post('2008-02-02-published.textile'),
+                       setup_post('2009-01-27-categories.textile')]
+      end
+
+      should "have next post" do
+        assert_equal(@site.posts.last, @site.posts.first.next)
+      end
+
+      should "have previous post" do
+        assert_equal(@site.posts.first, @site.posts.last.previous)
+      end
+
+      should "not have previous post if first" do
+        assert_equal(nil, @site.posts.first.previous)
+      end
+
+      should "not have next post if last" do
+        assert_equal(nil, @site.posts.last.next)
+      end
+    end
+
+    context "initializing posts" do
+      should "publish when published yaml is no specified" do
+        post = setup_post("2008-02-02-published.textile")
+        assert_equal true, post.published
+      end
+
+      should "not published when published yaml is false" do
+        post = setup_post("2008-02-02-not-published.textile")
+        assert_equal false, post.published
+      end
+
+      should "recognize category in yaml" do
+        post = setup_post("2009-01-27-category.textile")
+        assert post.categories.include?('foo')
+      end
+
+      should "recognize several categories in yaml" do
+        post = setup_post("2009-01-27-categories.textile")
+        assert post.categories.include?('foo')
+        assert post.categories.include?('bar')
+        assert post.categories.include?('baz')
+      end
+
+      context "rendering" do
+        setup do
+          clear_dest
+        end
+
+        should "render properly" do
+          post = setup_post("2008-10-18-foo-bar.textile")
+          do_render(post)
+          assert_equal "<<< <h1>Foo Bar</h1>\n<p>Best <strong>post</strong> ever</p> >>>", post.output
+        end
+
+        should "write properly" do
+          post = setup_post("2008-10-18-foo-bar.textile")
+          do_render(post)
+          post.write(dest_dir)
+
+          assert File.directory?(dest_dir)
+          assert File.exists?(File.join(dest_dir, '2008', '10', '18', 'foo-bar.html'))
+        end
+
+        should "write properly without html extension" do
+          post = setup_post("2008-10-18-foo-bar.textile")
+          post.site.permalink_style = ":title"
+          do_render(post)
+          post.write(dest_dir)
+
+          assert File.directory?(dest_dir)
+          assert File.exists?(File.join(dest_dir, 'foo-bar', 'index.html'))
+        end
+
+        should "insert data" do
+          post = setup_post("2008-11-21-complex.textile")
+          do_render(post)
+
+          assert_equal "<<< <p>url: /2008/11/21/complex.html<br />\ndate: #{Time.parse("2008-11-21")}<br />\nid: /2008/11/21/complex</p> >>>", post.output
+        end
+
+        should "include templates" do
+          post = setup_post("2008-12-13-include.markdown")
+          post.site.source = File.join(File.dirname(__FILE__), 'source')
+          do_render(post)
+
+          assert_equal "<<< <hr />\n<p>Tom Preston-Werner github.com/mojombo</p>\n\n<p>This <em>is</em> cool</p> >>>", post.output
+        end
+      end
+    end
+
+    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
 
-  def test_read_yaml
-    p = Post.allocate
-    p.read_yaml(File.join(File.dirname(__FILE__), *%w[source _posts]), "2008-10-18-foo-bar.textile")
-    
-    assert_equal({"title" => "Foo Bar", "layout" => "default"}, p.data)
-    assert_equal "\nh1. {{ page.title }}\n\nBest *post* ever", p.content
-  end
-  
-  def test_transform
-    p = Post.allocate
-    p.process("2008-10-18-foo-bar.textile")
-    p.read_yaml(File.join(File.dirname(__FILE__), *%w[source _posts]), "2008-10-18-foo-bar.textile")
-    p.transform
-    
-    assert_equal "<h1>{{ page.title }}</h1>\n<p>Best <strong>post</strong> ever</p>", p.content
-  end
-  
-  def test_render
-    p = Post.new(File.join(File.dirname(__FILE__), *%w[source]), '',  "2008-10-18-foo-bar.textile")
-    layouts = {"default" => Layout.new(File.join(File.dirname(__FILE__), *%w[source _layouts]), "simple.html")}
-    p.render(layouts, {"site" => {"posts" => []}})
-    
-    assert_equal "<<< <h1>Foo Bar</h1>\n<p>Best <strong>post</strong> ever</p> >>>", p.output
-  end
-  
-  def test_write
-    clear_dest
-    
-    p = Post.new(File.join(File.dirname(__FILE__), *%w[source]), '', "2008-10-18-foo-bar.textile")
-    layouts = {"default" => Layout.new(File.join(File.dirname(__FILE__), *%w[source _layouts]), "simple.html")}
-    p.render(layouts, {"site" => {"posts" => []}})
-    p.write(dest_dir)
-  end
-  
-  def test_data
-    p = Post.new(File.join(File.dirname(__FILE__), *%w[source]), '', "2008-11-21-complex.textile")
-    layouts = {"default" => Layout.new(File.join(File.dirname(__FILE__), *%w[source _layouts]), "simple.html")}
-    p.render(layouts, {"site" => {"posts" => []}})
-    
-    assert_equal "<<< <p>url: /2008/11/21/complex.html<br />\ndate: #{Time.parse("2008-11-21")}<br />\nid: /2008/11/21/complex</p> >>>", p.output
-  end
-  
-  def test_categories_and_topics
-    p = Post.new(File.join(File.dirname(__FILE__), *%w[source]), 'foo', 'bar/2008-12-12-topical-post.textile')
-    assert_equal ['foo'], p.categories
-    assert_equal ['bar'], p.topics
-  end    
-  
-  def test_include
-    Jekyll.source = File.join(File.dirname(__FILE__), *%w[source])
-    p = Post.new(File.join(File.dirname(__FILE__), *%w[source]), '', "2008-12-13-include.markdown")
-    layouts = {"default" => Layout.new(File.join(File.dirname(__FILE__), *%w[source _layouts]), "simple.html")}
-    p.render(layouts, {"site" => {"posts" => []}})
-    
-    assert_equal "<<< <hr />\n<p>Tom Preston-Werner github.com/mojombo</p>\n\n<p>This <em>is</em> cool</p> >>>", p.output
   end
-end
+end

data/test/test_site.rb

@@ -1,33 +1,65 @@
 require File.dirname(__FILE__) + '/helper'
 
 class TestSite < Test::Unit::TestCase
-  def setup
-    source = File.join(File.dirname(__FILE__), *%w[source])
-    @s = Site.new(source, dest_dir)
-  end
-  
-  def test_site_init
-    
-  end
-  
-  def test_read_layouts
-    @s.read_layouts
-    
-    assert_equal ["default", "simple"].sort, @s.layouts.keys.sort
-  end
- 
-  def test_read_posts
-    @s.read_posts('')
-    
-    assert_equal 4, @s.posts.size
-  end
-  
-  def test_site_payload
-    clear_dest
-    @s.process
-    
-    assert_equal 7, @s.posts.length
-    assert_equal ["category", "foo", "z_category"].sort, @s.categories.keys.sort
-    assert_equal 1, @s.categories['foo'].length
+  context "creating sites" do
+    setup do
+      stub(Jekyll).configuration do
+        Jekyll::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir})
+      end
+      @site = Site.new(Jekyll.configuration)
+    end
+
+    should "reset data before processing" do
+      clear_dest
+      @site.process
+      before_posts = @site.posts.length
+      before_layouts = @site.layouts.length
+      before_categories = @site.categories.length
+
+      @site.process
+      assert_equal before_posts, @site.posts.length
+      assert_equal before_layouts, @site.layouts.length
+      assert_equal before_categories, @site.categories.length
+    end
+
+    should "read layouts" do
+      @site.read_layouts
+      assert_equal ["default", "simple"].sort, @site.layouts.keys.sort
+    end
+
+    should "read posts" do
+      @site.read_posts('')
+      posts = Dir[source_dir('_posts', '*')]
+      assert_equal posts.size - 1, @site.posts.size
+    end
+
+    should "deploy payload" do
+      clear_dest
+      @site.process
+
+      posts = Dir[source_dir("**", "_posts", "*")]
+      categories = %w(bar baz category foo z_category publish_test).sort
+
+      assert_equal posts.size - 1, @site.posts.size
+      assert_equal categories, @site.categories.keys.sort
+      assert_equal 4, @site.categories['foo'].size
+    end
+
+    should "filter entries" do
+      ent1 = %w[foo.markdown bar.markdown baz.markdown #baz.markdown#
+              .baz.markdow foo.markdown~]
+      ent2 = %w[.htaccess _posts bla.bla]
+
+      assert_equal %w[foo.markdown bar.markdown baz.markdown], @site.filter_entries(ent1)
+      assert_equal ent2, @site.filter_entries(ent2)
+    end
+
+    should "filter entries with exclude" do
+      excludes = %w[README TODO]
+      includes = %w[index.html site.css]
+
+      @site.exclude = excludes
+      assert_equal includes, @site.filter_entries(excludes + includes)
+    end
   end
 end