diff --git a/HTMLKit/HTMLDocument.m b/HTMLKit/HTMLDocument.m index 86d36c3..09baa88 100644 --- a/HTMLKit/HTMLDocument.m +++ b/HTMLKit/HTMLDocument.m @@ -77,7 +77,7 @@ - (HTMLElement *)rootElement { - for (HTMLNode *node = self.firstChiledNode; node; node = node.nextSibling) { + for (HTMLNode *node = self.firstChild; node; node = node.nextSibling) { if (node.nodeType == HTMLNodeElement) { return node.asElement; } diff --git a/HTMLKit/HTMLElement.m b/HTMLKit/HTMLElement.m index 1c018da..6083537 100644 --- a/HTMLKit/HTMLElement.m +++ b/HTMLKit/HTMLElement.m @@ -146,8 +146,8 @@ return result; } - if ([self.tagName isEqualToAny:@"pre", @"textarea", @"listing", nil] && self.firstChiledNode.nodeType == HTMLNodeText) { - HTMLText *textNode = (HTMLText *)self.firstChiledNode; + if ([self.tagName isEqualToAny:@"pre", @"textarea", @"listing", nil] && self.firstChild.nodeType == HTMLNodeText) { + HTMLText *textNode = (HTMLText *)self.firstChild; if ([textNode.data hasPrefix:@"\n"]) { [result appendString:@"\n"]; } diff --git a/HTMLKit/HTMLNode.h b/HTMLKit/HTMLNode.h index a488dcd..eb07dbc 100644 --- a/HTMLKit/HTMLNode.h +++ b/HTMLKit/HTMLNode.h @@ -53,9 +53,9 @@ typedef NS_ENUM(unsigned short, HTMLDocumentPosition) @property (nonatomic, strong, readonly) NSOrderedSet *childNodes; -@property (nonatomic, strong, readonly) HTMLNode *firstChiledNode; +@property (nonatomic, strong, readonly) HTMLNode *firstChild; -@property (nonatomic, strong, readonly) HTMLNode *lastChildNode; +@property (nonatomic, strong, readonly) HTMLNode *lastChild; @property (nonatomic, strong, readonly) HTMLNode *previousSibling; diff --git a/HTMLKit/HTMLNode.m b/HTMLKit/HTMLNode.m index f6cedbc..fdff072 100644 --- a/HTMLKit/HTMLNode.m +++ b/HTMLKit/HTMLNode.m @@ -70,12 +70,12 @@ return _parentNode.nodeType == HTMLNodeElement ? (HTMLElement *)_parentNode : nil; } -- (HTMLNode *)firstChiledNode +- (HTMLNode *)firstChild { return self.childNodes.firstObject; } -- (HTMLNode *)lastChildNode +- (HTMLNode *)lastChild { return self.childNodes.lastObject; } @@ -147,13 +147,13 @@ - (HTMLNode *)prependNode:(HTMLNode *)node { - return [self insertNode:node beforeChildNode:self.firstChiledNode]; + return [self insertNode:node beforeChildNode:self.firstChild]; } - (void)prependNodes:(NSArray *)nodes { for (id node in nodes.reverseObjectEnumerator) { - [self insertNode:node beforeChildNode:self.firstChiledNode]; + [self insertNode:node beforeChildNode:self.firstChild]; } } diff --git a/HTMLKit/HTMLNodeIterator.m b/HTMLKit/HTMLNodeIterator.m index c5e85d1..6bfb9f4 100644 --- a/HTMLKit/HTMLNodeIterator.m +++ b/HTMLKit/HTMLNodeIterator.m @@ -89,7 +89,7 @@ typedef NS_ENUM(short, TraverseDirection) } if (_pointerBeforeReferenceNode) { - HTMLNode *nextSibling = oldPreviousSibling != nil ? oldPreviousSibling.nextSibling : oldParent.firstChiledNode; + HTMLNode *nextSibling = oldPreviousSibling != nil ? oldPreviousSibling.nextSibling : oldParent.firstChild; if (nextSibling != nil) { _referenceNode = nextSibling; return; @@ -105,8 +105,8 @@ typedef NS_ENUM(short, TraverseDirection) } HTMLNode * (^ lastInclusiveDescendant) (HTMLNode *) = ^ HTMLNode * (HTMLNode *node) { - while (node.lastChildNode) { - node = node.lastChildNode; + while (node.lastChild) { + node = node.lastChild; } return node; }; diff --git a/HTMLKit/HTMLNodeTraversal.m b/HTMLKit/HTMLNodeTraversal.m index 1c646df..dd17b2a 100644 --- a/HTMLKit/HTMLNodeTraversal.m +++ b/HTMLKit/HTMLNodeTraversal.m @@ -14,8 +14,8 @@ HTMLNode * PrecedingNode(HTMLNode *node, HTMLNode *root) { HTMLNode *previous = node.previousSibling; if (previous != nil) { - while (previous.lastChildNode != nil) { - previous = previous.lastChildNode; + while (previous.lastChild != nil) { + previous = previous.lastChild; } return previous; } @@ -29,8 +29,8 @@ HTMLNode * PrecedingNode(HTMLNode *node, HTMLNode *root) HTMLNode * FollowingNode(HTMLNode *node, HTMLNode *root) { - if (node.firstChiledNode != nil) { - return node.firstChiledNode; + if (node.firstChild != nil) { + return node.firstChild; } do { diff --git a/HTMLKit/HTMLParser.m b/HTMLKit/HTMLParser.m index d561e59..6f7bb46 100644 --- a/HTMLKit/HTMLParser.m +++ b/HTMLKit/HTMLParser.m @@ -455,8 +455,8 @@ if (adjustedInsertionLocation.nodeType != HTMLNodeDocument) { if (child != nil && child.previousSibling.nodeType == HTMLNodeText) { [(HTMLText *)child.previousSibling appendString:data]; - } else if (adjustedInsertionLocation.lastChildNode.nodeType == HTMLNodeText) { - [(HTMLText *)adjustedInsertionLocation.lastChildNode appendString:data]; + } else if (adjustedInsertionLocation.lastChild.nodeType == HTMLNodeText) { + [(HTMLText *)adjustedInsertionLocation.lastChild appendString:data]; } else { HTMLText *text = [[HTMLText alloc] initWithData:data]; [adjustedInsertionLocation insertNode:text beforeChildNode:child]; diff --git a/HTMLKit/HTMLTreeWalker.m b/HTMLKit/HTMLTreeWalker.m index 7224425..0e21ed0 100644 --- a/HTMLKit/HTMLTreeWalker.m +++ b/HTMLKit/HTMLTreeWalker.m @@ -72,7 +72,7 @@ typedef NS_ENUM(short, HTMLTreeWalkerSiblingsType) { HTMLNode *node = _currentNode; - node = (type == HTMLTreeWalkerChildrenTypeFirst) ? node.firstChiledNode : node.lastChildNode; + node = (type == HTMLTreeWalkerChildrenTypeFirst) ? node.firstChild : node.lastChild; while (node != nil) { HTMLNodeFilterValue result = FilterNode(self.filter, self.whatToShow, node); @@ -82,7 +82,7 @@ typedef NS_ENUM(short, HTMLTreeWalkerSiblingsType) } if (result == HTMLNodeFilterSkip) { - HTMLNode *child = (type == HTMLTreeWalkerChildrenTypeFirst) ? node.firstChiledNode : node.lastChildNode; + HTMLNode *child = (type == HTMLTreeWalkerChildrenTypeFirst) ? node.firstChild : node.lastChild; if (child != nil) { node = child; continue; @@ -135,7 +135,7 @@ typedef NS_ENUM(short, HTMLTreeWalkerSiblingsType) return node; } - sibling = (type == HTMLTreeWalkerSiblingsTypeNext) ? node.firstChiledNode : node.lastChildNode; + sibling = (type == HTMLTreeWalkerSiblingsTypeNext) ? node.firstChild : node.lastChild; if (result == HTMLNodeFilterReject || sibling == nil) { sibling = (type == HTMLTreeWalkerSiblingsTypeNext) ? node.nextSibling : node.previousSibling; } @@ -176,7 +176,7 @@ typedef NS_ENUM(short, HTMLTreeWalkerSiblingsType) HTMLNodeFilterValue result = FilterNode(self.filter, self.whatToShow, node); while (result != HTMLNodeFilterReject && node.hasChildNodes) { - node = node.lastChildNode; + node = node.lastChild; result = FilterNode(self.filter, self.whatToShow, node); } @@ -210,7 +210,7 @@ typedef NS_ENUM(short, HTMLTreeWalkerSiblingsType) while (YES) { while (result != HTMLNodeFilterReject && node.hasChildNodes) { - node = node.firstChiledNode; + node = node.firstChild; result = FilterNode(self.filter, self.whatToShow, node); if (result == HTMLNodeFilterAccept) { _currentNode = node; diff --git a/HTMLKitTests/HTMLKitNodeIteratorTests.m b/HTMLKitTests/HTMLKitNodeIteratorTests.m index 118b5c6..7ff6823 100644 --- a/HTMLKitTests/HTMLKitNodeIteratorTests.m +++ b/HTMLKitTests/HTMLKitNodeIteratorTests.m @@ -367,8 +367,8 @@ static void (^ IterateUpToNode)(HTMLNodeIterator *, HTMLNode *) = ^ (HTMLNodeIte }; static HTMLNode * (^ LastDescendant)(HTMLNode *) = ^ HTMLNode * (HTMLNode *node) { - while (node.lastChildNode) { - node = node.lastChildNode; + while (node.lastChild) { + node = node.lastChild; } return node; }; @@ -376,7 +376,7 @@ static HTMLNode * (^ LastDescendant)(HTMLNode *) = ^ HTMLNode * (HTMLNode *node) - (void)testThatRemovingRootNodeShouldNotAffectIterator { HTMLDocument *document = self.document; - HTMLNode *node = document.body.firstChiledNode; // + HTMLNode *node = document.body.firstChild; // HTMLNodeIterator *iterator = node.nodeIterator; @@ -401,7 +401,7 @@ static HTMLNode * (^ LastDescendant)(HTMLNode *) = ^ HTMLNode * (HTMLNode *node) RemoveThenInsertNode(iterator.root.childNodes[1]); // Remove

XCTAssertEqualObjects(iterator.root, body); - XCTAssertEqualObjects(iterator.referenceNode, body.firstChiledNode); + XCTAssertEqualObjects(iterator.referenceNode, body.firstChild); XCTAssertEqual(iterator.pointerBeforeReferenceNode, NO); } @@ -420,7 +420,7 @@ static HTMLNode * (^ LastDescendant)(HTMLNode *) = ^ HTMLNode * (HTMLNode *node) XCTAssertEqual(iterator.pointerBeforeReferenceNode, NO); HTMLNode *next = iterator.nextNode; // "Hello" - XCTAssertEqualObjects(next, iterator.root.firstChiledNode); + XCTAssertEqualObjects(next, iterator.root.firstChild); } - (void)testThatRemovingReferenceNodeShouldUpdateIterator_NonNilOldPreviousSibling_NotBeforeReference @@ -434,7 +434,7 @@ static HTMLNode * (^ LastDescendant)(HTMLNode *) = ^ HTMLNode * (HTMLNode *node) IterateUpToNode(iterator, node); // Reference node:

, pointer-before-reference: NO RemoveThenInsertNode(node); // Remove

with old previos sibling being - XCTAssertEqualObjects(iterator.referenceNode, LastDescendant(body.firstChiledNode)); + XCTAssertEqualObjects(iterator.referenceNode, LastDescendant(body.firstChild)); XCTAssertEqual(iterator.pointerBeforeReferenceNode, NO); } @@ -450,7 +450,7 @@ static HTMLNode * (^ LastDescendant)(HTMLNode *) = ^ HTMLNode * (HTMLNode *node) [iterator previousNode]; // pointer-before-reference: YES RemoveThenInsertNode(node); // Remove

with old previos sibling being - XCTAssertEqualObjects(iterator.referenceNode, body.firstChiledNode); + XCTAssertEqualObjects(iterator.referenceNode, body.firstChild); XCTAssertEqual(iterator.pointerBeforeReferenceNode, YES); } @@ -502,7 +502,7 @@ static HTMLNode * (^ LastDescendant)(HTMLNode *) = ^ HTMLNode * (HTMLNode *node) [iterator nextNode]; // Reference node: "This is an " RemoveThenInsertNode(parent); - XCTAssertEqualObjects(iterator.referenceNode, LastDescendant(body.firstChiledNode)); + XCTAssertEqualObjects(iterator.referenceNode, LastDescendant(body.firstChild)); XCTAssertEqual(iterator.pointerBeforeReferenceNode, NO); } @@ -519,7 +519,7 @@ static HTMLNode * (^ LastDescendant)(HTMLNode *) = ^ HTMLNode * (HTMLNode *node) [iterator previousNode]; // pointer-before-reference: YES RemoveThenInsertNode(parent); - XCTAssertEqualObjects(iterator.referenceNode, body.firstChiledNode); + XCTAssertEqualObjects(iterator.referenceNode, body.firstChild); XCTAssertEqual(iterator.pointerBeforeReferenceNode, YES); } @@ -555,13 +555,13 @@ static HTMLNode * (^ LastDescendant)(HTMLNode *) = ^ HTMLNode * (HTMLNode *node) body.innerHTML = @"

"; - HTMLNodeIterator *iterator = body.firstChiledNode.nodeIterator; + HTMLNodeIterator *iterator = body.firstChild.nodeIterator; - IterateUpToNode(iterator, LastDescendant(body.firstChiledNode)); // Referecne node: + IterateUpToNode(iterator, LastDescendant(body.firstChild)); // Referecne node: HTMLNode *node = [iterator previousNode]; // pointer-before-reference: YES RemoveThenInsertNode(node); - XCTAssertEqualObjects(iterator.referenceNode, iterator.root.firstChiledNode); + XCTAssertEqualObjects(iterator.referenceNode, iterator.root.firstChild); XCTAssertEqual(iterator.pointerBeforeReferenceNode, NO); } diff --git a/HTMLKitTests/HTMLKitNodesTests.m b/HTMLKitTests/HTMLKitNodesTests.m index 524a25c..87f37f9 100644 --- a/HTMLKitTests/HTMLKitNodesTests.m +++ b/HTMLKitTests/HTMLKitNodesTests.m @@ -37,10 +37,10 @@ XCTAssertNil(node.ownerDocument); XCTAssertNil(node.parentNode); XCTAssertNil(node.parentElement); - XCTAssertNil(node.firstChiledNode); - XCTAssertNil(node.lastChildNode); + XCTAssertNil(node.firstChild); + XCTAssertNil(node.lastChild); XCTAssertNil(node.previousSibling); - XCTAssertNil(node.lastChildNode); + XCTAssertNil(node.lastChild); } - (void)testAppendNode @@ -50,7 +50,7 @@ [element appendNode:comment]; XCTAssertEqual(element.childNodesCount, 1); - XCTAssertEqual(element.firstChiledNode, comment); + XCTAssertEqual(element.firstChild, comment); HTMLElement *firstElement = [HTMLElement new]; HTMLElement *secondElement = [HTMLElement new]; @@ -59,8 +59,8 @@ [element appendNodes:nodes]; XCTAssertEqual(element.childNodesCount, 3); - XCTAssertEqual(element.firstChiledNode, comment); - XCTAssertEqual(element.lastChildNode, secondElement); + XCTAssertEqual(element.firstChild, comment); + XCTAssertEqual(element.lastChild, secondElement); } - (void)testPrependNode @@ -73,7 +73,7 @@ [element prependNode:comment]; XCTAssertEqual(element.childNodesCount, 2); - XCTAssertEqual(element.firstChiledNode, comment); + XCTAssertEqual(element.firstChild, comment); HTMLElement *firstElement = [HTMLElement new]; HTMLElement *secondElement = [HTMLElement new]; @@ -82,8 +82,8 @@ [element prependNodes:nodes]; XCTAssertEqual(element.childNodesCount, 4); - XCTAssertEqual(element.firstChiledNode, firstElement); - XCTAssertEqual(element.lastChildNode, text); + XCTAssertEqual(element.firstChild, firstElement); + XCTAssertEqual(element.lastChild, text); } - (void)testAppendDocumentFragment @@ -104,10 +104,10 @@ XCTAssertEqualObjects(firstChild.parentNode, element); XCTAssertEqualObjects(secondChild.parentNode, element); - XCTAssertEqualObjects(element.firstChiledNode, comment); - XCTAssertEqualObjects(element.firstChiledNode.nextSibling, firstChild); - XCTAssertEqualObjects(element.lastChildNode.previousSibling, firstChild); - XCTAssertEqualObjects(element.lastChildNode, secondChild); + XCTAssertEqualObjects(element.firstChild, comment); + XCTAssertEqualObjects(element.firstChild.nextSibling, firstChild); + XCTAssertEqualObjects(element.lastChild.previousSibling, firstChild); + XCTAssertEqualObjects(element.lastChild, secondChild); } - (void)testParentNode @@ -170,20 +170,20 @@ HTMLNode *firstChild = [[HTMLNode alloc] initWithName:@"first" type:HTMLNodeElement]; [node appendNode:firstChild]; - XCTAssertEqualObjects(node.firstChiledNode, firstChild); - XCTAssertEqualObjects(node.lastChildNode, firstChild); + XCTAssertEqualObjects(node.firstChild, firstChild); + XCTAssertEqualObjects(node.lastChild, firstChild); HTMLNode *secondChild = [[HTMLNode alloc] initWithName:@"second" type:HTMLNodeElement]; [node appendNode:secondChild]; - XCTAssertEqualObjects(node.firstChiledNode, firstChild); - XCTAssertEqualObjects(node.lastChildNode, secondChild); + XCTAssertEqualObjects(node.firstChild, firstChild); + XCTAssertEqualObjects(node.lastChild, secondChild); HTMLNode *thirdChild = [[HTMLNode alloc] initWithName:@"third" type:HTMLNodeElement]; [node appendNode:thirdChild]; - XCTAssertEqualObjects(node.firstChiledNode, firstChild); - XCTAssertEqualObjects(node.lastChildNode, thirdChild); + XCTAssertEqualObjects(node.firstChild, firstChild); + XCTAssertEqualObjects(node.lastChild, thirdChild); } - (void)testNextAndPreviousSiblingNodes @@ -478,7 +478,7 @@ XCTAssertEqual(element.childNodesCount, 2); - XCTAssertEqualObjects(element.firstChiledNode.asElement.tagName, @"p"); + XCTAssertEqualObjects(element.firstChild.asElement.tagName, @"p"); XCTAssertEqualObjects([element childNodeAtIndex:1].asElement.tagName, @"p"); } diff --git a/HTMLKitTests/HTMLTreeWalkerTests.m b/HTMLKitTests/HTMLTreeWalkerTests.m index 256ea32..6aeeaf2 100644 --- a/HTMLKitTests/HTMLTreeWalkerTests.m +++ b/HTMLKitTests/HTMLTreeWalkerTests.m @@ -109,7 +109,7 @@ HTMLTreeWalker *walker = [[HTMLTreeWalker alloc] initWithNode:root]; - HTMLNode *f = root.lastChildNode.firstChiledNode.childNodes[1]; + HTMLNode *f = root.lastChild.firstChild.childNodes[1]; AssertElementWithId(walker.currentNode, @"a"); XCTAssertNil(walker.parentNode); @@ -157,7 +157,7 @@ - (void)testThatTreeWalkerParentHasNoEffectCurrentNodeWhenParentIsNotUnderRoot { HTMLDocument *document = self.currentNodeDOM; - HTMLNode *first = document.body.firstChiledNode; + HTMLNode *first = document.body.firstChild; HTMLTreeWalker *walker = [[HTMLTreeWalker alloc] initWithNode:first showOptions:HTMLNodeFilterShowElement @@ -171,7 +171,7 @@ - (void)testThatSettingCurrentNodeToNodesNotUnderRootIsHandledCorrectly { HTMLDocument *document = self.currentNodeDOM; - HTMLNode *first = document.body.firstChiledNode; + HTMLNode *first = document.body.firstChild; HTMLTreeWalker *walker = [[HTMLTreeWalker alloc] initWithNode:first showOptions:HTMLNodeFilterShowElement|HTMLNodeFilterShowComment @@ -181,20 +181,20 @@ XCTAssertEqualObjects(walker.currentNode, document.documentElement); walker.currentNode = document.documentElement; - XCTAssertEqualObjects(walker.nextNode, document.documentElement.firstChiledNode); - XCTAssertEqualObjects(walker.currentNode, document.documentElement.firstChiledNode); + XCTAssertEqualObjects(walker.nextNode, document.documentElement.firstChild); + XCTAssertEqualObjects(walker.currentNode, document.documentElement.firstChild); walker.currentNode = document.documentElement; XCTAssertNil(walker.previousNode); XCTAssertEqualObjects(walker.currentNode, document.documentElement); walker.currentNode = document.documentElement; - XCTAssertEqualObjects(walker.firstChild, document.documentElement.firstChiledNode); - XCTAssertEqualObjects(walker.currentNode, document.documentElement.firstChiledNode); + XCTAssertEqualObjects(walker.firstChild, document.documentElement.firstChild); + XCTAssertEqualObjects(walker.currentNode, document.documentElement.firstChild); walker.currentNode = document.documentElement; - XCTAssertEqualObjects(walker.lastChild, document.documentElement.lastChildNode); - XCTAssertEqualObjects(walker.currentNode, document.documentElement.lastChildNode); + XCTAssertEqualObjects(walker.lastChild, document.documentElement.lastChild); + XCTAssertEqualObjects(walker.currentNode, document.documentElement.lastChild); walker.currentNode = document.documentElement; XCTAssertNil(walker.nextSibling);