hamlit 0.5.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f26748711e6ecbb403d8f33ca532985d71e47985
-  data.tar.gz: cd5ba0bd80afab05b357a2cfe3cfba9720f3da17
+  metadata.gz: 3179fc842accfe9d500d85b4ab45abccd47cb1eb
+  data.tar.gz: 38eb7023728651efbd6d741b8d3de821e5dfc782
 SHA512:
-  metadata.gz: 5c6363a1a3a810c5aec5d715c31d30e22c04ff6cea3aea763522ea3c06f3e6ede4ea3807101cd631b8c390d753b69c04439377f116d3661db04cb336c2b22fd9
-  data.tar.gz: 81d9ac0d9e57f7c693bcf90f757cd0bc8a54a91a5a608375130704b3cc627a53fe085cf72d9f732342b50b201463e52ade08aee0a8f520ff98b2174977d6464a
+  metadata.gz: 74173d10d57f2419290f473b9b8a419a5f1cee0e371008bcbc1a7c18862796f7ecd18d0ce0bff63c2b44cf63f7f2e8c3be3e7c63919a97cfd061474a20ad0788
+  data.tar.gz: adfacd5b5d7625d66741e9fee4fa5ce3206a490cd91915406ebc758f47c53fe6732ef8bca5e23ca5a74846da9272565067351dba85f9c7d10a64de398c3ef3a5

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v0.6.0
+
+- Automatically escape html in all situations
+  - https://github.com/k0kubun/hamlit/pull/18
+
 ## v0.5.3
 
 - Bugfix for syntax error in data attribute hash

data/README.md

@@ -50,18 +50,9 @@ Hamlit is used on [githubranking.com](http://githubranking.com/).
 Basically the same as [haml](https://github.com/haml/haml).
 Check out the [reference documentation](http://haml.info/docs/yardoc/file.REFERENCE.html) for details.
 
-### Rails
+### Rails, Sinatra
 
-Just update Gemfile.
-
-### Sinatra
-
-For compatibility with Haml, Hamlit does not escape html automatically in sinatra.
-You can enable html escaping manually:
-
-```ruby
-set :haml, { escape_html: true }
-```
+Just update Gemfile. Html escaping is enabled by default.
 
 ## Why high performance?
 ### Less work on runtime

data/Rakefile

@@ -11,16 +11,9 @@ task :spec do
 end
 
 namespace :spec do
-  namespace :update do
-    desc 'Generate converted ugly haml-spec'
-    task :ugly do
-      system('cd spec && rake ugly')
-    end
-
-    desc 'Generate converted pretty haml-spec'
-    task :pretty do
-      system('cd spec && rake pretty')
-    end
+  desc 'Generate converted ugly haml-spec'
+  task :update do
+    system('cd spec && rake ugly')
   end
 end
 

data/benchmarks/benchmark.rb

@@ -34,7 +34,6 @@ class Benchmarks
     fast_erubis = Erubis::FastEruby.new(@erb_code)
     haml_ugly   = Haml::Engine.new(@haml_code, format: :html5, ugly: true)
     tenjin      = Tenjin::Engine.new.get_template(@rbhtml_path)
-    hamlit      = Hamlit::Engine.new(escape_html: true)
 
     context = Context.new
 
@@ -47,7 +46,7 @@ class Benchmarks
       def run_slim_ugly; #{Slim::Engine.new.call @slim_code}; end
       def run_faml; #{Faml::Engine.new.call @haml_code}; end
       def run_tenjin; _buf = ''; #{tenjin.script}; end
-      def run_hamlit; #{hamlit.call @haml_code}; end
+      def run_hamlit; #{Hamlit::Engine.new.call @haml_code}; end
     }
 
     bench('hamlit', Hamlit::VERSION) { context.run_hamlit }

data/lib/hamlit/compiler.rb

@@ -3,7 +3,6 @@ require 'hamlit/compilers/comment'
 require 'hamlit/compilers/doctype'
 require 'hamlit/compilers/dynamic'
 require 'hamlit/compilers/filter'
-require 'hamlit/compilers/preserve'
 require 'hamlit/compilers/script'
 require 'hamlit/compilers/strip'
 require 'hamlit/compilers/text'
@@ -16,7 +15,6 @@ module Hamlit
     include Compilers::Doctype
     include Compilers::Dynamic
     include Compilers::Filter
-    include Compilers::Preserve
     include Compilers::Script
     include Compilers::Strip
     include Compilers::Text

data/lib/hamlit/compilers/attributes.rb

@@ -1,7 +1,6 @@
 require 'hamlit/compilers/new_attribute'
 require 'hamlit/compilers/old_attribute'
 require 'hamlit/compilers/runtime_attribute'
-require 'hamlit/concerns/escapable'
 require 'hamlit/concerns/included'
 
 module Hamlit
@@ -13,8 +12,6 @@ module Hamlit
       include Compilers::RuntimeAttribute
 
       included do
-        include Concerns::Escapable
-
         define_options :format, :attr_quote
       end
 
@@ -41,7 +38,7 @@ module Hamlit
           type, arg = value
           next attr unless name && type && type && arg
 
-          [:html, :attr, name, escape_html(value, true)]
+          [:html, :attr, name, [:escape, true, value]]
         end
       end
 

data/lib/hamlit/compilers/script.rb

@@ -1,20 +1,11 @@
-require 'hamlit/concerns/escapable'
-require 'hamlit/concerns/included'
-
 module Hamlit
   module Compilers
     module Script
-      extend Concerns::Included
-
-      included do
-        include Concerns::Escapable
-      end
-
       def on_haml_script(code, options, *exps)
         variable = result_identifier
 
         assign = [:code, "#{variable} = #{code}"]
-        result = escape_html([:dynamic, variable], options[:force_escape])
+        result = [:escape, true, [:dynamic, variable]]
         result = [:dynamic, variable] if options[:disable_escape]
         [:multi, assign, *exps.map { |exp| compile(exp) }, compile(result)]
       end

data/lib/hamlit/engine.rb

@@ -1,21 +1,19 @@
 require 'temple'
 require 'hamlit/compiler'
-require 'hamlit/html/pretty'
-require 'hamlit/html/ugly'
+require 'hamlit/html'
 require 'hamlit/parser'
 
 module Hamlit
   class Engine < Temple::Engine
     define_options(
-      generator:  Temple::Generators::ArrayBuffer,
-      format:     :html,
-      attr_quote: "'",
-      ugly:       true,
+      generator:   Temple::Generators::ArrayBuffer,
+      format:      :html,
+      attr_quote:  "'",
     )
 
     use Parser
     use Compiler
-    use :Html, -> { create(html_compiler) }
+    use HTML
     filter :Escapable
     filter :ControlFlow
     filter :MultiFlattener
@@ -30,13 +28,5 @@ module Hamlit
       end
       klass.new(valid_options)
     end
-
-    def html_compiler
-      if options[:ugly]
-        HTML::Ugly
-      else
-        HTML::Pretty
-      end
-    end
   end
 end

data/lib/hamlit/html.rb

@@ -0,0 +1,10 @@
+require 'hamlit/concerns/deprecation'
+require 'temple/html/fast'
+
+# This is created to be compatible with Haml's ugly mode.
+# Currently pretty mode is not supported.
+module Hamlit
+  class HTML < Temple::HTML::Fast
+    include Concerns::Deprecation
+  end
+end

data/lib/hamlit/parser.rb

@@ -85,7 +85,7 @@ module Hamlit
       if scanner.scan(/\\/) || scanner.match?(/\#{/)
         return parse_text(scanner)
       elsif scanner.match?(/&=/)
-        return parse_script(scanner, force_escape: true)
+        return parse_script(scanner)
       elsif scanner.match?(/!=/)
         return parse_script(scanner, disable_escape: true)
       elsif scanner.match?(/[.#](\Z|[^a-zA-Z0-9_-])/)
@@ -97,10 +97,8 @@ module Hamlit
         parse_doctype(scanner)
       when '%', '.', '#'
         parse_tag(scanner)
-      when '='
+      when '=', '~'
         parse_script(scanner)
-      when '~'
-        parse_preserve(scanner)
       when '-'
         parse_silent_script(scanner)
       when '/'

data/lib/hamlit/parsers/script.rb

@@ -1,31 +1,24 @@
-require 'hamlit/concerns/escapable'
 require 'hamlit/concerns/error'
-require 'hamlit/concerns/included'
 require 'hamlit/concerns/indentable'
 
 module Hamlit
   module Parsers
     module Script
-      extend Concerns::Included
       include Concerns::Error
       include Concerns::Indentable
 
       INTERNAL_STATEMENTS    = %w[else elsif when].freeze
-      DEFAULT_SCRIPT_OPTIONS = { force_escape: false, disable_escape: false }.freeze
-
-      included do
-        include Concerns::Escapable
-      end
+      DEFAULT_SCRIPT_OPTIONS = { disable_escape: false }.freeze
 
       def parse_script(scanner, options = {})
-        assert_scan!(scanner, /=|&=|!=/)
+        assert_scan!(scanner, /=|&=|!=|~/)
         options = DEFAULT_SCRIPT_OPTIONS.merge(options)
 
         code, with_comment = scan_code(scanner, comment_check: true)
         return syntax_error("There's no Ruby code for = to evaluate.") if code.empty? && !with_comment
         unless has_block?
           return [:dynamic, code] if options[:disable_escape]
-          return escape_html([:dynamic, code], options[:force_escape])
+          return [:escape, true, [:dynamic, code]]
         end
 
         ast = [:haml, :script, code, options]
@@ -34,13 +27,6 @@ module Hamlit
         ast
       end
 
-      def parse_preserve(scanner)
-        assert_scan!(scanner, /~/)
-
-        code = scan_code(scanner)
-        escape_html([:haml, :preserve, code])
-      end
-
       def parse_silent_script(scanner)
         assert_scan!(scanner, /-/)
         if scanner.scan(/#/)

data/lib/hamlit/railtie.rb

@@ -8,9 +8,7 @@ module Hamlit
         Hamlit::Engine,
         generator:   Temple::Generators::RailsOutputBuffer,
         register_as: :haml,
-        escape_html: true,
         streaming:   true,
-        ugly:        true,
       )
 
       # Haml extends Haml::Helpers in ActionView each time.

data/lib/hamlit/version.rb

@@ -1,3 +1,3 @@
 module Hamlit
-  VERSION = "0.5.3"
+  VERSION = "0.6.0"
 end

data/spec/Rakefile

@@ -10,15 +10,21 @@ def generate_spec(mode)
 
     # This is a spec converted by haml-spec.
     # See: https://github.com/haml/haml-spec
-    describe "haml #{mode} mode" do
-      def assert_pretty(haml, locals, options)
-        engine = Haml::Engine.new(haml, options)
-        hamlit = Hamlit::Template.new(options) { haml }
+    describe "haml #{mode} mode with escape_html" do
+      DEFAULT_OPTIONS = { ugly: true, escape_html: true }.freeze
+
+      def assert_haml(haml, locals, options)
+        engine  = Haml::Engine.new(haml, DEFAULT_OPTIONS.merge(options))
+        hamlit  = Hamlit::Template.new(suppress_warnings(options)) { haml }
         expect(hamlit.render(Object.new, locals)).to eq(engine.render(Object.new, locals))
       end
 
-      def assert_ugly(haml, locals, options)
-        assert_pretty(haml, locals, { ugly: true }.merge(options))
+      # NOTE: Hamlit only supports escape_html mode.
+      # Thus the option is not supporeted and prints noisy warnings.
+      def suppress_warnings(options)
+        options = options.dup
+        options.delete(:escape_html)
+        options
       end
 
   SPEC
@@ -51,7 +57,7 @@ def generate_spec(mode)
   end
 
   spec += "end\n"
-  File.write("hamlit/#{mode}_spec.rb", spec)
+  File.write("hamlit/haml_spec.rb", spec)
 end
 
 def generate_specify(test, locals, options, mode)
@@ -61,7 +67,7 @@ def generate_specify(test, locals, options, mode)
       html    = %q{#{test[:html]}}
       locals  = #{locals}
       options = #{options}
-      assert_#{mode}(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
   SPEC
 end
@@ -71,9 +77,4 @@ task :ugly do
   generate_spec(:ugly)
 end
 
-desc 'Convert tests.json into pretty rspec tests'
-task :pretty do
-  generate_spec(:pretty)
-end
-
-task default: [:ugly, :pretty]
+task default: :ugly

data/spec/hamlit/engine/script_spec.rb

@@ -19,7 +19,7 @@ describe Hamlit::Engine do
       HAML
 
         ##
-        ["#", "#"]
+        ["#", "#"]
       HTML
     end
 
@@ -76,7 +76,7 @@ describe Hamlit::Engine do
     end
 
     it 'renders !=' do
-      assert_render(<<-HAML, <<-HTML, escape_html: true)
+      assert_render(<<-HAML, <<-HTML)
         != '<"&>'
         != '<"&>'.tap do |str|
           -# no operation
@@ -87,7 +87,7 @@ describe Hamlit::Engine do
     end
 
     it 'renders &=' do
-      assert_render(<<-HAML, <<-HTML, escape_html: false)
+      assert_render(<<-HAML, <<-HTML)
         &= '<"&>'
         &= '<"&>'.tap do |str|
           -# no operation
@@ -96,5 +96,14 @@ describe Hamlit::Engine do
         &lt;&quot;&amp;&gt;
       HTML
     end
+
+    it 'regards ~ operator as =' do
+      assert_render(<<-'HAML', <<-HTML)
+        ~ "<code>hello\nworld</code>"
+      HAML
+        &lt;code&gt;hello
+        world&lt;/code&gt;
+      HTML
+    end
   end
 end

data/spec/hamlit/engine/silent_script_spec.rb

@@ -154,7 +154,7 @@ describe Hamlit::Engine do
 
     it 'joins a next line if a current line ends with ","' do
       assert_render("- foo = [',  \n     ']\n= foo", <<-HTML)
-        [", "]
+        [&quot;, &quot;]
       HTML
     end
 

data/spec/hamlit/engine_spec.rb

@@ -7,7 +7,6 @@ describe Hamlit::Engine do
       {
         buffer:    buffer,
         generator: Temple::Generators::ArrayBuffer,
-        ugly:      true,
       }
     end
 

data/spec/hamlit/{ugly_spec.rb → haml_spec.rb}

@@ -2,15 +2,21 @@ require "haml"
 
 # This is a spec converted by haml-spec.
 # See: https://github.com/haml/haml-spec
-describe "haml ugly mode" do
-  def assert_pretty(haml, locals, options)
-    engine = Haml::Engine.new(haml, options)
-    hamlit = Hamlit::Template.new(options) { haml }
+describe "haml ugly mode with escape_html" do
+  DEFAULT_OPTIONS = { ugly: true, escape_html: true }.freeze
+
+  def assert_haml(haml, locals, options)
+    engine  = Haml::Engine.new(haml, DEFAULT_OPTIONS.merge(options))
+    hamlit  = Hamlit::Template.new(suppress_warnings(options)) { haml }
     expect(hamlit.render(Object.new, locals)).to eq(engine.render(Object.new, locals))
   end
 
-  def assert_ugly(haml, locals, options)
-    assert_pretty(haml, locals, { ugly: true }.merge(options))
+  # NOTE: Hamlit only supports escape_html mode.
+  # Thus the option is not supporeted and prints noisy warnings.
+  def suppress_warnings(options)
+    options = options.dup
+    options.delete(:escape_html)
+    options
   end
 
   context "headers" do
@@ -19,7 +25,7 @@ describe "haml ugly mode" do
       html    = %q{<?xml version='1.0' encoding='utf-8' ?>}
       locals  = {}
       options = {:format=>:xhtml}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "an XHTML default (transitional) doctype" do
@@ -27,7 +33,7 @@ describe "haml ugly mode" do
       html    = %q{<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">}
       locals  = {}
       options = {:format=>:xhtml}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "an XHTML 1.1 doctype" do
@@ -35,7 +41,7 @@ describe "haml ugly mode" do
       html    = %q{<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">}
       locals  = {}
       options = {:format=>:xhtml}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "an XHTML 1.2 mobile doctype" do
@@ -43,7 +49,7 @@ describe "haml ugly mode" do
       html    = %q{<!DOCTYPE html PUBLIC "-//WAPFORUM//DTD XHTML Mobile 1.2//EN" "http://www.openmobilealliance.org/tech/DTD/xhtml-mobile12.dtd">}
       locals  = {}
       options = {:format=>:xhtml}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "an XHTML 1.1 basic doctype" do
@@ -51,7 +57,7 @@ describe "haml ugly mode" do
       html    = %q{<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.1//EN" "http://www.w3.org/TR/xhtml-basic/xhtml-basic11.dtd">}
       locals  = {}
       options = {:format=>:xhtml}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "an XHTML 1.0 frameset doctype" do
@@ -59,7 +65,7 @@ describe "haml ugly mode" do
       html    = %q{<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">}
       locals  = {}
       options = {:format=>:xhtml}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "an HTML 5 doctype with XHTML syntax" do
@@ -67,7 +73,7 @@ describe "haml ugly mode" do
       html    = %q{<!DOCTYPE html>}
       locals  = {}
       options = {:format=>:xhtml}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "an HTML 5 XML prolog (silent)" do
@@ -75,7 +81,7 @@ describe "haml ugly mode" do
       html    = %q{}
       locals  = {}
       options = {:format=>:html5}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "an HTML 5 doctype" do
@@ -83,7 +89,7 @@ describe "haml ugly mode" do
       html    = %q{<!DOCTYPE html>}
       locals  = {}
       options = {:format=>:html5}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "an HTML 4 XML prolog (silent)" do
@@ -91,7 +97,7 @@ describe "haml ugly mode" do
       html    = %q{}
       locals  = {}
       options = {:format=>:html4}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "an HTML 4 default (transitional) doctype" do
@@ -99,7 +105,7 @@ describe "haml ugly mode" do
       html    = %q{<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">}
       locals  = {}
       options = {:format=>:html4}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "an HTML 4 frameset doctype" do
@@ -107,7 +113,7 @@ describe "haml ugly mode" do
       html    = %q{<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">}
       locals  = {}
       options = {:format=>:html4}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "an HTML 4 strict doctype" do
@@ -115,7 +121,7 @@ describe "haml ugly mode" do
       html    = %q{<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">}
       locals  = {}
       options = {:format=>:html4}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
   end
 
@@ -125,7 +131,7 @@ describe "haml ugly mode" do
       html    = %q{<p></p>}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "a self-closing tag (XHTML)" do
@@ -133,7 +139,7 @@ describe "haml ugly mode" do
       html    = %q{<meta />}
       locals  = {}
       options = {:format=>:xhtml}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "a self-closing tag (HTML4)" do
@@ -141,7 +147,7 @@ describe "haml ugly mode" do
       html    = %q{<meta>}
       locals  = {}
       options = {:format=>:html4}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "a self-closing tag (HTML5)" do
@@ -149,7 +155,7 @@ describe "haml ugly mode" do
       html    = %q{<meta>}
       locals  = {}
       options = {:format=>:html5}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "a self-closing tag ('/' modifier + XHTML)" do
@@ -157,7 +163,7 @@ describe "haml ugly mode" do
       html    = %q{<zzz />}
       locals  = {}
       options = {:format=>:xhtml}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "a self-closing tag ('/' modifier + HTML5)" do
@@ -165,7 +171,7 @@ describe "haml ugly mode" do
       html    = %q{<zzz>}
       locals  = {}
       options = {:format=>:html5}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "a tag with a CSS class" do
@@ -173,7 +179,7 @@ describe "haml ugly mode" do
       html    = %q{<p class='class1'></p>}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "a tag with multiple CSS classes" do
@@ -181,7 +187,7 @@ describe "haml ugly mode" do
       html    = %q{<p class='class1 class2'></p>}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "a tag with a CSS id" do
@@ -189,7 +195,7 @@ describe "haml ugly mode" do
       html    = %q{<p id='id1'></p>}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "a tag with multiple CSS id's" do
@@ -197,7 +203,7 @@ describe "haml ugly mode" do
       html    = %q{<p id='id2'></p>}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "a tag with a class followed by an id" do
@@ -205,7 +211,7 @@ describe "haml ugly mode" do
       html    = %q{<p class='class1' id='id1'></p>}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "a tag with an id followed by a class" do
@@ -213,7 +219,7 @@ describe "haml ugly mode" do
       html    = %q{<p class='class1' id='id1'></p>}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "an implicit div with a CSS id" do
@@ -221,7 +227,7 @@ describe "haml ugly mode" do
       html    = %q{<div id='id1'></div>}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "an implicit div with a CSS class" do
@@ -229,7 +235,7 @@ describe "haml ugly mode" do
       html    = %q{<div class='class1'></div>}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "multiple simple Haml tags" do
@@ -243,7 +249,7 @@ describe "haml ugly mode" do
 </div>}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
   end
 
@@ -253,7 +259,7 @@ describe "haml ugly mode" do
       html    = %q{<ns:tag></ns:tag>}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "a tag with underscores" do
@@ -261,7 +267,7 @@ describe "haml ugly mode" do
       html    = %q{<snake_case></snake_case>}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "a tag with dashes" do
@@ -269,7 +275,7 @@ describe "haml ugly mode" do
       html    = %q{<dashed-tag></dashed-tag>}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "a tag with camelCase" do
@@ -277,7 +283,7 @@ describe "haml ugly mode" do
       html    = %q{<camelCase></camelCase>}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "a tag with PascalCase" do
@@ -285,7 +291,7 @@ describe "haml ugly mode" do
       html    = %q{<PascalCase></PascalCase>}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
   end
 
@@ -295,7 +301,7 @@ describe "haml ugly mode" do
       html    = %q{<div class='123'></div>}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "a class with underscores" do
@@ -303,7 +309,7 @@ describe "haml ugly mode" do
       html    = %q{<div class='__'></div>}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "a class with dashes" do
@@ -311,7 +317,7 @@ describe "haml ugly mode" do
       html    = %q{<div class='--'></div>}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
   end
 
@@ -321,7 +327,7 @@ describe "haml ugly mode" do
       html    = %q{<p>hello</p>}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "Inline content tag with CSS" do
@@ -329,7 +335,7 @@ describe "haml ugly mode" do
       html    = %q{<p class='class1'>hello</p>}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "Inline content multiple simple tags" do
@@ -343,7 +349,7 @@ describe "haml ugly mode" do
 </div>}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
   end
 
@@ -356,7 +362,7 @@ describe "haml ugly mode" do
 </p>}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "Nested content tag with CSS" do
@@ -367,7 +373,7 @@ describe "haml ugly mode" do
 </p>}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "Nested content multiple simple tags" do
@@ -384,7 +390,7 @@ describe "haml ugly mode" do
 </div>}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
   end
 
@@ -394,7 +400,7 @@ describe "haml ugly mode" do
       html    = %q{<p a='b'></p>}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "HTML-style multiple attributes" do
@@ -402,7 +408,7 @@ describe "haml ugly mode" do
       html    = %q{<p a='b' c='d'></p>}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "HTML-style attributes separated with newlines" do
@@ -411,7 +417,7 @@ describe "haml ugly mode" do
       html    = %q{<p a='b' c='d'></p>}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "HTML-style interpolated attribute" do
@@ -419,7 +425,7 @@ describe "haml ugly mode" do
       html    = %q{<p a='value'></p>}
       locals  = {:var=>"value"}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "HTML-style 'class' as an attribute" do
@@ -427,7 +433,7 @@ describe "haml ugly mode" do
       html    = %q{<p class='class1'></p>}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "HTML-style tag with a CSS class and 'class' as an attribute" do
@@ -435,7 +441,7 @@ describe "haml ugly mode" do
       html    = %q{<p class='class1 class2'></p>}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "HTML-style tag with 'id' as an attribute" do
@@ -443,7 +449,7 @@ describe "haml ugly mode" do
       html    = %q{<p id='1'></p>}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "HTML-style tag with a CSS id and 'id' as an attribute" do
@@ -451,7 +457,7 @@ describe "haml ugly mode" do
       html    = %q{<p id='id_1'></p>}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "HTML-style tag with a variable attribute" do
@@ -459,7 +465,7 @@ describe "haml ugly mode" do
       html    = %q{<p class='hello'></p>}
       locals  = {:var=>"hello"}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "HTML-style tag with a CSS class and 'class' as a variable attribute" do
@@ -467,7 +473,7 @@ describe "haml ugly mode" do
       html    = %q{<div class='hello world'></div>}
       locals  = {:var=>"world"}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "HTML-style tag multiple CSS classes (sorted correctly)" do
@@ -475,7 +481,7 @@ describe "haml ugly mode" do
       html    = %q{<div class='a z'></div>}
       locals  = {:var=>"a"}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "HTML-style tag with an atomic attribute" do
@@ -483,7 +489,7 @@ describe "haml ugly mode" do
       html    = %q{<a flag></a>}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
   end
 
@@ -493,7 +499,7 @@ describe "haml ugly mode" do
       html    = %q{<p a='b'></p>}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "Ruby-style attributes hash with whitespace" do
@@ -501,7 +507,7 @@ describe "haml ugly mode" do
       html    = %q{<p a='b'></p>}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "Ruby-style interpolated attribute" do
@@ -509,7 +515,7 @@ describe "haml ugly mode" do
       html    = %q{<p a='value'></p>}
       locals  = {:var=>"value"}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "Ruby-style multiple attributes" do
@@ -517,7 +523,7 @@ describe "haml ugly mode" do
       html    = %q{<p a='b' c='d'></p>}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "Ruby-style attributes separated with newlines" do
@@ -526,7 +532,7 @@ describe "haml ugly mode" do
       html    = %q{<p a='b' c='d'></p>}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "Ruby-style 'class' as an attribute" do
@@ -534,7 +540,7 @@ describe "haml ugly mode" do
       html    = %q{<p class='class1'></p>}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "Ruby-style tag with a CSS class and 'class' as an attribute" do
@@ -542,7 +548,7 @@ describe "haml ugly mode" do
       html    = %q{<p class='class1 class2'></p>}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "Ruby-style tag with 'id' as an attribute" do
@@ -550,7 +556,7 @@ describe "haml ugly mode" do
       html    = %q{<p id='1'></p>}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "Ruby-style tag with a CSS id and 'id' as an attribute" do
@@ -558,7 +564,7 @@ describe "haml ugly mode" do
       html    = %q{<p id='id_1'></p>}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "Ruby-style tag with a CSS id and a numeric 'id' as an attribute" do
@@ -566,7 +572,7 @@ describe "haml ugly mode" do
       html    = %q{<p id='id_1'></p>}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "Ruby-style tag with a variable attribute" do
@@ -574,7 +580,7 @@ describe "haml ugly mode" do
       html    = %q{<p class='hello'></p>}
       locals  = {:var=>"hello"}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "Ruby-style tag with a CSS class and 'class' as a variable attribute" do
@@ -582,7 +588,7 @@ describe "haml ugly mode" do
       html    = %q{<div class='hello world'></div>}
       locals  = {:var=>"world"}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "Ruby-style tag multiple CSS classes (sorted correctly)" do
@@ -590,7 +596,7 @@ describe "haml ugly mode" do
       html    = %q{<div class='a z'></div>}
       locals  = {:var=>"a"}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
   end
 
@@ -600,7 +606,7 @@ describe "haml ugly mode" do
       html    = %q{}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "a nested silent comment" do
@@ -609,7 +615,7 @@ describe "haml ugly mode" do
       html    = %q{}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "a multiply nested silent comment" do
@@ -619,7 +625,7 @@ describe "haml ugly mode" do
       html    = %q{}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "a multiply nested silent comment with inconsistent indents" do
@@ -629,7 +635,7 @@ describe "haml ugly mode" do
       html    = %q{}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
   end
 
@@ -639,7 +645,7 @@ describe "haml ugly mode" do
       html    = %q{<!-- comment -->}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "a nested markup comment" do
@@ -652,7 +658,7 @@ describe "haml ugly mode" do
 -->}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
   end
 
@@ -665,7 +671,7 @@ describe "haml ugly mode" do
 <![endif]-->}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
   end
 
@@ -676,7 +682,7 @@ describe "haml ugly mode" do
       html    = %q{&lt;&amp;&quot;&gt;}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "content in a 'preserve' filter" do
@@ -688,7 +694,7 @@ describe "haml ugly mode" do
 <p></p>}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "content in a 'plain' filter" do
@@ -700,7 +706,7 @@ describe "haml ugly mode" do
 <p></p>}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "content in a 'css' filter (XHTML)" do
@@ -716,7 +722,7 @@ describe "haml ugly mode" do
 <p></p>}
       locals  = {}
       options = {:format=>:xhtml}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "content in a 'javascript' filter (XHTML)" do
@@ -731,7 +737,7 @@ describe "haml ugly mode" do
 <p></p>}
       locals  = {}
       options = {:format=>:xhtml}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "content in a 'css' filter (HTML)" do
@@ -745,7 +751,7 @@ describe "haml ugly mode" do
 <p></p>}
       locals  = {}
       options = {:format=>:html5}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "content in a 'javascript' filter (HTML)" do
@@ -758,7 +764,7 @@ describe "haml ugly mode" do
 <p></p>}
       locals  = {}
       options = {:format=>:html5}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
   end
 
@@ -768,7 +774,7 @@ describe "haml ugly mode" do
       html    = %q{<p>value</p>}
       locals  = {:var=>"value"}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "no interpolation when escaped" do
@@ -776,7 +782,7 @@ describe "haml ugly mode" do
       html    = %q{<p>#{var}</p>}
       locals  = {:var=>"value"}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "interpolation when the escape character is escaped" do
@@ -784,7 +790,7 @@ describe "haml ugly mode" do
       html    = %q{<p>\value</p>}
       locals  = {:var=>"value"}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "interpolation inside filtered content" do
@@ -793,7 +799,7 @@ describe "haml ugly mode" do
       html    = %q{value interpolated: value}
       locals  = {:var=>"value"}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
   end
 
@@ -803,7 +809,7 @@ describe "haml ugly mode" do
       html    = %q{&lt;&quot;&amp;&gt;}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "code following '=' when escape_haml is set to true" do
@@ -811,7 +817,7 @@ describe "haml ugly mode" do
       html    = %q{&lt;&quot;&amp;&gt;}
       locals  = {}
       options = {:escape_html=>"true"}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "code following '!=' when escape_haml is set to true" do
@@ -819,7 +825,7 @@ describe "haml ugly mode" do
       html    = %q{<"&>}
       locals  = {}
       options = {:escape_html=>"true"}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
   end
 
@@ -829,7 +835,7 @@ describe "haml ugly mode" do
       html    = %q{<input checked='checked' />}
       locals  = {}
       options = {:format=>:xhtml}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "boolean attribute with HTML" do
@@ -837,7 +843,7 @@ describe "haml ugly mode" do
       html    = %q{<input checked>}
       locals  = {}
       options = {:format=>:html5}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
   end
 
@@ -848,7 +854,7 @@ describe "haml ugly mode" do
 <pre>Bar&#x000A;Baz</pre>}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "inside a textarea tag" do
@@ -859,7 +865,7 @@ describe "haml ugly mode" do
 hello</textarea>}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "inside a pre tag" do
@@ -870,7 +876,7 @@ hello</textarea>}
 hello</pre>}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
   end
 
@@ -882,7 +888,7 @@ hello</pre>}
       html    = %q{<li>hello</li><li>world</li><li>again</li>}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "a tag with '>' appended and nested content" do
@@ -895,7 +901,7 @@ hello</pre>}
 </li><li>again</li>}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
 
     specify "a tag with '<' appended" do
@@ -906,7 +912,7 @@ hello</pre>}
 world</p>}
       locals  = {}
       options = {}
-      assert_ugly(haml, locals, options)
+      assert_haml(haml, locals, options)
     end
   end
 end