Merge ScriptCompiler into Compiler

lib/hamlit/compiler.rb

@@ -1,10 +1,14 @@
 require 'hamlit/compilers/doctype'
 require 'hamlit/compilers/preserve'
+require 'hamlit/compilers/script'
+require 'hamlit/concerns/escapable'
 require 'hamlit/filter'
 
 module Hamlit
   class Compiler < Hamlit::Filter
     include Compilers::Doctype
     include Compilers::Preserve
+    include Compilers::Script
+    include Concerns::Escapable
   end
 end

lib/hamlit/compilers/script.rb

@@ -0,0 +1,26 @@
+require 'hamlit/filter'
+require 'hamlit/concerns/escapable'
+
+module Hamlit
+  module Compilers
+    module Script
+      def on_haml_script(*exps)
+        exps     = exps.dup
+        variable = result_identifier
+        code     = exps.shift
+
+        assign = [:code, "#{variable} = #{code}"]
+        result = escape_html([:dynamic, variable])
+        [:multi, assign, *exps.map { |exp| compile(exp) }, result]
+      end
+
+      private
+
+      def result_identifier
+        @id_auto_increment ||= -1
+        @id_auto_increment += 1
+        "_hamlit_compiler#{@id_auto_increment}"
+      end
+    end
+  end
+end

lib/hamlit/engine.rb

@@ -10,7 +10,6 @@ require 'hamlit/html/ugly'
 require 'hamlit/multiline'
 require 'hamlit/new_attribute_compiler'
 require 'hamlit/parser'
-require 'hamlit/script_compiler'
 require 'hamlit/text_compiler'
 
 module Hamlit
@@ -30,7 +29,6 @@ module Hamlit
     use AttributeSorter
     use FilterFormatter
     use FilterCompiler
-    use ScriptCompiler
     use TextCompiler
     use DynamicFormatter
     use :Html, -> { create(html_compiler) }

lib/hamlit/script_compiler.rb

@@ -1,26 +0,0 @@
-require 'hamlit/filter'
-require 'hamlit/concerns/escapable'
-
-module Hamlit
-  class ScriptCompiler < Hamlit::Filter
-    include Concerns::Escapable
-
-    def on_haml_script(*exps)
-      exps     = exps.dup
-      variable = result_identifier
-      code     = exps.shift
-
-      assign = [:code, "#{variable} = #{code}"]
-      result = escape_html([:dynamic, variable])
-      [:multi, assign, *exps.map { |exp| compile(exp) }, result]
-    end
-
-    private
-
-    def result_identifier
-      @id_auto_increment ||= -1
-      @id_auto_increment += 1
-      "_hamlit_compiler#{@id_auto_increment}"
-    end
-  end
-end

spec/hamlit/compilers/script_spec.rb

@@ -1,5 +1,5 @@
-describe Hamlit::ScriptCompiler do
-  describe '#call' do
+describe Hamlit::Compiler do
+  describe 'script' do
     it 'does not alter single-line script' do
       assert_compile(
         [:multi,