diff --git a/lib/site_template/_layouts/post.html b/lib/site_template/_layouts/post.html index 3a0fb52e..2592391f 100644 --- a/lib/site_template/_layouts/post.html +++ b/lib/site_template/_layouts/post.html @@ -4,7 +4,7 @@ layout: default
-

{{ page.title }}

+

{{ page.title | escape }}

{% if page.author %} • {% endif %}

diff --git a/lib/site_template/index.html b/lib/site_template/index.html index 83d93985..9fbc9b70 100644 --- a/lib/site_template/index.html +++ b/lib/site_template/index.html @@ -12,7 +12,7 @@ layout: default {{ post.date | date: "%b %-d, %Y" }}

- {{ post.title }} + {{ post.title | escape }}

{% endfor %} diff --git a/script/proof b/script/proof index 01da5016..a5de7fd6 100755 --- a/script/proof +++ b/script/proof @@ -14,6 +14,7 @@ INGORE_HREFS=$(ruby -e 'puts %w{ twitter.com nearlyfreespeech.net eduardoboucas.com + github.com\/matrix9180 }.map{|h| "/#{h}/"}.join(",")') SOURCE="site" DESTINATION="_site" @@ -31,4 +32,4 @@ bundle exec jekyll build -s $SOURCE -d $DESTINATION --trace # 3. msg "Proofing..." -time bundle exec htmlproof ./$DESTINATION --href-ignore $INGORE_HREFS +time bundle exec htmlproof ./$DESTINATION --url-ignore $INGORE_HREFS diff --git a/site/_docs/extras.md b/site/_docs/extras.md index 708d8718..5abd0d73 100644 --- a/site/_docs/extras.md +++ b/site/_docs/extras.md @@ -15,7 +15,7 @@ Kramdown comes with optional support for LaTeX to PNG rendering via [MathJax](ht {% endhighlight %} -For more information about getting started, check out [this excellent blog post](https://gastonsanchez.com/opinion/2014/02/16/Mathjax-with-jekyll/). +For more information about getting started, check out [this excellent blog post](http://gastonsanchez.com/opinion/2014/02/16/Mathjax-with-jekyll/). ## Alternative Markdown Processors diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md index a8953f91..932fd204 100644 --- a/site/_docs/plugins.md +++ b/site/_docs/plugins.md @@ -845,6 +845,7 @@ LESS.js files during generation. - [Jekyll-Youtube](https://github.com/dommmel/jekyll-youtube) A Liquid tag that embeds Youtube videos. The default emded markup is responsive but you can also specify your own by using an include/partial. - [Jekyll Flickr Plugin](https://github.com/lawmurray/indii-jekyll-flickr) by [Lawrence Murray](http://www.indii.org): Embeds Flickr photosets (albums) as a gallery of thumbnails, with lightbox links to larger images. - [jekyll-figure](https://github.com/paulrobertlloyd/jekyll-figure): A liquid tag for Jekyll that generates `
` elements. +- [Jekyll Video Embed](https://github.com/eug/jekyll-video-embed): It provides several tags to easily embed videos (e.g. Youtube, Vimeo, UStream and Ted Talks) #### Collections diff --git a/site/_docs/resources.md b/site/_docs/resources.md index 2ba5f25e..261100f0 100644 --- a/site/_docs/resources.md +++ b/site/_docs/resources.md @@ -14,7 +14,7 @@ Jekyll’s growing use is producing a wide variety of tutorials, frameworks, ext - [Blogging with Git, Emacs and Jekyll](http://metajack.im/2009/01/23/blogging-with-git-emacs-and-jekyll/) - [Tips for working with GitHub Pages Integration](https://gist.github.com/jedschneider/2890453) -### Integrations +### Integrations - [Use FormKeep as a backend for forms (contact forms, hiring forms, etc.)](https://formkeep.com/guides/how-to-make-a-contact-form-in-jekyll?utm_source=github&utm_medium=jekyll-docs&utm_campaign=contact-form-jekyll) - [Use Simple Form to add a simple contact form](http://getsimpleform.com/) @@ -24,7 +24,7 @@ Jekyll’s growing use is producing a wide variety of tutorials, frameworks, ext ### Other commentary -- [‘My Jekyll Fork’, by Mike West](http://mikewest.org/2009/11/my-jekyll-fork) +- [‘My Jekyll Fork’, by Mike West](https://mikewest.org/2009/11/my-jekyll-fork) > “Jekyll is a well-architected throwback to a time before WordPress, when men were men, and HTML was static. I like the ideas it espouses, and have made a few improvements to it’s core. Here, I’ll point out some highlights of my fork in the hopes that they see usage beyond this site.” diff --git a/site/help/index.md b/site/help/index.md index 7c27ae4d..11213471 100644 --- a/site/help/index.md +++ b/site/help/index.md @@ -5,11 +5,19 @@ title: Getting Help Need help with Jekyll? Try these resources. -### [Upgrading Documentation](/docs/upgrading/) +### [Upgrading](/docs/upgrading/) Did you recently upgrade from Jekyll 1 to 2 or from Jekyll 2 to 3? Known breaking changes are listed in the upgrading docs. +### [Documentation](/docs/home/) + +Our guide to Jekyll covering installation, writing, customization, deployment, and more. + +### [View source](https://github.com/jekyll/jekyll/wiki/sites) + +Learn from the source of others' Jekyll-powered sites. + ### [Google](https://www.google.com/?q=jekyll) Add **jekyll** to almost any query, and you'll find just what you need. diff --git a/test/source/_methods/collection/entries b/test/source/_methods/collection/entries new file mode 100644 index 00000000..7622ac9a --- /dev/null +++ b/test/source/_methods/collection/entries @@ -0,0 +1,5 @@ +--- +title: "Collection#entries" +--- + +I have no file extension but I should still be a part of the collection. diff --git a/test/test_collections.rb b/test/test_collections.rb index d6d7d7de..1faef26e 100644 --- a/test/test_collections.rb +++ b/test/test_collections.rb @@ -126,6 +126,7 @@ class TestCollections < JekyllUnitTest assert_includes %w[ _methods/configuration.md _methods/sanitized_path.md + _methods/collection/entries _methods/site/generate.md _methods/site/initialize.md _methods/um_hi.md diff --git a/test/test_document.rb b/test/test_document.rb index 1197c4da..d3fac02f 100644 --- a/test/test_document.rb +++ b/test/test_document.rb @@ -12,7 +12,7 @@ class TestDocument < JekyllUnitTest "collections" => ["methods"] }) @site.process - @document = @site.collections["methods"].docs.first + @document = @site.collections["methods"].docs.detect {|d| d.relative_path == "_methods/configuration.md" } end should "exist" do @@ -49,7 +49,7 @@ class TestDocument < JekyllUnitTest setup do @site = fixture_site({"collections" => ["methods"]}) @site.process - @document = @site.collections["methods"].docs.last + @document = @site.collections["methods"].docs.detect {|d| d.relative_path == "_methods/yaml_with_dots.md" } end should "know its data" do diff --git a/test/test_filters.rb b/test/test_filters.rb index e9035b96..d8bce740 100644 --- a/test/test_filters.rb +++ b/test/test_filters.rb @@ -103,6 +103,13 @@ class TestFilters < JekyllUnitTest 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 + + should "not modify a time in-place when using filters" do + t = Time.new(2004, 9, 15, 0, 2, 37, "+01:00") + assert_equal 3600, t.utc_offset + @filter.date_to_string(t) + assert_equal 3600, t.utc_offset + end end context "with Date object" do @@ -289,6 +296,14 @@ class TestFilters < JekyllUnitTest end end end + + should "include the size of each grouping" do + grouping = @filter.group_by(@filter.site.pages, "layout") + grouping.each do |g| + p g + assert_equal g["items"].size, g["size"], "The size property for '#{g["name"]}' doesn't match the size of the Array." + end + end end context "where filter" do diff --git a/test/test_kramdown.rb b/test/test_kramdown.rb index fc18c4ce..c9316936 100644 --- a/test/test_kramdown.rb +++ b/test/test_kramdown.rb @@ -14,6 +14,7 @@ class TestKramdown < JekyllUnitTest 'auto_ids' => false, 'footnote_nr' => 1, + 'syntax_highlighter' => 'rouge', 'syntax_highlighter_opts' => { 'bold_every' => 8, 'css' => :class }