fast_haml 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e396fc6a76d932fc231a39783109c56be41fd5d2
-  data.tar.gz: 637ffb6b8faa7caf60cf8be200826740da3d521a
+  metadata.gz: 82e5ebff407e25bb08be2e8130a90cca37e0bfc6
+  data.tar.gz: ac737189d9a874166e57300520d1f58179420e03
 SHA512:
-  metadata.gz: 6a9bbe7b0da60b072fb9c5eab60d8292e549e5b78989b6ff5e109de846e0321dd5425f5f92bcb85c534a3153e2889953950384d68d896cad01db5d73d362976c
-  data.tar.gz: fcb46c42e9801024c85e1232c92222f079c37c60694796b4ec682c4dd72a97499508aef4fc4584348b9dba9f71c6902b01a2b098871e552cc6bd79b7bd224aab
+  metadata.gz: a9afecde05c50d903af4ef9fa480fbc89e8bfacc41256311a2a754a4acaa382128551ed2c9d20d57137db7747a66957230abd0ec4cda9e0c02a4aac88d49b941
+  data.tar.gz: 2fc94f166bbf3b2830fa123968c995bf73e96ee23b75a2b933ce789f3b5fe056274b9af01db342d7a62fd9e3a1662f5df15b66b723657822c69c248cb26dc68e

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.3 (2015-02-27)
+- Fix internal compiler error when `>` is used
+- Fix newline generation at Ast::Element case
+
 ## 0.1.2 (2015-02-24)
 - Keep newlines for better backtrace (#4)
 

data/lib/fast_haml/compiler.rb

@@ -87,12 +87,15 @@ module FastHaml
         if c.is_a?(Ast::Element) && c.nuke_outer_whitespace && was_newline
           # pop newline
           x = temple.pop
-          if x != [:newline]
-            raise "InternalError: Unexpected pop (expected [:newline]): #{x}"
-          end
-          x = temple.pop
-          if x != [:static, "\n"]
-            raise "InternalError: Unexpected pop (expected [:static, newline]): #{x}"
+          if x == [:newline]
+            x = temple.pop
+            if x != [:static, "\n"]
+              raise "InternalError: Unexpected pop (expected [:static, \\n]): #{x}"
+            end
+          elsif x == [:static, "\n"]
+            # nothing
+          else
+            raise "InternalError: Unexpected pop (expected [:newline] or [:static, \\n]): #{x}"
           end
           unless suppress_code_newline?(c.oneline_child)
             temple << [:newline]
@@ -125,7 +128,10 @@ module FastHaml
     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::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?)
     end
 
     def compile_text(ast)
@@ -185,6 +191,7 @@ module FastHaml
         unless nuke_inner_whitespace?(ast)
           children << [:static, "\n"]
         end
+        children << [:newline]
         compile_children(ast, children)
         temple << children
       end

data/lib/fast_haml/version.rb

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

data/spec/compiler_newline_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+class LineVerifier < StandardError
+  def initialize
+    super("raised at #{caller_locations(1, 1)[0].lineno}")
+  end
+end
+
+module LineVerifierHelper
+  extend RSpec::Matchers::DSL
+
+  matcher :raised_at do |expected|
+    match do |actual|
+      actual == "raised at #{expected}"
+    end
+  end
+end
+
+RSpec.describe 'FastHaml::Compiler newline generation', type: :render do
+  include LineVerifierHelper
+
+  it do
+    expect { render_string(<<HAML) }.to raise_error(LineVerifier, raised_at(3))
+%div
+  %span= 1
+  %span>= raise LineVerifier
+HAML
+  end
+
+  it do
+    expect { render_string(<<HAML) }.to raise_error(LineVerifier, raised_at(2))
+%img
+%img{href: raise(LineVerifier)}>
+%img
+HAML
+  end
+
+  it do
+    expect { render_string(<<'HAML') }.to raise_error(LineVerifier, raised_at(3))
+%div
+  %span hello
+  %span #{raise LineVerifier}
+  %span world
+HAML
+  end
+end

data/spec/render/element_spec.rb

@@ -140,6 +140,11 @@ HAML
 %img
 %span> hello
 %img
+HAML
+    expect(render_string(<<HAML)).to eq("<div>\n<span>1</span><span>hoge</span></div>\n")
+%div
+  %span= 1
+  %span> hoge
 HAML
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fast_haml
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-24 00:00:00.000000000 Z
+date: 2015-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape_utils
@@ -251,6 +251,7 @@ files:
 - lib/fast_haml/text_compiler.rb
 - lib/fast_haml/tilt.rb
 - lib/fast_haml/version.rb
+- spec/compiler_newline_spec.rb
 - spec/rails/Rakefile
 - spec/rails/app/assets/images/.keep
 - spec/rails/app/assets/javascripts/application.js
@@ -351,6 +352,7 @@ signing_key:
 specification_version: 4
 summary: Faster implementation of Haml template language.
 test_files:
+- spec/compiler_newline_spec.rb
 - spec/rails/Rakefile
 - spec/rails/app/assets/images/.keep
 - spec/rails/app/assets/javascripts/application.js