Revert "Drop escape_html option"

This reverts commit 27b29846a0.

lib/hamlit/compilers/attributes.rb

@@ -1,6 +1,7 @@
 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
@@ -12,6 +13,8 @@ module Hamlit
       include Compilers::RuntimeAttribute
 
       included do
+        include Concerns::Escapable
+
         define_options :format, :attr_quote
       end
 
@@ -38,7 +41,7 @@ module Hamlit
           type, arg = value
           next attr unless name && type && type && arg
 
-          [:html, :attr, name, [:escape, true, value]]
+          [:html, :attr, name, escape_html(value, true)]
         end
       end
 

lib/hamlit/compilers/script.rb

@@ -1,11 +1,20 @@
+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, true, [:dynamic, variable]]
+        result = escape_html([:dynamic, variable], options[:force_escape])
         result = [:dynamic, variable] if options[:disable_escape]
         [:multi, assign, *exps.map { |exp| compile(exp) }, compile(result)]
       end

lib/hamlit/concerns/escapable.rb

@@ -0,0 +1,17 @@
+require 'hamlit/concerns/included'
+
+module Hamlit
+  module Concerns
+    module Escapable
+      extend Included
+
+      included do
+        define_options escape_html: false
+      end
+
+      def escape_html(exp, force_escape = false)
+        [:escape, force_escape || @options[:escape_html], exp]
+      end
+    end
+  end
+end

lib/hamlit/engine.rb

@@ -10,6 +10,7 @@ module Hamlit
       generator:   Temple::Generators::ArrayBuffer,
       format:      :html,
       attr_quote:  "'",
+      escape_html: true,
     )
 
     use Parser

lib/hamlit/parser.rb

@@ -86,7 +86,7 @@ module Hamlit
       if scanner.scan(/\\/) || scanner.match?(/\#{/)
         return parse_text(scanner)
       elsif scanner.match?(/&=/)
-        return parse_script(scanner)
+        return parse_script(scanner, force_escape: true)
       elsif scanner.match?(/!=/)
         return parse_script(scanner, disable_escape: true)
       elsif scanner.match?(/[.#](\Z|[^a-zA-Z0-9_-])/)

lib/hamlit/parsers/script.rb

@@ -1,14 +1,21 @@
+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 = { disable_escape: false }.freeze
+      DEFAULT_SCRIPT_OPTIONS = { force_escape: false, disable_escape: false }.freeze
+
+      included do
+        include Concerns::Escapable
+      end
 
       def parse_script(scanner, options = {})
         assert_scan!(scanner, /=|&=|!=|~/)
@@ -18,7 +25,7 @@ module Hamlit
         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, true, [:dynamic, code]]
+          return escape_html([:dynamic, code], options[:force_escape])
         end
 
         ast = [:haml, :script, code, options]

lib/hamlit/railtie.rb

@@ -8,6 +8,7 @@ module Hamlit
         Hamlit::Engine,
         generator:   Temple::Generators::RailsOutputBuffer,
         register_as: :haml,
+        escape_html: true,
         streaming:   true,
       )
 

spec/Rakefile

@@ -10,23 +10,15 @@ def generate_spec(mode)
 
     # This is a spec converted by haml-spec.
     # See: https://github.com/haml/haml-spec
-    describe "haml #{mode} mode with escape_html" do
+    describe "haml #{mode} mode with ecape_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 }
+        hamlit  = Hamlit::Template.new(options) { haml }
         expect(hamlit.render(Object.new, locals)).to eq(engine.render(Object.new, locals))
       end
 
-      # 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
 
   url = 'https://raw.githubusercontent.com/haml/haml-spec/master/tests.json'

spec/hamlit/compilers/script_spec.rb

@@ -0,0 +1,46 @@
+describe Hamlit::Compiler do
+  describe 'script' do
+    let(:options) do
+      { force_escape: false, disable_escape: false }
+    end
+
+    it 'compiles hamlit script ast into assigning' do
+      assert_compile(
+        [:haml,
+         :script,
+         'link_to user_path do',
+         options,
+         [:static, 'user']],
+        [:multi,
+         [:code, "_hamlit_compiler0 = link_to user_path do"],
+         [:static, "user"],
+         [:escape, false, [:dynamic, "(_hamlit_compiler0).to_s"]]],
+      )
+    end
+
+    it 'compiles multiple hamlit scripts' do
+      assert_compile(
+        [:multi,
+         [:haml,
+          :script,
+          'link_to user_path do',
+          options,
+          [:static, 'user']],
+         [:haml,
+          :script,
+          'link_to repo_path do',
+          options,
+          [:static, 'repo']]],
+        [:multi,
+         [:multi,
+          [:code, "_hamlit_compiler0 = link_to user_path do"],
+          [:static, "user"],
+          [:escape, false, [:dynamic, "(_hamlit_compiler0).to_s"]]],
+         [:multi,
+          [:code, "_hamlit_compiler1 = link_to repo_path do"],
+          [:static, "repo"],
+          [:escape, false, [:dynamic, "(_hamlit_compiler1).to_s"]]]],
+      )
+    end
+  end
+end

spec/hamlit/engine/script_spec.rb

@@ -76,7 +76,7 @@ describe Hamlit::Engine do
     end
 
     it 'renders !=' do
-      assert_render(<<-HAML, <<-HTML)
+      assert_render(<<-HAML, <<-HTML, escape_html: true)
         != '<"&>'
         != '<"&>'.tap do |str|
           -# no operation
@@ -87,7 +87,7 @@ describe Hamlit::Engine do
     end
 
     it 'renders &=' do
-      assert_render(<<-HAML, <<-HTML)
+      assert_render(<<-HAML, <<-HTML, escape_html: false)
         &= '<"&>'
         &= '<"&>'.tap do |str|
           -# no operation

spec/hamlit/haml_spec.rb

@@ -2,23 +2,15 @@ require "haml"
 
 # This is a spec converted by haml-spec.
 # See: https://github.com/haml/haml-spec
-describe "haml ugly mode with escape_html" do
+describe "haml ugly mode with ecape_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 }
+    hamlit  = Hamlit::Template.new(options) { haml }
     expect(hamlit.render(Object.new, locals)).to eq(engine.render(Object.new, locals))
   end
 
-  # 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
     specify "an XHTML XML prolog" do
       haml    = %q{!!! XML}