Fix tags with a space but no attributes to speak of

zacwest · Feb 23, 2015 · ef1ce48 · ef1ce48
1 parent a9eb47d
commit ef1ce48
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/Example/Tests/Tests/ZSWStringParserSpec.m b/Example/Tests/Tests/ZSWStringParserSpec.m
@@ -29,7 +29,7 @@
             }).to.raise(NSInvalidArgumentException);
         });
     });
-        
+
     __block id mockOptions;
 
     beforeEach(^{
@@ -92,7 +92,7 @@
     });
 
     it(@"should handle a string with multiple overlapping and non-overlapping tags", ^{
-        ZSWTaggedString *taggedString = [ZSWTaggedString stringWithString:@"<all><qual>If I come <sad>without</sad> a thing</qual>, <suppose>then I come with <happy>all</happy> I need</suppose></all>"];
+        ZSWTaggedString *taggedString = [ZSWTaggedString stringWithString:@"<all><qual>If I come <sad >without</sad> a thing</qual>, <suppose >then I come with <happy>all</happy> I need</suppose></all>"];
 
         NSArray *tags;
         [[mockOptions expect] updateAttributedString:OCMOCK_ANY
@@ -145,6 +145,8 @@
         expect(tag.tagName).to.equal(@"hungry");
         expect(tag.tagRange.location).to.equal(5);
         expect(tag.tagRange.length).to.equal(0);
+
+        expect(tag.tagAttributes).to.equal(@{@"type": @"lol"});
     });
 });
 

diff --git a/ZSWTaggedString/Private/ZSWStringParserTag.m b/ZSWTaggedString/Private/ZSWStringParserTag.m
@@ -85,6 +85,11 @@ - (void)addRawTagAttributes:(NSString *)rawTagAttributes {
         // eat any whitespace at the start
         [scanner scanCharactersFromSet:whitespaceSet intoString:NULL];
 
+        if (scanner.isAtEnd) {
+            // e.g., a tag like <dog ></dog> might produce just a space attribute
+            break;
+        }
+
         // Scan up to '=' or ' '
         NSString *attributeName;
         [scanner scanUpToCharactersFromSet:nameBreakSet intoString:&attributeName];