tilt 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9bb9bafc29e9442fed0bf862fb442ea6efaa97c2881b7b958361f0ef7095aaa
-  data.tar.gz: f25db1d4c05ef3b20c5fabefa4eb664e702f51f8d9821b0c44f5f5404ade4c3b
+  metadata.gz: 1386734fb6f20f9b1faf9e5edd4c83156e1d2e355141cd136ef949e956769e75
+  data.tar.gz: 52108af4de8efed7ade56f64e22d79fd3e5aaad4eb5ec36b2f0947242e102e57
 SHA512:
-  metadata.gz: dc69e05565c5b007fbaaddc7636d6298fc9930c42d1e029834b752236309d97024132118bb723817c5c192cad1f1cef01e278ce4fc46629dac706d0ec4fdd6a2
-  data.tar.gz: 702e18b78c3e9b21e1abe86671bbe6f2427db44b05be4941c1693f30070f1de028af5324294d693bdeda130da603ecfd5c98dcefbce7ca21f7e7f6df5a249b97
+  metadata.gz: 99a6e69ae4720ad5146c46b9b885fa4a4714b250d9db9168ae801d17f3146c90f25eab789401081100fdc065ae3ce3e804b79427e5ac835bd6bc576d3318a073
+  data.tar.gz: b0a44938aae6303bf03d174a942615e371669be99e4ec641a7a2b6ac0ee8d4f45f82869142f3e17b162efdd365883e909463763064b2b1b0417679652319c804

data/lib/tilt/creole.rb

@@ -2,6 +2,8 @@
 require_relative 'template'
 require 'creole'
 
+warn 'tilt/creole is deprecated, as creole requires modifying string literals', uplevel: 1
+
 allowed_opts = [:allowed_schemes, :extensions, :no_escape].freeze
 
 # Creole implementation. See: http://www.wikicreole.org/

data/lib/tilt/liquid.rb

@@ -13,9 +13,6 @@ module Tilt
   # to #to_h it will be ignored.
   #
   # LiquidTemplate does not support yield blocks.
-  #
-  # It's suggested that your program require 'liquid' at load
-  # time when using this template engine.
   class LiquidTemplate < Template
     def prepare
       @options[:line_numbers] = true unless @options.has_key?(:line_numbers)

data/lib/tilt/mapping.rb

@@ -113,14 +113,14 @@ module Tilt
   # the exception of the first, since that was the most preferred one.
   #
   #     mapping = Tilt::Mapping.new
-  #     mapping.register_lazy('Maruku::Template', 'maruku/template', 'md')
+  #     mapping.register_lazy('Kramdown::Template', 'kramdown/template', 'md')
   #     mapping.register_lazy('RDiscount::Template', 'rdiscount/template', 'md')
   #     mapping['index.md']
   #     # => RDiscount::Template
   #
   # In the previous example we say that RDiscount has a *higher priority* than
-  # Maruku. Tilt will first try to `require "rdiscount/template"`, falling
-  # back to `require "maruku/template"`. If none of these are successful,
+  # Kramdown. Tilt will first try to `require "rdiscount/template"`, falling
+  # back to `require "kramdown/template"`. If none of these are successful,
   # the first error will be raised.
   class Mapping < BaseMapping
     LOCK = Mutex.new

data/lib/tilt/rdoc.rb

@@ -6,14 +6,6 @@ require 'rdoc/markup/to_html'
 require 'rdoc/options'
 
 # RDoc template. See: https://github.com/ruby/rdoc
-#
-# It's suggested that your program run the following at load time when
-# using this templae engine in a threaded environment:
-#
-#   require 'rdoc'
-#   require 'rdoc/markup'
-#   require 'rdoc/markup/to_html'
-#   require 'rdoc/options'
 Tilt::RDocTemplate = Tilt::StaticTemplate.subclass do
   RDoc::Markup::ToHtml.new(RDoc::Options.new, nil).convert(@data).to_s
 end

data/lib/tilt/template.rb

@@ -83,7 +83,7 @@ module Tilt
 
       if @data.respond_to?(:force_encoding)
         if default_encoding
-          @data = @data.dup if @data.frozen?
+          @data = _dup_string_if_frozen(@data)
           @data.force_encoding(default_encoding)
         end
 
@@ -267,6 +267,18 @@ module Tilt
 
     private
 
+    if RUBY_VERSION >= '2.3'
+      def _dup_string_if_frozen(string)
+        +string
+      end
+    # :nocov:
+    else
+      def _dup_string_if_frozen(string)
+        string.frozen? ? string.dup : string
+      end
+    end
+    # :nocov:
+
     def process_arg(arg)
       if arg
         case
@@ -390,8 +402,10 @@ module Tilt
     end
 
     def extract_magic_comment(script)
-      if script.frozen?
-        script = script.dup
+      was_frozen = script.frozen?
+      script = _dup_string_if_frozen(script)
+
+      if was_frozen
         yield script
       end
 
@@ -413,6 +427,16 @@ module Tilt
     end
   end
 
+  # Static templates are templates that return the same output for every render
+  #
+  # Instead of inheriting from the StaticTemplate class, you will use the .subclass
+  # method with a block which processes @data and returns the transformed value.
+  #
+  # Basic example which transforms the template to uppercase:
+  #
+  #   UppercaseTemplate = Tilt::StaticTemplate.subclass do
+  #     @data.upcase
+  #   end
   class StaticTemplate < Template
     def self.subclass(mime_type: 'text/html', &block)
       Class.new(self) do

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.4.0'
+  VERSION = '2.5.0'
 
   EMPTY_HASH = {}.freeze
   private_constant :EMPTY_HASH
@@ -139,11 +139,9 @@ module Tilt
 
   # 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 :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'
@@ -175,7 +173,6 @@ module Tilt
   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'
 
   # TILT3: Remove

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tilt
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Ryan Tomayko
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-27 00:00:00.000000000 Z
+date: 2024-12-20 00:00:00.000000000 Z
 dependencies: []
 description: Generic interface to multiple Ruby template engines
 email: code@jeremyevans.net
@@ -36,7 +36,6 @@ files:
 - lib/tilt/csv.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
@@ -44,7 +43,6 @@ files:
 - 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
@@ -61,7 +59,6 @@ files:
 - lib/tilt/string.rb
 - lib/tilt/template.rb
 - lib/tilt/typescript.rb
-- lib/tilt/wikicloth.rb
 - lib/tilt/yajl.rb
 homepage: https://github.com/jeremyevans/tilt
 licenses:
@@ -92,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Generic interface to multiple Ruby template engines

data/lib/tilt/erubis.rb

@@ -1,51 +0,0 @@
-# frozen_string_literal: true
-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/
-  #
-  # 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
-      @freeze_string_literals = !!@options.delete(:freeze)
-      @outvar = @options.delete(:outvar) || '_erbout'
-      @options[:preamble] = false
-      @options[:postamble] = false
-      @options[: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.
-    def precompiled(locals)
-      source, offset = super
-      [source, offset - 1]
-    end
-
-    def freeze_string_literals?
-      @freeze_string_literals
-    end
-  end
-end

data/lib/tilt/maruku.rb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-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
-end

data/lib/tilt/wikicloth.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-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
-  @options[:data] = @data
-  parser.new(@options).to_html
-end