haml 5.0.4 → 6.0.0

data/lib/haml/railtie.rb

@@ -1,48 +1,15 @@
 # frozen_string_literal: true
-require 'haml/template/options'
-
-# check for a compatible Rails version when Haml is loaded
-if (activesupport_spec = Gem.loaded_specs['activesupport'])
-  if activesupport_spec.version.to_s < '3.2'
-    raise Exception.new("\n\n** Haml now requires Rails 3.2 and later. Use Haml version 4.0.4\n\n")
-  end
-end
+require 'rails'
 
 module Haml
-  module Filters
-    module RailsErb
-      extend Plain
-      extend TiltFilter
-      extend PrecompiledTiltFilter
-    end
-  end
-
   class Railtie < ::Rails::Railtie
-    initializer :haml do |app|
-      ActiveSupport.on_load(:action_view) do
-        require "haml/template"
-
-        if defined?(::Sass::Rails::SassTemplate) && app.config.assets.enabled
-          require "haml/sass_rails_filter"
-        end
-
-        # Any object under ActionView::Template will be defined as the root constant with the same
-        # name if it exists. If Erubi is loaded at all, ActionView::Template::Handlers::ERB::Erubi
-        # will turn out to be a reference to the ::Erubi module.
-        # In Rails 4.2, calling const_defined? results in odd exceptions, which seems to be
-        # solved by looking for ::Erubi first.
-        # However, in JRuby, the const_defined? finds it anyway, so we must make sure that it's
-        # not just a reference to ::Erubi.
-        if defined?(::Erubi) && const_defined?('ActionView::Template::Handlers::ERB::Erubi') &&
-            ActionView::Template::Handlers::ERB::Erubi != ::Erubi
-          require "haml/helpers/safe_erubi_template"
-          Haml::Filters::RailsErb.template_class = Haml::SafeErubiTemplate
-        else
-          require "haml/helpers/safe_erubis_template"
-          Haml::Filters::RailsErb.template_class = Haml::SafeErubisTemplate
-        end
-        Haml::Template.options[:filters] = { 'erb' => Haml::Filters::RailsErb }
+    initializer :haml, before: :load_config_initializers do |app|
+      # Load haml/plugin first to override if available
+      begin
+        require 'haml/plugin'
+      rescue LoadError
       end
+      require 'haml/rails_template'
     end
   end
 end

data/lib/haml/ruby_expression.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+require 'ripper'
+
+module Haml
+  class RubyExpression < Ripper
+    class ParseError < StandardError; end
+
+    def self.syntax_error?(code)
+      self.new(code).parse
+      false
+    rescue ParseError
+      true
+    end
+
+    def self.string_literal?(code)
+      return false if syntax_error?(code)
+
+      type, instructions = Ripper.sexp(code)
+      return false if type != :program
+      return false if instructions.size > 1
+
+      type, _ = instructions.first
+      type == :string_literal
+    end
+
+    private
+
+    def on_parse_error(*)
+      raise ParseError
+    end
+  end
+end

data/lib/haml/string_splitter.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+require 'ripper'
+require 'haml/ruby_expression'
+
+module Haml
+  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
+
+      begin
+        Temple::Filters::StringSplitter.compile(code)
+      rescue Temple::FilterError => e
+        raise Haml::InternalError.new(e.message)
+      end
+    end
+  end
+end

data/lib/haml/template.rb

@@ -1,38 +1,20 @@
-# frozen_string_literal: true
-require 'haml/template/options'
-if defined?(ActiveSupport)
-  ActiveSupport.on_load(:action_view) do
-    require 'haml/helpers/action_view_mods'
-    require 'haml/helpers/action_view_extensions'
-  end
-else
-  require 'haml/helpers/action_view_mods'
-  require 'haml/helpers/action_view_extensions'
-end
-require 'haml/helpers/xss_mods'
-require 'haml/helpers/action_view_xss_mods'
+# frozen_string_literal: false
+require 'temple'
+require 'haml/engine'
+require 'haml/helpers'
 
 module Haml
-  class TempleEngine
-    def precompiled_method_return_value_with_haml_xss
-      "::Haml::Util.html_safe(#{precompiled_method_return_value_without_haml_xss})"
-    end
-    alias_method :precompiled_method_return_value_without_haml_xss, :precompiled_method_return_value
-    alias_method :precompiled_method_return_value, :precompiled_method_return_value_with_haml_xss
-  end
-
-  module Helpers
-    include Haml::Helpers::XssMods
-  end
+  Template = Temple::Templates::Tilt.create(
+    Haml::Engine,
+    register_as: [:haml, :haml],
+  )
 
-  module Util
-    undef :rails_xss_safe? if defined? rails_xss_safe?
-    def rails_xss_safe?; true; end
+  module TemplateExtension
+    # Activate Haml::Helpers for tilt templates.
+    # https://github.com/judofyr/temple/blob/v0.7.6/lib/temple/mixins/template.rb#L7-L11
+    def compile(*)
+      "extend Haml::Helpers; #{super}"
+    end
   end
-
+  Template.send(:extend, TemplateExtension)
 end
-
-
-Haml::Template.options[:escape_html] = true
-
-require 'haml/plugin'

data/lib/haml/temple_line_counter.rb

@@ -21,6 +21,8 @@ module Haml
         end.reduce(:+)
       when :escape
         count_lines(args[1])
+      when :newline
+        1
       else
         raise UnexpectedExpression.new("[HAML BUG] Unexpected Temple expression '#{type}' is given!")
       end

data/lib/haml/util.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 
 begin
   require 'erubis/tiny'
@@ -14,6 +14,22 @@ module Haml
   module Util
     extend self
 
+    # Java extension is not implemented for JRuby yet.
+    # TruffleRuby does not implement `rb_ary_sort_bang`, etc.
+    if /java/ === RUBY_PLATFORM || RUBY_ENGINE == 'truffleruby'
+      require 'cgi/escape'
+
+      def self.escape_html(html)
+        CGI.escapeHTML(html.to_s)
+      end
+    else
+      require 'haml/haml' # Haml::Util.escape_html
+    end
+
+    def self.escape_html_safe(html)
+      html.html_safe? ? html : escape_html(html)
+    end
+
     # Silence all output to STDERR within a block.
     #
     # @yield A block in which no output will be printed to STDERR
@@ -35,20 +51,6 @@ module Haml
       false
     end
 
-    # Returns the given text, marked as being HTML-safe.
-    # With older versions of the Rails XSS-safety mechanism,
-    # this destructively modifies the HTML-safety of `text`.
-    #
-    # It only works if you are using ActiveSupport or the parameter `text`
-    # implements the #html_safe method.
-    #
-    # @param text [String, nil]
-    # @return [String, nil] `text`, marked as HTML-safe
-    def html_safe(text)
-      return unless text
-      text.html_safe
-    end
-
     # Checks that the encoding of a string is valid
     # and cleans up potential encoding gotchas like the UTF-8 BOM.
     # If it's not, yields an error string describing the invalid character
@@ -166,7 +168,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)
@@ -199,7 +201,7 @@ MSG
     end
 
     def unescape_interpolation(str, escape_html = nil)
-      res = ''
+      res = ''.dup
       rest = Haml::Util.handle_interpolation str.dump do |scan|
         escapes = (scan[2].size - 1) / 2
         char = scan[3] # '{', '@' or '$'
@@ -212,9 +214,9 @@ MSG
           else
             scan.scan(/\w+/)
           end
-          content = eval('"' + interpolated + '"')
-          content.prepend(char) if char == '@' || char == '$'
-          content = "Haml::Helpers.html_escape((#{content}))" if escape_html
+          content = eval("\"#{interpolated}\"")
+          content = "#{char}#{content}" if char == '@' || char == '$'
+          content = "CGI.escapeHTML((#{content}).to_s)" if escape_html
 
           res << "\#{#{content}}"
         end
@@ -234,7 +236,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/haml/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Haml
-  VERSION = "5.0.4"
+  VERSION = '6.0.0'
 end

data/lib/haml.rb

@@ -1,24 +1,13 @@
 # frozen_string_literal: true
+require 'haml/engine'
+require 'haml/error'
 require 'haml/version'
+require 'haml/template'
 
-# The module that contains everything Haml-related:
-#
-# * {Haml::Parser} is Haml's parser.
-# * {Haml::Compiler} is Haml's compiler.
-# * {Haml::Engine} is the class used to render Haml within Ruby code.
-# * {Haml::Options} is where Haml's runtime options are defined.
-# * {Haml::Error} is raised when Haml encounters an error.
-#
-# Also see the {file:REFERENCE.md full Haml reference}.
-module Haml
-
-  def self.init_rails(*args)
-    # Maintain this as a no-op for any libraries that may be depending on the
-    # previous definition here.
+if File.basename($0) != 'haml'
+  begin
+    require 'rails'
+    require 'haml/railtie'
+  rescue LoadError
   end
-
 end
-
-require 'haml/util'
-require 'haml/engine'
-require 'haml/railtie' if defined?(Rails::Railtie)

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: haml
 version: !ruby/object:Gem::Version
-  version: 5.0.4
+  version: 6.0.0
 platform: ruby
 authors:
 - Natalie Weizenbaum
 - Hampton Catlin
 - Norman Clarke
 - Akira Matsuda
-autorequire: 
-bindir: bin
+- Takashi Kokubun
+autorequire:
+bindir: exe
 cert_chain: []
-date: 2017-10-13 00:00:00.000000000 Z
+date: 2022-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
@@ -19,14 +20,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.2
   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
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -42,21 +57,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: benchmark_driver
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rbench
+  name: coffee-script
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -70,7 +99,63 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: erubi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5'
+- !ruby/object:Gem::Dependency
+  name: less
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -84,7 +169,77 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sass
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: slim
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: string_template
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: unindent
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -97,24 +252,19 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: |
-  Haml (HTML Abstraction Markup Language) is a layer on top of HTML or XML that's
-  designed to express the structure of documents in a non-repetitive, elegant, and
-  easy way by using indentation rather than closing tags and allowing Ruby to be
-  embedded with ease. It was originally envisioned as a plugin for Ruby on Rails,
-  but it can function as a stand-alone templating engine.
+description: An elegant, structured (X)HTML/XML templating engine.
 email:
 - haml@googlegroups.com
-- norman@njclarke.com
+- ronnie@dio.jp
 executables:
 - haml
-extensions: []
+extensions:
+- ext/haml/extconf.rb
 extra_rdoc_files: []
 files:
+- ".github/FUNDING.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
-- ".gitmodules"
-- ".travis.yml"
-- ".yardopts"
 - CHANGELOG.md
 - FAQ.md
 - Gemfile
@@ -122,49 +272,72 @@ files:
 - README.md
 - REFERENCE.md
 - Rakefile
-- TODO
-- benchmark.rb
-- bin/haml
+- bin/bench
+- bin/console
+- bin/ruby
+- bin/setup
+- bin/stackprof
+- bin/test
+- exe/haml
+- ext/haml/extconf.rb
+- ext/haml/haml.c
+- ext/haml/hescape.c
+- ext/haml/hescape.h
 - haml.gemspec
 - lib/haml.rb
-- lib/haml/.gitattributes
+- lib/haml/ambles.rb
 - lib/haml/attribute_builder.rb
 - lib/haml/attribute_compiler.rb
 - lib/haml/attribute_parser.rb
-- lib/haml/buffer.rb
+- lib/haml/cli.rb
 - lib/haml/compiler.rb
+- lib/haml/compiler/children_compiler.rb
+- lib/haml/compiler/comment_compiler.rb
+- lib/haml/compiler/doctype_compiler.rb
+- lib/haml/compiler/script_compiler.rb
+- lib/haml/compiler/silent_script_compiler.rb
+- lib/haml/compiler/tag_compiler.rb
+- lib/haml/dynamic_merger.rb
 - lib/haml/engine.rb
 - lib/haml/error.rb
 - lib/haml/escapable.rb
-- lib/haml/exec.rb
 - lib/haml/filters.rb
-- lib/haml/generator.rb
+- lib/haml/filters/base.rb
+- lib/haml/filters/cdata.rb
+- lib/haml/filters/coffee.rb
+- lib/haml/filters/css.rb
+- lib/haml/filters/erb.rb
+- lib/haml/filters/escaped.rb
+- lib/haml/filters/javascript.rb
+- lib/haml/filters/less.rb
+- lib/haml/filters/markdown.rb
+- lib/haml/filters/plain.rb
+- lib/haml/filters/preserve.rb
+- lib/haml/filters/ruby.rb
+- lib/haml/filters/sass.rb
+- lib/haml/filters/scss.rb
+- lib/haml/filters/text_base.rb
+- lib/haml/filters/tilt_base.rb
+- lib/haml/force_escapable.rb
 - lib/haml/helpers.rb
-- lib/haml/helpers/action_view_extensions.rb
-- lib/haml/helpers/action_view_mods.rb
-- lib/haml/helpers/action_view_xss_mods.rb
-- lib/haml/helpers/safe_erubi_template.rb
-- lib/haml/helpers/safe_erubis_template.rb
-- lib/haml/helpers/xss_mods.rb
-- lib/haml/options.rb
+- lib/haml/html.rb
+- lib/haml/identity.rb
+- lib/haml/object_ref.rb
 - lib/haml/parser.rb
-- lib/haml/plugin.rb
+- lib/haml/rails_helpers.rb
+- lib/haml/rails_template.rb
 - lib/haml/railtie.rb
-- lib/haml/sass_rails_filter.rb
+- lib/haml/ruby_expression.rb
+- lib/haml/string_splitter.rb
 - lib/haml/template.rb
-- lib/haml/template/options.rb
-- lib/haml/temple_engine.rb
 - lib/haml/temple_line_counter.rb
 - lib/haml/util.rb
 - lib/haml/version.rb
-- yard/default/.gitignore
-- yard/default/fulldoc/html/css/common.sass
-- yard/default/layout/html/footer.erb
-homepage: http://haml.info/
+homepage: https://haml.info
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -172,16 +345,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: An elegant, structured (X)HTML/XML templating engine.
 test_files: []

data/.gitmodules

@@ -1,3 +0,0 @@
-[submodule "test/haml-spec"]
-	path = test/haml-spec
-	url = git://github.com/haml/haml-spec.git