Test+Fix: section helpers enter context stack

groue · Sep 25, 2012 · 180fc59 · 180fc59
1 parent 7344a18
commit 180fc59
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 1 deletion.
diff --git a/src/classes/GRMustacheSectionElement.m b/src/classes/GRMustacheSectionElement.m
@@ -141,7 +141,8 @@ - (void)renderInBuffer:(NSMutableString *)buffer withRuntime:(GRMustacheRuntime
         {
             // Helper
             if (!_inverted) {
-                GRMustacheSection *section = [GRMustacheSection sectionWithSectionElement:self runtime:sectionRuntime];
+                GRMustacheRuntime *helperRuntime = [sectionRuntime runtimeByAddingContextObject:value];
+                GRMustacheSection *section = [GRMustacheSection sectionWithSectionElement:self runtime:helperRuntime];
                 NSString *rendering = [(id<GRMustacheSectionHelper>)value renderSection:section];
                 if (rendering) {
                     [buffer appendString:rendering];

diff --git a/src/tests/Public/v5.0/GRMustacheSectionHelperTest.m b/src/tests/Public/v5.0/GRMustacheSectionHelperTest.m
@@ -45,6 +45,25 @@ - (NSString *)renderSection:(GRMustacheSection *)section
 }
 @end
 
+@interface GRMustacheAttributedSectionHelper : NSObject<GRMustacheHelper> {
+    NSString *_attribute;
+}
+@property (nonatomic, copy) NSString *attribute;
+@end
+
+@implementation GRMustacheAttributedSectionHelper
+@synthesize attribute=_attribute;
+- (void)dealloc
+{
+    self.attribute = nil;
+    [super dealloc];
+}
+- (NSString *)renderSection:(GRMustacheSection *)section
+{
+    return [section renderTemplateString:@"{{attribute}}" error:NULL];
+}
+@end
+
 @interface GRMustacheRecorderSectionHelper : NSObject<GRMustacheHelper> {
     NSUInteger _invocationCount;
     NSString *_lastInnerTemplateString;
@@ -279,6 +298,14 @@ - (void)testHelperCanRenderCurrentContextInDistinctTemplate
     STAssertEqualObjects(result, @"---", @"");
 }
 
+- (void)testHelperEnterCurrentContext
+{
+    GRMustacheAttributedSectionHelper *attributedHelper = [[[GRMustacheAttributedSectionHelper alloc] init] autorelease];
+    attributedHelper.attribute = @"---";
+    NSString *result = [GRMustacheTemplate renderObject:@{ @"helper": attributedHelper } fromString:@"{{#helper}}{{/helper}}" error:NULL];
+    STAssertEqualObjects(result, @"---", @"");
+}
+
 - (void)testHelperCanRenderCurrentContextInDistinctTemplateContainingPartial
 {
     id helper = [GRMustacheHelper helperWithBlock:^NSString *(GRMustacheSection *section) {