haml 4.0.7 → 5.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b7a38de787ab9e47ac3221b040c9c38ecf4884df
-  data.tar.gz: 29497caf8377f40940a0e094d1477ea2403f380f
+SHA256:
+  metadata.gz: ec6cbb2e4023f397f1d7b6d84f06d78ab492a61e88c3f16496f39d0baeb47a83
+  data.tar.gz: 004c2dd34697cb61a8c12854bf4b99abb3cab5195f28922b813ee299225e7663
 SHA512:
-  metadata.gz: 3c71810f7359be3c7536eea848acefb06d09859443d6b80a31908ea07b6c109dc082a7ad8a7e95f1305b08aefeabbe46dd48cc186dff66eb4fe46bdd258956e1
-  data.tar.gz: 0d85d5e2164cef71dab787d7967ab4a3e7ecd1dd0b5e212188032bd94faa6d4923cdb39cd5fdffcdaed6da13b6f637d1d5d5c8171ca878fa017ac64c345d589f
+  metadata.gz: a7430b4e42cf809f847448a9e04623b4b58878e44facedef5e43714820e8068f0bb853772564d5545936cdad8346f0c33abfc11642a3737d91c9a1f6242b3e41
+  data.tar.gz: 8a91df0cb185014512ee473a21755ba41edb06e835b29740e8e46c76287a81405b2706d8a10ea148893a9429de306c67584ac1c286637c0812a5562cf149431b

data/.github/workflows/test.yml

@@ -0,0 +1,36 @@
+name: test
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
+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]
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - uses: actions/cache@v2
+        with:
+          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: 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"

data/.gitignore

@@ -0,0 +1,19 @@
+/.idea
+/.yardoc
+/coverage
+/doc
+/log
+/pkg
+/test/rails
+/test/gemfiles/*.lock
+/.haml
+/site
+*.rbc
+.sass-cache
+.rbenv-version
+.rbx
+.ruby-version
+.rvmrc
+Gemfile.lock
+tmp
+.bundle/

data/.gitmodules

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

data/.yardopts

@@ -1,14 +1,13 @@
 --charset          utf-8
 --readme           README.md
 --markup           markdown
---markup-provider  maruku
+--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/template/patch.rb
---exclude          lib/haml/template/plugin.rb
+--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

data/CHANGELOG.md

@@ -1,5 +1,149 @@
 # Haml Changelog
 
+## 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+
+
+## 5.2.1
+
+Released on November 30, 2020
+([diff](https://github.com/haml/haml/compare/v5.2.0...v5.2.1)).
+
+* Add in improved "multiline" support for attributes [#1043](https://github.com/haml/haml/issues/1043)
+
+## 5.2
+
+Released on September 28, 2020
+([diff](https://github.com/haml/haml/compare/v5.1.2...v5.2.0)).
+
+* Fix crash in the attribute optimizer when `#inspect` is overridden in TrueClass / FalseClass [#972](https://github.com/haml/haml/issues/972)
+* Do not HTML-escape templates that are declared to be plaintext [#1014](https://github.com/haml/haml/issues/1014) (Thanks [@cesarizu](https://github.com/cesarizu))
+* Class names are no longer ordered alphabetically, and now follow a new specification as laid out in REFERENCE [#306](https://github.com/haml/haml/issues/306)
+
+## 5.1.2
+
+Released on August 6, 2019
+([diff](https://github.com/haml/haml/compare/v5.1.1...v5.1.2)).
+
+* Fix crash in some environments such as New Relic by unfreezing string literals for ParseNode#inspect. [#1016](https://github.com/haml/haml/pull/1016) (thanks [Jalyna](https://github.com/jalyna))
+
+## 5.1.1
+
+Released on May 25, 2019
+([diff](https://github.com/haml/haml/compare/v5.1.0...v5.1.1)).
+
+* Fix NameError bug that happens on ruby 2.6.1-2.6.3 + haml 5.1.0 + rails < 5.1 + erubi. (Akira Matsuda)
+
+## 5.1.0
+
+Released on May 16, 2019
+([diff](https://github.com/haml/haml/compare/v5.0.4...v5.1.0)).
+
+* Rails 6 support [#1008](https://github.com/haml/haml/pull/1008) (thanks [Seb Jacobs](https://github.com/sebjacobs))
+* Add `escape_filter_interpolations` option for backwards compatibility with haml 4 defaults [#984](https://github.com/haml/haml/pull/984) (thanks [Will Jordan](https://github.com/wjordan))
+* Fix error on empty :javascript and :css filter blocks [#986](https://github.com/haml/haml/pull/986) (thanks [Will Jordan](https://github.com/wjordan))
+* Respect changes in Haml::Options.defaults in `Haml::TempleEngine` options (Takashi Kokubun)
+* Un-freeze TempleEngine precompiled string literals [#983](https://github.com/haml/haml/pull/983) (thanks [Will Jordan](https://github.com/wjordan))
+* Various performance/memory improvements [#965](https://github.com/haml/haml/pull/965), [#966](https://github.com/haml/haml/pull/966), [#963](https://github.com/haml/haml/pull/963) (thanks [Dillon Welch](https://github.com/oniofchaos))
+* Enable `frozen_string_literal` magic comment for all .rb files [#967](https://github.com/haml/haml/pull/967) (thanks [Dillon Welch](https://github.com/oniofchaos))
+
+## 5.0.4
+
+Released on October 13, 2017
+([diff](https://github.com/haml/haml/compare/v5.0.3...v5.0.4)).
+
+* Fix `haml -c --stdin` regression in 5.0.2. [#958](https://github.com/haml/haml/pull/958) (thanks [Timo Göllner](https://github.com/TeaMoe))
+* Ruby 2.5 support (it wasn't working due to Ripper API change). (Akira Matsuda)
+
+## 5.0.3
+
+Released on September 7, 2017
+([diff](https://github.com/haml/haml/compare/v5.0.2...v5.0.3)).
+
+* Use `String#dump` instead of `String#inspect` to generate string literal. (Takashi Kokubun)
+* Fix Erubi superclass mismatch error. [#952](https://github.com/haml/haml/pull/952) (thanks [Robin Daugherty](https://github.com/RobinDaugherty))
+
+## 5.0.2
+
+Released on August 1, 2017
+([diff](https://github.com/haml/haml/compare/v5.0.1...v5.0.2)).
+
+* Let `haml -c` fail if generated Ruby code is syntax error. [#880](https://github.com/haml/haml/issues/880) (Takashi Kokubun)
+* Fix `NoMethodError` bug caused with Sprockets 3 and :sass filter. [#930](https://github.com/haml/haml/pull/930) (thanks [Gonzalez Maximiliano](https://github.com/emaxi))
+* Fix `list_of` helper with multi-line content. [#933](https://github.com/haml/haml/pull/933) (thanks [Benoit Larroque](https://github.com/zetaben))
+* Optimize rendering performance by changing timing to fix textareas. [#941](https://github.com/haml/haml/pull/941) (Takashi Kokubun)
+* Fix `TypeError` with empty :ruby filter. [#942](https://github.com/haml/haml/pull/942) (Takashi Kokubun)
+* Fix inconsistent attribute sort order. (Takashi Kokubun)
+
+## 5.0.1
+
+Released on May 3, 2017
+([diff](https://github.com/haml/haml/compare/v5.0.0...v5.0.1)).
+
+* Fix parsing attributes including string interpolation. [#917](https://github.com/haml/haml/pull/917) [#921](https://github.com/haml/haml/issues/921)
+* Stop distributing test files in gem package and allow installing on Windows.
+* Use ActionView's Erubi/Erubis handler for erb filter only on ActionView. [#914](https://github.com/haml/haml/pull/914)
+
+## 5.0.0
+
+Released on April 26, 2017
+([diff](https://github.com/haml/haml/compare/4.0.7...v5.0.0)).
+
+Breaking Changes
+
+* Haml now requires Ruby 2.0.0 or above.
+* Rails 3 is no longer supported, matching the official
+  [Maintenance Policy for Ruby on Rails](http://weblog.rubyonrails.org/2013/2/24/maintenance-policy-for-ruby-on-rails/).
+  Use Haml 4 if you want to use Rails 3.
+  (Tee Parham)
+* Remove `:ugly` option ([#894](https://github.com/haml/haml/pull/894))
+* The `haml` command's debug option (`-d`) no longer executes the Haml code, but
+  rather checks the generated Ruby syntax for errors.
+* Drop parser/compiler accessor from `Haml::Engine`. Modify `Haml::Engine#initialize` options
+  or `Haml::Template.options` instead. (Takashi Kokubun)
+* Drop dynamic quotes support and always escape `'` for `escape_html`/`escape_attrs` instead.
+  Also, escaped results are slightly changed and always unified to the same characters. (Takashi Kokubun)
+* Don't preserve newlines in attributes. (Takashi Kokubun)
+* HTML escape interpolated code in filters.
+  [#770](https://github.com/haml/haml/pull/770)
+  (Matt Wildig)
+
+        :javascript
+          #{JSON.generate(foo: "bar")}
+        Haml 4 output: {"foo":"bar"}
+        Haml 5 output: {&quot;foo&quot;:&quot;bar&quot;}
+
+Added
+
+* Add a tracing option. When enabled, Haml will output a data-trace attribute on each tag showing the path
+  to the source Haml file from which it was generated. Thanks [Alex Babkin](https://github.com/ababkin).
+* Add `haml_tag_if` to render a block, conditionally wrapped in another element (Matt Wildig)
+* Support Rails 5.1 Erubi template handler.
+* Support Sprockets 3. Thanks [Sam Davies](https://github.com/samphilipd) and [Jeremy Venezia](https://github.com/jvenezia).
+* General performance and memory usage improvements. (Akira Matsuda)
+* Analyze attribute values by Ripper and render static attributes beforehand. (Takashi Kokubun)
+* Optimize attribute rendering about 3x faster. (Takashi Kokubun)
+* Add temple gem as dependency and create `Haml::TempleEngine` class.
+  Some methods in `Haml::Compiler` are migrated to `Haml::TempleEngine`. (Takashi Kokubun)
+
+Fixed
+
+* Fix for attribute merging. When an attribute method (or literal nested hash)
+  was used in an old style attribute hash and there is also a (non-static) new
+  style hash there is an error. The fix can result in different behavior in
+  some circumstances. See the [commit message](https://github.com/haml/haml/tree/e475b015d3171fb4c4f140db304f7970c787d6e3)
+  for detailed info. (Matt Wildig)
+* Make escape_once respect hexadecimal references. (Matt Wildig)
+* Don't treat the 'data' attribute specially when merging attribute hashes. (Matt Wildig and Norman Clarke)
+* Fix #@foo and #$foo style interpolation that was not working in html_safe mode. (Akira Matsuda)
+* Allow `@` as tag's class name. Thanks [Joe Bartlett](https://github.com/redoPop).
+* Raise `Haml::InvalidAttributeNameError` when attribute name includes invalid characters. (Takashi Kokubun)
+* Don't ignore unexpected exceptions on initializing `ActionView::OutputBuffer`. (Takashi Kokubun)
+
 ## 4.0.7
 
 Released on August 10, 2015
@@ -11,7 +155,6 @@ Released on August 10, 2015
 
 Released on Dec 1, 2014 ([diff](https://github.com/haml/haml/compare/4.0.5...4.0.6)).
 
-
 * Fix warning on Ruby 1.8.7 "regexp has invalid interval" (thanks [Elia Schito](https://github.com/elia)).
 
 ## 4.0.5
@@ -76,7 +219,7 @@ Released March 21, 2013 ([diff](https://github.com/haml/haml/compare/4.0.0...4.0
 
 ## 4.0.0
 
-* The Haml exectutable now accepts an `--autoclose` option. You can now
+* The Haml executable now accepts an `--autoclose` option. You can now
   specify a list of tags that should be autoclosed
 
 * The `:ruby` filter no longer redirects $stdout to the Haml document, as this
@@ -113,7 +256,7 @@ Released March 21, 2013 ([diff](https://github.com/haml/haml/compare/4.0.0...4.0
 
 * All Hash attribute values are now treated as HTML5 data, regardless of key.
   Previously only the "data" key was treated this way. Allowing arbitrary keys
-  means you can now easily use this feauture for Aria attributes, among other
+  means you can now easily use this feature for Aria attributes, among other
   uses.
   (thanks to [Elvin Efendi](https://github.com/ElvinEfendi))
 
@@ -532,7 +675,6 @@ The {file:HAML_REFERENCE.md#ugly-option `:ugly` option} is now on by default
 in the testing environment in Rails to help tests run faster.
 
 ## 3.0.0
-{#3-0-0}
 
 [Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.0).
 

data/FAQ.md

@@ -2,14 +2,7 @@
 
 ## Haml
 
-### Why is my markup indented properly in development mode, but not in production?
-{#q-indentation-in-production}
-
-To improve performance, Haml defaults to {Haml::Options#ugly "ugly" mode} in
-Rails apps running in production.
-
-### How do I put a punctuation mark after an element, like "`I like <strong>cake</strong>!`"?
-{#q-punctuation}
+### How do I put a punctuation mark after an element, like "`I like <strong>cake</strong>!`"? {#q-punctuation}
 
 Expressing the structure of a document
 and expressing inline formatting are two very different problems.
@@ -37,8 +30,7 @@ then it's even easier:
 
     %p== I like #{link_to 'chocolate', 'http://franschocolates.com'}!
 
-### How do I stop Haml from indenting the contents of my `pre` and `textarea` tags?
-{#q-preserve}
+### How do I stop Haml from indenting the contents of my `pre` and `textarea` tags? {#q-preserve}
 
 Because Haml automatically indents the HTML source code,
 the contents of whitespace-sensitive tags like `pre` and `textarea`
@@ -78,8 +70,7 @@ and renders
 
     <p><textarea>Foo&#x000A;Bar</textarea></p>
 
-### How do I make my long lines of Ruby code look nicer in my Haml document?
-{#q-multiline}
+### How do I make my long lines of Ruby code look nicer in my Haml document? {#q-multiline}
 
 Put them in a helper or your model.
 
@@ -125,8 +116,7 @@ in Haml, you have to do
     - form_for stuff do
       ...
 
-### I have Haml installed. Why is Rails (only looking for `.html.erb` files | rendering Haml files as plain text | rendering Haml files as blank pages)?
-{#q-blank-page}
+### I have Haml installed. Why is Rails (only looking for `.html.erb` files | rendering Haml files as plain text | rendering Haml files as blank pages)? {#q-blank-page}
 
 There are several reasons these things might be happening.
 First of all, make sure that Haml really is installed;

data/Gemfile

@@ -0,0 +1,16 @@
+source "https://rubygems.org"
+gemspec
+
+gem "m"
+gem "pry"
+gem "simplecov"
+
+group :docs do
+  gem "yard"
+  gem "kramdown"
+  gem "sass"
+end
+
+platform :mri do
+  gem "ruby-prof"
+end

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2006-2009 Hampton Catlin and Nathan Weizenbaum
+Copyright (c) 2006-2019 Hampton Catlin and Natalie Weizenbaum
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -17,4 +17,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,34 +1,53 @@
 # Haml
 
-[![Build Status](https://secure.travis-ci.org/haml/haml.png?branch=master)](http://travis-ci.org/haml/haml)
+[![Gem Version](https://badge.fury.io/rb/haml.svg)](http://rubygems.org/gems/haml)
+[![Build Status](https://travis-ci.org/haml/haml.svg?branch=main)](http://travis-ci.org/haml/haml)
+[![Code Climate](https://codeclimate.com/github/haml/haml/badges/gpa.svg)](https://codeclimate.com/github/haml/haml)
+[![Inline docs](http://inch-ci.org/github/haml/haml.png)](http://inch-ci.org/github/haml/haml)
 
 Haml is a templating engine for HTML. It's designed to make it both easier and
 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
 first step is to install the gem:
 
-    gem install haml
+~~~sh
+gem install haml
+~~~
 
 After you write some Haml, you can run
 
-    haml document.haml
+~~~sh
+haml document.haml
+~~~
 
 to compile it to HTML. For more information on these commands, check out
 
-    haml --help
+~~~sh
+haml --help
+~~~
 
-To use Haml programatically, check out the [YARD
-documentation](http://haml.info/docs/yardoc/).
+To use Haml programmatically, check out the [YARD documentation](http://haml.info/docs/yardoc/).
 
 ## Using Haml with Rails
 
 To use Haml with Rails, simply add Haml to your Gemfile and run `bundle`.
 
+~~~ruby
+gem 'haml'
+~~~
+
 If you'd like to replace Rails's Erb-based generators with Haml, add
 [haml-rails](https://github.com/indirect/haml-rails) to your Gemfile as well.
 
@@ -36,58 +55,76 @@ If you'd like to replace Rails's Erb-based generators with Haml, add
 
 The most basic element of Haml is a shorthand for creating HTML:
 
-    %tagname{:attr1 => 'value1', :attr2 => 'value2'} Contents
+~~~haml
+%tagname{:attr1 => 'value1', :attr2 => 'value2'} Contents
+~~~
 
 No end-tag is needed; Haml handles that automatically. If you prefer HTML-style
 attributes, you can also use:
 
-    %tagname(attr1='value1' attr2='value2') Contents
+~~~haml
+%tagname(attr1='value1' attr2='value2') Contents
+~~~
 
 Adding `class` and `id` attributes is even easier. Haml uses the same syntax as
 the CSS that styles the document:
 
-    %tagname#id.class
+~~~haml
+%tagname#id.class
+~~~
 
 In fact, when you're using the `<div>` tag, it becomes _even easier_. Because
 `<div>` is such a common element, a tag without a name defaults to a div. So
 
-    #foo Hello!
+~~~haml
+#foo Hello!
+~~~
 
 becomes
 
-    <div id='foo'>Hello!</div>
+~~~html
+<div id='foo'>Hello!</div>
+~~~
 
 Haml uses indentation to bring the individual elements to represent the HTML
 structure. A tag's children are indented beneath than the parent tag. Again, a
 closing tag is automatically added. For example:
 
-    %ul
-      %li Salt
-      %li Pepper
+~~~haml
+%ul
+  %li Salt
+  %li Pepper
+~~~
 
 becomes:
 
-    <ul>
-      <li>Salt</li>
-      <li>Pepper</li>
-    </ul>
+~~~html
+<ul>
+  <li>Salt</li>
+  <li>Pepper</li>
+</ul>
+~~~
 
 You can also put plain text as a child of an element:
 
-    %p
-      Hello,
-      World!
+~~~haml
+%p
+  Hello,
+  World!
+~~~
 
 It's also possible to embed Ruby code into Haml documents. An equals sign, `=`,
 will output the result of the code. A hyphen, `-`, will run the code but not
 output the result. You can even use control statements like `if` and `while`:
 
-    %p
-      Date/Time:
-      - now = DateTime.now
-      %strong= now
-      - if now > DateTime.parse("December 31, 2006")
-        = "Happy new " + "year!"
+~~~haml
+%p
+  Date/Time:
+  - now = DateTime.now
+  %strong= now
+  - if now > DateTime.parse("December 31, 2006")
+    = "Happy new " + "year!"
+~~~
 
 Haml provides far more tools than those presented here. Check out the [reference
 documentation](http://haml.info/docs/yardoc/file.REFERENCE.html)
@@ -105,18 +142,22 @@ Contributions are welcomed, but before you get started please read the
 [guidelines](http://haml.info/development.html#contributing).
 
 After forking and then cloning the repo locally, install Bundler and then use it
-to install the development gem dependecies:
-
-    gem install bundler
-    bundle install
+to install the development gem dependencies:
+~~~sh
+gem install bundler
+bundle install
+~~~
 
 Once this is complete, you should be able to run the test suite:
-
-    rake
+~~~sh
+rake
+~~~
 
 You'll get a warning that you need to install haml-spec, so run this:
 
-    git submodule update --init
+~~~sh
+git submodule update --init
+~~~
 
 At this point `rake` should run without error or warning and you are ready to
 start working on your patch!
@@ -124,36 +165,38 @@ start working on your patch!
 Note that you can also run just one test out of the test suite if you're working
 on a specific area:
 
-    ruby -Itest test/helper_test.rb -n test_buffer_access
+~~~sh
+ruby -Itest test/helper_test.rb -n test_buffer_access
+~~~
 
-Haml supports Ruby 1.8.7 and higher, so please make sure your changes run on
-both 1.9 and 1.8.
+Haml currently supports Ruby 2.7.0 and higher, so please make sure your changes run on 2.7+.
 
 ## Team
 
 ### Current Maintainers
 
-* [Norman Clarke](http://github.com/norman)
-* [Matt Wildig](http://github.com/mattwildig)
+* [Hampton Catlin](https://github.com/hcatlin)
+* [Takashi Kokubun](https://github.com/k0kubun)
 * [Akira Matsuda](https://github.com/amatsuda)
 
 ### Alumni
 
 Haml was created by [Hampton Catlin](http://hamptoncatlin.com), the author of
-the original implementation. Hampton is no longer involved in day-to-day coding,
-but still consults on language issues.
+the original implementation.
 
-[Nathan Weizenbaum](http://nex-3.com) was for many years the primary developer
+[Natalie Weizenbaum](https://github.com/nex3) 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:
 
-## License
-
-Some of Nathan's work on Haml was supported by Unspace Interactive.
+[Norman Clarke](http://github.com/norman)
+[Matt Wildig](https://github.com/mattwildig)
+[Tee Parham](https://github.com/teeparham)
 
-Beyond that, the implementation is licensed under the MIT License.
+## License
 
-Copyright (c) 2006-2013 Hampton Catlin, Nathan Weizenbaum and the Haml team
+Copyright (c) 2006-2021 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