From 5445a1bead4d6257526208bed03f6eab078ab22c Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Sun, 14 Sep 2014 11:36:26 -0700 Subject: [PATCH 01/12] Add test for Use per-post permalinks ending in .htm --- features/permalinks.feature | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/features/permalinks.feature b/features/permalinks.feature index f63aaf81..67dfbb47 100644 --- a/features/permalinks.feature +++ b/features/permalinks.feature @@ -83,3 +83,13 @@ Feature: Fancy permalinks Then the _site directory should exist And the _site/custom/posts directory should exist And I should see "bla bla" in "_site/custom/posts/some.html" + + Scenario: Use per-post ending in .htm + Given I have a _posts directory + And I have the following post: + | title | date | permalink | content | + | Some post | 2013-04-14 | /custom/posts/some.htm | bla bla | + When I run jekyll build + Then the _site directory should exist + And the _site/custom/posts directory should exist + And I should see "bla bla" in "_site/custom/posts/some.htm" From fdf58c5ce2ba9b294ff7aacadc7fafe70f648e0d Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Sun, 14 Sep 2014 11:58:16 -0700 Subject: [PATCH 02/12] Allow per post permalinks to end in `.htm` Fixes #2920 --- lib/jekyll/post.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jekyll/post.rb b/lib/jekyll/post.rb index b13deff8..293e2c5d 100644 --- a/lib/jekyll/post.rb +++ b/lib/jekyll/post.rb @@ -269,7 +269,7 @@ module Jekyll def destination(dest) # The url needs to be unescaped in order to preserve the correct filename path = Jekyll.sanitized_path(dest, URL.unescape_path(url)) - path = File.join(path, "index.html") if path[/\.html$/].nil? + path = File.join(path, "index.html") if path[/\.html?$/].nil? path end From 0f008c02d821e859698a0fb317d18fcee3694b0c Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 19 Sep 2014 19:56:36 -0700 Subject: [PATCH 03/12] Add note about using the github-pages gem properly --- site/_docs/github-pages.md | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/site/_docs/github-pages.md b/site/_docs/github-pages.md index b8bf4d33..b448d510 100644 --- a/site/_docs/github-pages.md +++ b/site/_docs/github-pages.md @@ -12,6 +12,32 @@ organizations, and repositories, that are freely hosted on GitHub's powered by Jekyll behind the scenes, so in addition to supporting regular HTML content, they’re also a great way to host your Jekyll-powered website for free. + +
+
Use the github-pages gem
+

+ Our friends at GitHub have provided the + github-pages + gem which is used to manage Jekyll and its dependencies on + GitHub Pages. To use the currently-deployed version of the + gem in your project, add the following to your `Gemfile`: + + {% highlight ruby %} + source 'https://rubygems.org' + + require 'json' + require 'open-uri' + versions = JSON.parse(open('https://pages.github.com/versions.json').read) + + + gem 'github-pages', versions['github-pages'] + {% endhighlight %} + + This will ensure that when you run bundle install, you + have the correct version of the github-pages gem. +

+
+ ## Deploying Jekyll to GitHub Pages GitHub Pages work by looking at certain branches of repositories on GitHub. From a7eeeda99f1a1b65bc1d5c43d79fcfd36fae1388 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 19 Sep 2014 19:58:45 -0700 Subject: [PATCH 04/12] Move it down a little --- site/_docs/github-pages.md | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/site/_docs/github-pages.md b/site/_docs/github-pages.md index b448d510..e098067f 100644 --- a/site/_docs/github-pages.md +++ b/site/_docs/github-pages.md @@ -12,6 +12,12 @@ organizations, and repositories, that are freely hosted on GitHub's powered by Jekyll behind the scenes, so in addition to supporting regular HTML content, they’re also a great way to host your Jekyll-powered website for free. +## Deploying Jekyll to GitHub Pages + +GitHub Pages work by looking at certain branches of repositories on GitHub. +There are two basic types available: user/organization pages and project pages. +The way to deploy these two types of sites are nearly identical, except for a +few minor details.
Use the github-pages gem
@@ -38,13 +44,6 @@ content, they’re also a great way to host your Jekyll-powered website for free

-## Deploying Jekyll to GitHub Pages - -GitHub Pages work by looking at certain branches of repositories on GitHub. -There are two basic types available: user/organization pages and project pages. -The way to deploy these two types of sites are nearly identical, except for a -few minor details. - ### User and Organization Pages User and organization pages live in a special GitHub repository dedicated to From e013c16ba946f851e2d0df91c0a53218c7c7e8fa Mon Sep 17 00:00:00 2001 From: Philipp Rudloff Date: Mon, 22 Sep 2014 08:18:14 +0200 Subject: [PATCH 05/12] Fix code example for media query mixin It was using an old variable name (`$palm`) instead of the current one (`$on-paln`). --- lib/site_template/css/main.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/site_template/css/main.scss b/lib/site_template/css/main.scss index f03d1c3d..5415d8bc 100755 --- a/lib/site_template/css/main.scss +++ b/lib/site_template/css/main.scss @@ -27,7 +27,7 @@ $on-laptop: 800px; // Using media queries with like this: -// @include media-query($palm) { +// @include media-query($on-palm) { // .wrapper { // padding-right: $spacing-unit / 2; // padding-left: $spacing-unit / 2; From a5a8be97de6b0372c6e70b01d8a1a17f4e43974b Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 22 Sep 2014 22:52:23 -0700 Subject: [PATCH 06/12] Make it a little nicer. --- site/_docs/github-pages.md | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/site/_docs/github-pages.md b/site/_docs/github-pages.md index b448d510..c9305cd0 100644 --- a/site/_docs/github-pages.md +++ b/site/_docs/github-pages.md @@ -19,20 +19,22 @@ content, they’re also a great way to host your Jekyll-powered website for free Our friends at GitHub have provided the github-pages gem which is used to manage Jekyll and its dependencies on - GitHub Pages. To use the currently-deployed version of the - gem in your project, add the following to your `Gemfile`: - - {% highlight ruby %} - source 'https://rubygems.org' + GitHub Pages. Using it in your projects means that when you deploy + your site to GitHub Pages, you will not be caught by unexpected + differences between various versions of the gems. To use the + currently-deployed version of the gem in your project, add the + following to your Gemfile: - require 'json' - require 'open-uri' - versions = JSON.parse(open('https://pages.github.com/versions.json').read) +{% highlight ruby %} +source 'https://rubygems.org' +require 'json' +require 'open-uri' +versions = JSON.parse(open('https://pages.github.com/versions.json').read) + +gem 'github-pages', versions['github-pages'] +{% endhighlight %} - gem 'github-pages', versions['github-pages'] - {% endhighlight %} - This will ensure that when you run bundle install, you have the correct version of the github-pages gem.

From 633c9be95c196f18d013d6451782178191a3c0bc Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 22 Sep 2014 22:53:46 -0700 Subject: [PATCH 07/12] Update history to reflect merge of #2939 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 8c99c037..fc19b710 100644 --- a/History.markdown +++ b/History.markdown @@ -27,6 +27,7 @@ * Added `mathml.rb` to the list of third-party plugins. (#2937) * Add `--force_polling` to the list of configuration options (#2943) * Escape unicode characters in site CSS (#2906) + * Add note about using the github-pages gem via pages.github.com/versions.json (#2939) ## 2.4.0 / 2014-09-09 From e6f89074d421232aed67f9e9f5306ccb53cc1f33 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 22 Sep 2014 23:03:49 -0700 Subject: [PATCH 08/12] Rouge's Redcarpet plugin now has a different API See for more: - https://github.com/jneen/rouge/commit/18ec938e9ca9463fb424c3d706f8fc761dad2460 - https://github.com/jneen/rouge/issues/182 --- lib/jekyll/converters/markdown/redcarpet_parser.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/jekyll/converters/markdown/redcarpet_parser.rb b/lib/jekyll/converters/markdown/redcarpet_parser.rb index b69df9b8..468069e9 100644 --- a/lib/jekyll/converters/markdown/redcarpet_parser.rb +++ b/lib/jekyll/converters/markdown/redcarpet_parser.rb @@ -48,8 +48,8 @@ module Jekyll end protected - def rouge_formatter(opts = {}) - Rouge::Formatters::HTML.new(opts.merge(wrap: false)) + def rouge_formatter(lexer) + Rouge::Formatters::HTML.new(:wrap => false) end end From 8990d7199e941229cd12540977df8c399b65fa03 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 22 Sep 2014 23:04:51 -0700 Subject: [PATCH 09/12] Latest version of Rouge so we know the API is right. --- jekyll.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jekyll.gemspec b/jekyll.gemspec index 8371c91e..91173067 100644 --- a/jekyll.gemspec +++ b/jekyll.gemspec @@ -62,5 +62,5 @@ Gem::Specification.new do |s| s.add_development_dependency('activesupport', '~> 3.2.13') s.add_development_dependency('jekyll_test_plugin') s.add_development_dependency('jekyll_test_plugin_malicious') - s.add_development_dependency('rouge', '~> 1.3') + s.add_development_dependency('rouge', '~> 1.7') end From 6f585e5da51dcecd6525496c8a59b547c16baa40 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Wed, 24 Sep 2014 17:06:30 -0700 Subject: [PATCH 10/12] Update history to reflect merge of #2951 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index fc19b710..4146d17a 100644 --- a/History.markdown +++ b/History.markdown @@ -6,6 +6,7 @@ ### Bug Fixes + * Fix Rouge's RedCarpet plugin interface integration (#2951) * Remove `--watch` from the site template blog post since it defaults to watching in in 2.4.0 (#2922) From 3319c0ab563c302212a684de96220ea8bfc6bd99 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Wed, 24 Sep 2014 17:07:10 -0700 Subject: [PATCH 11/12] Update history to reflect merge of #2946 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 4146d17a..211b956c 100644 --- a/History.markdown +++ b/History.markdown @@ -9,6 +9,7 @@ * Fix Rouge's RedCarpet plugin interface integration (#2951) * Remove `--watch` from the site template blog post since it defaults to watching in in 2.4.0 (#2922) + * Fix code for media query mixin in site template (#2946) ### Development Fixes From 95644a844f8782929c952c0c95e00b526ea3b458 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Wed, 24 Sep 2014 17:08:21 -0700 Subject: [PATCH 12/12] Update history to reflect merge of #2925 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 211b956c..4809eb3b 100644 --- a/History.markdown +++ b/History.markdown @@ -10,6 +10,7 @@ * Remove `--watch` from the site template blog post since it defaults to watching in in 2.4.0 (#2922) * Fix code for media query mixin in site template (#2946) + * Allow post URL's to have `.htm` extensions (#2925) ### Development Fixes