tilt 2.0.11 → 2.6.1

data/lib/tilt/yajl.rb

@@ -1,8 +1,8 @@
-require 'tilt/template'
+# frozen_string_literal: true
+require_relative 'template'
 require 'yajl'
 
 module Tilt
-
   # Yajl Template implementation
   #
   # Yajl is a fast JSON parsing and encoding library for Ruby
@@ -40,14 +40,10 @@ module Tilt
   #    template.render(self)
   #
   class YajlTemplate < Template
-
     self.default_mime_type = 'application/json'
 
-    def prepare
-    end
-
     def evaluate(scope, locals, &block)
-      decorate super(scope, locals, &block)
+      decorate(super)
     end
 
     def precompiled_preamble(locals)
@@ -60,10 +56,9 @@ module Tilt
     end
 
     def precompiled_template(locals)
-      data.to_str
+      @data.to_str
     end
 
-
     # Decorates the +json+ input according to given +options+.
     #
     # json    - The json String to decorate.
@@ -71,7 +66,7 @@ module Tilt
     #
     # Returns the decorated String.
     def decorate(json)
-      callback, variable = options[:callback], options[:variable]
+      callback, variable = @options[:callback], @options[:variable]
       if callback && variable
         "var #{variable} = #{json}; #{callback}(#{variable});"
       elsif variable
@@ -83,5 +78,4 @@ module Tilt
       end
     end
   end
-
 end

data/lib/tilt.rb

@@ -1,73 +1,101 @@
-require 'tilt/mapping'
-require 'tilt/template'
+# frozen_string_literal: true
+require_relative 'tilt/mapping'
+require_relative 'tilt/template'
 
 # Namespace for Tilt. This module is not intended to be included anywhere.
 module Tilt
   # Current version.
-  VERSION = '2.0.11'
+  VERSION = '2.6.1'
+
+  EMPTY_ARRAY = [].freeze
+  private_constant :EMPTY_ARRAY
+
+  EMPTY_HASH = {}.freeze
+  private_constant :EMPTY_HASH
 
   @default_mapping = Mapping.new
+  @extract_fixed_locals = false
+
+  # Replace the default mapping with a finalized version of the default
+  # mapping. This can be done to improve performance after the template
+  # libraries you desire to use have already been loaded.  Once this is
+  # is called, all attempts to modify the default mapping will fail.
+  # This also freezes Tilt itself.
+  def self.finalize!
+    return self if @default_mapping.is_a?(FinalizedMapping)
+
+    class << self
+      prepend(Module.new do
+        def lazy_map(*)
+          raise "Tilt.#{__callee__} not supported after Tilt.finalize! has been called"
+        end
+        alias register lazy_map
+        alias register_lazy lazy_map
+        alias register_pipeline lazy_map
+        alias prefer lazy_map
+      end)
+    end
 
-  # @return [Tilt::Mapping] the main mapping object
-  def self.default_mapping
-    @default_mapping
+    @default_mapping = @default_mapping.finalized
+
+    freeze
   end
 
   # @private
   def self.lazy_map
-    default_mapping.lazy_map
+    @default_mapping.lazy_map
   end
 
   # @see Tilt::Mapping#register
   def self.register(template_class, *extensions)
-    default_mapping.register(template_class, *extensions)
+    @default_mapping.register(template_class, *extensions)
   end
 
   # @see Tilt::Mapping#register_lazy
   def self.register_lazy(class_name, file, *extensions)
-    default_mapping.register_lazy(class_name, file, *extensions)
+    @default_mapping.register_lazy(class_name, file, *extensions)
   end
 
-  # @deprecated Use {register} instead.
-  def self.prefer(template_class, *extensions)
-    register(template_class, *extensions)
+  # @see Tilt::Mapping#register_pipeline
+  def self.register_pipeline(ext, options=EMPTY_HASH)
+    @default_mapping.register_pipeline(ext, options)
   end
 
   # @see Tilt::Mapping#registered?
   def self.registered?(ext)
-    default_mapping.registered?(ext)
+    @default_mapping.registered?(ext)
   end
 
   # @see Tilt::Mapping#new
-  def self.new(file, line=nil, options={}, &block)
-    default_mapping.new(file, line, options, &block)
+  def self.new(file, line=nil, options=nil, &block)
+    @default_mapping.new(file, line, options, &block)
   end
 
   # @see Tilt::Mapping#[]
   def self.[](file)
-    default_mapping[file]
+    @default_mapping[file]
   end
 
   # @see Tilt::Mapping#template_for
   def self.template_for(file)
-    default_mapping.template_for(file)
+    @default_mapping.template_for(file)
   end
 
   # @see Tilt::Mapping#templates_for
   def self.templates_for(file)
-    default_mapping.templates_for(file)
+    @default_mapping.templates_for(file)
   end
 
-  # @return the template object that is currently rendering.
-  #
-  # @example
-  #   tmpl = Tilt['index.erb'].new { '<%= Tilt.current_template %>' }
-  #   tmpl.render == tmpl.to_s
-  #
-  # @note This is currently an experimental feature and might return nil
-  #   in the future.
-  def self.current_template
-    Thread.current[:tilt_current_template]
+  class << self
+    # @return [Tilt::Mapping] the main mapping object
+    attr_reader :default_mapping
+
+    # Whether to extract fixed locals from templates by scanning the
+    # template content.
+    attr_accessor :extract_fixed_locals
+
+    # Alias register as prefer for Tilt 1.x compatibility.
+    alias prefer register
   end
 
   # Extremely simple template cache implementation. Calling applications
@@ -110,18 +138,18 @@ module Tilt
       @cache = {}
     end
   end
-
+  # :nocov:
+  # TILT3: Remove Tilt::Cache
+  deprecate_constant :Cache if respond_to?(:deprecate_constant, true)
+  # :nocov:
 
   # Template Implementations ================================================
 
   # ERB
   register_lazy :ERBTemplate,    'tilt/erb',    'erb', 'rhtml'
-  register_lazy :ErubisTemplate, 'tilt/erubis', 'erb', 'rhtml', 'erubis'
   register_lazy :ErubiTemplate,  'tilt/erubi',  'erb', 'rhtml', 'erubi'
 
   # Markdown
-  register_lazy :BlueClothTemplate,    'tilt/bluecloth',    'markdown', 'mkd', 'md'
-  register_lazy :MarukuTemplate,       'tilt/maruku',       'markdown', 'mkd', 'md'
   register_lazy :KramdownTemplate,     'tilt/kramdown',     'markdown', 'mkd', 'md'
   register_lazy :RDiscountTemplate,    'tilt/rdiscount',    'markdown', 'mkd', 'md'
   register_lazy :RedcarpetTemplate,    'tilt/redcarpet',    'markdown', 'mkd', 'md'
@@ -138,9 +166,8 @@ module Tilt
   register_lazy :CreoleTemplate,       'tilt/creole',    'wiki', 'creole'
   register_lazy :EtanniTemplate,       'tilt/etanni',    'etn', 'etanni'
   register_lazy :HamlTemplate,         'tilt/haml',      'haml'
-  register_lazy :LessTemplate,         'tilt/less',      'less'
   register_lazy :LiquidTemplate,       'tilt/liquid',    'liquid'
-  register_lazy :LiveScriptTemplate,   'tilt/livescript','ls'
+  register_lazy :LiveScriptTemplate,   'tilt/livescript','ls', 'livescript'
   register_lazy :MarkabyTemplate,      'tilt/markaby',   'mab'
   register_lazy :NokogiriTemplate,     'tilt/nokogiri',  'nokogiri'
   register_lazy :PlainTemplate,        'tilt/plain',     'html'
@@ -151,17 +178,15 @@ module Tilt
   register_lazy :RstPandocTemplate,    'tilt/rst-pandoc', 'rst'
   register_lazy :SassTemplate,         'tilt/sass',      'sass'
   register_lazy :ScssTemplate,         'tilt/sass',      'scss'
-  register_lazy :SigilTemplate,        'tilt/sigil',     'sigil'
+  register_lazy :SlimTemplate,         'tilt/slim',      'slim'
   register_lazy :StringTemplate,       'tilt/string',    'str'
   register_lazy :TypeScriptTemplate,   'tilt/typescript', 'ts', 'tsx'
-  register_lazy :WikiClothTemplate,    'tilt/wikicloth', 'wiki', 'mediawiki', 'mw'
   register_lazy :YajlTemplate,         'tilt/yajl',      'yajl'
 
-  # External template engines
-  register_lazy 'Slim::Template',            'slim',            'slim'
-  register_lazy 'Tilt::HandlebarsTemplate',  'tilt/handlebars', 'handlebars', 'hbs'
-  register_lazy 'Tilt::OrgTemplate',         'org-ruby',        'org'
-  register_lazy 'Tilt::EmacsOrgTemplate',    'tilt/emacs_org',  'org'
-  register_lazy 'Opal::Processor',           'opal',            'opal', 'rb'
-  register_lazy 'Tilt::JbuilderTemplate',    'tilt/jbuilder',   'jbuilder'
+  # TILT3: Remove
+  # Deprecated lazy loading of external template engines
+  register_lazy 'Tilt::HandlebarsTemplate',  'tilt/_handlebars', 'handlebars', 'hbs'
+  register_lazy 'Tilt::OrgTemplate',         'tilt/_org',        'org'
+  register_lazy 'Tilt::OrgTemplate',         'tilt/_emacs_org',  'org'
+  register_lazy 'Tilt::JbuilderTemplate',    'tilt/_jbuilder',   'jbuilder'
 end

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: tilt
 version: !ruby/object:Gem::Version
-  version: 2.0.11
+  version: 2.6.1
 platform: ruby
 authors:
 - Ryan Tomayko
-autorequire:
+- Magnus Holm
+- Jeremy Evans
 bindir: bin
 cert_chain: []
-date: 2022-07-22 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies: []
 description: Generic interface to multiple Ruby template engines
-email: r@tomayko.com
+email: code@jeremyevans.net
 executables:
 - tilt
 extensions: []
@@ -20,29 +21,30 @@ files:
 - COPYING
 - bin/tilt
 - lib/tilt.rb
+- lib/tilt/_emacs_org.rb
+- lib/tilt/_handlebars.rb
+- lib/tilt/_jbuilder.rb
+- lib/tilt/_org.rb
 - lib/tilt/asciidoc.rb
 - lib/tilt/babel.rb
-- lib/tilt/bluecloth.rb
 - lib/tilt/builder.rb
+- lib/tilt/cli.rb
 - lib/tilt/coffee.rb
 - lib/tilt/commonmarker.rb
 - lib/tilt/creole.rb
 - lib/tilt/csv.rb
-- lib/tilt/dummy.rb
 - lib/tilt/erb.rb
 - lib/tilt/erubi.rb
-- lib/tilt/erubis.rb
 - lib/tilt/etanni.rb
 - lib/tilt/haml.rb
 - lib/tilt/kramdown.rb
-- lib/tilt/less.rb
 - lib/tilt/liquid.rb
 - lib/tilt/livescript.rb
 - lib/tilt/mapping.rb
 - lib/tilt/markaby.rb
-- lib/tilt/maruku.rb
 - lib/tilt/nokogiri.rb
 - lib/tilt/pandoc.rb
+- lib/tilt/pipeline.rb
 - lib/tilt/plain.rb
 - lib/tilt/prawn.rb
 - lib/tilt/radius.rb
@@ -52,17 +54,19 @@ files:
 - lib/tilt/redcloth.rb
 - lib/tilt/rst-pandoc.rb
 - lib/tilt/sass.rb
-- lib/tilt/sigil.rb
+- lib/tilt/slim.rb
 - lib/tilt/string.rb
 - lib/tilt/template.rb
 - lib/tilt/typescript.rb
-- lib/tilt/wikicloth.rb
 - lib/tilt/yajl.rb
-homepage: https://github.com/rtomayko/tilt/
+homepage: https://github.com/jeremyevans/tilt
 licenses:
 - MIT
-metadata: {}
-post_install_message:
+metadata:
+  bug_tracker_uri: https://github.com/jeremyevans/tilt/issues
+  changelog_uri: https://github.com/jeremyevans/tilt/blob/master/CHANGELOG.md
+  mailing_list_uri: https://github.com/jeremyevans/tilt/discussions
+  source_code_uri: https://github.com/jeremyevans/tilt
 rdoc_options:
 - "--line-numbers"
 - "--inline-source"
@@ -76,15 +80,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.29
-signing_key:
-specification_version: 2
+rubygems_version: 3.6.7
+specification_version: 4
 summary: Generic interface to multiple Ruby template engines
 test_files: []

data/lib/tilt/bluecloth.rb

@@ -1,24 +0,0 @@
-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/dummy.rb

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

data/lib/tilt/erubis.rb

@@ -1,43 +0,0 @@
-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

data/lib/tilt/less.rb

@@ -1,30 +0,0 @@
-require 'tilt/template'
-require 'less'
-
-module Tilt
-  # Lessscss template implementation. See:
-  # http://lesscss.org/
-  #
-  # Less templates do not support object scopes, locals, or yield.
-  class LessTemplate < Template
-    self.default_mime_type = 'text/css'
-
-    def prepare
-      if ::Less.const_defined? :Engine
-        @engine = ::Less::Engine.new(data)
-      else
-        parser  = ::Less::Parser.new(options.merge :filename => eval_file, :line => line)
-        @engine = parser.parse(data)
-      end
-    end
-
-    def evaluate(scope, locals, &block)
-      @output ||= @engine.to_css(options)
-    end
-
-    def allows_script?
-      false
-    end
-  end
-end
-

data/lib/tilt/maruku.rb

@@ -1,22 +0,0 @@
-require 'tilt/template'
-require 'maruku'
-
-module Tilt
-  # Maruku markdown implementation. See:
-  # http://maruku.rubyforge.org/
-  class MarukuTemplate < Template
-    def prepare
-      @engine = Maruku.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/sigil.rb

@@ -1,34 +0,0 @@
-require 'open3'
-require 'shellwords'
-
-module Tilt
-  # Standalone string interpolator and template processor implementation in Go.
-  # see: https://github.com/gliderlabs/sigil
-  class SigilTemplate < Template
-    def prepare
-    end
-
-    def evaluate(scope, locals, &block)
-      variables = locals.map {|k, v| "#{k}=#{v}" }
-
-      cmd = ['sigil']
-
-      unless variables.empty?
-        cmd << '-p'
-        cmd.concat(variables)
-      end
-
-      out, err, status = Open3.capture3(*cmd, :stdin_data => data)
-
-      if status.success?
-        out.chomp
-      else
-        raise err.chomp.gsub('<stdin>', file)
-      end
-    end
-
-    def allows_script?
-      false
-    end
-  end
-end

data/lib/tilt/wikicloth.rb

@@ -1,22 +0,0 @@
-require 'tilt/template'
-require 'wikicloth'
-
-module Tilt
-  # WikiCloth implementation. See:
-  # http://redcloth.org/
-  class WikiClothTemplate < Template
-    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
-
-    def allows_script?
-      false
-    end
-  end
-end