faml 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70be9578e244e136f47caf610ffde1a3e7edf582
-  data.tar.gz: c3673597a734dcf1822656f55e4868396bf242c8
+  metadata.gz: beef30a714bedb8c79f1ff6382d91ce5d79cd7ea
+  data.tar.gz: 0dfd73a88e67ebc32d5ec3aa7eecd190110c92c8
 SHA512:
-  metadata.gz: f370900646f37e6f58d4d2ef43ff98c1f72c6a74f10ea7e9733b506a85dca85e75a53b82267ec2dd5d151ea86b10c647e0de372b82e6e13b2841933ed5480df8
-  data.tar.gz: c268cc69b1de1723be7f79e8377026e34b712fbdecd4cea73f01f450bcad11cac600fee873f34db7394a168e9109e4f8882018f1ec7e3e52d55ed8643e23749f
+  metadata.gz: c8be5c3da3eb798f52e9c23e2db8e7f4b2826fdeb6cacd929f17c36dc4fdfcc14f472d10345f0f4dc6618a8e036ca3f6fdeba08458af8ad9428134e811a15356
+  data.tar.gz: 608fd49b52622683bf2eda3e401ecea2798ded3582f0367b28f981d54cfc50c2ac60e3f1340266e7543e4fd53891b3d8321adf255e17b98c3069ff57db6f7d59

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.6.3 (2015-11-22)
+- Remove duplicated class in Ruby attribute case
+    - `%span.foo{h}` where `h = { class: 'foo bar' }` now renders `<span class='bar foo'></span>` .
+    - `%span.foo{class: 'foo bar'}` renders `<span class='bar foo'></span>` since v0.2.12 .
+
 ## 0.6.2 (2015-11-22)
 - Fix data-id and data-class attribute
     - https://github.com/eagletmt/faml/pull/39

data/ext/attribute_builder/attribute_builder.c

@@ -177,16 +177,74 @@ merge_one(VALUE attributes, VALUE arg)
 }
 
 static void
-merge(VALUE attributes, VALUE object_ref, int argc, VALUE *argv)
+join_class_attribute(VALUE attributes, VALUE key)
 {
+  long len;
+  VALUE val;
+
+  val = rb_hash_delete(attributes, key);
+  Check_Type(val, T_ARRAY);
+  len = RARRAY_LEN(val);
+  if (len != 0) {
+    long i;
+    VALUE ary = rb_ary_new_capa(len);
+    for (i = 0; i < len; i++) {
+      VALUE v = RARRAY_AREF(val, i);
+      if (RTEST(v)) {
+        rb_ary_concat(ary, rb_str_split(rb_convert_type(v, T_STRING, "String", "to_s"), " "));
+      }
+    }
+    rb_funcall(ary, id_sort_bang, 0);
+    rb_funcall(ary, id_uniq_bang, 0);
+    rb_hash_aset(attributes, key, rb_ary_join(ary, rb_const_get(rb_mAttributeBuilder, id_space)));
+  }
+}
+
+static void
+join_id_attribute(VALUE attributes, VALUE key)
+{
+  long len;
+  VALUE val;
+
+  val = rb_hash_delete(attributes, key);
+  Check_Type(val, T_ARRAY);
+  len = RARRAY_LEN(val);
+  if (len != 0) {
+    long i;
+    VALUE ary = rb_ary_new_capa(len);
+    for (i = 0; i < len; i++) {
+      VALUE v = RARRAY_AREF(val, i);
+      if (RTEST(v)) {
+        rb_ary_push(ary, rb_convert_type(v, T_STRING, "String", "to_s"));
+      }
+    }
+    rb_hash_aset(attributes, key, rb_ary_join(ary, rb_const_get(rb_mAttributeBuilder, id_underscore)));
+  }
+}
+
+static VALUE
+merge(VALUE object_ref, int argc, VALUE *argv)
+{
+  VALUE attributes, id_str, class_str;
   int i;
 
+  attributes = rb_hash_new();
+  id_str = rb_const_get(rb_mAttributeBuilder, id_id);
+  class_str = rb_const_get(rb_mAttributeBuilder, id_class);
+  rb_hash_aset(attributes, id_str, rb_ary_new());
+  rb_hash_aset(attributes, class_str, rb_ary_new());
+
   for (i = 0; i < argc; i++) {
     merge_one(attributes, argv[i]);
   }
   if (!NIL_P(object_ref)) {
     merge_one(attributes, object_ref);
   }
+
+  join_class_attribute(attributes, class_str);
+  join_id_attribute(attributes, id_str);
+
+  return attributes;
 }
 
 static void
@@ -212,41 +270,7 @@ static void
 build_attribute(VALUE buf, VALUE attr_quote, int is_html, VALUE key, VALUE value)
 {
   Check_Type(key, T_STRING);
-  if (RSTRING_LEN(key) == 5 && memcmp(RSTRING_PTR(key), "class", 5) == 0) {
-    long len;
-
-    Check_Type(value, T_ARRAY);
-    len = RARRAY_LEN(value);
-    if (len != 0) {
-      long i;
-      VALUE ary = rb_ary_new_capa(len);
-      for (i = 0; i < len; i++) {
-        VALUE v = RARRAY_AREF(value, i);
-        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);
-      put_attribute(buf, attr_quote, key, rb_ary_join(ary, rb_const_get(rb_mAttributeBuilder, id_space)));
-    }
-  } else if (RSTRING_LEN(key) == 2 && memcmp(RSTRING_PTR(key), "id", 2) == 0) {
-    long len = RARRAY_LEN(value);
-
-    Check_Type(value, T_ARRAY);
-    len = RARRAY_LEN(value);
-    if (len != 0) {
-      long i;
-      VALUE ary = rb_ary_new_capa(len);
-      for (i = 0; i < len; i++) {
-        VALUE v = RARRAY_AREF(value, i);
-        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)));
-    }
-  } else if (RB_TYPE_P(value, T_TRUE)) {
+  if (RB_TYPE_P(value, T_TRUE)) {
     if (is_html) {
       rb_ary_push(buf, rb_const_get(rb_mAttributeBuilder, id_space));
       rb_ary_push(buf, key);
@@ -269,10 +293,7 @@ m_build(int argc, VALUE *argv, RB_UNUSED_VAR(VALUE self))
   attr_quote = argv[0];
   is_html = RTEST(argv[1]);
   object_ref = argv[2];
-  attributes = rb_hash_new();
-  rb_hash_aset(attributes, rb_const_get(rb_mAttributeBuilder, id_id), rb_ary_new());
-  rb_hash_aset(attributes, rb_const_get(rb_mAttributeBuilder, id_class), rb_ary_new());
-  merge(attributes, object_ref, argc-3, argv+3);
+  attributes = merge(object_ref, argc-3, argv+3);
 
   keys = rb_funcall(attributes, id_keys, 0);
   rb_funcall(keys, id_sort_bang, 0);
@@ -292,6 +313,13 @@ m_normalize_data(RB_UNUSED_VAR(VALUE self), VALUE data)
   return normalize_data(data);
 }
 
+static VALUE
+m_merge(int argc, VALUE *argv, RB_UNUSED_VAR(VALUE self))
+{
+  rb_check_arity(argc, 1, UNLIMITED_ARGUMENTS);
+  return merge(argv[0], argc-1, argv+1);
+}
+
 void
 Init_attribute_builder(void)
 {
@@ -299,6 +327,7 @@ Init_attribute_builder(void)
   rb_mAttributeBuilder = rb_define_module_under(mFaml, "AttributeBuilder");
   rb_define_singleton_method(rb_mAttributeBuilder, "build", RUBY_METHOD_FUNC(m_build), -1);
   rb_define_singleton_method(rb_mAttributeBuilder, "normalize_data", RUBY_METHOD_FUNC(m_normalize_data), 1);
+  rb_define_singleton_method(rb_mAttributeBuilder, "merge", RUBY_METHOD_FUNC(m_merge), -1);
 
   id_keys = rb_intern("keys");
   id_sort_bang = rb_intern("sort!");

data/incompatibilities/README.md

@@ -1,7 +1,7 @@
 # Incompatibilities
 ## Versions
 - Haml 4.1.0.beta.1
-- Faml 0.6.2
+- Faml 0.6.3
 - Hamlit 1.7.2
 
 ## Table of contents

data/incompatibilities/spec/render/attribute_spec.md

@@ -37,7 +37,45 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:68](../../../spec/render/attribute_spec.rb#L68)
+# [./spec/render/attribute_spec.rb:62](../../../spec/render/attribute_spec.rb#L62)
+## Input
+```haml
+- v = 'foo bar'
+%span.foo{class: v}
+```
+
+## Faml, Haml
+```html
+<span class='bar foo'></span>
+
+```
+
+## Hamlit
+```html
+<span class='foo foo bar'></span>
+
+```
+
+# [./spec/render/attribute_spec.rb:62](../../../spec/render/attribute_spec.rb#L62)
+## Input
+```haml
+- h = {class: 'foo bar'}
+%span.foo{h}
+```
+
+## Faml, Haml
+```html
+<span class='bar foo'></span>
+
+```
+
+## Hamlit
+```html
+<span class='foo foo bar'></span>
+
+```
+
+# [./spec/render/attribute_spec.rb:80](../../../spec/render/attribute_spec.rb#L80)
 ## Input
 ```haml
 %span{class: []}
@@ -55,7 +93,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:72](../../../spec/render/attribute_spec.rb#L72)
+# [./spec/render/attribute_spec.rb:84](../../../spec/render/attribute_spec.rb#L84)
 ## Input
 ```haml
 %span{class: [1, nil, false, true]}
@@ -73,7 +111,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:72](../../../spec/render/attribute_spec.rb#L72)
+# [./spec/render/attribute_spec.rb:84](../../../spec/render/attribute_spec.rb#L84)
 ## Input
 ```haml
 - v = [1, nil, false, true]
@@ -92,7 +130,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:72](../../../spec/render/attribute_spec.rb#L72)
+# [./spec/render/attribute_spec.rb:84](../../../spec/render/attribute_spec.rb#L84)
 ## Input
 ```haml
 - h = { class: [1, nil, false, true] }
@@ -111,7 +149,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:82](../../../spec/render/attribute_spec.rb#L82)
+# [./spec/render/attribute_spec.rb:94](../../../spec/render/attribute_spec.rb#L94)
 ## Input
 ```haml
 %span{id: []}
@@ -129,7 +167,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:86](../../../spec/render/attribute_spec.rb#L86)
+# [./spec/render/attribute_spec.rb:98](../../../spec/render/attribute_spec.rb#L98)
 ## Input
 ```haml
 %span{id: [1, nil, false, true]}
@@ -147,7 +185,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:86](../../../spec/render/attribute_spec.rb#L86)
+# [./spec/render/attribute_spec.rb:98](../../../spec/render/attribute_spec.rb#L98)
 ## Input
 ```haml
 - v = [1, nil, false, true]
@@ -166,7 +204,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:86](../../../spec/render/attribute_spec.rb#L86)
+# [./spec/render/attribute_spec.rb:98](../../../spec/render/attribute_spec.rb#L98)
 ## Input
 ```haml
 - h = { id: [1, nil, false, true] }
@@ -185,7 +223,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:92](../../../spec/render/attribute_spec.rb#L92)
+# [./spec/render/attribute_spec.rb:104](../../../spec/render/attribute_spec.rb#L104)
 ## Input
 ```haml
 %span{class: "x\"y'z"} hello
@@ -203,7 +241,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:110](../../../spec/render/attribute_spec.rb#L110)
+# [./spec/render/attribute_spec.rb:122](../../../spec/render/attribute_spec.rb#L122)
 ## Input (with options={:format=>:xhtml})
 ```haml
 - foo = true
@@ -222,7 +260,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:110](../../../spec/render/attribute_spec.rb#L110)
+# [./spec/render/attribute_spec.rb:122](../../../spec/render/attribute_spec.rb#L122)
 ## Input (with options={:format=>:xhtml})
 ```haml
 - h = {foo: true, bar: 1}
@@ -241,7 +279,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:117](../../../spec/render/attribute_spec.rb#L117)
+# [./spec/render/attribute_spec.rb:129](../../../spec/render/attribute_spec.rb#L129)
 ## Input
 ```haml
 %span{foo: {bar: 1+2}} hello
@@ -259,7 +297,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:121](../../../spec/render/attribute_spec.rb#L121)
+# [./spec/render/attribute_spec.rb:133](../../../spec/render/attribute_spec.rb#L133)
 ## Input
 ```haml
 - attrs = { foo: 1, bar: { hoge: :fuga }, baz: true }
@@ -285,7 +323,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:135](../../../spec/render/attribute_spec.rb#L135)
+# [./spec/render/attribute_spec.rb:147](../../../spec/render/attribute_spec.rb#L147)
 ## Input
 ```haml
 - data = { foo: 1 }
@@ -305,7 +343,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:149](../../../spec/render/attribute_spec.rb#L149)
+# [./spec/render/attribute_spec.rb:161](../../../spec/render/attribute_spec.rb#L161)
 ## Input
 ```haml
 %span{foo: {bar: 1+2}} hello
@@ -323,7 +361,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:172](../../../spec/render/attribute_spec.rb#L172)
+# [./spec/render/attribute_spec.rb:184](../../../spec/render/attribute_spec.rb#L184)
 ## Input
 ```haml
 %span{data: {foo: 1, bar: 'baz', :hoge => :fuga, k1: { k2: 'v3' }}} hello
@@ -341,7 +379,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:180](../../../spec/render/attribute_spec.rb#L180)
+# [./spec/render/attribute_spec.rb:192](../../../spec/render/attribute_spec.rb#L192)
 ## Input
 ```haml
 %span{data: {foo: 1, bar: 2+3}} hello
@@ -359,7 +397,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:184](../../../spec/render/attribute_spec.rb#L184)
+# [./spec/render/attribute_spec.rb:196](../../../spec/render/attribute_spec.rb#L196)
 ## Input
 ```haml
 - data = { foo: 1, bar: 2 }
@@ -379,7 +417,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:202](../../../spec/render/attribute_spec.rb#L202)
+# [./spec/render/attribute_spec.rb:214](../../../spec/render/attribute_spec.rb#L214)
 ## Input
 ```haml
 %span{b: __LINE__,
@@ -399,7 +437,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:209](../../../spec/render/attribute_spec.rb#L209)
+# [./spec/render/attribute_spec.rb:221](../../../spec/render/attribute_spec.rb#L221)
 ## Input
 ```haml
 %span{"foo\0bar" => "hello"}
@@ -417,7 +455,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:209](../../../spec/render/attribute_spec.rb#L209)
+# [./spec/render/attribute_spec.rb:221](../../../spec/render/attribute_spec.rb#L221)
 ## Input
 ```haml
 - val = "hello"
@@ -437,7 +475,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:209](../../../spec/render/attribute_spec.rb#L209)
+# [./spec/render/attribute_spec.rb:221](../../../spec/render/attribute_spec.rb#L221)
 ## Input
 ```haml
 - key = "foo\0bar"
@@ -459,7 +497,7 @@
 ...                               ^
 ```
 
-# [./spec/render/attribute_spec.rb:223](../../../spec/render/attribute_spec.rb#L223)
+# [./spec/render/attribute_spec.rb:235](../../../spec/render/attribute_spec.rb#L235)
 ## Input
 ```haml
 %span[Faml::TestStruct.new(123)] hello
@@ -477,7 +515,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:227](../../../spec/render/attribute_spec.rb#L227)
+# [./spec/render/attribute_spec.rb:239](../../../spec/render/attribute_spec.rb#L239)
 ## Input
 ```haml
 %span[Faml::TestStruct.new(123), :hello] hello
@@ -495,7 +533,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:231](../../../spec/render/attribute_spec.rb#L231)
+# [./spec/render/attribute_spec.rb:243](../../../spec/render/attribute_spec.rb#L243)
 ## Input
 ```haml
 %span[Faml::TestRefStruct.new(123)] hello
@@ -513,7 +551,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:235](../../../spec/render/attribute_spec.rb#L235)
+# [./spec/render/attribute_spec.rb:247](../../../spec/render/attribute_spec.rb#L247)
 ## Input
 ```haml
 %span#baz[Faml::TestStruct.new(123)]{id: "foo"} hello
@@ -531,7 +569,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:241](../../../spec/render/attribute_spec.rb#L241)
+# [./spec/render/attribute_spec.rb:253](../../../spec/render/attribute_spec.rb#L253)
 ## Input
 ```haml
 %span{foo: 1}(foo=2)
@@ -549,7 +587,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:241](../../../spec/render/attribute_spec.rb#L241)
+# [./spec/render/attribute_spec.rb:253](../../../spec/render/attribute_spec.rb#L253)
 ## Input
 ```haml
 %span(foo=2){foo: 1}
@@ -567,7 +605,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:241](../../../spec/render/attribute_spec.rb#L241)
+# [./spec/render/attribute_spec.rb:253](../../../spec/render/attribute_spec.rb#L253)
 ## Input
 ```haml
 - v = 2
@@ -586,7 +624,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:241](../../../spec/render/attribute_spec.rb#L241)
+# [./spec/render/attribute_spec.rb:253](../../../spec/render/attribute_spec.rb#L253)
 ## Input
 ```haml
 - v = 2
@@ -605,7 +643,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:241](../../../spec/render/attribute_spec.rb#L241)
+# [./spec/render/attribute_spec.rb:253](../../../spec/render/attribute_spec.rb#L253)
 ## Input
 ```haml
 - h = {foo: 1}
@@ -624,7 +662,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:241](../../../spec/render/attribute_spec.rb#L241)
+# [./spec/render/attribute_spec.rb:253](../../../spec/render/attribute_spec.rb#L253)
 ## Input
 ```haml
 - h = {foo: 1}
@@ -643,7 +681,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:260](../../../spec/render/attribute_spec.rb#L260)
+# [./spec/render/attribute_spec.rb:272](../../../spec/render/attribute_spec.rb#L272)
 ## Input
 ```haml
 %span{id: 1}(id=2)

data/lib/faml/attribute_compiler.rb

@@ -42,7 +42,7 @@ module Faml
     def try_optimize_attributes(old_attributes, new_attributes, static_id, static_class)
       static_attributes, dynamic_attributes = AttributeOptimizer.new.try_optimize(old_attributes, new_attributes, static_id, static_class)
       if static_attributes
-        (static_attributes.keys + dynamic_attributes.keys).sort.flat_map do |k|
+        (static_attributes.keys + dynamic_attributes.keys).sort.map do |k|
           if static_attributes.key?(k)
             compile_static_attribute(k, static_attributes[k])
           else
@@ -53,17 +53,6 @@ module Faml
     end
 
     def compile_static_attribute(key, value)
-      if value.is_a?(Hash) && key == 'data'
-        data = AttributeBuilder.normalize_data(value)
-        data.keys.sort.map do |k|
-          compile_static_simple_attribute("data-#{k}", data[k])
-        end
-      else
-        [compile_static_simple_attribute(key, value)]
-      end
-    end
-
-    def compile_static_simple_attribute(key, value)
       case
       when value == true
         [:haml, :attr, key, [:multi]]
@@ -75,13 +64,13 @@ module Faml
     end
 
     def compile_dynamic_attribute(key, value)
-      [[:haml, :attr, key, [:dvalue, value]]]
+      [:haml, :attr, key, [:dvalue, value]]
     end
 
     def compile_slow_attributes(old_attributes, new_attributes, static_id, static_class, object_ref)
       h = {}
       unless static_class.empty?
-        h[:class] = static_class.split(/ +/)
+        h[:class] = static_class
       end
       unless static_id.empty?
         h[:id] = static_id

data/lib/faml/attribute_optimizer.rb

@@ -1,4 +1,5 @@
 # frozen-string-literal: true
+require 'faml/attribute_builder'
 require_relative 'error'
 require_relative 'ruby_syntax_checker'
 require_relative 'static_hash_parser'
@@ -44,38 +45,13 @@ module Faml
     end
 
     def build_optimized_static_attributes(parser, static_id, static_class)
-      static_attributes = {}
-      class_list = []
-      id_list = []
-      parser.static_attributes.each do |k, v|
-        k = k.to_s
-        case k
-        when 'id'
-          id_list.concat(Array(v))
-        when 'class'
-          class_list.concat(Array(v))
-        else
-          static_attributes[k] = v
-        end
-      end
-
-      class_list = class_list.select { |v| v }.flat_map { |c| c.to_s.split(/ +/) }
-      unless static_class.empty?
-        class_list.concat(static_class.split(/ +/))
+      if static_id.empty?
+        static_id = nil
       end
-      unless class_list.empty?
-        static_attributes['class'] = class_list.uniq.sort.join(' ')
+      if static_class.empty?
+        static_class = nil
       end
-
-      id_list = id_list.select { |v| v }
-      unless static_id.empty?
-        id_list = [static_id].concat(id_list)
-      end
-      unless id_list.empty?
-        static_attributes['id'] = id_list.join('_')
-      end
-
-      static_attributes
+      AttributeBuilder.merge(parser.static_attributes, id: static_id, class: static_class)
     end
 
     def build_optimized_dynamic_attributes(parser, static_attributes)

data/lib/faml/version.rb

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

data/spec/render/attribute_spec.rb

@@ -60,9 +60,21 @@ HAML
   end
 
   it 'remove duplicated classes' 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")
+    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")
+    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")
+    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")
+    end
   end
 
   it 'skips empty array class' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faml
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Kohei Suzuki