faml 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd9450955cdd17a06278c80b23b5b4b566e3ac15
-  data.tar.gz: e115460cd407681b8c8768f976ad9f4a33b74313
+  metadata.gz: 00278629939c45cb0b99bb33b4804a1632fe9e2b
+  data.tar.gz: 8c70078e0c7da99320775bd7b1e9fbadae654aa3
 SHA512:
-  metadata.gz: 89aab3814554aef1673f164c666bc974f3fc7e8b2ff45b2e4bb438861caaac7796d4a2b76b9ccb612259e5737aac0001877d1d1d20e42bfb49867054e5547010
-  data.tar.gz: ab7478d4edefc0e5d3fc6f70cd1b6af2a6c1b8e40ea4d73175592b1e67d72500fc767ecaf2d9d7fc4022f684e0b78b0fa99112544f5dc22a8ad033101c87076b
+  metadata.gz: 0d4a3d25800c968bd0499386817e64293bd8bc99cfe2df3d8bc05d827c2fee83e663f9d7b793429a3f0ded1f8d2b662e656ed89dc76ae801c0084394506f3bb1
+  data.tar.gz: aacf989f3c254913503803e8596cb05c90fcc839f43344bcca6a3379132a06ccfac92a62db9738dd7886cbc54928d12c2e5703c5a298c3cbd0b244a7b08009fe

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.2.8 (2015-04-02)
+- Allow empty silent script body
+    - For compatibility with haml
+    - https://github.com/eagletmt/faml/issues/16
+- Fix parse error at multiline in attribute list
+    - https://github.com/eagletmt/faml/issues/15
+
 ## 0.2.7 (2015-03-31)
 - Improve backtrace of compile time errors
 - Annotate Faml::Ast with filename and line number (internal)

data/lib/faml/element_parser.rb

@@ -98,7 +98,7 @@ module Faml
           attr = s.pre_match + s.matched
           return [attr[1, attr.size-2], s.rest]
         else
-          if text[-1] == ',' && @line_parser.has_next?
+          if /,\s*\z/ === text && @line_parser.has_next?
             text << @line_parser.next_line
           else
             syntax_error!('Unmatched brace')

data/lib/faml/parser.rb

@@ -146,9 +146,6 @@ module Faml
       end
       node = create_node(Ast::SilentScript)
       node.script = text[/\A- *(.*)\z/, 1]
-      if node.script.empty?
-        syntax_error!("No Ruby code to evaluate")
-      end
       node.script += RubyMultiline.read(@line_parser, node.script)
       @ast << node
     end

data/lib/faml/version.rb

@@ -1,3 +1,3 @@
 module Faml
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
 end

data/spec/render/multiline_spec.rb

@@ -34,6 +34,13 @@ HAML
   hello
   |
   world
+HAML
+  end
+
+  it 'can be used in attribute list' do
+    expect(render_string(<<HAML)).to eq("<div bar='2' foo='1'></div>\n")
+%div{foo: 1, |
+  bar: 2}
 HAML
   end
 end

data/spec/render/silent_script_spec.rb

@@ -80,8 +80,8 @@ HAML
 HAML
   end
 
-  it 'raises error if no Ruby code is given' do
-    expect { render_string('-') }.to raise_error(Faml::SyntaxError)
+  it 'allows empty silent script body' do
+    expect(render_string("%br\n-\n%br")).to eq("<br>\n<br>\n")
   end
 
   it 'checks indent levels' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faml
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-31 00:00:00.000000000 Z
+date: 2015-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape_utils
@@ -432,7 +432,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Faster implementation of Haml template language.