Whatever: foo.bar
" in "_site/methods/configuration.html" + Scenario: Rendered collection at a custom URL + Given I have an "index.html" page that contains "Collections: {{ site.collections }}" + And I have fixture collections + And I have a "_config.yml" file with content: + """ + collections: + methods: + output: true + permalink: /:collection/:path/ + """ + When I run jekyll build + Then the _site directory should exist + And I should see "Whatever: foo.bar
" in "_site/methods/configuration/index.html" + Scenario: Rendered document in a layout Given I have an "index.html" page that contains "Collections: {{ site.collections }}" And I have a default layout that contains " tags to code blocks
- code = code.sub(/\n*/,'')
+ code = code.sub(/\n*/,'')
code = code.sub(/\n*<\/pre>/,"
")
code.strip
end
diff --git a/lib/jekyll/url.rb b/lib/jekyll/url.rb
index 8cd47242..f4ea4d33 100644
--- a/lib/jekyll/url.rb
+++ b/lib/jekyll/url.rb
@@ -89,7 +89,7 @@ module Jekyll
# pct-encoded = "%" HEXDIG HEXDIG
# sub-delims = "!" / "$" / "&" / "'" / "(" / ")"
# / "*" / "+" / "," / ";" / "="
- URI.escape(path, /[^a-zA-Z\d\-._~!$&\'()*+,;=:@\/]/)
+ URI.escape(path, /[^a-zA-Z\d\-._~!$&\'()*+,;=:@\/]/).encode('utf-8')
end
# Unescapes a URL path segment
@@ -103,7 +103,7 @@ module Jekyll
#
# Returns the unescaped path.
def self.unescape_path(path)
- URI.unescape(path)
+ URI.unescape(path.encode('utf-8'))
end
end
end
diff --git a/lib/jekyll/utils.rb b/lib/jekyll/utils.rb
index dc19a3e4..e1b4704d 100644
--- a/lib/jekyll/utils.rb
+++ b/lib/jekyll/utils.rb
@@ -35,17 +35,25 @@ module Jekyll
#
# Returns an array
def pluralized_array_from_hash(hash, singular_key, plural_key)
- if hash.has_key?(singular_key)
- array = [hash[singular_key]] if hash[singular_key]
- elsif hash.has_key?(plural_key)
- case hash[plural_key]
+ [].tap do |array|
+ array << (value_from_singular_key(hash, singular_key) || value_from_plural_key(hash, plural_key))
+ end.flatten.compact
+ end
+
+ def value_from_singular_key(hash, key)
+ hash[key] if (hash.has_key?(key) || (hash.default_proc && hash[key]))
+ end
+
+ def value_from_plural_key(hash, key)
+ if hash.has_key?(key) || (hash.default_proc && hash[key])
+ val = hash[key]
+ case val
when String
- array = hash[plural_key].split
+ val.split
when Array
- array = hash[plural_key].compact
+ val.compact
end
end
- array || []
end
def transform_keys(hash)
diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb
index 18840a56..b61af28b 100644
--- a/lib/jekyll/version.rb
+++ b/lib/jekyll/version.rb
@@ -1,3 +1,3 @@
module Jekyll
- VERSION = '2.0.3'
+ VERSION = '2.1.0'
end
diff --git a/lib/site_template/_config.yml b/lib/site_template/_config.yml
index 2c0d7379..ae45638b 100644
--- a/lib/site_template/_config.yml
+++ b/lib/site_template/_config.yml
@@ -4,6 +4,8 @@ email: your-email@domain.com
description: "Write an awesome description for your new site here. You can edit this line in _config.yml. It will appear in your document head meta (for Google search results) and in your feed.xml site description."
baseurl: ""
url: "http://yourdomain.com"
+twitter_username: jekyllrb
+github_username: jekyll
# Build settings
markdown: kramdown
diff --git a/lib/site_template/_includes/footer.html b/lib/site_template/_includes/footer.html
index e9082174..0026c4c5 100644
--- a/lib/site_template/_includes/footer.html
+++ b/lib/site_template/_includes/footer.html
@@ -13,8 +13,8 @@
diff --git a/lib/site_template/_includes/header.html b/lib/site_template/_includes/header.html
index 36ff6cc6..e5e6f26a 100644
--- a/lib/site_template/_includes/header.html
+++ b/lib/site_template/_includes/header.html
@@ -18,7 +18,7 @@
{% for page in site.pages %}
- {{ page.title }}
+ {% if page.title %}{{ page.title }}{% endif %}
{% endfor %}
diff --git a/lib/site_template/css/main.css b/lib/site_template/css/main.css
index b94ca8fb..88090a3e 100644
--- a/lib/site_template/css/main.css
+++ b/lib/site_template/css/main.css
@@ -234,6 +234,7 @@ a:visited { color: #205caa; }
-moz-border-radius: 3px;
border-radius: 3px;
font-size: 15px;
+ overflow:scroll;
}
.post code { padding: 1px 5px; }
diff --git a/lib/site_template/feed.xml b/lib/site_template/feed.xml
index 234d1c0b..4d7f8a4c 100644
--- a/lib/site_template/feed.xml
+++ b/lib/site_template/feed.xml
@@ -8,13 +8,22 @@ layout: none
{{ site.description | xml_escape }}
{{ site.url }}{{ site.baseurl }}/
{{ site.time | date_to_rfc822 }}
+ {{ site.time | date_to_rfc822 }}
+ Jekyll v{{ jekyll.version }}
{% for post in site.posts limit:10 %}
-
{{ post.title | xml_escape }}
{{ post.content | xml_escape }}
- {{ post.date | date: "%a, %d %b %Y %H:%M:%S %z" }}
+ {{ post.date | date_to_rfc822 }}
{{ post.url | prepend: site.baseurl | prepend: site.url }}
{{ post.url | prepend: site.baseurl | prepend: site.url }}
+ {% for tag in post.tags %}
+ {{ tag | xml_escape }}
+ {% endfor %}
+ {% for cat in post.categories %}
+ {{ cat | xml_escape }}
+ {% endfor %}
{% endfor %}
diff --git a/site/_config.yml b/site/_config.yml
index 44c2772e..0d4dacfd 100644
--- a/site/_config.yml
+++ b/site/_config.yml
@@ -7,3 +7,4 @@ excerpt_separator: noifniof3nioaniof3nioafafinoafnoif
repository: https://github.com/jekyll/jekyll
help_url: https://github.com/jekyll/jekyll-help
google_analytics_id: UA-50755011-1
+timezone: America/Los_Angeles
diff --git a/site/_data/docs.yml b/site/_data/docs.yml
index 7d0a83f3..474f73fa 100644
--- a/site/_data/docs.yml
+++ b/site/_data/docs.yml
@@ -31,6 +31,7 @@
docs:
- github-pages
- deployment-methods
+ - continuous-integration
- title: Miscellaneous
docs:
diff --git a/site/_includes/anchor_links.html b/site/_includes/anchor_links.html
index e9802071..08e37b5b 100644
--- a/site/_includes/anchor_links.html
+++ b/site/_includes/anchor_links.html
@@ -1,27 +1,32 @@
-
diff --git a/site/_includes/css/font-awesome.css b/site/_includes/css/font-awesome.css
index f864c27c..86435ecd 100644
--- a/site/_includes/css/font-awesome.css
+++ b/site/_includes/css/font-awesome.css
@@ -1,11 +1,11 @@
/*!
- * Font Awesome 4.0.3 by @davegandy - http://fontawesome.io - @fontawesome
+ * Font Awesome 4.1.0 by @davegandy - http://fontawesome.io - @fontawesome
* License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
*/
@font-face {
font-family: 'FontAwesome';
- src: url('../fonts/fontawesome-webfont.eot?v=4.0.3');
- src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.0.3') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff?v=4.0.3') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.0.3') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.0.3#fontawesomeregular') format('svg');
+ src: url('../fonts/fontawesome-webfont.eot?v=4.1.0');
+ src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.1.0') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff?v=4.1.0') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.1.0') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.1.0#fontawesomeregular') format('svg');
font-weight: normal;
font-style: normal;
}
diff --git a/site/_includes/css/style.css b/site/_includes/css/style.css
index e65c9065..18bc8330 100644
--- a/site/_includes/css/style.css
+++ b/site/_includes/css/style.css
@@ -590,6 +590,10 @@ article h2:first-child {
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#9e2812', endColorstr='#6f0d0d',GradientType=0 );
}
+.post-content img {
+ max-width: 100%
+}
+
.label {
float: left;
text-transform: uppercase;
@@ -695,6 +699,7 @@ pre, code {
}
.highlight {
+ margin: 1em 0;
padding: 10px 0;
width: 100%;
overflow: auto;
diff --git a/site/_includes/news_contents.html b/site/_includes/news_contents.html
index f22a1a1a..5c545211 100644
--- a/site/_includes/news_contents.html
+++ b/site/_includes/news_contents.html
@@ -10,7 +10,7 @@
Recent Releases
- {% for post in site.posts limit:5 %}
+ {% for post in site.categories.release limit:5 %}
-
Version {{ post.version }}
@@ -19,5 +19,15 @@
History »
+ Other News
+
+ {% for post in site.posts %}
+ {% unless post.categories contains 'release' %}
+ -
+ {{ post.title }}
+
+ {% endunless %}
+ {% endfor %}
+
diff --git a/site/_includes/top.html b/site/_includes/top.html
index ffeddd9d..35ba2f26 100644
--- a/site/_includes/top.html
+++ b/site/_includes/top.html
@@ -10,7 +10,6 @@
- {% include anchor_links.html %}