hamlit 2.11.1 → 2.14.1

data/lib/hamlit/compiler/children_compiler.rb

@@ -39,7 +39,7 @@ module Hamlit
         when :script, :silent_script
           @lineno += 1
         when :tag
-          node.value[:attributes_hashes].each do |attribute_hash|
+          [node.value[:dynamic_attributes].new, node.value[:dynamic_attributes].old].compact.each do |attribute_hash|
             @lineno += attribute_hash.count("\n")
           end
           @lineno += 1 if node.children.empty? && node.value[:parse]

data/lib/hamlit/compiler/comment_compiler.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hamlit
   class Compiler
     class CommentCompiler

data/lib/hamlit/filters/escaped.rb

@@ -12,7 +12,7 @@ module Hamlit
 
       def compile_text(text)
         if ::Hamlit::HamlUtil.contains_interpolation?(text)
-          [:dynamic, ::Hamlit::HamlUtil.slow_unescape_interpolation(text)]
+          [:dynamic, ::Hamlit::HamlUtil.unescape_interpolation(text)]
         else
           [:static, text]
         end

data/lib/hamlit/filters/markdown.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hamlit
   class Filters
     class Markdown < TiltBase

data/lib/hamlit/filters/preserve.rb

@@ -12,7 +12,7 @@ module Hamlit
 
       def compile_text(text)
         if ::Hamlit::HamlUtil.contains_interpolation?(text)
-          [:dynamic, ::Hamlit::HamlUtil.slow_unescape_interpolation(text)]
+          [:dynamic, ::Hamlit::HamlUtil.unescape_interpolation(text)]
         else
           [:static, text]
         end

data/lib/hamlit/filters/text_base.rb

@@ -6,7 +6,7 @@ module Hamlit
         text = node.value[:text].rstrip.gsub(/^/, prefix)
         if ::Hamlit::HamlUtil.contains_interpolation?(node.value[:text])
           # original: Haml::Filters#compile
-          text = ::Hamlit::HamlUtil.slow_unescape_interpolation(text).gsub(/(\\+)n/) do |s|
+          text = ::Hamlit::HamlUtil.unescape_interpolation(text).gsub(/(\\+)n/) do |s|
             escapes = $1.size
             next s if escapes % 2 == 0
             "#{'\\' * (escapes - 1)}\n"

data/lib/hamlit/filters/tilt_base.rb

@@ -35,7 +35,7 @@ module Hamlit
 
       def dynamic_compile(node, name, indent_width: 0)
         # original: Haml::Filters#compile
-        text = ::Hamlit::HamlUtil.slow_unescape_interpolation(node.value[:text]).gsub(/(\\+)n/) do |s|
+        text = ::Hamlit::HamlUtil.unescape_interpolation(node.value[:text]).gsub(/(\\+)n/) do |s|
           escapes = $1.size
           next s if escapes % 2 == 0
           "#{'\\' * (escapes - 1)}\n"

data/lib/hamlit/parser.rb

@@ -2,13 +2,17 @@
 # Hamlit::Parser uses original Haml::Parser to generate Haml AST.
 # hamlit/parser/haml_* are modules originally in haml gem.
 
+require 'hamlit/parser/haml_attribute_builder'
 require 'hamlit/parser/haml_error'
 require 'hamlit/parser/haml_util'
+require 'hamlit/parser/haml_helpers'
 require 'hamlit/parser/haml_buffer'
 require 'hamlit/parser/haml_compiler'
 require 'hamlit/parser/haml_parser'
-require 'hamlit/parser/haml_helpers'
 require 'hamlit/parser/haml_options'
+require 'hamlit/parser/haml_escapable'
+require 'hamlit/parser/haml_generator'
+require 'hamlit/parser/haml_temple_engine'
 
 module Hamlit
   class Parser
@@ -29,7 +33,7 @@ module Hamlit
       template = Hamlit::HamlUtil.check_haml_encoding(template) do |msg, line|
         raise Hamlit::Error.new(msg, line)
       end
-      HamlParser.new(template, HamlOptions.new(@options)).parse
+      HamlParser.new(HamlOptions.new(@options)).call(template)
     rescue ::Hamlit::HamlError => e
       error_with_lineno(e)
     end

data/lib/hamlit/parser/haml_attribute_builder.rb

@@ -0,0 +1,164 @@
+# frozen_string_literal: true
+
+module Hamlit
+  module HamlAttributeBuilder
+    # https://html.spec.whatwg.org/multipage/syntax.html#attributes-2
+    INVALID_ATTRIBUTE_NAME_REGEX = /[ \0"'>\/=]/
+
+    class << self
+      def build_attributes(is_html, attr_wrapper, escape_attrs, hyphenate_data_attrs, attributes = {})
+        # @TODO this is an absolutely ridiculous amount of arguments. At least
+        # some of this needs to be moved into an instance method.
+        join_char = hyphenate_data_attrs ? '-' : '_'
+
+        attributes.each do |key, value|
+          if value.is_a?(Hash)
+            data_attributes = attributes.delete(key)
+            data_attributes = flatten_data_attributes(data_attributes, '', join_char)
+            data_attributes = build_data_keys(data_attributes, hyphenate_data_attrs, key)
+            verify_attribute_names!(data_attributes.keys)
+            attributes = data_attributes.merge(attributes)
+          end
+        end
+
+        result = attributes.collect do |attr, value|
+          next if value.nil?
+
+          value = filter_and_join(value, ' ') if attr == 'class'
+          value = filter_and_join(value, '_') if attr == 'id'
+
+          if value == true
+            next " #{attr}" if is_html
+            next " #{attr}=#{attr_wrapper}#{attr}#{attr_wrapper}"
+          elsif value == false
+            next
+          end
+
+          value =
+            if escape_attrs == :once
+              Hamlit::HamlHelpers.escape_once_without_haml_xss(value.to_s)
+            elsif escape_attrs
+              Hamlit::HamlHelpers.html_escape_without_haml_xss(value.to_s)
+            else
+              value.to_s
+            end
+          " #{attr}=#{attr_wrapper}#{value}#{attr_wrapper}"
+        end
+        result.compact!
+        result.sort!
+        result.join
+      end
+
+      # @return [String, nil]
+      def filter_and_join(value, separator)
+        return '' if (value.respond_to?(:empty?) && value.empty?)
+
+        if value.is_a?(Array)
+          value = value.flatten
+          value.map! {|item| item ? item.to_s : nil}
+          value.compact!
+          value = value.join(separator)
+        else
+          value = value ? value.to_s : nil
+        end
+        !value.nil? && !value.empty? && value
+      end
+
+      # Merges two attribute hashes.
+      # This is the same as `to.merge!(from)`,
+      # except that it merges id, class, and data attributes.
+      #
+      # ids are concatenated with `"_"`,
+      # and classes are concatenated with `" "`.
+      # data hashes are simply merged.
+      #
+      # Destructively modifies `to`.
+      #
+      # @param to [{String => String,Hash}] The attribute hash to merge into
+      # @param from [{String => Object}] The attribute hash to merge from
+      # @return [{String => String,Hash}] `to`, after being merged
+      def merge_attributes!(to, from)
+        from.keys.each do |key|
+          to[key] = merge_value(key, to[key], from[key])
+        end
+        to
+      end
+
+      # Merge multiple values to one attribute value. No destructive operation.
+      #
+      # @param key [String]
+      # @param values [Array<Object>]
+      # @return [String,Hash]
+      def merge_values(key, *values)
+        values.inject(nil) do |to, from|
+          merge_value(key, to, from)
+        end
+      end
+
+      def verify_attribute_names!(attribute_names)
+        attribute_names.each do |attribute_name|
+          if attribute_name =~ INVALID_ATTRIBUTE_NAME_REGEX
+            raise HamlInvalidAttributeNameError.new("Invalid attribute name '#{attribute_name}' was rendered")
+          end
+        end
+      end
+
+      private
+
+      # Merge a couple of values to one attribute value. No destructive operation.
+      #
+      # @param to [String,Hash,nil]
+      # @param from [Object]
+      # @return [String,Hash]
+      def merge_value(key, to, from)
+        if from.kind_of?(Hash) || to.kind_of?(Hash)
+          from = { nil => from } if !from.is_a?(Hash)
+          to   = { nil => to }   if !to.is_a?(Hash)
+          to.merge(from)
+        elsif key == 'id'
+          merged_id = filter_and_join(from, '_')
+          if to && merged_id
+            merged_id = "#{to}_#{merged_id}"
+          elsif to || merged_id
+            merged_id ||= to
+          end
+          merged_id
+        elsif key == 'class'
+          merged_class = filter_and_join(from, ' ')
+          if to && merged_class
+            merged_class = (to.split(' ') | merged_class.split(' ')).join(' ')
+          elsif to || merged_class
+            merged_class ||= to
+          end
+          merged_class
+        else
+          from
+        end
+      end
+
+      def build_data_keys(data_hash, hyphenate, attr_name="data")
+        Hash[data_hash.map do |name, value|
+          if name == nil
+            [attr_name, value]
+          elsif hyphenate
+            ["#{attr_name}-#{name.to_s.tr('_', '-')}", value]
+          else
+            ["#{attr_name}-#{name}", value]
+          end
+        end]
+      end
+
+      def flatten_data_attributes(data, key, join_char, seen = [])
+        return {key => data} unless data.is_a?(Hash)
+
+        return {key => nil} if seen.include? data.object_id
+        seen << data.object_id
+
+        data.sort {|x, y| x[0].to_s <=> y[0].to_s}.inject({}) do |hash, (k, v)|
+          joined = key == '' ? k : [key, k].join(join_char)
+          hash.merge! flatten_data_attributes(v, joined, join_char, seen)
+        end
+      end
+    end
+  end
+end

data/lib/hamlit/parser/haml_buffer.rb

@@ -1,6 +1,4 @@
-require 'hamlit/parser/haml_helpers'
-require 'hamlit/parser/haml_util'
-require 'hamlit/parser/haml_compiler'
+# frozen_string_literal: true
 
 module Hamlit
   # This class is used only internally. It holds the buffer of HTML that
@@ -8,12 +6,8 @@ module Hamlit
   # It's called from within the precompiled code,
   # and helps reduce the amount of processing done within `instance_eval`ed code.
   class HamlBuffer
-    ID_KEY    = 'id'.freeze
-    CLASS_KEY = 'class'.freeze
-    DATA_KEY  = 'data'.freeze
-
-    include ::Hamlit::HamlHelpers
-    include ::Hamlit::HamlUtil
+    include Hamlit::HamlHelpers
+    include Hamlit::HamlUtil
 
     # The string that holds the compiled HTML. This is aliased as
     # `_erbout` for compatibility with ERB-specific code.
@@ -21,10 +15,10 @@ module Hamlit
     # @return [String]
     attr_accessor :buffer
 
-    # The options hash passed in from {Haml::Engine}.
+    # The options hash passed in from {Hamlit::HamlEngine}.
     #
     # @return [{String => Object}]
-    # @see Haml::Options#for_buffer
+    # @see Hamlit::HamlOptions#for_buffer
     attr_accessor :options
 
     # The {Buffer} for the enclosing Haml document.
@@ -94,11 +88,12 @@ module Hamlit
 
     # @param upper [Buffer] The parent buffer
     # @param options [{Symbol => Object}] An options hash.
-    #   See {Haml::Engine#options\_for\_buffer}
+    #   See {Hamlit::HamlEngine#options\_for\_buffer}
     def initialize(upper = nil, options = {})
       @active     = true
       @upper      = upper
-      @options    = options
+      @options    = HamlOptions.buffer_defaults
+      @options    = @options.merge(options) unless options.empty?
       @buffer     = new_encoded_string
       @tabulation = 0
 
@@ -135,70 +130,15 @@ module Hamlit
       @real_tabs += tab_change
     end
 
-    # the number of arguments here is insane, but passing in an options hash instead of named arguments
-    # causes a significant performance regression
-    def format_script(result, preserve_script, in_tag, preserve_tag, escape_html, nuke_inner_whitespace, interpolated, ugly)
-      result_name = escape_html ? html_escape(result.to_s) : result.to_s
-
-      if ugly
-        result = nuke_inner_whitespace ? result_name.strip : result_name
-        result = preserve(result, preserve_script, preserve_tag)
-        fix_textareas!(result) if toplevel? && result.include?('<textarea')
-        return result
-      end
-
-      # If we're interpolated,
-      # then the custom tabulation is handled in #push_text.
-      # The easiest way to avoid it here is to reset @tabulation.
-      if interpolated
-        old_tabulation = @tabulation
-        @tabulation = 0
-      end
-
-      in_tag_no_nuke = in_tag && !nuke_inner_whitespace
-      preserved_no_nuke = in_tag_no_nuke && preserve_tag
-      tabulation = !preserved_no_nuke && @real_tabs
-
-      result = nuke_inner_whitespace ? result_name.strip : result_name.rstrip
-      result = preserve(result, preserve_script, preserve_tag)
-
-      has_newline = !preserved_no_nuke && result.include?("\n")
-
-      if in_tag_no_nuke && (preserve_tag || !has_newline)
-        @real_tabs -= 1
-        @tabulation = old_tabulation if interpolated
-        return result
-      end
-
-      unless preserved_no_nuke
-        # Precompiled tabulation may be wrong
-        result = "#{tabs}#{result}" if !interpolated && !in_tag && @tabulation > 0
-
-        if has_newline
-          result.gsub! "\n", "\n#{tabs(tabulation)}"
-
-          # Add tabulation if it wasn't precompiled
-          result = "#{tabs(tabulation)}#{result}" if in_tag_no_nuke
-        end
-
-        fix_textareas!(result) if toplevel? && result.include?('<textarea')
-
-        if in_tag_no_nuke
-          result = "\n#{result}\n#{tabs(tabulation-1)}"
-          @real_tabs -= 1
-        end
-        @tabulation = old_tabulation if interpolated
-        result
-      end
-    end
-
     def attributes(class_id, obj_ref, *attributes_hashes)
       attributes = class_id
       attributes_hashes.each do |old|
-        self.class.merge_attrs(attributes, Hash[old.map {|k, v| [k.to_s, v]}])
+        result = {}
+        old.each { |k, v| result[k.to_s] = v }
+        HamlAttributeBuilder.merge_attributes!(attributes, result)
       end
-      self.class.merge_attrs(attributes, parse_object_ref(obj_ref)) if obj_ref
-      ::Hamlit::HamlCompiler.build_attributes(
+      HamlAttributeBuilder.merge_attributes!(attributes, parse_object_ref(obj_ref)) if obj_ref
+      HamlAttributeBuilder.build_attributes(
         html?, @options[:attr_wrapper], @options[:escape_attrs], @options[:hyphenate_data_attrs], attributes)
     end
 
@@ -213,61 +153,6 @@ module Hamlit
       buffer << buffer.slice!(capture_position..-1).rstrip
     end
 
-    # Merges two attribute hashes.
-    # This is the same as `to.merge!(from)`,
-    # except that it merges id, class, and data attributes.
-    #
-    # ids are concatenated with `"_"`,
-    # and classes are concatenated with `" "`.
-    # data hashes are simply merged.
-    #
-    # Destructively modifies both `to` and `from`.
-    #
-    # @param to [{String => String}] The attribute hash to merge into
-    # @param from [{String => #to_s}] The attribute hash to merge from
-    # @return [{String => String}] `to`, after being merged
-    def self.merge_attrs(to, from)
-      from[ID_KEY] = ::Hamlit::HamlCompiler.filter_and_join(from[ID_KEY], '_') if from[ID_KEY]
-      if to[ID_KEY] && from[ID_KEY]
-        to[ID_KEY] << "_#{from.delete(ID_KEY)}"
-      elsif to[ID_KEY] || from[ID_KEY]
-        from[ID_KEY] ||= to[ID_KEY]
-      end
-
-      from[CLASS_KEY] = ::Hamlit::HamlCompiler.filter_and_join(from[CLASS_KEY], ' ') if from[CLASS_KEY]
-      if to[CLASS_KEY] && from[CLASS_KEY]
-        # Make sure we don't duplicate class names
-        from[CLASS_KEY] = (from[CLASS_KEY].to_s.split(' ') | to[CLASS_KEY].split(' ')).sort.join(' ')
-      elsif to[CLASS_KEY] || from[CLASS_KEY]
-        from[CLASS_KEY] ||= to[CLASS_KEY]
-      end
-
-      from.keys.each do |key|
-        next unless from[key].kind_of?(Hash) || to[key].kind_of?(Hash)
-
-        from_data = from.delete(key)
-        # forces to_data & from_data into a hash
-        from_data = { nil => from_data } if from_data && !from_data.is_a?(Hash)
-        to[key] = { nil => to[key] } if to[key] && !to[key].is_a?(Hash)
-
-        if from_data && !to[key]
-          to[key] = from_data
-        elsif from_data && to[key]
-          to[key].merge! from_data
-        end
-      end
-
-      to.merge!(from)
-    end
-
-    private
-
-    def preserve(result, preserve_script, preserve_tag)
-      return ::Hamlit::HamlHelpers.preserve(result) if preserve_tag
-      return ::Hamlit::HamlHelpers.find_and_preserve(result, options[:preserve]) if preserve_script
-      result
-    end
-
     # Works like #{find_and_preserve}, but allows the first newline after a
     # preserved opening tag to remain unencoded, and then outdents the content.
     # This change was motivated primarily by the change in Rails 3.2.3 to emit
@@ -277,6 +162,8 @@ module Hamlit
     # @since Haml 4.0.1
     # @private
     def fix_textareas!(input)
+      return input unless input.include?('<textarea'.freeze)
+
       pattern = /<(textarea)([^>]*)>(\n|&#x000A;)(.*?)<\/textarea>/im
       input.gsub!(pattern) do |s|
         match = pattern.match(s)
@@ -288,10 +175,13 @@ module Hamlit
         end
         "<#{match[1]}#{match[2]}>\n#{content}</#{match[1]}>"
       end
+      input
     end
 
+    private
+
     def new_encoded_string
-      "".encode(Encoding.find(options[:encoding]))
+      "".encode(options[:encoding])
     end
 
     @@tab_cache = {}
@@ -329,7 +219,7 @@ module Hamlit
         id = "#{ prefix }_#{ id }"
       end
 
-      {ID_KEY => id, CLASS_KEY => class_name}
+      { 'id'.freeze => id, 'class'.freeze => class_name }
     end
 
     # Changes a word from camel case to underscores.