faml 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e56f6b1d1e1616fb0c3fad21f37e222335c035a5
-  data.tar.gz: 75024b5bd093c4fcc27505e42d9fd17e3ff4cca5
+  metadata.gz: fd9450955cdd17a06278c80b23b5b4b566e3ac15
+  data.tar.gz: e115460cd407681b8c8768f976ad9f4a33b74313
 SHA512:
-  metadata.gz: c5c2e4fd53a113be080c4a36e93dfc9c9472fd2bd2d2beecb5f60b7c0a8e47534380a9c3116239dcf2206710951d247b4a673f30441abd7eb07cc6d0b977f6a4
-  data.tar.gz: 3bb17b5f494fed5b47bbbe7507156b90cf7cc8f2378e52398527e97228e854249b50d4c976335055e8fad919ee90ad490e22004e52b30c867404900ea552bc3b
+  metadata.gz: 89aab3814554aef1673f164c666bc974f3fc7e8b2ff45b2e4bb438861caaac7796d4a2b76b9ccb612259e5737aac0001877d1d1d20e42bfb49867054e5547010
+  data.tar.gz: ab7478d4edefc0e5d3fc6f70cd1b6af2a6c1b8e40ea4d73175592b1e67d72500fc767ecaf2d9d7fc4022f684e0b78b0fa99112544f5dc22a8ad033101c87076b

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.2.7 (2015-03-31)
+- Improve backtrace of compile time errors
+- Annotate Faml::Ast with filename and line number (internal)
+- Fix error with tilt 1.x.
+
 ## 0.2.6 (2015-03-31)
 - Fix dependency on temple
 - Improve backtrace when syntax error is raised

data/lib/faml/ast.rb

@@ -15,7 +15,7 @@ module Faml
       include HasChildren
     end
 
-    class Doctype < Struct.new(:doctype)
+    class Doctype < Struct.new(:doctype, :filename, :lineno)
     end
 
     class Element < Struct.new(
@@ -28,6 +28,8 @@ module Faml
       :self_closing,
       :nuke_inner_whitespace,
       :nuke_outer_whitespace,
+      :filename,
+      :lineno,
     )
       include HasChildren
 
@@ -48,6 +50,8 @@ module Faml
       :escape_html,
       :preserve,
       :mid_block_keyword,
+      :filename,
+      :lineno,
     )
       include HasChildren
 
@@ -65,7 +69,7 @@ module Faml
       end
     end
 
-    class SilentScript < Struct.new(:children, :script, :mid_block_keyword)
+    class SilentScript < Struct.new(:children, :script, :mid_block_keyword, :filename, :lineno)
       include HasChildren
 
       def initialize(*)
@@ -76,7 +80,7 @@ module Faml
       end
     end
 
-    class HtmlComment < Struct.new(:children, :comment, :conditional)
+    class HtmlComment < Struct.new(:children, :comment, :conditional, :filename, :lineno)
       include HasChildren
 
       def initialize(*)
@@ -86,11 +90,11 @@ module Faml
       end
     end
 
-    class HamlComment < Struct.new(:children)
+    class HamlComment < Struct.new(:children, :filename, :lineno)
       include HasChildren
     end
 
-    class Text < Struct.new(:text, :escape_html)
+    class Text < Struct.new(:text, :escape_html, :filename, :lineno)
       def initialize(*)
         super
         if self.escape_html.nil?
@@ -99,14 +103,14 @@ module Faml
       end
     end
 
-    class Filter < Struct.new(:name, :texts)
+    class Filter < Struct.new(:name, :texts, :filename, :lineno)
       def initialize(*)
         super
         self.texts ||= []
       end
     end
 
-    class Empty
+    class Empty < Struct.new(:filename, :lineno)
     end
   end
 end

data/lib/faml/cli.rb

@@ -22,17 +22,17 @@ module Faml
     desc 'temple FILE', 'Render temple AST'
     def temple(file)
       require 'pp'
-      pp Faml::Compiler.new.call(parse_file(file))
+      pp Faml::Compiler.new(filename: file).call(parse_file(file))
     end
 
     private
 
     def compile_file(file)
-      Faml::Engine.new.call(File.read(file))
+      Faml::Engine.new(filename: file).call(File.read(file))
     end
 
     def parse_file(file)
-      Faml::Parser.new.call(File.read(file))
+      Faml::Parser.new(filename: file).call(File.read(file))
     end
   end
 end

data/lib/faml/compiler.rb

@@ -1,6 +1,7 @@
 require 'parser/current'
 require 'temple'
 require 'faml/ast'
+require 'faml/error'
 require 'faml/filter_compilers'
 require 'faml/helpers'
 require 'faml/rails_helpers'
@@ -9,7 +10,7 @@ require 'faml/text_compiler'
 
 module Faml
   class Compiler < Temple::Parser
-    class UnparsableRubyCode < StandardError
+    class UnparsableRubyCode < Error
     end
 
     DEFAULT_AUTO_CLOSE_TAGS = %w[
@@ -23,15 +24,22 @@ module Faml
       format: :html,
       preserve: DEFAULT_PRESERVE_TAGS,
       use_html_safe: false,
+      filename: nil,
     )
 
     def initialize(*)
       super
       @text_compiler = TextCompiler.new
+      @filename = options[:filename]
     end
 
     def call(ast)
       compile(ast)
+    rescue Error => e
+      if @filename && e.lineno
+        e.backtrace.unshift "#{@filename}:#{e.lineno}"
+      end
+      raise e
     end
 
     def self.find_and_preserve(input)
@@ -122,7 +130,7 @@ module Faml
     end
 
     def compile_text(ast)
-      @text_compiler.compile(ast.text, escape_html: ast.escape_html)
+      @text_compiler.compile(ast.text, ast.lineno, escape_html: ast.escape_html)
     end
 
     # html5 and html4 is deprecated in temple.
@@ -186,6 +194,11 @@ module Faml
       else
         temple
       end
+    rescue UnparsableRubyCode => e
+      unless e.lineno
+        e.lineno = ast.lineno
+      end
+      raise e
     end
 
     def self_closing?(ast)
@@ -282,7 +295,7 @@ module Faml
       parser.parse(buffer)
       true
     rescue ::Parser::SyntaxError
-      raise UnparsableRubyCode.new("Unparsable Ruby code is given to attributes: #{text}")
+      raise UnparsableRubyCode.new("Unparsable Ruby code is given to attributes: #{text}", nil)
     end
 
     def build_optimized_attributes(parser, static_id, static_class)
@@ -374,7 +387,12 @@ module Faml
     end
 
     def compile_filter(ast)
-      FilterCompilers.find(ast.name).compile(ast.texts)
+      FilterCompilers.find(ast.name).compile(ast)
+    rescue FilterCompilers::NotFound => e
+      unless e.lineno
+        e.lineno = ast.lineno
+      end
+      raise e
     end
   end
 end

data/lib/faml/element_parser.rb

@@ -20,6 +20,8 @@ module Faml
       end
 
       element = Ast::Element.new
+      element.filename = @line_parser.filename
+      element.lineno = @line_parser.lineno
       element.tag_name = m[1]
       element.static_class, element.static_id = parse_class_and_id(m[2])
       rest = m[3] || ''

data/lib/faml/error.rb

@@ -1,6 +1,7 @@
 module Faml
   class Error < StandardError
-    attr_reader :lineno
+    attr_accessor :lineno
+
     def initialize(message, lineno)
       super(message)
       @lineno = lineno

data/lib/faml/filter_compilers.rb

@@ -1,10 +1,10 @@
+require 'faml/error'
+
 module Faml
   module FilterCompilers
-    class NotFound < StandardError
-      attr_reader
-
+    class NotFound < Error
       def initialize(name)
-        super("Unable to find compiler for #{name}")
+        super("Unable to find compiler for #{name}", nil)
         @name = name
       end
     end

data/lib/faml/filter_compilers/base.rb

@@ -9,14 +9,14 @@ module Faml
 
       protected
 
-      def compile_texts(temple, texts, tab_width: 0, keep_last_empty_lines: false)
+      def compile_texts(temple, lineno, texts, tab_width: 0, keep_last_empty_lines: false)
         tabs = ' ' * tab_width
         n = 0
         unless keep_last_empty_lines
           texts, n = strip_last_empty_lines(texts)
         end
-        texts.each do |text|
-          temple << [:static, tabs] << text_compiler.compile(text)
+        texts.each_with_index do |text, i|
+          temple << [:static, tabs] << text_compiler.compile(text, lineno + i + 1)
           unless texts.last.equal?(text)
             temple << [:static, "\n"] << [:newline]
           end

data/lib/faml/filter_compilers/cdata.rb

@@ -3,9 +3,9 @@ require 'faml/filter_compilers/base'
 module Faml
   module FilterCompilers
     class Cdata < Base
-      def compile(texts)
+      def compile(ast)
         temple = [:multi, [:static, "<![CDATA[\n"], [:newline]]
-        compile_texts(temple, texts, tab_width: 4)
+        compile_texts(temple, ast.lineno, ast.texts, tab_width: 4)
         temple << [:static, "\n]]>"]
       end
     end

data/lib/faml/filter_compilers/coffee.rb

@@ -3,9 +3,9 @@ require 'faml/filter_compilers/tilt_base'
 module Faml
   module FilterCompilers
     class Coffee < TiltBase
-      def compile(texts)
+      def compile(ast)
         temple = [:multi, [:static, "\n"], [:newline]]
-        compile_with_tilt(temple, 'coffee', texts)
+        compile_with_tilt(temple, 'coffee', ast)
         temple << [:static, "\n"]
         [:haml, :tag, 'script', false, [:html, :attrs], [:html, :js, temple]]
       end

data/lib/faml/filter_compilers/css.rb

@@ -3,9 +3,9 @@ require 'faml/filter_compilers/base'
 module Faml
   module FilterCompilers
     class Css < Base
-      def compile(texts)
+      def compile(ast)
         temple = [:multi, [:static, "\n"], [:newline]]
-        compile_texts(temple, texts, tab_width: 2)
+        compile_texts(temple, ast.lineno, ast.texts, tab_width: 2)
         temple << [:static, "\n"]
         [:haml, :tag, 'style', false, [:html, :attrs], temple]
       end

data/lib/faml/filter_compilers/escaped.rb

@@ -5,9 +5,9 @@ module Faml
     class Escaped < Base
       include Temple::Utils
 
-      def compile(texts)
+      def compile(ast)
         temple = [:multi, [:newline]]
-        compile_texts(temple, texts)
+        compile_texts(temple, ast.lineno, ast.texts)
         temple << [:static, "\n"]
         escape_code = Temple::Filters::Escapable.new(use_html_safe: false).instance_variable_get(:@escape_code)
         sym = unique_name

data/lib/faml/filter_compilers/javascript.rb

@@ -3,9 +3,9 @@ require 'faml/filter_compilers/base'
 module Faml
   module FilterCompilers
     class Javascript < Base
-      def compile(texts)
+      def compile(ast)
         temple = [:multi, [:static, "\n"], [:newline]]
-        compile_texts(temple, texts, tab_width: 2)
+        compile_texts(temple, ast.lineno, ast.texts, tab_width: 2)
         temple << [:static, "\n"]
         [:haml, :tag, 'script', false, [:html, :attrs], [:html, :js, temple]]
       end

data/lib/faml/filter_compilers/markdown.rb

@@ -7,9 +7,9 @@ module Faml
         false
       end
 
-      def compile(texts)
+      def compile(ast)
         temple = [:multi, [:newline]]
-        compile_with_tilt(temple, 'markdown', texts)
+        compile_with_tilt(temple, 'markdown', ast)
       end
     end
 

data/lib/faml/filter_compilers/plain.rb

@@ -3,9 +3,9 @@ require 'faml/filter_compilers/base'
 module Faml
   module FilterCompilers
     class Plain < Base
-      def compile(texts)
+      def compile(ast)
         temple = [:multi, [:newline]]
-        compile_texts(temple, texts)
+        compile_texts(temple, ast.lineno, ast.texts)
         temple
       end
     end

data/lib/faml/filter_compilers/preserve.rb

@@ -5,10 +5,10 @@ module Faml
     class Preserve < Base
       include Temple::Utils
 
-      def compile(texts)
+      def compile(ast)
         temple = [:multi, [:newline]]
         # I don't know why only :preserve filter keeps the last empty lines.
-        compile_texts(temple, texts, keep_last_empty_lines: true)
+        compile_texts(temple, ast.lineno, ast.texts, keep_last_empty_lines: true)
         sym = unique_name
         [:multi,
           [:capture, sym, temple],

data/lib/faml/filter_compilers/ruby.rb

@@ -7,8 +7,8 @@ module Faml
         false
       end
 
-      def compile(texts)
-        [:multi, [:newline], [:code, strip_last_empty_lines(texts).join("\n")]]
+      def compile(ast)
+        [:multi, [:newline], [:code, strip_last_empty_lines(ast.texts).join("\n")]]
       end
     end
 

data/lib/faml/filter_compilers/sass.rb

@@ -3,9 +3,9 @@ require 'faml/filter_compilers/tilt_base'
 module Faml
   module FilterCompilers
     class Sass < TiltBase
-      def compile(texts)
+      def compile(ast)
         temple = [:multi, [:static, "\n"], [:newline]]
-        compile_with_tilt(temple, 'sass', texts)
+        compile_with_tilt(temple, 'sass', ast)
         [:haml, :tag, 'style', false, [:html, :attrs], temple]
       end
     end

data/lib/faml/filter_compilers/scss.rb

@@ -3,9 +3,9 @@ require 'faml/filter_compilers/tilt_base'
 module Faml
   module FilterCompilers
     class Scss < TiltBase
-      def compile(texts)
+      def compile(ast)
         temple = [:multi, [:static, "\n"], [:newline]]
-        compile_with_tilt(temple, 'scss', texts)
+        compile_with_tilt(temple, 'scss', ast)
         temple << [:static, "\n"]
         [:haml, :tag, 'style', false, [:html, :attrs], temple]
       end

data/lib/faml/filter_compilers/tilt_base.rb

@@ -14,18 +14,18 @@ module Faml
 
       protected
 
-      def compile_with_tilt(temple, name, texts)
-        source = texts.join("\n")
+      def compile_with_tilt(temple, name, ast)
+        source = ast.texts.join("\n")
         if TextCompiler.contains_interpolation?(source)
           text_temple = [:multi]
-          compile_texts(text_temple, texts)
+          compile_texts(text_temple, ast.lineno, ast.texts)
           sym = unique_name
           temple << [:capture, sym, text_temple]
           temple << [:dynamic, "::Faml::FilterCompilers::TiltBase.render_with_tilt(#{name.inspect}, #{sym})"]
         else
           compiled = self.class.render_with_tilt(name, source)
           temple << [:static, compiled]
-          temple.concat([[:newline]] * (texts.size - 1))
+          temple.concat([[:newline]] * (ast.texts.size - 1))
         end
         temple
       end

data/lib/faml/filter_parser.rb

@@ -10,9 +10,11 @@ module Faml
       !!@ast
     end
 
-    def start(name)
+    def start(name, filename, lineno)
       @ast = Ast::Filter.new
       @ast.name = name
+      @ast.filename
+      @ast.lineno = lineno
     end
 
     def append(line)

data/lib/faml/line_parser.rb

@@ -1,8 +1,9 @@
 module Faml
   class LineParser
-    attr_reader :lineno
+    attr_reader :filename, :lineno
 
-    def initialize(template_str)
+    def initialize(filename, template_str)
+      @filename = filename
       @lines = template_str.each_line.map { |line| line.chomp.rstrip }
       @lineno = 0
     end

data/lib/faml/parser.rb

@@ -18,7 +18,7 @@ module Faml
     def call(template_str)
       @ast = Ast::Root.new
       @stack = []
-      @line_parser = LineParser.new(template_str)
+      @line_parser = LineParser.new(@filename, template_str)
       @indent_tracker = IndentTracker.new(on_enter: method(:indent_enter), on_leave: method(:indent_leave))
       @filter_parser = FilterParser.new(@indent_tracker)
 
@@ -63,12 +63,12 @@ module Faml
       text, indent = @indent_tracker.process(line, @line_parser.lineno)
 
       if text.empty?
-        @ast << Ast::Empty.new
+        @ast << create_node(Ast::Empty)
         return
       end
 
       if @ast.is_a?(Ast::HamlComment)
-        @ast << Ast::Text.new(text)
+        @ast << create_node(Ast::Text) { |t| t.text = text }
         return
       end
 
@@ -101,12 +101,12 @@ module Faml
     end
 
     def parse_doctype(text)
-      @ast << Ast::Doctype.new(text[3 .. -1].strip)
+      @ast << create_node(Ast::Doctype) { |d| d.doctype = text[3 .. -1].strip }
     end
 
     def parse_comment(text)
       text = text[1, text.size-1].strip
-      comment = Ast::HtmlComment.new
+      comment = create_node(Ast::HtmlComment)
       comment.comment = text
       if text[0] == '['
         comment.conditional, rest = parse_conditional_comment(text)
@@ -128,7 +128,7 @@ module Faml
     end
 
     def parse_plain(text)
-      @ast << Ast::Text.new(text)
+      @ast << create_node(Ast::Text) { |t| t.text = text }
     end
 
     def parse_element(text)
@@ -141,15 +141,16 @@ module Faml
 
     def parse_silent_script(text)
       if text.start_with?('-#')
-        @ast << Ast::HamlComment.new
+        @ast << create_node(Ast::HamlComment)
         return
       end
-      script = text[/\A- *(.*)\z/, 1]
-      if script.empty?
+      node = create_node(Ast::SilentScript)
+      node.script = text[/\A- *(.*)\z/, 1]
+      if node.script.empty?
         syntax_error!("No Ruby code to evaluate")
       end
-      script += RubyMultiline.read(@line_parser, script)
-      @ast << Ast::SilentScript.new([], script)
+      node.script += RubyMultiline.read(@line_parser, node.script)
+      @ast << node
     end
 
     def parse_filter(text)
@@ -157,7 +158,7 @@ module Faml
       unless filter_name
         syntax_error!("Invalid filter name: #{text}")
       end
-      @filter_parser.start(filter_name)
+      @filter_parser.start(filter_name, @line_parser.filename, @line_parser.lineno)
     end
 
     def indent_enter(_, text)
@@ -214,5 +215,15 @@ module Faml
     def syntax_error!(message)
       raise SyntaxError.new(message, @line_parser.lineno)
     end
+
+    def create_node(klass, &block)
+      klass.new.tap do |node|
+        node.filename = @line_parser.filename
+        node.lineno = @line_parser.lineno
+        if block
+          block.call(node)
+        end
+      end
+    end
   end
 end

data/lib/faml/script_parser.rb

@@ -25,46 +25,58 @@ module Faml
 
     def parse_script(text)
       if text[1] == '='
-        Ast::Text.new(text[2 .. -1].strip)
+        create_node(Ast::Text) { |t| t.text = text[2 .. -1].strip }
       else
-        script = text[1 .. -1].lstrip
-        if script.empty?
+        node = create_node(Ast::Script)
+        node.script = text[1 .. -1].lstrip
+        if node.script.empty?
           syntax_error!('No Ruby code to evaluate')
         end
-        script += RubyMultiline.read(@line_parser, script)
-        Ast::Script.new([], script)
+        node.script += RubyMultiline.read(@line_parser, node.script)
+        node
       end
     end
 
     def parse_sanitized(text)
       case
       when text.start_with?('&==')
-        Ast::Text.new(text[3 .. -1].lstrip)
+        create_node(Ast::Text) { |t| t.text = text[3 .. -1].lstrip }
       when text[1] == '=' || text[1] == '~'
-        script = text[2 .. -1].lstrip
-        if script.empty?
+        node = create_node(Ast::Script)
+        node.script = text[2 .. -1].lstrip
+        if node.script.empty?
           syntax_error!('No Ruby code to evaluate')
         end
-        script += RubyMultiline.read(@line_parser, script)
-        Ast::Script.new([], script, true, text[1] == '~')
+        node.script += RubyMultiline.read(@line_parser, node.script)
+        node.preserve = text[1] == '~'
+        node
       else
-        Ast::Text.new(text[1 .. -1].strip)
+        create_node(Ast::Text) { |t| t.text = text[1 .. -1].strip }
       end
     end
 
     def parse_unescape(text)
       case
       when text.start_with?('!==')
-        Ast::Text.new(text[3 .. -1].lstrip, false)
+        create_node(Ast::Text) do |t|
+          t.text = text[3 .. -1].lstrip
+          t.escape_html = false
+        end
       when text[1] == '=' || text[1] == '~'
-        script = text[2 .. -1].lstrip
-        if script.empty?
+        node = create_node(Ast::Script)
+        node.escape_html = false
+        node.script = text[2 .. -1].lstrip
+        if node.script.empty?
           syntax_error!('No Ruby code to evaluate')
         end
-        script += RubyMultiline.read(@line_parser, script)
-        Ast::Script.new([], script, false, text[1] == '~')
+        node.script += RubyMultiline.read(@line_parser, node.script)
+        node.preserve = text[1] == '~'
+        node
       else
-        Ast::Text.new(text[1 .. -1].lstrip, false)
+        create_node(Ast::Text) do |t|
+          t.text = text[1 .. -1].lstrip
+          t.escape_html = false
+        end
       end
     end
 
@@ -73,12 +85,22 @@ module Faml
       if text.empty?
         nil
       else
-        Ast::Text.new(text)
+        create_node(Ast::Text) { |t| t.text = text }
       end
     end
 
     def syntax_error!(message)
       raise SyntaxError.new(message, @line_parser.lineno)
     end
+
+    def create_node(klass, &block)
+      klass.new.tap do |node|
+        node.filename = @line_parser.filename
+        node.lineno = @line_parser.lineno
+        if block
+          block.call(node)
+        end
+      end
+    end
   end
 end

data/lib/faml/text_compiler.rb

@@ -1,18 +1,19 @@
 require 'strscan'
+require 'faml/error'
 require 'faml/parser_utils'
 
 module Faml
   class TextCompiler
-    class InvalidInterpolation < StandardError
+    class InvalidInterpolation < Error
     end
 
     def initialize(escape_html: true)
       @escape_html = escape_html
     end
 
-    def compile(text, escape_html: @escape_html)
+    def compile(text, lineno, escape_html: @escape_html)
       if self.class.contains_interpolation?(text)
-        compile_interpolation(text, escape_html: escape_html)
+        compile_interpolation(text, lineno, escape_html: escape_html)
       else
         [:static, text]
       end
@@ -26,7 +27,7 @@ module Faml
 
     private
 
-    def compile_interpolation(text, escape_html: @escape_html)
+    def compile_interpolation(text, lineno, escape_html: @escape_html)
       s = StringScanner.new(text)
       temple = [:multi]
       pos = s.pos
@@ -37,7 +38,7 @@ module Faml
         if escapes % 2 == 0
           # perform interpolation
           if s[2] == '#{'
-            temple << [:escape, escape_html, [:dynamic, find_close_brace(s)]]
+            temple << [:escape, escape_html, [:dynamic, find_close_brace(s, lineno)]]
           else
             var = s[2][-1]
             s.scan(/\w+/)
@@ -56,11 +57,11 @@ module Faml
 
     INTERPOLATION_BRACE = /[\{\}]/o
 
-    def find_close_brace(scanner)
+    def find_close_brace(scanner, lineno)
       pos = scanner.pos
       depth = ParserUtils.balance(scanner, '{', '}')
       if depth != 0
-        raise InvalidInterpolation.new(scanner.string)
+        raise InvalidInterpolation.new(scanner.string, lineno)
       else
         scanner.string.byteslice(pos ... (scanner.pos-1))
       end

data/lib/faml/tilt.rb

@@ -1,10 +1,15 @@
 require 'tilt'
+require 'tilt/haml'
 require 'faml/engine'
 
 module Faml
   class Tilt < Tilt::Template
     def prepare
-      @code = Engine.new(options.merge(filename: File.expand_path(file))).call(data)
+      filename = nil
+      if file
+        filename = File.expand_path(file)
+      end
+      @code = Engine.new(options.merge(filename: filename)).call(data)
     end
 
     def precompiled_template(locals = {})

data/lib/faml/version.rb

@@ -1,3 +1,3 @@
 module Faml
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

data/spec/rails/app/views/books/filter_invalid_interpolation.html.haml

@@ -0,0 +1,5 @@
+.container
+  :javascript
+    (function() {
+      document.write('<script>#{content</script>');
+    })();

data/spec/rails/app/views/books/filter_not_found.html.haml

@@ -0,0 +1,4 @@
+.container
+  :java
+    public static void main(String[] args) {
+    }

data/spec/rails/app/views/books/invalid_interpolation.html.haml

@@ -0,0 +1,3 @@
+%div
+  %h1 hello
+  %p world#{

data/spec/rails/app/views/books/unparsable.html.haml

@@ -0,0 +1,3 @@
+%div
+  %span{foo: 1, bar::}
+  hello

data/spec/rails/config/routes.rb

@@ -5,7 +5,12 @@ Rails.application.routes.draw do
     get :with_capture
     get :escaped
     get :preserve
+
     get :syntax_error
     get :indent_error
+    get :unparsable
+    get :invalid_interpolation
+    get :filter_not_found
+    get :filter_invalid_interpolation
   end
 end

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

@@ -69,5 +69,37 @@ RSpec.describe 'Faml with Rails', type: :request do
         }
       end
     end
+
+    describe Faml::Compiler::UnparsableRubyCode do
+      it 'has proper backtrace' do
+        expect { get '/books/unparsable' }.to raise_error { |e|
+          expect(e.backtrace[0]).to end_with('app/views/books/unparsable.html.haml:2')
+        }
+      end
+    end
+
+    describe Faml::FilterCompilers::NotFound do
+      it 'has proper backtrace' do
+        expect { get '/books/filter_not_found' }.to raise_error { |e|
+          expect(e.backtrace[0]).to end_with('app/views/books/filter_not_found.html.haml:2')
+        }
+      end
+    end
+
+    describe Faml::TextCompiler::InvalidInterpolation do
+      it 'has proper backtrace' do
+        expect { get '/books/invalid_interpolation' }.to raise_error { |e|
+          expect(e.backtrace[0]).to end_with('app/views/books/invalid_interpolation.html.haml:3')
+        }
+      end
+
+      context 'inside filter' do
+        it 'has proper backtrace' do
+          expect { get '/books/filter_invalid_interpolation' }.to raise_error { |e|
+            expect(e.backtrace[0]).to end_with('app/views/books/filter_invalid_interpolation.html.haml:4')
+          }
+        end
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faml
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Kohei Suzuki
@@ -336,10 +336,14 @@ files:
 - spec/rails/app/models/book.rb
 - spec/rails/app/models/concerns/.keep
 - spec/rails/app/views/books/escaped.html.haml
+- spec/rails/app/views/books/filter_invalid_interpolation.html.haml
+- spec/rails/app/views/books/filter_not_found.html.haml
 - spec/rails/app/views/books/hello.html.haml
 - spec/rails/app/views/books/indent_error.html.haml
+- spec/rails/app/views/books/invalid_interpolation.html.haml
 - spec/rails/app/views/books/preserve.html.haml
 - spec/rails/app/views/books/syntax_error.html.haml
+- spec/rails/app/views/books/unparsable.html.haml
 - spec/rails/app/views/books/with_capture.html.haml
 - spec/rails/app/views/books/with_variables.html.haml
 - spec/rails/app/views/layouts/application.html.haml
@@ -428,7 +432,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Faster implementation of Haml template language.
@@ -447,10 +451,14 @@ test_files:
 - spec/rails/app/models/book.rb
 - spec/rails/app/models/concerns/.keep
 - spec/rails/app/views/books/escaped.html.haml
+- spec/rails/app/views/books/filter_invalid_interpolation.html.haml
+- spec/rails/app/views/books/filter_not_found.html.haml
 - spec/rails/app/views/books/hello.html.haml
 - spec/rails/app/views/books/indent_error.html.haml
+- spec/rails/app/views/books/invalid_interpolation.html.haml
 - spec/rails/app/views/books/preserve.html.haml
 - spec/rails/app/views/books/syntax_error.html.haml
+- spec/rails/app/views/books/unparsable.html.haml
 - spec/rails/app/views/books/with_capture.html.haml
 - spec/rails/app/views/books/with_variables.html.haml
 - spec/rails/app/views/layouts/application.html.haml