haml 5.2.1 → 6.0.0.beta.2

data/lib/haml/util.rb

@@ -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
@@ -214,7 +216,7 @@ MSG
           end
           content = eval("\"#{interpolated}\"")
           content = "#{char}#{content}" if char == '@' || char == '$'
-          content = "Haml::Helpers.html_escape((#{content}))" if escape_html
+          content = "CGI.escapeHTML((#{content}).to_s)" if escape_html
 
           res << "\#{#{content}}"
         end

data/lib/haml/version.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-
 module Haml
-  VERSION = "5.2.1"
+  VERSION = '6.0.0.beta.2'
 end

data/lib/haml.rb

@@ -1,25 +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.2.1
+  version: 6.0.0.beta.2
 platform: ruby
 authors:
 - Natalie Weizenbaum
 - Hampton Catlin
 - Norman Clarke
 - Akira Matsuda
-autorequire:
-bindir: bin
+- Takashi Kokubun
+autorequire: 
+bindir: exe
 cert_chain: []
-date: 2020-11-30 00:00:00.000000000 Z
+date: 2022-08-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,21 @@ 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: 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: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -70,7 +85,77 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: coffee-script
+  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: 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,63 @@ 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:
     - - ">="
@@ -98,7 +239,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: unindent
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -111,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
 - 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
@@ -136,55 +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:
-  bug_tracker_uri: https://github.com/haml/haml/issues
-  changelog_uri: https://github.com/haml/haml/blob/main/CHANGELOG.md
-  documentation_uri: http://haml.info/docs.html
-  homepage_uri: http://haml.info
-  mailing_list_uri: https://groups.google.com/forum/?fromgroups#!forum/haml
-  source_code_uri: https://github.com/haml/haml
-post_install_message:
+metadata: {}
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -192,15 +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'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.4
-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

data/.travis.yml

@@ -1,111 +0,0 @@
-sudo: false
-dist: trusty
-language: ruby
-cache:
-  bundler: true
-rvm:
-  - ruby-head
-  - 2.7
-  - 2.6
-  - 2.5
-  - jruby-9.2
-env:
-  - RUBYOPT="--enable-frozen-string-literal"
-  - RUBYOPT=""
-gemfile:
-  - test/gemfiles/Gemfile.rails-6.0.x
-  - test/gemfiles/Gemfile.rails-5.2.x
-  - test/gemfiles/Gemfile.rails-5.1.x
-  - test/gemfiles/Gemfile.rails-5.0.x
-  - test/gemfiles/Gemfile.rails-5.0.x.erubi
-  - test/gemfiles/Gemfile.rails-4.2.x
-  - test/gemfiles/Gemfile.rails-4.1.x
-  - test/gemfiles/Gemfile.rails-4.0.x
-matrix:
-  exclude:
-    - rvm: 2.5
-      gemfile: test/gemfiles/Gemfile.rails-4.0.x
-    - rvm: 2.5
-      gemfile: test/gemfiles/Gemfile.rails-4.1.x
-    - rvm: 2.5
-      gemfile: test/gemfiles/Gemfile.rails-4.2.x
-    - rvm: 2.5
-      gemfile: test/gemfiles/Gemfile.rails-5.0.x
-      env: RUBYOPT="--enable-frozen-string-literal"
-    - rvm: 2.5
-      gemfile: test/gemfiles/Gemfile.rails-5.0.x.erubi
-      env: RUBYOPT="--enable-frozen-string-literal"
-    - rvm: 2.5
-      gemfile: test/gemfiles/Gemfile.rails-5.1.x
-      env: RUBYOPT="--enable-frozen-string-literal"
-    - rvm: 2.6
-      gemfile: test/gemfiles/Gemfile.rails-4.0.x
-    - rvm: 2.6
-      gemfile: test/gemfiles/Gemfile.rails-4.1.x
-    - rvm: 2.6
-      gemfile: test/gemfiles/Gemfile.rails-4.2.x
-    - rvm: 2.6
-      gemfile: test/gemfiles/Gemfile.rails-5.0.x
-      env: RUBYOPT="--enable-frozen-string-literal"
-    - rvm: 2.6
-      gemfile: test/gemfiles/Gemfile.rails-5.0.x.erubi
-      env: RUBYOPT="--enable-frozen-string-literal"
-    - rvm: 2.6
-      gemfile: test/gemfiles/Gemfile.rails-5.1.x
-      env: RUBYOPT="--enable-frozen-string-literal"
-    - rvm: 2.7
-      gemfile: test/gemfiles/Gemfile.rails-4.0.x
-    - rvm: 2.7
-      gemfile: test/gemfiles/Gemfile.rails-4.1.x
-    - rvm: 2.7
-      gemfile: test/gemfiles/Gemfile.rails-4.2.x
-    - rvm: 2.7
-      gemfile: test/gemfiles/Gemfile.rails-5.0.x
-      env: RUBYOPT="--enable-frozen-string-literal"
-    - rvm: 2.7
-      gemfile: test/gemfiles/Gemfile.rails-5.0.x.erubi
-      env: RUBYOPT="--enable-frozen-string-literal"
-    - rvm: 2.7
-      gemfile: test/gemfiles/Gemfile.rails-5.1.x
-      env: RUBYOPT="--enable-frozen-string-literal"
-    - rvm: ruby-head
-      gemfile: test/gemfiles/Gemfile.rails-4.0.x
-    - rvm: ruby-head
-      gemfile: test/gemfiles/Gemfile.rails-4.1.x
-    - rvm: ruby-head
-      gemfile: test/gemfiles/Gemfile.rails-4.2.x
-    - rvm: jruby-9.2
-      gemfile: test/gemfiles/Gemfile.rails-5.0.x
-      env: RUBYOPT="--enable-frozen-string-literal"
-    - rvm: jruby-9.2
-      gemfile: test/gemfiles/Gemfile.rails-5.0.x.erubi
-      env: RUBYOPT="--enable-frozen-string-literal"
-    - rvm: jruby-9.2
-      gemfile: test/gemfiles/Gemfile.rails-5.1.x
-      env: RUBYOPT="--enable-frozen-string-literal"
-  include:
-    - rvm: 2.7
-      gemfile: test/gemfiles/Gemfile.rails-edge
-  allow_failures:
-    - rvm: ruby-head
-    - gemfile: test/gemfiles/Gemfile.rails-edge
-    - rvm: jruby-9.2
-      gemfile: test/gemfiles/Gemfile.rails-4.2.x
-    - rvm: jruby-9.2
-      gemfile: test/gemfiles/Gemfile.rails-4.1.x
-    - rvm: jruby-9.2
-      gemfile: test/gemfiles/Gemfile.rails-4.0.x
-    - rvm: jruby-9.2
-      gemfile: test/gemfiles/Gemfile.rails-5.0.x.erubi
-  fast_finish: true
-before_install:
-  # install older versions of rubygems and bundler only on Ruby < 2.7
-  - if [ `echo "${TRAVIS_RUBY_VERSION:0:3} < 2.7" | bc` == 1 ]; then gem i rubygems-update -v '<3' && update_rubygems; fi; # https://github.com/travis-ci/travis-ci/issues/8974
-  - if [ `echo "${TRAVIS_RUBY_VERSION:0:3} < 2.7" | bc` == 1 ]; then gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true; fi;
-  - if [ `echo "${TRAVIS_RUBY_VERSION:0:3} < 2.7" | bc` == 1 ]; then gem i bundler -v '<2'; fi;
-  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-  - chmod +x ./cc-test-reporter
-  - ./cc-test-reporter before-build
-script: "bundle exec rake submodules test"
-after_script:
-  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT

data/.yardopts

@@ -1,22 +0,0 @@
---charset          utf-8
---readme           README.md
---markup           markdown
---markup-provider  kramdown
---template-path    yard
---default-return   ""
---title            "Haml Documentation"
---query            'object.type != :classvariable'
---query            'object.type != :constant || @api && @api.text == "public"'
---exclude          lib/haml/plugin.rb
---exclude          lib/haml/railtie.rb
---exclude          lib/haml/helpers/action_view_mods.rb
---exclude          lib/haml/helpers/xss_mods.rb
---hide-void-return
---protected
---no-private
---no-highlight
--
-FAQ.md
-CHANGELOG.md
-REFERENCE.md
-MIT-LICENSE

data/TODO

@@ -1,24 +0,0 @@
-# -*- mode: org -*-
-#+STARTUP: nofold
-
-* Documentation
-  Redo tutorial?
-  Using helpers
-    haml_concat and haml_tag in particular
-  Syntax highlighting?
-
-* Code
-  Keep track of error offsets everywhere
-    Use this to show error location in messages
-** Haml
-   Support finer-grained HTML-escaping in filters
-   Speed
-     Make tags with dynamic attributes pre-render as much as possible
-     Including the attribute name where doable
-   :html improvements
-     Ignore closing tags where we can
-       http://code.google.com/speed/articles/optimizing-html.html
-       Requires Haml parsing refactor
-     Don't quote attributes that don't require it
-       http://www.w3.org/TR/REC-html40/intro/sgmltut.html#h-3.2.2
-       http://www.w3.org/TR/html5/syntax.html#attributes