Merge branch 'release/0.9.4'

# Conflicts:
#	Tests/html5lib-tests

.gitignore

@@ -26,6 +26,7 @@ xcuserdata
 ## Obj-C/Swift specific
 *.hmap
 *.ipa
+.build/
 
 # CocoaPods
 #

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "HTMLKitTests/html5lib-tests"]
-	path = HTMLKitTests/html5lib-tests
+	path = Tests/html5lib-tests
 	url = https://github.com/html5lib/html5lib-tests.git

.travis.yml

@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode7.2
+osx_image: xcode7.3
 
 branches:
   except:
@@ -15,20 +15,28 @@ env:
     - WORKSPACE=HTMLKit.xcworkspace
     - IOS_FRAMEWORK_SCHEME=HTMLKit-iOS
     - OSX_FRAMEWORK_SCHEME=HTMLKit-OSX
-    - IOS_SDK=iphonesimulator9.2
+    - WATCHOS_FRAMEWORK_SCHEME="HTMLKit-watchOS"
+    - TVOS_FRAMEWORK_SCHEME="HTMLKit-tvOS"
+    - IOS_SDK=iphonesimulator9.3
     - OSX_SDK=macosx10.11
+    - WATCHOS_SDK=watchsimulator2.2
+    - TVOS_SDK=appletvsimulator9.2
   matrix:
-    - DESTINATION="OS=9.0,name=iPhone 6 Plus"   SIMULATOR="iPhone 6 Plus (9.0)"   SCHEME="$IOS_FRAMEWORK_SCHEME"  SDK="$IOS_SDK"
-    - DESTINATION="OS=9.1,name=iPhone 6S"       SIMULATOR="iPhone 6S (9.1)"       SCHEME="$IOS_FRAMEWORK_SCHEME"  SDK="$IOS_SDK"
-    - DESTINATION="OS=9.2,name=iPhone 6S Plus"  SIMULATOR="iPhone 6S Plus (9.2)"  SCHEME="$IOS_FRAMEWORK_SCHEME"  SDK="$IOS_SDK"
-    - DESTINATION="arch=x86_64"                 SIMULATOR=""                      SCHEME="$OSX_FRAMEWORK_SCHEME"  SDK="$OSX_SDK"
+    - DESTINATION="OS=9.0,name=iPhone 6"            SIMULATOR="iPhone 6 (9.0)"            SCHEME="$IOS_FRAMEWORK_SCHEME"      SDK="$IOS_SDK"
+    - DESTINATION="OS=9.1,name=iPhone 6 Plus"       SIMULATOR="iPhone 6 Plus (9.1)"       SCHEME="$IOS_FRAMEWORK_SCHEME"      SDK="$IOS_SDK"
+    - DESTINATION="OS=9.2,name=iPhone 6S"           SIMULATOR="iPhone 6S (9.2)"           SCHEME="$IOS_FRAMEWORK_SCHEME"      SDK="$IOS_SDK"
+    - DESTINATION="OS=9.3,name=iPhone 6S Plus"      SIMULATOR="iPhone 6S Plus (9.3)"      SCHEME="$IOS_FRAMEWORK_SCHEME"      SDK="$IOS_SDK"
+    - DESTINATION="arch=x86_64"                     SIMULATOR=""                          SCHEME="$OSX_FRAMEWORK_SCHEME"      SDK="$OSX_SDK"
+    - DESTINATION="OS=2.2,name=Apple Watch - 42mm"  SIMULATOR="Apple Watch - 42mm (2.2)"  SCHEME="$WATCHOS_FRAMEWORK_SCHEME"  SDK="$WATCHOS_SDK"
+    - DESTINATION="OS=9.2,name=Apple TV 1080p"      SIMULATOR="Apple TV 1080p (9.2)"      SCHEME="$TVOS_FRAMEWORK_SCHEME"     SDK="$TVOS_SDK"
 
 script:
-- set -o pipefail
-- xcodebuild -version
-- xcodebuild -showsdks
-- SIMULATOR_ID=$(xcrun instruments -s devices | grep -io "$SIMULATOR \[.*\]" | grep -o "\[.*\]" | sed "s/^\[\(.*\)\]$/\1/")
-- open -b com.apple.iphonesimulator --args -CurrentDeviceUDID $SIMULATOR_ID
-- xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO clean build | xcpretty -c
-- xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO test | xcpretty -c
-
+  - set -o pipefail
+  - xcodebuild -version
+  - xcodebuild -showsdks
+  - SIMULATOR_ID=$(xcrun instruments -s devices | grep -io "$SIMULATOR \[.*\]" | grep -o "\[.*\]" | sed "s/^\[\(.*\)\]$/\1/")
+  - open -b com.apple.iphonesimulator --args -CurrentDeviceUDID $SIMULATOR_ID
+  - xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO clean build | xcpretty -c
+  - if [ "$SDK" != "$WATCHOS_SDK" ]; then
+      xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO test | xcpretty -c;
+    fi

CHANGELOG.md

@@ -1,10 +1,29 @@
 # Change Log
 
+## [0.9.4](https://github.com/iabudiab/HTMLKit/releases/tag/0.9.4) 
+
+Released on 2016.09.03
+
+### Added
+
+- `Swift Package Manager` support
+
+## [0.9.3](https://github.com/iabudiab/HTMLKit/releases/tag/0.9.3)
+
+Released on 2016.07.16
+
+This release passes all tokenizer and tree construction html5lib-tests as of 2016.07.16
+
+### Added
+
+- `watchOS` and `tvOS` targets
+- Updated HTML5Lib-Tests submodule (c305da7)
+
 ## [0.9.2](https://github.com/iabudiab/HTMLKit/releases/tag/0.9.2)
 
 Released on 2016.05.18
 
-This release passes all html5lib-tests as of 2016.05.18
+This release passes all tokenizer and tree construction html5lib-tests as of 2016.05.18
 
 ### Added
 

HTMLKit.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name               = "HTMLKit"
-  s.version            = "0.9.2"
+  s.version            = "0.9.4"
   s.summary            = "HTMLKit, an Objective-C framework for your everyday HTML needs."
   s.license            = "MIT"
   s.homepage           = "https://github.com/iabudiab/HTMLKit"
@@ -9,12 +9,14 @@ Pod::Spec.new do |s|
 
   s.ios.deployment_target = "8.0"
   s.osx.deployment_target = "10.9"
+  s.watchos.deployment_target = "2.0"
+  s.tvos.deployment_target = "9.0"
 
   s.source = { :git => "https://github.com/iabudiab/HTMLKit.git", :tag => s.version }
 
-  s.source_files         = "HTMLKit", "HTMLKit/**/*.{h,m}"
+  s.source_files         = "Sources", "Sources/**/*.{h,m}"
   s.private_header_files = [
-    'HTMLKit/**/*{HTMLToken,HTMLTokens,HTMLTagToken,HTMLCharacterToken,HTMLCommentToken,HTMLDOCTYPEToken,HTMLEOFToken,HTMLTokenizer,HTMLTokenizerCharacters,HTMLTokenizerEntities,HTMLTokenizerStates,HTMLElementAdjustment,HTMLElementTypes,HTMLInputStreamReader,HTMLListOfActiveFormattingElements,HTMLNodeTraversal,HTMLParseErrorToken,HTMLParserInsertionModes,HTMLStackOfOpenElements,HTMLNode+Private,HTMLMarker,CSSCodePoints,CSSInputStream}.h'
+    'Sources/**/*{HTMLToken,HTMLTokens,HTMLTagToken,HTMLCharacterToken,HTMLCommentToken,HTMLDOCTYPEToken,HTMLEOFToken,HTMLTokenizer,HTMLTokenizerCharacters,HTMLTokenizerEntities,HTMLTokenizerStates,HTMLElementAdjustment,HTMLElementTypes,HTMLInputStreamReader,HTMLListOfActiveFormattingElements,HTMLNodeTraversal,HTMLParseErrorToken,HTMLParserInsertionModes,HTMLStackOfOpenElements,HTMLNode+Private,HTMLMarker,CSSCodePoints,CSSInputStream}.h'
   ]
 
   s.requires_arc = true

HTMLKit.xcodeproj/xcshareddata/xcschemes/HTMLKit-tvOS.xcscheme

@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0730"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "62857CE91D39A262008DC254"
+               BuildableName = "HTMLKit.framework"
+               BlueprintName = "HTMLKit-tvOS"
+               ReferencedContainer = "container:HTMLKit.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "62857CF21D39A262008DC254"
+               BuildableName = "HTMLKit-tvOSTests.xctest"
+               BlueprintName = "HTMLKit-tvOSTests"
+               ReferencedContainer = "container:HTMLKit.xcodeproj">
+            </BuildableReference>
+            <SkippedTests>
+               <Test
+                  Identifier = "HTMLKitParserPerformance">
+               </Test>
+               <Test
+                  Identifier = "HTMLKitTokenizerPerformance">
+               </Test>
+            </SkippedTests>
+         </TestableReference>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "62857CE91D39A262008DC254"
+            BuildableName = "HTMLKit.framework"
+            BlueprintName = "HTMLKit-tvOS"
+            ReferencedContainer = "container:HTMLKit.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "62857CE91D39A262008DC254"
+            BuildableName = "HTMLKit.framework"
+            BlueprintName = "HTMLKit-tvOS"
+            ReferencedContainer = "container:HTMLKit.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "62857CE91D39A262008DC254"
+            BuildableName = "HTMLKit.framework"
+            BlueprintName = "HTMLKit-tvOS"
+            ReferencedContainer = "container:HTMLKit.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

HTMLKit.xcodeproj/xcshareddata/xcschemes/HTMLKit-watchOS.xcscheme

@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0730"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "62857C4D1D398642008DC254"
+               BuildableName = "HTMLKit.framework"
+               BlueprintName = "HTMLKit-watchOS"
+               ReferencedContainer = "container:HTMLKit.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "62857C4D1D398642008DC254"
+            BuildableName = "HTMLKit.framework"
+            BlueprintName = "HTMLKit-watchOS"
+            ReferencedContainer = "container:HTMLKit.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "62857C4D1D398642008DC254"
+            BuildableName = "HTMLKit.framework"
+            BlueprintName = "HTMLKit-watchOS"
+            ReferencedContainer = "container:HTMLKit.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

HTMLKit/HTMLKit-Prefix.pch

@@ -1,9 +0,0 @@
-//
-//  Prefix header
-//
-//  The contents of this file are implicitly included at the beginning of every source file.
-//
-
-#ifdef __OBJC__
-	#import <Foundation/Foundation.h>
-#endif

HTMLKit/en.lproj/InfoPlist.strings

@@ -1,2 +0,0 @@
-/* Localized versions of Info.plist keys */
-

HTMLKitTests/en.lproj/InfoPlist.strings

@@ -1,2 +0,0 @@
-/* Localized versions of Info.plist keys */
-

Package.swift

@@ -0,0 +1,5 @@
+import PackageDescription
+
+let package = Package(
+	name: "HTMLKit"
+)

README.md

@@ -4,7 +4,7 @@
 
 An Objective-C framework for your everyday HTML needs.
 
-[![Build Status](https://img.shields.io/travis/iabudiab/HTMLKit/develop.svg?style=flat)](https://travis-ci.org/iabudiab/HTMLKit)
+[![Build Status](https://img.shields.io/travis/iabudiab/HTMLKit/master.svg?style=flat)](https://travis-ci.org/iabudiab/HTMLKit)
 [![Carthage Compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
 [![CocoaPods Compatible](https://img.shields.io/cocoapods/v/HTMLKit.svg?style=flat)](https://cocoapods.org/pods/HTMLKit)
 [![CocoaDocs](https://img.shields.io/cocoapods/metrics/doc-percent/HTMLKit.svg?style=flat)](http://cocoadocs.org/docsets/HTMLKit)
@@ -31,6 +31,87 @@ The CSS3 Selector implementation is tested with an adapted version of the [CSS3
 
 Check out the playground!
 
+# Installation
+
+### Carthage
+
+[Carthage](https://github.com/Carthage/Carthage) is a decentralized dependency manager that builds your dependencies and provides you with binary frameworks.
+
+If you don't have Carthage yet, you can install it with Homebrew using the following command:
+
+```bash
+$ brew update
+$ brew install carthage
+```
+
+To add `HTMLKit` as a dependency into your project using Carthage just add the following line in your `Cartfile`:
+
+```
+github "iabudiab/HTMLKit"
+```
+
+Then run the following command to build the framework and drag the built `HTMLKit.framework` into your Xcode project.
+
+```bash
+$ carthage update
+```
+
+### CocoaPods
+
+[CocoaPods](http://cocoapods.org) is a dependency manager for Cocoa projects.
+
+If you don't have CocoaPods yet, you can install it with the following command:
+
+```bash
+$ gem install cocoapods
+```
+
+To add `HTMLKit` as a dependency into your project using CocoaPods just add the following in your `Podfile`:
+
+```ruby
+use_frameworks!
+
+target 'MyTarget' do
+  pod 'HTMLKit', '~> 0.9'
+end
+```
+
+Then, run the following command:
+
+```bash
+$ pod install
+```
+
+### Swift Package Manager
+
+[Swift Package Manager](https://github.com/apple/swift-package-manager) is the package manager for the Swift programming language.
+
+Add `HTMLKit` to your `Package.swift` dependecies:
+
+```swift
+.Package(url: "https://github.com/iabudiab/HTMLKit", majorVersion: 0, minor: 9)
+```
+
+Then run:
+
+```bash
+$ swift build
+```
+
+### Manually
+
+1- Add `HTMLKit` as git submodule
+
+```bash
+$ git submodule add https://github.com/iabudiab/HTMLKit.git
+```
+
+2- Open the `HTMLKit` folder and drag'n'drop the `HTMLKit.xcodeproj` into the Project Navigator in Xcode to add it as a sub-project.
+
+3- In the General panel of your target add `HTMLKit.framework` under the `Embedded Binaries` 
+
+# Features
+
 # Parsing Documents
 
 Given some HTML content, you can parse it either via the `HTMLParser` or instatiate a `HTMLDocument` directly:
@@ -185,7 +266,7 @@ NSArray *hasSiblingParagraph = [document elementsMatchingSelector:generalSibling
 NSArray *nonParagraphChildOfDiv = [document elementsMatchingSelector:
 	allOf(@[
 		childOfElementSelector(typeSelector(@"div")),
-		nay(typeSelector(@"p"))
+		not(typeSelector(@"p"))
 	])
 ];
 ```

Sources/HTMLKit-Info.plist

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

Sources/HTMLKitDOMExceptions.m

@@ -6,6 +6,7 @@
 //  Copyright (c) 2015 BrainCookie. All rights reserved.
 //
 
+#import <Foundation/Foundation.h>
 #import "HTMLKitDOMExceptions.h"
 
 NSString * const HTMLKitHierarchyRequestError = @"HierarchyRequestError";

Sources/include/CSSStructuralPseudoSelectors.h

@@ -6,6 +6,8 @@
 //  Copyright © 2015 BrainCookie. All rights reserved.
 //
 
+#import <Foundation/Foundation.h>
+
 @class CSSSelector;
 
 NS_ASSUME_NONNULL_BEGIN

Sources/include/HTMLKitDOMExceptions.h

@@ -6,6 +6,8 @@
 //  Copyright (c) 2015 BrainCookie. All rights reserved.
 //
 
+#import <Foundation/Foundation.h>
+
 extern NSString * const HTMLKitHierarchyRequestError;
 extern NSString * const HTMLKitNotFoundError;
 extern NSString * const HTMLKitNotSupportedError;

Sources/include/HTMLNode+Private.h

@@ -10,7 +10,7 @@
 /// HTMLKit private header
 ///------------------------------------------------------
 
-#import <HTMLKit/HTMLKit.h>
+#import "HTMLNode.h"
 
 /**
  Private HTML Node methods which are not intended for public API.