github-migration/rabl-rails
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ensure that child usage does not manipulate cached template

Browse Source
This commit is contained in:
John Bintz 2013-01-22 14:16:44 -05:00
parent 297f8a9145
commit cb53352607
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/rabl-rails/compiler.rb
View File

@ -67,7 +67,7 @@ module RablRails
name = options[:root] if options.has_key? :root name = options[:root] if options.has_key? :root
if options[:partial] if options[:partial]
template = Library.instance.compile_template_from_path(options[:partial]) template = Library.instance.compile_template_from_path(options[:partial])
@template[name] = template.merge!(:_data => data) @template[name] = template.merge(:_data => data)
elsif block_given? elsif block_given?
@template[name] = sub_compile(data) { yield } @template[name] = sub_compile(data) { yield }
end end

2
lib/rabl-rails/template.rb
View File

@ -2,7 +2,7 @@ module RablRails
class CompiledTemplate class CompiledTemplate
attr_accessor :source, :data, :root_name attr_accessor :source, :data, :root_name
delegate :[], :[]=, :merge!, :to => :source delegate :[], :[]=, :merge!, :merge, :to => :source
def initialize def initialize
@source = {} @source = {}

1
test/compiler_test.rb
View File

@ -113,6 +113,7 @@ class CompilerTest < ActiveSupport::TestCase
t = @compiler.compile_source(%{child(:user, :partial => 'users/base') }) t = @compiler.compile_source(%{child(:user, :partial => 'users/base') })
assert_equal( {:user => { :_data => :user, :id => :id } }, t.source) assert_equal( {:user => { :_data => :user, :id => :id } }, t.source)
assert_equal( {:id => :id}, mock_template.source)
end end
test "glue is compiled as a child but with anonymous name" do test "glue is compiled as a child but with anonymous name" do