hamlit 2.9.5-java → 2.13.0-java

data/lib/hamlit/parser/haml_temple_engine.rb

@@ -0,0 +1,123 @@
+# frozen_string_literal: true
+
+require 'temple'
+require 'hamlit/parser/haml_escapable'
+require 'hamlit/parser/haml_generator'
+
+module Hamlit
+  class HamlTempleEngine < Temple::Engine
+    define_options(
+      attr_wrapper:         "'",
+      autoclose:            %w(area base basefont br col command embed frame
+                               hr img input isindex keygen link menuitem meta
+                               param source track wbr),
+      encoding:             nil,
+      escape_attrs:         true,
+      escape_html:          false,
+      escape_filter_interpolations: nil,
+      filename:             '(haml)',
+      format:               :html5,
+      hyphenate_data_attrs: true,
+      line:                 1,
+      mime_type:            'text/html',
+      preserve:             %w(textarea pre code),
+      remove_whitespace:    false,
+      suppress_eval:        false,
+      cdata:                false,
+      parser_class:         ::Hamlit::HamlParser,
+      compiler_class:       ::Hamlit::HamlCompiler,
+      trace:                false,
+      filters:              {},
+    )
+
+    use :Parser,   -> { options[:parser_class] }
+    use :Compiler, -> { options[:compiler_class] }
+    use HamlEscapable
+    filter :ControlFlow
+    filter :MultiFlattener
+    filter :StaticMerger
+    use HamlGenerator
+
+    def compile(template)
+      initialize_encoding(template, options[:encoding])
+      @precompiled = call(template)
+    end
+
+    # The source code that is evaluated to produce the Haml document.
+    #
+    # This is automatically converted to the correct encoding
+    # (see {file:REFERENCE.md#encodings the `:encoding` option}).
+    #
+    # @return [String]
+    def precompiled
+      encoding = Encoding.find(@encoding || '')
+      return @precompiled.dup.force_encoding(encoding) if encoding == Encoding::ASCII_8BIT
+      return @precompiled.encode(encoding)
+    end
+
+    def precompiled_with_return_value
+      "#{precompiled};#{precompiled_method_return_value}".dup
+    end
+
+    # The source code that is evaluated to produce the Haml document.
+    #
+    # This is automatically converted to the correct encoding
+    # (see {file:REFERENCE.md#encodings the `:encoding` option}).
+    #
+    # @return [String]
+    def precompiled_with_ambles(local_names, after_preamble: '')
+      preamble = <<END.tr("\n", ';')
+begin
+extend Hamlit::HamlHelpers
+_hamlout = @haml_buffer = Hamlit::HamlBuffer.new(haml_buffer, #{HamlOptions.new(options).for_buffer.inspect})
+_erbout = _hamlout.buffer
+#{after_preamble}
+END
+      postamble = <<END.tr("\n", ';')
+#{precompiled_method_return_value}
+ensure
+@haml_buffer = @haml_buffer.upper if @haml_buffer
+end
+END
+      "#{preamble}#{locals_code(local_names)}#{precompiled}#{postamble}".dup
+    end
+
+    private
+
+    def initialize_encoding(template, given_value)
+      if given_value
+        @encoding = given_value
+      else
+        @encoding = Encoding.default_internal || template.encoding
+      end
+    end
+
+    # Returns the string used as the return value of the precompiled method.
+    # This method exists so it can be monkeypatched to return modified values.
+    def precompiled_method_return_value
+      "_erbout"
+    end
+
+    def locals_code(names)
+      names = names.keys if Hash === names
+
+      names.map do |name|
+        # Can't use || because someone might explicitly pass in false with a symbol
+        sym_local = "_haml_locals[#{inspect_obj(name.to_sym)}]"
+        str_local = "_haml_locals[#{inspect_obj(name.to_s)}]"
+        "#{name} = #{sym_local}.nil? ? #{str_local} : #{sym_local};"
+      end.join
+    end
+
+    def inspect_obj(obj)
+      case obj
+      when String
+        %Q!"#{obj.gsub(/[\x00-\x7F]+/) {|s| s.inspect[1...-1]}}"!
+      when Symbol
+        ":#{inspect_obj(obj.to_s)}"
+      else
+        obj.inspect
+      end
+    end
+  end
+end

data/lib/hamlit/parser/haml_util.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 begin
   require 'erubis/tiny'
@@ -126,7 +126,7 @@ MSG
     def inspect_obj(obj)
       case obj
       when String
-        %Q!"#{obj.gsub(/[\x00-\x7F]+/) {|s| s.inspect[1...-1]}}"!
+        %Q!"#{obj.gsub(/[\x00-\x7F]+/) {|s| s.dump[1...-1]}}"!
       when Symbol
         ":#{inspect_obj(obj.to_s)}"
       else
@@ -166,7 +166,7 @@ MSG
     #   and the rest of the string.
     #   `["Foo (Bar (Baz bang) bop)", " (Bang (bop bip))"]` in the example above.
     def balance(scanner, start, finish, count = 0)
-      str = ''
+      str = ''.dup
       scanner = StringScanner.new(scanner) unless scanner.is_a? StringScanner
       regexp = Regexp.new("(.*?)[\\#{start.chr}\\#{finish.chr}]", Regexp::MULTILINE)
       while scanner.scan(regexp)
@@ -198,12 +198,9 @@ MSG
       /#[\{$@]/ === str
     end
 
-    # Original Haml::Util.unescape_interpolation
-    # ex) slow_unescape_interpolation('foo#{bar}baz"', escape_html: true)
-    #   #=> "\"foo\#{::Hamlit::HamlHelpers.html_escape((bar))}baz\\\"\""
-    def slow_unescape_interpolation(str, escape_html = nil)
-      res = ''
-      rest = ::Hamlit::HamlUtil.handle_interpolation str.dump do |scan|
+    def unescape_interpolation(str, escape_html = nil)
+      res = ''.dup
+      rest = Hamlit::HamlUtil.handle_interpolation str.dump do |scan|
         escapes = (scan[2].size - 1) / 2
         char = scan[3] # '{', '@' or '$'
         res << scan.matched[0...-3 - escapes]
@@ -215,36 +212,9 @@ MSG
           else
             scan.scan(/\w+/)
           end
-          content = eval('"' + interpolated + '"')
-          content.prepend(char) if char == '@' || char == '$'
-          content = "::Hamlit::HamlHelpers.html_escape((#{content}))" if escape_html
-
-          res << "\#{#{content}}"
-        end
-      end
-      res + rest
-    end
-
-    # Customized Haml::Util.unescape_interpolation to handle escape by Hamlit.
-    # It wraps double quotes to given `str` with escaping `"`.
-    #
-    # ex) unescape_interpolation('foo#{bar}baz"') #=> "\"foo\#{bar}baz\\\"\""
-    def unescape_interpolation(str)
-      res = ''
-      rest = ::Hamlit::HamlUtil.handle_interpolation str.dump do |scan|
-        escapes = (scan[2].size - 1) / 2
-        char = scan[3] # '{', '@' or '$'
-        res << scan.matched[0...-3 - escapes]
-        if escapes % 2 == 1
-          res << "\##{char}"
-        else
-          interpolated = if char == '{'
-            balance(scan, ?{, ?}, 1)[0][0...-1]
-          else
-            scan.scan(/\w+/)
-          end
-          content = eval('"' + interpolated + '"')
-          content.prepend(char) if char == '@' || char == '$'
+          content = eval("\"#{interpolated}\"")
+          content = "#{char}#{content}" if char == '@' || char == '$'
+          content = "Hamlit::HamlHelpers.html_escape((#{content}))" if escape_html
 
           res << "\#{#{content}}"
         end
@@ -264,7 +234,7 @@ MSG
       scanner = StringScanner.new(str.dup.force_encoding(Encoding::ASCII_8BIT))
       bom = scanner.scan(/\xEF\xBB\xBF/n)
       return bom unless scanner.scan(/-\s*#\s*/n)
-      if coding = try_parse_haml_emacs_magic_comment(scanner)
+      if (coding = try_parse_haml_emacs_magic_comment(scanner))
         return bom, coding
       end
 

data/lib/hamlit/rails_template.rb

@@ -44,7 +44,7 @@ module Hamlit
 
   # https://github.com/haml/haml/blob/4.0.7/lib/haml/template.rb
   module HamlHelpers
-    require 'hamlit/parser/haml_xss_mods'
+    require 'hamlit/parser/haml_helpers/xss_mods'
     include Hamlit::HamlHelpers::XssMods
   end
 

data/lib/hamlit/string_splitter.rb

@@ -1,88 +1,20 @@
+# frozen_string_literal: true
 require 'ripper'
 require 'hamlit/ruby_expression'
 
 module Hamlit
-  class StringSplitter < Temple::Filter
-    class << self
-      # `code` param must be valid string literal
-      def compile(code)
-        [].tap do |exps|
-          tokens = Ripper.lex(code.strip)
-          tokens.pop while tokens.last && %i[on_comment on_sp].include?(tokens.last[1])
-
-          if tokens.size < 2
-            raise Hamlit::InternalError.new("Expected token size >= 2 but got: #{tokens.size}")
-          end
-          compile_tokens!(exps, tokens)
-        end
-      end
-
-      private
-
-      def strip_quotes!(tokens)
-        _, type, beg_str = tokens.shift
-        if type != :on_tstring_beg
-          raise Hamlit::InternalError.new("Expected :on_tstring_beg but got: #{type}")
-        end
-
-        _, type, end_str = tokens.pop
-        if type != :on_tstring_end
-          raise Hamlit::InternalError.new("Expected :on_tstring_end but got: #{type}")
-        end
-
-        [beg_str, end_str]
-      end
-
-      def compile_tokens!(exps, tokens)
-        beg_str, end_str = strip_quotes!(tokens)
-
-        until tokens.empty?
-          _, type, str = tokens.shift
-
-          case type
-          when :on_tstring_content
-            exps << [:static, eval("#{beg_str}#{str}#{end_str}")]
-          when :on_embexpr_beg
-            embedded = shift_balanced_embexpr(tokens)
-            exps << [:dynamic, embedded] unless embedded.empty?
-          end
-        end
-      end
-
-      def shift_balanced_embexpr(tokens)
-        String.new.tap do |embedded|
-          embexpr_open = 1
-
-          until tokens.empty?
-            _, type, str = tokens.shift
-            case type
-            when :on_embexpr_beg
-              embexpr_open += 1
-            when :on_embexpr_end
-              embexpr_open -= 1
-              break if embexpr_open == 0
-            end
-
-            embedded << str
-          end
-        end
+  module StringSplitter
+    # `code` param must be valid string literal
+    def self.compile(code)
+      unless Ripper.respond_to?(:lex) # truffleruby doesn't have Ripper.lex
+        return [[:dynamic, code]]
       end
-    end
-
-    def on_dynamic(code)
-      return [:dynamic, code] unless RubyExpression.string_literal?(code)
-      return [:dynamic, code] if code.include?("\n")
 
-      temple = [:multi]
-      StringSplitter.compile(code).each do |type, content|
-        case type
-        when :static
-          temple << [:static, content]
-        when :dynamic
-          temple << on_dynamic(content)
-        end
+      begin
+        Temple::Filters::StringSplitter.compile(code)
+      rescue Temple::FilterError => e
+        raise Hamlit::InternalError.new(e.message)
       end
-      temple
     end
   end
 end

data/lib/hamlit/template.rb

@@ -14,7 +14,7 @@ end
 module Hamlit
   Template = Temple::Templates::Tilt.create(
     Hamlit::Engine,
-    register_as: :haml,
+    register_as: [:haml, :hamlit],
   )
 
   module TemplateExtension

data/lib/hamlit/temple_line_counter.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+module Hamlit
+  # A module to count lines of expected code. This would be faster than actual code generation
+  # and counting newlines in it.
+  module TempleLineCounter
+    class UnexpectedExpression < StandardError; end
+
+    def self.count_lines(exp)
+      type, *args = exp
+      case type
+      when :multi
+        args.map { |a| count_lines(a) }.reduce(:+) || 0
+      when :dynamic, :code
+        args.first.count("\n")
+      when :static
+        0 # It has not real newline "\n" but escaped "\\n".
+      when :case
+        arg, *cases = args
+        arg.count("\n") + cases.map do |cond, e|
+          (cond == :else ? 0 : cond.count("\n")) + count_lines(e)
+        end.reduce(:+)
+      when :escape
+        count_lines(args[1])
+      when :newline
+        1
+      else
+        raise UnexpectedExpression.new("[HAML BUG] Unexpected Temple expression '#{type}' is given!")
+      end
+    end
+  end
+end

data/lib/hamlit/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Hamlit
-  VERSION = '2.9.5'
+  VERSION = '2.13.0'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: hamlit
 version: !ruby/object:Gem::Version
-  version: 2.9.5
+  version: 2.13.0
 platform: java
 authors:
 - Takashi Kokubun
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-09-08 00:00:00.000000000 Z
+date: 2020-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.2
   name: temple
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.2
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -31,8 +31,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: thor
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -45,8 +45,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: tilt
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -58,9 +58,23 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: bundler
+  name: benchmark_driver
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: bundler
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -73,8 +87,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: coffee-script
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -87,8 +101,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: erubi
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -101,8 +115,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5'
   name: haml
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -115,8 +129,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: less
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -129,8 +143,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.1'
   name: minitest-reporters
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -143,8 +157,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.0.0
   name: rails
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -157,8 +171,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: rake
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -171,8 +185,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: rake-compiler
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -185,8 +199,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: sass
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -199,8 +213,22 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: slim
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: string_template
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -213,8 +241,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: unindent
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -246,6 +274,9 @@ files:
 - benchmark/dynamic_attributes/data_attribute.haml
 - benchmark/dynamic_attributes/id_attribute.haml
 - benchmark/dynamic_boolean_attribute.haml
+- benchmark/dynamic_merger/benchmark.rb
+- benchmark/dynamic_merger/hello.haml
+- benchmark/dynamic_merger/hello.string
 - benchmark/etc/attribute_builder.haml
 - benchmark/etc/real_sample.haml
 - benchmark/etc/real_sample.rb
@@ -271,6 +302,7 @@ files:
 - bin/setup
 - bin/stackprof
 - bin/test
+- bin/update-haml
 - exe/hamlit
 - ext/hamlit/extconf.rb
 - ext/hamlit/hamlit.c
@@ -289,6 +321,7 @@ files:
 - lib/hamlit/compiler/script_compiler.rb
 - lib/hamlit/compiler/silent_script_compiler.rb
 - lib/hamlit/compiler/tag_compiler.rb
+- lib/hamlit/dynamic_merger.rb
 - lib/hamlit/engine.rb
 - lib/hamlit/error.rb
 - lib/hamlit/escapable.rb
@@ -310,28 +343,30 @@ files:
 - lib/hamlit/filters/text_base.rb
 - lib/hamlit/filters/tilt_base.rb
 - lib/hamlit/force_escapable.rb
-- lib/hamlit/hamlit.su
 - lib/hamlit/helpers.rb
 - lib/hamlit/html.rb
 - lib/hamlit/identity.rb
 - lib/hamlit/object_ref.rb
 - lib/hamlit/parser.rb
-- lib/hamlit/parser/MIT-LICENSE
-- lib/hamlit/parser/README.md
+- lib/hamlit/parser/haml_attribute_builder.rb
 - lib/hamlit/parser/haml_buffer.rb
 - lib/hamlit/parser/haml_compiler.rb
 - lib/hamlit/parser/haml_error.rb
+- lib/hamlit/parser/haml_escapable.rb
+- lib/hamlit/parser/haml_generator.rb
 - lib/hamlit/parser/haml_helpers.rb
+- lib/hamlit/parser/haml_helpers/xss_mods.rb
 - lib/hamlit/parser/haml_options.rb
 - lib/hamlit/parser/haml_parser.rb
+- lib/hamlit/parser/haml_temple_engine.rb
 - lib/hamlit/parser/haml_util.rb
-- lib/hamlit/parser/haml_xss_mods.rb
 - lib/hamlit/rails_helpers.rb
 - lib/hamlit/rails_template.rb
 - lib/hamlit/railtie.rb
 - lib/hamlit/ruby_expression.rb
 - lib/hamlit/string_splitter.rb
 - lib/hamlit/template.rb
+- lib/hamlit/temple_line_counter.rb
 - lib/hamlit/utils.rb
 - lib/hamlit/version.rb
 homepage: https://github.com/k0kubun/hamlit
@@ -353,8 +388,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.9
+rubygems_version: 3.0.6
 signing_key:
 specification_version: 4
 summary: High Performance Haml Implementation