jekyll 1.1.2 → 1.2.0

data/site/docs/variables.md

@@ -7,7 +7,7 @@ permalink: /docs/variables/
 ---
 
 Jekyll traverses your site looking for files to process. Any files with [YAML
-Front Matter](../frontmatter) are subject to processing. For each of these
+Front Matter](../frontmatter/) are subject to processing. For each of these
 files, Jekyll makes a variety of data available via the [Liquid templating
 system](http://wiki.github.com/shopify/liquid/liquid-for-designers). The
 following is a reference of the available data.
@@ -36,7 +36,7 @@ following is a reference of the available data.
       <td><p><code>page</code></p></td>
       <td><p>
 
-        Page specific information + the <a href="../frontmatter">YAML Front
+        Page specific information + the <a href="../frontmatter/">YAML Front
         Matter</a>. Custom variables set via the YAML front matter will be
         available here. See below for details.
 
@@ -57,7 +57,7 @@ following is a reference of the available data.
 
         When the <code>paginate</code> configuration option is set, this
         variable becomes available for use. See <a
-        href="../pagination">Pagination</a> for details.
+        href="../pagination/">Pagination</a> for details.
 
       </p></td>
     </tr>
@@ -221,7 +221,7 @@ following is a reference of the available data.
         directory. For example, a post at
         <code>/work/code/_posts/2008-12-24-closures.md</code> would have this
         field set to <code>['work', 'code']</code>. These can also be specified
-        in the <a href="../frontmatter">YAML Front Matter</a>.
+        in the <a href="../frontmatter/">YAML Front Matter</a>.
 
       </p></td>
     </tr>
@@ -230,7 +230,7 @@ following is a reference of the available data.
       <td><p>
 
         The list of tags to which this post belongs. These can be specified in
-        the <a href="../frontmatter">YAML Front Matter</a>.
+        the <a href="../frontmatter/">YAML Front Matter</a>.
 
       </p></td>
     </tr>
@@ -239,8 +239,8 @@ following is a reference of the available data.
       <td><p>
 
         The path to the raw post or page. Example usage: Linking back to the
-        page or post's source on GitHub. This can be overridden in the
-        <a href="../frontmatter">YAML Front Matter</a>.
+        page or post’s source on GitHub. This can be overridden in the
+        <a href="../frontmatter/">YAML Front Matter</a>.
 
       </p></td>
     </tr>

data/site/feed.xml

@@ -22,7 +22,7 @@ permalink: /feed.xml
     <description>Transform your plain text into static websites and blogs.</description>
     {% for post in site.posts %}
     <item>
-        <title>{{ post.title }}</title>
+        <title>{{ post.title | xml_escape}}</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>

data/site/index.html

@@ -18,19 +18,19 @@ overview: true
       <p>
         No more databases, comment moderation, or pesky updates to install—just <em>your content</em>.
       </p>
-      <a href="/docs/usage" class="">How Jekyll works &rarr;</a>
+      <a href="/docs/usage/" class="">How Jekyll works &rarr;</a>
     </div>
     <div class="unit one-third">
       <h2>Static</h2>
       <p><a href="http://daringfireball.net/projects/markdown/">Markdown</a> (or <a href="http://textile.sitemonks.com/">Textile</a>), <a href="http://wiki.shopify.com/Liquid">Liquid</a>, HTML <span class="amp">&amp;</span> CSS go in. Static sites come out ready for deployment.</p>
-      <a href="/docs/templates" class="">Jekyll template guide &rarr;</a>
+      <a href="/docs/templates/" class="">Jekyll template guide &rarr;</a>
     </div>
     <div class="unit one-third">
       <h2>Blog-aware</h2>
       <p>
         Permalinks, categories, pages, posts, and custom layouts are all first-class citizens here.
       </p>
-      <a href="/docs/migrations" class="">Migrate your blog &rarr;</a>
+      <a href="/docs/migrations/" class="">Migrate your blog &rarr;</a>
     </div>
     <div class="clear"></div>
   </div>

data/test/test_configuration.rb

@@ -79,6 +79,20 @@ class TestConfiguration < Test::Unit::TestCase
       assert_equal @config.backwards_compatibilize["include"], %w[STOP_THE_PRESSES.txt .heloses .git]
     end
   end
+  context "#fix_common_issues" do
+    setup do
+      @config = Proc.new do |val|
+        Configuration[{
+          'paginate' => val
+        }]
+      end
+    end
+    should "sets an invalid 'paginate' value to nil" do
+      assert_nil @config.call(0).fix_common_issues['paginate']
+      assert_nil @config.call(-1).fix_common_issues['paginate']
+      assert_nil @config.call(true).fix_common_issues['paginate']
+    end
+  end
   context "loading configuration" do
     setup do
       @path = File.join(Dir.pwd, '_config.yml')

data/test/test_excerpt.rb

@@ -10,6 +10,22 @@ class TestExcerpt < Test::Unit::TestCase
     post.render(layouts, {"site" => {"posts" => []}})
   end
 
+  context "With extraction disabled" do
+    setup do
+      clear_dest
+      stub(Jekyll).configuration do
+        Jekyll::Configuration::DEFAULTS.merge({'excerpt_separator' => ''})
+      end
+      @site = Site.new(Jekyll.configuration)
+      @post = setup_post("2013-07-22-post-excerpt-with-layout.markdown")
+    end
+
+    should "not be generated" do
+      excerpt = @post.send(:extract_excerpt)
+      assert_equal true, excerpt.empty?
+    end
+  end
+
   context "An extracted excerpt" do
     setup do
       clear_dest

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

data/test/test_post.rb

@@ -562,6 +562,13 @@ class TestPost < Test::Unit::TestCase
       assert conv.kind_of? Jekyll::Converters::Markdown
     end
 
+    should "process .mkdn under text if it is not in the markdown config" do
+      @site.config['markdown_ext'] = 'markdown,mkd,md,text'
+      post = setup_post '2013-08-01-mkdn-extension.mkdn'
+      conv = post.converter
+      assert conv.kind_of? Jekyll::Converters::Identity
+    end
+
     should "process .text as textile under alternate configuration" do
       @site.config['textile_ext'] = 'textile,text'
       post = setup_post '2011-04-12-text-extension.text'

data/test/test_url.rb

@@ -0,0 +1,28 @@
+require 'helper'
+
+class TestURL < Test::Unit::TestCase
+  context "The URL class" do
+
+    should "throw an exception if neither permalink or template is specified" do
+      assert_raises ArgumentError do
+        URL.new(:placeholders => {})
+      end
+    end
+
+    should "replace placeholders in templates" do
+      assert_equal "/foo/bar", URL.new(
+        :template => "/:x/:y",
+        :placeholders => {:x => "foo", :y => "bar"}
+      ).to_s
+    end
+
+    should "return permalink if given" do
+      assert_equal "/le/perma/link", URL.new(
+        :template => "/:x/:y",
+        :placeholders => {:x => "foo", :y => "bar"},
+        :permalink => "/le/perma/link"
+      ).to_s
+    end
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Tom Preston-Werner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-25 00:00:00.000000000 Z
+date: 2013-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -66,20 +66,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.5'
-- !ruby/object:Gem::Dependency
-  name: kramdown
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: pygments.rb
   requirement: !ruby/object:Gem::Requirement
@@ -227,7 +213,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.1
-    - - ! '!='
+    - - '!='
       - !ruby/object:Gem::Version
         version: 1.2.4
   type: :development
@@ -237,7 +223,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.1
-    - - ! '!='
+    - - '!='
       - !ruby/object:Gem::Version
         version: 1.2.4
 - !ruby/object:Gem::Dependency
@@ -254,6 +240,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: kramdown
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: rdiscount
   requirement: !ruby/object:Gem::Requirement
@@ -356,6 +356,7 @@ files:
 - features/support/env.rb
 - jekyll.gemspec
 - lib/jekyll.rb
+- lib/jekyll/cleaner.rb
 - lib/jekyll/command.rb
 - lib/jekyll/commands/build.rb
 - lib/jekyll/commands/doctor.rb
@@ -392,6 +393,7 @@ files:
 - lib/jekyll/tags/highlight.rb
 - lib/jekyll/tags/include.rb
 - lib/jekyll/tags/post_url.rb
+- lib/jekyll/url.rb
 - lib/site_template/.gitignore
 - lib/site_template/_config.yml
 - lib/site_template/_layouts/default.html
@@ -428,6 +430,7 @@ files:
 - site/_posts/2013-07-24-jekyll-1-1-1-released.markdown
 - site/_posts/2013-07-25-jekyll-1-0-4-released.markdown
 - site/_posts/2013-07-25-jekyll-1-1-2-released.markdown
+- site/_posts/2013-09-06-jekyll-1-2-0-released.markdown
 - site/css/gridism.css
 - site/css/normalize.css
 - site/css/pygments.css
@@ -517,6 +520,7 @@ files:
 - test/source/_posts/2013-04-11-custom-excerpt.markdown
 - test/source/_posts/2013-05-10-number-category.textile
 - test/source/_posts/2013-07-22-post-excerpt-with-layout.markdown
+- test/source/_posts/2013-08-01-mkdn-extension.mkdn
 - test/source/_posts/es/2008-11-21-nested.textile
 - test/source/about.html
 - test/source/category/_posts/2008-9-23-categories.textile
@@ -550,6 +554,7 @@ files:
 - test/test_related_posts.rb
 - test/test_site.rb
 - test/test_tags.rb
+- test/test_url.rb
 homepage: http://github.com/mojombo/jekyll
 licenses:
 - MIT
@@ -561,17 +566,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: jekyll
-rubygems_version: 2.0.3
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 2
 summary: A simple, blog aware, static site generator.
@@ -594,3 +599,4 @@ test_files:
 - test/test_related_posts.rb
 - test/test_site.rb
 - test/test_tags.rb
+- test/test_url.rb