tilt 2.0.0 → 2.4.0

data/lib/tilt/radius.rb

@@ -1,44 +1,37 @@
-require 'tilt/template'
+# frozen_string_literal: true
+require_relative 'template'
 require 'radius'
 
 module Tilt
   # Radius Template
   # http://github.com/jlong/radius/
   class RadiusTemplate < Template
-    def self.context_class
-      @context_class ||= Class.new(Radius::Context) do
-        attr_accessor :tilt_scope
+    class ContextClass < Radius::Context
+      attr_accessor :tilt_scope
 
-        def tag_missing(name, attributes)
-          tilt_scope.__send__(name)
-        end
-
-        def dup
-          i = super
-          i.tilt_scope = tilt_scope
-          i
-        end
+      def tag_missing(name, attributes)
+        tilt_scope.__send__(name)
       end
-    end
 
-    def prepare
+      def dup
+        i = super
+        i.tilt_scope = tilt_scope
+        i
+      end
     end
 
     def evaluate(scope, locals, &block)
-      context = self.class.context_class.new
+      context = ContextClass.new
       context.tilt_scope = scope
-      context.define_tag("yield") do
-        block.call
-      end
+      context.define_tag("yield", &block) if block
       locals.each do |tag, value|
         context.define_tag(tag) do
           value
         end
       end
 
-      options = {:tag_prefix => 'r'}.merge(@options)
-      parser = Radius::Parser.new(context, options)
-      parser.parse(data)
+      @options[:tag_prefix] = 'r' unless @options.has_key?(:tag_prefix)
+      Radius::Parser.new(context, @options).parse(@data)
     end
 
     def allows_script?

data/lib/tilt/rdiscount.rb

@@ -1,39 +1,23 @@
-require 'tilt/template'
+# frozen_string_literal: true
+require_relative 'template'
 require 'rdiscount'
 
-module Tilt
-  # Discount Markdown implementation. See:
-  # http://github.com/rtomayko/rdiscount
-  #
-  # RDiscount is a simple text filter. It does not support +scope+ or
-  # +locals+. The +:smart+ and +:filter_html+ options may be set true
-  # to enable those flags on the underlying RDiscount object.
-  class RDiscountTemplate < Template
-    self.default_mime_type = 'text/html'
+aliases = {
+  :escape_html => :filter_html,
+  :smartypants => :smart
+}.freeze
 
-    ALIAS = {
-      :escape_html => :filter_html,
-      :smartypants => :smart
-    }
+_flags = [:smart, :filter_html, :smartypants, :escape_html].freeze
 
-    FLAGS = [:smart, :filter_html, :smartypants, :escape_html]
+# Discount Markdown implementation. See:
+# http://github.com/rtomayko/rdiscount
+#
+# RDiscount is a simple text filter. It does not support +scope+ or
+# +locals+. The +:smart+ and +:filter_html+ options may be set true
+# to enable those flags on the underlying RDiscount object.
+Tilt::RDiscountTemplate = Tilt::StaticTemplate.subclass do
+  flags = _flags.select { |flag| @options[flag] }.
+    map! { |flag| aliases[flag] || flag }
 
-    def flags
-      FLAGS.select { |flag| options[flag] }.map { |flag| ALIAS[flag] || flag }
-    end
-
-    def prepare
-      @engine = RDiscount.new(data, *flags)
-      @output = nil
-    end
-
-    def evaluate(scope, locals, &block)
-      @output ||= @engine.to_html
-    end
-
-    def allows_script?
-      false
-    end
-  end
+  RDiscount.new(@data, *flags).to_html
 end
-

data/lib/tilt/rdoc.rb

@@ -1,40 +1,19 @@
-require 'tilt/template'
+# frozen_string_literal: true
+require_relative 'template'
 require 'rdoc'
 require 'rdoc/markup'
 require 'rdoc/markup/to_html'
+require 'rdoc/options'
 
-module Tilt
-  # RDoc template. See:
-  # http://rdoc.rubyforge.org/
-  #
-  # It's suggested that your program `require 'rdoc/markup'` and
-  # `require 'rdoc/markup/to_html'` at load time when using this template
-  # engine in a threaded environment.
-  class RDocTemplate < Template
-    self.default_mime_type = 'text/html'
-
-    def markup
-      begin
-        # RDoc 4.0
-        require 'rdoc/options'
-        RDoc::Markup::ToHtml.new(RDoc::Options.new, nil)
-      rescue ArgumentError
-        # RDoc < 4.0
-        RDoc::Markup::ToHtml.new
-      end
-    end
-
-    def prepare
-      @engine = markup.convert(data)
-      @output = nil
-    end
-
-    def evaluate(scope, locals, &block)
-      @output ||= @engine.to_s
-    end
-
-    def allows_script?
-      false
-    end
-  end
+# 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/redcarpet.rb

@@ -1,104 +1,31 @@
-require 'tilt/template'
+# frozen_string_literal: true
+require_relative 'template'
 require 'redcarpet'
 
-module Tilt
-  # Compatibility mode for Redcarpet 1.x
-  class Redcarpet1Template < Template
-    self.default_mime_type = 'text/html'
+aliases = {:escape_html => :filter_html, :smartypants => :smart}.freeze
 
-    ALIAS = {
-      :escape_html => :filter_html,
-      :smartypants => :smart
-    }
-
-    FLAGS = [:smart, :filter_html, :smartypants, :escape_html]
-
-    def flags
-      FLAGS.select { |flag| options[flag] }.map { |flag| ALIAS[flag] || flag }
-    end
-
-    def prepare
-      @engine = RedcarpetCompat.new(data, *flags)
-      @output = nil
-    end
-
-    def evaluate(scope, locals, &block)
-      @output ||= @engine.to_html
-    end
-
-    def allows_script?
-      false
-    end
-  end
-
-  # Future proof mode for Redcarpet 2.x (not yet released)
-  class Redcarpet2Template < Template
-    self.default_mime_type = 'text/html'
-
-    def self.engine_initialized?
-      defined? ::Redcarpet::Render and defined? ::Redcarpet::Markdown
-    end
-
-    def generate_renderer
-      renderer = options.delete(:renderer) || ::Redcarpet::Render::HTML
-      return renderer unless options.delete(:smartypants)
-      return renderer if renderer.is_a?(Class) && renderer <= ::Redcarpet::Render::SmartyPants
-
-      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
-    end
-
-    def prepare
-      # try to support the same aliases
-      Redcarpet1Template::ALIAS.each do |opt, aka|
-        next if options.key? opt or not options.key? aka
-        options[opt] = options.delete(aka)
-      end
-
-      # only raise an exception if someone is trying to enable :escape_html
-      options.delete(:escape_html) unless options[:escape_html]
-
-      @engine = ::Redcarpet::Markdown.new(generate_renderer, options)
-      @output = nil
-    end
-
-    def evaluate(scope, locals, &block)
-      @output ||= @engine.render(data)
-    end
-
-    def allows_script?
-      false
+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
 
-  # Upskirt Markdown implementation. See:
-  # https://github.com/tanoku/redcarpet
-  #
-  # Supports both Redcarpet 1.x and 2.x
-  class RedcarpetTemplate < Template
-    Redcarpet1 = Redcarpet1Template
-    Redcarpet2 = Redcarpet2Template
-
-    def prepare
-      klass = Redcarpet2.engine_initialized? ? Redcarpet2 : Redcarpet1
-      @engine = klass.new(file, line, options) { data }
-    end
+  # only raise an exception if someone is trying to enable :escape_html
+  @options.delete(:escape_html) unless @options[:escape_html]
 
-    def evaluate(scope, locals, &block)
-      @engine.evaluate(scope, locals, &block)
-    end
-
-    def allows_script?
-      false
+  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
   end
 
+  Redcarpet::Markdown.new(renderer, @options).render(@data)
 end
-

data/lib/tilt/redcloth.rb

@@ -1,23 +1,13 @@
-require 'tilt/template'
+# frozen_string_literal: true
+require_relative 'template'
 require 'redcloth'
 
-module Tilt
-  # RedCloth implementation. See:
-  # http://redcloth.org/
-  class RedClothTemplate < Template
-    def prepare
-      @engine = RedCloth.new(data)
-      options.each {|k, v| @engine.send("#{k}=", v) if @engine.respond_to? "#{k}="}
-      @output = nil
-    end
-
-    def evaluate(scope, locals, &block)
-      @output ||= @engine.to_html
-    end
-
-    def allows_script?
-      false
-    end
+# RedCloth implementation. See: https://github.com/jgarber/redcloth
+Tilt::RedClothTemplate = Tilt::StaticTemplate.subclass do
+  engine = RedCloth.new(@data)
+  @options.each  do |k, v|
+    m = :"#{k}="
+    engine.send(m, v) if engine.respond_to? m
   end
+  engine.to_html
 end
-

data/lib/tilt/rst-pandoc.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+require_relative 'template'
+require_relative 'pandoc'
+
+rst = {:f => "rst"}.freeze
+
+# Pandoc reStructuredText implementation. See: # http://pandoc.org/
+Tilt::RstPandocTemplate = Tilt::StaticTemplate.subclass do
+  PandocRuby.new(@data, rst).to_html.strip
+end

data/lib/tilt/sass.rb

@@ -1,41 +1,78 @@
-require 'tilt/template'
-require 'sass'
+# frozen_string_literal: true
+require_relative 'template'
 
 module Tilt
-  # Sass template implementation. See:
-  # http://haml.hamptoncatlin.com/
+  # Sass template implementation for generating CSS. See: https://sass-lang.com/
   #
   # Sass templates do not support object scopes, locals, or yield.
-  class SassTemplate < Template
+  class SassTemplate < StaticTemplate
     self.default_mime_type = 'text/css'
 
-    def prepare
-      @engine = ::Sass::Engine.new(data, sass_options)
-    end
+    begin
+      require 'sass-embedded'
+    # :nocov:
+      require 'uri'
 
-    def evaluate(scope, locals, &block)
-      @output ||= @engine.render
-    end
+      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
 
-    def allows_script?
-      false
-    end
+      private
 
-  private
-    def sass_options
-      options.merge(:filename => eval_file, :line => line, :syntax => :sass)
+      def _prepare_output
+        ::Sass.compile_string(@data, **sass_options).css
+      end
+
+      def sass_options
+        path = File.absolute_path(eval_file)
+        path = '/' + path unless path.start_with?('/')
+        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
+        require 'sassc'
+        Engine = ::SassC::Engine
+      rescue LoadError
+        begin
+          require 'sass'
+          Engine = ::Sass::Engine
+        rescue LoadError
+          raise err
+        end
+      end
+
+      private
+
+      def _prepare_output
+        Engine.new(@data, sass_options).render
+      end
+
+      def sass_options
+        @options[:filename] = eval_file
+        @options[:line] = @line
+        @options[:syntax] = :sass
+        @options
+      end
+    # :nocov:
     end
   end
 
-  # Sass's new .scss type template implementation.
   class ScssTemplate < SassTemplate
     self.default_mime_type = 'text/css'
 
-  private
+    private
+
     def sass_options
-      options.merge(:filename => eval_file, :line => line, :syntax => :scss)
+      opts = super
+      opts[:syntax] = :scss
+      opts
     end
   end
-
 end
-

data/lib/tilt/slim.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+require_relative 'template'
+require 'slim'
+
+Tilt::SlimTemplate = Slim::Template

data/lib/tilt/string.rb

@@ -1,12 +1,14 @@
-require 'tilt/template'
+# frozen_string_literal: true
+require_relative 'template'
 
 module Tilt
   # The template source is evaluated as a Ruby string. The #{} interpolation
   # syntax can be used to generated dynamic output.
   class StringTemplate < Template
     def prepare
-      hash = "TILT#{data.hash.abs}"
-      @code = "<<#{hash}.chomp\n#{data}\n#{hash}"
+      hash = "TILT#{@data.hash.abs}"
+      @freeze_string_literals = !!@options[:freeze]
+      @code = String.new("<<#{hash}.chomp\n#{@data}\n#{hash}")
     end
 
     def precompiled_template(locals)
@@ -17,5 +19,9 @@ module Tilt
       source, offset = super
       [source, offset + 1]
     end
+
+    def freeze_string_literals?
+      @freeze_string_literals
+    end
   end
 end