faml 0.2.16 → 0.3.0

data/lib/faml/compiler.rb

@@ -1,6 +1,6 @@
 require 'parser/current'
 require 'temple'
-require 'faml/ast'
+require 'haml_parser/ast'
 require 'faml/error'
 require 'faml/filter_compilers'
 require 'faml/helpers'
@@ -55,25 +55,25 @@ module Faml
 
     def compile(ast)
       case ast
-      when Ast::Root
+      when HamlParser::Ast::Root
         compile_root(ast)
-      when Ast::Doctype
+      when HamlParser::Ast::Doctype
         compile_doctype(ast)
-      when Ast::HtmlComment
+      when HamlParser::Ast::HtmlComment
         compile_html_comment(ast)
-      when Ast::HamlComment
+      when HamlParser::Ast::HamlComment
         compile_haml_comment(ast)
-      when Ast::Empty
+      when HamlParser::Ast::Empty
         [:multi]
-      when Ast::Element
+      when HamlParser::Ast::Element
         compile_element(ast)
-      when Ast::Script
+      when HamlParser::Ast::Script
         compile_script(ast)
-      when Ast::SilentScript
+      when HamlParser::Ast::SilentScript
         compile_silent_script(ast)
-      when Ast::Text
+      when HamlParser::Ast::Text
         compile_text(ast)
-      when Ast::Filter
+      when HamlParser::Ast::Filter
         compile_filter(ast)
       else
         raise "InternalError: Unknown AST node #{ast.class}: #{ast.inspect}"
@@ -108,13 +108,13 @@ module Faml
 
     def need_newline?(child)
       case child
-      when Ast::Script
+      when HamlParser::Ast::Script
         child.children.empty?
-      when Ast::SilentScript, Ast::HamlComment, Ast::Empty
+      when HamlParser::Ast::SilentScript, HamlParser::Ast::HamlComment, HamlParser::Ast::Empty
         false
-      when Ast::Element
+      when HamlParser::Ast::Element
         !child.nuke_outer_whitespace
-      when Ast::Filter
+      when HamlParser::Ast::Filter
         FilterCompilers.find(child.name).need_newline?
       else
         true
@@ -122,11 +122,11 @@ module Faml
     end
 
     def suppress_code_newline?(ast)
-      ast.is_a?(Ast::Script) ||
-        ast.is_a?(Ast::SilentScript) ||
-        (ast.is_a?(Ast::Element) && suppress_code_newline?(ast.oneline_child)) ||
-        (ast.is_a?(Ast::Element) && !ast.children.empty?) ||
-        (ast.is_a?(Ast::HtmlComment) && !ast.conditional.empty?)
+      ast.is_a?(HamlParser::Ast::Script) ||
+        ast.is_a?(HamlParser::Ast::SilentScript) ||
+        (ast.is_a?(HamlParser::Ast::Element) && suppress_code_newline?(ast.oneline_child)) ||
+        (ast.is_a?(HamlParser::Ast::Element) && !ast.children.empty?) ||
+        (ast.is_a?(HamlParser::Ast::HtmlComment) && !ast.conditional.empty?)
     end
 
     def compile_text(ast)
@@ -373,9 +373,7 @@ module Faml
       else
         temple << [:code, "#{sym} = #{ast.script}"] << [:newline]
         compile_children(ast, temple)
-        if !ast.mid_block_keyword
-          temple << [:code, 'end']
-        end
+        temple << [:code, 'end']
       end
       if !ast.escape_html && ast.preserve
         temple << [:haml, :preserve, sym]

data/lib/faml/engine.rb

@@ -2,7 +2,7 @@ require 'temple'
 require 'faml/compiler'
 require 'faml/html'
 require 'faml/newline'
-require 'faml/parser'
+require 'haml_parser/parser'
 
 module Faml
   class Engine < Temple::Engine
@@ -11,7 +11,7 @@ module Faml
       filename: nil,
     )
 
-    use Parser
+    use HamlParser::Parser
     use Compiler
     use Html
     filter :Escapable

data/lib/faml/text_compiler.rb

@@ -1,6 +1,6 @@
 require 'strscan'
 require 'faml/error'
-require 'faml/parser_utils'
+require 'haml_parser/utils'
 
 module Faml
   class TextCompiler
@@ -59,7 +59,7 @@ module Faml
 
     def find_close_brace(scanner, lineno)
       pos = scanner.pos
-      depth = ParserUtils.balance(scanner, '{', '}')
+      depth = HamlParser::Utils.balance(scanner, '{', '}')
       if depth != 0
         raise InvalidInterpolation.new(scanner.string, lineno)
       else

data/lib/faml/version.rb

@@ -1,3 +1,3 @@
 module Faml
-  VERSION = "0.2.16"
+  VERSION = "0.3.0"
 end

data/spec/rails/spec/requests/faml_spec.rb

@@ -54,7 +54,7 @@ RSpec.describe 'Faml with Rails', type: :request do
   end
 
   describe 'compile time errors' do
-    describe Faml::SyntaxError do
+    describe HamlParser::Error do
       it 'has proper backtrace' do
         expect { get '/books/syntax_error' }.to raise_error { |e|
           expect(e.backtrace[0]).to end_with('app/views/books/syntax_error.html.haml:2')
@@ -62,7 +62,7 @@ RSpec.describe 'Faml with Rails', type: :request do
       end
     end
 
-    describe Faml::IndentTracker::IndentMismatch do
+    describe HamlParser::IndentTracker::IndentMismatch do
       it 'has proper backtrace' do
         expect { get '/books/indent_error' }.to raise_error { |e|
           expect(e.backtrace[0]).to end_with('app/views/books/indent_error.html.haml:3')

data/spec/render/attribute_spec.rb

@@ -9,10 +9,6 @@ RSpec.describe 'Attributes rendering', type: :render do
     expect(render_string('%span{class: "x", "old" => 2} hello')).to eq(%Q{<span class='x' old='2'>hello</span>\n})
   end
 
-  it 'is not element with id attribute' do
-    expect(render_string('#{1 + 2}')).to eq("3\n")
-  end
-
   it 'renders attributes with symbol literal' do
     expect(render_string("%span{foo: 'baz'}")).to eq("<span foo='baz'></span>\n")
     expect(render_string("%span{:foo => 'baz'}")).to eq("<span foo='baz'></span>\n")
@@ -76,10 +72,6 @@ HAML
     expect(render_string(%q|%span{class: "x\"y'z"} hello|)).to eq(%Q{<span class='x&quot;y&#39;z'>hello</span>\n})
   end
 
-  it "doesn't parse extra brace" do
-    expect(render_string('%span{foo: 1}{bar: 2}')).to eq("<span foo='1'>{bar: 2}</span>\n")
-  end
-
   it 'renders only name if value is true' do
     expect(render_string(%q|%span{foo: true, bar: 1} hello|)).to eq(%Q{<span bar='1' foo>hello</span>\n})
   end
@@ -142,26 +134,6 @@ HAML
     expect(render_string("- h = {foo_bar: 'baz'}\n%span{data: h}")).to eq("<span data-foo-bar='baz'></span>\n")
   end
 
-  context 'with unmatched brace' do
-    it 'raises error' do
-      expect { render_string('%span{foo hello') }.to raise_error(Faml::SyntaxError)
-    end
-
-    it 'tries to parse next lines' do
-      expect(render_string(<<HAML)).to eq("<span bar='2' foo='1'>hello</span>\n")
-%span{foo: 1,
-bar: 2} hello
-HAML
-    end
-
-    it "doesn't try to parse next lines without trailing comma" do
-      expect { render_string(<<HAML) }.to raise_error(Faml::SyntaxError)
-%span{foo: 1
-, bar: 2} hello
-HAML
-    end
-  end
-
   context 'with data attributes' do
     it 'renders nested attributes' do
       expect(render_string(%q|%span{data: {foo: 1, bar: 'baz', :hoge => :fuga, k1: { k2: 'v3' }}} hello|)).to eq(%Q{<span data-bar='baz' data-foo='1' data-hoge='fuga' data-k1-k2='v3'>hello</span>\n})
@@ -189,90 +161,4 @@ HAML
   a: __LINE__}
 HAML
   end
-
-  describe 'with HTML-style attributes' do
-    it 'parses simple values' do
-      expect(render_string('%span(foo=1 bar=3) hello')).to eq("<span bar='3' foo='1'>hello</span>\n")
-    end
-
-    it 'parses variables' do
-      expect(render_string(<<HAML)).to eq("<span bar='3' foo='xxx'>hello</span>\n")
-- foo = 'xxx'
-%span(foo=foo bar=3) hello
-HAML
-    end
-
-    it 'parses attributes with old syntax' do
-      expect(render_string(<<HAML)).to eq("<span bar='3' foo='foo'>hello</span>\n")
-- foo = 'foo'
-%span(foo=foo){bar: 3} hello
-HAML
-    end
-
-    it 'parses multiline attribute list' do
-      expect(render_string(<<HAML)).to eq("<span data-bar='2' data-foo='1'>\n<span>hello</span>\n</span>\n")
-%span{data: {foo: 1,
-  bar: 2}}
-  %span hello
-HAML
-    end
-
-    it 'parses HTML-style multiline attribute list' do
-      expect(render_string(<<HAML)).to eq("<span bar='3' foo='1'>hello</span>\n")
-%span(foo=1
-
-bar=3) hello
-HAML
-    end
-
-    it "doesn't parse extra parens" do
-      expect(render_string('%span(foo=1)(bar=3) hello')).to eq("<span foo='1'>(bar=3) hello</span>\n")
-    end
-
-    it 'parses quoted value' do
-      expect(render_string('%span(foo=1 bar="baz") hello')).to eq("<span bar='baz' foo='1'>hello</span>\n")
-      expect(render_string("%span(foo=1 bar='baz') hello")).to eq("<span bar='baz' foo='1'>hello</span>\n")
-    end
-
-    it 'parses key-only attribute' do
-      expect(render_string('%span(foo bar=1) hello')).to eq("<span bar='1' foo>hello</span>\n")
-    end
-
-    it 'renders string interpolation' do
-      expect(render_string(%q|%span(foo=1 bar="baz#{1 + 2}") hello|)).to eq("<span bar='baz3' foo='1'>hello</span>\n")
-      expect(render_string(%q|%span(foo=1 bar='baz#{1 + 2}') hello|)).to eq("<span bar='baz3' foo='1'>hello</span>\n")
-    end
-
-    it 'parses escapes' do
-      expect(render_string(%q|%span(foo=1 bar="ba\"z") hello|)).to eq("<span bar='ba&quot;z' foo='1'>hello</span>\n")
-      expect(render_string(%q|%span(foo=1 bar='ba\'z') hello|)).to eq("<span bar='ba&#39;z' foo='1'>hello</span>\n")
-    end
-
-    it 'raises error when attributes list is unterminated' do
-      expect { render_string('%span(foo=1 bar=2') }.to raise_error(Faml::SyntaxError)
-    end
-
-    it 'raises error when key is not alnum' do
-      expect { render_string('%span(foo=1 3.14=3) hello') }.to raise_error(Faml::SyntaxError)
-    end
-
-    it 'raises error when value is missing' do
-      expect { render_string('%span(foo=1 bar=) hello') }.to raise_error(Faml::SyntaxError)
-    end
-
-    it 'raises error when quote is unterminated' do
-      expect { render_string('%span(foo=1 bar="baz) hello') }.to raise_error(Faml::SyntaxError)
-    end
-
-    it 'raises error when string interpolation is unterminated' do
-      expect { render_string('%span(foo=1 bar="ba#{1") hello') }.to raise_error(Faml::SyntaxError)
-    end
-
-    it 'renders __LINE__ correctly' do
-      expect(render_string(<<HAML)).to eq("<span a='2' b='1'></span>\n")
-%span(b=__LINE__
-  a=__LINE__)
-HAML
-    end
-  end
 end

data/spec/render/comment_spec.rb

@@ -45,17 +45,6 @@ HAML
 /[[if IE]]
   %span hello
   world
-HAML
-  end
-
-  it 'raises error if conditional comment bracket is unbalanced' do
-    expect { render_string('/[[if IE]') }.to raise_error(Faml::SyntaxError)
-  end
-
-  it 'raises error if both comment text and children are given' do
-    expect { render_string(<<HAML) }.to raise_error(Faml::SyntaxError)
-/ hehehe
-  %span hello
 HAML
   end
 end

data/spec/render/doctype_spec.rb

@@ -54,11 +54,4 @@ RSpec.describe 'Doctype rendering', type: :render do
       expect(render_string('!!! 5', format: :xhtml)).to eq(%Q|<!DOCTYPE html>\n|)
     end
   end
-
-  it 'raises error when doctype has children' do
-    expect { render_string(<<HAML) }.to raise_error(Faml::SyntaxError, /nesting within a header command/)
-!!!
-  hello
-HAML
-  end
 end

data/spec/render/element_spec.rb

@@ -22,15 +22,6 @@ HAML
 HAML
   end
 
-  it 'parses multi-line texts' do
-    expect(render_string(<<HAML)).to eq("<span>\n<b>\nhello\nworld\n</b>\n</span>\n")
-%span
-  %b
-    hello
-    world
-HAML
-  end
-
   it 'skips empty lines' do
     expect(render_string(<<HAML)).to eq("<span>\n<b>\nhello\n</b>\n</span>\n")
 %span
@@ -54,31 +45,6 @@ HAML
     expect(render_string('%span.foo#foo-bar.bar hello')).to eq(%Q{<span class='foo bar' id='foo-bar'>hello</span>\n})
   end
 
-  it "doesn't skip spaces before attribute list" do
-    expect(render_string('%span {hello}')).to eq("<span>{hello}</span>\n")
-    expect(render_string('%span (hello)')).to eq("<span>(hello)</span>\n")
-  end
-
-  context 'with invalid tag name' do
-    it 'raises error' do
-      expect { render_string('%.foo') }.to raise_error(Faml::SyntaxError)
-    end
-  end
-
-  context 'with invalid classes' do
-    it 'raises error' do
-      expect { render_string('%span. hello') }.to raise_error(Faml::SyntaxError)
-      expect { render_string('%span.{foo: "bar"} hello') }.to raise_error(Faml::SyntaxError)
-    end
-  end
-
-  context 'with invalid ids' do
-    it 'raises error' do
-      expect { render_string('%span# hello') }.to raise_error(Faml::SyntaxError)
-      expect { render_string('%span#{foo: "bar"} hello') }.to raise_error(Faml::SyntaxError)
-    end
-  end
-
   it 'parses #' do
     expect(render_string('#main')).to eq(%Q{<div id='main'></div>\n})
   end
@@ -87,14 +53,6 @@ HAML
     expect(render_string('.wrapper.main')).to eq(%Q{<div class='wrapper main'></div>\n})
   end
 
-  it 'parses Ruby multiline' do
-    expect(render_string(<<HAML)).to eq("<div>\n<span>2+3i</span>\n</div>\n")
-%div
-  %span= Complex(2,
-3)
-HAML
-  end
-
   it 'parses string interpolation' do
     expect(render_string(%q|%span hello <span> #{'</span>'} </span>|)).to eq("<span>hello <span> &lt;/span&gt; </span></span>\n")
     expect(render_string(<<'HAML')).to eq("<span>\nhello <span> &lt;/span&gt; </span>\n</span>\n")
@@ -123,19 +81,4 @@ HAML
   it 'renders some attributes as self-closing by default' do
     expect(render_string('%meta{"http-equiv" => "Content-Type", :content => "text/html"}')).to eq("<meta content='text/html' http-equiv='Content-Type'>\n")
   end
-
-  it 'parses == syntax' do
-    expect(render_string('%p== =#{1+2}hello')).to eq("<p>=3hello</p>\n")
-  end
-
-  it 'raises error if self-closing tag have text' do
-    expect { render_string('%p/ hello') }.to raise_error(Faml::SyntaxError)
-  end
-
-  it 'raises error if self-closing tag have children' do
-    expect { render_string(<<HAML) }.to raise_error(Faml::SyntaxError)
-%p/
-  hello
-HAML
-  end
 end

data/spec/render/filters_spec.rb

@@ -1,10 +1,6 @@
 require 'spec_helper'
 
 RSpec.describe 'filter rendering', type: :render do
-  it 'raises error if invalid filter name is given' do
-    expect { render_string(':filter with spaces') }.to raise_error(Faml::SyntaxError)
-  end
-
   it 'raises error if unregistered filter name is given' do
     expect { render_string(':eagletmt') }.to raise_error(Faml::FilterCompilers::NotFound)
   end

data/spec/render/plain_spec.rb

@@ -17,11 +17,4 @@ HAML
   it 'raises error when interpolation is unterminated' do
     expect { render_string('%span foo#{1 + 2') }.to raise_error(Faml::TextCompiler::InvalidInterpolation)
   end
-
-  it 'raises error when text has children' do
-    expect { render_string(<<HAML) }.to raise_error(Faml::SyntaxError, /nesting within plain text/)
-hello
-  world
-HAML
-  end
 end

data/spec/render/sanitize_spec.rb

@@ -26,11 +26,4 @@ HAML
       expect(render_string('%span&~ "<p>hello</p>"')).to eq("<span>&lt;p&gt;hello&lt;/p&gt;</span>\n")
     end
   end
-
-  context 'without Ruby code' do
-    it 'raises error' do
-      expect { render_string('%span&=') }.to raise_error(Faml::SyntaxError)
-      expect { render_string('&=') }.to raise_error(Faml::SyntaxError)
-    end
-  end
 end

data/spec/render/script_spec.rb

@@ -55,27 +55,4 @@ HAML
 %p= title
 HAML
   end
-
-  it 'parses Ruby multiline' do
-    expect(render_string(<<HAML)).to eq("<div>\n<span>\n2+3i\n</span>\n</div>\n")
-%div
-  %span
-    = Complex(2,
-3)
-HAML
-  end
-
-  it 'parses == syntax' do
-    expect(render_string('== =#{1+2}hello')).to eq("=3hello\n")
-  end
-
-  context 'without Ruby code' do
-    it 'raises error' do
-      expect { render_string('%span=') }.to raise_error(Faml::SyntaxError)
-      expect { render_string(<<HAML) }.to raise_error(Faml::SyntaxError)
-%span
-  =
-HAML
-    end
-  end
 end