faml 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efb487cc95863a4732f1771c0e634fe19c533d84
-  data.tar.gz: a2d406a2e67257ee76c8c847b52f9ac0c54a7bd5
+  metadata.gz: 12548082a8aaf67316ba96345010c92ded15aa41
+  data.tar.gz: bf0e80233a7227814421df27fe15b8fe05271aad
 SHA512:
-  metadata.gz: 4fb7e5535a4c2f2e7f03a9fb79055d02191bd3b862e6e5e5b8b884c832d5a6c877776d9fb234367de6f03d751749ccb38bfb92a698cb1a0279779e88b78f40f5
-  data.tar.gz: cc47fb356f37cf92cfc5c402b63c29d9b3318667118ff33c8b0fb964219d4bf262bed7d1de9d175f7dc4d9f4ec6fc1162434eb581628a4d02a01fda65e46d595
+  metadata.gz: 13d98c0fd7b3fa67895b874a99bc02606e3eb334be9d169038d975f86f09c7715f602a94d577ea63ef9ae7222795fbe7987555a6cfd8bd104216722ad6ef2765
+  data.tar.gz: 2ac8f294c6bfe8eab1ace2a755f6f5eceff9fd0b59770653a0d8c321c300a876d09f105e7d4f09d7dd1a130015588ea10fb05bd689bd6b3adfb90ae844fa8d3c

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.6.5 (2015-11-28)
+- Delete falsey values after merging all attributes
+    - `%span(foo=true){foo: false}` now renders `<span></span>`, because old attributes have priority even if the value is falsey.
+    - https://github.com/eagletmt/faml/pull/43
+- Fix duplicated attribute in dynamic attribute
+    - `%span{foo: 1, 'foo' => 1+1}` now renders `<span foo='2'></span>` correctly
+    - https://github.com/eagletmt/faml/pull/45
+
 ## 0.6.4 (2015-11-28)
 - Flatten `id` and `class` attributes
     - https://github.com/eagletmt/faml/pull/41

data/ext/attribute_builder/attribute_builder.c

@@ -83,14 +83,12 @@ substitute_underscores(VALUE str)
 static int
 normalize_data_i2(VALUE key, VALUE value, VALUE ptr)
 {
-  if (RTEST(value)) {
-    struct normalize_data_i2_arg *arg = (struct normalize_data_i2_arg *)ptr;
-    VALUE k = rb_str_dup(arg->key);
+  struct normalize_data_i2_arg *arg = (struct normalize_data_i2_arg *)ptr;
+  VALUE k = rb_str_dup(arg->key);
 
-    rb_str_cat(k, "-", 1);
-    rb_str_append(k, key);
-    rb_hash_aset(arg->normalized, k, value);
-  }
+  rb_str_cat(k, "-", 1);
+  rb_str_append(k, key);
+  rb_hash_aset(arg->normalized, k, value);
   return ST_CONTINUE;
 }
 
@@ -107,11 +105,9 @@ normalize_data_i(VALUE key, VALUE value, VALUE normalized)
     arg.key = key;
     arg.normalized = normalized;
     rb_hash_foreach(normalize_data(value), FOREACH_FUNC(normalize_data_i2), (VALUE)(&arg));
-  } else if (RB_TYPE_P(value, T_TRUE)) {
-    /* Keep Qtrue value */
+  } else if (RB_TYPE_P(value, T_TRUE) || !RTEST(value)) {
+    /* Keep Qtrue and falsey value */
     rb_hash_aset(normalized, key, value);
-  } else if (!RTEST(value)) {
-    /* Delete falsey values */
   } else {
     rb_hash_aset(normalized, key, rb_convert_type(value, T_STRING, "String", "to_s"));
   }
@@ -157,10 +153,8 @@ normalize(VALUE hash)
       rb_hash_delete(hash, key);
       data = normalize_data(value);
       rb_hash_foreach(data, FOREACH_FUNC(put_data_attribute), hash);
-    } else if (RB_TYPE_P(value, T_TRUE)) {
-      /* Keep Qtrue value */
-    } else if (!RTEST(value)) {
-      rb_hash_delete(hash, key);
+    } else if (RB_TYPE_P(value, T_TRUE) || !RTEST(value)) {
+      /* Keep Qtrue and falsey value */
     } else {
       rb_hash_aset(hash, key, rb_convert_type(value, T_STRING, "String", "to_s"));
     }
@@ -226,6 +220,22 @@ join_id_attribute(VALUE attributes, VALUE key)
   }
 }
 
+static int
+delete_falsey_values_i(RB_UNUSED_VAR(VALUE key), VALUE value, RB_UNUSED_VAR(VALUE arg))
+{
+  if (RTEST(value)) {
+    return ST_CONTINUE;
+  } else {
+    return ST_DELETE;
+  }
+}
+
+static void
+delete_falsey_values(VALUE attributes)
+{
+  rb_hash_foreach(attributes, FOREACH_FUNC(delete_falsey_values_i), Qnil);
+}
+
 static VALUE
 merge(VALUE object_ref, int argc, VALUE *argv)
 {
@@ -247,6 +257,7 @@ merge(VALUE object_ref, int argc, VALUE *argv)
 
   join_class_attribute(attributes, class_str);
   join_id_attribute(attributes, id_str);
+  delete_falsey_values(attributes);
 
   return attributes;
 }

data/incompatibilities/README.md

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

data/incompatibilities/spec/render/attribute_spec.md

@@ -1,6 +1,46 @@
 # [./spec/render/attribute_spec.rb:44](../../../spec/render/attribute_spec.rb#L44)
 ## Input
 ```haml
+- h1 = { foo: 'should be overwritten' }
+- h2 = { foo: nil }
+%a{h1, h2}
+
+```
+
+## Faml, Haml
+```html
+<a></a>
+
+```
+
+## Hamlit
+```html
+<a foo='should be overwritten'></a>
+
+```
+
+# [./spec/render/attribute_spec.rb:52](../../../spec/render/attribute_spec.rb#L52)
+## Input
+```haml
+- h = {foo: 1, 'foo' => 2}
+%span{h}
+```
+
+## Faml, Haml
+```html
+<span foo='2'></span>
+
+```
+
+## Hamlit
+```html
+<span foo='1' foo='2'></span>
+
+```
+
+# [./spec/render/attribute_spec.rb:58](../../../spec/render/attribute_spec.rb#L58)
+## Input
+```haml
 %span{foo: "x\"y'z"}hello
 ```
 
@@ -16,7 +56,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:44](../../../spec/render/attribute_spec.rb#L44)
+# [./spec/render/attribute_spec.rb:58](../../../spec/render/attribute_spec.rb#L58)
 ## Input
 ```haml
 - v = "x\"y'z"
@@ -35,7 +75,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:44](../../../spec/render/attribute_spec.rb#L44)
+# [./spec/render/attribute_spec.rb:58](../../../spec/render/attribute_spec.rb#L58)
 ## Input
 ```haml
 - h = {foo: "x\"y'z"}
@@ -54,7 +94,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:61](../../../spec/render/attribute_spec.rb#L61)
+# [./spec/render/attribute_spec.rb:75](../../../spec/render/attribute_spec.rb#L75)
 ## Input (with options={:format=>:xhtml})
 ```haml
 - v = true
@@ -73,7 +113,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:61](../../../spec/render/attribute_spec.rb#L61)
+# [./spec/render/attribute_spec.rb:75](../../../spec/render/attribute_spec.rb#L75)
 ## Input (with options={:format=>:xhtml})
 ```haml
 - h = {foo: true}
@@ -92,7 +132,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:75](../../../spec/render/attribute_spec.rb#L75)
+# [./spec/render/attribute_spec.rb:89](../../../spec/render/attribute_spec.rb#L89)
 ## Input
 ```haml
 %span{b: __LINE__,
@@ -112,7 +152,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:82](../../../spec/render/attribute_spec.rb#L82)
+# [./spec/render/attribute_spec.rb:96](../../../spec/render/attribute_spec.rb#L96)
 ## Input
 ```haml
 %span{"foo\0bar" => "hello"}
@@ -130,7 +170,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:82](../../../spec/render/attribute_spec.rb#L82)
+# [./spec/render/attribute_spec.rb:96](../../../spec/render/attribute_spec.rb#L96)
 ## Input
 ```haml
 - val = "hello"
@@ -150,7 +190,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:82](../../../spec/render/attribute_spec.rb#L82)
+# [./spec/render/attribute_spec.rb:96](../../../spec/render/attribute_spec.rb#L96)
 ## Input
 ```haml
 - key = "foo\0bar"
@@ -172,7 +212,7 @@
 ...                               ^
 ```
 
-# [./spec/render/attribute_spec.rb:96](../../../spec/render/attribute_spec.rb#L96)
+# [./spec/render/attribute_spec.rb:110](../../../spec/render/attribute_spec.rb#L110)
 ## Input
 ```haml
 %span[Faml::TestStruct.new(123)] hello
@@ -190,7 +230,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:100](../../../spec/render/attribute_spec.rb#L100)
+# [./spec/render/attribute_spec.rb:114](../../../spec/render/attribute_spec.rb#L114)
 ## Input
 ```haml
 %span[Faml::TestStruct.new(123), :hello] hello
@@ -208,7 +248,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:104](../../../spec/render/attribute_spec.rb#L104)
+# [./spec/render/attribute_spec.rb:118](../../../spec/render/attribute_spec.rb#L118)
 ## Input
 ```haml
 %span[Faml::TestRefStruct.new(123)] hello
@@ -226,7 +266,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:108](../../../spec/render/attribute_spec.rb#L108)
+# [./spec/render/attribute_spec.rb:122](../../../spec/render/attribute_spec.rb#L122)
 ## Input
 ```haml
 %span#baz[Faml::TestStruct.new(123)]{id: "foo"} hello
@@ -244,7 +284,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:114](../../../spec/render/attribute_spec.rb#L114)
+# [./spec/render/attribute_spec.rb:128](../../../spec/render/attribute_spec.rb#L128)
 ## Input
 ```haml
 %span{foo: 1}(foo=2)
@@ -262,7 +302,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:114](../../../spec/render/attribute_spec.rb#L114)
+# [./spec/render/attribute_spec.rb:128](../../../spec/render/attribute_spec.rb#L128)
 ## Input
 ```haml
 %span(foo=2){foo: 1}
@@ -280,7 +320,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:114](../../../spec/render/attribute_spec.rb#L114)
+# [./spec/render/attribute_spec.rb:128](../../../spec/render/attribute_spec.rb#L128)
 ## Input
 ```haml
 - v = 2
@@ -299,7 +339,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:114](../../../spec/render/attribute_spec.rb#L114)
+# [./spec/render/attribute_spec.rb:128](../../../spec/render/attribute_spec.rb#L128)
 ## Input
 ```haml
 - v = 2
@@ -318,7 +358,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:114](../../../spec/render/attribute_spec.rb#L114)
+# [./spec/render/attribute_spec.rb:128](../../../spec/render/attribute_spec.rb#L128)
 ## Input
 ```haml
 - h = {foo: 1}
@@ -337,7 +377,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:114](../../../spec/render/attribute_spec.rb#L114)
+# [./spec/render/attribute_spec.rb:128](../../../spec/render/attribute_spec.rb#L128)
 ## Input
 ```haml
 - h = {foo: 1}
@@ -356,7 +396,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:133](../../../spec/render/attribute_spec.rb#L133)
+# [./spec/render/attribute_spec.rb:147](../../../spec/render/attribute_spec.rb#L147)
 ## Input
 ```haml
 %span{id: 1}(id=2)

data/incompatibilities/spec/render/hash_attribute_spec.md

@@ -118,3 +118,24 @@
 
 ```
 
+# [./spec/render/hash_attribute_spec.rb:61](../../../spec/render/hash_attribute_spec.rb#L61)
+## Input
+```haml
+- h1 = { new: true }
+- h2 = { data: { old: true } }
+%a(data=h1){ h2 , data: { new: nil, old: false } }
+
+```
+
+## Faml, Haml
+```html
+<a></a>
+
+```
+
+## Hamlit
+```html
+<a data-old data='{:new=&gt;true}'></a>
+
+```
+

data/lib/faml/attribute_compiler.rb

@@ -56,8 +56,6 @@ module Faml
       case
       when value == true
         [:haml, :attr, key, [:multi]]
-      when value == false || value.nil?
-        [:multi]
       else
         [:haml, :attr, key, [:static, Temple::Utils.escape_html(value)]]
       end

data/lib/faml/attribute_optimizer.rb

@@ -59,10 +59,9 @@ module Faml
       parser.dynamic_attributes.each do |k, v|
         k = k.to_s
         if static_attributes.key?(k)
-          if StaticHashParser::SPECIAL_ATTRIBUTES.include?(k)
-            # XXX: Quit optimization
-            return nil
-          end
+          # XXX: Quit optimization.
+          # See also https://github.com/eagletmt/faml/issues/44
+          return nil
         end
         dynamic_attributes[k] = v
       end

data/lib/faml/version.rb

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

data/spec/render/attribute_spec.rb

@@ -41,6 +41,20 @@ RSpec.describe 'Attributes rendering', type: :render do
     end
   end
 
+  it 'skips falsey values after merging attributes' do
+    expect(render_string(<<HAML)).to eq("<a></a>\n")
+- h1 = { foo: 'should be overwritten' }
+- h2 = { foo: nil }
+%a{h1, h2}
+HAML
+  end
+
+  it 'renders duplicated keys correctly' do
+    expect(render_string("%span{foo: 1, 'foo' => 2}")).to eq("<span foo='2'></span>\n")
+    expect(render_string("- v = 2\n%span{foo: 1, 'foo' => v}")).to eq("<span foo='2'></span>\n")
+    expect(render_string("- h = {foo: 1, 'foo' => 2}\n%span{h}")).to eq("<span foo='2'></span>\n")
+  end
+
   it 'escapes' do
     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})

data/spec/render/hash_attribute_spec.rb

@@ -58,6 +58,14 @@ HAML
       expect(render_string("- v = nil\n%span{data: { foo: v }}")).to eq("<span></span>\n")
     end
 
+    it 'skips falsey data attributes after merging attributes' do
+      expect(render_string(<<HAML)).to eq("<a></a>\n")
+- h1 = { new: true }
+- h2 = { data: { old: true } }
+%a(data=h1){ h2 , data: { new: nil, old: false } }
+HAML
+    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")

metadata

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