tilt 1.4.1 → 2.0.11

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: a552c8551a7093b787234c00bac7ccaaef77e89b1d4835c31ddbaeb8388c74ae
+  data.tar.gz: 014cff88cd5ec4157d02127576eb788a6b0ae3795e69dc448781093f59153769
+SHA512:
+  metadata.gz: 9d9da743f0359f10e8486b946132d39ba892482a99e7961c4a62258a680a214030824e92442db2421f35cac7c4378ff3e8e8e0af72bd8af35150aae2cc58555b
+  data.tar.gz: 2755a44a43e094eb95bffe6ab095f4d8a6cc1b58d1c96d6c20325d8d607ada32da7529758dfed8f8d8f09a3eafe2c7d96f381c314c7cc99f950a36c5eaff3454

data/COPYING

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Ryan Tomayko <http://tomayko.com/about>
+Copyright (c) 2010-2016 Ryan Tomayko <http://tomayko.com/about>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

data/bin/tilt

@@ -10,14 +10,15 @@ when <file> is '-', read template from stdin and use the --type option
 to determine the template's type.
 
 Options
-  -l, --list           List template engines + file patterns and exit
-  -t, --type=<pattern> Use this template engine; required if no <file>
-  -y, --layout=<file>  Use <file> as a layout template
+  -l, --list                List template engines + file patterns and exit
+  -t, --type=<pattern>      Use this template engine; required if no <file>
+  -y, --layout=<file>       Use <file> as a layout template
 
-  -D<name>=<value>     Define variable <name> as <value>
-  --vars=<ruby>        Evaluate <ruby> to Hash and use for variables
+  -D<name>=<value>          Define variable <name> as <value>
+  -d, --define-file=<file>  Load YAML from <file> and use for variables
+  --vars=<ruby>             Evaluate <ruby> to Hash and use for variables
 
-  -h, --help           Show this help message
+  -h, --help                Show this help message
 
 Convert markdown to HTML:
   $ tilt foo.markdown > foo.html
@@ -44,9 +45,9 @@ ARGV.options do |o|
   # list all available template engines
   o.on("-l", "--list") do
     groups = {}
-    Tilt.mappings.each do |pattern,engines|
+    Tilt.lazy_map.each do |pattern,engines|
       engines.each do |engine|
-        key = engine.name.split('::').last.sub(/Template$/, '')
+        key = engine[0].split('::').last.sub(/Template$/, '')
         (groups[key] ||= []) << pattern
       end
     end
@@ -77,6 +78,15 @@ ARGV.options do |o|
     locals[key.to_sym] = value
   end
 
+  # define local variables from YAML or JSON
+  o.on("-d", "--define-file=FILE", String) do |file|
+    require 'yaml'
+    abort "no such define file: #{file}" unless File.exist? file
+    hash = File.open(file, 'r:bom|utf-8') { |f| YAML.load f, file }
+    abort "vars must be a Hash, not #{hash.inspect}" if !hash.is_a?(Hash)
+    hash.each { |key, value| locals[key.to_sym] = value }
+  end
+
   # define local variables using a Ruby hash
   o.on("--vars=RUBY") do |ruby|
     hash = eval(ruby)

data/lib/tilt/asciidoc.rb

@@ -1,4 +1,5 @@
 require 'tilt/template'
+require 'asciidoctor'
 
 # AsciiDoc see: http://asciidoc.org/
 module Tilt
@@ -11,14 +12,6 @@ module Tilt
   class AsciidoctorTemplate < Template
     self.default_mime_type = 'text/html'
 
-    def self.engine_initialized?
-      defined? ::Asciidoctor::Document
-    end
-
-    def initialize_engine
-      require_template_library 'asciidoctor'
-    end
-
     def prepare
       options[:header_footer] = false if options[:header_footer].nil?
     end

data/lib/tilt/babel.rb

@@ -0,0 +1,16 @@
+require 'tilt/template'
+require 'babel/transpiler'
+
+module Tilt
+  class BabelTemplate < Template
+    self.default_mime_type = 'application/javascript'
+
+    def prepare
+      options[:filename] ||= file
+    end
+
+    def evaluate(scope, locals, &block)
+      @output ||= Babel::Transpiler.transform(data)["code"]
+    end
+  end
+end

data/lib/tilt/bluecloth.rb

@@ -0,0 +1,24 @@
+require 'tilt/template'
+require 'bluecloth'
+
+module Tilt
+  # BlueCloth Markdown implementation. See:
+  # http://deveiate.org/projects/BlueCloth/
+  class BlueClothTemplate < Template
+    self.default_mime_type = 'text/html'
+
+    def prepare
+      @engine = BlueCloth.new(data, options)
+      @output = nil
+    end
+
+    def evaluate(scope, locals, &block)
+      @output ||= @engine.to_html
+    end
+
+    def allows_script?
+      false
+    end
+  end
+end
+

data/lib/tilt/builder.rb

@@ -1,33 +1,30 @@
 require 'tilt/template'
+require 'builder'
 
 module Tilt
-   # Builder template implementation. See:
+  # Builder template implementation. See:
   # http://builder.rubyforge.org/
   class BuilderTemplate < Template
     self.default_mime_type = 'text/xml'
 
-    def self.engine_initialized?
-      defined? ::Builder
+    def prepare
+      options[:indent] ||= 2
     end
 
-    def initialize_engine
-      require_template_library 'builder'
-    end
+    def evaluate(scope, locals, &block)
+      xml = (locals[:xml] || ::Builder::XmlMarkup.new(options))
 
-    def prepare; end
+      if data.respond_to?(:to_str)
+        if !locals[:xml]
+          locals = locals.merge(:xml => xml)
+        end
+        return super(scope, locals, &block)
+      end
 
-    def evaluate(scope, locals, &block)
-      return super(scope, locals, &block) if data.respond_to?(:to_str)
-      xml = ::Builder::XmlMarkup.new(:indent => 2)
       data.call(xml)
       xml.target!
     end
 
-    def precompiled_preamble(locals)
-      return super if locals.include? :xml
-      "xml = ::Builder::XmlMarkup.new(:indent => 2)\n#{super}"
-    end
-
     def precompiled_postamble(locals)
       "xml.target!"
     end

data/lib/tilt/coffee.rb

@@ -1,4 +1,5 @@
 require 'tilt/template'
+require 'coffee_script'
 
 module Tilt
   # CoffeeScript template implementation. See:
@@ -28,18 +29,15 @@ module Tilt
       @@default_bare = value
     end
 
-    def self.engine_initialized?
-      defined? ::CoffeeScript
-    end
-
-    def initialize_engine
-      require_template_library 'coffee_script'
+    def self.literate?
+      false
     end
 
     def prepare
       if !options.key?(:bare) and !options.key?(:no_wrap)
         options[:bare] = self.class.default_bare
       end
+      options[:literate] ||= self.class.literate?
     end
 
     def evaluate(scope, locals, &block)
@@ -50,5 +48,11 @@ module Tilt
       false
     end
   end
+
+  class CoffeeScriptLiterateTemplate < CoffeeScriptTemplate
+    def self.literate?
+      true
+    end
+  end
 end
 

data/lib/tilt/commonmarker.rb

@@ -0,0 +1,88 @@
+require 'tilt/template'
+require 'commonmarker'
+
+module Tilt
+  class CommonMarkerTemplate < Template
+    self.default_mime_type = 'text/html'
+
+    OPTION_ALIAS = {
+      :smartypants => :SMART
+    }
+    PARSE_OPTIONS = [
+      :FOOTNOTES,
+      :LIBERAL_HTML_TAG,
+      :SMART,
+      :smartypants,
+      :STRIKETHROUGH_DOUBLE_TILDE,
+      :UNSAFE,
+      :VALIDATE_UTF8,
+    ].freeze
+    RENDER_OPTIONS = [
+      :FOOTNOTES,
+      :FULL_INFO_STRING,
+      :GITHUB_PRE_LANG,
+      :HARDBREAKS,
+      :NOBREAKS,
+      :SAFE, # Removed in v0.18.0 (2018-10-17)
+      :SOURCEPOS,
+      :TABLE_PREFER_STYLE_ATTRIBUTES,
+      :UNSAFE,
+    ].freeze
+    EXTENSIONS = [
+      :autolink,
+      :strikethrough,
+      :table,
+      :tagfilter,
+      :tasklist,
+    ].freeze
+
+    def extensions
+      EXTENSIONS.select do |extension|
+        options[extension]
+      end
+    end
+
+    def parse_options
+      raw_options = PARSE_OPTIONS.select do |option|
+        options[option]
+      end
+      actual_options = raw_options.map do |option|
+        OPTION_ALIAS[option] || option
+      end
+
+      if actual_options.any?
+        actual_options
+      else
+        :DEFAULT
+      end
+    end
+
+    def render_options
+      raw_options = RENDER_OPTIONS.select do |option|
+        options[option]
+      end
+      actual_options = raw_options.map do |option|
+        OPTION_ALIAS[option] || option
+      end
+      if actual_options.any?
+        actual_options
+      else
+        :DEFAULT
+      end
+    end
+
+    def prepare
+      @engine = nil
+      @output = nil
+    end
+
+    def evaluate(scope, locals, &block)
+      doc = CommonMarker.render_doc(data, parse_options, extensions)
+      doc.to_html(render_options, extensions)
+    end
+
+    def allows_script?
+      false
+    end
+  end
+end

data/lib/tilt/creole.rb

@@ -0,0 +1,25 @@
+require 'tilt/template'
+require 'creole'
+
+module Tilt
+  # Creole implementation. See:
+  # http://www.wikicreole.org/
+  class CreoleTemplate < Template
+    def prepare
+      opts = {}
+      [:allowed_schemes, :extensions, :no_escape].each do |k|
+        opts[k] = options[k] if options[k]
+      end
+      @engine = Creole::Parser.new(data, opts)
+      @output = nil
+    end
+
+    def evaluate(scope, locals, &block)
+      @output ||= @engine.to_html
+    end
+
+    def allows_script?
+      false
+    end
+  end
+end

data/lib/tilt/csv.rb

@@ -1,5 +1,11 @@
 require 'tilt/template'
 
+if RUBY_VERSION >= '1.9.0'
+  require 'csv'
+else
+  require 'fastercsv'
+end
+
 module Tilt
 
   # CSV Template implementation. See:
@@ -30,10 +36,6 @@ module Tilt
   class CSVTemplate < Template
     self.default_mime_type = 'text/csv'
 
-    def self.engine_initialized?
-      engine
-    end
-
     def self.engine
       if RUBY_VERSION >= '1.9.0' && defined? ::CSV
         ::CSV
@@ -42,30 +44,22 @@ module Tilt
       end
     end
 
-    def initialize_engine
-      if RUBY_VERSION >= '1.9.0'
-        require_template_library 'csv'
-      else
-        require_template_library 'fastercsv'
-      end
+    def prepare
+      @outvar = options.delete(:outvar) || '_csvout'
     end
 
-    def prepare
-      @code =<<-RUBY
-        #{self.class.engine}.generate do |csv|
+    def precompiled_template(locals)
+      <<-RUBY
+        #{@outvar} = #{self.class.engine}.generate(**#{options}) do |csv|
           #{data}
         end
       RUBY
     end
 
-    def precompiled_template(locals)
-      @code
-    end
-
     def precompiled(locals)
       source, offset = super
       [source, offset + 1]
     end
 
   end
-end
+end

data/lib/tilt/dummy.rb

@@ -0,0 +1,3 @@
+# Used for detecting autoloading bug in JRuby
+class Tilt::Dummy; end
+

data/lib/tilt/erb.rb

@@ -1,4 +1,5 @@
 require 'tilt/template'
+require 'erb'
 
 module Tilt
   # ERB template implementation. See:
@@ -6,26 +7,25 @@ module Tilt
   class ERBTemplate < Template
     @@default_output_variable = '_erbout'
 
+    SUPPORTS_KVARGS = ::ERB.instance_method(:initialize).parameters.assoc(:key) rescue false
+
     def self.default_output_variable
       @@default_output_variable
     end
 
     def self.default_output_variable=(name)
+      warn "#{self}.default_output_variable= has been replaced with the :outvar-option"
       @@default_output_variable = name
     end
 
-    def self.engine_initialized?
-      defined? ::ERB
-    end
-
-    def initialize_engine
-      require_template_library 'erb'
-    end
-
     def prepare
       @outvar = options[:outvar] || self.class.default_output_variable
       options[:trim] = '<>' if !(options[:trim] == false) && (options[:trim].nil? || options[:trim] == true)
-      @engine = ::ERB.new(data, options[:safe], options[:trim], @outvar)
+      @engine = if SUPPORTS_KVARGS
+        ::ERB.new(data, trim_mode: options[:trim], eoutvar: @outvar)
+      else
+        ::ERB.new(data, options[:safe], options[:trim], @outvar)
+      end
     end
 
     def precompiled_template(locals)
@@ -59,52 +59,5 @@ module Tilt
       end
     end
   end
-
-  # Erubis template implementation. See:
-  # http://www.kuwata-lab.com/erubis/
-  #
-  # ErubisTemplate supports the following additional options, which are not
-  # passed down to the Erubis engine:
-  #
-  #   :engine_class   allows you to specify a custom engine class to use
-  #                   instead of the default (which is ::Erubis::Eruby).
-  #
-  #   :escape_html    when true, ::Erubis::EscapedEruby will be used as
-  #                   the engine class instead of the default. All content
-  #                   within <%= %> blocks will be automatically html escaped.
-  class ErubisTemplate < ERBTemplate
-    def self.engine_initialized?
-      defined? ::Erubis::Eruby
-    end
-
-    def initialize_engine
-      require_template_library 'erubis'
-    end
-
-    def prepare
-      @outvar = options.delete(:outvar) || self.class.default_output_variable
-      @options.merge!(:preamble => false, :postamble => false, :bufvar => @outvar)
-      engine_class = options.delete(:engine_class)
-      engine_class = ::Erubis::EscapedEruby if options.delete(:escape_html)
-      @engine = (engine_class || ::Erubis::Eruby).new(data, options)
-    end
-
-    def precompiled_preamble(locals)
-      [super, "#{@outvar} = _buf = ''"].join("\n")
-    end
-
-    def precompiled_postamble(locals)
-      [@outvar, super].join("\n")
-    end
-
-    # Erubis doesn't have ERB's line-off-by-one under 1.9 problem.
-    # Override and adjust back.
-    if RUBY_VERSION >= '1.9.0'
-      def precompiled(locals)
-        source, offset = super
-        [source, offset - 1]
-      end
-    end
-  end
 end
 

data/lib/tilt/erubi.rb

@@ -0,0 +1,32 @@
+require 'tilt/template'
+require 'erubi'
+
+module Tilt
+  # Erubi (a simplified version of Erubis) template implementation.
+  # See https://github.com/jeremyevans/erubi
+  #
+  # ErubiTemplate supports the following additional options, in addition
+  # to the options supported by the Erubi engine:
+  #
+  # :engine_class :: allows you to specify a custom engine class to use
+  #                  instead of the default (which is ::Erubi::Engine).
+  class ErubiTemplate < Template
+    def prepare
+      @options.merge!(:preamble => false, :postamble => false, :ensure=>true)
+
+      engine_class = @options[:engine_class] || Erubi::Engine
+
+      @engine = engine_class.new(data, @options)
+      @outvar = @engine.bufvar
+
+      # Remove dup after tilt supports frozen source.
+      @src = @engine.src.dup
+
+      @engine
+    end
+
+    def precompiled_template(locals)
+      @src
+    end
+  end
+end

data/lib/tilt/erubis.rb

@@ -0,0 +1,43 @@
+require 'tilt/erb'
+require 'erubis'
+
+module Tilt
+  # Erubis template implementation. See:
+  # http://www.kuwata-lab.com/erubis/
+  #
+  # ErubisTemplate supports the following additional options, which are not
+  # passed down to the Erubis engine:
+  #
+  #   :engine_class   allows you to specify a custom engine class to use
+  #                   instead of the default (which is ::Erubis::Eruby).
+  #
+  #   :escape_html    when true, ::Erubis::EscapedEruby will be used as
+  #                   the engine class instead of the default. All content
+  #                   within <%= %> blocks will be automatically html escaped.
+  class ErubisTemplate < ERBTemplate
+    def prepare
+      @outvar = options.delete(:outvar) || self.class.default_output_variable
+      @options.merge!(:preamble => false, :postamble => false, :bufvar => @outvar)
+      engine_class = options.delete(:engine_class)
+      engine_class = ::Erubis::EscapedEruby if options.delete(:escape_html)
+      @engine = (engine_class || ::Erubis::Eruby).new(data, options)
+    end
+
+    def precompiled_preamble(locals)
+      [super, "#{@outvar} = _buf = String.new"].join("\n")
+    end
+
+    def precompiled_postamble(locals)
+      [@outvar, super].join("\n")
+    end
+
+    # Erubis doesn't have ERB's line-off-by-one under 1.9 problem.
+    # Override and adjust back.
+    if RUBY_VERSION >= '1.9.0'
+      def precompiled(locals)
+        source, offset = super
+        [source, offset - 1]
+      end
+    end
+  end
+end