haml 5.2.2 → 6.0.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec6cbb2e4023f397f1d7b6d84f06d78ab492a61e88c3f16496f39d0baeb47a83
-  data.tar.gz: 004c2dd34697cb61a8c12854bf4b99abb3cab5195f28922b813ee299225e7663
+  metadata.gz: 6bda3cad64d59ca87a154986af35ca0e8f4aad63ccb20dcfc6baef0d4d1c5484
+  data.tar.gz: 025dca6d373cc07efe22112720722b4b419cb64b7588db502ee96d3597798edb
 SHA512:
-  metadata.gz: a7430b4e42cf809f847448a9e04623b4b58878e44facedef5e43714820e8068f0bb853772564d5545936cdad8346f0c33abfc11642a3737d91c9a1f6242b3e41
-  data.tar.gz: 8a91df0cb185014512ee473a21755ba41edb06e835b29740e8e46c76287a81405b2706d8a10ea148893a9429de306c67584ac1c286637c0812a5562cf149431b
+  metadata.gz: e526126720ad094d1a15281c028c8c8e002a3bcc1929f40d92caeebe25dccd1e8dc99471e7f52f95290241b65e4a83266c6e7fe58771891095e897408eef9b80
+  data.tar.gz: '078dfbdbd0c4f3904d303a376f2c460f4e35ba33b0e87bb33d449246e925e4d7e42248b32bd1060586d527130629d41e682ee426b2fb9a2539a6adca3ecde09c'

data/.github/FUNDING.yml

@@ -0,0 +1 @@
+github: haml

data/.github/workflows/test.yml

@@ -8,15 +8,21 @@ on:
       - opened
       - synchronize
       - reopened
+  schedule:
+    - cron: "00 15 * * *"
 jobs:
   test:
-    name: 'Ruby: ${{ matrix.ruby }}, Rails: ${{ matrix.rails }}'
     runs-on: ubuntu-latest
     strategy:
-      fail-fast: false
       matrix:
-        ruby: [2.6, 2.7, 3.0, jruby-9.2]
-        rails: [5.2.x, 6.0.x, 6.1.x, rails-edge]
+        ruby:
+          - '2.5'
+          - '2.6'
+          - '2.7'
+          - '3.0'
+          - '3.1'
+          - jruby
+          - truffleruby-head
     steps:
       - uses: actions/checkout@v2
       - name: Set up Ruby
@@ -28,9 +34,7 @@ jobs:
           path: vendor/bundle
           key: ${{ runner.os }}-${{ matrix.ruby }}-gems-${{ hashFiles('**/Gemfile.lock') }}
           restore-keys: ${{ runner.os }}-gems-
-      - name: bundle install --gemfile=test/gemfiles/Gemfile.rails-${{matrix.rails}}.x
+      - run: sudo apt-get update && sudo apt-get install -y nodejs libxslt-dev # nodejs for execjs, libxslt for TruffleRuby nokogiri
+      - name: bundle install
         run: bundle config path vendor/bundle && bundle install -j$(nproc) --retry 3
-      - name: rake test
-        run: bundle exec rake test submodules
-        env:
-          RUBYOPT: "--enable-frozen-string-literal"
+      - run: bundle exec rake test

data/.gitignore

@@ -1,19 +1,19 @@
-/.idea
+/.bundle/
 /.yardoc
-/coverage
-/doc
-/log
-/pkg
-/test/rails
-/test/gemfiles/*.lock
-/.haml
-/site
-*.rbc
+/Gemfile.lock
+/_yardoc/
+/.idea
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/
+/haml/
 .sass-cache
-.rbenv-version
-.rbx
 .ruby-version
-.rvmrc
-Gemfile.lock
-tmp
-.bundle/
+*.bundle
+*.so
+*.su
+*.a
+*.o
+*.swp

data/CHANGELOG.md

@@ -1,12 +1,22 @@
 # Haml Changelog
 
+## 6.0.0
+
+Not released yet
+([diff](https://github.com/haml/haml/compare/v5.2.2...main)).
+
+* Replace the implementation with Hamlit
+  * Haml 6 is about 1.7x faster than Haml 5 in [this benchmark](benchmark/slim/run-benchmarks.rb).
+  * The parser is kept as is, but everything else is replaced.
+  * All Haml helpers except for `preserve` are removed.
+  * Some legacy Rails integration is removed.
+
 ## 5.2.2
+
 Released on July 27, 2021
 ([diff](https://github.com/haml/haml/compare/v5.2.1...v5.2.2)).
 
-* Support for adding Annotations to Haml output (a Rails feature 6.1+)
-* Expanded test matrix to include Ruby 3.0 and Rails 6.1
-* Only testing Ruby 2.7+ and Rails 5.2+
+* Support `config.action_view.annotate_rendered_view_with_filenames = true` of Rails 6.1
 
 ## 5.2.1
 

data/Gemfile

@@ -1,16 +1,23 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
+
+git_source(:github) do |repo_name|
+  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
+  "https://github.com/#{repo_name}.git"
+end
+
+# Specify your gem's dependencies in haml.gemspec
 gemspec
 
-gem "m"
-gem "pry"
-gem "simplecov"
+gem 'benchmark-ips', '2.3.0'
+gem 'maxitest'
+gem 'pry'
 
-group :docs do
-  gem "yard"
-  gem "kramdown"
-  gem "sass"
-end
+if /java/ === RUBY_PLATFORM # JRuby
+  gem 'pandoc-ruby'
+else
+  gem 'redcarpet'
 
-platform :mri do
-  gem "ruby-prof"
+  if RUBY_PLATFORM !~ /mswin|mingw/ && RUBY_ENGINE != 'truffleruby'
+    gem 'stackprof'
+  end
 end

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2006-2019 Hampton Catlin and Natalie Weizenbaum
+Copyright (c) 2006-2021 Hampton Catlin, Natalie Weizenbaum and Takashi Kokubun
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -10,13 +10,6 @@ more pleasant to write HTML documents, by eliminating redundancy, reflecting the
 underlying structure that the document represents, and providing an elegant syntax
 that's both powerful and easy to understand.
 
-### Supported Versions
-
-* Ruby 2.6+
-* Rails 5.1+
-
-Other versions may likely work, but we don't test against them.
-
 ## Basic Usage
 
 Haml can be used from the command line or as part of a Ruby web framework. The
@@ -169,34 +162,35 @@ on a specific area:
 ruby -Itest test/helper_test.rb -n test_buffer_access
 ~~~
 
-Haml currently supports Ruby 2.7.0 and higher, so please make sure your changes run on 2.7+.
+Haml currently supports Ruby 2.0.0 and higher, so please make sure your changes run on 2.0+.
 
 ## Team
 
 ### Current Maintainers
 
-* [Hampton Catlin](https://github.com/hcatlin)
-* [Takashi Kokubun](https://github.com/k0kubun)
 * [Akira Matsuda](https://github.com/amatsuda)
+* [Matt Wildig](https://github.com/mattwildig)
+* [Tee Parham](https://github.com/teeparham)
+* [Takashi Kokubun](https://github.com/k0kubun)
 
 ### Alumni
 
 Haml was created by [Hampton Catlin](http://hamptoncatlin.com), the author of
-the original implementation.
+the original implementation. Hampton is no longer involved in day-to-day coding,
+but still consults on language issues.
 
-[Natalie Weizenbaum](https://github.com/nex3) was for many years the primary developer
+[Natalie Weizenbaum](http://nex-3.com) was for many years the primary developer
 and architect of the "modern" Ruby implementation of Haml.
 
-This project's been around for many years, and we have many amazing people who kept the project 
-alive! as former maintainers like:
-
-[Norman Clarke](http://github.com/norman)
-[Matt Wildig](https://github.com/mattwildig)
-[Tee Parham](https://github.com/teeparham)
+[Norman Clarke](http://github.com/norman) was the primary maintainer of Haml from 2012 to 2016.
 
 ## License
 
-Copyright (c) 2006-2021 Hampton Catlin, Natalie Weizenbaum and the Haml team
+Some of Natalie's work on Haml was supported by Unspace Interactive.
+
+Beyond that, the implementation is licensed under the MIT License.
+
+Copyright (c) 2006-2019 Hampton Catlin, Natalie Weizenbaum and the Haml team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

data/Rakefile

@@ -1,115 +1,117 @@
-require "rake/clean"
-require "rake/testtask"
-require "bundler/gem_tasks"
+require 'bundler/setup'
+require 'bundler/gem_tasks'
+
+#
+# Prepend DevKit into compilation phase
+#
+if Gem.win_platform?
+  desc 'Activates DevKit'
+  task :devkit do
+    begin
+      require 'devkit'
+    rescue LoadError
+      abort 'Failed to load DevKit required for compilation'
+    end
+  end
+  task compile: :devkit
+end
 
-task :default => :test
+require 'rake/testtask'
+if /java/ === RUBY_PLATFORM
+  # require 'rake/javaextensiontask'
+  # Rake::JavaExtensionTask.new(:haml) do |ext|
+  #   ext.ext_dir = 'ext/java'
+  #   ext.lib_dir = 'lib/haml'
+  # end
 
-# FIXME: Redefining :test task to run test/options_test.rb in isolated process since it depends on whether Rails is loaded or not.
-# Remove this task when we finished changing escape_html option to be true by default.
-isolated_test = Rake::TestTask.new do |t|
-  t.libs << 'test'
-  t.test_files = %w[test/options_test.rb]
-  t.warning = true
-  t.verbose = true
-end
-Rake::TestTask.new do |t|
-  t.libs << 'test'
-  t.test_files = Dir['test/*_test.rb'] + Dir['test/haml-spec/*_test.rb'] + Dir['test/cases/*_test.rb'] - isolated_test.file_list
-  t.warning = true
-  t.verbose = true
+  task :compile do
+    # dummy for now
+  end
+else
+  require 'rake/extensiontask'
+  Rake::ExtensionTask.new(:haml) do |ext|
+    ext.lib_dir = 'lib/haml'
+  end
 end
 
-CLEAN.replace %w(pkg doc coverage .yardoc test/haml vendor)
+Dir['benchmark/*.rake'].each { |b| import(b) }
 
-desc "Benchmark Haml against ERB. TIMES=n sets the number of runs, default is 1000."
-task :benchmark do
-  sh "ruby benchmark.rb #{ENV['TIMES']}"
+namespace :haml do
+  Rake::TestTask.new do |t|
+    t.libs << 'lib' << 'test'
+    files = Dir['test/haml/*_test.rb']
+    files << 'test/haml/haml-spec/*_test.rb'
+    t.ruby_opts = %w[-rtest_helper]
+    t.test_files = files
+    t.verbose = true
+  end
 end
 
-task :submodules do
-  if File.exist?(File.dirname(__FILE__) + "/.git")
-    sh %{git submodule sync}
-    sh %{git submodule update --init --recursive}
+namespace :hamlit do
+  Rake::TestTask.new do |t|
+    t.libs << 'lib' << 'test'
+    t.ruby_opts = %w[-rtest_helper]
+    t.test_files = Dir['test/hamlit/**/*_test.rb']
+    t.verbose = true
   end
 end
 
-namespace :doc do
-  task :sass do
-    require 'sass'
-    Dir["yard/default/**/*.sass"].each do |sass|
-      File.open(sass.gsub(/sass$/, 'css'), 'w') do |f|
-        f.write(Sass::Engine.new(File.read(sass)).render)
-      end
-    end
+namespace :test do
+  Rake::TestTask.new(:all) do |t|
+    t.libs << 'lib' << 'test'
+    files = Dir['test/hamlit/**/*_test.rb']
+    files += Dir['test/haml/*_test.rb']
+    files << 'test/haml/haml-spec/*_test.rb'
+    t.ruby_opts = %w[-rtest_helper]
+    t.test_files = files
+    t.verbose = true
   end
 
-  desc "List all undocumented methods and classes."
-  task :undocumented do
-    command = 'yard --list --query '
-    command << '"object.docstring.blank? && '
-    command << '!(object.type == :method && object.is_alias?)"'
-    sh command
+  Rake::TestTask.new(:spec) do |t|
+    t.libs << 'lib' << 'test'
+    t.ruby_opts = %w[-rtest_helper]
+    t.test_files = %w[test/haml/haml-spec/ugly_test.rb test/haml/haml-spec/pretty_test.rb]
+    t.verbose = true
   end
-end
-
-desc "Generate documentation"
-task(:doc => 'doc:sass') {sh "yard"}
-
-desc "Generate documentation incrementally"
-task(:redoc) {sh "yard -c"}
-
-desc <<END
-Profile Haml.
-  TIMES=n sets the number of runs. Defaults to 1000.
-  FILE=str sets the file to profile. Defaults to 'standard'
-  OUTPUT=str sets the ruby-prof output format.
-    Can be Flat, CallInfo, or Graph. Defaults to Flat. Defaults to Flat.
-END
-task :profile do
-  times  = (ENV['TIMES'] || '1000').to_i
-  file   = ENV['FILE'] || 'test/templates/standard.haml'
 
-  require 'bundler/setup'
-  require 'ruby-prof'
-  require 'haml'
-  file = File.read(File.expand_path("../#{file}", __FILE__))
-  obj = Object.new
-  Haml::Engine.new(file).def_method(obj, :render)
-  result = RubyProf.profile { times.times { obj.render } }
-
-  RubyProf.const_get("#{(ENV['OUTPUT'] || 'Flat').capitalize}Printer").new(result).print
-end
-
-def gemfiles
-  @gemfiles ||= Dir[File.dirname(__FILE__) + '/test/gemfiles/Gemfile.*'].reject {|f| f =~ /\.lock$/}
-end
+  Rake::TestTask.new(:engine) do |t|
+    t.libs << 'lib' << 'test'
+    t.ruby_opts = %w[-rtest_helper]
+    t.test_files = %w[test/haml/engine_test.rb]
+    t.verbose = true
+  end
 
-def with_each_gemfile
-  gemfiles.each do |gemfile|
-    Bundler.with_clean_env do
-      puts "Using gemfile: #{gemfile}"
-      ENV['BUNDLE_GEMFILE'] = gemfile
-      yield
-    end
+  Rake::TestTask.new(:filters) do |t|
+    t.libs << 'lib' << 'test'
+    t.ruby_opts = %w[-rtest_helper]
+    t.test_files = %w[test/haml/filters_test.rb]
+    t.verbose = true
   end
-end
 
-namespace :test do
-  namespace :bundles do
-    desc "Install all dependencies necessary to test Haml."
-    task :install do
-      with_each_gemfile {sh "bundle"}
-    end
+  Rake::TestTask.new(:helper) do |t|
+    t.libs << 'lib' << 'test'
+    t.ruby_opts = %w[-rtest_helper]
+    t.test_files = %w[test/haml/helper_test.rb]
+    t.verbose = true
+  end
 
-    desc "Update all dependencies for testing Haml."
-    task :update do
-      with_each_gemfile {sh "bundle update"}
-    end
+  Rake::TestTask.new(:template) do |t|
+    t.libs << 'lib' << 'test'
+    t.ruby_opts = %w[-rtest_helper]
+    t.test_files = %w[test/haml/template_test.rb]
+    t.verbose = true
   end
+end
 
-  desc "Test all supported versions of rails. This takes a while."
-  task :rails_compatibility => 'test:bundles:install' do
-    with_each_gemfile {sh "bundle exec rake test"}
+desc 'bench task for CI'
+task bench: :compile do
+  if ENV['SLIM_BENCH'] == '1'
+    cmd = %w[bundle exec ruby benchmark/slim/run-benchmarks.rb]
+  else
+    cmd = ['bin/bench', 'bench', ('-c' if ENV['COMPILE'] == '1'), *ENV['TEMPLATE'].split(',')].compact
   end
-  task :rc => :rails_compatibility
+  exit system(*cmd)
 end
+
+task default: %w[compile hamlit:test]
+task test: %w[compile test:all]

data/bin/bench

@@ -0,0 +1,66 @@
+#!/usr/bin/env ruby
+
+require 'bundler/setup'
+require 'haml'
+require 'thor'
+require 'benchmark/ips'
+require_relative '../benchmark/utils/benchmark_ips_extension'
+
+class Bench < Thor
+  class_option :show_template, type: :boolean, aliases: ['-t']
+
+  desc 'bench HAML', 'Benchmark haml template'
+  option :compile, type: :boolean, aliases: ['-c']
+  option :show_code, type: :boolean, aliases: ['-s']
+  def bench(*files)
+    files.each { |file| render(file) }
+    files.each { |file| compile(file) if options[:compile] }
+    files.each { |file| code(file) if options[:show_code] }
+  end
+
+  desc 'compile HAML', 'Benchmark compilation'
+  def compile(file)
+    puts "#{?= * 49}\n Compilation: #{file}\n#{?= * 49}"
+    haml = File.read(file)
+
+    Benchmark.ips do |x|
+      x.report("haml v#{Haml::VERSION}") { Haml::Engine.new.call(haml) }
+      x.compare!
+    end
+  end
+
+  desc 'render HAML', 'Benchmark rendering'
+  def render(file)
+    puts "#{?= * 49}\n Rendering: #{file}\n#{?= * 49}"
+    haml = File.read(file)
+    puts haml + "\n" if options[:show_template]
+    object = Object.new
+    ruby_file = file.gsub(/\.haml\z/, '.rb')
+    if File.exist?(ruby_file)
+      object.instance_eval(File.read(ruby_file))
+    end
+
+    object.instance_eval "def haml; #{Haml::Engine.new.call(haml)}; end"
+
+    Benchmark.ips do |x|
+      x.report("haml v#{Haml::VERSION}") { object.haml }
+      x.compare!
+    end
+  end
+
+  desc 'code HAML', 'Show compiled code'
+  def code(file)
+    haml = File.read(file)
+    puts "\n#{?= * 49}\n Haml Source: #{file}\n#{?= * 49}"
+    puts Haml::Engine.new.call(haml)
+  end
+
+  private
+
+  def method_missing(*args)
+    return super if args.length > 1
+    render(args.first.to_s)
+  end
+end
+
+Bench.start

data/bin/console

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+
+require 'bundler/setup'
+require 'hamlit'
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+require 'pry'
+Pry.start

data/bin/ruby

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+bundle exec ruby -Ilib:test -rtest_helper $@

data/bin/setup

@@ -0,0 +1,7 @@
+#!/bin/bash
+set -euo pipefail
+IFS=$'\n\t'
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/bin/stackprof

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+
+require 'bundler/setup'
+require 'hamlit'
+require 'stackprof'
+
+def open_flamegraph(report)
+  temp = `mktemp /tmp/stackflame-XXXXXXXX`.strip
+  data_path = "#{temp}.js"
+  system("mv #{temp} #{data_path}")
+
+  File.open(data_path, 'w') do |f|
+    report.print_flamegraph(f)
+  end
+
+  viewer_path = File.join(`bundle show stackprof`.strip, 'lib/stackprof/flamegraph/viewer.html')
+  url = "file://#{viewer_path}?data=#{data_path}"
+  system(%Q[osascript -e 'open location "#{url}"'])
+end
+
+haml = File.read(ARGV.first)
+StackProf.start(mode: :wall, interval: 1, raw: false)
+Hamlit::Engine.new.call(haml)
+StackProf.stop
+
+report = StackProf::Report.new(StackProf.results)
+report.print_text(false)

data/bin/test

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+VERSIONS=(
+  2.1.10
+  2.2.5
+  2.3.1
+)
+
+set -e
+trap 'echo "${VERSIONS[2]}" > .ruby-version' 0
+
+function test_with() {
+  version=$1
+  rbenv local $version
+  if ! bundle check > /dev/null; then
+    bundle install
+  fi
+  ruby -v
+  bundle exec rake test
+}
+
+for version in ${VERSIONS[@]}; do
+  test_with $version
+done

data/exe/haml

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+$:.unshift File.expand_path('../lib', __dir__)
+require 'haml/cli'
+
+Haml::CLI.start(ARGV)

data/ext/haml/extconf.rb

@@ -0,0 +1,10 @@
+require 'mkmf'
+
+$CFLAGS << ' -Wall -Wextra'
+
+$srcs = %w[
+  haml.c
+  hescape.c
+]
+
+create_makefile('haml/haml')