faml 0.6.3 → 0.6.4

data/incompatibilities/spec/render/hash_attribute_spec.md

@@ -0,0 +1,120 @@
+# [./spec/render/hash_attribute_spec.rb:5](../../../spec/render/hash_attribute_spec.rb#L5)
+## Input
+```haml
+%span{foo: {bar: 1+2}} hello
+```
+
+## Faml
+```html
+<span foo='{:bar=&gt;3}'>hello</span>
+
+```
+
+## Haml, Hamlit
+```html
+<span foo-bar='3'>hello</span>
+
+```
+
+# [./spec/render/hash_attribute_spec.rb:9](../../../spec/render/hash_attribute_spec.rb#L9)
+## Input
+```haml
+- attrs = { foo: 1, bar: { hoge: :fuga }, baz: true }
+%span{attrs} hello
+
+```
+
+## Faml
+```html
+<span bar='{:hoge=&gt;:fuga}' baz foo='1'>hello</span>
+
+```
+
+## Haml
+```html
+<span bar-hoge='fuga' baz foo='1'>hello</span>
+
+```
+
+## Hamlit
+```html
+<span foo='1' bar-hoge='fuga' baz>hello</span>
+
+```
+
+# [./spec/render/hash_attribute_spec.rb:16](../../../spec/render/hash_attribute_spec.rb#L16)
+## Input
+```haml
+- data = { foo: 1 }
+%span{foo: {bar: "x#{1}y"}} hello
+
+```
+
+## Faml
+```html
+<span foo='{:bar=&gt;&quot;x1y&quot;}'>hello</span>
+
+```
+
+## Haml, Hamlit
+```html
+<span foo-bar='x1y'>hello</span>
+
+```
+
+# [./spec/render/hash_attribute_spec.rb:37](../../../spec/render/hash_attribute_spec.rb#L37)
+## Input
+```haml
+%span{data: {foo: 1, bar: 'baz', :hoge => :fuga, k1: { k2: 'v3' }}} hello
+```
+
+## Faml, Haml
+```html
+<span data-bar='baz' data-foo='1' data-hoge='fuga' data-k1-k2='v3'>hello</span>
+
+```
+
+## Hamlit
+```html
+<span data-foo='1' data-bar='baz' data-hoge='fuga' data-k1-k2='v3'>hello</span>
+
+```
+
+# [./spec/render/hash_attribute_spec.rb:45](../../../spec/render/hash_attribute_spec.rb#L45)
+## Input
+```haml
+%span{data: {foo: 1, bar: 2+3}} hello
+```
+
+## Faml, Haml
+```html
+<span data-bar='5' data-foo='1'>hello</span>
+
+```
+
+## Hamlit
+```html
+<span data-foo='1' data-bar='5'>hello</span>
+
+```
+
+# [./spec/render/hash_attribute_spec.rb:49](../../../spec/render/hash_attribute_spec.rb#L49)
+## Input
+```haml
+- data = { foo: 1, bar: 2 }
+%span{data: data} hello
+
+```
+
+## Faml, Haml
+```html
+<span data-bar='2' data-foo='1'>hello</span>
+
+```
+
+## Hamlit
+```html
+<span data-foo='1' data-bar='2'>hello</span>
+
+```
+

data/lib/faml/version.rb

@@ -1,4 +1,4 @@
 # frozen-string-literal: true
 module Faml
-  VERSION = '0.6.3'
+  VERSION = '0.6.4'
 end

data/spec/render/array_attribute_spec.rb

@@ -0,0 +1,85 @@
+# frozen-string-literal: true
+require 'spec_helper'
+
+RSpec.describe 'Array attributes rendering', type: :render do
+  describe 'class' do
+    it 'renders array class' do
+      with_each_attribute_type(:class, '"c1"', klass: 'c2') do |str|
+        expect(render_string(str)).to eq("<span class='c1 c2'></span>\n")
+      end
+      with_each_attribute_type(:class, '["c1", "c3", :c2]', klass: 'c2') do |str|
+        expect(render_string(str)).to eq("<span class='c1 c2 c3'></span>\n")
+      end
+    end
+
+    it 'merges classes' do
+      expect(render_string(<<HAML)).to eq("<span class='c1 c2 content {}' id='main_id1_id3_id2'>hello</span>\n")
+- h1 = {class: 'c1', id: ['id1', 'id3']}
+- h2 = {class: [{}, 'c2'], id: 'id2'}
+%span#main.content{h1, h2} hello
+HAML
+    end
+
+    it 'remove duplicated classes' do
+      with_each_attribute_type(:class, ':foo', klass: 'foo') do |str|
+        expect(render_string(str)).to eq("<span class='foo'></span>\n")
+      end
+      with_each_attribute_type(:class, '"foo bar"', klass: 'foo') do |str|
+        expect(render_string(str)).to eq("<span class='bar foo'></span>\n")
+      end
+      with_each_attribute_type(:class, '%w[foo bar]', klass: 'foo') do |str|
+        expect(render_string(str)).to eq("<span class='bar foo'></span>\n")
+      end
+    end
+
+    it 'skips empty array class' do
+      with_each_attribute_type(:class, '[]') do |str|
+        expect(render_string(str)).to eq("<span></span>\n")
+      end
+    end
+
+    it 'skips falsey array elements in class' do
+      with_each_attribute_type(:class, '[1, nil, false, true]') do |str|
+        expect(render_string(str)).to eq("<span class='1 true'></span>\n")
+      end
+    end
+
+    it 'flattens array class' do
+      with_each_attribute_type(:class, '[[1, [2]]]') do |str|
+        expect(render_string(str)).to eq("<span class='1 2'></span>\n")
+      end
+    end
+
+    it 'merges static class' do
+      with_each_attribute_type(:class, '"bar"', tag: 'div', klass: 'foo', text: 'baz') do |str|
+        expect(render_string(str)).to eq("<div class='bar foo'>baz</div>\n")
+      end
+    end
+  end
+
+  describe 'id' do
+    it 'skips empty array id' do
+      with_each_attribute_type(:id, '[]') do |str|
+        expect(render_string(str)).to eq("<span></span>\n")
+      end
+    end
+
+    it 'skips falsey array elements in id' do
+      with_each_attribute_type(:id, '[1, nil, false, true]') do |str|
+        expect(render_string(str)).to eq("<span id='1_true'></span>\n")
+      end
+    end
+
+    it 'flattens array id' do
+      with_each_attribute_type(:id, '[1, [2]]') do |str|
+        expect(render_string(str)).to eq("<span id='1_2'></span>\n")
+      end
+    end
+
+    it 'merges static id' do
+      with_each_attribute_type(:id, '"bar"', tag: 'div', id: 'foo', text: 'baz') do |str|
+        expect(render_string(str)).to eq("<div id='foo_bar'>baz</div>\n")
+      end
+    end
+  end
+end

data/spec/render/attribute_spec.rb

@@ -29,89 +29,28 @@ RSpec.describe 'Attributes rendering', type: :render do
     expect(render_string(%q|%span#main{class: "na#{'ni'}ka"} hello|)).to eq(%Q{<span class='nanika' id='main'>hello</span>\n})
   end
 
-  it 'renders array class' do
-    expect(render_string('%span.c2{class: "c1"}')).to eq("<span class='c1 c2'></span>\n")
-    expect(render_string('%span.c2{class: ["c1", "c3", :c2]}')).to eq("<span class='c1 c2 c3'></span>\n")
-  end
-
   it 'renders boolean attributes' do
-    expect(render_string('%input{checked: true}')).to eq("<input checked>\n")
-    expect(render_string('%input{checked: false}')).to eq("<input>\n")
-    expect(render_string('%input{checked: nil}')).to eq("<input>\n")
-    expect(render_string('%input{checked: "a" == "a"}')).to eq("<input checked>\n")
-    expect(render_string('%input{checked: "a" != "a"}')).to eq("<input>\n")
-    expect(render_string("- x = nil\n%input{checked: x}")).to eq("<input>\n")
-    expect(render_string("- h = {checked: true}\n%input{h}")).to eq("<input checked>\n")
-    expect(render_string("- h = {checked: false}\n%input{h}")).to eq("<input>\n")
-    expect(render_string("- h = {checked: nil}\n%input{h}")).to eq("<input>\n")
-  end
-
-  it 'merges classes' do
-    expect(render_string(<<HAML)).to eq("<span class='c1 c2 content {}' id='main_id1_id3_id2'>hello</span>\n")
-- h1 = {class: 'c1', id: ['id1', 'id3']}
-- h2 = {class: [{}, 'c2'], id: 'id2'}
-%span#main.content{h1, h2} hello
-HAML
-  end
-
-  it 'strigify non-string classes' do
-    expect(render_string('%span.foo{class: :bar} hello')).to eq("<span class='bar foo'>hello</span>\n")
-    expect(render_string('%span.foo{class: 1} hello')).to eq("<span class='1 foo'>hello</span>\n")
-  end
-
-  it 'remove duplicated classes' do
-    aggregate_failures do
-      expect(render_string('%span.foo{class: :foo}')).to eq("<span class='foo'></span>\n")
-      expect(render_string('%span.foo{class: "foo bar"}')).to eq("<span class='bar foo'></span>\n")
-      expect(render_string('%span.foo{class: %w[foo bar]}')).to eq("<span class='bar foo'></span>\n")
+    with_each_attribute_type(:checked, 'true', tag: 'input') do |str|
+      expect(render_string(str)).to eq("<input checked>\n")
     end
-    aggregate_failures do
-      expect(render_string("- v = :foo\n%span.foo{class: v}")).to eq("<span class='foo'></span>\n")
-      expect(render_string("- v = 'foo bar'\n%span.foo{class: v}")).to eq("<span class='bar foo'></span>\n")
-      expect(render_string("- v = %w[foo bar]\n%span.foo{class: v}")).to eq("<span class='bar foo'></span>\n")
+    with_each_attribute_type(:checked, 'false', tag: 'input') do |str|
+      expect(render_string(str)).to eq("<input>\n")
     end
-    aggregate_failures do
-      expect(render_string("- h = {class: :foo}\n%span.foo{h}")).to eq("<span class='foo'></span>\n")
-      expect(render_string("- h = {class: 'foo bar'}\n%span.foo{h}")).to eq("<span class='bar foo'></span>\n")
-      expect(render_string("- h = {class: %w[foo bar]}\n%span.foo{h}")).to eq("<span class='bar foo'></span>\n")
+    with_each_attribute_type(:checked, 'nil', tag: 'input') do |str|
+      expect(render_string(str)).to eq("<input>\n")
     end
   end
 
-  it 'skips empty array class' do
-    expect(render_string('%span{class: []}')).to eq("<span></span>\n")
-  end
-
-  it 'skips falsey array elements in class' do
-    expect(render_string('%span{class: [1, nil, false, true]}')).to eq("<span class='1 true'></span>\n")
-    expect(render_string("- v = [1, nil, false, true]\n%span{class: v}")).to eq("<span class='1 true'></span>\n")
-    expect(render_string("- h = { class: [1, nil, false, true] }\n%span{h}")).to eq("<span class='1 true'></span>\n")
-  end
-
-  it 'strigify non-string ids' do
-    expect(render_string('%span#foo{id: :bar} hello')).to eq("<span id='foo_bar'>hello</span>\n")
-  end
-
-  it 'skips empty array class' do
-    expect(render_string('%span{id: []}')).to eq("<span></span>\n")
-  end
-
-  it 'skips falsey array elements in id' do
-    expect(render_string('%span{id: [1, nil, false, true]}')).to eq("<span id='1_true'></span>\n")
-    expect(render_string("- v = [1, nil, false, true]\n%span{id: v}")).to eq("<span id='1_true'></span>\n")
-    expect(render_string("- h = { id: [1, nil, false, true] }\n%span{h}")).to eq("<span id='1_true'></span>\n")
-  end
-
   it 'escapes' do
-    expect(render_string(%q|%span{class: "x\"y'z"} hello|)).to eq(%Q{<span class='x&quot;y&#39;z'>hello</span>\n})
+    with_each_attribute_type(:foo, %q|"x\"y'z"|, text: 'hello') do |str|
+      expect(render_string(str)).to eq(%Q{<span foo='x&quot;y&#39;z'>hello</span>\n})
+    end
   end
 
   it 'does not escape slash' do
-    expect(render_string(%q|%a{ href: 'http://example.com/' }|)).to eq(%Q{<a href='http://example.com/'></a>\n})
-    expect(render_string(%q|%a{ {}, href: 'http://example.com/' }|)).to eq(%Q{<a href='http://example.com/'></a>\n})
-  end
-
-  it 'renders only name if value is true' do
-    expect(render_string(%q|%span{foo: true, bar: 1} hello|)).to eq(%Q{<span bar='1' foo>hello</span>\n})
+    with_each_attribute_type(:href, "'http://example.com/'", tag: 'a') do |str|
+      expect(render_string(str)).to eq(%Q{<a href='http://example.com/'></a>\n})
+    end
   end
 
   it 'raises error when unparsable Ruby code is given' do
@@ -120,23 +59,12 @@ HAML
 
   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})
-      expect(render_string(%Q|- foo = true\n%span{foo: foo, bar: 1} hello|, format: :xhtml)).to eq(%Q{<span bar='1' foo='foo'>hello</span>\n})
-      expect(render_string(%Q|- h = {foo: true, bar: 1}\n%span{h} hello|, format: :xhtml)).to eq(%Q{<span bar='1' foo='foo'>hello</span>\n})
+      with_each_attribute_type(:foo, 'true', text: 'hello') do |str|
+        expect(render_string(str, format: :xhtml)).to eq(%Q{<span foo='foo'>hello</span>\n})
+      end
     end
   end
 
-  it 'renders nested attributes' do
-    expect(render_string(%q|%span{foo: {bar: 1+2}} hello|)).to eq(%Q|<span foo='{:bar=&gt;3}'>hello</span>\n|)
-  end
-
-  it 'renders code attributes' do
-    expect(render_string(<<HAML)).to eq(%Q|<span bar='{:hoge=&gt;:fuga}' baz foo='1'>hello</span>\n|)
-- attrs = { foo: 1, bar: { hoge: :fuga }, baz: true }
-%span{attrs} hello
-HAML
-  end
-
   it 'renders dstr attributes' do
     expect(render_string(<<HAML)).to eq(%Q|<span data='x{:foo=&gt;1}y'>hello</span>\n|)
 - data = { foo: 1 }
@@ -144,73 +72,6 @@ HAML
 HAML
   end
 
-  it 'renders nested dstr attributes' do
-    expect(render_string(<<'HAML')).to eq(%Q|<span foo='{:bar=&gt;&quot;x1y&quot;}'>hello</span>\n|)
-- data = { foo: 1 }
-%span{foo: {bar: "x#{1}y"}} hello
-HAML
-  end
-
-  it 'renders data-id and data-class (#38)' do
-    aggregate_failures do
-      expect(render_string('%span{data: {id: 1}}')).to eq("<span data-id='1'></span>\n")
-      expect(render_string('%span{data: {class: 1}}')).to eq("<span data-class='1'></span>\n")
-    end
-  end
-
-  it 'optimize send case' do
-    expect(render_string('%span{foo: {bar: 1+2}} hello')).to eq("<span foo='{:bar=&gt;3}'>hello</span>\n")
-  end
-
-  it 'merges static id' do
-    expect(render_string('#foo{id: "bar"} baz')).to eq("<div id='foo_bar'>baz</div>\n")
-    expect(render_string('#foo{id: %w[bar baz]} hoge')).to eq("<div id='foo_bar_baz'>hoge</div>\n")
-  end
-
-  it 'merges static class' do
-    expect(render_string('.foo{class: "bar"} baz')).to eq("<div class='bar foo'>baz</div>\n")
-    expect(render_string(<<'HAML')).to eq("<div class='bar foo'>baz</div>\n")
-- bar = 'bar'
-.foo{class: "#{bar}"} baz
-HAML
-  end
-
-  it 'converts underscore to hyphen in data attributes' do
-    expect(render_string("%span{data: {foo_bar: 'baz'}}")).to eq("<span data-foo-bar='baz'></span>\n")
-    expect(render_string("- h = {foo_bar: 'baz'}\n%span{data: h}")).to eq("<span data-foo-bar='baz'></span>\n")
-  end
-
-  context 'with data attributes' do
-    it 'renders nested attributes' do
-      expect(render_string(%q|%span{data: {foo: 1, bar: 'baz', :hoge => :fuga, k1: { k2: 'v3' }}} hello|)).to eq(%Q{<span data-bar='baz' data-foo='1' data-hoge='fuga' data-k1-k2='v3'>hello</span>\n})
-    end
-
-    it 'renders nested dynamic attributes' do
-      expect(render_string(%q|%span{data: {foo: "b#{'a'}r"}} hello|)).to eq(%Q{<span data-foo='bar'>hello</span>\n})
-    end
-
-    it 'renders nested attributes' do
-      expect(render_string(%q|%span{data: {foo: 1, bar: 2+3}} hello|)).to eq(%Q{<span data-bar='5' data-foo='1'>hello</span>\n})
-    end
-
-    it 'renders nested code attributes' do
-      expect(render_string(<<HAML)).to eq(%Q{<span data-bar='2' data-foo='1'>hello</span>\n})
-- data = { foo: 1, bar: 2 }
-%span{data: data} hello
-HAML
-    end
-
-    it 'skips falsey data attributes' do
-      expect(render_string('%span{data: { foo: nil }}')).to eq("<span></span>\n")
-      expect(render_string("- v = nil\n%span{data: { foo: v }}")).to eq("<span></span>\n")
-    end
-
-    it 'renders true data attributes' do
-      expect(render_string('%span{data: { foo: true }}')).to eq("<span data-foo></span>\n")
-      expect(render_string("- v = true\n%span{data: { foo: v }}")).to eq("<span data-foo></span>\n")
-    end
-  end
-
   it 'renders __LINE__ correctly' do
     expect(render_string(<<HAML)).to eq("<span a='2' b='1'></span>\n")
 %span{b: __LINE__,

data/spec/render/hash_attribute_spec.rb

@@ -0,0 +1,66 @@
+# frozen-string-literal: true
+require 'spec_helper'
+
+RSpec.describe 'Hash attributes rendering', type: :render do
+  it 'renders nested attributes' do
+    expect(render_string(%q|%span{foo: {bar: 1+2}} hello|)).to eq(%Q|<span foo='{:bar=&gt;3}'>hello</span>\n|)
+  end
+
+  it 'renders code attributes' do
+    expect(render_string(<<HAML)).to eq(%Q|<span bar='{:hoge=&gt;:fuga}' baz foo='1'>hello</span>\n|)
+- attrs = { foo: 1, bar: { hoge: :fuga }, baz: true }
+%span{attrs} hello
+HAML
+  end
+
+  it 'renders nested dstr attributes' do
+    expect(render_string(<<'HAML')).to eq(%Q|<span foo='{:bar=&gt;&quot;x1y&quot;}'>hello</span>\n|)
+- data = { foo: 1 }
+%span{foo: {bar: "x#{1}y"}} hello
+HAML
+  end
+
+  it 'renders data-id and data-class (#38)' do
+    aggregate_failures do
+      expect(render_string('%span{data: {id: 1}}')).to eq("<span data-id='1'></span>\n")
+      expect(render_string('%span{data: {class: 1}}')).to eq("<span data-class='1'></span>\n")
+    end
+  end
+
+  it 'converts underscore to hyphen in data attributes' do
+    with_each_attribute_type(:data, '{foo_bar: "baz"}') do |str|
+      expect(render_string(str)).to eq("<span data-foo-bar='baz'></span>\n")
+    end
+  end
+
+  describe 'data attributes' do
+    it 'renders nested attributes' do
+      expect(render_string(%q|%span{data: {foo: 1, bar: 'baz', :hoge => :fuga, k1: { k2: 'v3' }}} hello|)).to eq(%Q{<span data-bar='baz' data-foo='1' data-hoge='fuga' data-k1-k2='v3'>hello</span>\n})
+    end
+
+    it 'renders nested dynamic attributes' do
+      expect(render_string(%q|%span{data: {foo: "b#{'a'}r"}} hello|)).to eq(%Q{<span data-foo='bar'>hello</span>\n})
+    end
+
+    it 'renders nested attributes' do
+      expect(render_string(%q|%span{data: {foo: 1, bar: 2+3}} hello|)).to eq(%Q{<span data-bar='5' data-foo='1'>hello</span>\n})
+    end
+
+    it 'renders nested code attributes' do
+      expect(render_string(<<HAML)).to eq(%Q{<span data-bar='2' data-foo='1'>hello</span>\n})
+- data = { foo: 1, bar: 2 }
+%span{data: data} hello
+HAML
+    end
+
+    it 'skips falsey data attributes' do
+      expect(render_string('%span{data: { foo: nil }}')).to eq("<span></span>\n")
+      expect(render_string("- v = nil\n%span{data: { foo: v }}")).to eq("<span></span>\n")
+    end
+
+    it 'renders true data attributes' do
+      expect(render_string('%span{data: { foo: true }}')).to eq("<span data-foo></span>\n")
+      expect(render_string("- v = true\n%span{data: { foo: v }}")).to eq("<span data-foo></span>\n")
+    end
+  end
+end