Rakefile example/h2o/index.html example/h2o/layout.html spec/context_spec.rb spec/spec.opts spec/spec_helper.rb @@ -6,13 +6,13 @@ <title>something {{ page.title | capitalize }}</title> </head> <body> -{{ links.length }} +{{ links.length }} -{% if page.title == "this is a title" %} -haha -{% else %} -ohoh -{% endif %} +{% if page.title == "this is a title" %} +haha +{% else %} +ohoh +{% endif %} {{ callable }} @@ -54,6 +54,7 @@ ohoh {% endif %} {% block body %} + something here <h1>{{ page.title | test "", adsf }}</h1> <small> {{ page.description }} </small> <p>{{ page.body }}</p> example/h2o/base.html @@ -74,7 +74,7 @@ Server.start address do |s| require 'h2o' - h2o = H2o::Template.new('h2o/inherit.html') + h2o = H2o::Template.new('h2o/index.html') # liquid = Liquid::Template.parse(Pathname.new('liquid/base.html').read) # erb = ErbTemplate.new('erb/base.html') # example/run.rb @@ -169,7 +169,8 @@ module H2o end def super - @block.render(@context, @stream, @index-1) if @block.stack_size > @index.abs + @block.parent.render(@context, @stream, @index-1) if @block.parent.stack_size > @index.abs + nil end def depth lib/h2o/context.rb @@ -4,7 +4,8 @@ module H2o # class Block < Tag attr_reader :name - @name + attr_accessor :parent + def initialize parser, argstring @name = argstring.to_sym @stack = [ parser.parse(:endblock) ] @@ -45,8 +46,11 @@ module H2o blocks = @nodelist.parser.storage[:blocks] || {} - (parser.storage[:blocks] || []).each do |name, tag| - blocks[name].add_layer(tag) if blocks.include? name + (parser.storage[:blocks] || []).each do |name, block| + if blocks.include? name + blocks[name].add_layer(block) + block.parent = blocks[name] + end end end lib/h2o/tags/block.rb 9d118923d0aa549b416701cc382b05359d33c1d6 taylor luk subjective@gmail.com http://github.com/speedmax/h2o/commit/79b86324e0d54bea09261004c8065794bbd8ef7e 79b86324e0d54bea09261004c8065794bbd8ef7e

2008-10-02T16:03:47-07:00

addng BlockTag#parent property, added context_spec 9c57ea103a408da84d4496886da7e83181c78cee taylor luk subjective@gmail.com