haml-edge 3.1.68 → 3.1.69

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-3.1.68
+3.1.69

data/VERSION

@@ -1 +1 @@
-3.1.68
+3.1.69

data/lib/haml/precompiler.rb

@@ -534,8 +534,8 @@ END
       result = attributes.collect do |attr, value|
         next if value.nil?
 
-        value = filter_and_join(value, ' ') if attr == :class
-        value = filter_and_join(value, '_') if attr == :id
+        value = filter_and_join(value, ' ') if attr == 'class'
+        value = filter_and_join(value, '_') if attr == 'id'
 
         if value == true
           next " #{attr}" if is_html
@@ -561,8 +561,10 @@ END
     end
 
     def self.filter_and_join(value, separator)
+      return "" if value == ""
       value = [value] unless value.is_a?(Array)
-      return value.flatten.collect {|item| item ? item.to_s : nil}.compact.join(separator)
+      value = value.flatten.collect {|item| item ? item.to_s : nil}.compact.join(separator)
+      return !value.empty? && value
     end
 
     def prerender_tag(name, self_close, attributes)

data/test/haml/engine_test.rb

@@ -148,7 +148,7 @@ MESSAGE
     assert_equal("<p class='b css'>foo</p>\n", render("%p.css{:class => %w[css b]} foo")) # merge uniquely
     assert_equal("<p class='a b c d'>foo</p>\n", render("%p{:class => [%w[a b], %w[c d]]} foo")) # flatten
     assert_equal("<p class='a b'>foo</p>\n", render("%p{:class => [:a, :b] } foo")) # stringify
-    assert_equal("<p class=''>foo</p>\n", render("%p{:class => [nil, false] } foo")) # strip falsey
+    assert_equal("<p>foo</p>\n", render("%p{:class => [nil, false] } foo")) # strip falsey
     assert_equal("<p class='a'>foo</p>\n", render("%p{:class => :a} foo")) # single stringify
     assert_equal("<p>foo</p>\n", render("%p{:class => false} foo")) # single falsey
     assert_equal("<p class='a b html'>foo</p>\n", render("%p(class='html'){:class => %w[a b]} foo")) # html attrs
@@ -159,7 +159,7 @@ MESSAGE
     assert_equal("<p id='css_a_b'>foo</p>\n", render("%p#css{:id => %w[a b]} foo")) # merge with css
     assert_equal("<p id='a_b_c_d'>foo</p>\n", render("%p{:id => [%w[a b], %w[c d]]} foo")) # flatten
     assert_equal("<p id='a_b'>foo</p>\n", render("%p{:id => [:a, :b] } foo")) # stringify
-    assert_equal("<p id=''>foo</p>\n", render("%p{:id => [nil, false] } foo")) # strip falsey
+    assert_equal("<p>foo</p>\n", render("%p{:id => [nil, false] } foo")) # strip falsey
     assert_equal("<p id='a'>foo</p>\n", render("%p{:id => :a} foo")) # single stringify
     assert_equal("<p>foo</p>\n", render("%p{:id => false} foo")) # single falsey
     assert_equal("<p id='html_a_b'>foo</p>\n", render("%p(id='html'){:id => %w[a b]} foo")) # html attrs

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml-edge
 version: !ruby/object:Gem::Version 
-  version: 3.1.68
+  version: 3.1.69
 platform: ruby
 authors: 
 - Nathan Weizenbaum