RubyGems - haml - Versions diffs - 4.0.7 → 5.2.2 - Mend

haml 4.0.7 → 5.2.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (124) hide show

checksums.yaml +5 -5
data/.github/workflows/test.yml +36 -0
data/.gitignore +19 -0
data/.gitmodules +3 -0
data/.yardopts +2 -3
data/CHANGELOG.md +146 -4
data/FAQ.md +4 -14
data/Gemfile +16 -0
data/MIT-LICENSE +2 -2
data/README.md +90 -47
data/REFERENCE.md +160 -74
data/Rakefile +44 -63
data/TODO +24 -0
data/benchmark.rb +70 -0
data/haml.gemspec +45 -0
data/lib/haml/.gitattributes +1 -0
data/lib/haml/attribute_builder.rb +219 -0
data/lib/haml/attribute_compiler.rb +237 -0
data/lib/haml/attribute_parser.rb +150 -0
data/lib/haml/buffer.rb +12 -175
data/lib/haml/compiler.rb +110 -320
data/lib/haml/engine.rb +34 -41
data/lib/haml/error.rb +28 -24
data/lib/haml/escapable.rb +77 -0
data/lib/haml/exec.rb +38 -20
data/lib/haml/filters.rb +22 -27
data/lib/haml/generator.rb +42 -0
data/lib/haml/helpers/action_view_extensions.rb +4 -2
data/lib/haml/helpers/action_view_mods.rb +45 -60
data/lib/haml/helpers/action_view_xss_mods.rb +2 -0
data/lib/haml/helpers/safe_erubi_template.rb +20 -0
data/lib/haml/helpers/safe_erubis_template.rb +5 -1
data/lib/haml/helpers/xss_mods.rb +23 -13
data/lib/haml/helpers.rb +134 -89
data/lib/haml/options.rb +63 -69
data/lib/haml/parser.rb +319 -227
data/lib/haml/plugin.rb +54 -0
data/lib/haml/railtie.rb +43 -12
data/lib/haml/sass_rails_filter.rb +18 -4
data/lib/haml/template/options.rb +13 -2
data/lib/haml/template.rb +13 -6
data/lib/haml/temple_engine.rb +124 -0
data/lib/haml/temple_line_counter.rb +30 -0
data/lib/haml/util.rb +83 -202
data/lib/haml/version.rb +3 -1
data/lib/haml.rb +2 -0
data/yard/default/.gitignore +1 -0
data/yard/default/fulldoc/html/css/common.sass +15 -0
data/yard/default/layout/html/footer.erb +12 -0
metadata +73 -115
data/lib/haml/template/plugin.rb +0 -41
data/test/engine_test.rb +0 -2013
data/test/erb/_av_partial_1.erb +0 -12
data/test/erb/_av_partial_2.erb +0 -8
data/test/erb/action_view.erb +0 -62
data/test/erb/standard.erb +0 -55
data/test/filters_test.rb +0 -254
data/test/gemfiles/Gemfile.rails-3.0.x +0 -5
data/test/gemfiles/Gemfile.rails-3.1.x +0 -6
data/test/gemfiles/Gemfile.rails-3.2.x +0 -5
data/test/gemfiles/Gemfile.rails-4.0.x +0 -5
data/test/haml-spec/LICENSE +0 -14
data/test/haml-spec/README.md +0 -106
data/test/haml-spec/lua_haml_spec.lua +0 -38
data/test/haml-spec/perl_haml_test.pl +0 -81
data/test/haml-spec/ruby_haml_test.rb +0 -23
data/test/haml-spec/tests.json +0 -660
data/test/helper_test.rb +0 -583
data/test/markaby/standard.mab +0 -52
data/test/mocks/article.rb +0 -6
data/test/parser_test.rb +0 -105
data/test/results/content_for_layout.xhtml +0 -12
data/test/results/eval_suppressed.xhtml +0 -9
data/test/results/helpers.xhtml +0 -70
data/test/results/helpful.xhtml +0 -10
data/test/results/just_stuff.xhtml +0 -70
data/test/results/list.xhtml +0 -12
data/test/results/nuke_inner_whitespace.xhtml +0 -40
data/test/results/nuke_outer_whitespace.xhtml +0 -148
data/test/results/original_engine.xhtml +0 -20
data/test/results/partial_layout.xhtml +0 -5
data/test/results/partial_layout_erb.xhtml +0 -5
data/test/results/partials.xhtml +0 -21
data/test/results/render_layout.xhtml +0 -3
data/test/results/silent_script.xhtml +0 -74
data/test/results/standard.xhtml +0 -162
data/test/results/tag_parsing.xhtml +0 -23
data/test/results/very_basic.xhtml +0 -5
data/test/results/whitespace_handling.xhtml +0 -90
data/test/template_test.rb +0 -354
data/test/templates/_av_partial_1.haml +0 -9
data/test/templates/_av_partial_1_ugly.haml +0 -9
data/test/templates/_av_partial_2.haml +0 -5
data/test/templates/_av_partial_2_ugly.haml +0 -5
data/test/templates/_layout.erb +0 -3
data/test/templates/_layout_for_partial.haml +0 -3
data/test/templates/_partial.haml +0 -8
data/test/templates/_text_area.haml +0 -3
data/test/templates/_text_area_helper.html.haml +0 -4
data/test/templates/action_view.haml +0 -47
data/test/templates/action_view_ugly.haml +0 -47
data/test/templates/breakage.haml +0 -8
data/test/templates/content_for_layout.haml +0 -8
data/test/templates/eval_suppressed.haml +0 -11
data/test/templates/helpers.haml +0 -55
data/test/templates/helpful.haml +0 -11
data/test/templates/just_stuff.haml +0 -85
data/test/templates/list.haml +0 -12
data/test/templates/nuke_inner_whitespace.haml +0 -32
data/test/templates/nuke_outer_whitespace.haml +0 -144
data/test/templates/original_engine.haml +0 -17
data/test/templates/partial_layout.haml +0 -3
data/test/templates/partial_layout_erb.erb +0 -4
data/test/templates/partialize.haml +0 -1
data/test/templates/partials.haml +0 -12
data/test/templates/render_layout.haml +0 -2
data/test/templates/silent_script.haml +0 -45
data/test/templates/standard.haml +0 -43
data/test/templates/standard_ugly.haml +0 -43
data/test/templates/tag_parsing.haml +0 -21
data/test/templates/very_basic.haml +0 -4
data/test/templates/whitespace_handling.haml +0 -87
data/test/test_helper.rb +0 -81
data/test/util_test.rb +0 -63

data/REFERENCE.md CHANGED Viewed

@@ -107,13 +107,25 @@ output.
 In Rails, options can be set by setting the {Haml::Template#options Haml::Template.options}
 hash in an initializer:
-    # config/initializers/haml.rb
-    Haml::Template.options[:format] = :html5
+```ruby
+# config/initializers/haml.rb
+Haml::Template.options[:format] = :html5
+# Avoid escaping attributes which are already escaped
+Haml::Template.options[:escape_attrs] = :once
+```
 Outside Rails, you can set them by configuring them globally in
 Haml::Options.defaults:
-    Haml::Options.defaults[:format] = :html5
+```ruby
+Haml::Options.defaults[:format] = :html5
+```
+In sinatra specifically, you can set them in global config with:
+```ruby
+set :haml, { escape_html: true }
+```
 Finally, you can also set them by passing an options hash to
 {Haml::Engine#initialize}. For the complete list of available options, please
@@ -121,7 +133,7 @@ see {Haml::Options}.
 ### Encodings
-When using Ruby 1.9 or later, Haml supports the same sorts of
+Haml supports the same sorts of
 encoding-declaration comments that Ruby does. Although both Ruby and Haml
 support several different styles, the easiest it just to add `-# coding:
 encoding-name` at the beginning of the Haml template (it must come before all
@@ -223,18 +235,21 @@ is compiled to:
     <html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'></html>
 Attribute hashes can also be stretched out over multiple lines to accommodate
-many attributes. However, newlines may only be placed immediately after commas.
-For example:
+many attributes.
-    %script{:type => "text/javascript",
-            :src  => "javascripts/script_#{2 + 7}"}
+    %script{
+      "type": text/javascript",
+      "src": javascripts/script_#{2 + 7}",
+      "data": {
+        "controller": "reporter",
+      },
+    }
 is compiled to:
-    <script src='javascripts/script_9' type='text/javascript'></script>
+    <script src='javascripts/script_9' type='text/javascript' data-controller='reporter'></script>
-#### `:class` and `:id` Attributes
-{#class-and-id-attributes}
+#### `:class` and `:id` Attributes {#class-and-id-attributes}
 The `:class` and `:id` attributes can also be specified as a Ruby array whose
 elements will be joined together. A `:class` array is joined with `" "` and an
@@ -306,7 +321,7 @@ hash-style attributes:
 #### Ruby 1.9-style Hashes
-On Ruby 1.9, Haml also supports Ruby's new hash syntax:
+Haml also supports Ruby's new hash syntax:
     %a{title: @title, href: href} Stuff
@@ -389,27 +404,49 @@ or using `true` and `false`:
     %input(selected=true)
-#### HTML5 Custom Data Attributes
+<!-- The title to the next section (Prefixed Attributes) has changed. This
+<a> tag is so old links to here still work. -->
+<a id="html5_custom_data_attributes" style="border:0;"></a>
+#### Prefixed Attributes
-HTML5 allows for adding [custom non-visible data
-attributes](http://www.whatwg.org/specs/web-apps/current-work/multipage/elements.html#embedding-custom-non-visible-data)
-to elements using attribute names beginning with `data-`. Custom data attributes
-can be used in Haml by using the key `:data` with a Hash value in an attribute
-hash. Each of the key/value pairs in the Hash will be transformed into a custom
-data attribute. For example:
+HTML5 allows for adding
+[custom non-visible data attributes](http://www.whatwg.org/specs/web-apps/current-work/multipage/elements.html#embedding-custom-non-visible-data-with-the-data-*-attributes)
+to elements using attribute names beginning with `data-`. The
+[Accessible Rich Internet Applications](http://www.w3.org/WAI/intro/aria)
+specification makes use of attributes beginning with `aria-`. There are also
+frameworks that use non-standard attributes with a common prefix.
+Haml can help generate collections of attributes that share a prefix like
+these. Any entry in an attribute hash that has a Hash as its value is expanded
+into a series of attributes, one for each key/value pair in the hash, with the
+attribute name formed by joining the “parent” key name to the key name with a
+hyphen.
+For example:
-    %a{:href=>"/posts", :data => {:author_id => 123}} Posts By Author
+    %a{:href=>"/posts", :data => {:author_id => 123, :category => 7}} Posts By Author
 will render as:
-    <a data-author-id='123' href='/posts'>Posts By Author</a>
+    <a data-author-id='123' data-category='7' href='/posts'>Posts By Author</a>
 Notice that the underscore in `author_id` was replaced by a hyphen. If you wish
 to suppress this behavior, you can set Haml's
 {Haml::Options#hyphenate_data_attrs `:hyphenate_data_attrs` option} to `false`,
 and the output will be rendered as:
-    <a data-author_id='123' href='/posts'>Posts By Author</a>
+    <a data-author_id='123' data-category='7' href='/posts'>Posts By Author</a>
+This expansion of hashes is recursive – any value of the child hash that is
+itself a hash will create an attribute for each entry, with the attribute name
+prefixed with all ancestor keys. For example:
+    .book-info{:data => {:book => {:id => 123, :genre => 'programming'}, :category => 7}}
+will render as:
+    <div class='book-info' data-book-genre='programming' data-book-id='123' data-category='7'></div>
 ### Class and ID: `.` and `#`
@@ -491,28 +528,46 @@ and is compiled to:
       </div>
     </div>
+#### Class Name Merging and Ordering
+Class names are ordered in the following way:
+1) Tag identifiers in order (aka, ".alert.me" => "alert me")
+2) Classes appearing in HTML-style attributes
+3) Classes appearing in Hash-style attributes
+For instance, this is a complicated and unintuitive test case illustrating the ordering
+    .foo.moo{:class => ['bar', 'alpha']}(class='baz')
+The resulting HTML would be as follows:
+    <div class='foo moo baz bar alpha'></div>
+*Versions of Haml prior to 5.0 would alphabetically sort class names.*
 ### Empty (void) Tags: `/`
 The forward slash character, when placed at the end of a tag definition, causes
 Haml to treat it as being an empty (or void) element. Depending on the format,
 the tag will be rendered either without a closing tag (`:html4` or `:html5`), or
-as a self-closing tag (`:xhtml`). For example:
+as a self-closing tag (`:xhtml`).
+Taking the following as an example:
     %br/
     %meta{'http-equiv' => 'Content-Type', :content => 'text/html'}/
-is compiled to:
+When the format is `:html4` or `:html5` this is compiled to:
     <br>
     <meta content='text/html' http-equiv='Content-Type'>
-when the format is `:html4` or `:html5`, and to
+and when the format is `:xhtml` it is compiled to:
     <br />
     <meta content='text/html' http-equiv='Content-Type' />
-when the format is `:xhtml`.
 Some tags are automatically treated as being empty, as long as they have no
 content in the Haml source. `meta`, `img`, `link`, `br`, `hr`, `input`,
 `area`, `param`, `col` and `base` tags are treated as empty by default. This
@@ -779,6 +834,21 @@ is compiled to:
       </a>
     <![endif]-->
+To generate “downlevel-revealed” conditional comments, where the content is
+hidden from IE but not other browsers,  add a `!` before the brackets: `/![]`.
+Haml will produce valid HTML when generating this kind of conditional comment.
+For example:
+    /![if !IE]
+      You are not using Internet Explorer, or are using version 10+.
+is compiled to:
+    <!--[if !IE]><!-->
+      You are not using Internet Explorer, or are using version 10+.
+    <!--<![endif]-->
 ### Haml Comments: `-#`
 The hyphen followed immediately by the pound sign signifies a silent comment.
@@ -812,7 +882,7 @@ is compiled to:
 ## Ruby Evaluation
-### Inserting Ruby: `=`
+### Inserting Ruby: `=` {#inserting_ruby}
 The equals character is followed by Ruby code. This code is evaluated and the
 output is inserted into the document. For example:
@@ -985,6 +1055,21 @@ might compile to:
       //]]>
     </script>
+#### Gotchas
+Haml uses an overly simplistic regular expression to identify string
+interpolation rather than a full-blown Ruby parser. This is fast and works for
+most code but you may have errors with code like the following:
+    %span #{'{'}
+This code will generate a syntax error, complaining about unbalanced brackets.
+In cases like this, the recommended workaround is output the code as a Ruby
+string to force Haml to parse the code with Ruby.
+    %span= "#{'{'}"
 ### Escaping HTML: `&=` {#escaping_html}
 An ampersand followed by one or two equals characters evaluates Ruby code just
@@ -1069,8 +1154,8 @@ is compiled to
       <p>I <strong>really</strong> prefer <em>raspberry</em> jam.</p>
     </div>
-Currently, filters ignore the {Haml::Options#escape_html `:escape_html`} option.
-This means that `#{}` interpolation within filters is never HTML-escaped.
+Note that `#{}` interpolation within filters is HTML-escaped if you specify true to
+{Haml::Options#escape_filter_interpolations `:escape_filter_interpolations`} option.
 The functionality of some filters such as Markdown can be provided by many
 different libraries. Usually you don't have to worry about this - you can just
@@ -1087,53 +1172,53 @@ more info.
 Haml comes with the following filters defined:
-{#cdata-filter}
-### `:cdata`
+### `:cdata` {#cdata-filter}
 Surrounds the filtered text with CDATA tags.
-{#coffee-filter}
-### `:coffee`
-Compiles the filtered text to Javascript using Cofeescript. You can also
-reference this filter as `:coffeescript`. This filter is implemented using
-Tilt.
+### `:coffee` {#coffee-filter}
+Compiles the filtered text to JavaScript in `<script>` tag using CoffeeScript.
+You can also reference this filter as `:coffeescript`. This filter is
+implemented using Tilt.
+### `:css` {#css-filter}
-{#css-filter}
-### `:css`
 Surrounds the filtered text with `<style>` and (optionally) CDATA tags. Useful
 for including inline CSS. Use the {Haml::Options#cdata `:cdata` option} to
 control when CDATA tags are added.
-{#erb-filter}
-### `:erb`
-Parses the filtered text with ERb, like an RHTML template. Not available if the
+### `:erb` {#erb-filter}
+Parses the filtered text with ERB, like an RHTML template. Not available if the
 {Haml::Options#suppress_eval `:suppress_eval`} option is set to true. Embedded
 Ruby code is evaluated in the same context as the Haml template. This filter is
 implemented using Tilt.
-{#escaped-filter}
-### `:escaped`
+### `:escaped` {#escaped-filter}
 Works the same as plain, but HTML-escapes the text
 before placing it in the document.
-{#javascript-filter}
-### `:javascript`
+### `:javascript` {#javascript-filter}
 Surrounds the filtered text with `<script>` and (optionally) CDATA tags.
 Useful for including inline Javascript. Use the {Haml::Options#cdata `:cdata`
 option} to control when CDATA tags are added.
-{#less-filter}
-### `:less`
-Parses the filtered text with [Less](http://lesscss.org/) to produce CSS output.
+### `:less` {#less-filter}
+Parses the filtered text with [Less](http://lesscss.org/) to produce CSS output in `<style>` tag.
 This filter is implemented using Tilt.
-{#markdown-filter}
-### `:markdown`
+### `:markdown` {#markdown-filter}
 Parses the filtered text with
 [Markdown](http://daringfireball.net/projects/markdown). This filter is
 implemented using Tilt.
-{#maruku-filter}
-### `:maruku`
+### `:maruku` {#maruku-filter}
 Parses the filtered text with [Maruku](https://github.com/nex3/maruku), which
 has some non-standard extensions to Markdown.
@@ -1142,39 +1227,40 @@ contrib](https://github.com/haml/haml-contrib) but is loaded automatically for
 historical reasons. In future versions of Haml it will likely not be loaded by
 default. This filter is implemented using Tilt.
-{#plain-filter}
-### `:plain`
+### `:plain` {#plain-filter}
 Does not parse the filtered text. This is useful for large blocks of text
 without HTML tags, when you don't want lines starting with `.` or `-` to be
 parsed.
-{#preserve-filter}
-### `:preserve`
+### `:preserve` {#preserve-filter}
 Inserts the filtered text into the template with whitespace preserved.
 `preserve`d blocks of text aren't indented, and newlines are replaced with the
 HTML escape code for newlines, to preserve nice-looking output. See also
 [Whitespace Preservation](#whitespace_preservation).
-{#ruby-filter}
-### `:ruby`
+### `:ruby` {#ruby-filter}
 Parses the filtered text with the normal Ruby interpreter. Creates an `IO`
 object named `haml_io`, anything written to it is output into the Haml document.
 Not available if the {Haml::Options#suppress_eval `:suppress_eval`} option is
 set to true. The Ruby code is evaluated in the same context as the Haml
 template.
-{#sass-filter}
-### `:sass`
+### `:sass` {#sass-filter}
 Parses the filtered text with [Sass](http://sass-lang.com/) to produce CSS
-output. This filter is implemented using Tilt.
+output in `<style>` tag. This filter is implemented using Tilt.
+### `:scss` {#scss-filter}
-{#scss-filter}
-### `:scss`
 Parses the filtered text with Sass like the `:sass` filter, but uses the newer
-SCSS syntax to produce CSS output. This filter is implemented using Tilt.
+SCSS syntax to produce CSS output in `<style>` tag. This filter is implemented
+using Tilt.
+### `:textile` {#textile-filter}
-{#textile-filter}
-### `:textile`
 Parses the filtered text with [Textile](http://www.textism.com/tools/textile).
 Only works if [RedCloth](http://redcloth.org) is installed.
@@ -1194,8 +1280,8 @@ the whitespace removal methods allow. There are a few helper methods that are
 useful when dealing with inline content. All these methods take a Haml block to
 modify.
-{#surround}
-### surround
+### surround {#surround}
 Surrounds a Haml block with text. Expects 1 or 2 string arguments used to
 surround the Haml block. If a second argument is not provided, the first
 argument is used as the second.
@@ -1203,15 +1289,15 @@ argument is used as the second.
     = surround "(", ")" do
       = link_to "learn more", "#"
-{#precede}
-### precede
+### precede {#precede}
 Prepends a Haml block with text. Expects 1 argument.
     = precede "*" do
       %span Required
-{#succeed}
-### succeed
+### succeed {#succeed}
 Appends a Haml block with text. Expects 1 argument.
     Begin by
@@ -1266,7 +1352,7 @@ that just need a lot of template information.
 So data structures and  functions that require lots of arguments
 can be wrapped over multiple lines,
 as long as each line but the last ends in a comma
-(see [Inserting Ruby](#inserting_ruby_)).
+(see [Inserting Ruby](#inserting_ruby)).
 ## Whitespace Preservation

data/Rakefile CHANGED Viewed

@@ -1,43 +1,29 @@
 require "rake/clean"
 require "rake/testtask"
-require "rubygems/package_task"
+require "bundler/gem_tasks"
 task :default => :test
-CLEAN.replace %w(pkg doc coverage .yardoc test/haml vendor)
-def silence_warnings
-  the_real_stderr, $stderr = $stderr, StringIO.new
-  yield
-ensure
-  $stderr = the_real_stderr
-end
-desc "Benchmark Haml against ERb. TIMES=n sets the number of runs, default is 1000."
-task :benchmark do
-  sh "ruby benchmark.rb #{ENV['TIMES']}"
+# 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 << 'lib' << 'test'
-  # haml-spec tests are explicitly added after other tests so they don't
-  # interfere with the Haml loading process which can cause test failures
-  files = Dir["test/*_test.rb"]
-  files.concat(Dir['test/haml-spec/*_test.rb'])
-  t.test_files = files
+  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
 end
-task :set_coverage_env do
-  ENV["COVERAGE"] = "true"
-end
-desc "Run Simplecov (only works on 1.9)"
-task :coverage => [:set_coverage_env, :test]
+CLEAN.replace %w(pkg doc coverage .yardoc test/haml vendor)
-gemspec = File.expand_path("../haml.gemspec", __FILE__)
-if File.exist? gemspec
-  Gem::PackageTask.new(eval(File.read(gemspec))) { |pkg| }
+desc "Benchmark Haml against ERB. TIMES=n sets the number of runs, default is 1000."
+task :benchmark do
+  sh "ruby benchmark.rb #{ENV['TIMES']}"
 end
 task :submodules do
@@ -47,31 +33,32 @@ task :submodules do
   end
 end
-begin
-  silence_warnings do
-    require 'yard'
-  end
-  namespace :doc do
-    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
+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
   end
-  desc "Generate documentation"
-  task(:doc) {sh "yard"}
+  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
+  end
+end
-  desc "Generate documentation incrementally"
-  task(:redoc) {sh "yard -c"}
+desc "Generate documentation"
+task(:doc => 'doc:sass') {sh "yard"}
-rescue LoadError
-end
+desc "Generate documentation incrementally"
+task(:redoc) {sh "yard -c"}
-  desc <<END
+desc <<END
 Profile Haml.
   TIMES=n sets the number of runs. Defaults to 1000.
   FILE=str sets the file to profile. Defaults to 'standard'
@@ -80,37 +67,31 @@ Profile Haml.
 END
 task :profile do
   times  = (ENV['TIMES'] || '1000').to_i
-  file   = ENV['FILE']
+  file   = ENV['FILE'] || 'test/templates/standard.haml'
   require 'bundler/setup'
   require 'ruby-prof'
   require 'haml'
-  file = File.read(File.expand_path("../test/templates/#{file || 'standard'}.haml", __FILE__))
+  file = File.read(File.expand_path("../#{file}", __FILE__))
   obj = Object.new
-  Haml::Engine.new(file, :ugly => true).def_method(obj, :render)
+  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 ||= begin
-    Dir[File.dirname(__FILE__) + '/test/gemfiles/Gemfile.*'].
-      reject {|f| f =~ /\.lock$/}.
-      reject {|f| RUBY_VERSION < '1.9.3' && f =~ /Gemfile.rails-(\d+).\d+.x/ && $1.to_i > 3}
-  end
+  @gemfiles ||= Dir[File.dirname(__FILE__) + '/test/gemfiles/Gemfile.*'].reject {|f| f =~ /\.lock$/}
 end
 def with_each_gemfile
-  old_env = ENV['BUNDLE_GEMFILE']
   gemfiles.each do |gemfile|
-    puts "Using gemfile: #{gemfile}"
-    ENV['BUNDLE_GEMFILE'] = gemfile
-    yield
+    Bundler.with_clean_env do
+      puts "Using gemfile: #{gemfile}"
+      ENV['BUNDLE_GEMFILE'] = gemfile
+      yield
+    end
   end
-ensure
-  ENV['BUNDLE_GEMFILE'] = old_env
 end
 namespace :test do

data/TODO ADDED Viewed

@@ -0,0 +1,24 @@
+# -*- 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

data/benchmark.rb ADDED Viewed

@@ -0,0 +1,70 @@
+require "bundler/setup"
+require "haml"
+require "rbench"
+times = (ARGV.first || 1000).to_i
+if times == 0 # Invalid parameter
+  puts <<END
+ruby #$0 [times=1000]
+  Benchmark Haml against various other templating languages.
+END
+  exit 1
+end
+%w[erb erubi rails active_support action_controller
+   action_view action_pack haml/template rbench].each {|dep| require(dep)}
+def view
+  base = ActionView::Base.new
+  base.view_paths << File.join(File.dirname(__FILE__), '/test')
+  base
+end
+def render(view, file)
+  view.render :file => file
+end
+RBench.run(times) do
+  column :haml, :title => "Haml"
+  column :erb, :title => "ERB"
+  column :erubi, :title => "Erubi"
+  template_name = 'standard'
+  haml_template    = File.read("#{File.dirname(__FILE__)}/test/templates/#{template_name}.haml")
+  erb_template     = File.read("#{File.dirname(__FILE__)}/test/erb/#{template_name}.erb")
+  report "Cached" do
+    obj = Object.new
+    Haml::Engine.new(haml_template).def_method(obj, :haml)
+    if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+
+      obj.instance_eval("def erb; #{ERB.new(erb_template, trim_mode: '-').src}; end")
+    else
+      obj.instance_eval("def erb; #{ERB.new(erb_template, nil, '-').src}; end")
+    end
+    obj.instance_eval("def erubi; #{Erubi::Engine.new(erb_template).src}; end")
+    haml      { obj.haml }
+    erb       { obj.erb }
+    erubi     { obj.erubi }
+  end
+  report "ActionView" do
+    # To cache the template
+    render view, 'templates/standard'
+    render view, 'erb/standard'
+    haml  { render view, 'templates/standard' }
+    erubi { render view, 'erb/standard' }
+  end
+  report "ActionView with deep partials" do
+    # To cache the template
+    render view, 'templates/action_view'
+    render view, 'erb/action_view'
+    haml  { render view, 'templates/action_view' }
+    erubi { render view, 'erb/action_view' }
+  end
+end