fast_haml 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4dbc3b15e30a6c37e0c932d0dc6e2407cc3102e
-  data.tar.gz: 0e6c9d24076c83e7b5f76fdf88112db10f4bf854
+  metadata.gz: 82c2cd008b3cb7f86bf02d80ad69ae0655bd88b6
+  data.tar.gz: a06febaeb2ccf36598a2d612f8dd9de3e367f8c3
 SHA512:
-  metadata.gz: af1d8ee121870759f5215c9efa0de024c6e48d74e46b15ba142793df427f8eb8cb53fd8182633b6d59262628e8916382fc00eec8b818ae82b1a28687d8f5b6a5
-  data.tar.gz: 482e94239ea3a5f2b5c124f7fe1ae3c89a7bbcd412c70a12db1a2ecbf44a9e58886f9cfbc7e5f63fc215de4a0b3bb944b1043a49e6e3a8612ea5ac03363362a0
+  metadata.gz: 26b7a473dd89a20eb8dcef16c14b435157ea054ae8aac72bd19782959bc8de54d010c119580f6c5bd6a1617f19e1d0b20354e2d5691a2f2428df173a52bfb0c5
+  data.tar.gz: 15431eb000c43add9ab90cfd19167c52a5c23f0cee9fdc56b84bbcdbd7d40b1fbbdfd12bf5ddd89df5e102f861d6621550a28d4e8d98e8a404c02d9f10d858b7

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.1.6 (2015-03-11)
+- Fix render error with comment-only script
+    - https://github.com/eagletmt/fast_haml/issues/6
+- Fix parsing error at multiline attributes
+    - https://github.com/eagletmt/fast_haml/issues/7
+
 ## 0.1.5 (2015-03-01)
 - Fix minor newline generation bug with Haml comment
 

data/benchmark/rendering.rb

@@ -14,15 +14,21 @@ Benchmark.ips do |x|
   obj = Object.new
 
   Haml::Engine.new(File.read(template), ugly: true, escape_html: true).def_method(obj, :haml)
-  code = FastHaml::Engine.new.call(File.read(template))
-  obj.instance_eval("def fast_haml; #{code}; end")
+  code_array = FastHaml::Engine.new.call(File.read(template))
+  obj.instance_eval("def fast_haml_array; #{code_array}; end")
+  code_string = FastHaml::Engine.new(generator: Temple::Generators::RailsOutputBuffer).call(File.read(template))
+  obj.instance_eval("def fast_haml_string; #{code_string}; end")
 
-  x.report('Haml rendering') do
+  x.report('Haml') do
     obj.haml
   end
 
-  x.report('FastHaml rendering') do
-    obj.fast_haml
+  x.report('FastHaml (Array)') do
+    obj.fast_haml_array
+  end
+
+  x.report('FastHaml (String)') do
+    obj.fast_haml_string
   end
 
   x.compare!

data/lib/fast_haml/compiler.rb

@@ -318,10 +318,15 @@ module FastHaml
 
     def compile_script(ast)
       sym = unique_name
-      temple = [:multi, [:code, "#{sym} = #{ast.script}"], [:newline]]
-      compile_children(ast, temple)
-      if !ast.children.empty? && !ast.mid_block_keyword
-        temple << [:code, 'end']
+      temple = [:multi]
+      if ast.children.empty?
+        temple << [:code, "#{sym} = (#{ast.script}"] << [:newline] << [:code, ')']
+      else
+        temple << [:code, "#{sym} = #{ast.script}"] << [:newline]
+        compile_children(ast, temple)
+        if !ast.mid_block_keyword
+          temple << [:code, 'end']
+        end
       end
       if !ast.escape_html && ast.preserve
         temple << [:haml, :preserve, sym]

data/lib/fast_haml/element_parser.rb

@@ -92,7 +92,7 @@ module FastHaml
       s.pos = 1
       depth = 1
       loop do
-        depth = ParserUtils.balance(s, '{', '}')
+        depth = ParserUtils.balance(s, '{', '}', depth)
         if depth == 0
           attr = s.pre_match + s.matched
           return [attr[1, attr.size-2], s.rest.lstrip]

data/lib/fast_haml/version.rb

@@ -1,3 +1,3 @@
 module FastHaml
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/spec/render/attribute_spec.rb

@@ -164,6 +164,14 @@ HAML
     end
 
     it 'parses multiline attribute list' do
+      expect(render_string(<<HAML)).to eq("<span data-bar='2' data-foo='1'>\n<span>hello</span>\n</span>\n")
+%span{data: {foo: 1,
+  bar: 2}}
+  %span hello
+HAML
+    end
+
+    it 'parses HTML-style multiline attribute list' do
       expect(render_string(<<HAML)).to eq("<span bar='3' foo='1'>hello</span>\n")
 %span(foo=1
 

data/spec/render/script_spec.rb

@@ -34,6 +34,13 @@ HAML
 HAML
   end
 
+  it 'can be comment-only' do
+    expect(render_string(<<HAML)).to eq("\nstring\n")
+= # comment
+= 'string'
+HAML
+  end
+
   it 'can have children' do
     expect(render_string(<<HAML)).to eq("<span>0</span>\n1<span>end</span>\n")
 = 1.times do |i|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fast_haml
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-01 00:00:00.000000000 Z
+date: 2015-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape_utils
@@ -347,7 +347,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.