@@ -84,3 +84,37 @@ module TocFilter end end Liquid::Template.register_filter(TocFilter) + + + +# Under Ruby 1.9 [a,b,c].to_s doesn't join the array first. (Jekyll 0.5.2 requires this) +module Jekyll + class HighlightBlock < Liquid::Block + def render(context) + if context.registers[:site].pygments + render_pygments(context, super.join) + else + render_codehighlighter(context, super.join) + end + end + end +end + +# Ruby 1.9 has sane closure scoping which manages to mess Liquid filters. (Liquid 2.0.0 requires this) +module Liquid + class Variable + def render(context) + return '' if @name.nil? + @filters.inject(context[@name]) do |output, filter| + filterargs = filter[1].to_a.collect do |a| + context[a] + end + begin + context.invoke(filter[0], output, *filterargs) + rescue FilterNotFound + raise FilterNotFound, "Error - filter '#{filter[0]}' in '#{@markup.strip}' could not be found." + end + end + end + end +end rakelib/jekylltask.rb dce9f85ddcdeacb9ff3e1b629e9d1b33734ab7f2 Assaf Arkin assaf@apache.org http://github.com/assaf/buildr/commit/ce7f862493810c37be30c586f597aaf252461297 ce7f862493810c37be30c586f597aaf252461297 2009-06-30T18:21:09-07:00 2009-06-29T23:39:19-07:00 Fixed Jekyll 0.5.2 and Liquid 2.0.0 to work under Ruby 1.9. git-svn-id: https://svn.apache.org/repos/asf/buildr/trunk@789579 13f79535-47bb-0310-9956-ffa450edef68 3308ab8d533be0775dea5b4a375557f73c12af85 Assaf Arkin assaf@apache.org