tilt 2.0.0 → 2.4.0

data/lib/tilt/template.rb

@@ -1,9 +1,12 @@
-require 'tilt'
-require 'thread'
-
+# frozen_string_literal: true
 module Tilt
   # @private
-  TOPOBJECT = Object.superclass || Object
+  module CompiledTemplates
+  end
+
+  # @private
+  TOPOBJECT = CompiledTemplates
+
   # @private
   LOCK = Mutex.new
 
@@ -25,6 +28,12 @@ module Tilt
     # interface.
     attr_reader :options
 
+    # A path ending in .rb that the template code will be written to, then
+    # required, instead of being evaled.  This is useful for determining
+    # coverage of compiled template code, or to use static analysis tools
+    # on the compiled template code.
+    attr_reader :compiled_path
+
     class << self
       # An empty Hash that the template engine can populate with various
       # metadata.
@@ -32,12 +41,12 @@ module Tilt
         @metadata ||= {}
       end
 
-      # @deprecated Use `.metadata[:mime_type]` instead.
+      # Use `.metadata[:mime_type]` instead.
       def default_mime_type
         metadata[:mime_type]
       end
 
-      # @deprecated Use `.metadata[:mime_type] = val` instead.
+      # Use `.metadata[:mime_type] = val` instead.
       def default_mime_type=(value)
         metadata[:mime_type] = value
       end
@@ -49,36 +58,34 @@ module Tilt
     # a block is required.
     #
     # All arguments are optional.
-    def initialize(file=nil, line=1, options={}, &block)
-      @file, @line, @options = nil, 1, {}
+    def initialize(file=nil, line=nil, options=nil)
+      @file, @line, @options = nil, 1, nil
 
-      [options, line, file].compact.each do |arg|
-        case
-        when arg.respond_to?(:to_str)  ; @file = arg.to_str
-        when arg.respond_to?(:to_int)  ; @line = arg.to_int
-        when arg.respond_to?(:to_hash) ; @options = arg.to_hash.dup
-        when arg.respond_to?(:path)    ; @file = arg.path
-        when arg.respond_to?(:to_path) ; @file = arg.to_path
-        else raise TypeError, "Can't load the template file. Pass a string with a path " +
-          "or an object that responds to 'to_str', 'path' or 'to_path'"
-        end
-      end
+      process_arg(options)
+      process_arg(line)
+      process_arg(file)
 
-      raise ArgumentError, "file or block required" if (@file || block).nil?
+      raise ArgumentError, "file or block required" unless @file || block_given?
 
-      # used to hold compiled template methods
-      @compiled_method = {}
+      @options ||= {}
+
+      set_compiled_method_cache
 
-      # used on 1.9 to set the encoding if it is not set elsewhere (like a magic comment)
-      # currently only used if template compiles to ruby
+      # Force the encoding of the input data
       @default_encoding = @options.delete :default_encoding
 
+      # Skip encoding detection from magic comments and forcing that encoding
+      # for compiled templates
+      @skip_compiled_encoding_detection = @options.delete :skip_compiled_encoding_detection
+
       # load template data and prepare (uses binread to avoid encoding issues)
-      @reader = block || lambda { |t| read_template_file }
-      @data = @reader.call(self)
+      @data = block_given? ? yield(self) : read_template_file
 
       if @data.respond_to?(:force_encoding)
-        @data.force_encoding(default_encoding) if default_encoding
+        if default_encoding
+          @data = @data.dup if @data.frozen?
+          @data.force_encoding(default_encoding)
+        end
 
         if !@data.valid_encoding?
           raise Encoding::InvalidByteSequenceError, "#{eval_file} is not valid #{@data.encoding}"
@@ -91,27 +98,25 @@ module Tilt
     # Render the template in the given scope with the locals specified. If a
     # block is given, it is typically available within the template via
     # +yield+.
-    def render(scope=Object.new, locals={}, &block)
-      current_template = Thread.current[:tilt_current_template]
-      Thread.current[:tilt_current_template] = self
-      evaluate(scope, locals || {}, &block)
-    ensure
-      Thread.current[:tilt_current_template] = current_template
+    def render(scope=nil, locals=nil, &block)
+      evaluate(scope || Object.new, locals || EMPTY_HASH, &block)
     end
 
     # The basename of the template file.
     def basename(suffix='')
-      File.basename(file, suffix) if file
+      File.basename(@file, suffix) if @file
     end
 
     # The template file's basename with all extensions chomped off.
     def name
-      basename.split('.', 2).first if basename
+      if bname = basename
+        bname.split('.', 2).first
+      end
     end
 
     # The filename used in backtraces to describe the template.
     def eval_file
-      file || '(__TEMPLATE__)'
+      @file || '(__TEMPLATE__)'
     end
 
     # An empty Hash that the template engine can populate with various
@@ -124,6 +129,35 @@ module Tilt
       end
     end
 
+    # Set the prefix to use for compiled paths.
+    def compiled_path=(path)
+      if path
+        # Use expanded paths when loading, since that is helpful
+        # for coverage.  Remove any .rb suffix, since that will
+        # be added back later.
+        path = File.expand_path(path.sub(/\.rb\z/i, ''))
+      end
+      @compiled_path = path
+    end
+
+    # The compiled method for the locals keys and scope_class provided.
+    # Returns an UnboundMethod, which can be used to define methods
+    # directly on the scope class, which are much faster to call than
+    # Tilt's normal rendering.
+    def compiled_method(locals_keys, scope_class=nil)
+      key = [scope_class, locals_keys].freeze
+      LOCK.synchronize do
+        if meth = @compiled_method[key]
+          return meth
+        end
+      end
+      meth = compile_template_method(locals_keys, scope_class)
+      LOCK.synchronize do
+        @compiled_method[key] = meth
+      end
+      meth
+    end
+
     protected
 
     # @!group For template implementations
@@ -132,19 +166,23 @@ module Tilt
     # default_encoding-option if present. You may override this method
     # in your template class if you have a better hint of the data's
     # encoding.
-    def default_encoding
-      @default_encoding
+    attr_reader :default_encoding
+
+    def skip_compiled_encoding_detection?
+      @skip_compiled_encoding_detection
     end
 
     # Do whatever preparation is necessary to setup the underlying template
     # engine. Called immediately after template data is loaded. Instance
     # variables set in this method are available when #evaluate is called.
     #
-    # Subclasses must provide an implementation of this method.
+    # Empty by default as some subclasses do not need separate preparation.
     def prepare
-      raise NotImplementedError
     end
 
+    CLASS_METHOD = Kernel.instance_method(:class)
+    USE_BIND_CALL = RUBY_VERSION >= '2.7'
+
     # Execute the compiled template and return the result string. Template
     # evaluation is guaranteed to be performed in the scope object with the
     # locals specified and with support for yielding to the block.
@@ -152,8 +190,26 @@ module Tilt
     # This method is only used by source generating templates. Subclasses that
     # override render() may not support all features.
     def evaluate(scope, locals, &block)
-      method = compiled_method(locals.keys)
-      method.bind(scope).call(locals, &block)
+      locals_keys = locals.keys
+      locals_keys.sort!{|x, y| x.to_s <=> y.to_s}
+
+      case scope
+      when Object
+        scope_class = Module === scope ? scope : scope.class
+      else
+        # :nocov:
+        scope_class = USE_BIND_CALL ? CLASS_METHOD.bind_call(scope) : CLASS_METHOD.bind(scope).call
+        # :nocov:
+      end
+      method = compiled_method(locals_keys, scope_class)
+
+      if USE_BIND_CALL
+        method.bind_call(scope, locals, &block)
+      # :nocov:
+      else
+        method.bind(scope).call(locals, &block)
+      # :nocov:
+      end
     end
 
     # Generates all template source by combining the preamble, template, and
@@ -169,17 +225,21 @@ module Tilt
       preamble = precompiled_preamble(local_keys)
       template = precompiled_template(local_keys)
       postamble = precompiled_postamble(local_keys)
-      source = ''
+      source = String.new
 
-      # Ensure that our generated source code has the same encoding as the
-      # the source code generated by the template engine.
-      if source.respond_to?(:force_encoding)
-        template_encoding = extract_encoding(template)
+      unless skip_compiled_encoding_detection?
+        # Ensure that our generated source code has the same encoding as the
+        # the source code generated by the template engine.
+        template_encoding = extract_encoding(template){|t| template = t}
 
-        source.force_encoding(template_encoding)
-        template.force_encoding(template_encoding)
+        if template.encoding != template_encoding
+          # template should never be frozen here. If it was frozen originally,
+          # then extract_encoding should yield a dup.
+          template.force_encoding(template_encoding)
+        end
       end
 
+      source.force_encoding(template.encoding)
       source << preamble << "\n" << template << "\n" << postamble
 
       [source, preamble.count("\n")+1]
@@ -207,75 +267,143 @@ module Tilt
 
     private
 
-    def read_template_file
-      data = File.open(file, 'rb') { |io| io.read }
-      if data.respond_to?(:force_encoding)
-        # Set it to the default external (without verifying)
-        data.force_encoding(Encoding.default_external) if Encoding.default_external
+    def process_arg(arg)
+      if arg
+        case
+        when arg.respond_to?(:to_str)  ; @file = arg.to_str
+        when arg.respond_to?(:to_int)  ; @line = arg.to_int
+        when arg.respond_to?(:to_hash) ; @options = arg.to_hash.dup
+        when arg.respond_to?(:path)    ; @file = arg.path
+        when arg.respond_to?(:to_path) ; @file = arg.to_path
+        else raise TypeError, "Can't load the template file. Pass a string with a path " +
+          "or an object that responds to 'to_str', 'path' or 'to_path'"
+        end
       end
+    end
+
+    def read_template_file
+      data = File.binread(file)
+      # Set it to the default external (without verifying)
+      # :nocov:
+      data.force_encoding(Encoding.default_external) if Encoding.default_external
+      # :nocov:
       data
     end
 
-    # The compiled method for the locals keys provided.
-    def compiled_method(locals_keys)
-      LOCK.synchronize do
-        @compiled_method[locals_keys] ||= compile_template_method(locals_keys)
-      end
+    def set_compiled_method_cache
+      @compiled_method = {}
     end
 
     def local_extraction(local_keys)
-      local_keys.map do |k|
+      assignments = local_keys.map do |k|
         if k.to_s =~ /\A[a-z_][a-zA-Z_0-9]*\z/
           "#{k} = locals[#{k.inspect}]"
         else
           raise "invalid locals key: #{k.inspect} (keys must be variable names)"
         end
-      end.join("\n")
+      end
+
+      s = "locals = locals[:locals]"
+      if assignments.delete(s)
+        # If there is a locals key itself named `locals`, delete it from the ordered keys so we can
+        # assign it last. This is important because the assignment of all other locals depends on the
+        # `locals` local variable still matching the `locals` method argument given to the method
+        # created in `#compile_template_method`.
+        assignments << s
+      end
+
+      assignments.join("\n")
     end
 
-    def compile_template_method(local_keys)
+    def compile_template_method(local_keys, scope_class=nil)
       source, offset = precompiled(local_keys)
       local_code = local_extraction(local_keys)
 
       method_name = "__tilt_#{Thread.current.object_id.abs}"
-      method_source = ""
+      method_source = String.new
+      method_source.force_encoding(source.encoding)
 
-      if method_source.respond_to?(:force_encoding)
-        method_source.force_encoding(source.encoding) 
+      if freeze_string_literals?
+        method_source << "# frozen-string-literal: true\n"
       end
 
-      method_source << <<-RUBY
-        TOPOBJECT.class_eval do
-          def #{method_name}(locals)
-            Thread.current[:tilt_vars] = [self, locals]
-            class << self
-              this, locals = Thread.current[:tilt_vars]
-              this.instance_eval do
-                #{local_code}
-      RUBY
+      # Don't indent method source, to avoid indentation warnings when using compiled paths
+      method_source << "::Tilt::TOPOBJECT.class_eval do\ndef #{method_name}(locals)\n#{local_code}\n"
+
       offset += method_source.count("\n")
       method_source << source
-      method_source << "\nend;end;end;end"
-      Object.class_eval(method_source, eval_file, line - offset)
+      method_source << "\nend;end;"
+
+      bind_compiled_method(method_source, offset, scope_class)
       unbind_compiled_method(method_name)
     end
 
+    def bind_compiled_method(method_source, offset, scope_class)
+      path = compiled_path
+      if path && scope_class.name
+        path = path.dup
+
+        if defined?(@compiled_path_counter)
+          path << '-' << @compiled_path_counter.succ!
+        else
+          @compiled_path_counter = "0".dup
+        end
+        path << ".rb"
+
+        # Wrap method source in a class block for the scope, so constant lookup works
+        if freeze_string_literals?
+          method_source_prefix = "# frozen-string-literal: true\n"
+          method_source = method_source.sub(/\A# frozen-string-literal: true\n/, '')
+        end
+        method_source = "#{method_source_prefix}class #{scope_class.name}\n#{method_source}\nend"
+
+        load_compiled_method(path, method_source)
+      else
+        if path
+          warn "compiled_path (#{compiled_path.inspect}) ignored on template with anonymous scope_class (#{scope_class.inspect})"
+        end
+
+        eval_compiled_method(method_source, offset, scope_class)
+      end
+    end
+
+    def eval_compiled_method(method_source, offset, scope_class)
+      (scope_class || Object).class_eval(method_source, eval_file, line - offset)
+    end
+
+    def load_compiled_method(path, method_source)
+      File.binwrite(path, method_source)
+
+      # Use load and not require, so unbind_compiled_method does not
+      # break if the same path is used more than once.
+      load path
+    end
+
     def unbind_compiled_method(method_name)
       method = TOPOBJECT.instance_method(method_name)
       TOPOBJECT.class_eval { remove_method(method_name) }
       method
     end
 
-    def extract_encoding(script)
-      extract_magic_comment(script) || script.encoding
+    def extract_encoding(script, &block)
+      extract_magic_comment(script, &block) || script.encoding
     end
 
     def extract_magic_comment(script)
+      if script.frozen?
+        script = script.dup
+        yield script
+      end
+
       binary(script) do
         script[/\A[ \t]*\#.*coding\s*[=:]\s*([[:alnum:]\-_]+).*$/n, 1]
       end
     end
 
+    def freeze_string_literals?
+      false
+    end
+
     def binary(string)
       original_encoding = string.encoding
       string.force_encoding(Encoding::BINARY)
@@ -284,4 +412,44 @@ module Tilt
       string.force_encoding(original_encoding)
     end
   end
+
+  class StaticTemplate < Template
+    def self.subclass(mime_type: 'text/html', &block)
+      Class.new(self) do
+        self.default_mime_type = mime_type
+
+        private
+
+        define_method(:_prepare_output, &block)
+      end
+    end
+
+    # Static templates always return the prepared output.
+    def render(scope=nil, locals=nil)
+      @output
+    end
+
+    # Raise NotImplementedError, since static templates
+    # do not support compiled methods.
+    def compiled_method(locals_keys, scope_class=nil)
+      raise NotImplementedError
+    end
+
+    # Static templates never allow script.
+    def allows_script?
+      false
+    end
+
+    protected
+
+    def prepare
+      @output = _prepare_output
+    end
+
+    private
+
+    # Do nothing, since compiled method cache is not used.
+    def set_compiled_method_cache
+    end
+  end
 end

data/lib/tilt/typescript.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+require_relative 'template'
+require 'typescript-node'
+
+Tilt::TypeScriptTemplate = Tilt::StaticTemplate.subclass(mime_type: 'application/javascript') do
+  option_args = []
+
+  @options.each do |key, value|
+    next unless value
+
+    option_args << "--#{key}"
+
+    if value != true
+      option_args << value.to_s
+    end
+  end
+
+  TypeScript::Node.compile(@data, *option_args)
+end

data/lib/tilt/wikicloth.rb

@@ -1,22 +1,12 @@
-require 'tilt/template'
+# frozen_string_literal: true
+require_relative '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
+warn 'tilt/wikicloth is deprecated, as wikicloth requires modifying string literals', uplevel: 1
 
-    def evaluate(scope, locals, &block)
-      @output ||= @engine.to_html
-    end
-
-    def allows_script?
-      false
-    end
-  end
+# WikiCloth implementation. See: https://github.com/nricciar/wikicloth
+Tilt::WikiClothTemplate = Tilt::StaticTemplate.subclass do
+  parser = @options.delete(:parser) || WikiCloth::Parser
+  @options[:data] = @data
+  parser.new(@options).to_html
 end

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