jekyll 2.0.3 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ed5e240dbbd58c004f13b3c6337dca1c5a757f9
-  data.tar.gz: b69c82422c9be169e7a4dc4626268092a80f44ad
+  metadata.gz: 8630d257c463ffcf3ee92aad938ebd5975ff8c81
+  data.tar.gz: 9a07f6df12e2bf48b25f987c43d33834a03f49fc
 SHA512:
-  metadata.gz: 950f2add8c0bd180e04073b7b1b41e13cb887a38e7476c2eaf69f57434ec532ca2a642a68649d5db8f76f5b13908c3b8a3d6bb16ce7ee618076d707ef2b22439
-  data.tar.gz: ecda77f22316674ca4baec5d6342587ad0cb5e4c7344acc58efce3a8429d3406569ce54c26b511545a4472f957137e0b79bb276ed6ca1f4a8fdbc11b2e7f5d57
+  metadata.gz: 6ea2a31ab0006db1f258c101679ab98c9c401eb7738d18dec74f72c745f231e8fede3dc46a7e4582870b0210d75b407a669203416980fe3316e3ceec9bf0c470
+  data.tar.gz: d081db50caabc6c047916587691e5bac090967327f6508943c754d918f4ae0b9327e53a6b716147c5654e592f9c42bde75065808b5c8009e6b2749335b55976b

data/.travis.yml

@@ -4,8 +4,8 @@ install:
 - script/rebund download
 - travis_retry bundle install --path vendor/bundle
 rvm:
-- 2.1.1
-- 2.0.0
+- 2.1
+- 2.0
 - 1.9.3
 script: script/cibuild
 after_script:

data/CONTRIBUTING.markdown

@@ -4,10 +4,10 @@ Contribute
 So you've got an awesome idea to throw into Jekyll. Great! Please keep the
 following in mind:
 
-* **Contributions will not be accepted without tests.**
+* **Contributions will not be accepted without tests or necessary documentation updates.**
 * If you're creating a small fix or patch to an existing feature, just a simple
   test will do. Please stay in the confines of the current test suite and use
-  [Shoulda](http://github.com/thoughtbot/shoulda/tree/master) and
+  [Shoulda](https://github.com/thoughtbot/shoulda/tree/master) and
   [RR](https://github.com/rr/rr).
 * If it's a brand new feature, make sure to create a new
   [Cucumber](https://github.com/cucumber/cucumber/) feature and reuse steps

data/History.markdown

@@ -10,6 +10,92 @@
 
 ### Site Enhancements
 
+## 2.1.0 / 2014-06-28
+
+### Minor Enhancements
+
+  * Bump to the latest Liquid version, 2.6.1 (#2495)
+  * Add support for JSON files in the `_data` directory (#2369)
+  * Allow subclasses to override `EXCERPT_ATTRIBUTES_FOR_LIQUID` (#2408)
+  * Add `Jekyll.env` and `jekyll.environment` (the Liquid var) (#2417)
+  * Use `_config.yaml` or `_config.yml` (`.yml` takes precedence) (#2406)
+  * Override collection url template (#2418)
+  * Allow subdirectories in `_data` (#2395)
+  * Extract Pagination Generator into gem: `jekyll-paginate` (#2455)
+  * Utilize `date_to_rfc822` filter in site template (#2437)
+  * Add categories, last build datetime, and generator to site template
+    feed (#2438)
+  * Configurable, replaceable Logger-compliant logger (#2444)
+  * Extract `gist` tag into a separate gem (#2469)
+  * Add `collection` attribute to `Document#to_liquid` to access the
+    document's collection label. (#2436)
+  * Upgrade listen to `2.7.6 <= x < 3.0.0` (#2492)
+  * Allow configuration of different Twitter and GitHub usernames in site template (#2485)
+  * Bump Pygments to v0.6.0 (#2504)
+  * Front-matter defaults for documents in collections (#2419)
+  * Include files with a url which ends in `/` in the `site.html_pages` list (#2524)
+  * Make `highlight` tag use `language-` prefix in CSS class (#2511)
+  * Lookup item property via `item#to_liquid` before `#data` or `#[]` in filters (#2493)
+  * Skip initial build of site on serve with flag (#2477)
+  * Add support for `hl_lines` in `highlight` tag (#2532)
+  * Spike out `--watch` flag into a separate gem (#2550)
+
+### Bug Fixes
+
+  * Liquid `sort` filter should sort even if one of the values is `nil` (#2345)
+  * Remove padding on `pre code` in the site template CSS (#2383)
+  * Set `log_level` earlier to silence info level configuration output (#2393)
+  * Only list pages which have `title` in site template (#2411)
+  * Accept `Numeric` values for dates, not `Number` values (#2377)
+  * Prevent code from overflowing container in site template (#2429)
+  * Encode URLs in UTF-8 when escaping and unescaping (#2420)
+  * No Layouts or Liquid for Asset Files (#2431)
+  * Allow front-matter defaults to set post categories (#2373)
+  * Fix command in subcommand deprecation warning (#2457)
+  * Keep all parent directories of files/dirs in `keep_files` (#2458)
+  * When using RedCarpet and Rouge without Rouge installed, fixed erroneous
+    error which stated that redcarpet was missing, not rouge. (#2464)
+  * Ignore *all* directories and files that merit it on auto-generation (#2459)
+  * Before copying file, explicitly remove the old one (#2535)
+  * Merge file system categories with categories from YAML. (#2531)
+  * Deep merge front matter defaults (#2490)
+  * Ensure exclude and include arrays are arrays of strings (#2542)
+  * Allow collections to have dots in their filenames (#2552)
+  * Collections shouldn't try to read in directories as files (#2552)
+  * Be quiet very quickly. (#2520)
+
+### Development Fixes
+
+  * Test Ruby 2.1.2 instead of 2.1.1 (#2374)
+  * Add test for sorting UTF-8 characters (#2384)
+  * Use `https` for GitHub links in documentation (#2470)
+  * Remove coverage reporting with Coveralls (#2494)
+  * Fix a bit of missing TomDoc to `Jekyll::Commands::Build#build` (#2554)
+
+### Site Enhancements
+
+  * Set `timezone` to `America/Los_Angeles` (#2394)
+  * Improve JavaScript in `anchor_links.html` (#2368)
+  * Remove note on Quickstart page about default markdown converter (#2387)
+  * Remove broken link in extras.md to a Maruku fork (#2401)
+  * Update Font Awesome to v4.1.0. (#2410)
+  * Fix broken link on Installation page to Templates page (#2421)
+  * Prevent table from extending parent width in permalink style table (#2424)
+  * Add collections to info about pagination support (#2389)
+  * Add `jekyll_github_sample` plugin to list of third-party plugins (#2463)
+  * Clarify documentation around front-matter defaults and add details
+    about defaults for collections. (#2439)
+  * Add Jekyll Project Version Tag to list of third-party plugins (#2468)
+  * Use `https` for GitHub links across whole site (#2470)
+  * Add StickerMule + Jekyll post (#2476)
+  * Add Jekyll Asset Pipeline Reborn to list of third-party plugins (#2479)
+  * Add link to jekyll-compress-html to list of third-party plugins (#2514)
+  * Add Piwigo Gallery to list of third-party plugins (#2526)
+  * Set `show_drafts` to `false` in default configuration listing (#2536)
+  * Provide an updated link for Windows installation instructions (#2544)
+  * Remove `url` from configuration docs (#2547)
+  * Documentation for Continuous Integration for your Jekyll Site (#2432)
+
 ## 2.0.3 / 2014-05-08
 
 ### Bug Fixes

data/README.markdown

@@ -1,11 +1,9 @@
 # [Jekyll](http://jekyllrb.com/)
 
-[![Gem Version](https://badge.fury.io/rb/jekyll.svg)](http://badge.fury.io/rb/jekyll)
-
+[![Gem Version](https://badge.fury.io/rb/jekyll.svg)](https://rubygems.org/gems/jekyll)
 [![Build Status](https://secure.travis-ci.org/jekyll/jekyll.svg?branch=master)](https://travis-ci.org/jekyll/jekyll)
-[![Code Climate](https://codeclimate.com/github/jekyll/jekyll.png)](https://codeclimate.com/github/jekyll/jekyll)
+[![Code Climate](http://img.shields.io/codeclimate/github/jekyll/jekyll.svg)](https://codeclimate.com/github/jekyll/jekyll)
 [![Dependency Status](https://gemnasium.com/jekyll/jekyll.svg)](https://gemnasium.com/jekyll/jekyll)
-[![Coverage Status](https://coveralls.io/repos/jekyll/jekyll/badge.png)](https://coveralls.io/r/jekyll/jekyll)
 
 By Tom Preston-Werner, Nick Quaranto, and many [awesome contributors](https://github.com/jekyll/jekyll/graphs/contributors)!
 
@@ -19,42 +17,19 @@ Jekyll does what you tell it to do — no more, no less. It doesn't try to outs
 
 * [Install](http://jekyllrb.com/docs/installation/) the gem
 * Read up about its [Usage](http://jekyllrb.com/docs/usage/) and [Configuration](http://jekyllrb.com/docs/configuration/)
-* Take a gander at some existing [Sites](http://wiki.github.com/jekyll/jekyll/sites)
+* Take a gander at some existing [Sites](https://wiki.github.com/jekyll/jekyll/sites)
 * Fork and [Contribute](http://jekyllrb.com/docs/contributing/) your own modifications
-* Have questions? Check out `#jekyll` on irc.freenode.net.
+* Have questions? Check out [`#jekyll` on irc.freenode.net](https://botbot.me/freenode/jekyll/).
 
 ## Diving In
 
-* [Migrate](http://jekyllrb.com/docs/migrations/) from your previous system
+* [Migrate](http://import.jekyllrb.com/docs/home/) from your previous system
 * Learn how the [YAML Front Matter](http://jekyllrb.com/docs/frontmatter/) works
 * Put information on your site with [Variables](http://jekyllrb.com/docs/variables/)
 * Customize the [Permalinks](http://jekyllrb.com/docs/permalinks/) your posts are generated with
 * Use the built-in [Liquid Extensions](http://jekyllrb.com/docs/templates/) to make your life easier
 * Use custom [Plugins](http://jekyllrb.com/docs/plugins/) to generate content specific to your site
 
-## Runtime Dependencies
-
-* Commander: Command-line interface constructor (Ruby)
-* Colorator: Colorizes command line output (Ruby)
-* Classifier: Generating related posts (Ruby)
-* Directory Watcher: Auto-regeneration of sites (Ruby)
-* Kramdown: Default Markdown engine (Ruby)
-* Liquid: Templating system (Ruby)
-* Pygments.rb: Syntax highlighting (Ruby/Python)
-* RedCarpet: Markdown engine (Ruby)
-* Safe YAML: YAML Parser built for security (Ruby)
-
-## Developer Dependencies
-
-* Launchy: Cross-platform file launcher (Ruby)
-* Maruku: Markdown-superset interpreter (Ruby)
-* RDiscount: Discount Markdown Processor (Ruby)
-* RedCloth: Textile support (Ruby)
-* RedGreen: Nicer test output (Ruby)
-* RR: Mocking (Ruby)
-* Shoulda: Test framework (Ruby)
-* SimpleCov: Coverage framework (Ruby)
-
 ## License
 
 See [LICENSE](https://github.com/jekyll/jekyll/blob/master/LICENSE).

data/Rakefile

@@ -14,7 +14,7 @@ require 'jekyll/version'
 #############################################################################
 
 def name
-  @name ||= Dir['*.gemspec'].first.split('.').first
+  @name ||= File.basename(Dir['*.gemspec'].first, ".*")
 end
 
 def version
@@ -68,14 +68,7 @@ end
 #
 #############################################################################
 
-if ENV["TRAVIS"] == "true"
-  require 'coveralls/rake/task'
-  Coveralls::RakeTask.new
-
-  task :default => [:test, :features, 'coveralls:push']
-else
-  task :default => [:test, :features]
-end
+task :default => [:test, :features]
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
@@ -235,6 +228,7 @@ end
 #
 #############################################################################
 
+desc "Release #{name} v#{version}"
 task :release => :build do
   unless `git branch` =~ /^\* master$/
     puts "You must be on the master branch to release!"
@@ -247,6 +241,7 @@ task :release => :build do
   sh "gem push pkg/#{name}-#{version}.gem"
 end
 
+desc "Build #{name} v#{version} into pkg/"
 task :build do
   mkdir_p "pkg"
   sh "gem build #{gemspec_file}"

data/docs/jp/CONTRIBUTING.jp.markdown

@@ -7,8 +7,8 @@
 * **テストなしではコントリビュートはできません。**
 * もし、既存の機能への小さな修正やパッチを作成したなら、シンプルなテストを行います。
   現在のテストスイートの範囲にとどまり、そして
-  [Shoulda](http://github.com/thoughtbot/shoulda/tree/master) や
-  [RR](http://github.com/btakita/rr/tree/master) を使用してください。
+  [Shoulda](https://github.com/thoughtbot/shoulda/tree/master) や
+  [RR](https://github.com/btakita/rr/tree/master) を使用してください。
 * もし、それが新しい機能の場合は、必ず新しい
   [Cucumber](https://github.com/cucumber/cucumber/) の機能を作成し、
   必要に応じて手順を再利用します。

data/docs/jp/README.jp.markdown

@@ -5,7 +5,6 @@
 [![Build Status](https://secure.travis-ci.org/jekyll/jekyll.png?branch=master)](https://travis-ci.org/jekyll/jekyll)
 [![Code Climate](https://codeclimate.com/github/jekyll/jekyll.png)](https://codeclimate.com/github/jekyll/jekyll)
 [![Dependency Status](https://gemnasium.com/jekyll/jekyll.png)](https://gemnasium.com/jekyll/jekyll)
-[![Coverage Status](https://coveralls.io/repos/jekyll/jekyll/badge.png)](https://coveralls.io/r/jekyll/jekyll)
 
 Tom Preston-Werner, Nick Quaranto や多くの[素晴らしいコントリビュータ](https://github.com/jekyll/jekyll/graphs/contributors)によって作成されています！
 
@@ -28,7 +27,7 @@ Jekyll あなたがするように伝えたことをします ― それ以上
 
 * gem を[インストール](http://jekyllrb.com/docs/installation/)します
 * [使用方法](http://jekyllrb.com/docs/usage/) と [設定方法](http://jekyllrb.com/docs/configuration/) を読みます
-* 既存の [Jekyll で作られたサイト](http://wiki.github.com/jekyll/jekyll/sites) をチラッと見ます
+* 既存の [Jekyll で作られたサイト](https://wiki.github.com/jekyll/jekyll/sites) をチラッと見ます
 * Fork し、あなたの変更を [コントリビュート](http://jekyllrb.com/docs/contributing/) します
 * 質問があったら？ irc.freenode.net の `#jekyll` チャンネルをチェックしてください
 

data/features/collections.feature

@@ -9,7 +9,7 @@ Feature: Collections
     And I have a configuration file with "collections" set to "['methods']"
     When I run jekyll build
     Then the _site directory should exist
-    And I should see "Collections: <p>Use <code>Jekyll.configuration</code> to build a full configuration for use w/Jekyll.</p>\n\n<p>Whatever: foo.bar</p>\n<p><code>Jekyll.sanitized_path</code> is used to make sure your path is in your source.</p>\n<p>Run your generators! default</p>\n<p>Create dat site.</p>\n<p>Run your generators! default</p>" in "_site/index.html"
+    And I should see "Collections: <p>Use <code>Jekyll.configuration</code> to build a full configuration for use w/Jekyll.</p>\n\n<p>Whatever: foo.bar</p>\n<p><code>Jekyll.sanitized_path</code> is used to make sure your path is in your source.</p>\n<p>Run your generators! default</p>\n<p>Page without title.</p>\n<p>Run your generators! default</p>" in "_site/index.html"
     And the "_site/methods/configuration.html" file should not exist
 
   Scenario: Rendered collection
@@ -29,6 +29,20 @@ Feature: Collections
     And I should see "Methods metadata: bar" in "_site/collection_metadata.html"
     And I should see "<p>Whatever: foo.bar</p>" 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 "<p>Whatever: foo.bar</p>" 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 "<div class='title'>Tom Preston-Werner</div> {{content}}"
@@ -64,8 +78,7 @@ Feature: Collections
     And I have a "_config.yml" file with content:
     """
     collections:
-      methods:
-        baz: bin
+    - methods
     """
     When I run jekyll build
     Then the _site directory should exist
@@ -106,3 +119,27 @@ Feature: Collections
     When I run jekyll build
     Then the _site directory should exist
     And I should see "Item count: 1" in "_site/index.html"
+
+  Scenario: Sort by title
+    Given I have an "index.html" page that contains "{% assign items = site.methods | sort: 'title' %}1. of {{ items.size }}: {{ items.first.output }}"
+    And I have fixture collections
+    And I have a "_config.yml" file with content:
+    """
+    collections:
+    - methods
+    """
+    When I run jekyll build
+    Then the _site directory should exist
+    And I should see "1. of 5: <p>Page without title.</p>" in "_site/index.html"
+
+  Scenario: Sort by relative_path
+    Given I have an "index.html" page that contains "Collections: {% assign methods = site.methods | sort: 'relative_path' %}{% for method in methods %}{{ method.title }}, {% endfor %}"
+    And I have fixture collections
+    And I have a "_config.yml" file with content:
+    """
+    collections:
+    - methods
+    """
+    When I run jekyll build
+    Then the _site directory should exist
+    And I should see "Collections: Jekyll.configuration, Jekyll.sanitized_path, Site#generate, , Site#generate," in "_site/index.html"

data/features/data.feature

@@ -33,6 +33,18 @@ Feature: Data
     And I should see "Jack" in "_site/index.html"
     And I should see "Leon" in "_site/index.html"
 
+  Scenario: autoload *.json files in _data directory
+    Given I have a _data directory
+    And I have a "_data/members.json" file with content:
+      """
+      [{"name": "Jack", "age": 28},{"name": "Leon", "age": 34}]
+      """
+    And I have an "index.html" page that contains "{% for member in site.data.members %}{{member.name}}{% endfor %}"
+    When I run jekyll build
+    Then the "_site/index.html" file should exist
+    And I should see "Jack" in "_site/index.html"
+    And I should see "Leon" in "_site/index.html"
+
   Scenario: autoload *.yml files in _data directory with space in file name
     Given I have a _data directory
     And I have a "_data/team members.yml" file with content:
@@ -48,6 +60,35 @@ Feature: Data
     And I should see "Jack" in "_site/index.html"
     And I should see "Leon" in "_site/index.html"
 
+  Scenario: autoload *.yaml files in subdirectories in _data directory
+    Given I have a _data directory
+    And I have a _data/categories directory
+    And I have a "_data/categories/dairy.yaml" file with content:
+      """
+      name: Dairy Products
+      """
+    And I have an "index.html" page that contains "{{ site.data.categories.dairy.name }}"
+    When I run jekyll build
+    Then the "_site/index.html" file should exist
+    And I should see "Dairy Products" in "_site/index.html"
+
+  Scenario: folders should have precedence over files with the same name
+    Given I have a _data directory
+    And I have a _data/categories directory
+    And I have a "_data/categories/dairy.yaml" file with content:
+      """
+      name: Dairy Products
+      """
+    And I have a "_data/categories.yaml" file with content:
+      """
+      dairy:
+        name: Should not display this
+      """
+    And I have an "index.html" page that contains "{{ site.data.categories.dairy.name }}"
+    When I run jekyll build
+    Then the "_site/index.html" file should exist
+    And I should see "Dairy Products" in "_site/index.html"
+
   Scenario: should be backward compatible with site.data in _config.yml
     Given I have a "_config.yml" file with content:
       """
@@ -62,4 +103,3 @@ Feature: Data
     Then the "_site/index.html" file should exist
     And I should see "Jack" in "_site/index.html"
     And I should see "Leon" in "_site/index.html"
-

data/features/frontmatter_defaults.feature

@@ -77,3 +77,60 @@ Feature: frontmatter defaults
     Then I should see "a blog by some guy" in "_site/frontmatter.html"
     And I should see "nothing" in "_site/override.html"
     But the "_site/perma.html" file should not exist
+
+  Scenario: Use frontmatter defaults in collections
+    Given I have a _slides directory
+    And I have a "index.html" file that contains "nothing"
+    And I have a "_slides/slide1.html" file with content: 
+    """
+    Value: {{ page.myval }}
+    """
+    And I have a "_config.yml" file with content:
+    """
+      collections:
+        slides:
+          output: true
+      defaults:
+        -
+          scope:
+            path: ""
+            type: slides
+          values:
+            myval: "Test"
+    """
+    When I run jekyll build
+    Then the _site directory should exist
+    And I should see "Value: Test" in "_site/slides/slide1.html"
+
+  Scenario: Override frontmatter defaults inside a collection
+    Given I have a _slides directory
+    And I have a "index.html" file that contains "nothing"
+    And I have a "_slides/slide2.html" file with content: 
+    """
+    ---
+    myval: Override
+    ---
+    Value: {{ page.myval }}
+    """
+    And I have a "_config.yml" file with content:
+    """
+      collections:
+        slides:
+          output: true
+      defaults:
+        -
+          scope:
+            path: ""
+            type: slides
+          values:
+            myval: "Test"
+    """
+    When I run jekyll build
+    Then the _site directory should exist
+    And I should see "Value: Override" in "_site/slides/slide2.html"
+
+  Scenario: Deep merge frontmatter defaults
+    Given I have an "index.html" page with fruit "{orange: 1}" that contains "Fruits: {{ page.fruit.orange | plus: page.fruit.apple }}"
+    And I have a configuration file with "defaults" set to "[{scope: {path: ""}, values: {fruit: {apple: 2}}}]"
+    When I run jekyll build
+    Then I should see "Fruits: 3" in "_site/index.html"

data/features/post_data.feature

@@ -70,6 +70,18 @@ Feature: Post data
     Then the _site directory should exist
     And I should see "Post category: movies" in "_site/movies/2009/03/27/star-wars.html"
 
+  Scenario: Use post.categories variable when category is in a folder and has categories in YAML
+    Given I have a movies directory
+    And I have a movies/_posts directory
+    And I have a _layouts directory
+    And I have the following post in "movies":
+      | title     | date       | layout | categories | content                 |
+      | Star Wars | 2009-03-27 | simple | [film]     | Luke, I am your father. |
+    And I have a simple layout that contains "Post category: {{ page.categories }}"
+    When I run jekyll build
+    Then the _site directory should exist
+    And I should see "Post category: movies" in "_site/movies/film/2009/03/27/star-wars.html"
+
   Scenario: Use post.tags variable
     Given I have a _posts directory
     And I have a _layouts directory