tilt 1.3.2 → 1.3.3

data/Gemfile

@@ -0,0 +1,2 @@
+source "http://rubygems.org"
+gemspec

data/README.md

@@ -21,35 +21,40 @@ template engines included in the distribution.
 
 Support for these template engines is included with the package:
 
-    ENGINE                     FILE EXTENSIONS        REQUIRED LIBRARIES
-    -------------------------- ---------------------- ----------------------------
-    ERB                        .erb, .rhtml           none (included ruby stdlib)
-    Interpolated String        .str                   none (included ruby core)
-    Erubis                     .erb, .rhtml, .erubis  erubis
-    Haml                       .haml                  haml
-    Sass                       .sass                  haml (< 3.1) or sass (>= 3.1)
-    Scss                       .scss                  haml (< 3.1) or sass (>= 3.1)
-    Less CSS                   .less                  less
-    Builder                    .builder               builder
-    Liquid                     .liquid                liquid
-    RDiscount                  .markdown, .mkd, .md   rdiscount
-    Redcarpet                  .markdown, .mkd, .md   redcarpet
-    BlueCloth                  .markdown, .mkd, .md   bluecloth
-    Kramdown                   .markdown, .mkd, .md   kramdown
-    Maruku                     .markdown, .mkd, .md   maruku
-    RedCloth                   .textile               redcloth
-    RDoc                       .rdoc                  rdoc
-    Radius                     .radius                radius
-    Markaby                    .mab                   markaby
-    Nokogiri                   .nokogiri              nokogiri
-    CoffeeScript               .coffee                coffee-script (+ javascript)
-    Creole (Wiki markup)       .creole                creole
+    ENGINE                     FILE EXTENSIONS         REQUIRED LIBRARIES
+    -------------------------- ----------------------- ----------------------------
+    ERB                        .erb, .rhtml            none (included ruby stdlib)
+    Interpolated String        .str                    none (included ruby core)
+    Erubis                     .erb, .rhtml, .erubis   erubis
+    Haml                       .haml                   haml
+    Sass                       .sass                   haml (< 3.1) or sass (>= 3.1)
+    Scss                       .scss                   haml (< 3.1) or sass (>= 3.1)
+    Less CSS                   .less                   less
+    Builder                    .builder                builder
+    Liquid                     .liquid                 liquid
+    RDiscount                  .markdown, .mkd, .md    rdiscount
+    Redcarpet                  .markdown, .mkd, .md    redcarpet
+    BlueCloth                  .markdown, .mkd, .md    bluecloth
+    Kramdown                   .markdown, .mkd, .md    kramdown
+    Maruku                     .markdown, .mkd, .md    maruku
+    RedCloth                   .textile                redcloth
+    RDoc                       .rdoc                   rdoc
+    Radius                     .radius                 radius
+    Markaby                    .mab                    markaby
+    Nokogiri                   .nokogiri               nokogiri
+    CoffeeScript               .coffee                 coffee-script (+ javascript)
+    Creole (Wiki markup)       .wiki, .creole          creole
+    WikiCloth (Wiki markup)    .wiki, .mediawiki, .mw  wikicloth
+    Yajl                       .yajl                   yajl-ruby
 
 These template engines ship with their own Tilt integration:
 
     ENGINE                     FILE EXTENSIONS   REQUIRED LIBRARIES
     -------------------------- ----------------- ----------------------------
     Slim                       .slim             slim (>= 0.7)
+    Embedded JavaScript                          sprockets
+    Embedded CoffeeScript                        sprockets
+    JST                                          sprockets
 
 See [TEMPLATES.md][t] for detailed information on template engine
 options and supported features.
@@ -194,7 +199,7 @@ it on subsequent template invocations. Benchmarks show this yields a 5x-10x
 performance increase over evaluating the Ruby source on each invocation.
 
 Template compilation is currently supported for these template engines:
-StringTemplate, ERB, Erubis, Haml, Nokogiri and Builder.
+StringTemplate, ERB, Erubis, Haml, Nokogiri, Builder and Yajl.
 
 LICENSE
 -------

data/lib/tilt.rb

@@ -1,5 +1,5 @@
 module Tilt
-  VERSION = '1.3.2'
+  VERSION = '1.3.3'
 
   @preferred_mappings = Hash.new
   @template_mappings = Hash.new { |h, k| h[k] = [] }
@@ -172,8 +172,8 @@ module Tilt
   register MarukuTemplate,    'markdown', 'mkd', 'md'
   register KramdownTemplate,  'markdown', 'mkd', 'md'
   register BlueClothTemplate, 'markdown', 'mkd', 'md'
-  register RedcarpetTemplate, 'markdown', 'mkd', 'md'
   register RDiscountTemplate, 'markdown', 'mkd', 'md'
+  register RedcarpetTemplate, 'markdown', 'mkd', 'md'
 
   require 'tilt/textile'
   register RedClothTemplate, 'textile'
@@ -181,6 +181,10 @@ module Tilt
   require 'tilt/rdoc'
   register RDocTemplate, 'rdoc'
 
-  require 'tilt/creole'
-  register CreoleTemplate, 'creole'
+  require 'tilt/wiki'
+  register CreoleTemplate,    'wiki', 'creole'
+  register WikiClothTemplate, 'wiki', 'mediawiki', 'mw'
+
+  require 'tilt/yajl'
+  register YajlTemplate, 'yajl'
 end

data/lib/tilt/css.rb

@@ -48,7 +48,7 @@ module Tilt
     self.default_mime_type = 'text/css'
 
     def self.engine_initialized?
-      defined? ::Less::Engine
+      defined? ::Less
     end
 
     def initialize_engine
@@ -56,11 +56,16 @@ module Tilt
     end
 
     def prepare
-      @engine = ::Less::Engine.new(data)
+      if ::Less.const_defined? :Engine
+        @engine = ::Less::Engine.new(data)
+      else
+        parser  = ::Less::Parser.new(:filename => eval_file, :line => line)
+        @engine = parser.parse(data)
+      end
     end
 
     def evaluate(scope, locals, &block)
-      @engine.to_css
+      @output ||= @engine.to_css
     end
   end
 end

data/lib/tilt/markdown.rb

@@ -42,12 +42,10 @@ module Tilt
   # Upskirt Markdown implementation. See:
   # https://github.com/tanoku/redcarpet
   #
-  # Compatible to RDiscount
-  class RedcarpetTemplate < RDiscountTemplate
-    self.default_mime_type = 'text/html'
-
+  # Supports both Redcarpet 1.x and 2.x
+  class RedcarpetTemplate < Template
     def self.engine_initialized?
-      defined? ::RedcarpetCompat
+      defined? ::Redcarpet
     end
 
     def initialize_engine
@@ -55,8 +53,69 @@ module Tilt
     end
 
     def prepare
-      @engine = RedcarpetCompat.new(data, *flags)
-      @output = nil
+      klass = [Redcarpet1, Redcarpet2].detect { |e| e.engine_initialized? }
+      @engine = klass.new(file, line, options) { data }
+    end
+
+    def evaluate(scope, locals, &block)
+      @engine.evaluate(scope, locals, &block)
+    end
+
+    # Compatibility mode for Redcarpet 1.x
+    class Redcarpet1 < RDiscountTemplate
+      self.default_mime_type = 'text/html'
+
+      def self.engine_initialized?
+        defined? ::RedcarpetCompat
+      end
+
+      def prepare
+        @engine = RedcarpetCompat.new(data, *flags)
+        @output = nil
+      end
+    end
+
+    # Future proof mode for Redcarpet 2.x (not yet released)
+    class Redcarpet2 < Template
+      self.default_mime_type = 'text/html'
+
+      def self.engine_initialized?
+        defined? ::Redcarpet::Render
+      end
+
+      def generate_renderer
+        renderer = options.delete(:renderer) || Redcarpet::Render::HTML
+        return renderer unless options.delete(:smartypants)
+        return renderer if renderer <= Redcarpet::Render::SmartyPants
+
+        if renderer == Redcarpet::Render::XHTML
+          Redcarpet::Render::SmartyHTML.new(:xhtml => true)
+        elsif renderer == Redcarpet::Render::HTML
+          Redcarpet::Render::SmartyHTML
+        elsif renderer.is_a? Class
+          Class.new(renderer) { include Redcarpet::Render::SmartyPants }
+        else
+          renderer.extend Redcarpet::Render::SmartyPants
+        end
+      end
+
+      def prepare
+        # try to support the same aliases
+        RDiscountTemplate::ALIAS.each do |opt, aka|
+          next if options.key? opt or not options.key? aka
+          options[opt] = options.delete(aka)
+        end
+
+        # only raise an exception if someone is trying to enable :escape_html
+        options.delete(:escape_html) unless options[:escape_html]
+
+        @engine = Redcarpet::Markdown.new(generate_renderer, options)
+        @output = nil
+      end
+
+      def evaluate(scope, locals, &block)
+        @output ||= @engine.render(data)
+      end
     end
   end
 

data/lib/tilt/{creole.rb → wiki.rb}

@@ -25,4 +25,26 @@ module Tilt
       @output ||= @engine.to_html
     end
   end
+
+  # WikiCloth implementation. See:
+  # http://redcloth.org/
+  class WikiClothTemplate < Template
+    def self.engine_initialized?
+      defined? ::WikiCloth::Parser
+    end
+
+    def initialize_engine
+      require_template_library 'wikicloth'
+    end
+
+    def prepare
+      @parser = options.delete(:parser) || WikiCloth::Parser
+      @engine = @parser.new options.merge(:data => data)
+      @output = nil
+    end
+
+    def evaluate(scope, locals, &block)
+      @output ||= @engine.to_html
+    end
+  end
 end

data/lib/tilt/yajl.rb

@@ -0,0 +1,94 @@
+require 'tilt/template'
+
+module Tilt
+
+  # Yajl Template implementation
+  #
+  # Yajl is a fast JSON parsing and encoding library for Ruby
+  # See https://github.com/brianmario/yajl-ruby
+  #
+  # The template source is evaluated as a Ruby string,
+  # and the result is converted #to_json.
+  #
+  # == Example
+  #
+  #    # This is a template example.
+  #    # The template can contain any Ruby statement.
+  #    tpl <<-EOS
+  #      @counter = 0
+  #
+  #      # The json variable represents the buffer
+  #      # and holds the data to be serialized into json.
+  #      # It defaults to an empty hash, but you can override it at any time.
+  #      json = {
+  #        :"user#{@counter += 1}" => { :name => "Joshua Peek", :id => @counter },
+  #        :"user#{@counter += 1}" => { :name => "Ryan Tomayko", :id => @counter },
+  #        :"user#{@counter += 1}" => { :name => "Simone Carletti", :id => @counter },
+  #      }
+  #
+  #      # Since the json variable is a Hash,
+  #      # you can use conditional statements or any other Ruby statement
+  #      # to populate it.
+  #      json[:"user#{@counter += 1}"] = { :name => "Unknown" } if 1 == 2
+  #
+  #      # The last line doesn't affect the returned value.
+  #      nil
+  #    EOS
+  #
+  #    template = Tilt::YajlTemplate.new { tpl }
+  #    template.render(self)
+  #
+  class YajlTemplate < Template
+
+    self.default_mime_type = 'application/json'
+
+    def self.engine_initialized?
+      defined? ::Yajl
+    end
+
+    def initialize_engine
+      require_template_library 'yajl'
+    end
+
+    def prepare
+    end
+
+    def evaluate(scope, locals, &block)
+      decorate super(scope, locals, &block)
+    end
+
+    def precompiled_preamble(locals)
+      return super if locals.include? :json
+      "json = {}\n#{super}"
+    end
+
+    def precompiled_postamble(locals)
+      "Yajl::Encoder.new.encode(json)"
+    end
+
+    def precompiled_template(locals)
+      data.to_str
+    end
+
+
+    # Decorates the +json+ input according to given +options+.
+    #
+    # json    - The json String to decorate.
+    # options - The option Hash to customize the behavior.
+    #
+    # Returns the decorated String.
+    def decorate(json)
+      callback, variable = options[:callback], options[:variable]
+      if callback && variable
+        "var #{variable} = #{json}; #{callback}(#{variable});"
+      elsif variable
+        "var #{variable} = #{json};"
+      elsif callback
+        "#{callback}(#{json});"
+      else
+        json
+      end
+    end
+  end
+
+end

data/test/tilt_compilesite_test.rb

@@ -39,7 +39,7 @@ class CompileSiteTest < Test::Unit::TestCase
               locals = { "local#{i}" => 'value' }
               res = template.render(self, locals)
               thread_id = Thread.current.object_id
-              res = template.render(self, "local#{thread_id.to_s}" => 'value')
+              res = template.render(self, "local#{thread_id.abs.to_s}" => 'value')
             rescue => boom
               main_thread.raise(boom)
             end

data/test/tilt_creoletemplate_test.rb

@@ -9,6 +9,10 @@ begin
       assert_equal Tilt::CreoleTemplate, Tilt['test.creole']
     end
 
+    test "registered for '.wiki' files" do
+      assert Tilt.mappings['wiki'].include?(Tilt::CreoleTemplate)
+    end
+
     test "compiles and evaluates the template on #render" do
       template = Tilt::CreoleTemplate.new { |t| "= Hello World!" }
       assert_equal "<h1>Hello World!</h1>", template.render

data/test/tilt_lesstemplate_test.rb

@@ -2,6 +2,7 @@ require 'contest'
 require 'tilt'
 
 begin
+  require 'pathname'
   require 'less'
 
   class LessTemplateTest < Test::Unit::TestCase
@@ -11,12 +12,12 @@ begin
 
     test "compiles and evaluates the template on #render" do
       template = Tilt::LessTemplate.new { |t| ".bg { background-color: #0000ff; } \n#main\n { .bg; }\n" }
-      assert_equal ".bg, #main { background-color: #0000ff; }\n", template.render
+      assert_equal ".bg {\n  background-color: #0000ff;\n}\n#main {\n  background-color: #0000ff;\n}\n", template.render
     end
 
     test "can be rendered more than once" do
       template = Tilt::LessTemplate.new { |t| ".bg { background-color: #0000ff; } \n#main\n { .bg; }\n" }
-      3.times { assert_equal ".bg, #main { background-color: #0000ff; }\n", template.render }
+      3.times { assert_equal ".bg {\n  background-color: #0000ff;\n}\n#main {\n  background-color: #0000ff;\n}\n", template.render }
     end
   end
 

data/test/tilt_markdown_test.rb

@@ -1,5 +1,7 @@
 # coding: UTF-8
 require 'tilt'
+
+begin
 require 'nokogiri'
 
 module MarkdownTests
@@ -91,6 +93,13 @@ begin
   class MarkdownRedcarpetTest < Test::Unit::TestCase
     include MarkdownTests
     template Tilt::RedcarpetTemplate
+    # Doesn't support escaping
+    undef test_escape_html_true
+
+    def test_smarty_pants_true
+      html = nrender "Hello ``World'' -- This is --- a test ...", :smartypants => true
+      assert_equal "<p>Hello “World” – This is — a test …</p>", html
+    end
   end
 rescue LoadError => boom
   # It should already be warned in the main tests
@@ -145,4 +154,8 @@ rescue LoadError => boom
   # It should already be warned in the main tests
 end
 
+rescue LoadError
+  warn "Markdown tests need Nokogiri\n"
+end
+
 

data/test/tilt_radiustemplate_test.rb

@@ -2,11 +2,11 @@ require 'contest'
 require 'tilt'
 
 begin
+  require 'radius'
+
   # Disable radius tests under Ruby versions >= 1.9.1 since it's still buggy.
   # Remove when fixed upstream.
-  raise LoadError if RUBY_VERSION >= "1.9.1"
-
-  require 'radius'
+  raise LoadError if RUBY_VERSION >= "1.9.1" and Radius.version < "0.7"
 
   class RadiusTemplateTest < Test::Unit::TestCase
     test "registered for '.radius' files" do

data/test/tilt_redcarpettemplate_test.rb

@@ -21,9 +21,19 @@ begin
       %w[md mkd markdown].each do |ext|
         mappings = Tilt.mappings[ext]
         blue_idx = mappings.index(Tilt::BlueClothTemplate)
-        rdis_idx = mappings.index(Tilt::RedcarpetTemplate)
-        assert rdis_idx < blue_idx,
-          "#{rdis_idx} should be lower than #{blue_idx}"
+        redc_idx = mappings.index(Tilt::RedcarpetTemplate)
+        assert redc_idx < blue_idx,
+          "#{redc_idx} should be lower than #{blue_idx}"
+      end
+    end
+
+    test "registered above RDiscount" do
+      %w[md mkd markdown].each do |ext|
+        mappings = Tilt.mappings[ext]
+        rdis_idx = mappings.index(Tilt::RDiscountTemplate)
+        redc_idx = mappings.index(Tilt::RedcarpetTemplate)
+        assert redc_idx < rdis_idx,
+          "#{redc_idx} should be lower than #{rdis_idx}"
       end
     end
 
@@ -40,15 +50,9 @@ begin
     test "smartypants when :smart is set" do
       template = Tilt::RedcarpetTemplate.new(:smart => true) { |t|
         "OKAY -- 'Smarty Pants'" }
-      assert_equal "<p>OKAY &mdash; &lsquo;Smarty Pants&rsquo;</p>\n",
+      assert_match /<p>OKAY &[nm]dash; &lsquo;Smarty Pants&rsquo;<\/p>/,
         template.render
     end
-
-    test "stripping HTML when :filter_html is set" do
-      template = Tilt::RedcarpetTemplate.new(:filter_html => true) { |t|
-        "HELLO <blink>WORLD</blink>" }
-      assert_equal "<p>HELLO WORLD</p>\n", template.render
-    end
   end
 rescue LoadError => boom
   warn "Tilt::RedcarpetTemplate (disabled)\n"

data/test/tilt_wikiclothtemplate_test.rb

@@ -0,0 +1,32 @@
+require 'contest'
+require 'tilt'
+
+begin
+  require 'wikicloth'
+
+  class WikiClothTemplateTest < Test::Unit::TestCase
+    test "is registered for '.mediawiki' files" do
+      assert_equal Tilt::WikiClothTemplate, Tilt['test.mediawiki']
+    end
+
+    test "is registered for '.mw' files" do
+      assert_equal Tilt::WikiClothTemplate, Tilt['test.mw']
+    end
+
+    test "is registered for '.wiki' files" do
+      assert_equal Tilt::WikiClothTemplate, Tilt['test.wiki']
+    end
+
+    test "compiles and evaluates the template on #render" do
+      template = Tilt::WikiClothTemplate.new { |t| "= Hello World! =" }
+      assert_match /<h1>.*Hello World!.*<\/h1>/, template.render
+    end
+
+    test "can be rendered more than once" do
+      template = Tilt::WikiClothTemplate.new { |t| "= Hello World! =" }
+      3.times { assert_match /<h1>.*Hello World!.*<\/h1>/, template.render }
+    end
+  end
+rescue LoadError => boom
+  warn "Tilt::WikiClothTemplate (disabled)\n"
+end

data/test/tilt_yajltemplate_test.rb

@@ -0,0 +1,92 @@
+require 'contest'
+require 'tilt'
+
+begin
+  require 'yajl'
+
+  class YajlTemplateTest < Test::Unit::TestCase
+    test "is registered for '.yajl' files" do
+      assert_equal Tilt::YajlTemplate, Tilt['test.yajl']
+    end
+
+    test "compiles and evaluates the template on #render" do
+      template = Tilt::YajlTemplate.new { "json = { :integer => 3, :string => 'hello' }" }
+      assert_equal '{"integer":3,"string":"hello"}', template.render
+    end
+
+    test "can be rendered more than once" do
+      template = Tilt::YajlTemplate.new { "json = { :integer => 3, :string => 'hello' }" }
+      3.times { assert_equal '{"integer":3,"string":"hello"}', template.render }
+    end
+
+    test "evaluating ruby code" do
+      template = Tilt::YajlTemplate.new { "json = { :integer => (3 * 2) }" }
+      assert_equal '{"integer":6}', template.render
+    end
+
+    test "evaluating in an object scope" do
+      template = Tilt::YajlTemplate.new { "json = { :string => 'Hey ' + @name + '!' }" }
+      scope = Object.new
+      scope.instance_variable_set :@name, 'Joe'
+      assert_equal '{"string":"Hey Joe!"}', template.render(scope)
+    end
+
+    test "passing locals" do
+      template = Tilt::YajlTemplate.new { "json = { :string => 'Hey ' + name + '!' }" }
+      assert_equal '{"string":"Hey Joe!"}', template.render(Object.new, :name => 'Joe')
+    end
+
+    test "passing a block for yield" do
+      template = Tilt::YajlTemplate.new { "json = { :string => 'Hey ' + yield + '!' }" }
+      assert_equal '{"string":"Hey Joe!"}', template.render { 'Joe' }
+      assert_equal '{"string":"Hey Moe!"}', template.render { 'Moe' }
+    end
+
+    test "template multiline" do
+      template = Tilt::YajlTemplate.new { %Q{
+        json = {
+          :string   => "hello"
+        }
+      } }
+      assert_equal '{"string":"hello"}', template.render
+    end
+
+    test "template can reuse existing json buffer" do
+      template = Tilt::YajlTemplate.new { "json.merge! :string => 'hello'" }
+      assert_equal '{"string":"hello"}', template.render
+    end
+
+    test "template can end with any statement" do
+      template = Tilt::YajlTemplate.new { %Q{
+        json = {
+          :string   => "hello"
+        }
+        four = 2 * 2
+        json[:integer] = four
+        nil
+      } }
+      assert_equal '{"string":"hello","integer":4}', template.render
+    end
+
+    test "option callback" do
+      options = { :callback => 'foo' }
+      template = Tilt::YajlTemplate.new(nil, options) { "json = { :string => 'hello' }" }
+      assert_equal 'foo({"string":"hello"});', template.render
+    end
+
+    test "option variable" do
+      options = { :variable => 'output' }
+      template = Tilt::YajlTemplate.new(nil, options) { "json = { :string => 'hello' }" }
+      assert_equal 'var output = {"string":"hello"};', template.render
+    end
+
+    test "option callback and variable" do
+      options = { :callback => 'foo', :variable => 'output' }
+      template = Tilt::YajlTemplate.new(nil, options) { "json = { :string => 'hello' }" }
+      assert_equal 'var output = {"string":"hello"}; foo(output);', template.render
+    end
+
+  end
+rescue LoadError
+  warn "Tilt::YajlTemplateTest (disabled)\n"
+end

data/tilt.gemspec

@@ -3,8 +3,8 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
 
   s.name = 'tilt'
-  s.version = '1.3.2'
-  s.date = '2011-05-26'
+  s.version = '1.3.3'
+  s.date = '2011-08-25'
 
   s.description = "Generic interface to multiple Ruby template engines"
   s.summary     = s.description
@@ -15,6 +15,7 @@ Gem::Specification.new do |s|
   # = MANIFEST =
   s.files = %w[
     COPYING
+    Gemfile
     README.md
     Rakefile
     TEMPLATES.md
@@ -22,7 +23,6 @@ Gem::Specification.new do |s|
     lib/tilt.rb
     lib/tilt/builder.rb
     lib/tilt/coffee.rb
-    lib/tilt/creole.rb
     lib/tilt/css.rb
     lib/tilt/erb.rb
     lib/tilt/haml.rb
@@ -35,6 +35,8 @@ Gem::Specification.new do |s|
     lib/tilt/string.rb
     lib/tilt/template.rb
     lib/tilt/textile.rb
+    lib/tilt/wiki.rb
+    lib/tilt/yajl.rb
     test/contest.rb
     test/markaby/locals.mab
     test/markaby/markaby.mab
@@ -68,6 +70,8 @@ Gem::Specification.new do |s|
     test/tilt_stringtemplate_test.rb
     test/tilt_template_test.rb
     test/tilt_test.rb
+    test/tilt_wikiclothtemplate_test.rb
+    test/tilt_yajltemplate_test.rb
     tilt.gemspec
   ]
   # = MANIFEST =
@@ -78,6 +82,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'builder'
   s.add_development_dependency 'erubis'
   s.add_development_dependency 'haml', '>= 2.2.11'
+  s.add_development_dependency 'sass'
   s.add_development_dependency 'rdiscount'
   s.add_development_dependency 'liquid'
   s.add_development_dependency 'less'
@@ -91,10 +96,14 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'creole'
   s.add_development_dependency 'kramdown'
   s.add_development_dependency 'redcarpet'
+  s.add_development_dependency 'creole'
+  s.add_development_dependency 'yajl-ruby'
+  s.add_development_dependency 'wikicloth'
+  s.add_development_dependency 'redcarpet'
+  s.add_development_dependency 'kramdown'
 
   s.homepage = "http://github.com/rtomayko/tilt/"
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Tilt", "--main", "Tilt"]
   s.require_paths = %w[lib]
-  s.rubyforge_project = 'wink'
   s.rubygems_version = '1.1.1'
 end

metadata

@@ -1,273 +1,278 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: tilt
-version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: false
-  segments: 
-  - 1
-  - 3
-  - 2
-  version: 1.3.2
+version: !ruby/object:Gem::Version
+  version: 1.3.3
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Ryan Tomayko
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-26 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-25 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: contest
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70292614853000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: builder
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70292614853000
+- !ruby/object:Gem::Dependency
+  name: builder
+  requirement: &70292614852540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: erubis
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70292614852540
+- !ruby/object:Gem::Dependency
+  name: erubis
+  requirement: &70292614852120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: haml
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70292614852120
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: &70292614868000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 2
-        - 2
-        - 11
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.2.11
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rdiscount
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70292614868000
+- !ruby/object:Gem::Dependency
+  name: sass
+  requirement: &70292614867580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: liquid
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70292614867580
+- !ruby/object:Gem::Dependency
+  name: rdiscount
+  requirement: &70292614867120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: less
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70292614867120
+- !ruby/object:Gem::Dependency
+  name: liquid
+  requirement: &70292614866700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: radius
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *70292614866700
+- !ruby/object:Gem::Dependency
+  name: less
+  requirement: &70292614866280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *70292614866280
+- !ruby/object:Gem::Dependency
+  name: radius
+  requirement: &70292614865860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: markaby
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *70292614865860
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &70292614865440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: coffee-script
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: *70292614865440
+- !ruby/object:Gem::Dependency
+  name: markaby
+  requirement: &70292614865020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: bluecloth
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: *70292614865020
+- !ruby/object:Gem::Dependency
+  name: coffee-script
+  requirement: &70292614864600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70292614864600
+- !ruby/object:Gem::Dependency
+  name: bluecloth
+  requirement: &70292614864180 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: RedCloth
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: *70292614864180
+- !ruby/object:Gem::Dependency
+  name: RedCloth
+  requirement: &70292614863760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id013
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70292614863760
+- !ruby/object:Gem::Dependency
   name: maruku
+  requirement: &70292614863340 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  version_requirements: *70292614863340
+- !ruby/object:Gem::Dependency
+  name: creole
+  requirement: &70292614862920 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70292614862920
+- !ruby/object:Gem::Dependency
+  name: kramdown
+  requirement: &70292614862500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id014
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70292614862500
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: &70292614862080 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70292614862080
+- !ruby/object:Gem::Dependency
   name: creole
+  requirement: &70292614861660 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  version_requirements: *70292614861660
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: &70292614861240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id015
-- !ruby/object:Gem::Dependency 
-  name: kramdown
   prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  version_requirements: *70292614861240
+- !ruby/object:Gem::Dependency
+  name: wikicloth
+  requirement: &70292614860820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id016
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70292614860820
+- !ruby/object:Gem::Dependency
   name: redcarpet
+  requirement: &70292614860400 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id017 !ruby/object:Gem::Requirement 
+  version_requirements: *70292614860400
+- !ruby/object:Gem::Dependency
+  name: kramdown
+  requirement: &70292614876340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id017
+  prerelease: false
+  version_requirements: *70292614876340
 description: Generic interface to multiple Ruby template engines
 email: r@tomayko.com
-executables: 
+executables:
 - tilt
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - COPYING
+- Gemfile
 - README.md
 - Rakefile
 - TEMPLATES.md
@@ -275,7 +280,6 @@ files:
 - lib/tilt.rb
 - lib/tilt/builder.rb
 - lib/tilt/coffee.rb
-- lib/tilt/creole.rb
 - lib/tilt/css.rb
 - lib/tilt/erb.rb
 - lib/tilt/haml.rb
@@ -288,6 +292,8 @@ files:
 - lib/tilt/string.rb
 - lib/tilt/template.rb
 - lib/tilt/textile.rb
+- lib/tilt/wiki.rb
+- lib/tilt/yajl.rb
 - test/contest.rb
 - test/markaby/locals.mab
 - test/markaby/markaby.mab
@@ -321,47 +327,40 @@ files:
 - test/tilt_stringtemplate_test.rb
 - test/tilt_template_test.rb
 - test/tilt_test.rb
+- test/tilt_wikiclothtemplate_test.rb
+- test/tilt_yajltemplate_test.rb
 - tilt.gemspec
-has_rdoc: true
 homepage: http://github.com/rtomayko/tilt/
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --line-numbers
 - --inline-source
 - --title
 - Tilt
 - --main
 - Tilt
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: wink
-rubygems_version: 1.3.7
+rubyforge_project: 
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 2
 summary: Generic interface to multiple Ruby template engines
-test_files: 
+test_files:
 - test/tilt_blueclothtemplate_test.rb
 - test/tilt_buildertemplate_test.rb
 - test/tilt_cache_test.rb
@@ -388,3 +387,5 @@ test_files:
 - test/tilt_stringtemplate_test.rb
 - test/tilt_template_test.rb
 - test/tilt_test.rb
+- test/tilt_wikiclothtemplate_test.rb
+- test/tilt_yajltemplate_test.rb