faml 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d3d6e9933ba8aa9a3e12fbba30474f4f930c912
-  data.tar.gz: de060fd62fd0dbbadcb2afce01af8118a44b1735
+  metadata.gz: 328702b10e441bb1ae9badaa46916346ae4ce107
+  data.tar.gz: bb21f995e912c1730b63248d03ec0c53950edb0c
 SHA512:
-  metadata.gz: ec7e51f60ee73922dafa2dace0a192d502e6654ec96490b61c30e149d601e5d41583f4eebd689b52d6c1db488c5f370304619ff41022edeb7d9c65059b2d87aa
-  data.tar.gz: 7862119f1f6240fb3cf137dcca00c0be7aade9dfe73ed1c4e00484b4095909b45fb6340e80bb010ed66a6e3772b8f956e382b025b0b1ba8a59d6b09772550bfd
+  metadata.gz: 61e63a2853364b69ffccdc59a1ceac429eba475a4a7cfa93c67a354a2cf74f75d66fa062a52b2a0f6dc7c0d09cf572663cf47772e5c8f91c9f584aebfee258ca
+  data.tar.gz: 47fffa94adedb8d3197076b5a1bf7ecef6a95a7e4a52606a710d7e08eb5f9959f9cb866df51d725a92001db941d2bdba5a6990fec056c76c8e9b46f3e6ea21b3

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.4 (2015-03-26)
+- Fix parser when parsing `>` or `<` after attribute lists
+    - `%div{foo: :bar} <br>` was incorrectly parsed as `%div{foo: :bar}< br>` .
+
 ## 0.2.3 (2015-03-25)
 - Always escape texts in :escape filter
     - It was not escaped when used in Rails

data/lib/faml/element_parser.rb

@@ -94,7 +94,7 @@ module Faml
         depth = ParserUtils.balance(s, '{', '}', depth)
         if depth == 0
           attr = s.pre_match + s.matched
-          return [attr[1, attr.size-2], s.rest.lstrip]
+          return [attr[1, attr.size-2], s.rest]
         else
           if text[-1] == ',' && @line_parser.has_next?
             text << @line_parser.next_line
@@ -117,7 +117,7 @@ module Faml
         if depth == 0
           t = s.string.byteslice(pre_pos ... s.pos-1)
           new_attributes.concat(parse_new_attribute_list(t))
-          return [new_attributes, s.rest.lstrip]
+          return [new_attributes, s.rest]
         else
           if @line_parser.has_next?
             text << ' ' << @line_parser.next_line

data/lib/faml/version.rb

@@ -1,3 +1,3 @@
 module Faml
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/spec/render/newline_spec.rb

@@ -67,6 +67,11 @@ HAML
     = i
 HAML
     end
+
+    it 'parses texts correctly' do
+      expect(render_string('%div{foo: :bar} <b>hello</b>')).to eq("<div foo='bar'><b>hello</b></div>\n")
+      expect(render_string('%div(foo="bar") <b>hello</b>')).to eq("<div foo='bar'><b>hello</b></div>\n")
+    end
   end
 
   describe '><' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faml
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-25 00:00:00.000000000 Z
+date: 2015-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape_utils