tilt 2.0.11 → 2.7.0

data/lib/tilt/sass.rb

@@ -1,17 +1,53 @@
-require 'tilt/template'
+# frozen_string_literal: true
+
+# = Sass / Scss
+#
+# Sass/Scss template implementation for generating CSS.
+#
+# Sass templates do not support object scopes, locals, or yield.
+#
+# === See also
+#
+# * https://sass-lang.com/
+#
+# === Related modules
+#
+# * Tilt::SassTemplate
+# * Tilt::ScssTemplate
+
+require_relative 'template'
 
 module Tilt
-  # Sass template implementation. See:
-  # http://haml.hamptoncatlin.com/
-  #
-  # Sass templates do not support object scopes, locals, or yield.
-  class SassTemplate < Template
+  class SassTemplate < StaticTemplate
     self.default_mime_type = 'text/css'
 
     begin
       require 'sass-embedded'
+    # :nocov:
       require 'uri'
-      Engine = nil
+
+      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
+        ::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'
@@ -24,55 +60,32 @@ module Tilt
           raise err
         end
       end
-    end
 
-    def prepare
-      @engine = unless Engine.nil?
-                  Engine.new(data, sass_options)
-                end
-    end
-
-    def evaluate(scope, locals, &block)
-      @output ||= if @engine.nil?
-                    ::Sass.compile_string(data, **sass_embedded_options).css
-                  else
-                    @engine.render
-                  end
-    end
+      private
 
-    def allows_script?
-      false
-    end
-
-  private
-    def eval_file_url
-      path = File.absolute_path(eval_file)
-      path = '/' + path unless path.start_with?('/')
-      ::URI::File.build([nil, ::URI::DEFAULT_PARSER.escape(path)]).to_s
-    end
-
-    def sass_embedded_options
-      options.merge(:url => eval_file_url, :syntax => :indented)
-    end
+      def _prepare_output
+        Engine.new(@data, sass_options).render
+      end
 
-    def sass_options
-      options.merge(:filename => eval_file, :line => line, :syntax => :sass)
+      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
-    def sass_embedded_options
-      options.merge(:url => eval_file_url, :syntax => :scss)
-    end
+    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,18 @@
+# frozen_string_literal: true
+
+# = Slim (<tt>slim</tt>)
+#
+# === Embedded locals
+#
+# In slim templates, the comment format looks like this:
+#
+#   //# locals: ()
+#
+# === See also
+#
+# * https://slim-template.github.io
+
+require_relative 'template'
+require 'slim'
+
+Tilt::SlimTemplate = Slim::Template

data/lib/tilt/string.rb

@@ -1,12 +1,22 @@
-require 'tilt/template'
+# frozen_string_literal: true
+
+# = String
+#
+# The template source is evaluated as a Ruby string. The #{} interpolation
+# syntax can be used to generated dynamic output.
+#
+# === Related module
+#
+# * Tilt::StringTemplate
+
+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 = String.new("<<#{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 +27,9 @@ module Tilt
       source, offset = super
       [source, offset + 1]
     end
+
+    def freeze_string_literals?
+      @freeze_string_literals
+    end
   end
 end