faml 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c643b558a5d6ef910d8545a6be0501d258c730ea
-  data.tar.gz: 35de29c371d213c3291c3a3c0f5816b3d9638285
+  metadata.gz: fde0bb641367cd51b35eeeb6d1d5b02211d57054
+  data.tar.gz: 82f60f95e10a5d7b40fd6c2a16f5504a569a9fc2
 SHA512:
-  metadata.gz: 5cebe334bdd49fb358a07f2004df19eb9542d4d215be3197b1bd52c45a035e646b5375084e009031669a7e40908d653bb29eb186f263cabee3211a18b419671d
-  data.tar.gz: 028cadedad4e8cbbafcb7e62896b2389e40f3c2f18c42bedbc48f1818b5cadfa90d6db8a04af01d8ca9ccdecfeb3d6e873d959008470d0f5d86dad7d91a4c8fb
+  metadata.gz: 5a6f81803cfcc97363081929acf0720d511602fe1057d5057b46de50498559004a162b894b5a809c2a6c9d4258f089689d1544feff72c5968436ada5623f9d61
+  data.tar.gz: e49cfef05e71d400b49c6367e21f1878237fdac8c2798ff34b2a034aa155f416a7f50e51780963181bf11b96f00efe1d0433ea5ffe7b9fd7ea58ae8585b190ad

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.3.5 (2015-10-19)
+- Fix empty class or id rendering
+    - It's a regression in v0.3.4.
+- Ignore falsey elements in class or id array
+    - For compatibility with haml
+    - `%span{class: [1, nil, false, true]}` now renders `<span class='1 true'></span>` .
+
 ## 0.3.4 (2015-10-19)
 - Support array, rational and complex literal optimization
     - Now `%div{class: %w[foo bar], data: { foo: 1i, bar: 2r }}` is compiled into string literal.

data/ext/attribute_builder/attribute_builder.c

@@ -79,7 +79,7 @@ substitute_underscores(VALUE str)
 static int
 normalize_data_i2(VALUE key, VALUE value, VALUE ptr)
 {
-  if (!(RB_TYPE_P(value, T_FALSE) || NIL_P(value))) {
+  if (RTEST(value)) {
     struct normalize_data_i2_arg *arg = (struct normalize_data_i2_arg *)ptr;
     VALUE k = rb_str_dup(arg->key);
 
@@ -107,7 +107,7 @@ normalize_data_i(VALUE key, VALUE value, VALUE normalized)
   } else if (RB_TYPE_P(value, T_TRUE)) {
     /* Keep Qtrue value */
     rb_hash_aset(normalized, key, value);
-  } else if (RB_TYPE_P(value, T_FALSE) || NIL_P(value)) {
+  } else if (!RTEST(value)) {
     /* Delete falsey values */
   } else {
     rb_hash_aset(normalized, key, rb_convert_type(value, T_STRING, "String", "to_s"));
@@ -156,7 +156,7 @@ normalize(VALUE hash)
       rb_hash_foreach(data, FOREACH_FUNC(put_data_attribute), hash);
     } else if (RB_TYPE_P(value, T_TRUE)) {
       /* Keep Qtrue value */
-    } else if (RB_TYPE_P(value, T_FALSE) || NIL_P(value)) {
+    } else if (!RTEST(value)) {
       rb_hash_delete(hash, key);
     } else {
       rb_hash_aset(hash, key, rb_convert_type(value, T_STRING, "String", "to_s"));
@@ -214,7 +214,9 @@ build_attribute(VALUE buf, VALUE attr_quote, int is_html, VALUE key, VALUE value
       VALUE ary = rb_ary_new_capa(len);
       for (i = 0; i < len; i++) {
         VALUE v = RARRAY_AREF(value, i);
-        rb_ary_push(ary, rb_convert_type(v, T_STRING, "String", "to_s"));
+        if (RTEST(v)) {
+          rb_ary_push(ary, rb_convert_type(v, T_STRING, "String", "to_s"));
+        }
       }
       rb_funcall(ary, id_sort_bang, 0);
       rb_funcall(ary, id_uniq_bang, 0);
@@ -230,7 +232,9 @@ build_attribute(VALUE buf, VALUE attr_quote, int is_html, VALUE key, VALUE value
       VALUE ary = rb_ary_new_capa(len);
       for (i = 0; i < len; i++) {
         VALUE v = RARRAY_AREF(value, i);
-        rb_ary_push(ary, rb_convert_type(v, T_STRING, "String", "to_s"));
+        if (RTEST(v)) {
+          rb_ary_push(ary, rb_convert_type(v, T_STRING, "String", "to_s"));
+        }
       }
       put_attribute(buf, attr_quote, key, rb_ary_join(ary, rb_const_get(rb_mAttributeBuilder, id_underscore)));
     }

data/incompatibilities/README.md

@@ -1,7 +1,7 @@
 # Incompatibilities
 ## Versions
 - Haml 4.0.7
-- Faml 0.3.3
+- Faml 0.3.5
 - Hamlit 1.7.2
 
 ## Table of contents

data/incompatibilities/spec/render/attribute_spec.md

@@ -37,9 +37,157 @@
 
 ```
 
+# [./spec/render/attribute_spec.rb:67](../../../spec/render/attribute_spec.rb#L67)
+## Input
+```haml
+%span{class: []}
+```
+
+## Faml, Haml
+```html
+<span></span>
+
+```
+
+## Hamlit
+```html
+<span class=''></span>
+
+```
+
+# [./spec/render/attribute_spec.rb:71](../../../spec/render/attribute_spec.rb#L71)
+## Input
+```haml
+- v = [1, nil, false, true]
+%span{class: v}
+```
+
+## Faml, Haml
+```html
+<span class='1 true'></span>
+
+```
+
+## Hamlit
+```html
+<span class='1  false true'></span>
+
+```
+
 # [./spec/render/attribute_spec.rb:71](../../../spec/render/attribute_spec.rb#L71)
 ## Input
 ```haml
+- h = { class: [1, nil, false, true] }
+%span{h}
+```
+
+## Faml, Haml
+```html
+<span class='1 true'></span>
+
+```
+
+## Hamlit
+```html
+<span class='1  false true'></span>
+
+```
+
+# [./spec/render/attribute_spec.rb:71](../../../spec/render/attribute_spec.rb#L71)
+## Input
+```haml
+%span{class: [1, nil, false, true]}
+```
+
+## Faml, Haml
+```html
+<span class='1 true'></span>
+
+```
+
+## Hamlit
+```html
+<span class='1  false true'></span>
+
+```
+
+# [./spec/render/attribute_spec.rb:81](../../../spec/render/attribute_spec.rb#L81)
+## Input
+```haml
+%span{id: []}
+```
+
+## Faml, Haml
+```html
+<span></span>
+
+```
+
+## Hamlit
+```html
+<span id=''></span>
+
+```
+
+# [./spec/render/attribute_spec.rb:85](../../../spec/render/attribute_spec.rb#L85)
+## Input
+```haml
+- v = [1, nil, false, true]
+%span{id: v}
+```
+
+## Faml, Haml
+```html
+<span id='1_true'></span>
+
+```
+
+## Hamlit
+```html
+<span id='1__false_true'></span>
+
+```
+
+# [./spec/render/attribute_spec.rb:85](../../../spec/render/attribute_spec.rb#L85)
+## Input
+```haml
+- h = { id: [1, nil, false, true] }
+%span{h}
+```
+
+## Faml, Haml
+```html
+<span id='1_true'></span>
+
+```
+
+## Hamlit
+```html
+<span id='1__false_true'></span>
+
+```
+
+# [./spec/render/attribute_spec.rb:85](../../../spec/render/attribute_spec.rb#L85)
+## Input
+```haml
+%span{id: [1, nil, false, true]}
+```
+
+## Faml, Haml
+```html
+<span id='1_true'></span>
+
+```
+
+## Hamlit
+```html
+<span id='1__false_true'></span>
+
+```
+
+# [./spec/render/attribute_spec.rb:91](../../../spec/render/attribute_spec.rb#L91)
+## Input
+```haml
 %span{class: "x\"y'z"} hello
 ```
 
@@ -55,7 +203,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:84](../../../spec/render/attribute_spec.rb#L84)
+# [./spec/render/attribute_spec.rb:104](../../../spec/render/attribute_spec.rb#L104)
 ## Input (with options={:format=>:xhtml})
 ```haml
 - foo = true
@@ -74,7 +222,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:84](../../../spec/render/attribute_spec.rb#L84)
+# [./spec/render/attribute_spec.rb:104](../../../spec/render/attribute_spec.rb#L104)
 ## Input (with options={:format=>:xhtml})
 ```haml
 - h = {foo: true, bar: 1}
@@ -93,7 +241,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:91](../../../spec/render/attribute_spec.rb#L91)
+# [./spec/render/attribute_spec.rb:111](../../../spec/render/attribute_spec.rb#L111)
 ## Input
 ```haml
 %span{foo: {bar: 1+2}} hello
@@ -111,7 +259,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:95](../../../spec/render/attribute_spec.rb#L95)
+# [./spec/render/attribute_spec.rb:115](../../../spec/render/attribute_spec.rb#L115)
 ## Input
 ```haml
 - attrs = { foo: 1, bar: { hoge: :fuga }, baz: true }
@@ -137,7 +285,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:109](../../../spec/render/attribute_spec.rb#L109)
+# [./spec/render/attribute_spec.rb:129](../../../spec/render/attribute_spec.rb#L129)
 ## Input
 ```haml
 - data = { foo: 1 }
@@ -157,7 +305,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:116](../../../spec/render/attribute_spec.rb#L116)
+# [./spec/render/attribute_spec.rb:136](../../../spec/render/attribute_spec.rb#L136)
 ## Input
 ```haml
 %span{foo: {bar: 1+2}} hello
@@ -175,7 +323,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:139](../../../spec/render/attribute_spec.rb#L139)
+# [./spec/render/attribute_spec.rb:159](../../../spec/render/attribute_spec.rb#L159)
 ## Input
 ```haml
 %span{data: {foo: 1, bar: 'baz', :hoge => :fuga, k1: { k2: 'v3' }}} hello
@@ -193,7 +341,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:147](../../../spec/render/attribute_spec.rb#L147)
+# [./spec/render/attribute_spec.rb:167](../../../spec/render/attribute_spec.rb#L167)
 ## Input
 ```haml
 %span{data: {foo: 1, bar: 2+3}} hello
@@ -211,7 +359,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:151](../../../spec/render/attribute_spec.rb#L151)
+# [./spec/render/attribute_spec.rb:171](../../../spec/render/attribute_spec.rb#L171)
 ## Input
 ```haml
 - data = { foo: 1, bar: 2 }
@@ -231,7 +379,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:169](../../../spec/render/attribute_spec.rb#L169)
+# [./spec/render/attribute_spec.rb:189](../../../spec/render/attribute_spec.rb#L189)
 ## Input
 ```haml
 %span{b: __LINE__,
@@ -251,7 +399,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:176](../../../spec/render/attribute_spec.rb#L176)
+# [./spec/render/attribute_spec.rb:196](../../../spec/render/attribute_spec.rb#L196)
 ## Input
 ```haml
 %span{"foo\0bar" => "hello"}
@@ -269,7 +417,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:176](../../../spec/render/attribute_spec.rb#L176)
+# [./spec/render/attribute_spec.rb:196](../../../spec/render/attribute_spec.rb#L196)
 ## Input
 ```haml
 - val = "hello"
@@ -289,7 +437,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:176](../../../spec/render/attribute_spec.rb#L176)
+# [./spec/render/attribute_spec.rb:196](../../../spec/render/attribute_spec.rb#L196)
 ## Input
 ```haml
 - key = "foo\0bar"

data/lib/faml/compiler.rb

@@ -319,7 +319,7 @@ module Faml
         static_attributes[k.to_s] = v
       end
 
-      class_list = Array(static_attributes['class']).flat_map { |c| c.to_s.split(/ +/) }
+      class_list = Array(static_attributes.delete('class')).select { |v| v }.flat_map { |c| c.to_s.split(/ +/) }
       unless static_class.empty?
         class_list.concat(static_class.split(/ +/))
       end
@@ -327,7 +327,7 @@ module Faml
         static_attributes['class'] = class_list.uniq.sort.join(' ')
       end
 
-      id_list = Array(static_attributes['id'])
+      id_list = Array(static_attributes.delete('id')).select { |v| v }
       unless static_id.empty?
         id_list = [static_id].concat(id_list)
       end

data/lib/faml/version.rb

@@ -1,3 +1,3 @@
 module Faml
-  VERSION = '0.3.4'
+  VERSION = '0.3.5'
 end

data/spec/render/attribute_spec.rb

@@ -64,10 +64,30 @@ HAML
     expect(render_string('%span.foo{class: %w[foo bar]}')).to eq("<span class='bar foo'></span>\n")
   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})
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faml
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-18 00:00:00.000000000 Z
+date: 2015-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape_utils
@@ -511,7 +511,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Faster implementation of Haml template language.