fast_haml 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b27cfffdd8647b6badef2bce9bc9696c5fabdac
-  data.tar.gz: bd9776dd0a37157e8fabfcfb1d81a90d7f84f341
+  metadata.gz: e396fc6a76d932fc231a39783109c56be41fd5d2
+  data.tar.gz: 637ffb6b8faa7caf60cf8be200826740da3d521a
 SHA512:
-  metadata.gz: 268d5ce19f97c7b2c5fdd6ef20fa2f4e5ac490ef2b974f4c8ea3db50d59fecd5c661f49fc2966bd432fa44c77126495f71c0ec1452f6ab0db2f905b79609c07c
-  data.tar.gz: 71dbcabdf836323d3a23070ec9d443f9e94912b05b6715fa455640f70a698741337105442e3692a0436de2a8cc2f208b950fcfef7d0513170c98ff906b3c8c7e
+  metadata.gz: 6a9bbe7b0da60b072fb9c5eab60d8292e549e5b78989b6ff5e109de846e0321dd5425f5f92bcb85c534a3153e2889953950384d68d896cad01db5d73d362976c
+  data.tar.gz: fcb46c42e9801024c85e1232c92222f079c37c60694796b4ec682c4dd72a97499508aef4fc4584348b9dba9f71c6902b01a2b098871e552cc6bd79b7bd224aab

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.1.2 (2015-02-24)
+- Keep newlines for better backtrace (#4)
+
 ## 0.1.1 (2015-02-23)
 - Fix attribute parsing with `%span {foo}` or `%span (foo)` cases.
 - Fix comparison with statically-compilable class attributes like `%span.foo{class: bar}` .

data/lib/fast_haml/ast.rb

@@ -1,6 +1,19 @@
 module FastHaml
   module Ast
-    module Construct
+    module LineCounter
+      def initialize(*)
+        super
+        @trailing_empty_lines = 0
+      end
+
+      def trailing_empty_lines
+        @trailing_empty_lines
+      end
+
+      def increment_trailing_empty_lines
+        @trailing_empty_lines += 1
+        nil
+      end
     end
 
     module HasChildren
@@ -15,10 +28,12 @@ module FastHaml
     end
 
     class Root < Struct.new(:children)
+      include LineCounter
       include HasChildren
     end
 
     class Doctype < Struct.new(:doctype)
+      include LineCounter
     end
 
     class Element < Struct.new(
@@ -32,6 +47,7 @@ module FastHaml
       :nuke_inner_whitespace,
       :nuke_outer_whitespace,
     )
+      include LineCounter
       include HasChildren
 
       def initialize(*)
@@ -52,6 +68,7 @@ module FastHaml
       :preserve,
       :mid_block_keyword,
     )
+      include LineCounter
       include HasChildren
 
       def initialize(*)
@@ -69,6 +86,7 @@ module FastHaml
     end
 
     class SilentScript < Struct.new(:children, :script, :mid_block_keyword)
+      include LineCounter
       include HasChildren
 
       def initialize(*)
@@ -80,6 +98,7 @@ module FastHaml
     end
 
     class HtmlComment < Struct.new(:children, :comment, :conditional)
+      include LineCounter
       include HasChildren
 
       def initialize(*)
@@ -90,10 +109,13 @@ module FastHaml
     end
 
     class HamlComment < Struct.new(:children)
+      include LineCounter
       include HasChildren
     end
 
     class Text < Struct.new(:text, :escape_html)
+      include LineCounter
+
       def initialize(*)
         super
         if self.escape_html.nil?
@@ -103,6 +125,8 @@ module FastHaml
     end
 
     class Filter < Struct.new(:name, :texts)
+      include LineCounter
+
       def initialize(*)
         super
         self.texts ||= []

data/lib/fast_haml/compiler.rb

@@ -44,32 +44,39 @@ module FastHaml
     private
 
     def compile(ast)
-      case ast
-      when Ast::Root
-        compile_root(ast)
-      when Ast::Doctype
-        compile_doctype(ast)
-      when Ast::HtmlComment
-        compile_html_comment(ast)
-      when Ast::HamlComment
-        [:multi]
-      when Ast::Element
-        compile_element(ast)
-      when Ast::Script
-        compile_script(ast)
-      when Ast::SilentScript
-        compile_silent_script(ast)
-      when Ast::Text
-        compile_text(ast)
-      when Ast::Filter
-        compile_filter(ast)
+      temple =
+        case ast
+        when Ast::Root
+          compile_root(ast)
+        when Ast::Doctype
+          compile_doctype(ast)
+        when Ast::HtmlComment
+          compile_html_comment(ast)
+        when Ast::HamlComment
+          [:multi]
+        when Ast::Element
+          compile_element(ast)
+        when Ast::Script
+          compile_script(ast)
+        when Ast::SilentScript
+          compile_silent_script(ast)
+        when Ast::Text
+          compile_text(ast)
+        when Ast::Filter
+          compile_filter(ast)
+        else
+          raise "InternalError: Unknown AST node #{ast.class}: #{ast.inspect}"
+        end
+
+      if ast.trailing_empty_lines > 0
+        [:multi, temple].concat([[:newline]] * ast.trailing_empty_lines)
       else
-        raise "InternalError: Unknown AST node #{ast.class}: #{ast.inspect}"
+        temple
       end
     end
 
     def compile_root(ast)
-      [:multi, [:newline]].tap do |temple|
+      [:multi].tap do |temple|
         compile_children(ast, temple)
       end
     end
@@ -87,10 +94,15 @@ module FastHaml
           if x != [:static, "\n"]
             raise "InternalError: Unexpected pop (expected [:static, newline]): #{x}"
           end
+          unless suppress_code_newline?(c.oneline_child)
+            temple << [:newline]
+          end
         end
         temple << compile(c)
         if was_newline = need_newline?(ast, c)
           temple << [:static, "\n"]
+        end
+        unless suppress_code_newline?(c)
           temple << [:newline]
         end
       end
@@ -112,6 +124,10 @@ module FastHaml
       end
     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))
+    end
+
     def compile_text(ast)
       @text_compiler.compile(ast.text, escape_html: ast.escape_html)
     end
@@ -169,7 +185,6 @@ module FastHaml
         unless nuke_inner_whitespace?(ast)
           children << [:static, "\n"]
         end
-        children << [:newline]
         compile_children(ast, children)
         temple << children
       end

data/lib/fast_haml/filter_compilers/base.rb

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

data/lib/fast_haml/filter_compilers/plain.rb

@@ -7,7 +7,7 @@ module FastHaml
         temple = [:multi]
         texts = strip_last_empty_lines(texts)
         compile_texts(temple, texts[0 .. -2])
-        temple << text_compiler.compile(texts[-1])
+        temple << text_compiler.compile(texts[-1]) << [:newline]
         temple
       end
     end

data/lib/fast_haml/filter_compilers/preserve.rb

@@ -12,6 +12,7 @@ module FastHaml
           unless texts.last.equal?(text)
             temple << [:static, "\n"]
           end
+          temple << [:newline]
         end
         sym = unique_name
         [:multi,

data/lib/fast_haml/parser.rb

@@ -59,6 +59,7 @@ module FastHaml
       text, indent = @indent_tracker.process(line, @line_parser.lineno)
 
       if text.empty?
+        @ast.increment_trailing_empty_lines
         return
       end
 

data/lib/fast_haml/railtie.rb

@@ -2,11 +2,6 @@ module FastHaml
   class Railtie < ::Rails::Railtie
     initializer :fast_haml do |app|
       require 'fast_haml/rails_handler'
-      begin
-        # Load Haml::Plugin earlier to overwrite template handler with fast_haml.
-        require 'haml/plugin'
-      rescue LoadError
-      end
       ActionView::Template.register_template_handler(:haml, FastHaml::RailsHandler.new)
     end
   end

data/lib/fast_haml/version.rb

@@ -1,3 +1,3 @@
 module FastHaml
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fast_haml
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-23 00:00:00.000000000 Z
+date: 2015-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape_utils