Let {{tag}} render kCFBooleanFalse and empty array, remove obsolete t…

…ests, update Guides/runtime/booleans.md
groue · Apr 1, 2012 · d796a61 · d796a61
1 parent b44b9c3
commit d796a61
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 26 deletions.
diff --git a/Guides/runtime/booleans.md b/Guides/runtime/booleans.md
@@ -58,8 +58,6 @@ GRMustache considers as false the following values, and only those:
 - the empty string `@""`
 - empty enumerables (all objects conforming to the NSFastEnumeration protocol, but NSDictionary -- the most obvious enumerable is NSArray).
 
-All those values will never be rendered with `{{name}}` tags.
-
 They all prevent Mustache sections `{{#name}}...{{/name}}` rendering.
 
 They all trigger inverted sections `{{^name}}...{{/name}}` rendering.

diff --git a/src/classes/GRMustacheTemplate.m b/src/classes/GRMustacheTemplate.m
@@ -263,10 +263,6 @@ + (GRMustacheObjectKind)objectKind:(id)object
     }
 }
 
-+ (BOOL)objectShouldBeRendered:(id)object
-{
-    return (object && (object != [NSNull null]) && ((void *)object != (void *)kCFBooleanFalse));
-}
 
 #pragma mark <GRMustacheRenderingElement>
 

diff --git a/src/classes/GRMustacheTemplate_private.h b/src/classes/GRMustacheTemplate_private.h
@@ -42,7 +42,6 @@ typedef enum {
 #pragma mark Objects kinds
 
 + (GRMustacheObjectKind)objectKind:(id)object GRMUSTACHE_API_INTERNAL;
-+ (BOOL)objectShouldBeRendered:(id)object GRMUSTACHE_API_INTERNAL;
 
 #pragma mark Delegate
 

diff --git a/src/classes/GRMustacheVariableElement.m b/src/classes/GRMustacheVariableElement.m
@@ -64,7 +64,7 @@ - (NSString *)renderContext:(GRMustacheContext *)context inRootTemplate:(GRMusta
     // interpret
 
     NSString *result = nil;
-    if([GRMustacheTemplate objectShouldBeRendered:value]) {
+    if (value && (value != [NSNull null])) {
         result = [value description];
         if (!_raw) {
             result = [self htmlEscape:result];

diff --git a/src/tests/Public/v2.0/GRMustacheSuites/variables.json b/src/tests/Public/v2.0/GRMustacheSuites/variables.json
@@ -58,24 +58,6 @@
       "template": "<{{subject}}>",
       "expected": "<>"
     },
-    {
-      "name": "False should not be rendered.",
-      "data": { "subject": false },
-      "template": "<{{subject}}>",
-      "expected": "<>"
-    },
-    {
-      "name": "Empty string should not be rendered.",
-      "data": { "subject": "" },
-      "template": "<{{subject}}>",
-      "expected": "<>"
-    },
-    {
-      "name": "Empty list should not be rendered.",
-      "data": { "subject": [] },
-      "template": "<{{subject}}>",
-      "expected": "<>"
-    },
 
     // Whitespace Insensitivity