hamlit 1.5.3 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b37fdbe2260e2bb676c56133ab5c61fb5064900
-  data.tar.gz: ae2188f3122c3a02bff15888f0d9891368bd388b
+  metadata.gz: 48cbd681aed1b48f72d46f0256620e5d6d358445
+  data.tar.gz: 804f4570f39a8d92091157197dd26791c908dfd6
 SHA512:
-  metadata.gz: 5ae27755753ed242c704eac31eb066f702f2383b12851fda96accbcc2a20b3887a0c12f87a73fe45154f152e744f8248137dd8930ab2b78db660347544dea17e
-  data.tar.gz: 00af5e2645cf488be39c75708d70e2f14fb23c6f6778b38d74ce82a4d4931e2e010506b53868a260f80ab91a57ec36a36a3a3d28f3439f3b07b6c508d74eae09
+  metadata.gz: 79e74c4d9128dda022f1275ef9adbd1f0f90733b0f0223e836a8985dac426a29620563602d3ccda345296b1ee251da0c92cd0c93c96d6af091eb6b64a844a0b8
+  data.tar.gz: 8567ec9a0f5984c122cfa99d14c8afbf7b55cf29be98f5439d50fd92f169d4200ee2cb3c398802f7c7a21c919c06dce822d3586e1dd7d8135979bcef539796bf

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v1.5.4
+
+- Recursively remove whitespace inside a tag
+- Fix ! operator immediately before whitespace
+
 ## v1.5.3
 
 - Support !, !=, !==, &= and ~ as inline operators

data/lib/hamlit/compilers/strip.rb

@@ -1,30 +1,18 @@
+require 'hamlit/concerns/whitespace'
+
 # This module is created to compile [:haml, :strip],
 # which is sexp for whitespace inner removal.module Hamlit
 module Hamlit
   module Compilers
     module Strip
-      def on_haml_strip(*exps)
-        stripped = strip_newline(exps)
-        on_multi(*stripped)
-      end
-
-      private
+      include Concerns::Whitespace
 
-      def strip_newline(content)
-        indexes = newline_indexes(content)
-
-        content = content.dup
-        content.delete_at(indexes.last)
-        content.delete_at(indexes.first)
-        content
-      end
+      def on_haml_strip(*exps)
+        exps = exps.dup
+        remove_first_space!(exps)
+        remove_last_space!(exps)
 
-      def newline_indexes(exps)
-        indexes = []
-        exps.each_with_index do |exp, index|
-          indexes << index if exp == [:static, "\n"]
-        end
-        indexes
+        on_multi(*exps)
       end
     end
   end

data/lib/hamlit/{parsers → concerns}/whitespace.rb

@@ -1,9 +1,11 @@
 require 'set'
 
-# Hamlit::Parsers::Whitespace cares about "whitespace removal",
+# Hamlit::Concerns::Whitespace cares about "whitespace removal",
 # which is achieved by '<' or '>' after html tag.
+# NOTE: Whitespace means [:static, "\n"] because it is rendered
+# as whitespace on browsers.
 module Hamlit
-  module Parsers
+  module Concerns
     module Whitespace
       def parse_whitespace_removal(scanner)
         if scanner.match?(/</)
@@ -16,20 +18,11 @@ module Hamlit
         inner_removal
       end
 
-      def remove_last_outer_space!(exps)
-        exps.reverse!
-        remove_first_outer_space!(exps)
-      ensure
-        exps.reverse!
-      end
-
-      private
-
-      def remove_first_outer_space!(exps)
+      # `<` removes spaces inside script or silent script recursively.
+      def remove_first_space!(exps)
         deleted = false
-        exps.delete_if do |exp|
-          break if deleted
 
+        exps.delete_if do |exp|
           name, *args = exp
           case name
           when :static
@@ -41,13 +34,30 @@ module Hamlit
           when :newline
             next false
           when :haml
-            remove_last_outer_space!(exp) if args.first == :script
+            # recursive call for script
+            remove_last_space!(exp) if args.first == :script
+          when :multi
+            break if exp == :multi
+            # to flatten multi
+            remove_last_space!(exp)
           end
           break
         end
-        remove_last_outer_space!(exps) if deleted
+
+        # recursive call for silent script
+        remove_last_space!(exps) if deleted
+      end
+
+      def remove_last_space!(exps)
+        exps.reverse!
+        remove_first_space!(exps)
+      ensure
+        exps.reverse!
+        exps
       end
 
+      private
+
       def reset_outer_removal
         @outer_removal = Set.new
         @tag_indent    = 0

data/lib/hamlit/parser.rb

@@ -8,7 +8,6 @@ require 'hamlit/parsers/multiline'
 require 'hamlit/parsers/script'
 require 'hamlit/parsers/tag'
 require 'hamlit/parsers/text'
-require 'hamlit/parsers/whitespace'
 
 module Hamlit
   class Parser < Temple::Parser
@@ -20,7 +19,6 @@ module Hamlit
     include Parsers::Script
     include Parsers::Tag
     include Parsers::Text
-    include Parsers::Whitespace
 
     SKIP_NEWLINE_EXPS    = %i[newline code multi].freeze
     SKIP_NEWLINE_FILTERS = %w[ruby markdown erb].freeze
@@ -56,7 +54,7 @@ module Hamlit
 
         @current_lineno += 1
         node = parse_line(current_line)
-        remove_last_outer_space!(ast) if outer_remove?
+        remove_last_space!(ast) if outer_remove?
 
         ast << [:newline] if @current_indent > 0
         ast << node
@@ -104,7 +102,7 @@ module Hamlit
       return parse_text(scanner, lstrip: true, escape: false) if scanner.scan(/!( |==)/)
       return parse_script(scanner, force_escape: true)        if scanner.match?(/&=/)
       return parse_script(scanner, disable_escape: true)      if scanner.match?(/!=/)
-      return parse_text(scanner, lstrip: true, escape: false) if inline && scanner.scan(/!/)
+      return parse_text(scanner, lstrip: true, escape: false) if scanner.scan(/!/)
 
       case scanner.peek(1)
       when '=', '~'

data/lib/hamlit/parsers/tag.rb

@@ -1,5 +1,6 @@
 require 'hamlit/concerns/error'
 require 'hamlit/concerns/indentable'
+require 'hamlit/concerns/whitespace'
 require 'hamlit/helpers'
 
 module Hamlit
@@ -7,6 +8,7 @@ module Hamlit
     module Tag
       include Concerns::Error
       include Concerns::Indentable
+      include Concerns::Whitespace
 
       TAG_ID_CLASS_REGEXP = /[a-zA-Z0-9_-]+/
       TAG_REGEXP  = /[a-zA-Z0-9\-_:]+/

data/lib/hamlit/version.rb

@@ -1,3 +1,3 @@
 module Hamlit
-  VERSION = "1.5.3"
+  VERSION = "1.5.4"
 end

data/release

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -e
+
+source ./test
+bundle exec rake release

data/spec/hamlit/engine/doctype_spec.rb

@@ -9,7 +9,7 @@ describe Hamlit::Engine do
     end
 
     it 'renders xml doctype' do
-      assert_render(<<-HAML, <<-HTML)
+      assert_render(<<-HAML, <<-HTML, format: :xhtml)
         !!! XML
       HAML
         <?xml version='1.0' encoding='utf-8' ?>

data/spec/hamlit/engine/indent_spec.rb

@@ -1,7 +1,7 @@
 describe Hamlit::Engine do
   describe 'tab indent' do
     it 'accepts tab indentation' do
-      assert_render(<<-HAML, <<-HTML)
+      assert_render(<<-HAML, <<-HTML, compatible_only: :haml)
         %p
         \t%a
       HAML

data/spec/hamlit/engine/multiline_spec.rb

@@ -1,7 +1,7 @@
 describe Hamlit::Engine do
   describe 'multiline' do
     it 'joins multi-lines ending with pipe' do
-      assert_render(<<-HAML, <<-HTML)
+      assert_render(<<-HAML, <<-HTML, compatible_only: [])
         a |
           b |
       HAML

data/spec/hamlit/engine/new_attribute_spec.rb

@@ -18,7 +18,7 @@ describe Hamlit::Engine do
 
     describe 'html escape' do
       it 'escapes attribute values on static attributes' do
-        assert_render(<<-'HAML', <<-HTML)
+        assert_render(<<-'HAML', <<-HTML, compatible_only: :faml)
           %a(title="'")
           %a(title = "'\"")
           %a(href='/search?foo=bar&hoge=<fuga>')
@@ -30,7 +30,7 @@ describe Hamlit::Engine do
       end
 
       it 'escapes attribute values on dynamic attributes' do
-        assert_render(<<-'HAML', <<-HTML)
+        assert_render(<<-'HAML', <<-HTML, compatible_only: :faml)
           - title = "'\""
           - href  = '/search?foo=bar&hoge=<fuga>'
           %a(title=title)

data/spec/hamlit/engine/old_attributes_spec.rb

@@ -41,7 +41,7 @@ describe Hamlit::Engine do
     end
 
     it 'accepts even illegal input for haml' do
-      assert_render(<<-'HAML', <<-HTML)
+      assert_render(<<-'HAML', <<-HTML, error_with: [:haml, :faml])
         %span{ class: '}}}', id: '{}}' } }{
       HAML
         <span class='}}}' id='{}}'>}{</span>
@@ -122,7 +122,7 @@ describe Hamlit::Engine do
       end
 
       it 'joins attribute class and element class' do
-        assert_render(<<-HAML, <<-HTML)
+        assert_render(<<-HAML, <<-HTML, compatible_only: :haml)
           .foo{ class: ['bar'] }
           .foo{ class: ['bar', nil] }
           .foo{ class: ['bar', 'baz'] }
@@ -198,8 +198,9 @@ describe Hamlit::Engine do
         HTML
       end
 
-      it 'does not delete some attributes, for optimization' do
-        assert_render(<<-'HAML', <<-HTML)
+      # NOTE: This incompatibility will not be fixed for performance.
+      it 'does not delete non-boolean attributes, for optimization' do
+        assert_render(<<-'HAML', <<-HTML, compatible_only: []) # wontfix
           - val = false
           %a{ href: val }
           - val = nil
@@ -213,7 +214,7 @@ describe Hamlit::Engine do
 
     describe 'html escape' do
       it 'escapes attribute values on static attributes' do
-        assert_render(<<-'HAML', <<-HTML)
+        assert_render(<<-'HAML', <<-HTML, compatible_only: :faml)
           %a{title: "'"}
           %a{title: "'\""}
           %a{href: '/search?foo=bar&hoge=<fuga>'}
@@ -225,7 +226,7 @@ describe Hamlit::Engine do
       end
 
       it 'escapes attribute values on dynamic attributes' do
-        assert_render(<<-'HAML', <<-HTML)
+        assert_render(<<-'HAML', <<-HTML, compatible_only: :faml)
           - title = "'\""
           - href  = '/search?foo=bar&hoge=<fuga>'
           %a{title: title}
@@ -237,7 +238,7 @@ describe Hamlit::Engine do
       end
 
       it 'escapes attribute values on hash attributes' do
-        assert_render(<<-'HAML', <<-HTML)
+        assert_render(<<-'HAML', <<-HTML, compatible_only: :faml)
           - title = { title: "'\"" }
           - href  = { href:  '/search?foo=bar&hoge=<fuga>' }
           %a{ title }
@@ -260,7 +261,7 @@ describe Hamlit::Engine do
       end
 
       it 'renders true attributes' do
-        assert_render(<<-'HAML', <<-HTML)
+        assert_render(<<-'HAML', <<-HTML, compatible_only: :haml)
           %span{ data: { disable: true } } bar
         HAML
           <span data-disable>bar</span>

data/spec/hamlit/engine/script_spec.rb

@@ -39,7 +39,7 @@ describe Hamlit::Engine do
     end
 
     it 'renders block script' do
-      assert_render(<<-HAML, <<-HTML)
+      assert_render(<<-HAML, <<-HTML, compatible_only: [])
         = 3.times do |i|
           = i
         4
@@ -53,7 +53,7 @@ describe Hamlit::Engine do
     end
 
     it 'renders tag internal block script' do
-      assert_render(<<-HAML, <<-HTML)
+      assert_render(<<-HAML, <<-HTML, compatible_only: [])
         %span
           = 1.times do |i|
             = i
@@ -85,7 +85,7 @@ describe Hamlit::Engine do
     end
 
     it 'renders !=' do
-      assert_render(<<-HAML, <<-HTML, escape_html: true)
+      assert_render(<<-HAML, <<-HTML, escape_html: true, compatible_only: [])
         != '<"&>'
         != '<"&>'.tap do |str|
           -# no operation
@@ -96,7 +96,7 @@ describe Hamlit::Engine do
     end
 
     it 'renders &=' do
-      assert_render(<<-HAML, <<-HTML, escape_html: false)
+      assert_render(<<-HAML, <<-HTML, escape_html: false, compatible_only: [])
         &= '<"&>'
         &= '<"&>'.tap do |str|
           -# no operation

data/spec/hamlit/engine/silent_script_spec.rb

@@ -77,7 +77,7 @@ describe Hamlit::Engine do
     end
 
     it 'renders empty elsif statement' do
-      assert_render(<<-'HAML', <<-HTML)
+      assert_render(<<-'HAML', <<-HTML, compatible_only: :haml, error_with: :faml)
         %span
           - if false
           - elsif false
@@ -88,7 +88,7 @@ describe Hamlit::Engine do
     end
 
     it 'renders empty else statement' do
-      assert_render(<<-'HAML', <<-HTML)
+      assert_render(<<-'HAML', <<-HTML, compatible_only: :haml, error_with: :faml)
         %span
           - if false
             ng
@@ -100,7 +100,7 @@ describe Hamlit::Engine do
     end
 
     it 'renders empty when statement' do
-      assert_render(<<-'HAML', <<-HTML)
+      assert_render(<<-'HAML', <<-HTML, compatible_only: :haml, error_with: :faml)
         %span
           - case
           - when false
@@ -188,7 +188,7 @@ describe Hamlit::Engine do
     end
 
     it 'joins a next line if a current line ends with ","' do
-      assert_render("- foo = [',  \n     ']\n= foo", <<-HTML)
+      assert_render("- foo = [',  \n     ']\n= foo", <<-HTML, compatible_only: :haml)
         [&quot;, &quot;]
       HTML
     end

data/spec/hamlit/engine/tag_spec.rb

@@ -226,7 +226,7 @@ describe Hamlit::Engine do
       end
 
       it 'accepts ! operator' do
-        assert_render(<<-'HAML', <<-'HTML')
+        assert_render(<<-'HAML', <<-'HTML', compatible_only: :faml)
           %span!#{'<nyaa>'}
           %span! #{'<nyaa>'}
           !#{'<nyaa>'}
@@ -234,7 +234,7 @@ describe Hamlit::Engine do
         HAML
           <span><nyaa></span>
           <span><nyaa></span>
-          !&lt;nyaa&gt;
+          <nyaa>
           <nyaa>
         HTML
       end
@@ -297,6 +297,29 @@ describe Hamlit::Engine do
           <span>foofoo2<span>bar</span></span>
         HTML
       end
+
+      it 'removes whitespace inside script inside silent script' do
+        assert_render(<<-HAML, <<-HTML, compatible_only: [:haml, :faml])
+          .bar<
+            - 3.times do
+              = 'foo'
+        HAML
+          <div class='bar'>foofoofoo</div>
+        HTML
+      end
+
+      it 'removes whitespace inside script recursively' do
+        assert_render(<<-HAML, <<-HTML, compatible_only: [:haml, :faml])
+          .foo<
+            - 1.times do
+              = 2.times do
+                - 2.times do
+                  = 1.times do
+                    = 'bar'
+        HAML
+          <div class='foo'>bar1bar1bar1bar12</div>
+        HTML
+      end
     end
   end
 end

data/spec/hamlit/engine/text_spec.rb

@@ -13,7 +13,7 @@ describe Hamlit::Engine do
     end
 
     it 'renders . or # which is not continued by tag name' do
-      assert_render(<<-HAML, <<-HTML)
+      assert_render(<<-HAML, <<-HTML, compatible_only: [], error_with: :haml)
         .
         .*
         #
@@ -72,7 +72,7 @@ describe Hamlit::Engine do
     end
 
     it 'renders ! operator' do
-      assert_render(<<-'HAML', <<-HTML)
+      assert_render(<<-'HAML', <<-HTML, compatible_only: :faml)
         aaa#{'<a>'}
         !aaa#{'<a>'}
         ! aaa#{'<a>'}
@@ -80,10 +80,10 @@ describe Hamlit::Engine do
         !!aa
       HAML
         aaa&lt;a&gt;
-        !aaa&lt;a&gt;
         aaa<a>
         aaa<a>
-        !!aa
+        aaa<a>
+        !aa
       HTML
     end
 
@@ -91,7 +91,7 @@ describe Hamlit::Engine do
       specify { assert_render('#{}', "\n") }
       specify { assert_render('1#{}', "1\n") }
       specify { assert_render('1#{2}', "12\n") }
-      specify { assert_render('1#{2', "1\#{2\n") }
+      specify { assert_render('1#{2', "1\#{2\n", error_with: [:haml, :faml]) }
       specify { assert_render('}#{1}', "}1\n") }
       specify { assert_render('#{1}2', "12\n") }
       specify { assert_render('1#{ "2#{3}4" }5', "12345\n") }
@@ -100,7 +100,7 @@ describe Hamlit::Engine do
       specify { assert_render('あ#{1}', "あ1\n") }
       specify { assert_render('あ#{"い"}う', "あいう\n") }
       specify { assert_render('a#{"<b>"}c', "a&lt;b&gt;c\n") }
-      specify { assert_render(":plain\n  あ\n  \#{'い'}", "あ\nい\n\n") }
+      specify { assert_render(":plain\n  あ\n  \#{'い'}", "あ\nい\n\n", compatible_only: :haml) }
     end
   end
 end

data/spec/hamlit/filters/coffee_spec.rb

@@ -1,7 +1,7 @@
 describe Hamlit::Filters::Coffee do
   describe '#compile' do
     it 'renders coffee filter' do
-      assert_render(<<-HAML, <<-HTML)
+      assert_render(<<-HAML, <<-HTML, compatible_only: :haml)
         :coffee
           foo = ->
             alert('hello')
@@ -20,7 +20,7 @@ describe Hamlit::Filters::Coffee do
     end
 
     it 'renders coffeescript filter' do
-      assert_render(<<-HAML, <<-HTML)
+      assert_render(<<-HAML, <<-HTML, compatible_only: :haml)
         :coffee
           foo = ->
             alert('hello')
@@ -39,7 +39,7 @@ describe Hamlit::Filters::Coffee do
     end
 
     it 'renders coffeescript filter' do
-      assert_render(<<-'HAML', <<-HTML)
+      assert_render(<<-'HAML', <<-HTML, compatible_only: :haml)
         :coffee
           foo = ->
             alert("#{'<&>'}")

data/spec/hamlit/filters/erb_spec.rb

@@ -1,7 +1,7 @@
 describe Hamlit::Filters::Erb do
   describe '#compile' do
     it 'renders erb filter' do
-      assert_render(<<-HAML, <<-HTML)
+      assert_render(<<-HAML, <<-HTML, compatible_only: [], error_with: :faml)
         :erb
           <% if true %>
           ok

data/spec/hamlit/filters/javascript_spec.rb

@@ -1,7 +1,7 @@
 describe Hamlit::Filters::Javascript do
   describe '#compile' do
     it 'just renders script tag for empty filter' do
-      assert_render(<<-HAML, <<-HTML)
+      assert_render(<<-HAML, <<-HTML, compatible_only: [])
         before
         :javascript
         after
@@ -30,7 +30,7 @@ describe Hamlit::Filters::Javascript do
     end
 
     it 'accepts illegal indentation' do
-      assert_render(<<-HAML, <<-HTML)
+      assert_render(<<-HAML, <<-HTML, compatible_only: :faml)
         :javascript
          if {
           alert('hello');

data/spec/hamlit/filters/less_spec.rb

@@ -1,7 +1,7 @@
 describe Hamlit::Filters::Less do
   describe '#compile' do
     it 'renders less filter' do
-      assert_render(<<-HAML, <<-HTML)
+      assert_render(<<-HAML, <<-HTML, compatible_only: :haml, error_with: :faml)
         :less
           .users_controller {
             .show_action {
@@ -20,7 +20,7 @@ describe Hamlit::Filters::Less do
     end
 
     it 'parses string interpolation' do
-      assert_render(<<-'HAML', <<-HTML)
+      assert_render(<<-'HAML', <<-HTML, compatible_only: :haml, error_with: :faml)
         :less
           .foo {
             content: "#{'<&>'}";

data/spec/hamlit/filters/markdown_spec.rb

@@ -13,7 +13,7 @@ describe Hamlit::Filters::Markdown do
     end
 
     it 'renders markdown filter with string interpolation' do
-      assert_render(<<-'HAML', <<-HTML)
+      assert_render(<<-'HAML', <<-HTML, compatible_only: :faml)
         - project = '<Hamlit>'
         :markdown
           # #{project}

data/spec/hamlit/filters/sass_spec.rb

@@ -1,7 +1,7 @@
 describe Hamlit::Filters::Sass do
   describe '#compile' do
     it 'renders sass filter' do
-      assert_render(<<-HAML, <<-HTML)
+      assert_render(<<-HAML, <<-HTML, compatible_only: :haml)
         :sass
           .users_controller
             .show_action
@@ -17,7 +17,7 @@ describe Hamlit::Filters::Sass do
     end
 
     it 'renders sass filter with string interpolation' do
-      assert_render(<<-'HAML', <<-HTML)
+      assert_render(<<-'HAML', <<-HTML, compatible_only: :haml)
         :sass
           .users_controller
             .show_action

data/spec/hamlit/filters/scss_spec.rb

@@ -1,7 +1,7 @@
 describe Hamlit::Filters::Scss do
   describe '#compile' do
     it 'renders scss filter' do
-      assert_render(<<-HAML, <<-HTML)
+      assert_render(<<-HAML, <<-HTML, compatible_only: :haml)
         :scss
           .users_controller {
             .show_action {
@@ -19,7 +19,7 @@ describe Hamlit::Filters::Scss do
     end
 
     it 'parses string interpolation' do
-      assert_render(<<-'HAML', <<-HTML)
+      assert_render(<<-'HAML', <<-HTML, compatible_only: :haml)
         :scss
           .users_controller {
             .show_action {

data/spec/spec_helper.rb

@@ -1,7 +1,11 @@
+require 'haml'
+require 'faml'
 require 'hamlit'
 require 'unindent'
 
 module HamlitSpecHelper
+  DEFAULT_OPTIONS = { ugly: true, escape_html: true }.freeze
+
   def parse_string(str)
     Hamlit::Parser.new.call(str)
   end
@@ -11,10 +15,21 @@ module HamlitSpecHelper
   end
 
   def assert_render(haml, html, options = {})
-    haml = haml.unindent
-    html = html.unindent
+    errs  = array_wrap(options.delete(:error_with) || [])
+    impls = array_wrap(options.delete(:compatible_only) || [:haml, :faml] - errs)
+    haml  = haml.unindent
+    html  = html.unindent
 
     expect(render_string(haml, options)).to eq(html)
+    impls.each do |impl|
+      expect_compatibility(impl, haml, options)
+    end
+    errs.each do |impl|
+      expect_compatibility(impl, haml, options, type: :error)
+    end
+    ([:haml, :faml] - impls - errs).each do |impl|
+      expect_compatibility(impl, haml, options, type: :failure)
+    end
   end
 
   def assert_parse(haml, &block)
@@ -28,6 +43,58 @@ module HamlitSpecHelper
     result = described_class.new.call(before)
     expect(result).to eq(after)
   end
+
+  private
+
+  def expect_compatibility(impl, haml, options, type: :success)
+    case impl
+    when :haml
+      expect_haml(haml, options, type: type)
+    when :faml
+      expect_faml(haml, options, type: type)
+    end
+  end
+
+  def expect_faml(haml, options, type: :success)
+    hamlit_html = render_string(haml, options)
+    options = options.dup
+    options.delete(:escape_html)
+
+    case type
+    when :success
+      faml_html = eval Faml::Engine.new(options).call(haml)
+      expect(hamlit_html).to eq(faml_html)
+    when :failure
+      faml_html = eval Faml::Engine.new(options).call(haml)
+      expect(hamlit_html).to_not eq(faml_html)
+    when :error
+      expect {
+        eval Faml::Engine.new(options).call(haml)
+      }.to raise_error
+    end
+  end
+
+  def expect_haml(haml, options, type: :success)
+    hamlit_html = render_string(haml, options)
+    options = DEFAULT_OPTIONS.merge(options)
+    case type
+    when :success
+      haml_html = Haml::Engine.new(haml, options).render(Object.new, {})
+      expect(hamlit_html).to eq(haml_html)
+    when :failure
+      haml_html = Haml::Engine.new(haml, options).render(Object.new, {})
+      expect(hamlit_html).to_not eq(haml_html)
+    when :error
+      expect {
+        Haml::Engine.new(haml, options).render(Object.new, {})
+      }.to raise_error
+    end
+  end
+
+  def array_wrap(arr)
+    return arr if arr.is_a?(Array)
+    [arr]
+  end
 end
 
 RSpec.configure do |config|

data/test

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+set -e
+trap 'rm .ruby-version' 0
+
+VERSIONS=(
+  2.0.0
+  2.1.6
+  2.2.2
+)
+
+function test_with() {
+  version=$1
+  rbenv local $version
+  ruby -v
+  rake spec
+}
+
+for version in ${VERSIONS[@]}; do
+  test_with $version
+done
+
+rbenv local ${VERSIONS[2]}
+ruby -v
+rake rails:spec

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hamlit
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-06 00:00:00.000000000 Z
+date: 2015-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape_utils
@@ -339,6 +339,7 @@ files:
 - lib/hamlit/concerns/registerable.rb
 - lib/hamlit/concerns/ripperable.rb
 - lib/hamlit/concerns/string_interpolation.rb
+- lib/hamlit/concerns/whitespace.rb
 - lib/hamlit/engine.rb
 - lib/hamlit/filters/base.rb
 - lib/hamlit/filters/coffee.rb
@@ -365,11 +366,11 @@ files:
 - lib/hamlit/parsers/script.rb
 - lib/hamlit/parsers/tag.rb
 - lib/hamlit/parsers/text.rb
-- lib/hamlit/parsers/whitespace.rb
 - lib/hamlit/railtie.rb
 - lib/hamlit/template.rb
 - lib/hamlit/temple.rb
 - lib/hamlit/version.rb
+- release
 - spec/Rakefile
 - spec/hamlit/engine/comment_spec.rb
 - spec/hamlit/engine/doctype_spec.rb
@@ -458,6 +459,7 @@ files:
 - spec/rails/vendor/assets/javascripts/.keep
 - spec/rails/vendor/assets/stylesheets/.keep
 - spec/spec_helper.rb
+- test
 homepage: https://github.com/k0kubun/hamlit
 licenses:
 - MIT
@@ -571,3 +573,4 @@ test_files:
 - spec/rails/vendor/assets/javascripts/.keep
 - spec/rails/vendor/assets/stylesheets/.keep
 - spec/spec_helper.rb
+has_rdoc: