jekyll 2.0.0.alpha.2 → 2.0.0.alpha.3

data/test/test_filters.rb

@@ -125,7 +125,7 @@ class TestFilters < Test::Unit::TestCase
           case g["name"]
           when "default"
             assert g["items"].is_a?(Array), "The list of grouped items for 'default' is not an Array."
-            assert_equal 4, g["items"].size
+            assert_equal 5, g["items"].size
           when "nil"
             assert g["items"].is_a?(Array), "The list of grouped items for 'nil' is not an Array."
             assert_equal 2, g["items"].size

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 39, @site.posts.size
+      assert_equal 41, @site.posts.size
     end
 
     should "insert site.posts into the index" do
@@ -33,7 +33,7 @@ class TestGeneratedSite < Test::Unit::TestCase
     end
 
     should "hide unpublished page" do
-      assert !File.exists?(dest_dir('/unpublished.html'))
+      assert !File.exist?(dest_dir('/unpublished.html'))
     end
 
     should "not copy _posts directory" do
@@ -41,13 +41,14 @@ class TestGeneratedSite < Test::Unit::TestCase
     end
 
     should "process other static files and generate correct permalinks" do
-      assert File.exists?(dest_dir('/about/index.html'))
-      assert File.exists?(dest_dir('/contacts.html'))
+      assert File.exist?(dest_dir('/about/index.html'))
+      assert File.exist?(dest_dir('/contacts.html'))
     end
 
     should "print a nice list of static files" do
       expected_output = Regexp.new <<-OUTPUT
 - /css/screen.css last edited at \\d+ with extname .css
+- /pgp.key last edited at \\d+ with extname .key
 - /products.yml last edited at \\d+ with extname .yml
 - /symlink-test/symlinked-dir/screen.css last edited at \\d+ with extname .css
 OUTPUT

data/test/test_new_command.rb

@@ -24,9 +24,9 @@ class TestNewCommand < Test::Unit::TestCase
     end
 
     should 'create a new directory' do
-      assert !File.exists?(@full_path)
+      assert !File.exist?(@full_path)
       capture_stdout { Jekyll::Commands::New.process(@args) }
-      assert File.exists?(@full_path)
+      assert File.exist?(@full_path)
     end
 
     should 'display a success message' do
@@ -83,9 +83,9 @@ class TestNewCommand < Test::Unit::TestCase
     end
 
     should 'create a new directory' do
-      assert !File.exists?(@site_name_with_spaces)
+      assert !File.exist?(@site_name_with_spaces)
       capture_stdout { Jekyll::Commands::New.process(@multiple_args) }
-      assert File.exists?(@site_name_with_spaces)
+      assert File.exist?(@site_name_with_spaces)
     end
   end
 

data/test/test_page.rb

@@ -30,6 +30,11 @@ class TestPage < Test::Unit::TestCase
         assert_equal false, @page.published?
       end
 
+      should "create url with non-alphabetic characters" do
+        @page = setup_page('+', '%# +.md')
+        assert_equal "/+/%25%23%20+.html", @page.url
+      end
+
       context "in a directory hierarchy" do
         should "create url based on filename" do
           @page = setup_page('/contacts', 'bar.html')
@@ -162,7 +167,7 @@ class TestPage < Test::Unit::TestCase
         page.write(dest_dir)
 
         assert File.directory?(dest_dir)
-        assert File.exists?(File.join(dest_dir, 'contacts.html'))
+        assert File.exist?(File.join(dest_dir, 'contacts.html'))
       end
 
       should "write even when the folder name is plus and permalink has +" do
@@ -171,7 +176,16 @@ class TestPage < Test::Unit::TestCase
         page.write(dest_dir)
 
         assert File.directory?(dest_dir)
-        assert File.exists?(File.join(dest_dir, '+', 'plus+in+url'))
+        assert File.exist?(File.join(dest_dir, '+', 'plus+in+url'))
+      end
+
+      should "write even when permalink has '%# +'" do
+        page = setup_page('+', '%# +.md')
+        do_render(page)
+        page.write(dest_dir)
+
+        assert File.directory?(dest_dir)
+        assert File.exist?(File.join(dest_dir, '+', '%# +.html'))
       end
 
       should "write properly without html extension" do
@@ -181,7 +195,7 @@ class TestPage < Test::Unit::TestCase
         page.write(dest_dir)
 
         assert File.directory?(dest_dir)
-        assert File.exists?(File.join(dest_dir, 'contacts', 'index.html'))
+        assert File.exist?(File.join(dest_dir, 'contacts', 'index.html'))
       end
 
       should "write properly with extension different from html" do
@@ -193,7 +207,7 @@ class TestPage < Test::Unit::TestCase
         assert_equal("/sitemap.xml", page.url)
         assert_nil(page.url[/\.html$/])
         assert File.directory?(dest_dir)
-        assert File.exists?(File.join(dest_dir,'sitemap.xml'))
+        assert File.exist?(File.join(dest_dir,'sitemap.xml'))
       end
 
       should "write dotfiles properly" do
@@ -202,7 +216,7 @@ class TestPage < Test::Unit::TestCase
         page.write(dest_dir)
 
         assert File.directory?(dest_dir)
-        assert File.exists?(File.join(dest_dir, '.htaccess'))
+        assert File.exist?(File.join(dest_dir, '.htaccess'))
       end
 
       context "in a directory hierarchy" do
@@ -212,7 +226,7 @@ class TestPage < Test::Unit::TestCase
           page.write(dest_dir)
 
           assert File.directory?(dest_dir)
-          assert File.exists?(File.join(dest_dir, 'contacts', 'index.html'))
+          assert File.exist?(File.join(dest_dir, 'contacts', 'index.html'))
         end
 
         should "write properly" do
@@ -221,7 +235,7 @@ class TestPage < Test::Unit::TestCase
           page.write(dest_dir)
 
           assert File.directory?(dest_dir)
-          assert File.exists?(File.join(dest_dir, 'contacts', 'bar.html'))
+          assert File.exist?(File.join(dest_dir, 'contacts', 'bar.html'))
         end
 
         should "write properly without html extension" do
@@ -231,7 +245,7 @@ class TestPage < Test::Unit::TestCase
           page.write(dest_dir)
 
           assert File.directory?(dest_dir)
-          assert File.exists?(File.join(dest_dir, 'contacts', 'bar', 'index.html'))
+          assert File.exist?(File.join(dest_dir, 'contacts', 'bar', 'index.html'))
         end
       end
     end

data/test/test_path_sanitization.rb

@@ -10,5 +10,9 @@ class TestPathSanitization < Test::Unit::TestCase
     should "strip drive name from path" do
       assert_equal "C:/Users/xmr/Desktop/mpc-hc.org/_site", Jekyll.sanitized_path(@source, @dest)
     end
+
+    should "strip just the initial drive name" do
+      assert_equal "/tmp/foobar/jail/..c:/..c:/..c:/etc/passwd", Jekyll.sanitized_path("/tmp/foobar/jail", "..c:/..c:/..c:/etc/passwd")
+    end
   end
 end

data/test/test_post.rb

@@ -86,13 +86,20 @@ class TestPost < Test::Unit::TestCase
         end
       end
 
-      should "CGI escape urls" do
+      should "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 "escape urls with non-alphabetic characters" do
+        @post.categories = []
+        @post.process("2014-03-22-escape-+ %20[].markdown")
+        assert_equal "/2014/03/22/escape-+%20%2520%5B%5D.html", @post.url
+        assert_equal "/2014/03/22/escape-+ %20[]", @post.id
+      end
+
       should "respect permalink in yaml front matter" do
         file = "2008-12-03-permalinked-post.textile"
         @post.process(file)
@@ -127,6 +134,18 @@ class TestPost < Test::Unit::TestCase
         end
       end
 
+      context "with three dots ending YAML header" do
+        setup do
+          @real_file = "2014-03-03-yaml-with-dots.md"
+        end
+        should "should read the YAML header" do
+          @post.read_yaml(@source, @real_file)
+
+          assert_equal({"title" => "Test Post Where YAML Ends in Dots"},
+                       @post.data)
+        end
+      end
+
       context "with embedded triple dash" do
         setup do
           @real_file = "2010-01-08-triple-dash.markdown"
@@ -396,16 +415,6 @@ class TestPost < Test::Unit::TestCase
     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 date in yaml" do
         post = setup_post("2010-01-09-date-override.textile")
         do_render(post)
@@ -518,7 +527,27 @@ class TestPost < Test::Unit::TestCase
           post.write(dest_dir)
 
           assert File.directory?(dest_dir)
-          assert File.exists?(File.join(dest_dir, '2008', '10', '18', 'foo-bar.html'))
+          assert File.exist?(File.join(dest_dir, '2008', '10', '18', 'foo-bar.html'))
+        end
+
+        should "write properly when url has hash" do
+          post = setup_post("2009-03-12-hash-#1.markdown")
+          do_render(post)
+          post.write(dest_dir)
+
+          assert File.directory?(dest_dir)
+          assert File.exist?(File.join(dest_dir, '2009', '03', '12',
+                                        'hash-#1.html'))
+        end
+
+        should "write properly when url has space" do
+          post = setup_post("2014-03-22-escape-+ %20[].markdown")
+          do_render(post)
+          post.write(dest_dir)
+
+          assert File.directory?(dest_dir)
+          assert File.exist?(File.join(dest_dir, '2014', '03', '22',
+                                        'escape-+ %20[].html'))
         end
 
         should "write properly without html extension" do
@@ -528,7 +557,7 @@ class TestPost < Test::Unit::TestCase
           post.write(dest_dir)
 
           assert File.directory?(dest_dir)
-          assert File.exists?(File.join(dest_dir, 'foo-bar', 'index.html'))
+          assert File.exist?(File.join(dest_dir, 'foo-bar', 'index.html'))
         end
 
         should "insert data" do

data/test/test_site.rb

@@ -159,6 +159,7 @@ class TestSite < Test::Unit::TestCase
       @site.process
       # files in symlinked directories may appear twice
       sorted_pages = %w(
+        %#\ +.md
         .htaccess
         about.html
         bar.html
@@ -186,6 +187,16 @@ class TestSite < Test::Unit::TestCase
       assert_equal posts.size - @num_invalid_posts, @site.posts.size
     end
 
+    should "read pages with yaml front matter" do
+      abs_path = File.expand_path("about.html", @site.source)
+      assert_equal true, @site.send(:has_yaml_header?, abs_path)
+    end
+
+    should "enforce a strict 3-dash limit on the start of the YAML front-matter" do
+      abs_path = File.expand_path("pgp.key", @site.source)
+      assert_equal false, @site.send(:has_yaml_header?, abs_path)
+    end
+
     should "expose jekyll version to site payload" do
       assert_equal Jekyll::VERSION, @site.site_payload['jekyll']['version']
     end
@@ -385,23 +396,6 @@ class TestSite < Test::Unit::TestCase
         assert_nil site.site_payload['site']['data']['products']
       end
 
-      should "load symlink directory in unsafe mode" do
-        site = Site.new(Jekyll.configuration.merge({'safe' => false, 'data_source' => File.join('symlink-test', '_data')}))
-        site.process
-
-        assert_not_nil site.data['products']
-        assert_not_nil site.data['languages']
-        assert_not_nil site.data['members']
-      end
-
-      should "not load symlink directory in safe mode" do
-        site = Site.new(Jekyll.configuration.merge({'safe' => true, 'data_source' => File.join('symlink-test', '_data')}))
-        site.process
-
-        assert_nil site.data['products']
-        assert_nil site.data['languages']
-        assert_nil site.data['members']
-      end
     end
   end
 end

data/test/test_tags.rb

@@ -33,8 +33,12 @@ title: This is a test
 
 This document results in a markdown error with maruku
 
-{% highlight text %}#{code}{% endhighlight %}
-{% highlight text linenos %}#{code}{% endhighlight %}
+{% highlight text %}
+#{code}
+{% endhighlight %}
+{% highlight text linenos %}
+#{code}
+{% endhighlight %}
 CONTENT
     create_post(content, override)
   end
@@ -87,11 +91,11 @@ CONTENT
     end
 
     should "render markdown with pygments" do
-      assert_match %{<pre><code class="text">test\n</code></pre>}, @result
+      assert_match %{<pre><code class="text">test</code></pre>}, @result
     end
 
     should "render markdown with pygments with line numbers" do
-      assert_match %{<pre><code class="text"><span class="lineno">1</span> test\n</code></pre>}, @result
+      assert_match %{<pre><code class="text"><span class="lineno">1</span> test</code></pre>}, @result
     end
   end
 
@@ -101,7 +105,7 @@ CONTENT
     end
 
     should "not embed the file" do
-      assert_match %{<pre><code class="text">./jekyll.gemspec\n</code></pre>}, @result
+      assert_match %{<pre><code class="text">./jekyll.gemspec</code></pre>}, @result
     end
   end
 
@@ -111,7 +115,7 @@ CONTENT
     end
 
     should "render markdown with pygments line handling" do
-      assert_match %{<pre><code class="text">Æ\n</code></pre>}, @result
+      assert_match %{<pre><code class="text">Æ</code></pre>}, @result
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll
 version: !ruby/object:Gem::Version
-  version: 2.0.0.alpha.2
+  version: 2.0.0.alpha.3
 platform: ruby
 authors:
 - Tom Preston-Werner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-26 00:00:00.000000000 Z
+date: 2014-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -451,6 +451,7 @@ files:
 - cucumber.yml
 - docs/jp/CONTRIBUTING.jp.markdown
 - docs/jp/README.jp.markdown
+- features/collections.feature
 - features/create_sites.feature
 - features/data.feature
 - features/drafts.feature
@@ -468,6 +469,7 @@ files:
 - jekyll.gemspec
 - lib/jekyll.rb
 - lib/jekyll/cleaner.rb
+- lib/jekyll/collection.rb
 - lib/jekyll/command.rb
 - lib/jekyll/commands/build.rb
 - lib/jekyll/commands/docs.rb
@@ -485,6 +487,7 @@ files:
 - lib/jekyll/converters/textile.rb
 - lib/jekyll/convertible.rb
 - lib/jekyll/deprecator.rb
+- lib/jekyll/document.rb
 - lib/jekyll/draft.rb
 - lib/jekyll/entry_filter.rb
 - lib/jekyll/errors.rb
@@ -497,8 +500,11 @@ files:
 - lib/jekyll/mime.types
 - lib/jekyll/page.rb
 - lib/jekyll/plugin.rb
+- lib/jekyll/plugin_manager.rb
 - lib/jekyll/post.rb
+- lib/jekyll/publisher.rb
 - lib/jekyll/related_posts.rb
+- lib/jekyll/renderer.rb
 - lib/jekyll/site.rb
 - lib/jekyll/static_file.rb
 - lib/jekyll/stevenson.rb
@@ -517,7 +523,6 @@ files:
 - lib/site_template/_layouts/default.html
 - lib/site_template/_layouts/page.html
 - lib/site_template/_layouts/post.html
-- lib/site_template/_posts/0000-00-00-this-post-demonstrates-post-content-styles.md
 - lib/site_template/_posts/0000-00-00-welcome-to-jekyll.markdown.erb
 - lib/site_template/about/index.md
 - lib/site_template/css/main.css
@@ -527,6 +532,7 @@ files:
 - script/bootstrap
 - script/branding
 - script/cibuild
+- script/console
 - script/rebund
 - site/.gitignore
 - site/CNAME
@@ -572,8 +578,10 @@ files:
 - site/_posts/2013-12-16-jekyll-1-4-2-released.markdown
 - site/_posts/2014-01-13-jekyll-1-4-3-released.markdown
 - site/_posts/2014-03-24-jekyll-1-5-0-released.markdown
+- site/_posts/2014-03-27-jekyll-1-5-1-released.markdown
 - site/css/screen.css
 - site/docs/assets.md
+- site/docs/collections.md
 - site/docs/configuration.md
 - site/docs/contributing.md
 - site/docs/datafiles.md
@@ -602,18 +610,18 @@ files:
 - site/docs/usage.md
 - site/docs/variables.md
 - site/docs/windows.md
-- site/favicon.png
+- site/favicon.ico
 - site/feed.xml
 - site/freenode.txt
 - site/img/article-footer.png
 - site/img/footer-arrow.png
 - site/img/footer-logo.png
 - site/img/logo-2x.png
+- site/img/logo-rss.png
 - site/img/octojekyll.png
-- site/img/tube.png
-- site/img/tube1x.png
 - site/index.html
-- site/js/modernizr-2.7.1.min.js
+- site/js/html5shiv.js
+- site/js/respond.min.js
 - site/news/index.html
 - site/news/releases/index.html
 - test/fixtures/broken_front_matter1.erb
@@ -622,6 +630,7 @@ files:
 - test/fixtures/exploit_front_matter.erb
 - test/fixtures/front_matter.erb
 - test/helper.rb
+- test/source/+/%# +.md
 - test/source/+/foo.md
 - test/source/.htaccess
 - test/source/_config.dev.toml
@@ -635,6 +644,13 @@ files:
 - test/source/_layouts/default.html
 - test/source/_layouts/post/simple.html
 - test/source/_layouts/simple.html
+- test/source/_methods/_do_not_read_me.md
+- test/source/_methods/configuration.md
+- test/source/_methods/sanitized_path.md
+- test/source/_methods/site/_dont_include_me_either.md
+- test/source/_methods/site/generate.md
+- test/source/_methods/site/initialize.md
+- test/source/_methods/um_hi.md
 - test/source/_plugins/dummy.rb
 - test/source/_posts/2008-02-02-not-published.textile
 - test/source/_posts/2008-02-02-published.textile
@@ -672,6 +688,8 @@ files:
 - test/source/_posts/2013-12-17-include-variable-filters.markdown
 - test/source/_posts/2013-12-20-properties.text
 - test/source/_posts/2014-01-06-permalink-traversal.md
+- test/source/_posts/2014-03-03-yaml-with-dots.md
+- test/source/_posts/2014-03-22-escape-+ %20[].markdown
 - test/source/_posts/es/2008-11-21-nested.textile
 - test/source/_sass/_grid.scss
 - test/source/about.html
@@ -686,6 +704,7 @@ files:
 - test/source/foo/_posts/bar/2008-12-12-topical-post.textile
 - test/source/index.html
 - test/source/js/coffeescript.coffee
+- test/source/pgp.key
 - test/source/products.yml
 - test/source/properties.html
 - test/source/sitemap.xml
@@ -696,9 +715,11 @@ files:
 - test/source/z_category/_posts/2008-9-23-categories.textile
 - test/suite.rb
 - test/test_coffeescript.rb
+- test/test_collections.rb
 - test/test_command.rb
 - test/test_configuration.rb
 - test/test_convertible.rb
+- test/test_document.rb
 - test/test_draft.rb
 - test/test_entry_filter.rb
 - test/test_excerpt.rb
@@ -746,6 +767,7 @@ signing_key:
 specification_version: 2
 summary: A simple, blog aware, static site generator.
 test_files:
+- features/collections.feature
 - features/create_sites.feature
 - features/data.feature
 - features/drafts.feature
@@ -766,6 +788,7 @@ test_files:
 - test/fixtures/exploit_front_matter.erb
 - test/fixtures/front_matter.erb
 - test/helper.rb
+- test/source/+/%# +.md
 - test/source/+/foo.md
 - test/source/.htaccess
 - test/source/_config.dev.toml
@@ -779,6 +802,13 @@ test_files:
 - test/source/_layouts/default.html
 - test/source/_layouts/post/simple.html
 - test/source/_layouts/simple.html
+- test/source/_methods/_do_not_read_me.md
+- test/source/_methods/configuration.md
+- test/source/_methods/sanitized_path.md
+- test/source/_methods/site/_dont_include_me_either.md
+- test/source/_methods/site/generate.md
+- test/source/_methods/site/initialize.md
+- test/source/_methods/um_hi.md
 - test/source/_plugins/dummy.rb
 - test/source/_posts/2008-02-02-not-published.textile
 - test/source/_posts/2008-02-02-published.textile
@@ -816,6 +846,8 @@ test_files:
 - test/source/_posts/2013-12-17-include-variable-filters.markdown
 - test/source/_posts/2013-12-20-properties.text
 - test/source/_posts/2014-01-06-permalink-traversal.md
+- test/source/_posts/2014-03-03-yaml-with-dots.md
+- test/source/_posts/2014-03-22-escape-+ %20[].markdown
 - test/source/_posts/es/2008-11-21-nested.textile
 - test/source/_sass/_grid.scss
 - test/source/about.html
@@ -830,6 +862,7 @@ test_files:
 - test/source/foo/_posts/bar/2008-12-12-topical-post.textile
 - test/source/index.html
 - test/source/js/coffeescript.coffee
+- test/source/pgp.key
 - test/source/products.yml
 - test/source/properties.html
 - test/source/sitemap.xml
@@ -840,9 +873,11 @@ test_files:
 - test/source/z_category/_posts/2008-9-23-categories.textile
 - test/suite.rb
 - test/test_coffeescript.rb
+- test/test_collections.rb
 - test/test_command.rb
 - test/test_configuration.rb
 - test/test_convertible.rb
+- test/test_document.rb
 - test/test_draft.rb
 - test/test_entry_filter.rb
 - test/test_excerpt.rb