fast_haml 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 435825826b3948fd94accaf5eaafc29e1d7ea4f1
-  data.tar.gz: 3b0ad21919d9a8ec7bccee42f39740431acd2b8d
+  metadata.gz: ec965b362a4b85f320d2144ebc3117d16476505a
+  data.tar.gz: 4cdd71b4c7664e6fe6e9bf74f225be290b02456e
 SHA512:
-  metadata.gz: 3c03f60242ffe2650685d696c1e1cc36d3561d28b31aaa86feee6412154551c938d76f3406948527a5b959122d846bc5cd827a85f11558e79dab8e02e453f1f2
-  data.tar.gz: d5a8252b40bfd94d5f2748870add6eda2cda54579b50aee5dc91de16f46e61c3bf22e6dd4e77ed3f90c2ce20ff2b08c25fabd15b5fe588d67e63b9e9c0e175f5
+  metadata.gz: 4e8e90941f16081fba0ffc531cdcbc84fba4cf65ff629ebfcee51b50ad65660c78b4b92fbe965afa7798e3407567cdddc2064317fd996cec82c140a015831f71
+  data.tar.gz: f461f513f3e2d5249156e5dcc399216c777057431ebb5027bedcc372bd25e15d1374b961267d0d62af159250747a175ab66f27d3c4ccdc380bdae797ec44007b

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.8 (2015-03-17)
+- Fix whitespace removal (`<` and `>`) behavior
+    - Internally, new instructions `mknl` and `rmnl` are added.
+
 ## 0.1.7 (2015-03-16)
 - Fix attribute rendering with falsey values
     - https://github.com/eagletmt/fast_haml/pull/11

data/README.md

@@ -88,6 +88,24 @@ I introduced incompatibility to expand the chance: all attribute values are conv
 This will enable us to avoid runtime expensive hash merging and rendering.
 The runtime hash merging is implemented by C extension in fast_haml.
 
+Internally, attributes are categolized into three types.
+
+1. Static attributes
+    - Both the key and the value are literal.
+    - Compiled into string literals.
+    - Fastest.
+    - e.g. `%input{checked: false}`
+2. Dynamic attributes
+    - The key is literal but the value isn't.
+    - The key is compiled into string literal. The value is interpolated at run-time.
+    - Relatively fast.
+    - e.g. `%input{checked: helper_method(@record)}`
+3. Ruby attributes
+    - Both the key and the value are non-literal expression.
+    - The attributes are stringified at run-time.
+    - Slow.
+    - e.g. `%input{helper_method(@record)}`
+
 ## Contributing
 
 1. Fork it ( https://github.com/eagletmt/fast_haml/fork )

data/lib/fast_haml/ast.rb

@@ -13,12 +13,6 @@ module FastHaml
 
     class Root < Struct.new(:children)
       include HasChildren
-      attr_reader :leading_empty_lines
-
-      def initialize(*)
-        super
-        @leading_empty_lines = 0
-      end
     end
 
     class Doctype < Struct.new(:doctype)

data/lib/fast_haml/compiler.rb

@@ -1,3 +1,4 @@
+require 'parser/current'
 require 'temple'
 require 'fast_haml/ast'
 require 'fast_haml/filter_compilers'
@@ -6,6 +7,9 @@ require 'fast_haml/text_compiler'
 
 module FastHaml
   class Compiler < Temple::Parser
+    class UnparsableRubyCode < StandardError
+    end
+
     DEFAULT_AUTO_CLOSE_TAGS = %w[
       area base basefont br col command embed frame hr img input isindex keygen
       link menuitem meta param source track wbr
@@ -72,34 +76,15 @@ module FastHaml
 
     def compile_root(ast)
       [:multi].tap do |temple|
-        temple.concat([[:newline]] * ast.leading_empty_lines)
         compile_children(ast, temple)
       end
     end
 
     def compile_children(ast, temple)
-      was_newline = false
       ast.children.each do |c|
-        if c.is_a?(Ast::Element) && c.nuke_outer_whitespace && was_newline
-          # pop newline
-          x = temple.pop
-          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]
-          end
-        end
         temple << compile(c)
-        if was_newline = need_newline?(ast, c)
-          temple << [:static, "\n"]
+        if need_newline?(c)
+          temple << [:mknl]
         end
         unless suppress_code_newline?(c)
           temple << [:newline]
@@ -107,10 +92,7 @@ module FastHaml
       end
     end
 
-    def need_newline?(parent, child)
-      if parent.is_a?(Ast::Element) && nuke_inner_whitespace?(parent) && parent.children.last.equal?(child)
-        return false
-      end
+    def need_newline?(child)
       case child
       when Ast::Script
         child.children.empty?
@@ -127,7 +109,8 @@ module FastHaml
       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::Element) && !ast.children.empty?) ||
+        (ast.is_a?(Ast::HtmlComment) && !ast.conditional.empty?)
     end
 
     def compile_text(ast)
@@ -160,9 +143,9 @@ module FastHaml
       else
         temple = [:multi]
         if ast.conditional.empty?
-          temple << [:static, "\n"]
+          temple << [:mknl]
         else
-          temple << [:static, "[#{ast.conditional}]>\n"]
+          temple << [:static, "[#{ast.conditional}]>"] << [:mknl] << [:newline]
         end
         compile_children(ast, temple)
         unless ast.conditional.empty?
@@ -189,14 +172,21 @@ module FastHaml
       elsif !ast.children.empty?
         children = [:multi]
         unless nuke_inner_whitespace?(ast)
-          children << [:static, "\n"]
+          children << [:mknl]
         end
         children << [:newline]
         compile_children(ast, children)
+        if nuke_inner_whitespace?(ast)
+          children << [:rmnl]
+        end
         temple << children
       end
 
-      temple
+      if ast.nuke_outer_whitespace
+        [:multi, [:rmnl], temple]
+      else
+        temple
+      end
     end
 
     def self_closing?(ast)
@@ -249,6 +239,7 @@ module FastHaml
     def try_optimize_attributes(text, static_id, static_class)
       parser = StaticHashParser.new
       unless parser.parse("{#{text}}")
+        assert_valid_ruby_code!(text)
         return nil
       end
 
@@ -271,6 +262,17 @@ module FastHaml
       end
     end
 
+    def assert_valid_ruby_code!(text)
+      parser = ::Parser::CurrentRuby.new
+      parser.diagnostics.consumer = nil
+      buffer = ::Parser::Source::Buffer.new('(fast_haml)')
+      buffer.source = "call(#{text})"
+      parser.parse(buffer)
+      true
+    rescue ::Parser::SyntaxError
+      raise UnparsableRubyCode.new("Unparsable Ruby code is given to attributes: #{text}")
+    end
+
     def build_optimized_attributes(parser, static_id, static_class)
       static_attributes = {}
       parser.static_attributes.each do |k, v|

data/lib/fast_haml/engine.rb

@@ -1,6 +1,7 @@
 require 'temple'
 require 'fast_haml/compiler'
 require 'fast_haml/html'
+require 'fast_haml/newline'
 require 'fast_haml/parser'
 
 module FastHaml
@@ -24,6 +25,7 @@ module FastHaml
     filter :Escapable
     filter :ControlFlow
     filter :MultiFlattener
+    use Newline
     filter :StaticMerger
     use :Generator do
       options[:generator].new(options.to_hash.reject {|k,v| !options[:generator].options.valid_key?(k) })

data/lib/fast_haml/newline.rb

@@ -0,0 +1,30 @@
+require 'temple'
+
+module FastHaml
+  class Newline < Temple::Filter
+    def on_multi(*exprs)
+      i = exprs.size-1
+      marker = false
+      while i >= 0
+        case exprs[i]
+        when [:rmnl]
+          if marker
+            raise "InternalError: double rmnl error"
+          else
+            marker = true
+            exprs.delete_at(i)
+          end
+        when [:mknl]
+          if marker
+            marker = false
+            exprs.delete_at(i)
+          else
+            exprs[i] = [:static, "\n"]
+          end
+        end
+        i -= 1
+      end
+      [:multi, *exprs]
+    end
+  end
+end

data/lib/fast_haml/version.rb

@@ -1,3 +1,3 @@
 module FastHaml
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/spec/compiler_newline_spec.rb

@@ -75,4 +75,23 @@ HAML
 %span= raise LineVerifier
 HAML
   end
+
+  context 'with conditional comment' do
+    it do
+      expect { render_string(<<HAML) }.to raise_error(LineVerifier, raised_at(3))
+%div
+  / [if IE]
+    %span= raise LineVerifier
+HAML
+    end
+
+    it do
+      expect { render_string(<<HAML) }.to raise_error(LineVerifier, raised_at(4))
+%div
+  / [if IE]
+    %span hello
+  %span= raise LineVerifier
+HAML
+    end
+  end
 end

data/spec/render/attribute_spec.rb

@@ -63,6 +63,10 @@ HAML
     expect(render_string(%q|%span{foo: true, bar: 1} hello|)).to eq(%Q{<span bar='1' foo>hello</span>\n})
   end
 
+  it 'raises error when unparsable Ruby code is given' do
+    expect { render_string('%span{x ==== 2}') }.to raise_error(FastHaml::Compiler::UnparsableRubyCode)
+  end
+
   context 'with xhtml format' do
     it 'renders name="name" if value is true' do
       expect(render_string(%q|%span{foo: true, bar: 1} hello|, format: :xhtml)).to eq(%Q{<span bar='1' foo='foo'>hello</span>\n})

data/spec/render/element_spec.rb

@@ -119,45 +119,6 @@ HAML
     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 nuke-inner-whitespace (<)' do
-    expect(render_string(<<HAML)).to eq("<blockquote><div>\nFoo!\n</div></blockquote>\n")
-%blockquote<
-  %div
-    Foo!
-HAML
-  end
-
-  it 'renders pre tag as nuke-inner-whitespace by default' do
-    expect(render_string(<<HAML)).to eq("<pre>hello\nworld</pre>\n")
-%pre
-  hello
-  world
-HAML
-  end
-
-  it 'parses nuke-outer-whitespace (>)' do
-    expect(render_string(<<HAML)).to eq("<img><span>hello</span><img>\n")
-%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
-
-  it 'parses nuke-whitespaces' do
-    expect(render_string(<<HAML)).to eq("<img><pre>foo\nbar</pre><img>\n")
-%img
-%pre><
-  foo
-  bar
-%img
-HAML
-  end
-
   it 'parses == syntax' do
     expect(render_string('%p== =#{1+2}hello')).to eq("<p>=3hello</p>\n")
   end

data/spec/render/newline_spec.rb

@@ -0,0 +1,83 @@
+require 'spec_helper'
+
+RSpec.describe 'Newline with > and <', type: :render do
+  describe '>' do
+    it 'parses nuke-outer-whitespace (>)' do
+      expect(render_string(<<HAML)).to eq("<img><span>hello</span><img>\n")
+%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
+
+    it 'handles silent script' do
+      expect(render_string(<<HAML)).to eq("<div><span>0</span><span>1</span></div>\n")
+%div
+  - 2.times do |i|
+    %span>= i
+HAML
+    end
+
+    it 'handles comment' do
+      expect(render_string(<<HAML)).to eq("<div>\n<!--<span>0</span><span>1</span>-->\n</div>\n")
+%div
+  /
+    - 2.times do |i|
+      %span>= i
+HAML
+    end
+
+    it 'handles conditional comment' do
+      expect(render_string(<<HAML)).to eq("<div>\n<!--[if IE]><span>0</span><span>1</span><![endif]-->\n</div>\n")
+%div
+  / [if IE]
+    - 2.times do |i|
+      %span>= i
+HAML
+    end
+  end
+
+  describe '>' do
+    it 'parses nuke-inner-whitespace (<)' do
+      expect(render_string(<<HAML)).to eq("<blockquote><div>\nFoo!\n</div></blockquote>\n")
+%blockquote<
+  %div
+    Foo!
+HAML
+    end
+
+    it 'renders pre tag as nuke-inner-whitespace by default' do
+      expect(render_string(<<HAML)).to eq("<pre>hello\nworld</pre>\n")
+%pre
+  hello
+  world
+HAML
+    end
+
+    it 'handles silent script' do
+      expect(render_string(<<HAML)).to eq("<div>012</div>\n")
+%div<
+  - 3.times do |i|
+    = i
+HAML
+    end
+  end
+
+  describe '><' do
+    it 'parses nuke-whitespaces' do
+      expect(render_string(<<HAML)).to eq("<img><pre>foo\nbar</pre><img>\n")
+%img
+%pre><
+  foo
+  bar
+%img
+HAML
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fast_haml
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-16 00:00:00.000000000 Z
+date: 2015-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape_utils
@@ -241,6 +241,7 @@ files:
 - lib/fast_haml/html.rb
 - lib/fast_haml/indent_tracker.rb
 - lib/fast_haml/line_parser.rb
+- lib/fast_haml/newline.rb
 - lib/fast_haml/parser.rb
 - lib/fast_haml/parser_utils.rb
 - lib/fast_haml/rails_handler.rb
@@ -319,6 +320,7 @@ files:
 - spec/render/filters_spec.rb
 - spec/render/haml_comment_spec.rb
 - spec/render/multiline_spec.rb
+- spec/render/newline_spec.rb
 - spec/render/plain_spec.rb
 - spec/render/preserve_spec.rb
 - spec/render/sanitize_spec.rb
@@ -420,6 +422,7 @@ test_files:
 - spec/render/filters_spec.rb
 - spec/render/haml_comment_spec.rb
 - spec/render/multiline_spec.rb
+- spec/render/newline_spec.rb
 - spec/render/plain_spec.rb
 - spec/render/preserve_spec.rb
 - spec/render/sanitize_spec.rb