jekyll 1.0.0.rc1 → 1.0.0

data/site/index.html

@@ -5,25 +5,27 @@ overview: true
 ---
 
 <section class="intro">
-  <div class="content">
-    <p class="first">Transform your plain text into static websites and blogs. <br />So easy, <strong>it&rsquo;s scary</strong>.</p>
+  <div class="grid">
+    <div class="unit whole center-on-mobiles">
+      <p class="first">Transform your plain text into static&nbsp;websites and&nbsp;blogs.</p>
+    </div>
   </div>
 </section>
 <section class="features">
-  <div class="content">
-    <div class="grid4 first">
+  <div class="grid">
+    <div class="unit one-third">
       <h2>Simple</h2>
       <p>
         No more databases, comment moderation, or pesky updates to install—just <em>your content</em>.
       </p>
       <a href="{% post_url 2012-07-01-usage %}" class="">How Jekyll works &rarr;</a>
     </div>
-    <div class="grid4">
+    <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://liquidmarkup.org/">Liquid</a>, HTML <span class="amp">&amp;</span> CSS go in. Static sites come out ready for deployment.</p>
       <a href="{% post_url 2012-07-01-templates %}" class="">Jekyll template guide &rarr;</a>
     </div>
-    <div class="grid4">
+    <div class="unit one-third">
       <h2>Blog-aware</h2>
       <p>
         Permalinks, categories, pages, posts, and custom layouts are all first-class citizens here.
@@ -34,49 +36,55 @@ overview: true
   </div>
 </section>
 <section class="quickstart">
-  <div class="content">
-    <div class="grid5 first">
-      <h4>Get up and running <em>in seconds</em>.</h4>
+  <div class="grid">
+    <div class="unit golden-small center-on-mobiles">
+      <h4>Get up and running <em>in&nbsp;seconds</em>.</h4>
     </div>
-      <div class="code">
-        <p class="title">Quick-start Instructions</p>
-        <div class="shell">
-          <p class="line">
-            <span class="path">~</span>
-            <span class="prompt">$</span>
-            <span class="command">gem install jekyll</span>
-          </p>
-          <p class="line">
-            <span class="path">~</span>
-            <span class="prompt">$</span>
-            <span class="command">jekyll new my-awesome-site</span>
-          </p>
-          <p class="line">
-            <span class="path">~</span>
-            <span class="prompt">$</span>
-            <span class="command">cd my-awesome-site</span>
-          </p>
-          <p class="line">
-            <span class="path">~/my-awesome-site</span>
-            <span class="prompt">$</span>
-            <span class="command">jekyll serve</span>
-          </p>
-          <p class="line">
-            <span class="output"># => Now browse to http://localhost:4000</span>
-          </p>
-        </div>
+    <div class="unit golden-large code">
+      <p class="title">Quick-start Instructions</p>
+      <div class="shell">
+        <p class="line">
+          <span class="path">~</span>
+          <span class="prompt">$</span>
+          <span class="command">gem install jekyll</span>
+        </p>
+        <p class="line">
+          <span class="path">~</span>
+          <span class="prompt">$</span>
+          <span class="command">jekyll new my-awesome-site</span>
+        </p>
+        <p class="line">
+          <span class="path">~</span>
+          <span class="prompt">$</span>
+          <span class="command">cd my-awesome-site</span>
+        </p>
+        <p class="line">
+          <span class="path">~/my-awesome-site</span>
+          <span class="prompt">$</span>
+          <span class="command">jekyll serve</span>
+        </p>
+        <p class="line">
+          <span class="output"># => Now browse to http://localhost:4000</span>
+        </p>
       </div>
+    </div>
     <div class="clear"></div>
   </div>
 </section>
 <section class="free-hosting">
-  <div class="content">
-    <img src="img/octojekyll.png" alt="Free Jekyll hosting on GitHub Pages">
-    <div class="pane">
-      <h2><strong>Free hosting</strong> with GitHub Pages</h2>
-      <p>Sick of dealing with hosting companies? <a href="http://pages.github.com/">GitHub Pages</a> are <em>powered by Jekyll</em>, so you can easily deploy your site using GitHub for free&mdash;<a href="https://help.github.com/articles/setting-up-a-custom-domain-with-pages">custom domain name</a> and all.</p>
-      <a href="http://pages.github.com/" class="">Learn more about GitHub Pages &rarr;</a>
-      <div class="clear"></div>
+  <div class="grid">
+    <div class="unit whole">
+      <div class="grid pane">
+        <div class="unit whole center-on-mobiles">
+          <img src="img/octojekyll.png" alt="Free Jekyll hosting on GitHub Pages">
+          <div class="pane-content">
+            <h2 class="center-on-mobiles"><strong>Free hosting</strong> with GitHub Pages</h2>
+            <p>Sick of dealing with hosting companies? <a href="http://pages.github.com/">GitHub Pages</a> are <em>powered by Jekyll</em>, so you can easily deploy your site using GitHub for free&mdash;<a href="https://help.github.com/articles/setting-up-a-custom-domain-with-pages">custom domain name</a> and&nbsp;all.</p>
+            <a href="http://pages.github.com/" class="">Learn more about GitHub Pages &rarr;</a>
+          </div>
+        </div>
+        <div class="clear"></div>
+      </div>
     </div>
   </div>
 </section>

data/test/helper.rb

@@ -6,6 +6,7 @@ end
 
 require 'rubygems'
 require 'test/unit'
+require 'ostruct'
 gem 'RedCloth', '>= 4.2.1'
 
 require 'jekyll'

data/test/source/_posts/es/2008-11-21-nested.textile

@@ -0,0 +1,8 @@
+---
+layout: default
+title: Nested
+---
+
+url: {{ page.url }}
+date: {{ page.date }}
+id: {{ page.id }}

data/test/test_convertible.rb

@@ -25,7 +25,7 @@ class TestConvertible < Test::Unit::TestCase
         ret = @convertible.read_yaml(@base, name)
         assert_equal({}, ret)
       end
-      assert_match(/YAML Exception|syntax error/, out)
+      assert_match(/YAML Exception|syntax error|Error reading file/, out)
       assert_match(/#{File.join(@base, name)}/, out)
     end
 

data/test/test_filters.rb

@@ -14,6 +14,7 @@ class TestFilters < Test::Unit::TestCase
     setup do
       @filter = JekyllFilter.new
       @sample_time = Time.utc(2013, 03, 27, 11, 22, 33)
+      @time_as_string = "September 11, 2001 12:46:30 -0000"
     end
 
     should "textilize with simple string" do
@@ -43,20 +44,42 @@ class TestFilters < Test::Unit::TestCase
       assert_equal "chunky, bacon, bits, and pieces", @filter.array_to_sentence_string(["chunky", "bacon", "bits", "pieces"])
     end
 
-    should "format a date with short format" do
-      assert_equal "27 Mar 2013", @filter.date_to_string(@sample_time)
-    end
+    context "date filters" do
+      context "with Time object" do
+        should "format a date with short format" do
+          assert_equal "27 Mar 2013", @filter.date_to_string(@sample_time)
+        end
 
-    should "format a date with long format" do
-      assert_equal "27 March 2013", @filter.date_to_long_string(@sample_time)
-    end
+        should "format a date with long format" do
+          assert_equal "27 March 2013", @filter.date_to_long_string(@sample_time)
+        end
 
-    should "format a time with xmlschema" do
-      assert_equal "2013-03-27T11:22:33Z", @filter.date_to_xmlschema(@sample_time)
-    end
+        should "format a time with xmlschema" do
+          assert_equal "2013-03-27T11:22:33Z", @filter.date_to_xmlschema(@sample_time)
+        end
+
+        should "format a time according to RFC-822" do
+          assert_equal "Wed, 27 Mar 2013 11:22:33 -0000", @filter.date_to_rfc822(@sample_time)
+        end
+      end
+
+      context "with String object" do
+        should "format a date with short format" do
+          assert_equal "11 Sep 2001", @filter.date_to_string(@time_as_string)
+        end
+
+        should "format a date with long format" do
+          assert_equal "11 September 2001", @filter.date_to_long_string(@time_as_string)
+        end
+
+        should "format a time with xmlschema" do
+          assert_equal "2001-09-11T12:46:30Z", @filter.date_to_xmlschema(@time_as_string)
+        end
 
-    should "format a time according to RFC-822" do
-      assert_equal "Wed, 27 Mar 2013 11:22:33 -0000", @filter.date_to_rfc822(@sample_time)
+        should "format a time according to RFC-822" do
+          assert_equal "Tue, 11 Sep 2001 12:46:30 -0000", @filter.date_to_rfc822(@time_as_string)
+        end
+      end
     end
 
     should "escape xml with ampersands" do

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 32, @site.posts.size
+      assert_equal 33, @site.posts.size
     end
 
     should "insert site.posts into the index" do
@@ -58,8 +58,19 @@ class TestGeneratedSite < Test::Unit::TestCase
       assert_equal 5, @site.posts.size
     end
 
-    should "ensure limit posts is 1 or more" do
+    should "ensure limit posts is 0 or more" do
       assert_raise ArgumentError do
+        clear_dest
+        stub(Jekyll).configuration do
+          Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'limit_posts' => -1})
+        end
+
+        @site = Site.new(Jekyll.configuration)
+      end
+    end
+
+    should "acceptable limit post is 0" do
+      assert_nothing_raised ArgumentError do
         clear_dest
         stub(Jekyll).configuration do
           Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'limit_posts' => 0})

data/test/test_kramdown.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require 'helper'
 
 class TestKramdown < Test::Unit::TestCase
@@ -23,11 +25,11 @@ class TestKramdown < Test::Unit::TestCase
 
     should "convert quotes to smart quotes" do
       markdown = Converters::Markdown.new(@config)
-      assert_equal "<p>&#8220;Pit&#8217;hy&#8221;</p>", markdown.convert(%{"Pit'hy"}).strip
+      assert_match /<p>(&#8220;|“)Pit(&#8217;|’)hy(&#8221;|”)<\/p>/, markdown.convert(%{"Pit'hy"}).strip
 
       override = { 'kramdown' => { 'smart_quotes' => 'lsaquo,rsaquo,laquo,raquo' } }
       markdown = Converters::Markdown.new(@config.deep_merge(override))
-      assert_equal "<p>&#171;Pit&#8250;hy&#187;</p>", markdown.convert(%{"Pit'hy"}).strip
+      assert_match /<p>(&#171;|«)Pit(&#8250;|›)hy(&#187;|»)<\/p>/, markdown.convert(%{"Pit'hy"}).strip
     end
   end
 end

data/test/test_pager.rb

@@ -23,7 +23,8 @@ class TestPager < Test::Unit::TestCase
     end
 
     should "report that pagination is disabled" do
-      assert !Pager.pagination_enabled?(@config, 'index.html')
+      page = OpenStruct.new({ :name => 'index.html', :dir => '/' })
+      assert !Pager.pagination_enabled?(@config, page)
     end
 
   end
@@ -45,7 +46,8 @@ class TestPager < Test::Unit::TestCase
     end
 
     should "report that pagination is enabled" do
-      assert Pager.pagination_enabled?(@config, 'index.html')
+      page = OpenStruct.new({ :name => 'index.html', :dir => '/' })
+      assert Pager.pagination_enabled?(@config, page)
     end
 
     context "with 4 posts" do

data/test/test_post.rb

@@ -71,8 +71,8 @@ class TestPost < Test::Unit::TestCase
         @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
+        assert_equal "/my_category", @post.dir
+        assert_equal "/my_category/permalinked-post", @post.url
       end
 
       context "with CRLF linebreaks" do

data/test/test_site.rb

@@ -48,6 +48,7 @@ class TestSite < Test::Unit::TestCase
         Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir})
       end
       @site = Site.new(Jekyll.configuration)
+      @num_invalid_posts = 2
     end
 
     should "have an empty tag hash by default" do
@@ -160,20 +161,20 @@ class TestSite < Test::Unit::TestCase
 
     should "read posts" do
       @site.read_posts('')
-      posts = Dir[source_dir('_posts', '*')]
-      posts.delete_if { |post| File.directory?(post) }
-      assert_equal posts.size - 1, @site.posts.size
+      posts = Dir[source_dir('_posts', '**', '*')]
+      posts.delete_if { |post| File.directory?(post) && !Post.valid?(post) }
+      assert_equal posts.size - @num_invalid_posts, @site.posts.size
     end
 
     should "deploy payload" do
       clear_dest
       @site.process
 
-      posts = Dir[source_dir("**", "_posts", "*")]
-      posts.delete_if { |post| File.directory?(post) }
+      posts = Dir[source_dir("**", "_posts", "**", "*")]
+      posts.delete_if { |post| File.directory?(post) && !Post.valid?(post) }
       categories = %w(bar baz category foo z_category publish_test win).sort
 
-      assert_equal posts.size, @site.posts.size
+      assert_equal posts.size - @num_invalid_posts, @site.posts.size
       assert_equal categories, @site.categories.keys.sort
       assert_equal 4, @site.categories['foo'].size
     end

data/test/test_tags.rb

@@ -204,6 +204,36 @@ CONTENT
     end
   end
 
+  context "simple page with nested post linking" do
+    setup do
+      content = <<CONTENT
+---
+title: Post linking
+---
+
+- 1 {% post_url 2008-11-21-complex %}
+- 2 {% post_url /2008-11-21-complex %}
+- 3 {% post_url es/2008-11-21-nested %}
+- 4 {% post_url /es/2008-11-21-nested %}
+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 \"nested\" post from 2008-11-21" do
+      assert_match %r{1\s/2008/11/21/complex/}, @result
+      assert_match %r{2\s/2008/11/21/complex/}, @result
+    end
+
+    should "have the url to the \"nested\" post from 2008-11-21" do
+      assert_match %r{3\s/2008/11/21/nested/}, @result
+      assert_match %r{4\s/2008/11/21/nested/}, @result
+    end
+  end
+
   context "gist tag" do
     context "simple" do
       setup do

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: jekyll
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc1
-  prerelease: 6
+  version: 1.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Tom Preston-Werner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-16 00:00:00.000000000 Z
+date: 2013-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -416,14 +416,13 @@ files:
 - lib/jekyll/tags/highlight.rb
 - lib/jekyll/tags/include.rb
 - lib/jekyll/tags/post_url.rb
+- lib/site_template/.gitignore
 - lib/site_template/_config.yml
 - lib/site_template/_layouts/default.html
 - lib/site_template/_layouts/post.html
 - lib/site_template/_posts/0000-00-00-welcome-to-jekyll.markdown.erb
-- lib/site_template/css/screen.css
+- lib/site_template/css/main.css
 - lib/site_template/css/syntax.css
-- lib/site_template/images/.gitkeep
-- lib/site_template/images/rss.png
 - lib/site_template/index.html
 - script/bootstrap
 - site/.gitignore
@@ -432,8 +431,10 @@ files:
 - site/_config.yml
 - site/_includes/analytics.html
 - site/_includes/docs_contents.html
+- site/_includes/docs_contents_mobile.html
 - site/_includes/footer.html
 - site/_includes/header.html
+- site/_includes/primary-nav-items.html
 - site/_includes/section_nav.html
 - site/_includes/top.html
 - site/_layouts/default.html
@@ -458,9 +459,10 @@ files:
 - site/_posts/2012-07-01-structure.md
 - site/_posts/2012-07-01-templates.md
 - site/_posts/2012-07-01-troubleshooting.md
+- site/_posts/2012-07-01-upgrading.md
 - site/_posts/2012-07-01-usage.md
 - site/_posts/2012-07-01-variables.md
-- site/css/grid.css
+- site/css/gridism.css
 - site/css/normalize.css
 - site/css/pygments.css
 - site/css/style.css
@@ -516,6 +518,7 @@ files:
 - test/source/_posts/2013-01-12-no-layout.textile
 - test/source/_posts/2013-03-19-not-a-post.markdown/.gitkeep
 - test/source/_posts/2013-04-11-custom-excerpt.markdown
+- test/source/_posts/es/2008-11-21-nested.textile
 - test/source/about.html
 - test/source/category/_posts/2008-9-23-categories.textile
 - test/source/contacts.html
@@ -560,15 +563,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -61414058465599084
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: jekyll
 rubygems_version: 1.8.23