jekyll 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5684903622e5f92d2f68afb075d5748a49b925ca
-  data.tar.gz: de0dc20b4663a52ef365ee00662dde4ada3e56a3
+  metadata.gz: 1ed5e240dbbd58c004f13b3c6337dca1c5a757f9
+  data.tar.gz: b69c82422c9be169e7a4dc4626268092a80f44ad
 SHA512:
-  metadata.gz: 31d796e3a2a4cbf892437021da4f5f1a5bac9ad53de19e050751a85494649c94c2c2db984a55c1bdd9e1a4aab6300612202da1f232fa05f4e975f34fcec8c2eb
-  data.tar.gz: db93aa64708dea8c5b3d7f7d825b22f471a0a6c15a67f00560e2308d04c64d7e09b4a99e39914135ed6c5717e1dcb7eda9c37d0d64ff372014e6369dcb4fdc1e
+  metadata.gz: 950f2add8c0bd180e04073b7b1b41e13cb887a38e7476c2eaf69f57434ec532ca2a642a68649d5db8f76f5b13908c3b8a3d6bb16ce7ee618076d707ef2b22439
+  data.tar.gz: ecda77f22316674ca4baec5d6342587ad0cb5e4c7344acc58efce3a8429d3406569ce54c26b511545a4472f957137e0b79bb276ed6ca1f4a8fdbc11b2e7f5d57

data/History.markdown

@@ -10,23 +10,48 @@
 
 ### Site Enhancements
 
-## v2.0.2 / 2014-05-07
+## 2.0.3 / 2014-05-08
 
 ### Bug Fixes
 
-* Correct use of `url` and `baseurl` in the site template. (#2317)
-* Default `baseurl` to `""` (#2317)
+  * Properly prefix links in site template with URL or baseurl depending upon
+    need. (#2319)
+  * Update gist tag comments and error message to require username (#2326)
+  * Fix `permalink` setting in site template (#2331)
+  * Don't fail if any of the path objects are nil (#2325)
+  * Instantiate all descendants for converters and generators, not just
+    direct subclasses (#2334)
+  * Replace all instances of `site.name` with `site.title` in site template (#2324)
+  * `Jekyll::Filters#time` now accepts UNIX timestamps in string or number form (#2339)
+  * Use `item_property` for `where` filter so it doesn't break on collections (#2359)
+  * Rescue errors thrown so `--watch` doesn't fail (#2364)
 
 ### Site Enhancements
 
-* Correct docs for the `gist` plugin so it always includes the username. (#2314)
-* Clarify new (defaults, `where` filter) features in docs (#2316)
+  * Add missing "as" to assets docs page (#2337)
+  * Update docs to reflect new `baseurl` default (#2341)
+  * Add links to headers who have an ID. (#2342)
+  * Use symbol instead of HTML number in `upgrading.md` (#2351)
+  * Fix link to frontmatter defaults docs (#2353)
+  * Fix for `History.markdown` in order to fix history page in docs (#2363)
+
+## 2.0.2 / 2014-05-07
+
+### Bug Fixes
+
+  * Correct use of `url` and `baseurl` in the site template. (#2317)
+  * Default `baseurl` to `""` (#2317)
+
+### Site Enhancements
+
+  * Correct docs for the `gist` plugin so it always includes the username. (#2314)
+  * Clarify new (defaults, `where` filter) features in docs (#2316)
 
 ## 2.0.1 / 2014-05-06
 
 ### Bug Fixes
 
-* Require `kramdown` gem instead of `maruku` gem
+  * Require `kramdown` gem instead of `maruku` gem
 
 ## 2.0.0 / 2014-05-06
 
@@ -167,7 +192,7 @@
   * Extract plugin management into its own class (#2197)
   * Add missing tests for `Command` (#2216)
   * Update `rr` link in CONTRIBUTING doc (#2247)
-  * Streamline cucumber execution of `jekyll` subcommands (#2258)
+  * Streamline Cucumber execution of `jekyll` subcommands (#2258)
   * Refactor `Commands::Serve`. (#2269)
   * Refactor `highlight` tag (#2154)
   * Update `Util` hash functions with latest from Rails (#2273)
@@ -399,7 +424,7 @@
   * Refactor Site#render (#1638)
   * Remove duplication in command line options (#1637)
   * Add tests for all the coderay options (#1543)
-  * Improve some of the cucumber test code (#1493)
+  * Improve some of the Cucumber test code (#1493)
   * Improve comparisons of timestamps by ignoring the seconds (#1582)
 
 ### Site Enhancements
@@ -569,7 +594,7 @@
   * Latest posts first in non-LSI `related_posts` (#1271)
 
 ### Development Fixes
-  * Merge the theme and layout cucumber steps into one step (#1151)
+  * Merge the theme and layout Cucumber steps into one step (#1151)
   * Restrict activesupport dependency to pre-4.0.0 to maintain compatibility with `<= 1.9.2`
   * Include/exclude deprecation handling simplification (#1284)
   * Convert README to Markdown. (#1267)
@@ -599,7 +624,7 @@
   * Update contributor information (#1192)
   * Update URL of article about Blogger migration (#1242)
   * Specify that RedCarpet is the default for new Jekyll sites on Quickstart page (#1247)
-  * Added site.pages to Variables page in docs (#1251)
+  * Added `site.pages` to Variables page in docs (#1251)
   * Add Youku and Tudou Embed link on Plugins page. (#1250)
   * Add note that `gist` tag supports private gists. (#1248)
   * Add `jekyll-timeago` to list of third-party plugins. (#1260)
@@ -617,7 +642,7 @@
 
 ### Minor Enhancements
   * Add support to gist tag for private gists. (#1189)
-  * Fail loudly when MaRuKu errors out (#1190)
+  * Fail loudly when Maruku errors out (#1190)
   * Move the building of related posts into their own class (#1057)
   * Removed trailing spaces in several places throughout the code (#1116)
   * Add a `--force` option to `jekyll new` (#1115)
@@ -683,7 +708,7 @@
 ## 1.0.1 / 2013-05-08
 
 ### Minor Enhancements
-  * Do not force use of toc_token when using generate_tok in RDiscount (#1048)
+  * Do not force use of `toc_token` when using `generate_tok` in RDiscount (#1048)
   * Add newer `language-` class name prefix to code blocks (#1037)
   * Commander error message now preferred over process abort with incorrect args (#1040)
 
@@ -706,15 +731,15 @@
 ## 1.0.0 / 2013-05-06
 
 ### Major Enhancements
-  * Add `jekyll new` subcommand: generate a jekyll scaffold (#764)
-  * Refactored jekyll commands into subcommands: build, serve, and migrate. (#690)
+  * Add `jekyll new` subcommand: generate a Jekyll scaffold (#764)
+  * Refactored Jekyll commands into subcommands: build, serve, and migrate. (#690)
   * Removed importers/migrators from main project, migrated to jekyll-import sub-gem (#793)
   * Added ability to render drafts in `_drafts` folder via command line (#833)
   * Add ordinal date permalink style (/:categories/:year/:y_day/:title.html) (#928)
 
 ### Minor Enhancements
   * Site template HTML5-ified (#964)
-  * Use post's directory path when matching for the post_url tag (#998)
+  * Use post's directory path when matching for the `post_url` tag (#998)
   * Loosen dependency on Pygments so it's only required when it's needed (#1015)
   * Parse strings into Time objects for date-related Liquid filters (#1014)
   * Tell the user if there is no subcommand specified (#1008)
@@ -728,7 +753,7 @@
   * Expose new attribute to Liquid via `page`: `page.path` (#951)
   * Accept multiple config files from command line (#945)
   * Add page variable to liquid custom tags and blocks (#413)
-  * Add paginator.previous_page_path and paginator.next_page_path (#942)
+  * Add `paginator.previous_page_path` and `paginator.next_page_path` (#942)
   * Backwards compatibility for 'auto' (#821, #934)
   * Added date_to_rfc822 used on RSS feeds (#892)
   * Upgrade version of pygments.rb to 0.4.2 (#927)
@@ -747,7 +772,7 @@
   * Relaxed Kramdown version to 0.14 (#808)
   * Aliased `jekyll server` to `jekyll serve`. (#792)
   * Updated gem versions for Kramdown, Rake, Shoulda, Cucumber, and RedCarpet. (#744)
-  * Refactored jekyll subcommands into Jekyll::Commands submodule, which now contains them (#768)
+  * Refactored Jekyll subcommands into Jekyll::Commands submodule, which now contains them (#768)
   * Rescue from import errors in Wordpress.com migrator (#671)
   * Massively accelerate LSI performance (#664)
   * Truncate post slugs when importing from Tumblr (#496)
@@ -762,7 +787,7 @@
   * Paginate in subdirectories properly (#1016)
   * Ensure post and page URLs have a leading slash (#992)
   * Catch all exceptions, not just StandardError descendents (#1007)
-  * Bullet-proof limit_posts option (#1004)
+  * Bullet-proof `limit_posts` option (#1004)
   * Read in YAML as UTF-8 to accept non-ASCII chars (#836)
   * Fix the CLI option `--plugins` to actually accept dirs and files (#993)
   * Allow 'excerpt' in YAML Front-Matter to override the extracted excerpt (#946)
@@ -774,10 +799,10 @@
   * Force usage of older directory_watcher gem as 1.5 is broken (#883)
   * Ensure all Post categories are downcase (#842, #872)
   * Force encoding of the rdiscount TOC to UTF8 to avoid conversion errors (#555)
-  * Patch for multibyte URI problem with jekyll serve (#723)
+  * Patch for multibyte URI problem with `jekyll serve` (#723)
   * Order plugin execution by priority (#864)
   * Fixed Page#dir and Page#url for edge cases (#536)
-  * Fix broken post_url with posts with a time in their YAML Front-Matter (#831)
+  * Fix broken `post_url` with posts with a time in their YAML Front-Matter (#831)
   * Look for plugins under the source directory (#654)
   * Tumblr Migrator: finds `_posts` dir correctly, fixes truncation of long
       post names (#775)
@@ -799,7 +824,7 @@
 ### Development Fixes
   * Exclude Cucumber 1.2.4, which causes tests to fail in 1.9.2 (#938)
   * Added "features:html" rake task for debugging purposes, cleaned up
-      cucumber profiles (#832)
+      Cucumber profiles (#832)
   * Explicitly require HTTPS rubygems source in Gemfile (#826)
   * Changed Ruby version for development to 1.9.3-p374 from p362 (#801)
   * Including a link to the GitHub Ruby style guide in CONTRIBUTING.md (#806)
@@ -809,6 +834,7 @@
   * Switch to Simplecov for coverage report (#765)
 
 ## 0.12.1 / 2013-02-19
+
 ### Minor Enhancements
   * Update Kramdown version to 0.14.1 (#744)
   * Test Enhancements
@@ -817,11 +843,12 @@
   * Update Redcarpet version to 2.2.2 (#744)
 
 ## 0.12.0 / 2012-12-22
+
 ### Minor Enhancements
   * Add ability to explicitly specify included files (#261)
-  * Add --default-mimetype option (#279)
+  * Add `--default-mimetype` option (#279)
   * Allow setting of RedCloth options (#284)
-  * Add post_url Liquid tag for internal post linking (#369)
+  * Add `post_url` Liquid tag for internal post linking (#369)
   * Allow multiple plugin dirs to be specified (#438)
   * Inline TOC token support for RDiscount (#333)
   * Add the option to specify the paginated url format (#342)
@@ -831,9 +858,9 @@
   * Bug Fixes
   * Allow some special characters in highlight names
   * URL escape category names in URL generation (#360)
-  * Fix error with limit_posts (#442)
+  * Fix error with `limit_posts` (#442)
   * Properly select dotfile during directory scan (#363, #431, #377)
-  * Allow setting of Kramdown smart_quotes (#482)
+  * Allow setting of Kramdown `smart_quotes` (#482)
   * Ensure front-matter is at start of file (#562)
 
 ## 0.11.2 / 2011-12-27
@@ -846,6 +873,7 @@
   * Update dependencies
 
 ## 0.11.0 / 2011-07-10
+
 ### Major Enhancements
   * Add command line importer functionality (#253)
   * Add Redcarpet Markdown support (#318)
@@ -867,9 +895,10 @@
 
 ## 0.10.0 / 2010-12-16
   * Bug Fixes
-  * Add --no-server option.
+  * Add `--no-server` option.
 
 ## 0.9.0 / 2010-12-15
+
 ### Minor Enhancements
   * Use OptionParser's `[no-]` functionality for better boolean parsing.
   * Add Drupal migrator (#245)
@@ -878,11 +907,12 @@
   * Add Marley migrator (#28)
 
 ## 0.8.0 / 2010-11-22
+
 ### Minor Enhancements
   * Add wordpress.com importer (#207)
-  * Add --limit-posts cli option (#212)
-  * Add uri_escape filter (#234)
-  * Add --base-url cli option (#235)
+  * Add `--limit-posts` cli option (#212)
+  * Add `uri_escape` filter (#234)
+  * Add `--base-url` cli option (#235)
   * Improve MT migrator (#238)
   * Add kramdown support (#239)
   * Bug Fixes
@@ -891,6 +921,7 @@
   * Prevent `_includes` dir from being a symlink
 
 ## 0.7.0 / 2010-08-24
+
 ### Minor Enhancements
   * Add support for rdiscount extensions (#173)
   * Bug Fixes
@@ -902,13 +933,14 @@
   * Fix Rakefile 'release' task (tag pushing was missing origin)
   * Ensure that RedCloth is loaded when textilize filter is used (#183)
   * Expand source, destination, and plugin paths (#180)
-  * Fix page.url to include full relative path (#181)
+  * Fix `page.url` to include full relative path (#181)
 
 ## 0.6.1 / 2010-06-24
   * Bug Fixes
   * Fix Markdown Pygments prefix and suffix (#178)
 
 ## 0.6.0 / 2010-06-23
+
 ### Major Enhancements
   * Proper plugin system (#19, #100)
   * Add safe mode so unsafe converters/generators can be added
@@ -919,9 +951,9 @@
 ### Minor Enhancements
   * Inclusion/exclusion of future dated posts (#59)
   * Generation for a specific time (#59)
-  * Allocate site.time on render not per site_payload invocation (#59)
+  * Allocate `site.time` on render not per site_payload invocation (#59)
   * Pages now present in the site payload and can be used through the
-      site.pages and site.html_pages variables
+      `site.pages` and `site.html_pages` variables
   * Generate phase added to site#process and pagination is now a generator
   * Switch to RakeGem for build/test process
   * Only regenerate static files when they have changed (#142)
@@ -933,9 +965,10 @@
   * Fix extension munging when pretty permalinks are enabled (#64)
   * Stop sorting categories (#33)
   * Preserve generated attributes over front matter (#119)
-  * Fix source directory binding using Dir.pwd (#75)
+  * Fix source directory binding using `Dir.pwd` (#75)
 
 ## 0.5.7 / 2010-01-12
+
 ### Minor Enhancements
   * Allow overriding of post date in the front matter (#62, #38)
   * Bug Fixes
@@ -943,7 +976,7 @@
   * Empty tags causes error in read_posts (#84)
   * Fix pagination to adhere to read/render/write paradigm
   * Test Enhancement
-  * cucumber features no longer use site.posts.first where a better
+  * Cucumber features no longer use site.posts.first where a better
       alternative is available
 
 ## 0.5.6 / 2010-01-08
@@ -1001,6 +1034,7 @@
   * Added Date#xmlschema for Ruby versions < 1.9
 
 ## 0.5.1 / 2009-05-06
+
 ### Major Enhancements
   * Next/previous posts in site payload (@pantulis, @tomo)
   * Permalink templating system
@@ -1015,6 +1049,7 @@
   * CGI escaped post titles (@Chrononaut)
 
 ## 0.5.0 / 2009-04-07
+
 ### Minor Enhancements
   * Ability to set post categories via YAML (@qrush)
   * Ability to set prevent a post from publishing via YAML (@qrush)
@@ -1033,18 +1068,20 @@
   * Add Cucumber acceptance test suite (@qrush, @technicalpickles)
 
 ## 0.4.1
+
 ### Minor Enhancements
   * Changed date format on wordpress converter (zeropadding) (@dysinger)
   * Bug Fixes
-  * Add jekyll binary as executable to gemspec (@dysinger)
+  * Add Jekyll binary as executable to gemspec (@dysinger)
 
 ## 0.4.0 / 2009-02-03
+
 ### Major Enhancements
   * Switch to Jeweler for packaging tasks
 
 ### Minor Enhancements
   * Type importer (@codeslinger)
-  * site.topics accessor (@baz)
+  * `site.topics` accessor (@baz)
   * Add `array_to_sentence_string` filter (@mchung)
   * Add a converter for textpattern (@PerfectlyNormal)
   * Add a working Mephisto / MySQL converter (@ivey)
@@ -1059,8 +1096,9 @@
   * Fix site payload available to files (@matrix9180)
 
 ## 0.3.0 / 2008-12-24
+
 ### Major Enhancements
-  * Added --server option to start a simple WEBrick server on destination
+  * Added `--server` option to start a simple WEBrick server on destination
       directory (@johnreilly and @mchung)
 
 ### Minor Enhancements
@@ -1079,23 +1117,24 @@
 ## 0.2.1 / 2008-12-15
   * Major Changes
   * Use Maruku (pure Ruby) for Markdown by default (@mreid)
-  * Allow use of RDiscount with --rdiscount flag
+  * Allow use of RDiscount with `--rdiscount` flag
 
 ### Minor Enhancements
   * Don't load directory_watcher unless it's needed (@pjhyett)
 
 ## 0.2.0 / 2008-12-14
   * Major Changes
-  * related_posts is now found in site.related_posts
+  * related_posts is now found in `site.related_posts`
 
 ## 0.1.6 / 2008-12-13
   * Major Features
   * Include files in `_includes` with `{% include x.textile %}`
 
 ## 0.1.5 / 2008-12-12
+
 ### Major Enhancements
-  * Code highlighting with Pygments if --pygments is specified
-  * Disable true LSI by default, enable with --lsi
+  * Code highlighting with Pygments if `--pygments` is specified
+  * Disable true LSI by default, enable with `--lsi`
 
 ### Minor Enhancements
   * Output informative message if RDiscount is not available (@JackDanger)
@@ -1114,7 +1153,7 @@
   * Code hilighting (@vanpelt)
   * Autobuild
   * Bug Fixes
-  * Accept both \r\n and \n in YAML header (@vanpelt)
+  * Accept both `\r\n` and `\n` in YAML header (@vanpelt)
 
 ## 0.1.2 / 2008-11-22
   * Major Features

data/Rakefile

@@ -29,12 +29,8 @@ def gem_file
   "#{name}-#{version}.gem"
 end
 
-def replace_header(head, header_name)
-  head.sub!(/(\.#{header_name}\s*= ').*'/) { "#{$1}#{send(header_name)}'"}
-end
-
 def normalize_bullets(markdown)
-  markdown.gsub(/\s{2}\*{1}/, "-")
+  markdown.gsub(/\n\s{2}\*{1}/, "\n-")
 end
 
 def linkify_prs(markdown)

data/features/collections.feature

@@ -94,3 +94,15 @@ Feature: Collections
     When I run jekyll build
     Then the _site directory should exist
     And I should see "First document's output: <p>Use <code>Jekyll.configuration</code> to build a full configuration for use w/Jekyll.</p>\n\n<p>Whatever: foo.bar</p>" in "_site/index.html"
+
+  Scenario: Filter documents by where
+    Given I have an "index.html" page that contains "{% assign items = site.methods | where: 'whatever','foo.bar' %}Item count: {{ items.size }}"
+    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 "Item count: 1" in "_site/index.html"

data/jekyll.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('listen', "~> 2.5")
   s.add_runtime_dependency('kramdown', "~> 1.3")
   s.add_runtime_dependency('pygments.rb', "~> 0.5.0")
-  s.add_runtime_dependency('mercenary', "~> 0.3.1")
+  s.add_runtime_dependency('mercenary', "~> 0.3.3")
   s.add_runtime_dependency('safe_yaml', "~> 1.0")
   s.add_runtime_dependency('colorator', "~> 0.1")
   s.add_runtime_dependency('redcarpet', "~> 3.1")

data/lib/jekyll/commands/build.rb

@@ -67,8 +67,6 @@ module Jekyll
             ignored = nil
           end
 
-          Jekyll.logger.info "Auto-regeneration:", "enabled"
-
           listener = Listen.to(
             source,
             :ignore => ignored,
@@ -77,11 +75,19 @@ module Jekyll
             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} "
-            process_site(site)
-            puts  "...done."
+            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"
+
           unless options['serving']
             trap("INT") do
               listener.stop