faml 0.2.10 → 0.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05912ba9442dfe72d17b8f1e9aacbf1484b036e7
-  data.tar.gz: d84fdc9481afa2e31fefb7b180a45664197706a2
+  metadata.gz: 4090ae5210da7fc60d6ed8e2837ab25f846a8271
+  data.tar.gz: 60d7ddcb1e8fd8f87fc97de7341e97e5e3e6c81a
 SHA512:
-  metadata.gz: 71e2974457f43aca89266a3dde091a0306db1f1d8c5bee5ed9a69d3efc0dde87ef5386023acf19f6864860383d01158b88aeda3a6607719c7ccababc1277fdf3
-  data.tar.gz: a0b4b25fccb960ec88a9733fe34610e27a7d984c53fc79c3690b55a2cb508b0b7f705963877be2a79faf39f09ba3c7e48bc75167c9122b138352506dcdfdb501
+  metadata.gz: 3840b30af5a7e5edcf48918d91046fcd34b2982672770a5b29afca3f05833676f30dbed78fe00e5807fbe3b8ffa58fd6a2e737509e307ee544c6769cf63c93bc
+  data.tar.gz: 1afc3e04ae4fb23a20b9e0fb316bf5cf336c162df281165c726f2f240e494639dadc8e197d70e41bb44d0a4424de0fe6ed3b7d640f1603c0fe4819cb4448784f

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.11 (2015-04-07)
+- Keep code newlines within multiline in HTML-style attribute list
+    - https://github.com/eagletmt/faml/issues/19
+
 ## 0.2.10 (2015-04-06)
 - Keep code newlines within Ruby multiline
 

data/README.md

@@ -27,6 +27,8 @@ Or install it yourself as:
 ### Rails, sinatra
 Just replace your `gem 'haml'` with `gem 'faml'` .
 
+faml is only tested with Rails >= 4.0.
+
 ### middleman
 Since middleman has its own renderers, there's no easy way to use faml with middleman currently.
 

data/lib/faml/element_parser.rb

@@ -77,11 +77,10 @@ module Faml
 
       attributes = old_attributes
       unless new_attributes.empty?
-        t = to_old_syntax(new_attributes)
         if attributes.empty?
-          attributes = t
+          attributes = new_attributes
         else
-          attributes << ", " << t
+          attributes << ", " << new_attributes
         end
       end
       [attributes, rest]
@@ -112,14 +111,12 @@ module Faml
       s = StringScanner.new(text)
       s.pos = 1
       depth = 1
-      new_attributes = []
       loop do
         pre_pos = s.pos
         depth = ParserUtils.balance(s, '(', ')', depth)
         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]
+          return [parse_new_attribute_list(t), s.rest]
         else
           if @line_parser.has_next?
             text << "\n" << @line_parser.next_line
@@ -132,7 +129,7 @@ module Faml
 
     def parse_new_attribute_list(text)
       s = StringScanner.new(text)
-      list = []
+      attributes = []
       until s.eos?
         name = scan_key(s)
         s.skip(/\s*/)
@@ -143,11 +140,12 @@ module Faml
         else
           value = 'true'
         end
-        s.skip(/\s*/)
+        spaces = s.scan(/\s*/)
+        line_count = spaces.count("\n")
 
-        list << [name, value]
+        attributes << "#{name.inspect} => #{value},#{"\n" * line_count}"
       end
-      list
+      attributes.join
     end
 
     def scan_key(scanner)
@@ -201,10 +199,6 @@ module Faml
       end
     end
 
-    def to_old_syntax(new_attributes)
-      new_attributes.map { |k, v| "#{k.inspect} => #{v}" }.join(', ')
-    end
-
     def parse_nuke_whitespace(rest)
       m = rest.match(/\A(><|<>|[><])(.*)\z/)
       if m

data/lib/faml/version.rb

@@ -1,3 +1,3 @@
 module Faml
-  VERSION = "0.2.10"
+  VERSION = "0.2.11"
 end

data/spec/compiler_newline_spec.rb

@@ -168,6 +168,14 @@ HAML
 HAML
       end
 
+      it 'keeps newlines in static HTML-style attributes' do
+        expect(render_string(<<HAML)).to eq("<span a='1' b='2'></span>\n3\n")
+%span(a=1
+  b=2)
+= __LINE__
+HAML
+      end
+
       it 'keeps newlines in dynamic attributes' do
         expect { render_string(<<HAML) }.to raise_error(LineVerifier, raised_at(2))
 %span{a: 1,

data/spec/render/attribute_spec.rb

@@ -259,5 +259,12 @@ HAML
     it 'raises error when string interpolation is unterminated' do
       expect { render_string('%span(foo=1 bar="ba#{1") hello') }.to raise_error(Faml::SyntaxError)
     end
+
+    it 'renders __LINE__ correctly' do
+      expect(render_string(<<HAML)).to eq("<span a='2' b='1'></span>\n")
+%span(b=__LINE__
+  a=__LINE__)
+HAML
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faml
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.11
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-06 00:00:00.000000000 Z
+date: 2015-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape_utils