Release 2.1.0

Release 2.1.0

History.markdown

@@ -2,6 +2,16 @@
 
 ### Major Enhancements
 
+### Minor Enhancements
+
+### Bug Fixes
+
+### Development Fixes
+
+### Site Enhancements
+
+## 2.1.0 / 2014-06-28
+
 ### Minor Enhancements
 
   * Bump to the latest Liquid version, 2.6.1 (#2495)
@@ -27,6 +37,8 @@
   * 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
 
@@ -46,6 +58,11 @@
   * 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
 
@@ -53,6 +70,7 @@
   * 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
 
@@ -74,6 +92,9 @@
   * 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
 

features/frontmatter_defaults.feature

@@ -128,3 +128,9 @@ Feature: frontmatter defaults
     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"

jekyll.gemspec

@@ -30,7 +30,6 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency('liquid', "~> 2.6.1")
   s.add_runtime_dependency('classifier', "~> 1.3")
-  s.add_runtime_dependency('listen', [">= 2.7.6", "< 3.0.0"])
   s.add_runtime_dependency('kramdown', "~> 1.3")
   s.add_runtime_dependency('pygments.rb', "~> 0.6.0")
   s.add_runtime_dependency('mercenary', "~> 0.3.3")
@@ -42,6 +41,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('jekyll-gist', '~> 1.0')
   s.add_runtime_dependency('jekyll-coffeescript', '~> 1.0')
   s.add_runtime_dependency('jekyll-sass-converter', '~> 1.0')
+  s.add_runtime_dependency('jekyll-watch', '~> 1.0')
 
   s.add_development_dependency('rake', "~> 10.1")
   s.add_development_dependency('rdoc', "~> 3.11")

lib/jekyll.rb

@@ -32,7 +32,6 @@ require 'toml'
 # internal requires
 require 'jekyll/version'
 require 'jekyll/utils'
-require 'jekyll/hooks'
 require 'jekyll/log_adapter'
 require 'jekyll/stevenson'
 require 'jekyll/deprecator'

lib/jekyll/collection.rb

@@ -52,7 +52,7 @@ module Jekyll
     def filtered_entries
       return Array.new unless exists?
       Dir.chdir(directory) do
-        entry_filter.filter(entries)
+        entry_filter.filter(entries).reject { |f| File.directory?(f) }
       end
     end
 
@@ -105,7 +105,7 @@ module Jekyll
     #
     # Returns a sanitized version of the label.
     def sanitize_label(label)
-      label.gsub(/[^a-z0-9_\-]/i, '')
+      label.gsub(/[^a-z0-9_\-\.]/i, '')
     end
 
     # Produce a representation of this Collection for use in Liquid.

lib/jekyll/commands/build.rb

@@ -38,7 +38,7 @@ module Jekyll
         # Build your Jekyll site.
         #
         # site - the Jekyll::Site instance to build
-        # options - the
+        # options - A Hash of options passed to the command
         #
         # Returns nothing.
         def build(site, options)
@@ -58,38 +58,8 @@ module Jekyll
         #
         # Returns nothing.
         def watch(site, options)
-          require 'listen'
-
-          listener = Listen.to(
-            options['source'],
-            :ignore => ignore_paths(options),
-            :force_polling => options['force_polling']
-          ) do |modified, added, removed|
-            t = Time.now.strftime("%Y-%m-%d %H:%M:%S")
-            n = modified.length + added.length + removed.length
-            print Jekyll.logger.formatted_topic("Regenerating:") + "#{n} files at #{t} "
-            begin
-              process_site(site)
-              puts  "...done."
-            rescue => e
-              puts "...error:"
-              Jekyll.logger.warn "Error:", e.message
-              Jekyll.logger.warn "Error:", "Run jekyll build --trace for more information."
-            end
-          end
-          listener.start
-
-          Jekyll.logger.info "Auto-regeneration:", "enabled for '#{source}'"
-
-          unless options['serving']
-            trap("INT") do
-              listener.stop
-              puts "     Halting auto-regeneration."
-              exit 0
-            end
-
-            loop { sleep 1000 }
-          end
+          require 'jekyll-watch'
+          Jekyll::Commands::Watch.watch(site, options)
         end
 
       end # end of class << self

lib/jekyll/configuration.rb

@@ -40,6 +40,7 @@ module Jekyll
       'markdown_ext'  => 'markdown,mkdown,mkdn,mkd,md',
       'textile_ext'   => 'textile',
 
+      'quiet'         => false,
       'port'          => '4000',
       'host'          => '0.0.0.0',
 
@@ -103,6 +104,10 @@ module Jekyll
       override['source'] || self['source'] || DEFAULTS['source']
     end
 
+    def quiet?(override = {})
+      override['quiet'] || self['quiet'] || DEFAULTS['quiet']
+    end
+
     def safe_load_file(filename)
       case File.extname(filename)
       when '.toml'
@@ -120,6 +125,9 @@ module Jekyll
     #
     # Returns an Array of config files
     def config_files(override)
+      # Be quiet quickly.
+      Jekyll.logger.log_level = :error if quiet?(override)
+
       # Get configuration from <source>/_config.yml or <source>/<config_file>
       config_files = override.delete('config')
       if config_files.to_s.empty?
@@ -234,6 +242,7 @@ module Jekyll
             " as a list of comma-separated values."
           config[option] = csv_to_array(config[option])
         end
+        config[option].map!(&:to_s)
       end
 
       if config.fetch('markdown', 'kramdown').to_s.downcase.eql?("maruku")

lib/jekyll/frontmatter_defaults.rb

@@ -41,10 +41,10 @@ module Jekyll
         old_scope = nil
         matching_sets(path, type).each do |set|
           if has_precedence?(old_scope, set['scope'])
-            defaults.merge! set['values']
+            defaults = Utils.deep_merge_hashes(defaults, set['values'])
             old_scope = set['scope']
           else
-            defaults = set['values'].merge(defaults)
+            defaults = Utils.deep_merge_hashes(set['values'], defaults)
           end
         end
         defaults
@@ -145,4 +145,4 @@ module Jekyll
       end
     end
   end
-end
+end

lib/jekyll/hooks.rb

@@ -1,62 +0,0 @@
-module Jekyll
-  module Hooks
-
-    class HookCollection
-      include Enumerable
-
-      def each(&block)
-        if block.nil?
-          hook_methods
-        else
-          hook_methods.each &block
-        end
-      end
-
-      def hook_methods
-        @hook_methods ||= Array.new
-      end
-
-      def add_hook(proc)
-        hook_methods << proc
-      end
-
-      def exec(*args)
-        if args.empty?
-          hook_methods.each { |hook| hook.call }
-        else
-          hook_methods.each do |hook|
-            args.each { |arg| hook.call(arg) }
-          end
-        end
-      end
-
-    end
-
-    %w[
-      post_reset
-      pre_read
-      post_read
-      pre_generate
-      post_generate
-      pre_render
-      post_render
-      pre_cleanup
-      post_cleanup
-      pre_write
-      post_write
-    ].each do |method|
-      declaration = <<-METH
-      def #{method}(method_name, *args)
-        cr = caller
-        ((@hooks ||= Hash.new).fetch(method_name.to_s, HookCollection.new)).add_hook -> { cr.send(method_name.to_sym, args) }
-      end
-      def #{method}_exec(*args)
-        ((@hooks ||= Hash.new).fetch(method_name.to_s, HookCollection.new)).exec(*args)
-      end
-METH
-puts declaration
-      class_eval declaration
-    end
-
-  end
-end

lib/jekyll/post.rb

@@ -78,8 +78,9 @@ module Jekyll
 
     def populate_categories
       categories_from_data = Utils.pluralized_array_from_hash(data, 'category', 'categories')
-      self.categories = (Array(categories) + categories_from_data).map {|c| c.to_s.downcase}
-      categories.flatten!
+      self.categories = (
+        Array(categories) + categories_from_data
+      ).map {|c| c.to_s.downcase}.flatten.uniq
     end
 
     def populate_tags

lib/jekyll/site.rb

@@ -8,8 +8,6 @@ module Jekyll
 
     attr_accessor :converters, :generators
 
-    include Jekyll::Hooks
-
     # Public: Initialize a new Site.
     #
     # config - A Hash containing site configuration details.

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

lib/jekyll/version.rb

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

site/_data/docs.yml

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

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.*

site/docs/configuration.md

@@ -434,7 +434,6 @@ server:      false    # deprecated
 host:        0.0.0.0
 port:        4000
 baseurl:     ""
-url:         http://localhost:4000
 lsi:         false
 
 maruku:

site/docs/continuous-integration.md

@@ -0,0 +1,177 @@
+---
+layout: docs
+title: Continuous Integration
+prev_section: deployment-methods
+next_section: troubleshooting
+permalink: /docs/continuous-integration/
+---
+
+You can easily test your website build against one or more versions of Ruby.
+The following guide will show you how to set up a free build environment on
+[Travis][0], with [GitHub][1] integration for pull requests. Paid
+alternatives exist for private repositories.
+
+[0]: https://travis-ci.org/
+[1]: https://github.com/
+
+## 1. Enabling Travis and GitHub
+
+Enabling Travis builds for your GitHub repository is pretty simple:
+
+1. Go to your profile on travis-ci.org: https://travis-ci.org/profile/username
+2. Find the repository for which you're interested in enabling builds.
+3. Click the slider on the right so it says "ON" and is a dark grey.
+4. Optionally configure the build by clicking on the wrench icon. Further
+   configuration happens in you `.travis.yml` file. More details on that
+   below.
+
+## 2. The Test Script
+
+The simplest test script simply runs `jekyll build` and ensures that Jekyll
+doesn't fail to build the site. It doesn't check the resulting site, but it
+does ensure things are built properly.
+
+When testing Jekyll output, there is no better tool than [html-proofer][2].
+This tool checks your resulting site to ensure all links and images exist.
+Utilize it either with the convenient `htmlproof` command-line executable,
+or write a Ruby script which utilizes the gem.
+
+### The HTML Proofer Executable
+
+{% highlight bash %}
+#!/usr/bin/env bash
+set -e # halt script on error
+
+bundle exec jekyll build
+bundle exec htmlproof ./_site
+{% endhighlight %}
+
+Some options can be specified via command-line switches. Check out the
+`html-proofer` README for more information about these switches, or run
+`htmlproof --help` locally.
+
+### The HTML Proofer Library
+
+You can also invoke `html-proofer` in Ruby scripts (e.g. in a Rakefile):
+
+{% highlight ruby %}
+#!/usr/bin/env ruby
+
+require 'html/proofer'
+HTML::Proofer.new("./_site").run
+{% endhighlight %}
+
+Options are given as a second argument to `.new`, and are encoded in a
+symbol-keyed Ruby Hash. More information about the configuration options,
+check out `html-proofer`'s README file.
+
+[2]: https://github.com/gjtorikian/html-proofer
+
+## 3. Configuring Your Travis Builds
+
+This file is used to configure your Travis builds. Because Jekyll is built
+with Ruby and requires RubyGems to install, we use the Ruby language build
+environment. Below is a sample `.travis.yml` file, and what follows that is
+an explanation of each line.
+
+{% highlight yaml %}
+language: ruby
+rvm:
+- 2.1
+script: ./script/cibuild
+
+# branch whitelist
+branches:
+  only:
+  - gh-pages     # test the gh-pages branch
+  - /pages-(.*)/ # test every branch which starts with "pages-"
+
+env:
+  global:
+  - NOKOGIRI_USE_SYSTEM_LIBRARIES=true # speeds up installation of html-proofer
+{% endhighlight %}
+
+Ok, now for an explanation of each line:
+
+{% highlight yaml %}
+language: ruby
+{% endhighlight %}
+
+This line tells Travis to use a Ruby build container. It gives your script
+access to Bundler, RubyGems, and and Ruby runtime.
+
+{% highlight yaml %}
+rvm:
+- 2.1
+{% endhighlight %}
+
+RVM is a popular Ruby Version Manager (like rbenv, chruby, etc). This
+directive tells Travis the Ruby version to use when running your test
+script.
+
+{% highlight yaml %}
+script: ./script/cibuild
+{% endhighlight %}
+
+Travis allows you to run any arbitrary shell script to test your site. One
+convention is to put all scripts for your project in the `script`
+directory, and to call your test script `cibuild`. This line is completely
+customizable. If your script won't change much, you can write your test
+incantation here directly:
+
+{% highlight yaml %}
+script: jekyll build && htmlproof ./_site
+{% endhighlight %}
+
+The `script` directive can be absolutely any valid shell command.
+
+{% highlight yaml %}
+# branch whitelist
+branches:
+  only:
+  - gh-pages     # test the gh-pages branch
+  - /pages-(.*)/ # test every branch which starts with "pages-"
+{% endhighlight %}
+
+You want to ensure the Travis builds for your site are being run only on
+the branch or branches which contain your site. One means of ensuring this
+isolation is including a branch whitelist in your Travis configuration
+file. By specifying the `gh-pages` branch, you will ensure the associated
+test script (discussed above) is only executed on site branches. If you use
+a pull request flow for proposing changes, you may wish to enforce a
+convention for your builds such that all branches containing edits are
+prefixed, exemplified above with the `/pages-(.*)/` regular expression.
+
+The `branches` directive is completely optional.
+
+{% highlight yaml %}
+env:
+  global:
+  - NOKOGIRI_USE_SYSTEM_LIBRARIES=true # speeds up installation of html-proofer
+{% endhighlight %}
+
+Using `html-proofer`? You'll want this environment variable. Nokogiri, used
+to parse HTML files in your compiled site, comes bundled with libraries
+which it must compile each time it is installed. Luckily, you can
+dramatically increase the install time of Nokogiri by setting the
+environment variable `NOKOGIRI_USE_SYSTEM_LIBRARIES` to `true`.
+
+## 4. Gotchas
+
+### Exclude `vendor`
+
+Travis bundles all gems in the `vendor` directory on its build servers,
+which Jekyll will mistakenly read and explode on. To avoid this, exclude
+`vendor` in your `_config.yml`:
+
+{% highlight yaml %}
+exclude: [vendor]
+{% endhighlight %}
+
+### Questions?
+
+This entire guide is open-source. Go ahead and [edit it][3] if you have a
+fix or [ask for help][4] if you run into trouble and need some help.
+
+[3]: https://github.com/jekyll/jekyll/edit/master/site/docs/continuous-integration.md
+[4]: https://github.com/jekyll/jekyll-help#how-do-i-ask-a-question

site/docs/history.md

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

site/docs/installation.md

@@ -19,6 +19,8 @@ you’ll need to make sure your system has before you start.
 - [Ruby](http://www.ruby-lang.org/en/downloads/)
 - [RubyGems](http://rubygems.org/pages/download)
 - Linux, Unix, or Mac OS X
+- [NodeJS](http://nodejs.org), or another JavaScript runtime (for
+  CoffeeScript support).
 
 <div class="note info">
   <h5>Running Jekyll on Windows</h5>

site/docs/windows.md

@@ -12,7 +12,7 @@ knowledge and lessons that have been unearthed by Windows users.
 
 ## Installation
 
-Madhur Ahuja has written up instructions to get
+Julian Thilo has written up instructions to get
 [Jekyll running on Windows][windows-installation] and it seems to work for most.
 
 ## Encoding
@@ -29,7 +29,7 @@ the site generation process. It can be done with the following command:
 $ chcp 65001
 {% endhighlight %}
 
-[windows-installation]: http://www.madhur.co.in/blog/2011/09/01/runningjekyllwindows.html
+[windows-installation]: https://github.com/juthilo/run-jekyll-on-windows
 
 ## Auto-regeneration
 

test/source/_with.dots/all.dots/2.4.0.md

@@ -0,0 +1,5 @@
+---
+title: v2.4.0
+---
+
+v2.4.0

test/test_collections.rb

@@ -17,15 +17,15 @@ class TestCollections < Test::Unit::TestCase
     end
 
     should "sanitize the label name" do
-      assert_equal @collection.label, "etcpassword"
+      assert_equal @collection.label, "....etcpassword"
     end
 
     should "have a sanitized relative path name" do
-      assert_equal @collection.relative_directory, "_etcpassword"
+      assert_equal @collection.relative_directory, "_....etcpassword"
     end
 
     should "have a sanitized full path" do
-      assert_equal @collection.directory, source_dir("_etcpassword")
+      assert_equal @collection.directory, source_dir("_....etcpassword")
     end
   end
 
@@ -194,4 +194,31 @@ class TestCollections < Test::Unit::TestCase
     end
   end
 
+  context "with dots in the filenames" do
+    setup do
+      @site = fixture_site({
+        "collections" => ["with.dots"],
+        "safe"        => true
+      })
+      @site.process
+      @collection = @site.collections["with.dots"]
+    end
+
+    should "exist" do
+      assert_not_nil @collection
+    end
+
+    should "contain one document" do
+      assert_equal 2, @collection.docs.size
+    end
+
+    should "allow dots in the filename" do
+      assert_equal "_with.dots", @collection.relative_directory
+    end
+
+    should "read document in subfolders with dots" do
+      assert @collection.docs.any? { |d| d.path.include?("all.dots") }
+    end
+  end
+
 end

test/test_tags.rb

@@ -75,7 +75,13 @@ CONTENT
 
       tag = Jekyll::Tags::HighlightBlock.new('highlight', 'ruby linenos=table cssclass=hl', ["test", "{% endhighlight %}", "\n"])
       assert_equal({ :cssclass => 'hl', :linenos => 'table' }, tag.instance_variable_get(:@options))
-
+      
+      tag = Jekyll::Tags::HighlightBlock.new('highlight', 'ruby linenos=table cssclass=hl hl_linenos=3', ["test", "{% endhighlight %}", "\n"])
+      assert_equal({ :cssclass => 'hl', :linenos => 'table', :hl_linenos => '3' }, tag.instance_variable_get(:@options))
+      
+      tag = Jekyll::Tags::HighlightBlock.new('highlight', 'ruby linenos=table cssclass=hl hl_linenos="3 5 6"', ["test", "{% endhighlight %}", "\n"])
+      assert_equal({ :cssclass => 'hl', :linenos => 'table', :hl_linenos => ['3', '5', '6'] }, tag.instance_variable_get(:@options))
+      
       tag = Jekyll::Tags::HighlightBlock.new('highlight', 'Ruby ', ["test", "{% endhighlight %}", "\n"])
       assert_equal "ruby", tag.instance_variable_get(:@lang), "lexers should be case insensitive"
     end