kotovalexarian-likes-github/haml--haml
1
0
Fork 0
mirror of https://github.com/haml/haml.git synced 2022-11-09 12:33:31 -05:00
Code Releases Activity

Fix rendering failure for static integer

Browse source
This commit is contained in:
Takashi Kokubun 2015-12-16 17:31:07 +09:00
parent 8ff7c548a0
commit 070eeb38ab
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/hamlit/compiler/attribute_compiler.rb
View file

@ -61,7 +61,7 @@ module Hamlit
def compile_id!(temple, key, values) def compile_id!(temple, key, values)
build_code = attribute_builder(:id, values) build_code = attribute_builder(:id, values)
if values.all? { |type, exp| type == :static || StaticAnalyzer.static?(exp) } if values.all? { |type, exp| type == :static || StaticAnalyzer.static?(exp) }
temple << [:html, :attr, key, [:static, eval(build_code)]] temple << [:html, :attr, key, [:static, eval(build_code).to_s]]
else else
temple << [:html, :attr, key, [:dynamic, build_code]] temple << [:html, :attr, key, [:dynamic, build_code]]
end end
@ -70,7 +70,7 @@ module Hamlit
def compile_class!(temple, key, values) def compile_class!(temple, key, values)
build_code = attribute_builder(:class, values) build_code = attribute_builder(:class, values)
if values.all? { |type, exp| type == :static || StaticAnalyzer.static?(exp) } if values.all? { |type, exp| type == :static || StaticAnalyzer.static?(exp) }
temple << [:html, :attr, key, [:static, eval(build_code)]] temple << [:html, :attr, key, [:static, eval(build_code).to_s]]
else else
temple << [:html, :attr, key, [:dynamic, build_code]] temple << [:html, :attr, key, [:dynamic, build_code]]
end end
@ -81,7 +81,7 @@ module Hamlit
build_code = "::Hamlit::AttributeBuilder.build_data(#{args.join(', ')})" build_code = "::Hamlit::AttributeBuilder.build_data(#{args.join(', ')})"
if values.all? { |type, exp| type == :static || StaticAnalyzer.static?(exp) } if values.all? { |type, exp| type == :static || StaticAnalyzer.static?(exp) }
temple << [:static, eval(build_code)] temple << [:static, eval(build_code).to_s]
else else
temple << [:dynamic, build_code] temple << [:dynamic, build_code]
end end
@ -95,7 +95,7 @@ module Hamlit
case value case value
when true then temple << [:html, :attr, key, @format == :xhtml ? [:static, key] : [:multi]] when true then temple << [:html, :attr, key, @format == :xhtml ? [:static, key] : [:multi]]
when false, nil when false, nil
else temple << [:html, :attr, key, [:escape, @escape_attrs, [:static, value]]] else temple << [:html, :attr, key, [:escape, @escape_attrs, [:static, value.to_s]]]
end end
else else
var = @identity.generate var = @identity.generate

6
test/hamlit/engine/attributes_test.rb
View file

@ -9,6 +9,7 @@ describe Hamlit::Engine do
it { assert_haml(%q|#a{ id: false }|) } it { assert_haml(%q|#a{ id: false }|) }
it { assert_haml(%q|#a{ id: 'b' }|) } it { assert_haml(%q|#a{ id: 'b' }|) }
it { assert_haml(%q|#b{ id: 'a' }|) } it { assert_haml(%q|#b{ id: 'a' }|) }
it { assert_haml(%q|%a{ 'id' => 60 }|) }
it { assert_haml(%q|#a{ id: 'b' }(id=id)|, locals: { id: 'c' }) } it { assert_haml(%q|#a{ id: 'b' }(id=id)|, locals: { id: 'c' }) }
it { assert_haml(%q|#c{ id: a = 'a' }(id=id)|, locals: { id: 'b' }) } it { assert_haml(%q|#c{ id: a = 'a' }(id=id)|, locals: { id: 'b' }) }
@ -54,6 +55,7 @@ describe Hamlit::Engine do
it { assert_haml(%q|.a{ class: [] }|) } it { assert_haml(%q|.a{ class: [] }|) }
it { assert_haml(%q|.a{ class: %w[c b] }|) } it { assert_haml(%q|.a{ class: %w[c b] }|) }
it { assert_haml(%q|.a.c(class='b')|) } it { assert_haml(%q|.a.c(class='b')|) }
it { assert_haml(%q|%a{ 'class' => 60 }|) }
it { assert_haml(%q|%div{ class: 'b a' }(class=klass)|, locals: { klass: 'b a' }) } it { assert_haml(%q|%div{ class: 'b a' }(class=klass)|, locals: { klass: 'b a' }) }
it { assert_haml(%q|%div(class=klass){ class: 'b a' }|, locals: { klass: 'b a' }) } it { assert_haml(%q|%div(class=klass){ class: 'b a' }|, locals: { klass: 'b a' }) }
@ -120,6 +122,7 @@ describe Hamlit::Engine do
it { assert_haml(%q|%a{ data: { nil => 3 } }|) } it { assert_haml(%q|%a{ data: { nil => 3 } }|) }
it { assert_haml(%q|%a{ data: 3 }|) } it { assert_haml(%q|%a{ data: 3 }|) }
it { assert_haml(%q|%a(data=3)|) } it { assert_haml(%q|%a(data=3)|) }
it { assert_haml(%q|%a{ 'data-bar' => 60 }|) }
it { assert_haml(%q|%a{ data: { overlay_modal: 'foo' } }|) } it { assert_haml(%q|%a{ data: { overlay_modal: 'foo' } }|) }
it { assert_haml(%q|%a{ data: { overlay_modal: true } }|) } it { assert_haml(%q|%a{ data: { overlay_modal: true } }|) }
@ -199,6 +202,8 @@ describe Hamlit::Engine do
it { assert_haml(%q|%a{ hash }|, locals: { hash: { 'data-overlay_modal' => false } }) } it { assert_haml(%q|%a{ hash }|, locals: { hash: { 'data-overlay_modal' => false } }) }
it { assert_haml(%q|%a{ hash }|, locals: { hash: { 'data-overlay_modal' => true } }) } it { assert_haml(%q|%a{ hash }|, locals: { hash: { 'data-overlay_modal' => true } }) }
it { assert_haml(%q|%a{ 'disabled' => 60 }|) }
end end
describe 'common attributes' do describe 'common attributes' do
@ -224,6 +229,7 @@ describe Hamlit::Engine do
%div{ h } %div{ h }
HAML HAML
end end
it { assert_haml(%q|%a{ 'href' => 60 }|) }
end end
describe 'incompatibility' do describe 'incompatibility' do