jekyll 2.0.0.alpha.3 → 2.0.0.rc1

data/lib/jekyll/liquid_extensions.rb

@@ -0,0 +1,22 @@
+module Jekyll
+  module LiquidExtensions
+
+    # Lookup a Liquid variable in the given context.
+    #
+    # context  - the Liquid context in question.
+    # variable - the variable name, as a string.
+    #
+    # Returns the value of the variable in the context
+    #   or the variable name if not found.
+    def lookup_variable(context, variable)
+      lookup = context
+
+      variable.split(".").each do |value|
+        lookup = lookup[value]
+      end
+
+      lookup || variable
+    end
+
+  end
+end

data/lib/jekyll/page.rb

@@ -28,8 +28,13 @@ module Jekyll
       @dir  = dir
       @name = name
 
+
       process(name)
       read_yaml(File.join(base, dir), name)
+
+      data.default_proc = proc do |hash, key|
+        site.frontmatter_defaults.find(File.join(dir, name), type, key)
+      end
     end
 
     # The generated directory into which the page will be placed

data/lib/jekyll/post.rb

@@ -56,6 +56,10 @@ module Jekyll
       process(name)
       read_yaml(@base, name)
 
+      data.default_proc = proc do |hash, key|
+        site.frontmatter_defaults.find(File.join(dir, name), type, key)
+      end
+
       if data.has_key?('date')
         self.date = Time.parse(data["date"].to_s)
       end
@@ -64,6 +68,14 @@ module Jekyll
       populate_tags
     end
 
+    def published?
+      if data.has_key?('published') && data['published'] == false
+        false
+      else
+        true
+      end
+    end
+
     def populate_categories
       if categories.empty?
         self.categories = Utils.pluralized_array_from_hash(data, 'category', 'categories').map {|c| c.to_s.downcase}

data/lib/jekyll/site.rb

@@ -4,7 +4,7 @@ module Jekyll
                   :exclude, :include, :source, :dest, :lsi, :highlighter,
                   :permalink_style, :time, :future, :unpublished, :safe, :plugins, :limit_posts,
                   :show_drafts, :keep_files, :baseurl, :data, :file_read_opts, :gems,
-                  :plugin_manager, :collections
+                  :plugin_manager
 
     attr_accessor :converters, :generators
 
@@ -55,6 +55,7 @@ module Jekyll
       self.pages = []
       self.static_files = []
       self.data = {}
+      @collections = nil
 
       if limit_posts < 0
         raise ArgumentError, "limit_posts must be a non-negative number"
@@ -90,18 +91,24 @@ module Jekyll
     #
     # Returns a Hash containing collection name-to-instance pairs.
     def collections
-      @collections ||= if config['collections']
-        Hash[config['collections'].map { |coll| [coll, Jekyll::Collection.new(self, coll)] } ]
-      else
-        Hash.new
-      end
+      @collections ||= Hash[collection_names.map { |coll| [coll, Jekyll::Collection.new(self, coll)] } ]
     end
 
-    # The list of collections to render.
+    # The list of collection names.
     #
-    # The array of collection labels to render.
-    def to_render
-      @to_render ||= (config['render'] || Array.new)
+    # Returns an array of collection names from the configuration,
+    #   or an empty array if the `collections` key is not set.
+    def collection_names
+      case config['collections']
+      when Hash
+        config['collections'].keys
+      when Array
+        config['collections']
+      when nil
+        []
+      else
+        raise ArgumentError, "Your `collections` key must be a hash or an array."
+      end
     end
 
     # Read Site data from disk and load it into internal data structures.
@@ -188,17 +195,18 @@ module Jekyll
     #
     # Returns nothing
     def read_data(dir)
-      unless dir.to_s.eql?("_data")
-        Jekyll.logger.error "Error:", "Data source directories other than '_data' have been removed.\n" +
-          "Please move your YAML files to `_data` and remove the `data_source` key from your `_config.yml`."
-      end
+      base = File.join(source, dir)
+      return unless File.directory?(base) && (!safe || !File.symlink?(base))
 
-      collections['data'] = Jekyll::Collection.new(self, "data")
-      collections['data'].read
+      entries = Dir.chdir(base) { Dir['*.{yaml,yml}'] }
+      entries.delete_if { |e| File.directory?(File.join(base, e)) }
+
+      entries.each do |entry|
+        path = File.join(source, dir, entry)
+        next if File.symlink?(path) && safe
 
-      collections['data'].docs.each do |doc|
-        key = sanitize_filename(doc.basename(".*"))
-        self.data[key] = doc.data
+        key = sanitize_filename(File.basename(entry, '.*'))
+        self.data[key] = SafeYAML.load_file(path)
       end
     end
 
@@ -206,7 +214,9 @@ module Jekyll
     #
     # Returns nothing.
     def read_collections
-      collections.each { |_, collection| collection.read }
+      collections.each do |_, collection|
+        collection.read unless collection.label.eql?("data")
+      end
     end
 
     # Run each of the Generators.
@@ -224,8 +234,8 @@ module Jekyll
     def render
       relative_permalinks_deprecation_method
 
-      to_render.each do |label|
-        collections[label].docs.each do |document|
+      collections.each do |label, collection|
+        collection.docs.each do |document|
           document.output = Jekyll::Renderer.new(self, document).run
         end
       end
@@ -306,7 +316,7 @@ module Jekyll
     def site_payload
       {"jekyll" => { "version" => Jekyll::VERSION },
        "site"   => Utils.deep_merge_hashes(config,
-         Utils.deep_merge_hashes(collections, {
+         Utils.deep_merge_hashes(Hash[collections.map{|label, coll| [label, coll.docs]}], {
           "time"         => time,
           "posts"        => posts.sort { |a, b| b <=> a },
           "pages"        => pages,
@@ -314,6 +324,7 @@ module Jekyll
           "html_pages"   => pages.reject { |page| !page.html? },
           "categories"   => post_attr_hash('categories'),
           "tags"         => post_attr_hash('tags'),
+          "collections"  => collections,
           "data"         => site_data
         }))
       }
@@ -395,9 +406,9 @@ module Jekyll
     end
 
     def documents
-      collections.reduce(Set.new) do |docs, (label, coll)|
-        if to_render.include?(label)
-          docs.merge(coll.docs)
+      collections.reduce(Set.new) do |docs, (_, collection)|
+        if collection.write?
+          docs.merge(collection.docs)
         else
           docs
         end
@@ -412,6 +423,10 @@ module Jekyll
       end
     end
 
+    def frontmatter_defaults
+      @frontmatter_defaults ||= Configuration::FrontmatterDefaults.new(self)
+    end
+
     private
 
     def has_relative_page?
@@ -419,7 +434,7 @@ module Jekyll
     end
 
     def has_yaml_header?(file)
-      !!(File.open(file).read =~ /\A---\r?\n/)
+      !!(File.open(file, "rb").read(5) =~ /\A---\r?\n/)
     end
 
     def limit_posts!

data/lib/jekyll/version.rb

@@ -1,3 +1,3 @@
 module Jekyll
-  VERSION = '2.0.0.alpha.3'
+  VERSION = '2.0.0.rc1'
 end

data/script/test

@@ -0,0 +1,11 @@
+#! /bin/bash
+
+set -x
+
+if [ -z "$1" ]; then
+  TEST_FILES="test/test*.rb"
+else
+  TEST_FILES="$@"
+fi
+
+/usr/bin/env bundle exec ruby -I"lib:test" -r rake -r rake/rake_test_loader ${TEST_FILES}

data/site/docs/collections.md

@@ -21,8 +21,6 @@ permalink: /docs/collections/
   </p>
 </div>
 
-Put some things in a folder and add the folder to your config. It's simple...
-
 Not everything is a post or a page. Maybe you want to document the various methods in your open source project, members of a team, or talks at a conference. Collections allow you to define a new type of document that behave like Pages or Posts do normally, but also have their own unique properties and namespace.
 
 ## Using Collections
@@ -36,6 +34,14 @@ collections:
 - my_collection
 {% endhighlight %}
 
+You can optionally specify metadata for your collection in the configuration:
+
+{% highlight yaml %}
+collections:
+  my_collection:
+    foo: bar
+{% endhighlight %}
+
 ### Step 2: Add your content
 
 Create a corresponding folder (e.g. `<source>/_my_collection`) and add documents.
@@ -45,11 +51,12 @@ Note: the folder must be named identical to the collection you defined in you co
 
 ### Step 3: Optionally render your collection's documents into independent files
 
-If you'd like Jekyll to create a public-facing, rendered version of each document in your collection, add your collection name to the `render` config key in your `_config.yml`:
+If you'd like Jekyll to create a public-facing, rendered version of each document in your collection, set the `output` key to `true` in your collection metadata in your `_config.yml`:
 
 {% highlight yaml %}
-render:
-- my_collection
+collections:
+  my_collection:
+    output: true
 {% endhighlight %}
 
 This will produce a file for each document in the collection.
@@ -63,6 +70,72 @@ choice and written out to `<dest>/my_collection/some_subdir/some_doc.html`.
 
 Each collection is accessible via the `site` Liquid variable. For example, if you want to access the `albums` collection found in `_albums`, you'd use `site.albums`. Each collection is itself an array of documents (e.g. `site.albums` is an array of documents, much like `site.pages` and `site.posts`). See below for how to access attributes of those documents.
 
+The collections are also available under `site.collections`, with the metadata you specified in your `_config.yml` (if present) and the following information:
+
+<div class="mobile-side-scroller">
+<table>
+  <thead>
+    <tr>
+      <th>Variable</th>
+      <th>Description</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>
+        <p><code>label</code></p>
+      </td>
+      <td>
+        <p>
+          The name of your collection, e.g. <code>my_collection</code>.
+        </p>
+      </td>
+    </tr>
+    <tr>
+      <td>
+        <p><code>docs</code></p>
+      </td>
+      <td>
+        <p>
+          An array of <a href="#documents">documents</a>.
+        </p>
+      </td>
+    </tr>
+    <tr>
+      <td>
+        <p><code>relative_directory</code></p>
+      </td>
+      <td>
+        <p>
+          The path to the collections's source directory, relative to the site source.
+        </p>
+      </td>
+    </tr>
+    <tr>
+      <td>
+        <p><code>directory</code></p>
+      </td>
+      <td>
+        <p>
+          The full path to the collections's source directory..
+        </p>
+      </td>
+    </tr>
+    <tr>
+      <td>
+        <p><code>output</code></p>
+      </td>
+      <td>
+        <p>
+          Whether the collection's documents will be output as individual files.
+        </p>
+      </td>
+    </tr>
+  </tbody>
+</table>
+</div>
+
+
 ### Documents
 
 In addition to any YAML front-matter provided in the document's corresponding file, each document has the following attributes:

data/site/docs/configuration.md

@@ -121,6 +121,18 @@ class="flag">flags</code> (specified on the command-line) that control them.
         <p><code class="option">encoding: ENCODING</code></p>
       </td>
     </tr>
+    <tr>
+      <td>
+        <p class='name'><strong>Defaults</strong></p>
+        <p class='description'>
+            Set defaults for <a href="../frontmatter/" title="YAML frontmatter">YAML frontmatter</a>
+            variables.
+        </p>
+      </td>
+      <td class='align-center'>
+        <p>see <a href="#frontmatter_defaults" title="details">below</a></p>
+      </td>
+    </tr>
   </tbody>
 </table>
 </div>
@@ -264,6 +276,43 @@ before your site is served.
   </p>
 </div>
 
+## Frontmatter defaults
+
+You can set default values for your [YAML frontmatter](../frontmatter/) variables
+in your configuration. This way, you can for example set default layouts or define
+defaults for your custom variables. Of course, any variable actually specified in
+the front matter overrides the defaults.
+
+All defaults go under the `defaults` key, which holds a list of scope-values combinations ("default sets").
+The `scope` key defines for which files the defaults apply, limiting them by their `path` and
+optionally by their `type` (`page`, `post` or `draft`). The `values` key holds the actual list of defaults.
+
+For example:
+{% highlight yaml %}
+defaults:
+  -
+    scope:
+      path: "" # empty string for all files
+    values:
+      layout: "my-site"
+  -
+    scope:
+      path: "about/blog"
+      type: "post"
+    values:
+      layout: "meta-blog" # overrides previous default layout
+      author: "Dr. Hyde"
+{% endhighlight %}
+
+With these defaults, all pages and posts would default to the `my-site` layout except for the posts under `about/blog`,
+who would default to the `meta-blog` layout and also have the `page.author` [liquid variable](../variables/) set to `Dr. Hyde` by default.
+
+### Precedence
+You can have multiple sets of frontmatter defaults that specify defaults for the same setting. In this case, for each page or post,
+the default set with the more specific scope takes precedence. This way, you can specify defaults for a path like `/site/blog` that would
+override any defaults for `/site`. Also, if the paths are equal, a scope with a specified type is more specific. If two sets are equally
+specific, the bottom-most takes precedence.
+
 ## Default Configuration
 
 Jekyll runs with the following configuration options by default. Unless

data/site/docs/frontmatter.md

@@ -179,3 +179,13 @@ These are available out-of-the-box to be used in the front-matter for a post.
   </tbody>
 </table>
 </div>
+
+<div class="note">
+  <h5>ProTip™: Don't repeat yourself</h5>
+  <p>
+    If you don't want to repeat your frequently used front-matter variables over and over,
+    just define <a href="../configuration/#frontmatter_defaults" title="frontmatter defaults">defaults</a>
+    for them and only override them where necessary (or not at all). This works both for predefined
+    and custom variables.
+  </p>
+</div>

data/site/docs/plugins.md

@@ -426,6 +426,7 @@ You can find a few useful plugins at the following locations:
 - [Compass integration for Jekyll](https://github.com/mscharley/jekyll-compass): Easily integrate Compass and Sass with your Jekyll website.
 - [Pages Directory by Ben Baker-Smith](https://github.com/bbakersmith/jekyll-pages-directory): Defines a `_pages` directory for page files which routes its output relative to the project root.
 - [Page Collections by Jeff Kolesky](https://github.com/jeffkole/jekyll-page-collections): Generates collections of pages with functionality that resembles posts.
+- [Windows 8.1 Live Tile Generation by Matt Sheehan](https://github.com/sheehamj13/jekyll-live-tiles): Generates Internet Explorer 11 config.xml file and Tile Templates for pinning your site to Windows 8.1.
 
 #### Converters
 

data/site/docs/posts.md

@@ -41,6 +41,15 @@ file. For example, the following are examples of valid post filenames:
 2012-09-12-how-to-write-a-blog.textile
 {% endhighlight %}
 
+<div class="note">
+  <h5>ProTip™: Link to other posts</h5>
+  <p>
+    Use the <a href="../templates#post_url"><code>post_url</code></a>
+    tag to link to other posts without having to worry about the URL's
+    breaking when the site permalink style changes.
+  </p>
+</div>
+
 ### Content Formats
 
 All blog post files must begin with [YAML front-matter](../frontmatter/). After

data/site/docs/sites.md

@@ -16,8 +16,8 @@ learning purposes.
     ([source](https://github.com/qrush/qrush.github.com))
 - [Roger Chapman](http://rogchap.com/)
     ([source](https://github.com/rogchap/rogchap.github.com))
-- [GitHub Official Teaching Materials](http://teach.github.com)
-    ([source](https://github.com/github/teach.github.com))
+- [GitHub Official Teaching Materials](http://training.github.com)
+    ([source](https://github.com/github/training.github.com/tree/7049d7532a6856411e34046aedfce43a4afaf424))
 - [Rasmus Andersson](http://rsms.me/)
     ([source](https://github.com/rsms/rsms.github.com))
 - [Scott Chacon](http://schacon.github.com)