fast_haml 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82c2cd008b3cb7f86bf02d80ad69ae0655bd88b6
-  data.tar.gz: a06febaeb2ccf36598a2d612f8dd9de3e367f8c3
+  metadata.gz: 435825826b3948fd94accaf5eaafc29e1d7ea4f1
+  data.tar.gz: 3b0ad21919d9a8ec7bccee42f39740431acd2b8d
 SHA512:
-  metadata.gz: 26b7a473dd89a20eb8dcef16c14b435157ea054ae8aac72bd19782959bc8de54d010c119580f6c5bd6a1617f19e1d0b20354e2d5691a2f2428df173a52bfb0c5
-  data.tar.gz: 15431eb000c43add9ab90cfd19167c52a5c23f0cee9fdc56b84bbcdbd7d40b1fbbdfd12bf5ddd89df5e102f861d6621550a28d4e8d98e8a404c02d9f10d858b7
+  metadata.gz: 3c03f60242ffe2650685d696c1e1cc36d3561d28b31aaa86feee6412154551c938d76f3406948527a5b959122d846bc5cd827a85f11558e79dab8e02e453f1f2
+  data.tar.gz: d5a8252b40bfd94d5f2748870add6eda2cda54579b50aee5dc91de16f46e61c3bf22e6dd4e77ed3f90c2ce20ff2b08c25fabd15b5fe588d67e63b9e9c0e175f5

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.7 (2015-03-16)
+- Fix attribute rendering with falsey values
+    - https://github.com/eagletmt/fast_haml/pull/11
+
 ## 0.1.6 (2015-03-11)
 - Fix render error with comment-only script
     - https://github.com/eagletmt/fast_haml/issues/6

data/ext/attribute_builder/attribute_builder.c

@@ -116,7 +116,7 @@ normalize(VALUE hash)
         rb_str_buf_append(k, data_key);
         rb_hash_aset(hash, k, rb_hash_lookup(data, data_key));
       }
-    } else if (!RB_TYPE_P(value, T_TRUE)) {
+    } else if (!(RB_TYPE_P(value, T_TRUE) || RB_TYPE_P(value, T_FALSE) || NIL_P(value))) {
       rb_hash_aset(hash, key, rb_funcall(value, id_to_s, 0));
     }
   }
@@ -202,6 +202,8 @@ build_attribute(VALUE attr_quote, VALUE key, VALUE value)
     rb_str_buf_cat(attr, " ", 1);
     rb_str_buf_append(attr, key);
     return attr;
+  } else if (RB_TYPE_P(value, T_FALSE) || NIL_P(value)) {
+    return Qnil;
   } else {
     return put_attribute(attr_quote, key, value);
   }

data/lib/fast_haml/ast.rb

@@ -19,11 +19,6 @@ module FastHaml
         super
         @leading_empty_lines = 0
       end
-
-      def increment_leading_empty_lines
-        @leading_empty_lines +=1
-        nil
-      end
     end
 
     class Doctype < Struct.new(:doctype)

data/lib/fast_haml/compiler.rb

@@ -302,6 +302,8 @@ module FastHaml
       case
       when value == true
         [[:haml, :attr, key, [:multi]]]
+      when value == false || value == nil
+        [[:multi]]
       when value.is_a?(Hash) && key == 'data'
         data = AttributeBuilder.normalize_data(value)
         data.keys.sort.map do |k|
@@ -313,7 +315,7 @@ module FastHaml
     end
 
     def compile_dynamic_attribute(key, value)
-      [[:haml, :attr, key, [:escape, true, [:dynamic, value]]]]
+      [[:haml, :attr, key, [:dvalue, value]]]
     end
 
     def compile_script(ast)

data/lib/fast_haml/html.rb

@@ -23,6 +23,20 @@ module FastHaml
         else
           [:static, " #{name}=#{options[:attr_quote]}#{name}#{options[:attr_quote]}"]
         end
+      elsif value[0] == :dvalue
+        sym = unique_name
+        [:multi,
+          [:code, "#{sym} = (#{value[1]})"],
+          [:case, sym,
+            ['true', [:static, " #{name}"]],
+            ['false, nil', [:multi]],
+            [:else, [:multi,
+              [:static, " #{name}=#{options[:attr_quote]}"],
+              [:escape, true, [:dynamic, sym]],
+              [:static, options[:attr_quote]],
+            ]],
+          ],
+        ]
       else
         [:multi,
           [:static, " #{name}=#{options[:attr_quote]}"],

data/lib/fast_haml/version.rb

@@ -1,3 +1,3 @@
 module FastHaml
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/spec/render/attribute_spec.rb

@@ -22,6 +22,18 @@ RSpec.describe 'Attributes rendering', type: :render do
     expect(render_string('%span.c2{class: ["c1", "c3"]}')).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']}
@@ -197,7 +209,6 @@ HAML
       expect(render_string(%q|%span(foo=1 bar='baz#{1 + 2}') hello|)).to eq("<span bar='baz3' foo='1'>hello</span>\n")
     end
 
-
     it 'parses escapes' do
       expect(render_string(%q|%span(foo=1 bar="ba\"z") hello|)).to eq("<span bar='ba&quot;z' foo='1'>hello</span>\n")
       expect(render_string(%q|%span(foo=1 bar='ba\'z') hello|)).to eq("<span bar='ba&#39;z' foo='1'>hello</span>\n")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fast_haml
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-11 00:00:00.000000000 Z
+date: 2015-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape_utils