Merge branch 'release/2.0.5'

This should be the fix for #12. However the issue will stay open until
tested with Xcode 8.3.1

.jazzy.yaml

@@ -1,5 +1,5 @@
 module: HTMLKit
-module_version: 2.0.0
+module_version: 2.0.5
 author: Iskandar Abudiab 
 author_url: https://twitter.com/iabudiab
 github_url: https://github.com/iabudiab/HTMLKit

CHANGELOG.md

@@ -1,5 +1,63 @@
 # Change Log
 
+## [2.0.5](https://github.com/iabudiab/HTMLKit/releases/tag/2.0.5) 
+
+Released on 2017.04.19
+
+### Fixed
+- Xcode 8.3 issue with modulemaps
+	- Temporary workaround (renamed modulemap file)
+- Memory Leaks in `CSSInputStream`
+
+### Added
+- Minor memory consumption improvements
+	- Collections for child nodes or attributes of HTML Nodes or Elements are allocated lazily
+	- Underyling data string of `CharacterData` is allocated on first access
+	- Autorelease pool for the main `HTMLTokenizer` loop
+
+
+## [2.0.4](https://github.com/iabudiab/HTMLKit/releases/tag/2.0.4) 
+
+Released on 2017.04.2
+
+### Fixed
+- Testing with Swift 3.1
+	- Fixed by @tali in PR #8
+
+### Deprecated
+- `HTMLRange` initializers with typo
+	- `initWithDowcument:startContainer:startOffset:endContainer:endOffset:`
+
+
+## [2.0.3](https://github.com/iabudiab/HTMLKit/releases/tag/2.0.3) 
+
+Released on 2017.03.6
+
+### Fixed
+- Compilation for Swift 3.1
+	- Fixed by @tali in PR #6
+
+
+## [2.0.2](https://github.com/iabudiab/HTMLKit/releases/tag/2.0.2) 
+
+Released on 2017.02.26
+
+### Fixed
+- Retain cycles in `HTMLNodeIterator` (issue #4)
+- Retain cycles in `HTMLRange` (issue #5)
+- The layout of `HTMLKit` tests module for Swift Package Manager
+
+
+## [2.0.1](https://github.com/iabudiab/HTMLKit/releases/tag/2.0.1) 
+
+Released on 2017.02.20
+
+### Hotifx
+
+- Set `INSTALL_PATH` and `DYLIB_INSTALL_NAME_BASE` to `@rpath` for macOS target
+	- This fixes embedding `HTMLKit` in a Cocoa application
+
+
 ## [2.0.0](https://github.com/iabudiab/HTMLKit/releases/tag/2.0.0) 
 
 Released on 2017.02.11

HTMLKit.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name               = "HTMLKit"
-  s.version            = "2.0.0"
+  s.version            = "2.0.5"
   s.summary            = "HTMLKit, an Objective-C framework for your everyday HTML needs."
   s.license            = "MIT"
   s.homepage           = "https://github.com/iabudiab/HTMLKit"

HTMLKit.xcodeproj/project.pbxproj

@@ -35,7 +35,6 @@
 		624AB31B1B050A4D00F3830D /* CSSAttributeSelectorTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 624AB3191B050A4D00F3830D /* CSSAttributeSelectorTests.m */; };
 		624AC90219FBF9ED00BD3C4A /* HTMLKitTokenizerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 624AC90019FBF9ED00BD3C4A /* HTMLKitTokenizerTests.m */; };
 		624AC90519FBFE9A00BD3C4A /* html5lib-tests in Resources */ = {isa = PBXBuildFile; fileRef = 624AC90419FBFE8A00BD3C4A /* html5lib-tests */; };
-		624AC90F19FC702E00BD3C4A /* HTML Standard.html in Resources */ = {isa = PBXBuildFile; fileRef = 624AC90D19FC702E00BD3C4A /* HTML Standard.html */; };
 		624B9FB31AE0313300646C4C /* HTMLStringCategoryTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 624B9FB11AE0313300646C4C /* HTMLStringCategoryTests.m */; };
 		624B9FB61AE0391400646C4C /* HTMLOrderedDictionaryTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 624B9FB41AE0391400646C4C /* HTMLOrderedDictionaryTests.m */; };
 		624C777A1DE9D05E00DD6DFA /* HTMLCharacterData.h in Headers */ = {isa = PBXBuildFile; fileRef = 624C77781DE9D05E00DD6DFA /* HTMLCharacterData.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -247,7 +246,6 @@
 		62857D431D39A34B008DC254 /* HTMLKitTestObserver.m in Sources */ = {isa = PBXBuildFile; fileRef = 625EE4561CBAA41D00F2CC8E /* HTMLKitTestObserver.m */; };
 		62857D441D39A34D008DC254 /* HTMLKitTestUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 625EE45A1CBB171300F2CC8E /* HTMLKitTestUtil.m */; };
 		62857D451D39A353008DC254 /* css-tests in Resources */ = {isa = PBXBuildFile; fileRef = 62132E5B1C021FF200084175 /* css-tests */; };
-		62857D461D39A3D7008DC254 /* HTML Standard.html in Resources */ = {isa = PBXBuildFile; fileRef = 624AC90D19FC702E00BD3C4A /* HTML Standard.html */; };
 		62857D471D39A3E4008DC254 /* html5lib-tests in Resources */ = {isa = PBXBuildFile; fileRef = 624AC90419FBFE8A00BD3C4A /* html5lib-tests */; };
 		62857D491D39A3F4008DC254 /* HTMLKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 625A14BC19C7829400AD0C32 /* HTMLKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		62857D4A1D39A3F4008DC254 /* HTMLKitErrorDomain.h in Headers */ = {isa = PBXBuildFile; fileRef = 626652F81C03D30F00C3F121 /* HTMLKitErrorDomain.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -320,6 +318,9 @@
 		62E0BA971E25456700E4D193 /* HTMLCharacterDataTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 62E0BA961E25456700E4D193 /* HTMLCharacterDataTests.m */; };
 		62E0BA981E25456700E4D193 /* HTMLCharacterDataTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 62E0BA961E25456700E4D193 /* HTMLCharacterDataTests.m */; };
 		62E0BA991E25456700E4D193 /* HTMLCharacterDataTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 62E0BA961E25456700E4D193 /* HTMLCharacterDataTests.m */; };
+		62E1A3B51E610E5300C41C3B /* Fixtures in Resources */ = {isa = PBXBuildFile; fileRef = 62E1A3B41E610E5300C41C3B /* Fixtures */; };
+		62E1A3B61E610E5300C41C3B /* Fixtures in Resources */ = {isa = PBXBuildFile; fileRef = 62E1A3B41E610E5300C41C3B /* Fixtures */; };
+		62E1A3B71E610E5300C41C3B /* Fixtures in Resources */ = {isa = PBXBuildFile; fileRef = 62E1A3B41E610E5300C41C3B /* Fixtures */; };
 		62EC0A851E158BD80007786B /* HTMLRangeTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 62EC0A841E158BD80007786B /* HTMLRangeTests.m */; };
 		62EC0A861E158BD80007786B /* HTMLRangeTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 62EC0A841E158BD80007786B /* HTMLRangeTests.m */; };
 		62EC0A871E158BD80007786B /* HTMLRangeTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 62EC0A841E158BD80007786B /* HTMLRangeTests.m */; };
@@ -545,7 +546,6 @@
 		62ECBFDB1C0B6E2E00AF847B /* CSSNThExpressionSelectorTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 62F6586F1BD83C8E0045F137 /* CSSNThExpressionSelectorTests.m */; };
 		62ECBFDC1C0B6E2E00AF847B /* CSSCombinatorSelectorTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 621FBE5C1BDAD90200BC9555 /* CSSCombinatorSelectorTests.m */; };
 		62ECBFDD1C0B6E4400AF847B /* css-tests in Resources */ = {isa = PBXBuildFile; fileRef = 62132E5B1C021FF200084175 /* css-tests */; };
-		62ECBFDE1C0B6E4400AF847B /* HTML Standard.html in Resources */ = {isa = PBXBuildFile; fileRef = 624AC90D19FC702E00BD3C4A /* HTML Standard.html */; };
 		62ECBFDF1C0B6E4400AF847B /* html5lib-tests in Resources */ = {isa = PBXBuildFile; fileRef = 624AC90419FBFE8A00BD3C4A /* html5lib-tests */; };
 		62F658711BD83C8E0045F137 /* CSSNThExpressionSelectorTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 62F6586F1BD83C8E0045F137 /* CSSNThExpressionSelectorTests.m */; };
 		62F7E5A21DEB63F900DEF09B /* HTMLRange+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 62F7E5A01DEB63F900DEF09B /* HTMLRange+Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -585,14 +585,14 @@
 		620C877A1BD44CBE00FB3EEE /* CSSCompoundSelector.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSSCompoundSelector.m; sourceTree = "<group>"; };
 		620EE9471BC46F2A0028ED34 /* CSSPseudoClassSelector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CSSPseudoClassSelector.h; path = include/CSSPseudoClassSelector.h; sourceTree = "<group>"; };
 		620EE9481BC46F2A0028ED34 /* CSSPseudoClassSelector.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSSPseudoClassSelector.m; sourceTree = "<group>"; };
-		62132E571C01F83200084175 /* CSSSelectorTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSSelectorTest.h; sourceTree = "<group>"; };
-		62132E581C01F83200084175 /* CSSSelectorTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSSSelectorTest.m; sourceTree = "<group>"; };
+		62132E571C01F83200084175 /* CSSSelectorTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CSSSelectorTest.h; path = HTMLKitTests/CSSSelectorTest.h; sourceTree = "<group>"; };
+		62132E581C01F83200084175 /* CSSSelectorTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CSSSelectorTest.m; path = HTMLKitTests/CSSSelectorTest.m; sourceTree = "<group>"; };
 		62132E5B1C021FF200084175 /* css-tests */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "css-tests"; sourceTree = "<group>"; };
-		6216ACFC1C28DCC80074CAB4 /* CSSExtensionSelectorsParsingTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSSExtensionSelectorsParsingTests.m; sourceTree = "<group>"; };
+		6216ACFC1C28DCC80074CAB4 /* CSSExtensionSelectorsParsingTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CSSExtensionSelectorsParsingTests.m; path = HTMLKitTests/CSSExtensionSelectorsParsingTests.m; sourceTree = "<group>"; };
 		621CC48F1DEA704000D1992A /* HTMLDocument+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "HTMLDocument+Private.h"; path = "include/HTMLDocument+Private.h"; sourceTree = "<group>"; };
 		621CC4A31DEA721A00D1992A /* HTMLParser+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "HTMLParser+Private.h"; path = "include/HTMLParser+Private.h"; sourceTree = "<group>"; };
-		621FBE591BDAD68700BC9555 /* CSSSelectorParserTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSSSelectorParserTests.m; sourceTree = "<group>"; };
-		621FBE5C1BDAD90200BC9555 /* CSSCombinatorSelectorTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSSCombinatorSelectorTests.m; sourceTree = "<group>"; };
+		621FBE591BDAD68700BC9555 /* CSSSelectorParserTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CSSSelectorParserTests.m; path = HTMLKitTests/CSSSelectorParserTests.m; sourceTree = "<group>"; };
+		621FBE5C1BDAD90200BC9555 /* CSSCombinatorSelectorTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CSSCombinatorSelectorTests.m; path = HTMLKitTests/CSSCombinatorSelectorTests.m; sourceTree = "<group>"; };
 		6223211D1A969B9300BACED5 /* HTMLElementTypes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = HTMLElementTypes.h; path = include/HTMLElementTypes.h; sourceTree = "<group>"; };
 		622BF57F1BBF2FD700363583 /* CSSSelectorParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CSSSelectorParser.h; path = include/CSSSelectorParser.h; sourceTree = "<group>"; };
 		622BF5801BBF2FD700363583 /* CSSSelectorParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSSSelectorParser.m; sourceTree = "<group>"; };
@@ -616,7 +616,7 @@
 		62362A3F1A9FDE8A00301989 /* HTMLDOM.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = HTMLDOM.h; path = include/HTMLDOM.h; sourceTree = "<group>"; };
 		62363C3B1ABE428200DAB4C6 /* HTMLListOfActiveFormattingElements.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HTMLListOfActiveFormattingElements.h; path = include/HTMLListOfActiveFormattingElements.h; sourceTree = "<group>"; };
 		62363C3C1ABE428200DAB4C6 /* HTMLListOfActiveFormattingElements.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLListOfActiveFormattingElements.m; sourceTree = "<group>"; };
-		6236738D1AC0CE2500FF89B3 /* HTMLKitTokenizerPerformance.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLKitTokenizerPerformance.m; sourceTree = "<group>"; };
+		6236738D1AC0CE2500FF89B3 /* HTMLKitTokenizerPerformance.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HTMLKitTokenizerPerformance.m; path = HTMLKitTests/HTMLKitTokenizerPerformance.m; sourceTree = "<group>"; };
 		623719431AA12EE8002E03C8 /* HTMLQuirksMode.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = HTMLQuirksMode.h; path = include/HTMLQuirksMode.h; sourceTree = "<group>"; };
 		6238039D1AB63A8C008A53D0 /* HTMLEOFToken.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HTMLEOFToken.h; path = include/HTMLEOFToken.h; sourceTree = "<group>"; };
 		6238039E1AB63A8C008A53D0 /* HTMLEOFToken.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLEOFToken.m; sourceTree = "<group>"; };
@@ -628,11 +628,11 @@
 		6238579A1A9E8934003A45D9 /* HTMLComment.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLComment.m; sourceTree = "<group>"; };
 		6238C9831AB8D6330006512E /* HTMLKitDOMExceptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HTMLKitDOMExceptions.h; path = include/HTMLKitDOMExceptions.h; sourceTree = "<group>"; };
 		6238C9841AB8D6330006512E /* HTMLKitDOMExceptions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLKitDOMExceptions.m; sourceTree = "<group>"; };
-		623916C61AC7209E0066B4FE /* HTMLNodeIteratorTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLNodeIteratorTests.m; sourceTree = "<group>"; };
-		623975591AC362CA007E26F1 /* HTMLKitTreeConstructionTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLKitTreeConstructionTests.m; sourceTree = "<group>"; };
-		6239755C1AC364BB007E26F1 /* HTML5LibTreeConstructionTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTML5LibTreeConstructionTest.h; sourceTree = "<group>"; };
-		6239755D1AC364BB007E26F1 /* HTML5LibTreeConstructionTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTML5LibTreeConstructionTest.m; sourceTree = "<group>"; };
-		623CAF9C1AD88BEA00E34C32 /* HTMLKitParserPerformance.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLKitParserPerformance.m; sourceTree = "<group>"; };
+		623916C61AC7209E0066B4FE /* HTMLNodeIteratorTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HTMLNodeIteratorTests.m; path = HTMLKitTests/HTMLNodeIteratorTests.m; sourceTree = "<group>"; };
+		623975591AC362CA007E26F1 /* HTMLKitTreeConstructionTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HTMLKitTreeConstructionTests.m; path = HTMLKitTests/HTMLKitTreeConstructionTests.m; sourceTree = "<group>"; };
+		6239755C1AC364BB007E26F1 /* HTML5LibTreeConstructionTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HTML5LibTreeConstructionTest.h; path = HTMLKitTests/HTML5LibTreeConstructionTest.h; sourceTree = "<group>"; };
+		6239755D1AC364BB007E26F1 /* HTML5LibTreeConstructionTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HTML5LibTreeConstructionTest.m; path = HTMLKitTests/HTML5LibTreeConstructionTest.m; sourceTree = "<group>"; };
+		623CAF9C1AD88BEA00E34C32 /* HTMLKitParserPerformance.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HTMLKitParserPerformance.m; path = HTMLKitTests/HTMLKitParserPerformance.m; sourceTree = "<group>"; };
 		624493A419CCC54100BCDDF4 /* HTMLTokenizer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HTMLTokenizer.h; path = include/HTMLTokenizer.h; sourceTree = "<group>"; };
 		624493A519CCC54100BCDDF4 /* HTMLTokenizer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLTokenizer.m; sourceTree = "<group>"; };
 		624493A919CCE84A00BCDDF4 /* HTMLTokenizerStates.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = HTMLTokenizerStates.h; path = include/HTMLTokenizerStates.h; sourceTree = "<group>"; };
@@ -640,7 +640,7 @@
 		624493AB19CD0CBE00BCDDF4 /* HTMLToken.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLToken.m; sourceTree = "<group>"; };
 		624717161B22333200C11912 /* HTMLNodeTraversal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HTMLNodeTraversal.h; path = include/HTMLNodeTraversal.h; sourceTree = "<group>"; };
 		624717171B22333200C11912 /* HTMLNodeTraversal.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLNodeTraversal.m; sourceTree = "<group>"; };
-		6247171B1B2240B800C11912 /* HTMLTreeWalkerTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLTreeWalkerTests.m; sourceTree = "<group>"; };
+		6247171B1B2240B800C11912 /* HTMLTreeWalkerTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HTMLTreeWalkerTests.m; path = HTMLKitTests/HTMLTreeWalkerTests.m; sourceTree = "<group>"; };
 		624717B71B21FE5400B38302 /* HTMLNodeFilter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLNodeFilter.m; sourceTree = "<group>"; };
 		624717BA1B22009200B38302 /* HTMLTreeWalker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HTMLTreeWalker.h; path = include/HTMLTreeWalker.h; sourceTree = "<group>"; };
 		624717BB1B22009200B38302 /* HTMLTreeWalker.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLTreeWalker.m; sourceTree = "<group>"; };
@@ -648,12 +648,11 @@
 		6247A9421B152F4F00CCF25C /* HTMLNodeIterator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLNodeIterator.m; sourceTree = "<group>"; };
 		6247A9461B152F8C00CCF25C /* HTMLNodeFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HTMLNodeFilter.h; path = include/HTMLNodeFilter.h; sourceTree = "<group>"; };
 		624AB3151B04EA4200F3830D /* CSSSelectors.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = CSSSelectors.h; path = include/CSSSelectors.h; sourceTree = "<group>"; };
-		624AB3161B0508AE00F3830D /* CSSTypeSelectorTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSSTypeSelectorTests.m; sourceTree = "<group>"; };
-		624AB3191B050A4D00F3830D /* CSSAttributeSelectorTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSSAttributeSelectorTests.m; sourceTree = "<group>"; };
+		624AB3161B0508AE00F3830D /* CSSTypeSelectorTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CSSTypeSelectorTests.m; path = HTMLKitTests/CSSTypeSelectorTests.m; sourceTree = "<group>"; };
+		624AB3191B050A4D00F3830D /* CSSAttributeSelectorTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CSSAttributeSelectorTests.m; path = HTMLKitTests/CSSAttributeSelectorTests.m; sourceTree = "<group>"; };
 		624AC8FE19FBF4F700BD3C4A /* HTMLTokens.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = HTMLTokens.h; path = include/HTMLTokens.h; sourceTree = "<group>"; };
-		624AC90019FBF9ED00BD3C4A /* HTMLKitTokenizerTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLKitTokenizerTests.m; sourceTree = "<group>"; };
+		624AC90019FBF9ED00BD3C4A /* HTMLKitTokenizerTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HTMLKitTokenizerTests.m; path = HTMLKitTests/HTMLKitTokenizerTests.m; sourceTree = "<group>"; };
 		624AC90419FBFE8A00BD3C4A /* html5lib-tests */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "html5lib-tests"; sourceTree = "<group>"; };
-		624AC90D19FC702E00BD3C4A /* HTML Standard.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "HTML Standard.html"; sourceTree = "<group>"; };
 		624B28B61B03DA820048D328 /* CSSTypeSelector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CSSTypeSelector.h; path = include/CSSTypeSelector.h; sourceTree = "<group>"; };
 		624B28B71B03DA820048D328 /* CSSTypeSelector.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSSTypeSelector.m; sourceTree = "<group>"; };
 		624B28BD1B0413200048D328 /* CSSAttributeSelector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CSSAttributeSelector.h; path = include/CSSAttributeSelector.h; sourceTree = "<group>"; };
@@ -663,14 +662,14 @@
 		624B371C1B24E9BA0010BDDF /* CSSInputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CSSInputStream.h; path = include/CSSInputStream.h; sourceTree = "<group>"; };
 		624B371D1B24E9BA0010BDDF /* CSSInputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSSInputStream.m; sourceTree = "<group>"; };
 		624B37211B250BB50010BDDF /* CSSCodePoints.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = CSSCodePoints.h; path = include/CSSCodePoints.h; sourceTree = "<group>"; };
-		624B9FB11AE0313300646C4C /* HTMLStringCategoryTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLStringCategoryTests.m; sourceTree = "<group>"; };
-		624B9FB41AE0391400646C4C /* HTMLOrderedDictionaryTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLOrderedDictionaryTests.m; sourceTree = "<group>"; };
+		624B9FB11AE0313300646C4C /* HTMLStringCategoryTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HTMLStringCategoryTests.m; path = HTMLKitTests/HTMLStringCategoryTests.m; sourceTree = "<group>"; };
+		624B9FB41AE0391400646C4C /* HTMLOrderedDictionaryTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HTMLOrderedDictionaryTests.m; path = HTMLKitTests/HTMLOrderedDictionaryTests.m; sourceTree = "<group>"; };
 		624C77781DE9D05E00DD6DFA /* HTMLCharacterData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HTMLCharacterData.h; path = include/HTMLCharacterData.h; sourceTree = "<group>"; };
 		624C77791DE9D05E00DD6DFA /* HTMLCharacterData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLCharacterData.m; sourceTree = "<group>"; };
-		624FC3791AE591D80015DDF9 /* HTMLNodesTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLNodesTests.m; sourceTree = "<group>"; };
+		624FC3791AE591D80015DDF9 /* HTMLNodesTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HTMLNodesTests.m; path = HTMLKitTests/HTMLNodesTests.m; sourceTree = "<group>"; };
 		62567F4E1C0CB5750025D458 /* HTMLDOMTokenList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HTMLDOMTokenList.h; path = include/HTMLDOMTokenList.h; sourceTree = "<group>"; };
 		62567F4F1C0CB5750025D458 /* HTMLDOMTokenList.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLDOMTokenList.m; sourceTree = "<group>"; };
-		62567F551C0CC3AE0025D458 /* HTMLDOMTokenListTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLDOMTokenListTests.m; sourceTree = "<group>"; };
+		62567F551C0CC3AE0025D458 /* HTMLDOMTokenListTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HTMLDOMTokenListTests.m; path = HTMLKitTests/HTMLDOMTokenListTests.m; sourceTree = "<group>"; };
 		625A14AC19C7829400AD0C32 /* HTMLKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = HTMLKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		625A14AF19C7829400AD0C32 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		625A14B219C7829400AD0C32 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
@@ -680,15 +679,14 @@
 		625A14BC19C7829400AD0C32 /* HTMLKit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = HTMLKit.h; path = include/HTMLKit.h; sourceTree = "<group>"; };
 		625A14C319C7829400AD0C32 /* HTMLKitTests-macOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "HTMLKitTests-macOS.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
 		625A14C419C7829400AD0C32 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
-		625A14CC19C7829400AD0C32 /* HTMLKitTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "HTMLKitTests-Info.plist"; sourceTree = "<group>"; };
 		625A14DF19C7834100AD0C32 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		625A150619C78ABA00AD0C32 /* HTMLInputStreamReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HTMLInputStreamReader.h; path = include/HTMLInputStreamReader.h; sourceTree = "<group>"; };
 		625A150719C78ABA00AD0C32 /* HTMLInputStreamReader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLInputStreamReader.m; sourceTree = "<group>"; };
 		625D0F011C2717DE00D7BEB0 /* HTMLNode+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "HTMLNode+Private.h"; path = "include/HTMLNode+Private.h"; sourceTree = "<group>"; };
-		625EE4551CBAA41D00F2CC8E /* HTMLKitTestObserver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLKitTestObserver.h; sourceTree = "<group>"; };
-		625EE4561CBAA41D00F2CC8E /* HTMLKitTestObserver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLKitTestObserver.m; sourceTree = "<group>"; };
-		625EE4591CBB171300F2CC8E /* HTMLKitTestUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLKitTestUtil.h; sourceTree = "<group>"; };
-		625EE45A1CBB171300F2CC8E /* HTMLKitTestUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLKitTestUtil.m; sourceTree = "<group>"; };
+		625EE4551CBAA41D00F2CC8E /* HTMLKitTestObserver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HTMLKitTestObserver.h; path = HTMLKitTests/HTMLKitTestObserver.h; sourceTree = "<group>"; };
+		625EE4561CBAA41D00F2CC8E /* HTMLKitTestObserver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HTMLKitTestObserver.m; path = HTMLKitTests/HTMLKitTestObserver.m; sourceTree = "<group>"; };
+		625EE4591CBB171300F2CC8E /* HTMLKitTestUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HTMLKitTestUtil.h; path = HTMLKitTests/HTMLKitTestUtil.h; sourceTree = "<group>"; };
+		625EE45A1CBB171300F2CC8E /* HTMLKitTestUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HTMLKitTestUtil.m; path = HTMLKitTests/HTMLKitTestUtil.m; sourceTree = "<group>"; };
 		626652F81C03D30F00C3F121 /* HTMLKitErrorDomain.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = HTMLKitErrorDomain.h; path = include/HTMLKitErrorDomain.h; sourceTree = "<group>"; };
 		626679CD1DEA3DAF004353E7 /* HTMLCharacterData+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "HTMLCharacterData+Private.h"; path = "include/HTMLCharacterData+Private.h"; sourceTree = "<group>"; };
 		626BE1E01DF3819500C49514 /* HTMLDOMUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HTMLDOMUtils.h; path = include/HTMLDOMUtils.h; sourceTree = "<group>"; };
@@ -699,7 +697,7 @@
 		62857C4E1D398642008DC254 /* HTMLKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = HTMLKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		62857CEA1D39A262008DC254 /* HTMLKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = HTMLKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		62857CF31D39A262008DC254 /* HTMLKit-tvOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "HTMLKit-tvOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
-		628AF62E1BC99A6C00496128 /* CSSNthExpressionsParserTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSSNthExpressionsParserTests.m; sourceTree = "<group>"; };
+		628AF62E1BC99A6C00496128 /* CSSNthExpressionsParserTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CSSNthExpressionsParserTests.m; path = HTMLKitTests/CSSNthExpressionsParserTests.m; sourceTree = "<group>"; };
 		628AF6311BC9A63D00496128 /* CSSNthExpressionSelector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CSSNthExpressionSelector.h; path = include/CSSNthExpressionSelector.h; sourceTree = "<group>"; };
 		628AF6321BC9A63D00496128 /* CSSNthExpressionSelector.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSSNthExpressionSelector.m; sourceTree = "<group>"; };
 		628AF63C1BC9D6FB00496128 /* CSSStructuralPseudoSelectors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CSSStructuralPseudoSelectors.h; path = include/CSSStructuralPseudoSelectors.h; sourceTree = "<group>"; };
@@ -717,21 +715,22 @@
 		62AE594319F992F30043F069 /* HTMLCommentToken.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLCommentToken.m; sourceTree = "<group>"; };
 		62AE594719F9948A0043F069 /* HTMLCharacterToken.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HTMLCharacterToken.h; path = include/HTMLCharacterToken.h; sourceTree = "<group>"; };
 		62AE594819F9948A0043F069 /* HTMLCharacterToken.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLCharacterToken.m; sourceTree = "<group>"; };
-		62D8345719FB1AC4009205A9 /* HTML5LibTokenizerTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTML5LibTokenizerTest.h; sourceTree = "<group>"; };
-		62D8345819FB1AC4009205A9 /* HTML5LibTokenizerTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTML5LibTokenizerTest.m; sourceTree = "<group>"; };
+		62D8345719FB1AC4009205A9 /* HTML5LibTokenizerTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HTML5LibTokenizerTest.h; path = HTMLKitTests/HTML5LibTokenizerTest.h; sourceTree = "<group>"; };
+		62D8345819FB1AC4009205A9 /* HTML5LibTokenizerTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HTML5LibTokenizerTest.m; path = HTMLKitTests/HTML5LibTokenizerTest.m; sourceTree = "<group>"; };
 		62D91C211DE218A500BEFADE /* HTMLRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HTMLRange.h; path = include/HTMLRange.h; sourceTree = "<group>"; };
 		62D91C221DE218A500BEFADE /* HTMLRange.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLRange.m; sourceTree = "<group>"; };
-		62E0BA961E25456700E4D193 /* HTMLCharacterDataTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLCharacterDataTests.m; sourceTree = "<group>"; };
+		62E0BA961E25456700E4D193 /* HTMLCharacterDataTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HTMLCharacterDataTests.m; path = HTMLKitTests/HTMLCharacterDataTests.m; sourceTree = "<group>"; };
+		62E1A3B41E610E5300C41C3B /* Fixtures */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Fixtures; sourceTree = "<group>"; };
 		62E7CAAE19CDFFB500465A83 /* HTMLTokenizerCharacters.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = HTMLTokenizerCharacters.h; path = include/HTMLTokenizerCharacters.h; sourceTree = "<group>"; };
-		62EC0A841E158BD80007786B /* HTMLRangeTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLRangeTests.m; sourceTree = "<group>"; };
-		62EC7AE51AEEAC6F0015D3BE /* HTMLMutationAlgorithmsTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLMutationAlgorithmsTests.m; sourceTree = "<group>"; };
+		62EC0A841E158BD80007786B /* HTMLRangeTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HTMLRangeTests.m; path = HTMLKitTests/HTMLRangeTests.m; sourceTree = "<group>"; };
+		62EC7AE51AEEAC6F0015D3BE /* HTMLMutationAlgorithmsTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HTMLMutationAlgorithmsTests.m; path = HTMLKitTests/HTMLMutationAlgorithmsTests.m; sourceTree = "<group>"; };
 		62ECBF4D1C0B6C7600AF847B /* HTMLKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = HTMLKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		62ECBF561C0B6C7600AF847B /* HTMLKitTests-iOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "HTMLKitTests-iOS.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
 		62F31FDB19E9DCCF007F0657 /* HTMLTokenizerEntities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HTMLTokenizerEntities.h; path = include/HTMLTokenizerEntities.h; sourceTree = "<group>"; };
 		62F31FDC19E9DCCF007F0657 /* HTMLTokenizerEntities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLTokenizerEntities.m; sourceTree = "<group>"; };
 		62F501631BC9576B0069F47B /* CSSNthExpressionParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CSSNthExpressionParser.h; path = include/CSSNthExpressionParser.h; sourceTree = "<group>"; };
 		62F501641BC9576B0069F47B /* CSSNthExpressionParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSSNthExpressionParser.m; sourceTree = "<group>"; };
-		62F6586F1BD83C8E0045F137 /* CSSNThExpressionSelectorTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSSNThExpressionSelectorTests.m; sourceTree = "<group>"; };
+		62F6586F1BD83C8E0045F137 /* CSSNThExpressionSelectorTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CSSNThExpressionSelectorTests.m; path = HTMLKitTests/CSSNThExpressionSelectorTests.m; sourceTree = "<group>"; };
 		62F7E5A01DEB63F900DEF09B /* HTMLRange+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "HTMLRange+Private.h"; path = "include/HTMLRange+Private.h"; sourceTree = "<group>"; };
 		62F873E919E088C90062683C /* HTMLParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HTMLParser.h; path = include/HTMLParser.h; sourceTree = "<group>"; };
 		62F873EA19E088C90062683C /* HTMLParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLParser.m; sourceTree = "<group>"; };
@@ -997,10 +996,9 @@
 		625A14CB19C7829400AD0C32 /* Supporting Files */ = {
 			isa = PBXGroup;
 			children = (
+				62E1A3B41E610E5300C41C3B /* Fixtures */,
 				62132E5B1C021FF200084175 /* css-tests */,
-				624AC90D19FC702E00BD3C4A /* HTML Standard.html */,
 				624AC90419FBFE8A00BD3C4A /* html5lib-tests */,
-				625A14CC19C7829400AD0C32 /* HTMLKitTests-Info.plist */,
 			);
 			name = "Supporting Files";
 			sourceTree = "<group>";
@@ -1637,7 +1635,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				624AC90F19FC702E00BD3C4A /* HTML Standard.html in Resources */,
+				62E1A3B51E610E5300C41C3B /* Fixtures in Resources */,
 				624AC90519FBFE9A00BD3C4A /* html5lib-tests in Resources */,
 				62132E5D1C021FF200084175 /* css-tests in Resources */,
 			);
@@ -1661,9 +1659,9 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				62E1A3B71E610E5300C41C3B /* Fixtures in Resources */,
 				62857D471D39A3E4008DC254 /* html5lib-tests in Resources */,
 				62857D451D39A353008DC254 /* css-tests in Resources */,
-				62857D461D39A3D7008DC254 /* HTML Standard.html in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1678,8 +1676,8 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				62E1A3B61E610E5300C41C3B /* Fixtures in Resources */,
 				62ECBFDD1C0B6E4400AF847B /* css-tests in Resources */,
-				62ECBFDE1C0B6E4400AF847B /* HTML Standard.html in Resources */,
 				62ECBFDF1C0B6E4400AF847B /* html5lib-tests in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -2112,6 +2110,7 @@
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				FRAMEWORK_VERSION = A;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -2119,6 +2118,7 @@
 				GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES;
 				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
 				INFOPLIST_FILE = "Sources/HTMLKit-Info.plist";
+				INSTALL_PATH = "@rpath";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				PRODUCT_BUNDLE_IDENTIFIER = de.iabudiab.HTMLKit;
 				PRODUCT_NAME = HTMLKit;
@@ -2135,6 +2135,7 @@
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				FRAMEWORK_VERSION = A;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -2142,6 +2143,7 @@
 				GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES;
 				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
 				INFOPLIST_FILE = "Sources/HTMLKit-Info.plist";
+				INSTALL_PATH = "@rpath";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				PRODUCT_BUNDLE_IDENTIFIER = de.iabudiab.HTMLKit;
 				PRODUCT_NAME = HTMLKit;
@@ -2166,7 +2168,7 @@
 					"DEBUG=1",
 					"$(inherited)",
 				);
-				INFOPLIST_FILE = "Tests/HTMLKitTests-Info.plist";
+				INFOPLIST_FILE = "Tests/HTMLKitTests/HTMLKitTests-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "de.iabudiab.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -2188,7 +2190,7 @@
 				);
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "";
-				INFOPLIST_FILE = "Tests/HTMLKitTests-Info.plist";
+				INFOPLIST_FILE = "Tests/HTMLKitTests/HTMLKitTests-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "de.iabudiab.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -2349,7 +2351,7 @@
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
-				INFOPLIST_FILE = "Tests/HTMLKitTests-Info.plist";
+				INFOPLIST_FILE = "Tests/HTMLKitTests/HTMLKitTests-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MTL_ENABLE_DEBUG_INFO = YES;
@@ -2369,7 +2371,7 @@
 				COPY_PHASE_STRIP = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
-				INFOPLIST_FILE = "Tests/HTMLKitTests-Info.plist";
+				INFOPLIST_FILE = "Tests/HTMLKitTests/HTMLKitTests-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MTL_ENABLE_DEBUG_INFO = NO;
@@ -2463,7 +2465,7 @@
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
-				INFOPLIST_FILE = "Tests/HTMLKitTests-Info.plist";
+				INFOPLIST_FILE = "Tests/HTMLKitTests/HTMLKitTests-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MTL_ENABLE_DEBUG_INFO = YES;
@@ -2483,7 +2485,7 @@
 				COPY_PHASE_STRIP = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
-				INFOPLIST_FILE = "Tests/HTMLKitTests-Info.plist";
+				INFOPLIST_FILE = "Tests/HTMLKitTests/HTMLKitTests-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MTL_ENABLE_DEBUG_INFO = NO;

Package.swift

@@ -1,5 +1,6 @@
 import PackageDescription
 
 let package = Package(
-	name: "HTMLKit"
+	name: "HTMLKit",
+	exclude: ["Tests/Fixtures", "Tests/css-tests", "Tests/html5lib-tests"]
 )

Sources/CSSInputStream.m

@@ -24,14 +24,14 @@
 
 - (NSString *)consumeIdentifier
 {
-	CFMutableStringRef value = CFStringCreateMutable(kCFAllocatorDefault, 0);
-
 	if (!isValidIdentifierStart([self inputCharacterPointAtOffset:0],
 								[self inputCharacterPointAtOffset:1],
 								[self inputCharacterPointAtOffset:2])) {
 		return nil;
 	}
 
+	CFMutableStringRef value = CFStringCreateMutable(kCFAllocatorDefault, 0);
+
 	while (YES) {
 		UTF32Char codePoint = [self consumeNextInputCharacter];
 		if (codePoint == EOF) {
@@ -47,7 +47,12 @@
 		}
 	}
 
-	return (__bridge NSString *)(CFStringGetLength(value) > 0 ? value : nil);
+	if (CFStringGetLength(value) > 0) {
+		return (__bridge_transfer NSString *)value;
+	}
+
+	CFRelease(value);
+	return nil;
 }
 
 - (NSString *)consumeStringWithEndingCodePoint:(UTF32Char)endingCodePoint
@@ -85,7 +90,12 @@
 		}
 	}
 
-	return (__bridge NSString *)(CFStringGetLength(value) > 0 ? value : nil);
+	if (CFStringGetLength(value) > 0) {
+		return (__bridge_transfer NSString *)value;
+	}
+
+	CFRelease(value);
+	return nil;
 }
 
 - (UTF32Char)consumeEscapedCodePoint
@@ -105,7 +115,7 @@
 			[self consumeNextInputCharacter];
 		}
 
-		NSScanner *scanner = [NSScanner scannerWithString:(__bridge NSString *)(hexString)];
+		NSScanner *scanner = [NSScanner scannerWithString:(__bridge_transfer NSString *)(hexString)];
 		unsigned int number;
 		[scanner scanHexInt:&number];
 

Sources/HTMLCharacterData.m

@@ -24,14 +24,25 @@
 {
 	self = [super initWithName:name type:type];
 	if (self) {
-		_data = [[NSMutableString alloc] initWithString:data ?: @""];
+		if (data) {
+			_data = [[NSMutableString alloc] initWithString:data];
+		}
 	}
 	return self;
 }
 
+- (NSString *)data
+{
+	if (_data == nil) {
+		_data = [[NSMutableString alloc] initWithString:@""];
+	}
+
+	return _data;
+}
+
 - (NSString *)textContent
 {
-	return [_data copy];
+	return [self.data copy];
 }
 
 - (void)setTextContent:(NSString *)textContent
@@ -41,7 +52,7 @@
 
 - (NSUInteger)length
 {
-	return _data.length;
+	return self.data.length;
 }
 
 #pragma mark - Data
@@ -81,7 +92,7 @@ NS_INLINE void CheckValidOffset(HTMLCharacterData *node, NSUInteger offset, NSSt
 
 	range.length = MIN(range.length, self.length - range.location);
 
-	[_data replaceCharactersInRange:range withString:data];
+	[(NSMutableString *)self.data replaceCharactersInRange:range withString:data];
 	[self.ownerDocument didRemoveCharacterDataInNode:self atOffset:range.location withLength:range.length];
 	[self.ownerDocument didAddCharacterDataToNode:self atOffset:range.location withLength:data.length];
 }

Sources/HTMLDocument.m

@@ -20,8 +20,8 @@
 @interface HTMLDocument ()
 {
 	HTMLDocument *_inertTemplateDocument;
-	NSMutableArray *_nodeIterators;
-	NSMutableArray *_ranges;
+	NSHashTable *_nodeIterators;
+	NSHashTable *_ranges;
 }
 @property (nonatomic, assign) HTMLDocumentReadyState readyState;
 @end
@@ -41,8 +41,8 @@
 	self = [super initWithName:@"#document" type:HTMLNodeDocument];
 	if (self) {
 		_readyState = HTMLDocumentLoading;
-		_nodeIterators = [NSMutableArray new];
-		_ranges = [NSMutableArray new];
+		_nodeIterators = [[NSHashTable alloc] initWithOptions:NSHashTableWeakMemory capacity:10];
+		_ranges = [[NSHashTable alloc] initWithOptions:NSHashTableWeakMemory capacity:10];
 	}
 	return self;
 }

Sources/HTMLElement.m

@@ -32,7 +32,7 @@
 
 - (instancetype)initWithTagName:(NSString *)tagName
 {
-	return [self initWithTagName:tagName attributes:@{}];
+	return [self initWithTagName:tagName attributes:nil];
 }
 
 - (instancetype)initWithTagName:(NSString *)tagName attributes:(NSDictionary *)attributes
@@ -45,8 +45,9 @@
 	self = [super initWithName:tagName type:HTMLNodeElement];
 	if (self) {
 		_tagName = [tagName copy];
-		_attributes = [HTMLOrderedDictionary new];
+		_attributes = nil;
 		if (attributes != nil) {
+			_attributes = [HTMLOrderedDictionary new];
 			[_attributes addEntriesFromDictionary:attributes];
 		}
 		_htmlNamespace = htmlNamespace;
@@ -56,24 +57,33 @@
 
 #pragma mark - Special Attributes
 
+- (NSMutableDictionary<NSString *,NSString *> *)attributes
+{
+	if (_attributes == nil) {
+		_attributes = [HTMLOrderedDictionary new];
+	}
+
+	return _attributes;
+}
+
 - (NSString *)elementId
 {
-	return _attributes[@"id"] ?: @"";
+	return self.attributes[@"id"] ?: @"";
 }
 
 - (void)setElementId:(NSString *)elementId
 {
-	_attributes[@"id"] = elementId;
+	self.attributes[@"id"] = elementId;
 }
 
 - (NSString *)className
 {
-	return _attributes[@"class"] ?: @"";
+	return self.attributes[@"class"] ?: @"";
 }
 
 - (void)setClassName:(NSString *)className
 {
-	_attributes[@"class"] = className;
+	self.attributes[@"class"] = className;
 }
 
 - (HTMLDOMTokenList *)classList
@@ -85,22 +95,22 @@
 
 - (BOOL)hasAttribute:(NSString *)name
 {
-	return _attributes[name] != nil;
+	return self.attributes[name] != nil;
 }
 
 - (NSString *)objectForKeyedSubscript:(NSString *)name;
 {
-	return _attributes[name];
+	return self.attributes[name];
 }
 
 - (void)setObject:(NSString *)value forKeyedSubscript:(NSString *)attribute
 {
-	_attributes[attribute] = value;
+	self.attributes[attribute] = value;
 }
 
 - (void)removeAttribute:(NSString *)name
 {
-	[_attributes removeObjectForKey:name];
+	[self.attributes removeObjectForKey:name];
 }
 
 - (NSString *)textContent

Sources/HTMLKit-Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.0</string>
+	<string>2.0.5</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

Sources/HTMLNode.m

@@ -36,13 +36,22 @@
 	if (self) {
 		_name = name;
 		_nodeType = type;
-		_childNodes = [NSMutableOrderedSet new];
+		_childNodes = nil;
 	}
 	return self;
 }
 
 #pragma mark - Properties
 
+- (NSOrderedSet<HTMLNode *> *)childNodes
+{
+	if (_childNodes == nil) {
+		_childNodes = [NSMutableOrderedSet new];
+	}
+
+	return _childNodes;
+}
+
 - (HTMLDocument *)ownerDocument
 {
 	if (_nodeType == HTMLNodeDocument) {
@@ -55,7 +64,9 @@
 - (void)setOwnerDocument:(HTMLDocument *)ownerDocument
 {
 	_ownerDocument = ownerDocument;
-	[self.childNodes.array makeObjectsPerformSelector:@selector(setOwnerDocument:) withObject:ownerDocument];
+	for (HTMLNode *child in self.childNodes) {
+		[child setOwnerDocument:ownerDocument];
+	}
 }
 
 - (HTMLNode *)rootNode
@@ -262,7 +273,9 @@
 		[node removeAllChildNodes];
 	}
 
-	[nodes makeObjectsPerformSelector:@selector(setParentNode:) withObject:self];
+	for (HTMLNode *node in nodes) {
+		[node setParentNode:self];
+	}
 
 	return node;
 }
@@ -322,7 +335,7 @@
 
 - (void)reparentChildNodesIntoNode:(HTMLNode *)node
 {
-	for (HTMLNode *child in self.childNodes.array) {
+	for (HTMLNode *child in self.childNodes) {
 		[node appendNode:child];
 	}
 	[(NSMutableOrderedSet *)self.childNodes removeAllObjects];
@@ -330,7 +343,9 @@
 
 - (void)removeAllChildNodes
 {
-	[self.childNodes.array makeObjectsPerformSelector:@selector(setParentNode:) withObject:nil];
+	for (HTMLNode *child in self.childNodes) {
+		[child setParentNode:nil];
+	}
 	[(NSMutableOrderedSet *)self.childNodes removeAllObjects];
 }
 

Sources/HTMLRange.m

@@ -23,14 +23,28 @@
 
 #pragma mark - Lifecycle
 
+- (instancetype)initWithDocument:(HTMLDocument *)document
+{
+	return [self initWithDocument:document startContainer:document startOffset:0 endContainer:document endOffset:0];
+}
+
 - (instancetype)initWithDowcument:(HTMLDocument *)document
 {
-	return [self initWithDowcument:document startContainer:document startOffset:0 endContainer:document endOffset:0];
+	return [self initWithDocument:document startContainer:document startOffset:0 endContainer:document endOffset:0];
 }
 
 - (instancetype)initWithDowcument:(HTMLDocument *)document
 				   startContainer:(HTMLNode *)startContainer startOffset:(NSUInteger)startOffset
 					 endContainer:(HTMLNode *)endContainer endOffset:(NSUInteger)endOffset
+{
+	return [self initWithDocument:document
+				   startContainer:startContainer startOffset:startOffset
+					 endContainer:endContainer endOffset:endOffset];
+}
+
+- (instancetype)initWithDocument:(HTMLDocument *)document
+				  startContainer:(HTMLNode *)startContainer startOffset:(NSUInteger)startOffset
+					endContainer:(HTMLNode *)endContainer endOffset:(NSUInteger)endOffset
 {
 	self = [super init];
 	if (self) {
@@ -517,7 +531,7 @@ NS_INLINE HTMLCharacterData * CloneCharachterData(HTMLNode *node, NSUInteger sta
 		HTMLNode *clone = [firstPartiallyContainedChild copy];
 		[fragment appendNode:clone];
 
-		HTMLRange *subRange = [[HTMLRange alloc] initWithDowcument:_ownerDocument
+		HTMLRange *subRange = [[HTMLRange alloc] initWithDocument:_ownerDocument
 													startContainer:_startContainer
 													   startOffset:_startOffset
 													  endContainer:firstPartiallyContainedChild
@@ -537,7 +551,7 @@ NS_INLINE HTMLCharacterData * CloneCharachterData(HTMLNode *node, NSUInteger sta
 		HTMLNode *clone = [lastPartiallyContainedChild copy];
 		[fragment appendNode:clone];
 
-		HTMLRange *subRange = [[HTMLRange alloc] initWithDowcument:_ownerDocument
+		HTMLRange *subRange = [[HTMLRange alloc] initWithDocument:_ownerDocument
 													startContainer:lastPartiallyContainedChild
 													   startOffset:0
 													  endContainer:_endContainer
@@ -580,7 +594,7 @@ NS_INLINE HTMLCharacterData * CloneCharachterData(HTMLNode *node, NSUInteger sta
 		HTMLNode *clone = [firstPartiallyContainedChild copy];
 		[fragment appendNode:clone];
 
-		HTMLRange *subRange = [[HTMLRange alloc] initWithDowcument:_ownerDocument
+		HTMLRange *subRange = [[HTMLRange alloc] initWithDocument:_ownerDocument
 													startContainer:_startContainer
 													   startOffset:_startOffset
 													  endContainer:firstPartiallyContainedChild
@@ -601,7 +615,7 @@ NS_INLINE HTMLCharacterData * CloneCharachterData(HTMLNode *node, NSUInteger sta
 		HTMLNode *clone = [lastPartiallyContainedChild copy];
 		[fragment appendNode:clone];
 
-		HTMLRange *subRange = [[HTMLRange alloc] initWithDowcument:_ownerDocument
+		HTMLRange *subRange = [[HTMLRange alloc] initWithDocument:_ownerDocument
 													startContainer:lastPartiallyContainedChild
 													   startOffset:0
 													  endContainer:_endContainer

Sources/HTMLTokenizer.m

@@ -77,14 +77,16 @@
 
 - (id)nextObject
 {
-	while (_eof == NO && _tokens.count == 0) {
-		[self read];
+	@autoreleasepool {
+		while (_eof == NO && _tokens.count == 0) {
+			[self read];
+		}
+		HTMLToken *nextToken = [_tokens firstObject];
+		if (_tokens.count > 0) {
+			[_tokens removeObjectAtIndex:0];
+		}
+		return nextToken;
 	}
-	HTMLToken *nextToken = [_tokens firstObject];
-	if (_tokens.count > 0) {
-		[_tokens removeObjectAtIndex:0];
-	}
-	return nextToken;
 }
 
 - (void)read

Sources/include/HTMLElement.h

@@ -75,7 +75,7 @@ NS_ASSUME_NONNULL_BEGIN
  @param attributes The attributes.
  @return A new HTML element.
  */
-- (instancetype)initWithTagName:(NSString *)tagName attributes:(NSDictionary<NSString *, NSString *> *)attributes;
+- (instancetype)initWithTagName:(NSString *)tagName attributes:(nullable NSDictionary<NSString *, NSString *> *)attributes;
 
 /**
  Initializes a new HTML element with the given tag name, namespace, and attributes.
@@ -85,7 +85,7 @@ NS_ASSUME_NONNULL_BEGIN
  @param attributes The attributes.
  @return A new HTML element.
  */
-- (instancetype)initWithTagName:(NSString *)tagName namespace:(HTMLNamespace)htmlNamespace attributes:(NSDictionary<NSString *, NSString *> *)attributes;
+- (instancetype)initWithTagName:(NSString *)tagName namespace:(HTMLNamespace)htmlNamespace attributes:(nullable NSDictionary<NSString *, NSString *> *)attributes;
 
 /**
  Checks whether this element has an attribute with the given name.

Sources/include/HTMLKit.modulemap

@@ -5,7 +5,7 @@ module HTMLKit {
 	export *
 
 	explicit module Private {
-		header "CSSCodePoints.h"
+		textual header "CSSCodePoints.h"
 		header "CSSInputStream.h"
 		header "HTMLCharacterToken.h"
 		header "HTMLCommentToken.h"
@@ -22,7 +22,7 @@ module HTMLKit {
 		header "HTMLTagToken.h"
 		header "HTMLToken.h"
 		header "HTMLTokenizer.h"
-		header "HTMLTokenizerCharacters.h"
+		textual header "HTMLTokenizerCharacters.h"
 		header "HTMLTokenizerEntities.h"
 		header "HTMLTokenizerStates.h"
 		header "HTMLTokens.h"

Sources/include/HTMLRange.h

@@ -81,7 +81,12 @@ typedef NS_ENUM(unsigned short, HTMLRangeComparisonMethod)
  @param document The HTML doucment for which the range will be constructed.
  @return A new HTML Range instance.
  */
-- (instancetype)initWithDowcument:(HTMLDocument *)document;
+- (instancetype)initWithDocument:(HTMLDocument *)document;
+
+/**
+ Deprecated due to typo.
+ */
+- (instancetype)initWithDowcument:(HTMLDocument *)document __attribute__((deprecated("Replaced by -initWithDocument:")));
 
 /**
  Initializes a new range instance for the given document and boundaries.
@@ -93,9 +98,17 @@ typedef NS_ENUM(unsigned short, HTMLRangeComparisonMethod)
  @param endOffset The offset of the end boundary
  @return A new HTML Range instance.
  */
+- (instancetype)initWithDocument:(HTMLDocument *)document
+				  startContainer:(HTMLNode *)startContainer startOffset:(NSUInteger)startOffset
+					endContainer:(HTMLNode *)endContainer endOffset:(NSUInteger)endOffset;
+
+/**
+ Deprecated due to typo.
+ */
 - (instancetype)initWithDowcument:(HTMLDocument *)document
 				   startContainer:(HTMLNode *)startContainer startOffset:(NSUInteger)startOffset
-					 endContainer:(HTMLNode *)endContainer endOffset:(NSUInteger)endOffset;
+					 endContainer:(HTMLNode *)endContainer endOffset:(NSUInteger)endOffset
+	__attribute__((deprecated("Replaced by -initWithDocument:startContainer:startOffset:endContainer:endOffset:")));
 
 /**
  Sets the start boundary.

Tests/HTMLKitTests/CSSSelectorParserTests.m

@@ -7,7 +7,7 @@
 //
 
 #import <XCTest/XCTest.h>
-#import <HTMLKit/HTMLKit.h>
+#import "HTMLKit.h"
 #import "CSSSelectorTest.h"
 #import "CSSSelectorParser.h"
 

Tests/HTMLKitTests/CSSSelectorTest.m

@@ -11,6 +11,7 @@
 #import "HTMLDocument.h"
 #import "HTMLElement.h"
 #import "CSSSelectors.h"
+#import "HTMLKitTestUtil.h"
 
 static NSString * const CSSTests = @"css-tests";
 
@@ -18,8 +19,7 @@ static NSString * const CSSTests = @"css-tests";
 
 + (NSArray *)loadCSSSelectorTests
 {
-	NSString *path = [[NSBundle bundleForClass:self.class] resourcePath];
-	path = [path stringByAppendingPathComponent:CSSTests];
+	NSString *path = [HTMLKitTestUtil pathForFixture:CSSTests ofType:nil inDirectory:nil];
 
 	NSMutableArray *tests = [NSMutableArray array];
 	NSArray *testFiles = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:path error:nil];

Tests/HTMLKitTests/HTML5LibTokenizerTest.m

@@ -7,23 +7,22 @@
 //
 
 #import "HTML5LibTokenizerTest.h"
+#import "HTMLOrderedDictionary.h"
 #import "HTMLTokenizerStates.h"
 #import "HTMLTokens.h"
+#import "HTMLKitTestUtil.h"
 
 static NSString * const HTML5LibTests = @"html5lib-tests";
-static NSString * const TOKENIZER = @"tokenizer";
+static NSString * const Tokenizer = @"tokenizer";
 
 @implementation HTML5LibTokenizerTest
 
 + (NSDictionary *)loadHTML5LibTokenizerTests
 {
-	NSString *path = [[NSBundle bundleForClass:self.class] resourcePath];
-	path = [path stringByAppendingPathComponent:HTML5LibTests];
-	path = [path stringByAppendingPathComponent:TOKENIZER];
-
-	NSMutableDictionary *testsMap = [NSMutableDictionary dictionary];
+	NSString *path = [HTMLKitTestUtil pathForFixture:Tokenizer ofType:nil inDirectory:HTML5LibTests];
 	NSArray *testFiles = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:path error:nil];
 
+	NSMutableDictionary *testsMap = [NSMutableDictionary dictionary];
 	for (NSString *testFile in testFiles) {
 		if (![testFile.pathExtension isEqualToString:@"test"]) {
 			continue;

Tests/HTMLKitTests/HTML5LibTreeConstructionTest.m

@@ -13,6 +13,7 @@
 #import "HTMLElement.h"
 #import "HTMLText.h"
 #import "HTMLComment.h"
+#import "HTMLKitTestUtil.h"
 
 static NSString * const HTML5LibTests = @"html5lib-tests";
 static NSString * const TreeConstruction = @"tree-construction";
@@ -21,13 +22,10 @@ static NSString * const TreeConstruction = @"tree-construction";
 
 + (NSDictionary *)loadHTML5LibTreeConstructionTests
 {
-	NSString *path = [[NSBundle bundleForClass:self.class] resourcePath];
-	path = [path stringByAppendingPathComponent:HTML5LibTests];
-	path = [path stringByAppendingPathComponent:TreeConstruction];
-
-	NSMutableDictionary *testsMap = [NSMutableDictionary dictionary];
+	NSString *path = [HTMLKitTestUtil pathForFixture:TreeConstruction ofType:nil inDirectory:HTML5LibTests];
 	NSArray *testFiles = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:path error:nil];
 
+	NSMutableDictionary *testsMap = [NSMutableDictionary dictionary];
 	for (NSString *testFile in testFiles) {
 		if (![testFile.pathExtension isEqualToString:@"dat"]) {
 			continue;

Tests/HTMLKitTests/HTMLKitParserPerformance.m

@@ -8,6 +8,7 @@
 
 #import <XCTest/XCTest.h>
 #import "HTMLParser.h"
+#import "HTMLKitTestUtil.h"
 
 @interface HTMLKitParserPerformance : XCTestCase
 
@@ -17,10 +18,9 @@
 
 #define HTMLKIT_NO_DOM_CHECKS
 
-- (void)testParserPerformance
+- (void)_testParserPerformance
 {
-	NSString *path = [[NSBundle bundleForClass:self.class] resourcePath];
-	path = [path stringByAppendingPathComponent:@"HTML Standard.html"];
+	NSString *path = [HTMLKitTestUtil pathForFixture:@"HTML Standard" ofType:@"html" inDirectory:@"Fixtures"];
 
 	NSString *string = [NSString stringWithContentsOfFile:path encoding:NSUTF8StringEncoding error:nil];
 

Tests/HTMLKitTests/HTMLKitTestUtil.h

@@ -11,5 +11,7 @@
 @interface HTMLKitTestUtil : NSObject
 
 + (NSInvocation *)addTestToClass:(Class)cls withName:(NSString *)name block:(id)block;
++ (id)ivarForInstacne:(id)instance name:(NSString *)name;
++ (NSString *)pathForFixture:(NSString *)fixture ofType:(NSString *)type inDirectory:(NSString *)directory;
 
 @end

Tests/HTMLKitTests/HTMLKitTestUtil.m

@@ -26,4 +26,29 @@
 	return invocation;
 }
 
++ (id)ivarForInstacne:(id)instance name:(NSString *)name
+{
+	Ivar ivar = class_getInstanceVariable([instance class], [name UTF8String]);
+	return object_getIvar(instance, ivar);
+}
+
++ (NSString *)pathForFixture:(NSString *)fixture ofType:(NSString *)type inDirectory:(NSString *)directory
+{
+	// Try testing bundle first
+	NSString *path = [[NSBundle bundleForClass:self.class] pathForResource:fixture ofType:type inDirectory:directory];
+	if (path) {
+		return path;
+	}
+
+	path = [[@(__FILE__) stringByDeletingLastPathComponent] stringByDeletingLastPathComponent];
+	if (directory) {
+		path = [path stringByAppendingPathComponent:directory];
+	}
+
+	NSString *resource = type ? [NSString stringWithFormat:@"%@.%@", fixture, type] : fixture;
+	path = [path stringByAppendingPathComponent:resource];
+
+	return path;
+}
+
 @end

Tests/HTMLKitTests/HTMLKitTokenizerPerformance.m

@@ -10,6 +10,7 @@
 #import "HTMLTokenizer.h"
 #import "HTMLTokenizerStates.h"
 #import "HTMLTokens.h"
+#import "HTMLKitTestUtil.h"
 
 @interface HTMLKitTokenizerPerformance : XCTestCase
 
@@ -17,10 +18,9 @@
 
 @implementation HTMLKitTokenizerPerformance
 
-- (void)testTokenizerPerformance
+- (void)_testTokenizerPerformance
 {
-	NSString *path = [[NSBundle bundleForClass:self.class] resourcePath];
-	path = [path stringByAppendingPathComponent:@"HTML Standard.html"];
+	NSString *path = [HTMLKitTestUtil pathForFixture:@"HTML Standard" ofType:@"html" inDirectory:@"Fixtures"];
 
 	NSString *string = [NSString stringWithContentsOfFile:path encoding:NSUTF8StringEncoding error:nil];
 

Tests/HTMLKitTests/HTMLNodeIteratorTests.m

@@ -8,6 +8,7 @@
 
 #import <XCTest/XCTest.h>
 #import "HTMLDOM.h"
+#import "HTMLKitTestUtil.h"
 
 @interface HTMLKitNodeIteratorTests : XCTestCase
 
@@ -565,4 +566,30 @@ static HTMLNode * (^ LastDescendant)(HTMLNode *) = ^ HTMLNode * (HTMLNode *node)
 	XCTAssertEqual(iterator.pointerBeforeReferenceNode, NO);
 }
 
+#pragma mark - Bug Fixes
+
+- (void)testBugFix_Issue_4
+{
+	HTMLDocument *document = [HTMLDocument documentWithString:@"<ul><li>1<li>2"];
+
+	NSHashTable *nodeIterators = [HTMLKitTestUtil ivarForInstacne:document name:@"_nodeIterators"];
+	XCTAssertTrue([nodeIterators isKindOfClass:[NSHashTable class]]);
+
+	// document.body uses an iterator internally
+	HTMLElement *body =	document.body;
+	XCTAssertNotNil(body);
+
+	// iterator should be deallocated and detached at this point
+	XCTAssertEqual(0, nodeIterators.count);
+
+	// iterator should be autoreleased, deallocated and detached after autoreleasepool
+	@autoreleasepool {
+		HTMLNodeIterator *iterator = [[HTMLNodeIterator alloc] initWithNode:body];
+		[iterator nextNode];
+		XCTAssertEqual(1, nodeIterators.count);
+	}
+
+	XCTAssertEqual(0, nodeIterators.count);
+}
+
 @end

Tests/HTMLKitTests/HTMLRangeTests.m

@@ -11,6 +11,7 @@
 #import "HTMLDOM.h"
 #import "HTMLNode+Private.h"
 #import "HTMLRange+Private.h"
+#import "HTMLKitTestUtil.h"
 
 #define BodyOf(doc) doc.body.innerHTML
 #define InnerHTML(str) [HTMLDocument documentWithString:str].body.innerHTML
@@ -89,7 +90,7 @@
 
 - (void)testInitRange
 {
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:_document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:_document];
 
 	XCTAssertEqualObjects(range.startContainer, _document);
 	XCTAssertEqual(range.startOffset, 0);
@@ -100,7 +101,7 @@
 
 - (void)testSetStartBoundary
 {
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:_document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:_document];
 
 	XCTAssertThrows([range setStartNode:[HTMLElement new] startOffset:0], @"Cannot set boundary to a node outside of the range's document");
 	XCTAssertThrows([range setStartNode:[HTMLDocumentType new] startOffset:0], @"DOCTYPE as range boundary is invalid");
@@ -129,7 +130,7 @@
 
 - (void)testSetEndBoundary
 {
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:_document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:_document];
 
 	XCTAssertThrows([range setEndNode:[HTMLDocumentType new] endOffset:	0], @"DOCTYPE as range boundary is invalid");
 	XCTAssertThrows([range setEndNode:_firstText endOffset:_firstText.length + 1], @"Offset is outside the boundary node");
@@ -167,7 +168,7 @@
 
 - (void)testSetStartBeforeNode
 {
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:_document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:_document];
 
 	// <h1>Title</h1><p>Hello</p><div><div>First text<!--First comment-->Second text</div><!--Second comment--></div>
 	//                  |___|
@@ -262,7 +263,7 @@
 
 - (void)testSetStartAfterNode
 {
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:_document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:_document];
 
 	// <h1>Title</h1><p>Hello</p><div><div>First text<!--First comment-->Second text</div><!--Second comment--></div>
 	//                  |___|
@@ -357,7 +358,7 @@
 
 - (void)testSetEndBeforeNode
 {
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:_document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:_document];
 
 	// <h1>Title</h1><p>Hello</p><div><div>First text<!--First comment-->Second text</div><!--Second comment--></div>
 	//                  |___|
@@ -452,7 +453,7 @@
 
 - (void)testSetEndAfterNode
 {
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:_document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:_document];
 
 	// <h1>Title</h1><p>Hello</p><div><div>First text<!--First comment-->Second text</div><!--Second comment--></div>
 	//                  |___|
@@ -547,7 +548,7 @@
 
 - (void)testIsCollapsed
 {
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:_document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:_document];
 	XCTAssertTrue(range.isCollapsed);
 
 	[range setEndNode:_title endOffset:1];
@@ -559,7 +560,7 @@
 
 - (void)testCollapseToStart
 {
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:_document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:_document];
 
 	// <h1>Title</h1><p>Hello</p><div><div>First text<!--First comment-->Second text</div><--Second comment--></div>
 	//       |______________|
@@ -578,7 +579,7 @@
 
 - (void)testCollapseToEnd
 {
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:_document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:_document];
 
 	// <h1>Title</h1><p>Hello</p><div><div>First text<!--First comment-->Second text</div><--Second comment--></div>
 	//       |______________|
@@ -597,7 +598,7 @@
 
 - (void)testSelectNode
 {
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:_document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:_document];
 
 	// <h1>Title</h1><p>Hello</p><div><div>First text<!--First comment-->Second text</div><--Second comment--></div>
 	//                                     ----------
@@ -650,7 +651,7 @@
 
 - (void)testSelectNodeContents
 {
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:_document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:_document];
 
 	// <h1>Title</h1><p>Hello</p><div><div>First text<!--First comment-->Second text</div><--Second comment--></div>
 	//                                     ----------
@@ -703,9 +704,9 @@
 
 - (void)testCompareBoundaries
 {
-	HTMLRange *range1 = [[HTMLRange alloc] initWithDowcument:_document];
+	HTMLRange *range1 = [[HTMLRange alloc] initWithDocument:_document];
 
-	HTMLRange *range2 = [[HTMLRange alloc] initWithDowcument:_document];
+	HTMLRange *range2 = [[HTMLRange alloc] initWithDocument:_document];
 
 	// <h1>Title</h1><p>Hello</p><div><div>First text<!--First comment-->Second text</div><--Second comment--></div>
 	//                                     ----------
@@ -775,7 +776,7 @@
 
 - (void)testContainmentAndComparisons
 {
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:_document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:_document];
 
 	/*********** Compare ***********/
 
@@ -849,7 +850,7 @@
 
 - (void)testIntersections
 {
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:_document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:_document];
 
 	XCTAssertFalse([range intersectsNode:[HTMLText new]]);
 	XCTAssertTrue([range intersectsNode:_document]);
@@ -881,7 +882,7 @@
 
 - (void)testThatCharacterDataMutationsUpdateRangeCorrectly
 {
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:_document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:_document];
 
 	// <h1>Title</h1><p>Hello</p><div><div>First text<!--First comment-->Second text</div><--Second comment--></div>
 	//                                     |________|
@@ -979,7 +980,7 @@
 
 - (void)testThatCharacterDataMutationsUpdateRangeCorrectly_DifferentBoundaries
 {
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:_document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:_document];
 
 	// <h1>Title</h1><p>Hello</p><div><div>First text<!--First comment-->Second text</div><--Second comment--></div>
 	//                                         |___________________________|
@@ -1093,7 +1094,7 @@
 
 - (void)testThatTextSplitUpdateRangeCorrectly_BeforeStartTextNode
 {
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:_document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:_document];
 	// <h1>Title</h1><p>Hello</p><div><div>First text<!--First comment-->Second text</div><--Second comment--></div>
 	//                                     |________|
 	[range selectNodeContents:_firstText];
@@ -1110,7 +1111,7 @@
 
 - (void)testThatTextSplitUpdateRangeCorrectly_AfterEndTextNode
 {
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:_document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:_document];
 	// <h1>Title</h1><p>Hello</p><div><div>First text<!--First comment-->Second text</div><--Second comment--></div>
 	//                                     |________|
 	[range selectNodeContents:_firstText];
@@ -1127,7 +1128,7 @@
 
 - (void)testThatTextSplitUpdateRangeCorrectly_MidleSameTextNode
 {
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:_document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:_document];
 	// <h1>Title</h1><p>Hello</p><div><div>First text<!--First comment-->Second text</div><--Second comment--></div>
 	//                                     |________|
 	[range selectNodeContents:_firstText];
@@ -1144,7 +1145,7 @@
 
 - (void)testThatTextSplitUpdateRangeCorrectly_MidleDifferentTextNodes
 {
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:_document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:_document];
 	// <h1>Title</h1><p>Hello</p><div><div>First text<!--First comment-->Second text</div><--Second comment--></div>
 	//                                      |______________________________|
 	[range setStartNode:_firstText startOffset:2];
@@ -1162,7 +1163,7 @@
 
 - (void)testThatTextSplitUpdateRangeCorrectly_BeforeStartDifferentTextNodes
 {
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:_document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:_document];
 	// <h1>Title</h1><p>Hello</p><div><div>First text<!--First comment-->Second text</div><--Second comment--></div>
 	//                                      |______________________________|
 	[range setStartNode:_firstText startOffset:6];
@@ -1180,7 +1181,7 @@
 
 - (void)testThatTextSplitUpdateRangeCorrectly_BeforeEndDifferentTextNodes
 {
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:_document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:_document];
 	// <h1>Title</h1><p>Hello</p><div><div>First text<!--First comment-->Second text</div><--Second comment--></div>
 	//                                      |_______________________________|
 	[range setStartNode:_firstText startOffset:6];
@@ -1240,7 +1241,7 @@
 - (void)testDeleteContents_SameTextNode
 {
 	HTMLDocument *document = self.editingDocument;
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:document];
 
 	HTMLNode *start = [document querySelector:@"#P1"].firstChild;
 	[range setStartNode:start startOffset:1];
@@ -1259,7 +1260,7 @@
 - (void)testDeleteContents_SameTextNode_Selected
 {
 	HTMLDocument *document = self.editingDocument;
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:document];
 
 	HTMLNode *node = [document querySelector:@"#P1"].firstChild;
 	[range selectNode:node];
@@ -1278,7 +1279,7 @@
 - (void)testDeleteContents_SameTextNode_SelectedContents
 {
 	HTMLDocument *document = self.editingDocument;
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:document];
 
 	HTMLNode *node = [document querySelector:@"#P1"].firstChild;
 	[range selectNodeContents:node];
@@ -1298,7 +1299,7 @@
 - (void)testDeleteContents_DifferentTextNodesOfSingleParent
 {
 	HTMLDocument *document = self.editingDocument;
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:document];
 
 	HTMLNode *start = [document querySelector:@"#P1"].firstChild;
 	[range setStartNode:start startOffset:3];
@@ -1317,7 +1318,7 @@
 - (void)testDeleteContents_DifferentTextNodesOfDifferentParents
 {
 	HTMLDocument *document = self.editingDocument;
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:document];
 
 	HTMLNode *start = [document querySelector:@"#P1"].firstChild;
 	[range setStartNode:start startOffset:3];
@@ -1336,7 +1337,7 @@
 - (void)testDeleteContents_DifferentTextNodesOfDifferentParents_HavingContainedNodesInBetween
 {
 	HTMLDocument *document = self.editingDocument;
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:document];
 
 	HTMLNode *start = [document querySelector:@"#P1"].firstChild;
 	[range setStartNode:start startOffset:3];
@@ -1354,7 +1355,7 @@
 - (void)testDeleteContents_SameContainerNode
 {
 	HTMLDocument *document = self.editingDocument;
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:document];
 
 	HTMLNode *start = [document querySelector:@"#P1"];
 	[range setStartNode:start startOffset:0];
@@ -1373,7 +1374,7 @@
 - (void)testDeleteContents_SameContainerNode_Selected
 {
 	HTMLDocument *document = self.editingDocument;
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:document];
 
 	HTMLNode *node = [document querySelector:@"#P1"];
 	[range selectNode:node];
@@ -1390,7 +1391,7 @@
 - (void)testDeleteContents_SameContainerNode_SelectedContents
 {
 	HTMLDocument *document = self.editingDocument;
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:document];
 
 	HTMLNode *node = [document querySelector:@"#P1"];
 	[range selectNodeContents:node];
@@ -1407,7 +1408,7 @@
 - (void)testDeleteContents_StartContainerIsCommonRoot
 {
 	HTMLDocument *document = self.editingDocument;
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:document];
 
 	HTMLNode *start = [document querySelector:@"#D1"];
 	[range setStartNode:start startOffset:0];
@@ -1426,7 +1427,7 @@
 - (void)testDeleteContents_EndContainerIsCommonRoot
 {
 	HTMLDocument *document = self.editingDocument;
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:document];
 
 	HTMLNode *start = [document querySelector:@"#P1"].firstChild;
 	[range setStartNode:start startOffset:1];
@@ -1447,7 +1448,7 @@
 - (void)testCloneContents_SameTextNode
 {
 	HTMLDocument *document = self.editingDocument;
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:document];
 
 	HTMLNode *start = [document querySelector:@"#P1"].firstChild;
 	[range setStartNode:start startOffset:1];
@@ -1463,7 +1464,7 @@
 - (void)testCloneContents_SameTextNode_Selected
 {
 	HTMLDocument *document = self.editingDocument;
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:document];
 
 	HTMLNode *node = [document querySelector:@"#P1"].firstChild;
 	[range selectNode:node];
@@ -1477,7 +1478,7 @@
 - (void)testCloneContents_SameTextNode_SelectedContents
 {
 	HTMLDocument *document = self.editingDocument;
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:document];
 
 	HTMLNode *node = [document querySelector:@"#P1"].firstChild;
 	[range selectNodeContents:node];
@@ -1491,7 +1492,7 @@
 - (void)testCloneContents_DifferentTextNodesOfSingleParent
 {
 	HTMLDocument *document = self.editingDocument;
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:document];
 
 	HTMLNode *start = [document querySelector:@"#P1"].firstChild;
 	[range setStartNode:start startOffset:3];
@@ -1505,7 +1506,7 @@
 - (void)testCloneContents_DifferentTextNodesOfDifferentParents
 {
 	HTMLDocument *document = self.editingDocument;
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:document];
 
 	HTMLNode *start = [document querySelector:@"#P1"].firstChild;
 	[range setStartNode:start startOffset:3];
@@ -1519,7 +1520,7 @@
 - (void)testCloneContents_DifferentTextNodesOfDifferentParents_HavingContainedNodesInBetween
 {
 	HTMLDocument *document = self.editingDocument;
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:document];
 
 	HTMLNode *start = [document querySelector:@"#P1"].firstChild;
 	[range setStartNode:start startOffset:3];
@@ -1535,7 +1536,7 @@
 - (void)testCloneContents_SameContainerNode
 {
 	HTMLDocument *document = self.editingDocument;
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:document];
 
 	HTMLNode *start = [document querySelector:@"#P1"];
 	[range setStartNode:start startOffset:0];
@@ -1549,7 +1550,7 @@
 - (void)testCloneContents_SameContainerNode_Selected
 {
 	HTMLDocument *document = self.editingDocument;
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:document];
 
 	HTMLNode *node = [document querySelector:@"#P1"];
 	[range selectNode:node];
@@ -1561,7 +1562,7 @@
 - (void)testCloneContents_SameContainerNode_SelectedContents
 {
 	HTMLDocument *document = self.editingDocument;
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:document];
 
 	HTMLNode *node = [document querySelector:@"#P1"];
 	[range selectNodeContents:node];
@@ -1573,7 +1574,7 @@
 - (void)testCloneContents_StartContainerIsCommonRoot
 {
 	HTMLDocument *document = self.editingDocument;
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:document];
 
 	HTMLNode *start = [document querySelector:@"#D1"];
 	[range setStartNode:start startOffset:0];
@@ -1587,7 +1588,7 @@
 - (void)testCloneContents_EndContainerIsCommonRoot
 {
 	HTMLDocument *document = self.editingDocument;
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:document];
 
 	HTMLNode *start = [document querySelector:@"#P1"].firstChild;
 	[range setStartNode:start startOffset:1];
@@ -1603,7 +1604,7 @@
 - (void)testExtractContents_SameTextNode
 {
 	HTMLDocument *document = self.editingDocument;
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:document];
 
 	HTMLNode *start = [document querySelector:@"#P1"].firstChild;
 	[range setStartNode:start startOffset:1];
@@ -1626,7 +1627,7 @@
 - (void)testExtractContents_SameTextNode_Selected
 {
 	HTMLDocument *document = self.editingDocument;
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:document];
 
 	HTMLNode *node = [document querySelector:@"#P1"].firstChild;
 	[range selectNode:node];
@@ -1649,7 +1650,7 @@
 - (void)testExtractContents_SameTextNode_SelectedContents
 {
 	HTMLDocument *document = self.editingDocument;
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:document];
 
 	HTMLNode *node = [document querySelector:@"#P1"].firstChild;
 	[range selectNodeContents:node];
@@ -1673,7 +1674,7 @@
 - (void)testExtractContents_DifferentTextNodesOfSingleParent
 {
 	HTMLDocument *document = self.editingDocument;
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:document];
 
 	HTMLNode *start = [document querySelector:@"#P1"].firstChild;
 	[range setStartNode:start startOffset:3];
@@ -1694,7 +1695,7 @@
 - (void)testExtractContents_DifferentTextNodesOfDifferentParents
 {
 	HTMLDocument *document = self.editingDocument;
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:document];
 
 	HTMLNode *start = [document querySelector:@"#P1"].firstChild;
 	[range setStartNode:start startOffset:3];
@@ -1715,7 +1716,7 @@
 - (void)testExtractContents_DifferentTextNodesOfDifferentParents_HavingContainedNodesInBetween
 {
 	HTMLDocument *document = self.editingDocument;
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:document];
 
 	HTMLNode *start = [document querySelector:@"#P1"].firstChild;
 	[range setStartNode:start startOffset:3];
@@ -1737,7 +1738,7 @@
 - (void)testExtractContents_SameContainerNode
 {
 	HTMLDocument *document = self.editingDocument;
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:document];
 
 	HTMLNode *start = [document querySelector:@"#P1"];
 	[range setStartNode:start startOffset:0];
@@ -1758,7 +1759,7 @@
 - (void)testExtractContents_SameContainerNode_Selected
 {
 	HTMLDocument *document = self.editingDocument;
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:document];
 
 	HTMLNode *node = [document querySelector:@"#P1"];
 	[range selectNode:node];
@@ -1777,7 +1778,7 @@
 - (void)testExtractContents_SameContainerNode_SelectedContents
 {
 	HTMLDocument *document = self.editingDocument;
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:document];
 
 	HTMLNode *node = [document querySelector:@"#P1"];
 	[range selectNodeContents:node];
@@ -1796,7 +1797,7 @@
 - (void)testExtractContents_StartContainerIsCommonRoot
 {
 	HTMLDocument *document = self.editingDocument;
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:document];
 
 	HTMLNode *start = [document querySelector:@"#D1"];
 	[range setStartNode:start startOffset:0];
@@ -1817,7 +1818,7 @@
 - (void)testExtractContents_EndContainerIsCommonRoot
 {
 	HTMLDocument *document = self.editingDocument;
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:document];
 
 	HTMLNode *start = [document querySelector:@"#P1"].firstChild;
 	[range setStartNode:start startOffset:1];
@@ -1840,7 +1841,7 @@
 - (void)testInsertNode_InvalidNode
 {
 	HTMLDocument *document = self.editingDocument;
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:document];
 
 	HTMLNode *start = [document querySelector:@"#P1"].firstChild;
 	[range setStartNode:start startOffset:2];
@@ -1859,7 +1860,7 @@
 - (void)testInsertNode_TextNodeStart_Begin
 {
 	HTMLDocument *document = self.editingDocument;
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:document];
 
 	HTMLNode *start = [document querySelector:@"#P1"].firstChild;
 	[range setStartNode:start startOffset:0];
@@ -1883,7 +1884,7 @@
 - (void)testInsertNode_TextNodeStart_Middle
 {
 	HTMLDocument *document = self.editingDocument;
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:document];
 
 	HTMLNode *start = [document querySelector:@"#P1"].firstChild;
 	[range setStartNode:start startOffset:2];
@@ -1907,7 +1908,7 @@
 - (void)testInsertNode_NonTextNodeStart_Begin
 {
 	HTMLDocument *document = self.editingDocument;
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:document];
 
 	HTMLNode *start = [document querySelector:@"#P1"];
 	[range setStartNode:start startOffset:0];
@@ -1931,7 +1932,7 @@
 - (void)testInsertNode_NonTextNodeStart_Middle
 {
 	HTMLDocument *document = self.editingDocument;
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:document];
 
 	HTMLNode *start = [document querySelector:@"#P1"];
 	[range setStartNode:start startOffset:2];
@@ -1955,7 +1956,7 @@
 - (void)testInsertNode_NonTextNodeStart_DifferentParents
 {
 	HTMLDocument *document = self.editingDocument;
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:document];
 
 	HTMLNode *start = [document querySelector:@"#D1"];
 	[range setStartNode:start startOffset:1];
@@ -1979,7 +1980,7 @@
 - (void)testSurroundContents_InvalidNode
 {
 	HTMLDocument *document = self.editingDocument;
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:document];
 
 	HTMLNode *start = [document querySelector:@"#P1"].firstChild;
 	[range setStartNode:start startOffset:2];
@@ -1994,7 +1995,7 @@
 - (void)testSurroundContents_PartiallySelectedAncestors
 {
 	HTMLDocument *document = self.editingDocument;
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:document];
 
 	HTMLNode *start = [document querySelector:@"#P1"].firstChild;
 	[range setStartNode:start startOffset:2];
@@ -2015,7 +2016,7 @@
 - (void)testSurroundContents_TextNodes
 {
 	HTMLDocument *document = self.editingDocument;
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:document];
 
 	HTMLNode *start = [document querySelector:@"#P1"].firstChild;
 	[range setStartNode:start startOffset:2];
@@ -2036,7 +2037,7 @@
 - (void)testSurroundContents_NonTextNodes
 {
 	HTMLDocument *document = self.editingDocument;
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:document];
 
 	HTMLNode *start = [document querySelector:@"#P1"];
 	[range setStartNode:start startOffset:0];
@@ -2059,7 +2060,7 @@
 - (void)testRangeStringifier
 {
 	HTMLDocument *document = self.editingDocument;
-	HTMLRange *range = [[HTMLRange alloc] initWithDowcument:document];
+	HTMLRange *range = [[HTMLRange alloc] initWithDocument:document];
 
 	HTMLNode *start = [document querySelector:@"#P1"].firstChild;
 	[range setStartNode:start startOffset:2];
@@ -2098,4 +2099,23 @@
 	XCTAssertEqualObjects([range textContent], @"This is a textHelloWorldAnother text");
 }
 
+#pragma mark - Bug Fixes
+
+- (void)testBugFix_Issue_5
+{
+	HTMLDocument *document = [HTMLDocument documentWithString:@"<ul><li>1<li>2"];
+
+	NSHashTable *ranges = [HTMLKitTestUtil ivarForInstacne:document name:@"_ranges"];
+	XCTAssertTrue([ranges isKindOfClass:[NSHashTable class]]);
+
+	// range should be autoreleased, deallocated and detached after autoreleasepool
+	@autoreleasepool {
+		HTMLRange *range = [[HTMLRange alloc] initWithDocument:document];
+		[range cloneContents];
+		XCTAssertEqual(1, ranges.count);
+	}
+
+	XCTAssertEqual(0, ranges.count);
+}
+
 @end