jekyll 2.0.3 → 2.1.0

data/lib/jekyll/tags/highlight.rb

@@ -4,9 +4,11 @@ module Jekyll
       include Liquid::StandardFilters
 
       # The regular expression syntax checker. Start with the language specifier.
-      # Follow that by zero or more space separated options that take one of two
-      # forms: name or name=value
-      SYNTAX = /^([a-zA-Z0-9.+#-]+)((\s+\w+(=\w+)?)*)$/
+      # Follow that by zero or more space separated options that take one of three
+      # forms: name, name=value, or name="<quoted list>"
+      #
+      # <quoted list> is a space-separated list of numbers
+      SYNTAX = /^([a-zA-Z0-9.+#-]+)((\s+\w+(=(\w+|"([0-9]+\s)*[0-9]+"))?)*)$/
 
       def initialize(tag_name, markup, tokens)
         super
@@ -14,8 +16,14 @@ module Jekyll
           @lang = $1.downcase
           @options = {}
           if defined?($2) && $2 != ''
-            $2.split.each do |opt|
+            # Split along 3 possible forms -- key="<quoted list>", key=value, or key
+            $2.scan(/(?:\w="[^"]*"|\w=\w|\w)+/) do |opt|
               key, value = opt.split('=')
+              # If a quoted list, convert to array
+              if value && value.include?("\"")
+                  value.gsub!(/"/, "")
+                  value = value.split
+              end
               @options[key.to_sym] = value || true
             end
           end
@@ -83,7 +91,7 @@ eos
 
       def add_code_tag(code)
         # Add nested <code> tags to code blocks
-        code = code.sub(/<pre>\n*/,'<pre><code class="' + @lang.to_s.gsub("+", "-") + '">')
+        code = code.sub(/<pre>\n*/,'<pre><code class="language-' + @lang.to_s.gsub("+", "-") + '" data-lang="' + @lang.to_s + '">')
         code = code.sub(/\n*<\/pre>/,"</code></pre>")
         code.strip
       end

data/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

data/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)

data/lib/jekyll/version.rb

@@ -1,3 +1,3 @@
 module Jekyll
-  VERSION = '2.0.3'
+  VERSION = '2.1.0'
 end

data/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

data/lib/site_template/_includes/footer.html

@@ -13,8 +13,8 @@
 
     <div class="footer-col-2 column">
       <ul>
-        <li>
-          <a href="https://github.com/{{ site.username }}">
+        {% if site.github_username %}<li>
+          <a href="https://github.com/{{ site.github_username }}">
             <span class="icon github">
               <svg version="1.1" class="github-icon-svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
                  viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
@@ -29,11 +29,11 @@
                 c0,0.208,0.14,0.449,0.534,0.373c3.081-1.028,5.302-3.935,5.302-7.362C15.76,3.906,12.285,0.431,7.999,0.431z"/>
               </svg>
             </span>
-            <span class="username">{{ site.username }}</span>
+            <span class="username">{{ site.github_username }}</span>
           </a>
-        </li>
-        <li>
-          <a href="https://twitter.com/{{ site.username }}">
+        </li>{% endif %}
+        {% if site.twitter_username %}<li>
+          <a href="https://twitter.com/{{ site.twitter_username }}">
             <span class="icon twitter">
               <svg version="1.1" class="twitter-icon-svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
                  viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
@@ -46,9 +46,9 @@
                 c6.015,0,9.304-4.983,9.304-9.304c0-0.142-0.003-0.283-0.009-0.423C14.976,4.29,15.531,3.714,15.969,3.058z"/>
               </svg>
             </span>
-            <span class="username">{{ site.username }}</span>
+            <span class="username">{{ site.twitter_username }}</span>
           </a>
-        </li>
+        </li>{% endif %}
       </ul>
     </div>
 

data/lib/site_template/_includes/header.html

@@ -18,7 +18,7 @@
       </a>
       <div class="trigger">
         {% for page in site.pages %}
-          <a class="page-link" href="{{ page.url | prepend: site.baseurl }}">{{ page.title }}</a>
+          {% if page.title %}<a class="page-link" href="{{ page.url | prepend: site.baseurl }}">{{ page.title }}</a>{% endif %}
         {% endfor %}
       </div>
     </nav>

data/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; }
@@ -241,7 +242,11 @@ a:visited { color: #205caa; }
 .post ul,
 .post ol { margin-left: 1.35em; }
 
-.post pre code { border: none; }
+.post pre code {
+  border: 0;
+  padding-right: 0;
+  padding-left: 0;
+}
 
 /* terminal */
 .post pre.terminal {
@@ -402,4 +407,4 @@ a:visited { color: #205caa; }
     width: auto;
     margin: 0 0 15px; }
 
-}
+}

data/lib/site_template/feed.xml

@@ -8,13 +8,22 @@ layout: none
     <description>{{ site.description | xml_escape }}</description>
     <link>{{ site.url }}{{ site.baseurl }}/</link>
     <atom:link href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}" rel="self" type="application/rss+xml" />
+    <pubDate>{{ site.time | date_to_rfc822 }}</pubDate>
+    <lastBuildDate>{{ site.time | date_to_rfc822 }}</lastBuildDate>
+    <generator>Jekyll v{{ jekyll.version }}</generator>
     {% for post in site.posts limit:10 %}
       <item>
         <title>{{ post.title | xml_escape }}</title>
         <description>{{ post.content | xml_escape }}</description>
-        <pubDate>{{ post.date | date: "%a, %d %b %Y %H:%M:%S %z" }}</pubDate>
+        <pubDate>{{ post.date | date_to_rfc822 }}</pubDate>
         <link>{{ post.url | prepend: site.baseurl | prepend: site.url }}</link>
         <guid isPermaLink="true">{{ post.url | prepend: site.baseurl | prepend: site.url }}</guid>
+        {% for tag in post.tags %}
+        <category>{{ tag | xml_escape }}</category>
+        {% endfor %}
+        {% for cat in post.categories %}
+        <category>{{ cat | xml_escape }}</category>
+        {% endfor %}
       </item>
     {% endfor %}
   </channel>

data/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

data/site/_data/docs.yml

@@ -31,6 +31,7 @@
   docs:
   - github-pages
   - deployment-methods
+  - continuous-integration
 
 - title: Miscellaneous
   docs:

data/site/_includes/anchor_links.html

@@ -1,27 +1,32 @@
-<script type="text/javascript" charset="utf-8">
-var anchorForId = function(id){
+<script>
+  var anchorForId = function (id) {
+    var anchor = document.createElement("a");
+    anchor.className = "header-link";
+    anchor.href      = "#" + id;
+    anchor.innerHTML = "<i class=\"fa fa-link\"></i>";
+    return anchor;
+  };
 
-  var anchor = document.createElement("a");
-  anchor.className = "header-link";
-  anchor.href      = "#" + id;
-  anchor.innerHTML = '<i class="fa fa-link"></i>';
-  return anchor;
-}
-var linkifyAnchors = function(level, containingElement) {
+  var linkifyAnchors = function (level, containingElement) {
+    var headers = containingElement.getElementsByTagName("h" + level);
+    for (var h = 0; h < headers.length; h++) {
+      var header = headers[h];
 
-  var headers = containingElement.getElementsByTagName("h"+level);
-  for(var h=0; h<headers.length; h++){
-    var header = headers[h];
+      if (typeof header.id !== "undefined" && header.id !== "") {
+        header.appendChild(anchorForId(header.id));
+      }
+    }
+  };
 
-    if( typeof(header.id) !== "undefined" && header.id !== "" )
-      header.appendChild(anchorForId(header.id));
-  }
-};
-document.onreadystatechange = function(){
-  if(this.readyState === "complete"){
-    var contentBlock = document.getElementsByClassName("docs")[0] || document.getElementsByClassName("news")[0]
-    for(var level=1; level<=6; level++)
-      linkifyAnchors(level, contentBlock);
-  }
-}
+  document.onreadystatechange = function () {
+    if (this.readyState === "complete") {
+      var contentBlock = document.getElementsByClassName("docs")[0] || document.getElementsByClassName("news")[0];
+      if (!contentBlock) {
+        return;
+      }
+      for (var level = 1; level <= 6; level++) {
+        linkifyAnchors(level, contentBlock);
+      }
+    }
+  };
 </script>

data/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;
 }

data/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;

data/site/_includes/news_contents.html

@@ -10,7 +10,7 @@
     </ul>
     <h4>Recent Releases</h4>
     <ul>
-      {% for post in site.posts limit:5 %}
+      {% for post in site.categories.release limit:5 %}
       <li class="{% if page.title == post.title %}current{% endif %}">
         <a href="{{ post.url }}">Version {{ post.version }}</a>
       </li>
@@ -19,5 +19,15 @@
         <a href="/docs/history/">History »</a>
       </li>
     </ul>
+    <h4>Other News</h4>
+    <ul>
+        {% for post in site.posts %}
+        {% unless post.categories contains 'release' %}
+        <li class="{% if page.title == post.title %}current{% endif %}">
+          <a href="{{ post.url }}">{{ post.title }}</a>
+        </li>
+        {% endunless %}
+        {% endfor %}
+    </ul>
   </aside>
 </div>

data/site/_includes/top.html

@@ -10,7 +10,6 @@
   <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Lato:300,300italic,400,400italic,700,700italic,900">
   <link rel="stylesheet" href="/css/screen.css">
   <link rel="icon" type="image/x-icon" href="/favicon.ico">
-  {% include anchor_links.html %}
   <!--[if lt IE 9]>
   <script src="/js/html5shiv.min.js"></script>
   <script src="/js/respond.min.js"></script>

data/site/_layouts/default.html

@@ -6,6 +6,7 @@
   {{ content }}
 
   {% include footer.html %}
+  {% include anchor_links.html %}
   {% include analytics.html %}
 
 </body>

data/site/_posts/2013-07-25-jekyll-1-0-4-released.markdown

@@ -13,7 +13,7 @@ Community and custom plugins extending the `Liquid::Drop` class may inadvertentl
 
 We recommend you upgrade to Jekyll v1.0.4 immediately if you use `Liquid::Drop` plugins on your Jekyll site.
 
-Many thanks for [Ben Balter](http://github.com/benbalter) for alerting us to the problem
+Many thanks for [Ben Balter](https://github.com/benbalter) for alerting us to the problem
 and [submitting a patch][1349] so quickly.
 
 [230]: https://github.com/Shopify/liquid/pull/230

data/site/_posts/2013-07-25-jekyll-1-1-2-released.markdown

@@ -13,7 +13,7 @@ Community and custom plugins extending the `Liquid::Drop` class may inadvertentl
 
 We recommend you upgrade to Jekyll v1.1.2 immediately if you use `Liquid::Drop` plugins on your Jekyll site.
 
-Many thanks for [Ben Balter](http://github.com/benbalter) for alerting us to the problem
+Many thanks for [Ben Balter](https://github.com/benbalter) for alerting us to the problem
 and [submitting a patch][1349] so quickly.
 
 [230]: https://github.com/Shopify/liquid/pull/230

data/site/_posts/2014-06-04-jekyll-stickers-1-dollar-stickermule.markdown

@@ -0,0 +1,19 @@
+---
+layout: news_item
+title: 'Pick Up your $1 Jekyll Sticker'
+date: 2014-06-04 15:46:53 -0400
+author: parkr
+categories: [partners]
+---
+
+![Jekyll Sticker](/img/jekyll-sticker.jpg)
+
+You may have heard that [@cobyism](https://github.com/cobyism)'s excellent
+Jekyll logo has been made into a sticker. You may have sat idly by, wishing
+that you could have a sticker honoring your beloved Jekyll.
+
+The StickerMule team says, *"Pine no longer!"* StickerMule has **[discounted the
+price of Jekyll stickers down to $1 and are offering free (domestic)
+shipping](http://www.stickermule.com/marketplace/825-jekyll-stickers)!**
+Go grab one now on the StickerMule marketplace – [they'll look
+swell on your favourite hardware.](https://twitter.com/parkr/status/430826309707902976/photo/1)

data/site/_posts/2014-06-28-jekyll-turns-21-i-mean-2-1-0.markdown

@@ -0,0 +1,27 @@
+---
+layout: news_item
+title: 'Jekyll Turns 21! Err... I mean 2.1.0.'
+date: 2014-06-28 17:26:59 -0400
+author: parkr
+version: 2.1.0
+categories: [release]
+---
+
+Jekyll's finally [legal to drink in the States](http://en.wikipedia.org/wiki/Legal_drinking_age).
+And he's done a lot of learning in the process! Here are some of the new
+things to look forward to:
+
+- Uses the latest Liquid version (2.6.1) (#2495)
+- Set front-matter defaults for collections (#2419)
+- Set a collection-specific URL template (#2418)
+- `pygments.rb` 0.6.0! (#2504)
+- `.json` files in `_data` (#2369)
+- Allow subdirectories in `_data` (#2395)
+- Add support for `hl_lines` in `highlight` tag (#2532)
+- Post categories now merge with directory, front-matter, and defaults (#2373)
+- New `--skip_initial_build` flag for `jekyll serve` (#2477)
+- A bajilion bug fixes and site updates!
+
+Let's go party!
+
+*Check out the [full changelog](/docs/history/) for more.*

data/site/docs/collections.md

@@ -56,6 +56,54 @@ For example, if you have `_my_collection/some_subdir/some_doc.md`,
 it will be rendered using Liquid and the Markdown converter of your
 choice and written out to `<dest>/my_collection/some_subdir/some_doc.html`.
 
+As for posts with [Permalinks](../Permalinks/), document URL can be customized by setting a `permalink` metadata to the collection:
+
+{% highlight yaml %}
+collections:
+  my_collection:
+    output: true
+    permalink: /awesome/:path/
+{% endhighlight %}
+
+For example, if you have `_my_collection/some_subdir/some_doc.md`, it will be written out to `<dest>/awesome/some_subdir/some_doc/index.html`.
+
+<div class="mobile-side-scroller">
+<table>
+  <thead>
+    <tr>
+      <th>Variable</th>
+      <th>Description</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>
+        <p><code>collection</code></p>
+      </td>
+      <td>
+        <p>Label of the containing collection</p>
+      </td>
+    </tr>
+    <tr>
+      <td>
+        <p><code>path</code></p>
+      </td>
+      <td>
+        <p>Path to the document relative to the collection's directory</p>
+      </td>
+    </tr>
+    <tr>
+      <td>
+        <p><code>output_ext</code></p>
+      </td>
+      <td>
+        <p>Extension of the output file</p>
+      </td>
+    </tr>
+  </tbody>
+</table>
+</div>
+
 ## Liquid Attributes
 
 ### Collections
@@ -109,7 +157,7 @@ The collections are also available under `site.collections`, with the metadata y
       </td>
       <td>
         <p>
-          The full path to the collections's source directory..
+          The full path to the collections's source directory.
         </p>
       </td>
     </tr>
@@ -196,6 +244,16 @@ In addition to any YAML front-matter provided in the document's corresponding fi
         </p>
       </td>
     </tr>
+    <tr>
+      <td>
+        <p><code>collection</code></p>
+      </td>
+      <td>
+        <p>
+          The name of the document's collection.
+        </p>
+      </td>
+    </tr>
   </tbody>
 </table>
 </div>