haml 4.0.6 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00b001616cbcf722d8dd8f3e4a99d7895d1ce34b
-  data.tar.gz: b87d0bfe9067818b38abf03b6c0d3128cb9f4fb6
+  metadata.gz: 7fa1e64aca629e46493a148b6159feb77763ba0d
+  data.tar.gz: 912f3565b782829c0651604333a0d5fd823c45a1
 SHA512:
-  metadata.gz: a0872b7e36195c11d167e066ab51c8006d9c4f50130caa2947f058897c57b2960d619ecee6379782fbbd1a4c908d588c3895ad5a4a24bf5ba90f216272005b14
-  data.tar.gz: 2271653d27a61a75e130fed6dad51e02ebed14e61123448731c910b21e679fc8bb64d3fa5ea55604a1354c7b66dd907ba5e03a8fe6c53dcb484fb79ab1a607b6
+  metadata.gz: d8e860a0fc047d158a7a1d08f349a5555ae9a0afd578327c16cca624c3c0425a323e40cc3185f8ba8fede3ed79d24babb44f634969a69707a46f27d92b925b15
+  data.tar.gz: f3e66b26cf401ac0081721f44322a4fe39c0b0c486d6b4b0dd7e665e483be86f6f1769a0c94ed00b2646e3d76fb7be0ebe2e40c75943c0a5774e38cb3f17a4e2

data/.yardopts

@@ -1,7 +1,7 @@
 --charset          utf-8
 --readme           README.md
 --markup           markdown
---markup-provider  maruku
+--markup-provider  kramdown
 --template-path    yard
 --default-return   ""
 --title            "Haml Documentation"

data/CHANGELOG.md

@@ -1,10 +1,55 @@
 # Haml Changelog
 
+## 5.0.0
+
+Released on April 26, 2017
+([diff](https://github.com/haml/haml/compare/4.0.7...5.0.0)).
+
+* 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/).
+  (Tee Parham)
+* 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)
+* General performance and memory usage improvements. (Akira Matsuda)
+* Don't treat the 'data' attribute specially when merging attribute hashes. (Matt Wildig and Norman Clarke)
+* 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).
+* Fix #@foo and #$foo style interpolation that was not working in html_safe mode. (Akira Matsuda)
+* Add `haml_tag_if` to render a block, conditionally wrapped in another element (Matt Wildig)
+* Escape Ruby script interpolated in filters. (Matt Wildig)
+* The `haml` command's debug option (`-d`) no longer executes the Haml code, but
+  rather checks the generated Ruby syntax for errors.
+* Support Rails 5.1 Erubi template handler.
+* Support Sprockets 3. Thanks [Sam Davies](https://github.com/samphilipd) and [Jeremy Venezia](https://github.com/jvenezia).
+* Allow `@` as tag's class name. Thanks [Joe Bartlett](https://github.com/redoPop).
+* Raise `Haml::InvalidAttributeNameError` when attribute name includes invalid characters. (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)
+* Add temple gem as dependency and create `Haml::TempleEngine` class.
+  Some methods in `Haml::Compiler` are migrated to `Haml::TempleEngine`. (Takashi Kokubun)
+* Drop parser/compiler accessor from `Haml::Engine`. Modify `Haml::Engine#initialize` options
+  or `Haml::Template.options` instead. (Takashi Kokubun)
+* Don't ignore unexpected exceptions on initializing `ActionView::OutputBuffer`. (Takashi Kokubun)
+* Analyze attribute values by Ripper and render static attributes beforehand. (Takashi Kokubun)
+* Optimize attribute rendering about 3x faster. (Takashi Kokubun)
+
+## 4.0.7
+
+Released on August 10, 2015
+([diff](https://github.com/haml/haml/compare/4.0.6...4.0.7)).
+
+* Significantly improve performance of regexp used to fix whitespace handling in textareas (thanks [Stan Hu](https://github.com/stanhu)).
+
 ## 4.0.6
 
 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
@@ -69,7 +114,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
@@ -106,7 +151,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))
 
@@ -525,7 +570,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).
 
@@ -1354,3 +1398,4 @@ has been moved to [YARD](http://yard.soen.ca).
 YARD is an excellent documentation system,
 and allows us to write our documentation in [Maruku](http://maruku.rubyforge.org),
 which is also excellent.
+>>>>>>> External Changes

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/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2006-2009 Hampton Catlin and Nathan Weizenbaum
+Copyright (c) 2006-2009 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

data/README.md

@@ -1,6 +1,10 @@
 # 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=master)](http://travis-ci.org/haml/haml)
+[![Code Climate](http://img.shields.io/codeclimate/github/haml/haml.svg)](https://codeclimate.com/github/haml/haml)
+[![Coverage Status](http://img.shields.io/coveralls/haml/haml.svg)](https://coveralls.io/r/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
@@ -12,23 +16,38 @@ that's both powerful and easy to understand.
 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 programatically, 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'
+~~~
+
+Haml 5 will require Rails version 4.0 or later. If you are using Rails 3.x, you should use Haml version 4.0.x:
+
+~~~ruby
+gem 'haml', '~> 4.0.5'
+~~~
+
 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,18 +165,19 @@ 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.0.0 and higher, so please make sure your changes run on 2.0+.
 
 ## Team
 
 ### Current Maintainers
 
-* [Norman Clarke](http://github.com/norman)
-* [Matt Wildig](http://github.com/mattwildig)
 * [Akira Matsuda](https://github.com/amatsuda)
+* [Matt Wildig](https://github.com/mattwildig)
+* [Tee Parham](https://github.com/teeparham)
 
 ### Alumni
 
@@ -143,17 +185,18 @@ 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.
 
-[Nathan Weizenbaum](http://nex-3.com) 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.
 
+[Norman Clarke](http://github.com/norman) was the primary maintainer of Haml from 2012 to 2016.
 
 ## License
 
-Some of Nathan's work on Haml was supported by Unspace Interactive.
+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-2013 Hampton Catlin, Nathan Weizenbaum and the Haml team
+Copyright (c) 2006-2013 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