fast_haml 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82e5ebff407e25bb08be2e8130a90cca37e0bfc6
-  data.tar.gz: ac737189d9a874166e57300520d1f58179420e03
+  metadata.gz: e6d99c4413e3858045374b49a571cd49b41a6bdd
+  data.tar.gz: 9cca499f18f80fbd21e45fc661feafdf133342a2
 SHA512:
-  metadata.gz: a9afecde05c50d903af4ef9fa480fbc89e8bfacc41256311a2a754a4acaa382128551ed2c9d20d57137db7747a66957230abd0ec4cda9e0c02a4aac88d49b941
-  data.tar.gz: 2fc94f166bbf3b2830fa123968c995bf73e96ee23b75a2b933ce789f3b5fe056274b9af01db342d7a62fd9e3a1662f5df15b66b723657822c69c248cb26dc68e
+  metadata.gz: b7823392fa8c824f2658a6f2e565cc0c31a142e0dcff1e7e087f290248ff1775f1898ba8afcf33ca762c595f608f32ca29960f821be97841b515e4d23fd17ad0
+  data.tar.gz: 445518be81a78566281badd2336ec90f6c2a7b9cd1b515f2276bf32d8e285f9d7a8380634116fd3aee58d654064f04059075d4f322598f525534d410b59f8a9b

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.4 (2015-02-28)
+- Fix newline generation around empty lines
+    - Internal: introduce Ast::Empty and remove LineCounter
+
 ## 0.1.3 (2015-02-27)
 - Fix internal compiler error when `>` is used
 - Fix newline generation at Ast::Element case

data/lib/fast_haml/ast.rb

@@ -1,21 +1,5 @@
 module FastHaml
   module Ast
-    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
       def initialize(*)
         super
@@ -28,12 +12,21 @@ module FastHaml
     end
 
     class Root < Struct.new(:children)
-      include LineCounter
       include HasChildren
+      attr_reader :leading_empty_lines
+
+      def initialize(*)
+        super
+        @leading_empty_lines = 0
+      end
+
+      def increment_leading_empty_lines
+        @leading_empty_lines +=1
+        nil
+      end
     end
 
     class Doctype < Struct.new(:doctype)
-      include LineCounter
     end
 
     class Element < Struct.new(
@@ -47,7 +40,6 @@ module FastHaml
       :nuke_inner_whitespace,
       :nuke_outer_whitespace,
     )
-      include LineCounter
       include HasChildren
 
       def initialize(*)
@@ -68,7 +60,6 @@ module FastHaml
       :preserve,
       :mid_block_keyword,
     )
-      include LineCounter
       include HasChildren
 
       def initialize(*)
@@ -86,7 +77,6 @@ module FastHaml
     end
 
     class SilentScript < Struct.new(:children, :script, :mid_block_keyword)
-      include LineCounter
       include HasChildren
 
       def initialize(*)
@@ -98,7 +88,6 @@ module FastHaml
     end
 
     class HtmlComment < Struct.new(:children, :comment, :conditional)
-      include LineCounter
       include HasChildren
 
       def initialize(*)
@@ -109,13 +98,10 @@ 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?
@@ -125,12 +111,13 @@ module FastHaml
     end
 
     class Filter < Struct.new(:name, :texts)
-      include LineCounter
-
       def initialize(*)
         super
         self.texts ||= []
       end
     end
+
+    class Empty
+    end
   end
 end

data/lib/fast_haml/compiler.rb

@@ -44,39 +44,33 @@ module FastHaml
     private
 
     def compile(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)
+      case ast
+      when Ast::Root
+        compile_root(ast)
+      when Ast::Doctype
+        compile_doctype(ast)
+      when Ast::HtmlComment
+        compile_html_comment(ast)
+      when Ast::HamlComment, Ast::Empty
+        [: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
-        temple
+        raise "InternalError: Unknown AST node #{ast.class}: #{ast.inspect}"
       end
     end
 
     def compile_root(ast)
       [:multi].tap do |temple|
+        temple.concat([[:newline]] * ast.leading_empty_lines)
         compile_children(ast, temple)
       end
     end
@@ -118,7 +112,7 @@ module FastHaml
       case child
       when Ast::Script
         child.children.empty?
-      when Ast::SilentScript, Ast::HamlComment
+      when Ast::SilentScript, Ast::HamlComment, Ast::Empty
         false
       when Ast::Element
         !child.nuke_outer_whitespace

data/lib/fast_haml/parser.rb

@@ -59,7 +59,7 @@ module FastHaml
       text, indent = @indent_tracker.process(line, @line_parser.lineno)
 
       if text.empty?
-        @ast.increment_trailing_empty_lines
+        @ast << Ast::Empty.new
         return
       end
 
@@ -200,8 +200,13 @@ module FastHaml
     end
 
     def indent_enter(_, text)
+      empty_lines = []
+      while @ast.children.last.is_a?(Ast::Empty)
+        empty_lines << @ast.children.pop
+      end
       @stack.push(@ast)
       @ast = @ast.children.last
+      @ast.children = empty_lines
       if @ast.is_a?(Ast::Element) && @ast.self_closing
         syntax_error!('Illegal nesting: nesting within a self-closing tag is illegal')
       end

data/lib/fast_haml/version.rb

@@ -1,3 +1,3 @@
 module FastHaml
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/compiler_newline_spec.rb

@@ -41,6 +41,30 @@ HAML
   %span hello
   %span #{raise LineVerifier}
   %span world
+HAML
+  end
+
+  it do
+    expect { render_string(<<HAML) }.to raise_error(LineVerifier, raised_at(2))
+
+%div= raise LineVerifier
+HAML
+  end
+
+  it do
+    expect { render_string(<<HAML) }.to raise_error(LineVerifier, raised_at(4))
+%div
+  %span= 1
+
+  %span= raise LineVerifier
+HAML
+  end
+
+  it do
+    expect { render_string(<<HAML) }.to raise_error(LineVerifier, raised_at(3))
+%div
+
+  %span= raise LineVerifier
 HAML
   end
 end

data/spec/render/filters/preserve_spec.rb

@@ -3,7 +3,6 @@ require 'spec_helper'
 RSpec.describe 'Preserve filter rendering', type: :render do
   it 'renders preserve filter' do
     expect(render_string(<<'HAML')).to eq("<span>start</span>\nhello&#x000A;  <p>wor&#x000A;ld</p>&#x000A;<span>hello</span>\n<span>end</span>\n")
-
 %span start
 :preserve
   hello

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fast_haml
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Kohei Suzuki