jekyll 1.0.4 → 1.1.1

data/site/docs/upgrading.md

@@ -2,13 +2,18 @@
 layout: docs
 title: Upgrading
 prev_section: resources
-next_section: history
+next_section: contributing
 permalink: /docs/upgrading/
 ---
 
 Upgrading from an older version of Jekyll? A few things have changed in 1.0
 that you'll want to know about.
 
+Before we dive in, go ahead and fetch the latest version of Jekyll:
+
+{% highlight bash %}
+$ gem update jekyll
+{% endhighlight %}
 
 <div class="note feature">
   <h5 markdown="1">Diving in</h5>

data/site/docs/variables.md

@@ -84,6 +84,14 @@ following is a reference of the available data.
 
       </p></td>
     </tr>
+    <tr>
+      <td><p><code>site.pages</code></p></td>
+      <td><p>
+
+        A list of all Pages.
+
+      </p></td>
+    </tr>
     <tr>
       <td><p><code>site.posts</code></p></td>
       <td><p>
@@ -161,7 +169,7 @@ following is a reference of the available data.
       <td><p><code>page.title</code></p></td>
       <td><p>
 
-        The title of the Post.
+        The title of the Page.
 
       </p></td>
     </tr>
@@ -189,7 +197,9 @@ following is a reference of the available data.
 
         The Date assigned to the Post. This can be overridden in a Post’s front
         matter by specifying a new date/time in the format
-        <code>YYYY-MM-DD HH:MM:SS</code>
+        <code>YYYY-MM-DD HH:MM:SS</code> (assuming UTC), or
+        <code>YYYY-MM-DD HH:MM:SS +/-TTTT</code> (to specify a time zone using
+        an offset from UTC. e.g. <code>2008-12-14 10:30:00 +0900</code>).
 
       </p></td>
     </tr>

data/site/feed.xml

@@ -0,0 +1,36 @@
+---
+layout: none
+permalink: /feed.xml
+---
+
+<?xml version="1.0" encoding="utf-8"?>
+<rss version="2.0"
+  xmlns:content="http://purl.org/rss/1.0/modules/content/"
+  xmlns:wfw="http://wellformedweb.org/CommentAPI/"
+  xmlns:dc="http://purl.org/dc/elements/1.1/"
+  xmlns:atom="http://www.w3.org/2005/Atom"
+  xmlns:sy="http://purl.org/rss/1.0/modules/syndication/"
+  xmlns:slash="http://purl.org/rss/1.0/modules/slash/"
+  >
+<channel>
+    <title xml:lang="en">Jekyll • Simple, blog-aware, static sites</title>
+    <atom:link type="application/atom+xml" href="http://jekyllrb.com/feed/" rel="self"/>
+    <link>http://jekyllrb.com</link>
+    <pubDate>{{ site.time | date: "%a, %d %b %Y %H:%M:%S %z" }}</pubDate>
+    <lastBuildDate>{{ site.time | date: "%a, %d %b %Y %H:%M:%S %z" }}</lastBuildDate>
+    <language>en-US</language>
+    <description>Transform your plain text into static websites and blogs.</description>
+    {% for post in site.posts %}
+    <item>
+        <title>{{ post.title }}</title>
+        <link>http://jekyllrb.com{{ post.url }}</link>
+        <pubDate>{{ post.date | date: "%a, %d %b %Y %H:%M:%S %z" }}</pubDate>
+        <dc:creator>{{ post.author }}</dc:creator>
+        {% for tag in post.tags %}<category>{{ tag | xml_escape }}</category>
+        {% endfor %}{% for cat in post.categories %}<category>{{ cat | xml_escape }}</category>
+        {% endfor %}<guid isPermaLink="false">{{ post.id }}</guid>
+        <description><![CDATA[ {{ post.content }} ]]></description>
+    </item>
+    {% endfor %}
+</channel>
+</rss>

data/site/freenode.txt

@@ -0,0 +1 @@
+aS3gAc4g

data/site/index.html

@@ -1,6 +1,6 @@
 ---
 layout: default
-title: Jekyll • Simple, blog-aware, static sites
+title: Jekyll • Simple, blog-aware, static sites
 overview: true
 ---
 

data/site/news/index.md

@@ -0,0 +1,10 @@
+---
+layout: news
+title: News
+permalink: /news/
+author: all
+---
+
+{% for post in site.posts %}
+  {% include news_item.html %}
+{% endfor %}

data/site/news/releases/index.md

@@ -0,0 +1,10 @@
+---
+layout: news
+title: Releases
+permalink: /news/releases/
+author: all
+---
+
+{% for post in site.categories.release %}
+  {% include news_item.html %}
+{% endfor %}

data/test/source/+/foo.md

@@ -0,0 +1,7 @@
+---
+layout: default
+title : Page inside +
+permalink: plus+in+url
+---
+Line 1
+{{ page.title }}

data/test/source/_includes/params.html

@@ -0,0 +1,7 @@
+<span id='include-param'>{{include.param}}</span>
+
+<ul id='param-list'>
+  {% for param in include %}
+    <li>{{param[0]}} = {{param[1]}}</li>
+  {% endfor %}
+</ul>

data/test/source/_posts/2013-07-22-post-excerpt-with-layout.markdown

@@ -0,0 +1,23 @@
+---
+layout: post
+title:  Post Excerpt with Layout
+categories:
+- bar
+- baz
+- z_category
+tags:
+- first
+- second
+- third
+- jekyllrb.com
+---
+
+First paragraph with [link ref][link].
+
+Second paragraph
+
+---
+
+Third paragraph
+
+[link]: http://www.jekyllrb.com/

data/test/test_configuration.rb

@@ -82,6 +82,7 @@ class TestConfiguration < Test::Unit::TestCase
   context "loading configuration" do
     setup do
       @path = File.join(Dir.pwd, '_config.yml')
+      @user_config = File.join(Dir.pwd, "my_config_file.yml")
     end
 
     should "fire warning with no _config.yml" do
@@ -102,6 +103,14 @@ class TestConfiguration < Test::Unit::TestCase
       mock($stderr).puts("Configuration file: (INVALID) #{@path}".yellow)
       assert_equal Jekyll::Configuration::DEFAULTS, Jekyll.configuration({})
     end
+
+    should "fire warning when user-specified config file isn't there" do
+      mock(YAML).safe_load_file(@user_config) { raise SystemCallError, "No such file or directory - #{@user_config}" }
+      mock($stderr).puts(("Fatal: ".rjust(20) + "The configuration file '#{@user_config}' could not be found.").red)
+      assert_raises LoadError do
+        Jekyll.configuration({'config' => [@user_config]})
+      end
+    end
   end
   context "loading config from external file" do
     setup do

data/test/test_excerpt.rb

@@ -0,0 +1,62 @@
+require 'helper'
+
+class TestExcerpt < Test::Unit::TestCase
+  def setup_post(file)
+    Post.new(@site, source_dir, '', file)
+  end
+
+  def do_render(post)
+    layouts = { "default" => Layout.new(@site, source_dir('_layouts'), "simple.html")}
+    post.render(layouts, {"site" => {"posts" => []}})
+  end
+
+  context "An extracted excerpt" do
+    setup do
+      clear_dest
+      stub(Jekyll).configuration { Jekyll::Configuration::DEFAULTS }
+      @site = Site.new(Jekyll.configuration)
+      @post = setup_post("2013-07-22-post-excerpt-with-layout.markdown")
+      @excerpt = @post.send :extract_excerpt
+    end
+
+    context "#to_liquid" do
+      should "contain the proper page data to mimick the post liquid" do
+        assert_equal "Post Excerpt with Layout", @excerpt.to_liquid["title"]
+        assert_equal "/bar/baz/z_category/2013/07/22/post-excerpt-with-layout.html", @excerpt.to_liquid["url"]
+        assert_equal Time.parse("2013-07-22"), @excerpt.to_liquid["date"]
+        assert_equal %w[bar baz z_category], @excerpt.to_liquid["categories"]
+        assert_equal %w[first second third jekyllrb.com], @excerpt.to_liquid["tags"]
+        assert_equal "_posts/2013-07-22-post-excerpt-with-layout.markdown", @excerpt.to_liquid["path"]
+      end
+    end
+
+    context "#content" do
+
+      context "before render" do
+        should "be the first paragraph of the page" do
+          assert_equal "First paragraph with [link ref][link].\n\n[link]: http://www.jekyllrb.com/", @excerpt.content
+        end
+
+        should "contain any refs at the bottom of the page" do
+          assert @excerpt.content.include?("[link]: http://www.jekyllrb.com/")
+        end
+      end
+
+      context "after render" do
+        setup do
+          @rendered_post = @post.dup
+          do_render(@rendered_post)
+          @extracted_excerpt = @rendered_post.send :extracted_excerpt
+        end
+
+        should "be the first paragraph of the page" do
+          assert_equal "<p>First paragraph with <a href='http://www.jekyllrb.com/'>link ref</a>.</p>", @extracted_excerpt.content
+        end
+
+        should "link properly" do
+          assert @extracted_excerpt.content.include?("http://www.jekyllrb.com/")
+        end
+      end
+    end
+  end
+end

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 34, @site.posts.size
+      assert_equal 35, @site.posts.size
     end
 
     should "insert site.posts into the index" do

data/test/test_page.rb

@@ -127,6 +127,15 @@ class TestPage < Test::Unit::TestCase
         assert File.exists?(File.join(dest_dir, 'contacts.html'))
       end
 
+      should "write even when the folder name is plus and permalink has +" do
+        page = setup_page('+', 'foo.md')
+        do_render(page)
+        page.write(dest_dir)
+
+        assert File.directory?(dest_dir)
+        assert File.exists?(File.join(dest_dir, '+', 'plus+in+url'))
+      end
+
       should "write properly without html extension" do
         page = setup_page('contacts.html')
         page.site.permalink_style = :pretty

data/test/test_pager.rb

@@ -2,6 +2,17 @@ require 'helper'
 
 class TestPager < Test::Unit::TestCase
 
+  def build_site(config = {})
+    base = Jekyll::Configuration::DEFAULTS.deep_merge({
+      'source'      => source_dir,
+      'destination' => dest_dir,
+      'paginate'    => 1
+    })
+    site = Jekyll::Site.new(base.deep_merge(config))
+    site.process
+    site
+  end
+
   should "calculate number of pages" do
     assert_equal(0, Pager.calculate_pages([], '2'))
     assert_equal(1, Pager.calculate_pages([1], '2'))
@@ -12,49 +23,32 @@ class TestPager < Test::Unit::TestCase
   end
 
   should "determine the pagination path" do
-    assert_nil(Pager.paginate_path(Jekyll::Configuration::DEFAULTS, 1))
-    assert_equal("page2", Pager.paginate_path(Jekyll::Configuration::DEFAULTS, 2))
-    assert_nil(Pager.paginate_path(Jekyll::Configuration::DEFAULTS.merge('paginate_path' => '/blog/page-:num'), 1))
-    assert_equal("page-2", Pager.paginate_path(Jekyll::Configuration::DEFAULTS.merge('paginate_path' => '/blog/page-:num'), 2))
+    assert_equal("/index.html",  Pager.paginate_path(build_site, 1))
+    assert_equal("/page2",       Pager.paginate_path(build_site, 2))
+    assert_equal("/index.html",  Pager.paginate_path(build_site({'paginate_path' => '/blog/page-:num'}), 1))
+    assert_equal("/blog/page-2", Pager.paginate_path(build_site({'paginate_path' => '/blog/page-:num'}), 2))
+    assert_equal("/index.html",  Pager.paginate_path(build_site({'paginate_path' => '/blog/page/:num'}), 1))
+    assert_equal("/blog/page/2", Pager.paginate_path(build_site({'paginate_path' => '/blog/page/:num'}), 2))
+    assert_equal("/contacts/index.html", Pager.paginate_path(build_site({'paginate_path' => '/contacts/page:num'}), 1))
+    assert_equal("/contacts/page2",      Pager.paginate_path(build_site({'paginate_path' => '/contacts/page:num'}), 2))
+    assert_equal("/contacts/index.html", Pager.paginate_path(build_site({'paginate_path' => '/contacts/page/:num'}), 1))
+    assert_equal("/contacts/page/2",     Pager.paginate_path(build_site({'paginate_path' => '/contacts/page/:num'}), 2))
   end
 
   context "pagination disabled" do
-    setup do
-      stub(Jekyll).configuration do
-        Jekyll::Configuration::DEFAULTS.merge({
-          'source'      => source_dir,
-          'destination' => dest_dir
-        })
-      end
-      @config = Jekyll.configuration
-    end
-
     should "report that pagination is disabled" do
-      page = OpenStruct.new({ :name => 'index.html', :dir => '/' })
-      assert !Pager.pagination_enabled?(@config, page)
+      assert !Pager.pagination_enabled?(build_site('paginate' => nil))
     end
-
   end
 
   context "pagination enabled for 2" do
     setup do
-      stub(Jekyll).configuration do
-        Jekyll::Configuration::DEFAULTS.merge({
-          'source'      => source_dir,
-          'destination' => dest_dir,
-          'paginate'    => 2
-        })
-      end
-
-      @config = Jekyll.configuration
-      @site = Site.new(@config)
-      @site.process
+      @site  = build_site('paginate' => 2)
       @posts = @site.posts
     end
 
     should "report that pagination is enabled" do
-      page = OpenStruct.new({ :name => 'index.html', :dir => '/' })
-      assert Pager.pagination_enabled?(@config, page)
+      assert Pager.pagination_enabled?(@site)
     end
 
     context "with 4 posts" do
@@ -63,7 +57,7 @@ class TestPager < Test::Unit::TestCase
       end
 
       should "create first pager" do
-        pager = Pager.new(@config, 1, @posts)
+        pager = Pager.new(@site, 1, @posts)
         assert_equal(2, pager.posts.size)
         assert_equal(2, pager.total_pages)
         assert_nil(pager.previous_page)
@@ -71,7 +65,7 @@ class TestPager < Test::Unit::TestCase
       end
 
       should "create second pager" do
-        pager = Pager.new(@config, 2, @posts)
+        pager = Pager.new(@site, 2, @posts)
         assert_equal(2, pager.posts.size)
         assert_equal(2, pager.total_pages)
         assert_equal(1, pager.previous_page)
@@ -79,7 +73,7 @@ class TestPager < Test::Unit::TestCase
       end
 
       should "not create third pager" do
-        assert_raise(RuntimeError) { Pager.new(@config, 3, @posts) }
+        assert_raise(RuntimeError) { Pager.new(@site, 3, @posts) }
       end
 
     end
@@ -90,7 +84,7 @@ class TestPager < Test::Unit::TestCase
       end
 
       should "create first pager" do
-        pager = Pager.new(@config, 1, @posts)
+        pager = Pager.new(@site, 1, @posts)
         assert_equal(2, pager.posts.size)
         assert_equal(3, pager.total_pages)
         assert_nil(pager.previous_page)
@@ -98,7 +92,7 @@ class TestPager < Test::Unit::TestCase
       end
 
       should "create second pager" do
-        pager = Pager.new(@config, 2, @posts)
+        pager = Pager.new(@site, 2, @posts)
         assert_equal(2, pager.posts.size)
         assert_equal(3, pager.total_pages)
         assert_equal(1, pager.previous_page)
@@ -106,7 +100,7 @@ class TestPager < Test::Unit::TestCase
       end
 
       should "create third pager" do
-        pager = Pager.new(@config, 3, @posts)
+        pager = Pager.new(@site, 3, @posts)
         assert_equal(1, pager.posts.size)
         assert_equal(3, pager.total_pages)
         assert_equal(2, pager.previous_page)
@@ -114,7 +108,7 @@ class TestPager < Test::Unit::TestCase
       end
 
       should "not create fourth pager" do
-        assert_raise(RuntimeError) { Pager.new(@config, 4, @posts) }
+        assert_raise(RuntimeError) { Pager.new(@site, 4, @posts) }
       end
 
     end

data/test/test_post.rb

@@ -267,9 +267,10 @@ class TestPost < Test::Unit::TestCase
       context "#excerpt" do
         setup do
           file = "2013-01-02-post-excerpt.markdown"
+          @post = setup_post(file)
           @post.process(file)
           @post.read_yaml(@source, file)
-          @post.transform
+          do_render(@post)
         end
 
         should "return first paragraph by default" do