fast_haml 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec965b362a4b85f320d2144ebc3117d16476505a
-  data.tar.gz: 4cdd71b4c7664e6fe6e9bf74f225be290b02456e
+  metadata.gz: d8aa3367427fc4d33e2ff57ba8f1988f31be1047
+  data.tar.gz: da9216a9d2cc12bfdc92b90a9df75f1912876459
 SHA512:
-  metadata.gz: 4e8e90941f16081fba0ffc531cdcbc84fba4cf65ff629ebfcee51b50ad65660c78b4b92fbe965afa7798e3407567cdddc2064317fd996cec82c140a015831f71
-  data.tar.gz: f461f513f3e2d5249156e5dcc399216c777057431ebb5027bedcc372bd25e15d1374b961267d0d62af159250747a175ab66f27d3c4ccdc380bdae797ec44007b
+  metadata.gz: 53802e8411247cecffb2987fde99ec569dfea66b73a1240ee9a33361f4c2e4ba7a2b13892f1952be33e8b84b75b56de75f93be0c93c40e2029eeeb2df7211a28
+  data.tar.gz: 8ec843e6e5946ae0fefcd3d04c3d7c62649a042a038641c716fc498ae60bdc163645f99503424e4a0191ae4ced649f8c276327671d1f579b478bdc298d319eb1

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.1.9 (2015-03-18)
+- Refactor script parser (internal)
+- Fix newline generation with filters
+- Support sass, scss and coffee filter
+
 ## 0.1.8 (2015-03-17)
 - Fix whitespace removal (`<` and `>`) behavior
     - Internally, new instructions `mknl` and `rmnl` are added.

data/fast_haml.gemspec

@@ -26,10 +26,12 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "appraisal"
   spec.add_development_dependency "benchmark-ips"
   spec.add_development_dependency "bundler"
+  spec.add_development_dependency "coffee-script"
   spec.add_development_dependency "coveralls"
   spec.add_development_dependency "haml"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rake-compiler"
   spec.add_development_dependency "rspec", ">= 3"
+  spec.add_development_dependency "sass"
   spec.add_development_dependency "simplecov"
 end

data/lib/fast_haml/compiler.rb

@@ -168,18 +168,9 @@ module FastHaml
       ]
 
       if ast.oneline_child
-         temple << compile(ast.oneline_child)
+        temple << compile(ast.oneline_child)
       elsif !ast.children.empty?
-        children = [:multi]
-        unless nuke_inner_whitespace?(ast)
-          children << [:mknl]
-        end
-        children << [:newline]
-        compile_children(ast, children)
-        if nuke_inner_whitespace?(ast)
-          children << [:rmnl]
-        end
-        temple << children
+        temple << compile_element_children(ast)
       end
 
       if ast.nuke_outer_whitespace
@@ -193,6 +184,19 @@ module FastHaml
       ast.self_closing || options[:autoclose].include?(ast.tag_name)
     end
 
+    def compile_element_children(ast)
+      children = [:multi]
+      unless nuke_inner_whitespace?(ast)
+        children << [:mknl]
+      end
+      children << [:newline]
+      compile_children(ast, children)
+      if nuke_inner_whitespace?(ast)
+        children << [:rmnl]
+      end
+      children
+    end
+
     def nuke_inner_whitespace?(ast)
       ast.nuke_inner_whitespace || options[:preserve].include?(ast.tag_name)
     end
@@ -274,6 +278,16 @@ module FastHaml
     end
 
     def build_optimized_attributes(parser, static_id, static_class)
+      static_attributes = build_optimized_static_attributes(parser, static_id, static_class)
+      dynamic_attributes = build_optimized_dynamic_attributes(parser, static_attributes)
+      if dynamic_attributes
+        [static_attributes, dynamic_attributes]
+      else
+        [nil, nil]
+      end
+    end
+
+    def build_optimized_static_attributes(parser, static_id, static_class)
       static_attributes = {}
       parser.static_attributes.each do |k, v|
         static_attributes[k.to_s] = v
@@ -284,20 +298,22 @@ module FastHaml
       unless static_id.empty?
         static_attributes['id'] = [static_id, static_attributes['id']].compact.join('_')
       end
+      static_attributes
+    end
 
+    def build_optimized_dynamic_attributes(parser, static_attributes)
       dynamic_attributes = {}
       parser.dynamic_attributes.each do |k, v|
         k = k.to_s
         if static_attributes.has_key?(k)
           if StaticHashParser::SPECIAL_ATTRIBUTES.include?(k)
             # XXX: Quit optimization
-            return [nil, nil]
+            return nil
           end
         end
         dynamic_attributes[k] = v
       end
-
-      [static_attributes, dynamic_attributes]
+      dynamic_attributes
     end
 
     def compile_static_attribute(key, value)

data/lib/fast_haml/element_parser.rb

@@ -2,20 +2,19 @@ require 'strscan'
 require 'fast_haml/ast'
 require 'fast_haml/parser_utils'
 require 'fast_haml/ruby_multiline'
+require 'fast_haml/script_parser'
 require 'fast_haml/syntax_error'
 
 module FastHaml
   class ElementParser
-    def initialize(text, lineno, line_parser)
-      @text = text
-      @lineno = lineno
+    def initialize(line_parser)
       @line_parser = line_parser
     end
 
     ELEMENT_REGEXP = /\A%([-:\w]+)([-:\w.#]*)(.+)?\z/o
 
-    def parse
-      m = @text.match(ELEMENT_REGEXP)
+    def parse(text)
+      m = text.match(ELEMENT_REGEXP)
       unless m
         syntax_error!('Invalid element declaration')
       end
@@ -28,7 +27,7 @@ module FastHaml
       element.attributes, rest = parse_attributes(rest)
       element.nuke_inner_whitespace, element.nuke_outer_whitespace, rest = parse_nuke_whitespace(rest)
       element.self_closing, rest = parse_self_closing(rest)
-      element.oneline_child = parse_oneline_child(rest)
+      element.oneline_child = ScriptParser.new(@line_parser).parse(rest)
 
       element
     end
@@ -229,60 +228,8 @@ module FastHaml
       end
     end
 
-    def parse_oneline_child(rest)
-      case rest[0]
-      when '=', '~'
-        if rest[1] == '='
-          Ast::Text.new(rest[2 .. -1].strip)
-        else
-          script = rest[1 .. -1].lstrip
-          if script.empty?
-            syntax_error!('No Ruby code to evaluate')
-          end
-          script += RubyMultiline.read(@line_parser, script)
-          Ast::Script.new([], script)
-        end
-      when '&'
-        case
-        when rest.start_with?('&==')
-          Ast::Text.new(rest[3 .. -1].lstrip)
-        when rest[1] == '=' || rest[1] == '~'
-          script = rest[2 .. -1].lstrip
-          if script.empty?
-            syntax_error!('No Ruby code to evaluate')
-          end
-          script += RubyMultiline.read(@line_parser, script)
-          Ast::Script.new([], script, true, rest[1] == '~')
-        else
-          Ast::Text.new(rest[1 .. -1].strip)
-        end
-      when '!'
-        case
-        when rest.start_with?('!==')
-          Ast::Text.new(rest[3 .. -1].lstrip, false)
-        when rest[1] == '=' || rest[1] == '~'
-          script = rest[2 .. -1].lstrip
-          if script.empty?
-            syntax_error!('No Ruby code to evaluate')
-          end
-          script += RubyMultiline.read(@line_parser, script)
-          Ast::Script.new([], script, false, rest[1] == '~')
-          Ast::Script.new([], script, false, true)
-        else
-          Ast::Text.new(rest[1 .. -1].lstrip, false)
-        end
-      else
-        rest = rest.lstrip
-        if rest.empty?
-          nil
-        else
-          Ast::Text.new(rest)
-        end
-      end
-    end
-
     def syntax_error!(message)
-      raise SyntaxError.new(message, @lineno)
+      raise SyntaxError.new(message, @line_parser.lineno)
     end
   end
 end

data/lib/fast_haml/filter_compilers.rb

@@ -29,9 +29,12 @@ module FastHaml
 end
 
 require 'fast_haml/filter_compilers/cdata'
+require 'fast_haml/filter_compilers/coffee'
 require 'fast_haml/filter_compilers/css'
 require 'fast_haml/filter_compilers/escaped'
 require 'fast_haml/filter_compilers/javascript'
 require 'fast_haml/filter_compilers/plain'
 require 'fast_haml/filter_compilers/preserve'
 require 'fast_haml/filter_compilers/ruby'
+require 'fast_haml/filter_compilers/sass'
+require 'fast_haml/filter_compilers/scss'

data/lib/fast_haml/filter_compilers/base.rb

@@ -7,9 +7,11 @@ module FastHaml
 
       def compile_texts(temple, texts, tab_width: 0)
         tabs = ' ' * tab_width
+        texts = strip_last_empty_lines(texts)
         texts.each do |text|
           temple << [:static, tabs] << text_compiler.compile(text) << [:static, "\n"] << [:newline]
         end
+        temple.pop  # discard last [:newline]
         nil
       end
 

data/lib/fast_haml/filter_compilers/cdata.rb

@@ -4,8 +4,8 @@ module FastHaml
   module FilterCompilers
     class Cdata < Base
       def compile(texts)
-        temple = [:multi, [:static, "<![CDATA[\n"]]
-        compile_texts(temple, strip_last_empty_lines(texts), tab_width: 4)
+        temple = [:multi, [:static, "<![CDATA[\n"], [:newline]]
+        compile_texts(temple, texts, tab_width: 4)
         temple << [:static, "]]>"]
       end
     end

data/lib/fast_haml/filter_compilers/coffee.rb

@@ -0,0 +1,14 @@
+require 'fast_haml/filter_compilers/tilt_base'
+
+module FastHaml
+  module FilterCompilers
+    class Coffee < TiltBase
+      def compile(texts)
+        temple = compile_with_tilt('coffee', texts)
+        [:haml, :tag, 'script', false, [:html, :attrs], [:html, :js, temple]]
+      end
+    end
+
+    register(:coffee, Coffee)
+  end
+end

data/lib/fast_haml/filter_compilers/css.rb

@@ -4,8 +4,8 @@ module FastHaml
   module FilterCompilers
     class Css < Base
       def compile(texts)
-        temple = [:multi, [:static, "\n"]]
-        compile_texts(temple, strip_last_empty_lines(texts), tab_width: 2)
+        temple = [:multi, [:static, "\n"], [:newline]]
+        compile_texts(temple, texts, tab_width: 2)
         [:haml, :tag, 'style', false, [:html, :attrs], temple]
       end
     end

data/lib/fast_haml/filter_compilers/escaped.rb

@@ -6,8 +6,8 @@ module FastHaml
       include Temple::Utils
 
       def compile(texts)
-        temple = [:multi]
-        compile_texts(temple, strip_last_empty_lines(texts))
+        temple = [:multi, [:newline]]
+        compile_texts(temple, texts)
         escape_code = Temple::Filters::Escapable.new.instance_variable_get(:@escape_code)
         sym = unique_name
         [:multi,

data/lib/fast_haml/filter_compilers/javascript.rb

@@ -4,8 +4,8 @@ module FastHaml
   module FilterCompilers
     class Javascript < Base
       def compile(texts)
-        temple = [:multi, [:static, "\n"]]
-        compile_texts(temple, strip_last_empty_lines(texts), tab_width: 2)
+        temple = [:multi, [:static, "\n"], [:newline]]
+        compile_texts(temple, texts, tab_width: 2)
         [:haml, :tag, 'script', false, [:html, :attrs], [:html, :js, temple]]
       end
     end

data/lib/fast_haml/filter_compilers/plain.rb

@@ -4,10 +4,14 @@ module FastHaml
   module FilterCompilers
     class Plain < Base
       def compile(texts)
-        temple = [:multi]
+        temple = [:multi, [:newline]]
         texts = strip_last_empty_lines(texts)
-        compile_texts(temple, texts[0 .. -2])
-        temple << text_compiler.compile(texts[-1]) << [:newline]
+        texts.each do |text|
+          temple << text_compiler.compile(text)
+          unless texts.last.equal?(text)
+            temple << [:static, "\n"] << [:newline]
+          end
+        end
         temple
       end
     end

data/lib/fast_haml/filter_compilers/preserve.rb

@@ -6,13 +6,12 @@ module FastHaml
       include Temple::Utils
 
       def compile(texts)
-        temple = [:multi]
+        temple = [:multi, [:newline]]
         texts.each do |text|
           temple << text_compiler.compile(text)
           unless texts.last.equal?(text)
-            temple << [:static, "\n"]
+            temple << [:static, "\n"] << [:newline]
           end
-          temple << [:newline]
         end
         sym = unique_name
         [:multi,

data/lib/fast_haml/filter_compilers/ruby.rb

@@ -4,7 +4,7 @@ module FastHaml
   module FilterCompilers
     class Ruby < Base
       def compile(texts)
-        [:multi, [:code, strip_last_empty_lines(texts).join("\n")], [:newline]]
+        [:multi, [:newline], [:code, strip_last_empty_lines(texts).join("\n")]]
       end
     end
 

data/lib/fast_haml/filter_compilers/sass.rb

@@ -0,0 +1,14 @@
+require 'fast_haml/filter_compilers/tilt_base'
+
+module FastHaml
+  module FilterCompilers
+    class Sass < TiltBase
+      def compile(texts)
+        temple = compile_with_tilt('sass', texts)
+        [:haml, :tag, 'style', false, [:html, :attrs], temple]
+      end
+    end
+
+    register(:sass, Sass)
+  end
+end

data/lib/fast_haml/filter_compilers/scss.rb

@@ -0,0 +1,14 @@
+require 'fast_haml/filter_compilers/tilt_base'
+
+module FastHaml
+  module FilterCompilers
+    class Scss < TiltBase
+      def compile(texts)
+        temple = compile_with_tilt('scss', texts)
+        [:haml, :tag, 'style', false, [:html, :attrs], temple]
+      end
+    end
+
+    register(:scss, Scss)
+  end
+end

data/lib/fast_haml/filter_compilers/tilt_base.rb

@@ -0,0 +1,36 @@
+require 'temple'
+require 'tilt'
+require 'fast_haml/filter_compilers/base'
+require 'fast_haml/text_compiler'
+
+module FastHaml
+  module FilterCompilers
+    class TiltBase < Base
+      include Temple::Utils
+
+      def self.render_with_tilt(name, source)
+        ::Tilt["t.#{name}"].new { source }.render
+      end
+
+      protected
+
+      def compile_with_tilt(name, texts)
+        source = texts.join("\n")
+        temple = [:multi, [:static, "\n"], [:newline]]
+        if TextCompiler.contains_interpolation?(source)
+          text_temple = [:multi]
+          compile_texts(text_temple, texts)
+          sym = unique_name
+          temple << [:capture, sym, text_temple]
+          temple << [:dynamic, "::FastHaml::FilterCompilers::TiltBase.render_with_tilt(#{name.inspect}, #{sym})"]
+          temple << [:newline]
+        else
+          compiled = self.class.render_with_tilt(name, source)
+          temple << [:static, compiled]
+          temple.concat([[:newline]] * (texts.size - 1))
+        end
+        temple
+      end
+    end
+  end
+end

data/lib/fast_haml/parser.rb

@@ -5,6 +5,7 @@ require 'fast_haml/indent_tracker'
 require 'fast_haml/line_parser'
 require 'fast_haml/parser_utils'
 require 'fast_haml/ruby_multiline'
+require 'fast_haml/script_parser'
 require 'fast_haml/syntax_error'
 
 module FastHaml
@@ -42,18 +43,14 @@ module FastHaml
 
     private
 
-
     DOCTYPE_PREFIX = '!'
     ELEMENT_PREFIX = '%'
-    SCRIPT_PREFIX = '='
     COMMENT_PREFIX = '/'
     SILENT_SCRIPT_PREFIX = '-'
     DIV_ID_PREFIX = '#'
     DIV_CLASS_PREFIX = '.'
     FILTER_PREFIX = ':'
     ESCAPE_PREFIX = '\\'
-    PRESERVE_PREFIX = '~'
-    SANITIZE_PREFIX = '&'
 
     def parse_line(line)
       text, indent = @indent_tracker.process(line, @line_parser.lineno)
@@ -74,54 +71,25 @@ module FastHaml
       when ELEMENT_PREFIX
         parse_element(text)
       when DOCTYPE_PREFIX
-        case
-        when text.start_with?('!!!')
+        if text.start_with?('!!!')
           parse_doctype(text)
-        when text.start_with?('!==')
-          parse_plain(text[3 .. -1].lstrip, escape_html: false)
-        when text[1] == SCRIPT_PREFIX
-          parse_script(text)
-        when text[1] == PRESERVE_PREFIX
-          parse_script("!=#{text[2 .. -1].lstrip}", preserve: true)
-        when text[1] == ' '
-          parse_plain(text[1 .. -1].lstrip, escape_html: false)
         else
-          parse_plain(text)
+          parse_script(text)
         end
       when COMMENT_PREFIX
         parse_comment(text)
-      when SCRIPT_PREFIX
-        if text[1] == SCRIPT_PREFIX
-          parse_plain(text[2 .. -1].strip)
-        else
-          parse_script(text)
-        end
       when SILENT_SCRIPT_PREFIX
         parse_silent_script(text)
-      when PRESERVE_PREFIX
-        # preserve has no meaning in non-html_escape mode
-        parse_script(text)
       when DIV_ID_PREFIX, DIV_CLASS_PREFIX
         if text.start_with?('#{')
-          parse_plain(text)
+          parse_script(text)
         else
           parse_line("#{indent}%div#{text}")
         end
       when FILTER_PREFIX
         parse_filter(text)
-      when SANITIZE_PREFIX
-        case
-        when text.start_with?('&==')
-          parse_plain(text[3 .. -1].lstrip)
-        when text[1] == SCRIPT_PREFIX
-          parse_script(text)
-        when text[1] == PRESERVE_PREFIX
-          parse_script("&=#{text[2 .. -1].lstrip}", preserve: true)
-        else
-          parse_plain(text[1 .. -1].strip)
-        end
       else
-        parse_plain(text)
+        parse_script(text)
       end
     end
 
@@ -152,30 +120,16 @@ module FastHaml
       end
     end
 
-    def parse_plain(text, escape_html: true)
-      @ast << Ast::Text.new(text, escape_html)
+    def parse_plain(text)
+      @ast << Ast::Text.new(text)
     end
 
     def parse_element(text)
-      @ast << ElementParser.new(text, @line_parser.lineno, @line_parser).parse
+      @ast << ElementParser.new(@line_parser).parse(text)
     end
 
-    def parse_script(text, preserve: false)
-      m = text.match(/\A([!&~])?[=~] *(.*)\z/)
-      script = m[2]
-      if script.empty?
-        syntax_error!("No Ruby code to evaluate")
-      end
-      script += RubyMultiline.read(@line_parser, script)
-      node = Ast::Script.new([], script)
-      case m[1]
-      when '!'
-        node.escape_html = false
-      when '&'
-        node.escape_html = true
-      end
-      node.preserve = preserve
-      @ast << node
+    def parse_script(text)
+      @ast << ScriptParser.new(@line_parser).parse(text)
     end
 
     def parse_silent_script(text)

data/lib/fast_haml/script_parser.rb

@@ -0,0 +1,84 @@
+require 'fast_haml/ast'
+require 'fast_haml/ruby_multiline'
+require 'fast_haml/syntax_error'
+
+module FastHaml
+  class ScriptParser
+    def initialize(line_parser)
+      @line_parser = line_parser
+    end
+
+    def parse(text)
+      case text[0]
+      when '=', '~'
+        parse_script(text)
+      when '&'
+        parse_sanitized(text)
+      when '!'
+        parse_unescape(text)
+      else
+        parse_text(text)
+      end
+    end
+
+    private
+
+    def parse_script(text)
+      if text[1] == '='
+        Ast::Text.new(text[2 .. -1].strip)
+      else
+        script = text[1 .. -1].lstrip
+        if script.empty?
+          syntax_error!('No Ruby code to evaluate')
+        end
+        script += RubyMultiline.read(@line_parser, script)
+        Ast::Script.new([], script)
+      end
+    end
+
+    def parse_sanitized(text)
+      case
+      when text.start_with?('&==')
+        Ast::Text.new(text[3 .. -1].lstrip)
+      when text[1] == '=' || text[1] == '~'
+        script = text[2 .. -1].lstrip
+        if script.empty?
+          syntax_error!('No Ruby code to evaluate')
+        end
+        script += RubyMultiline.read(@line_parser, script)
+        Ast::Script.new([], script, true, text[1] == '~')
+      else
+        Ast::Text.new(text[1 .. -1].strip)
+      end
+    end
+
+    def parse_unescape(text)
+      case
+      when text.start_with?('!==')
+        Ast::Text.new(text[3 .. -1].lstrip, false)
+      when text[1] == '=' || text[1] == '~'
+        script = text[2 .. -1].lstrip
+        if script.empty?
+          syntax_error!('No Ruby code to evaluate')
+        end
+        script += RubyMultiline.read(@line_parser, script)
+        Ast::Script.new([], script, false, text[1] == '~')
+      else
+        Ast::Text.new(text[1 .. -1].lstrip, false)
+      end
+    end
+
+    def parse_text(text)
+      text = text.lstrip
+      if text.empty?
+        nil
+      else
+        Ast::Text.new(text)
+      end
+    end
+
+    def syntax_error!(message)
+      raise SyntaxError.new(message, @line_parser.lineno)
+    end
+  end
+end

data/lib/fast_haml/text_compiler.rb

@@ -11,21 +11,21 @@ module FastHaml
     end
 
     def compile(text, escape_html: @escape_html)
-      if contains_interpolation?(text)
+      if self.class.contains_interpolation?(text)
         compile_interpolation(text, escape_html: escape_html)
       else
         [:static, text]
       end
     end
 
-    private
-
     INTERPOLATION_BEGIN = /(\\*)(#[\{$@])/o
 
-    def contains_interpolation?(text)
+    def self.contains_interpolation?(text)
       INTERPOLATION_BEGIN === text
     end
 
+    private
+
     def compile_interpolation(text, escape_html: @escape_html)
       s = StringScanner.new(text)
       temple = [:multi]

data/lib/fast_haml/version.rb

@@ -1,3 +1,3 @@
 module FastHaml
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

data/spec/compiler_newline_spec.rb

@@ -94,4 +94,45 @@ HAML
 HAML
     end
   end
+
+  context 'with tilt filters' do
+    it 'keeps newlines in filter' do
+      expect { render_string(<<'HAML') }.to raise_error(LineVerifier, raised_at(4))
+:scss
+  nav {
+    ul {
+      margin: #{raise LineVerifier}px;
+    }
+  }
+HAML
+    end
+
+    it 'keeps newlines after filter' do
+      expect { render_string(<<'HAML') }.to raise_error(LineVerifier, raised_at(8))
+:scss
+  nav {
+    ul {
+      margin: 0;
+    }
+  }
+
+%span= raise LineVerifier
+HAML
+    end
+
+    context 'with interpolation' do
+      it 'keeps newlines after filter' do
+        expect { render_string(<<'HAML') }.to raise_error(LineVerifier, raised_at(8))
+:scss
+  nav {
+    ul {
+      margin: #{0 + 5}px;
+    }
+  }
+
+%span= raise LineVerifier
+HAML
+      end
+    end
+  end
 end

data/spec/render/doctype_spec.rb

@@ -1,11 +1,6 @@
 require 'spec_helper'
 
 RSpec.describe 'Doctype rendering', type: :render do
-  it 'ignores 1 or 2 exclamation marks' do
-    expect(render_string('!')).to eq("!\n")
-    expect(render_string('!!')).to eq("!!\n")
-  end
-
   context 'with html format' do
     it 'renders html5 doctype by default' do
       expect(render_string('!!!')).to eq("<!DOCTYPE html>\n")

data/spec/render/filters/coffee_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+RSpec.describe 'CoffeeScript filter rendering', type: :render do
+  it 'renders CoffeeScript filter' do
+    html = render_string(<<HAML)
+:coffee
+  square = (x) -> x * x
+  square(3)
+HAML
+    expect(html).to include('<script>')
+    expect(html).to include('square = function(x)')
+    expect(html).to include('square(3)')
+  end
+
+  it 'parses string interpolation' do
+    html = render_string(<<'HAML')
+:coffee
+  square = (x) -> x * x
+  square(#{1 + 2})
+HAML
+    expect(html).to include('<script>')
+    expect(html).to include('square = function(x)')
+    expect(html).to include('square(3)')
+  end
+end

data/spec/render/filters/javascript_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-RSpec.describe 'JavaScript filter renderiong', type: :render do
+RSpec.describe 'JavaScript filter rendering', type: :render do
   it 'renders javascript filter' do
     expect(render_string(<<HAML)).to eq("<div>\n<script>\n  alert('hello');\n</script>\n<span>world</span>\n</div>\n")
 %div

data/spec/render/filters/sass_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+RSpec.describe 'SASS filter rendering', type: :render do
+  it 'renders SASS filter' do
+    html = render_string(<<'HAML')
+:sass
+  nav
+    ul
+      margin: 0
+      content: "hello"
+HAML
+    expect(html).to include('<style>')
+    expect(html).to include('nav ul {')
+    expect(html).to include('content: "hello"')
+  end
+
+   it 'parses string interpolation' do
+    html = render_string(<<'HAML')
+:sass
+  nav
+    ul
+      margin: #{0 + 5}px
+HAML
+    expect(html).to include('<style>')
+    expect(html).to include('nav ul {')
+    expect(html).to include('margin: 5px')
+  end
+end

data/spec/render/filters/scss_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+RSpec.describe 'SCSS filter rendering', type: :render do
+  it 'renders SCSS filter' do
+    html = render_string(<<'HAML')
+:scss
+  nav {
+    ul {
+      margin: 0;
+      content: "hello";
+    }
+  }
+HAML
+    expect(html).to include('<style>')
+    expect(html).to include('nav ul {')
+    expect(html).to include('content: "hello"')
+  end
+
+   it 'parses string interpolation' do
+    html = render_string(<<'HAML')
+:scss
+  nav {
+    ul {
+      margin: #{0 + 5}px;
+    }
+  }
+HAML
+    expect(html).to include('<style>')
+    expect(html).to include('nav ul {')
+    expect(html).to include('margin: 5px')
+  end
+end

data/spec/render/unescape_spec.rb

@@ -14,6 +14,11 @@ HAML
     expect(render_string('%span! <p>hello</p>')).to eq("<span><p>hello</p></span>\n")
   end
 
+  it 'ignores single Unescape mark without spaces' do
+    expect(render_string('!<p>hello</p>')).to eq("<p>hello</p>\n")
+    expect(render_string('%span!<p>hello</p>')).to eq("<span><p>hello</p></span>\n")
+  end
+
   it 'has effect on string interpolation in plain' do
     expect(render_string('! <p>#{"<strong>hello</strong>"}</p>')).to eq("<p><strong>hello</strong></p>\n")
     expect(render_string('%span! <p>#{"<strong>hello</strong>"}</p>')).to eq("<span><p><strong>hello</strong></p></span>\n")

data/spec/spec_helper.rb

@@ -31,8 +31,6 @@ RSpec.configure do |config|
 
   config.disable_monkey_patching!
 
-  config.warnings = true
-
   if config.files_to_run.one?
     config.default_formatter = 'doc'
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fast_haml
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-17 00:00:00.000000000 Z
+date: 2015-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape_utils
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coffee-script
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -178,6 +192,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3'
+- !ruby/object:Gem::Dependency
+  name: sass
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -231,12 +259,16 @@ files:
 - lib/fast_haml/filter_compilers.rb
 - lib/fast_haml/filter_compilers/base.rb
 - lib/fast_haml/filter_compilers/cdata.rb
+- lib/fast_haml/filter_compilers/coffee.rb
 - lib/fast_haml/filter_compilers/css.rb
 - lib/fast_haml/filter_compilers/escaped.rb
 - lib/fast_haml/filter_compilers/javascript.rb
 - lib/fast_haml/filter_compilers/plain.rb
 - lib/fast_haml/filter_compilers/preserve.rb
 - lib/fast_haml/filter_compilers/ruby.rb
+- lib/fast_haml/filter_compilers/sass.rb
+- lib/fast_haml/filter_compilers/scss.rb
+- lib/fast_haml/filter_compilers/tilt_base.rb
 - lib/fast_haml/filter_parser.rb
 - lib/fast_haml/html.rb
 - lib/fast_haml/indent_tracker.rb
@@ -247,6 +279,7 @@ files:
 - lib/fast_haml/rails_handler.rb
 - lib/fast_haml/railtie.rb
 - lib/fast_haml/ruby_multiline.rb
+- lib/fast_haml/script_parser.rb
 - lib/fast_haml/static_hash_parser.rb
 - lib/fast_haml/syntax_error.rb
 - lib/fast_haml/text_compiler.rb
@@ -311,12 +344,15 @@ files:
 - spec/render/doctype_spec.rb
 - spec/render/element_spec.rb
 - spec/render/filters/cdata_spec.rb
+- spec/render/filters/coffee_spec.rb
 - spec/render/filters/css_spec.rb
 - spec/render/filters/escaped_spec.rb
 - spec/render/filters/javascript_spec.rb
 - spec/render/filters/plain_spec.rb
 - spec/render/filters/preserve_spec.rb
 - spec/render/filters/ruby_spec.rb
+- spec/render/filters/sass_spec.rb
+- spec/render/filters/scss_spec.rb
 - spec/render/filters_spec.rb
 - spec/render/haml_comment_spec.rb
 - spec/render/multiline_spec.rb
@@ -413,12 +449,15 @@ test_files:
 - spec/render/doctype_spec.rb
 - spec/render/element_spec.rb
 - spec/render/filters/cdata_spec.rb
+- spec/render/filters/coffee_spec.rb
 - spec/render/filters/css_spec.rb
 - spec/render/filters/escaped_spec.rb
 - spec/render/filters/javascript_spec.rb
 - spec/render/filters/plain_spec.rb
 - spec/render/filters/preserve_spec.rb
 - spec/render/filters/ruby_spec.rb
+- spec/render/filters/sass_spec.rb
+- spec/render/filters/scss_spec.rb
 - spec/render/filters_spec.rb
 - spec/render/haml_comment_spec.rb
 - spec/render/multiline_spec.rb