tilt 2.2.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b933744ac3dc007d759af22c61ea725d84e6d83a689c07e384792d08f330f60
-  data.tar.gz: b07ad772a645934f3c0f912d2864eb9b47964b423a83d3cbc7978e6c90385229
+  metadata.gz: d9bb9bafc29e9442fed0bf862fb442ea6efaa97c2881b7b958361f0ef7095aaa
+  data.tar.gz: f25db1d4c05ef3b20c5fabefa4eb664e702f51f8d9821b0c44f5f5404ade4c3b
 SHA512:
-  metadata.gz: 17e9ff63c011271c8fceb20c08f1c3d36f85c6674608690575ffc08b79b5d9704c0d63e456c00a2a0207295f54ef8c5df9f59c5de71680b1bf018faee93cba26
-  data.tar.gz: fcffaeed7fba1e7f2bd9ec25f57426d544281cd434f8138253f5046f47e73a871770b4e8be1cb08349462b988a6101bbbca1f7ecc273bd74f457271eb3a84aa9
+  metadata.gz: dc69e05565c5b007fbaaddc7636d6298fc9930c42d1e029834b752236309d97024132118bb723817c5c192cad1f1cef01e278ce4fc46629dac706d0ec4fdd6a2
+  data.tar.gz: 702e18b78c3e9b21e1abe86671bbe6f2427db44b05be4941c1693f30070f1de028af5324294d693bdeda130da603ecfd5c98dcefbce7ca21f7e7f6df5a249b97

data/lib/tilt/coffee.rb

@@ -15,18 +15,6 @@ module Tilt
       attr_accessor :default_bare
     end
 
-    # :nocov:
-    def self.default_no_wrap
-      warn "#{self.class}.default_no_wrap is deprecated and will be removed in Tilt 2.3.  Switch to #{self.class}.default_bare."
-      default_bare
-    end
-
-    def self.default_no_wrap=(value)
-      warn "#{self.class}.default_no_wrap= is deprecated and will be removed in Tilt 2.3.  Switch to #{self.class}.default_bare=."
-      self.default_bare = value
-    end
-    # :nocov:
-
     def self.literate?
       false
     end

data/lib/tilt/commonmarker.rb

@@ -2,53 +2,94 @@
 require_relative 'template'
 require 'commonmarker'
 
-aliases = {
-  :smartypants => :SMART
-}.freeze
-parse_opts = [
-  :FOOTNOTES,
-  :LIBERAL_HTML_TAG,
-  :SMART,
-  :smartypants,
-  :STRIKETHROUGH_DOUBLE_TILDE,
-  :UNSAFE,
-  :VALIDATE_UTF8,
-].freeze
-render_opts = [
-  :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
-exts = [
-  :autolink,
-  :strikethrough,
-  :table,
-  :tagfilter,
-  :tasklist,
-].freeze
+if defined?(::Commonmarker)
+  aliases = {
+    :smartypants => :smart
+  }.freeze
+  parse_opts = [
+    :smart,
+    :default_info_string,
+  ].freeze
+  render_opts = [
+    :hardbreaks,
+    :github_pre_lang,
+    :width,
+    :unsafe,
+    :escape,
+    :sourcepos,
+  ].freeze
+  exts = [
+    :strikethrough,
+    :tagfilter,
+    :table,
+    :autolink,
+    :tasklist,
+    :superscript,
+    :header_ids,
+    :footnotes,
+    :description_lists,
+    :front_matter_delimiter,
+    :shortcodes,
+  ].freeze
 
+  Tilt::CommonMarkerTemplate = Tilt::StaticTemplate.subclass do
+    parse_options = @options.select { |key, _| parse_opts.include?(key.downcase) }.transform_keys(&:downcase)
+    parse_options.merge!(@options.select { |key, _| aliases.has_key?(key) }.transform_keys { |key| aliases[key] })
+    render_options = @options.select { |key, _| render_opts.include?(key.downcase) }.transform_keys(&:downcase)
+    extensions = @options.select { |key, _| exts.include?(key) }.transform_keys(&:downcase)
 
-Tilt::CommonMarkerTemplate = Tilt::StaticTemplate.subclass do
-  extensions = exts.select do |extension|
-    @options[extension]
+    Commonmarker.to_html(@data, options: { parse: parse_options, render: render_options, extension: extensions })
   end
+# :nocov:
+else
+  aliases = {
+    :smartypants => :SMART
+  }.freeze
+  parse_opts = [
+    :FOOTNOTES,
+    :LIBERAL_HTML_TAG,
+    :SMART,
+    :smartypants,
+    :STRIKETHROUGH_DOUBLE_TILDE,
+    :UNSAFE,
+    :VALIDATE_UTF8,
+  ].freeze
+  render_opts = [
+    :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
+  exts = [
+    :autolink,
+    :strikethrough,
+    :table,
+    :tagfilter,
+    :tasklist,
+  ].freeze
 
-  parse_options, render_options = [parse_opts, render_opts].map do |opts|
-    opts = opts.select do |option|
-      @options[option]
-    end.map! do |option|
-      aliases[option] || option
+  Tilt::CommonMarkerTemplate = Tilt::StaticTemplate.subclass do
+    extensions = exts.select do |extension|
+      @options[extension]
     end
 
-    opts = :DEFAULT unless opts.any?
-    opts
-  end
+    parse_options, render_options = [parse_opts, render_opts].map do |opts|
+      opts = opts.select do |option|
+        @options[option]
+      end.map! do |option|
+        aliases[option] || option
+      end
+
+      opts = :DEFAULT unless opts.any?
+      opts
+    end
 
-  CommonMarker.render_doc(@data, parse_options, extensions).to_html(render_options, extensions)
+    CommonMarker.render_doc(@data, parse_options, extensions).to_html(render_options, extensions)
+  end
 end
+# :nocov:

data/lib/tilt/erb.rb

@@ -8,23 +8,9 @@ module Tilt
   class ERBTemplate < Template
     SUPPORTS_KVARGS = ::ERB.instance_method(:initialize).parameters.assoc(:key) rescue false
 
-    # Remove in Tilt 2.3
-    @default_output_variable = nil
-    def self._default_output_variable
-      @default_output_variable
-    end
-    def self.default_output_variable
-      warn "#{self}.default_output_variable is deprecated and will be removed in Tilt 2.3.", uplevel: 1
-      @default_output_variable
-    end
-    def self.default_output_variable=(name)
-      warn "#{self}.default_output_variable= is deprecated and will be removed in Tilt 2.3. Switch to using the :outvar option.", uplevel: 1
-      @default_output_variable = name
-    end
-
     def prepare
       @freeze_string_literals = !!@options[:freeze]
-      @outvar = @options[:outvar] || self.class._default_output_variable || '_erbout'
+      @outvar = @options[:outvar] || '_erbout'
       trim = case @options[:trim]
       when false
         nil

data/lib/tilt/erubis.rb

@@ -2,6 +2,8 @@
 require_relative 'erb'
 require 'erubis'
 
+warn 'tilt/erubis is deprecated, as erubis requires modifying string literals', uplevel: 1
+
 module Tilt
   # Erubis template implementation. See:
   # http://www.kuwata-lab.com/erubis/
@@ -16,12 +18,9 @@ module Tilt
   #                   the engine class instead of the default. All content
   #                   within <%= %> blocks will be automatically html escaped.
   class ErubisTemplate < ERBTemplate
-    # Remove in Tilt 2.3
-    @default_output_variable = nil
-
     def prepare
       @freeze_string_literals = !!@options.delete(:freeze)
-      @outvar = @options.delete(:outvar) || self.class._default_output_variable  || '_erbout'
+      @outvar = @options.delete(:outvar) || '_erbout'
       @options[:preamble] = false
       @options[:postamble] = false
       @options[:bufvar] = @outvar

data/lib/tilt/etanni.rb

@@ -5,7 +5,7 @@ module Tilt
   class EtanniTemplate < Template
     def prepare
       separator = data.hash.abs
-      chomp = "<<#{separator}.chomp!"
+      chomp = "<<#{separator}.chomp"
       start = "\n_out_ << #{chomp}\n"
       stop = "\n#{separator}\n"
       replacement = "#{stop}\\1#{start}"
@@ -13,7 +13,7 @@ module Tilt
       temp = @data.strip
       temp.gsub!(/<\?r\s+(.*?)\s+\?>/m, replacement)
 
-      @code = "_out_ = [<<#{separator}.chomp!]\n#{temp}#{stop}_out_.join"
+      @code = "_out_ = [<<#{separator}.chomp]\n#{temp}#{stop}_out_.join"
     end
 
     def precompiled_template(locals)

data/lib/tilt/maruku.rb

@@ -2,6 +2,8 @@
 require_relative 'template'
 require 'maruku'
 
+warn 'tilt/maruku is deprecated, as maruku requires modifying string literals', uplevel: 1
+
 # Maruku markdown implementation. See: https://github.com/bhollis/maruku
 Tilt::MarukuTemplate = Tilt::StaticTemplate.subclass do
   Maruku.new(@data, @options).to_html

data/lib/tilt/prawn.rb

@@ -15,16 +15,9 @@ module Tilt
     
     def evaluate(scope, locals, &block)
       pdf = @engine
-      if @data.respond_to?(:to_str)
-        locals = locals.dup
-        locals[:pdf] = pdf
-        super
-      else
-        warn "Non-string provided as prawn template data. This is no longer supported and support for it will be removed in Tilt 2.3", :uplevel=>2
-        # :nocov:
-        @data.call(pdf) if @data.kind_of?(Proc)
-        # :nocov:
-      end
+      locals = locals.dup
+      locals[:pdf] = pdf
+      super
       pdf.render
     end
     

data/lib/tilt/redcarpet.rb

@@ -4,41 +4,28 @@ require 'redcarpet'
 
 aliases = {:escape_html => :filter_html, :smartypants => :smart}.freeze
 
-# :nocov:
-unless defined? ::Redcarpet::Render and defined? ::Redcarpet::Markdown
-  # Redcarpet 1.x
-  warn "Tilt support for RedCarpet 1.x is deprecated and will be removed in Tilt 2.3", uplevel: 1
-  _flags = [:smart, :filter_html, :smartypants, :escape_html]
-
-  Tilt::RedcarpetTemplate = Tilt::StaticTemplate.subclass do
-    flags = _flags.select { |flag| @options[flag] }.map! { |flag| aliases[flag] || flag }
-    RedcarpetCompat.new(@data, *flags).to_html
-  end
-# :nocov:
-else
-  Tilt::RedcarpetTemplate = Tilt::StaticTemplate.subclass do
-    aliases.each do |opt, aka|
-      if options.key?(aka) || !@options.key?(opt)
-        @options[opt] = @options.delete(aka)
-      end
+Tilt::RedcarpetTemplate = Tilt::StaticTemplate.subclass do
+  aliases.each do |opt, aka|
+    if options.key?(aka) || !@options.key?(opt)
+      @options[opt] = @options.delete(aka)
     end
+  end
 
-    # only raise an exception if someone is trying to enable :escape_html
-    @options.delete(:escape_html) unless @options[:escape_html]
+  # only raise an exception if someone is trying to enable :escape_html
+  @options.delete(:escape_html) unless @options[:escape_html]
 
-    renderer = @options.delete(:renderer) || ::Redcarpet::Render::HTML.new(@options)
-    if options.delete(:smartypants) && !(renderer.is_a?(Class) && renderer <= ::Redcarpet::Render::SmartyPants)
-      renderer = 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
+  renderer = @options.delete(:renderer) || ::Redcarpet::Render::HTML.new(@options)
+  if options.delete(:smartypants) && !(renderer.is_a?(Class) && renderer <= ::Redcarpet::Render::SmartyPants)
+    renderer = 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
-
-    Redcarpet::Markdown.new(renderer, @options).render(@data)
   end
+
+  Redcarpet::Markdown.new(renderer, @options).render(@data)
 end

data/lib/tilt/sass.rb

@@ -13,6 +13,13 @@ module Tilt
     # :nocov:
       require 'uri'
 
+      ALLOWED_KEYS = (defined?(::Sass::Compiler) ? ::Sass::Compiler : ::Sass::Embedded).
+        instance_method(:compile_string).
+        parameters.
+        map{|k, v| v if k == :key}.
+        compact rescue nil
+      private_constant :ALLOWED_KEYS
+
       private
 
       def _prepare_output
@@ -22,9 +29,11 @@ module Tilt
       def sass_options
         path = File.absolute_path(eval_file)
         path = '/' + path unless path.start_with?('/')
-        @options[:url] = ::URI::File.build([nil, ::URI::DEFAULT_PARSER.escape(path)]).to_s
-        @options[:syntax] = :indented
-        @options
+        opts = @options.dup
+        opts[:url] = ::URI::File.build([nil, ::URI::DEFAULT_PARSER.escape(path)]).to_s
+        opts[:syntax] = :indented
+        opts.delete_if{|k| !ALLOWED_KEYS.include?(k)} if ALLOWED_KEYS
+        opts
       end
     rescue LoadError => err
       begin
@@ -61,9 +70,9 @@ module Tilt
     private
 
     def sass_options
-      super
-      @options[:syntax] = :scss
-      @options
+      opts = super
+      opts[:syntax] = :scss
+      opts
     end
   end
 end

data/lib/tilt/string.rb

@@ -7,6 +7,7 @@ module Tilt
   class StringTemplate < Template
     def prepare
       hash = "TILT#{@data.hash.abs}"
+      @freeze_string_literals = !!@options[:freeze]
       @code = String.new("<<#{hash}.chomp\n#{@data}\n#{hash}")
     end
 
@@ -18,5 +19,9 @@ module Tilt
       source, offset = super
       [source, offset + 1]
     end
+
+    def freeze_string_literals?
+      @freeze_string_literals
+    end
   end
 end

data/lib/tilt/template.rb

@@ -99,11 +99,7 @@ module Tilt
     # block is given, it is typically available within the template via
     # +yield+.
     def render(scope=nil, locals=nil, &block)
-      current_template = Thread.current[:tilt_current_template]
-      Thread.current[:tilt_current_template] = self
       evaluate(scope || Object.new, locals || EMPTY_HASH, &block)
-    ensure
-      Thread.current[:tilt_current_template] = current_template
     end
 
     # The basename of the template file.
@@ -355,7 +351,11 @@ module Tilt
         path << ".rb"
 
         # Wrap method source in a class block for the scope, so constant lookup works
-        method_source = "class #{scope_class.name}\n#{method_source}\nend"
+        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

data/lib/tilt/wikicloth.rb

@@ -2,6 +2,8 @@
 require_relative 'template'
 require 'wikicloth'
 
+warn 'tilt/wikicloth is deprecated, as wikicloth requires modifying string literals', uplevel: 1
+
 # WikiCloth implementation. See: https://github.com/nricciar/wikicloth
 Tilt::WikiClothTemplate = Tilt::StaticTemplate.subclass do
   parser = @options.delete(:parser) || WikiCloth::Parser

data/lib/tilt.rb

@@ -5,7 +5,7 @@ require_relative 'tilt/template'
 # Namespace for Tilt. This module is not intended to be included anywhere.
 module Tilt
   # Current version.
-  VERSION = '2.2.0'
+  VERSION = '2.4.0'
 
   EMPTY_HASH = {}.freeze
   private_constant :EMPTY_HASH
@@ -18,6 +18,8 @@ module Tilt
   # 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(*)
@@ -80,19 +82,6 @@ module Tilt
     @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
-    warn "Tilt.current_template is deprecated and will be removed in Tilt 2.3", uplevel: 1
-    Thread.current[:tilt_current_template]
-  end
-
   class << self
     # @return [Tilt::Mapping] the main mapping object
     attr_reader :default_mapping

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tilt
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Ryan Tomayko
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-05 00:00:00.000000000 Z
+date: 2024-06-27 00:00:00.000000000 Z
 dependencies: []
 description: Generic interface to multiple Ruby template engines
 email: code@jeremyevans.net
@@ -92,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Generic interface to multiple Ruby template engines