Merge branch 'release/0.3.0'

Author: iabudiab

.gitignore

@@ -1,8 +1,12 @@
-# OS X
-.DS_Store
-
 # Xcode
+#
+# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+
+## Build generated
 build/
+DerivedData
+
+## Various settings
 *.pbxuser
 !default.pbxuser
 *.mode1v3
@@ -12,13 +16,28 @@ build/
 *.perspectivev3
 !default.perspectivev3
 xcuserdata
+
+## Other
 *.xccheckout
-profile
 *.moved-aside
-DerivedData
+*.xcuserstate
+*.xcscmblueprint
+
+## Obj-C/Swift specific
 *.hmap
 *.ipa
 
 # CocoaPods
-Pods
+#
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+#
+Pods/
+
+# Carthage
+#
+# Add this line if you want to avoid checking in source code from Carthage dependencies.
+Carthage/Checkouts
 
+Carthage/Build

HTMLKit.xcodeproj/project.pbxproj

@@ -0,0 +1,30 @@
+//
+//  CSSAttributeSelector.h
+//  HTMLKit
+//
+//  Created by Iska on 14/05/15.
+//  Copyright (c) 2015 BrainCookie. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "CSSSelector.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface CSSAttributeSelector : CSSSelector
+
+@property (nonatomic, assign) CSSAttributeSelectorType type;
+@property (nonatomic, strong, readonly) NSString *name;
+@property (nonatomic, strong, readonly) NSString *value;
+
++ (instancetype)classSelector:(NSString *)className;
++ (instancetype)idSelector:(NSString *)elementId;
++ (instancetype)hasAttributeSelector:(NSString *)attributeName;
+
+- (instancetype)initWithType:(CSSAttributeSelectorType)type
+						attributeName:(NSString *)name
+			  attrbiuteValue:(NSString *)value;
+
+@end
+
+NS_ASSUME_NONNULL_END

HTMLKit.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,111 @@
+//
+//  CSSAttributeSelector.m
+//  HTMLKit
+//
+//  Created by Iska on 14/05/15.
+//  Copyright (c) 2015 BrainCookie. All rights reserved.
+//
+
+#import "CSSAttributeSelector.h"
+#import "HTMLElement.h"
+#import "NSCharacterSet+HTMLKit.h"
+
+@interface CSSAttributeSelector ()
+{
+	CSSAttributeSelectorType _type;
+	NSString *_name;
+	NSString *_value;
+}
+@end
+
+@implementation CSSAttributeSelector
+
++ (instancetype)classSelector:(NSString *)className
+{
+	return [[self alloc] initWithType:CSSAttributeSelectorIncludes attributeName:@"class" attrbiuteValue:className];
+}
+
++ (instancetype)idSelector:(NSString *)elementId
+{
+	return [[self alloc] initWithType:CSSAttributeSelectorExactMatch attributeName:@"id" attrbiuteValue:elementId];
+}
+
++ (instancetype)hasAttributeSelector:(NSString *)attributeName
+{
+	return [[self alloc] initWithType:CSSAttributeSelectorExists attributeName:attributeName attrbiuteValue:@""];
+}
+
+- (instancetype)initWithType:(CSSAttributeSelectorType)type
+			   attributeName:(NSString *)name
+			  attrbiuteValue:(NSString *)value
+{
+	self = [super init];
+	if (self) {
+		self.type = type;
+		_name = [name copy];
+		_value = value ? [value copy]: @"";
+	}
+	return self;
+}
+
+- (BOOL)acceptElement:(HTMLElement *)element
+{
+	switch (_type) {
+		case CSSAttributeSelectorExists:
+		{
+			return !!element[_name];
+		}
+		case CSSAttributeSelectorExactMatch:
+		{
+			return [element[_name] isEqualToString:_value];
+		}
+		case CSSAttributeSelectorIncludes:
+		{
+			NSArray *components = [element[_name] componentsSeparatedByCharactersInSet:[NSCharacterSet HTMLWhitespaceCharacterSet]];
+			return [components containsObject:_value];
+		}
+		case CSSAttributeSelectorBegins:
+		{
+			return [element[_name] hasPrefix:_value];
+		}
+		case CSSAttributeSelectorEnds:
+		{
+			return [element[_name] hasSuffix:_value];
+		}
+		case CSSAttributeSelectorContains:
+		{
+			return [element[_name] containsString:_value];
+		}
+		case CSSAttributeSelectorHyphen:
+		{
+			return [element[_name] isEqualToString:_value] || [element[_name] hasPrefix:[_value stringByAppendingString:@"-"]];
+		}
+		case CSSAttributeSelectorNot:
+		{
+			return ![element[_name] isEqualToString:_value];
+		}
+		default:
+			return NO;
+	}
+}
+
+#pragma mark - Description
+
+- (NSString *)debugDescription
+{
+	if (self.type == CSSAttributeSelectorExists) {
+		return [NSString stringWithFormat:@"[%@]", self.name];
+	}
+
+	NSString *matcher = @{@(CSSAttributeSelectorExactMatch): @"=",
+						  @(CSSAttributeSelectorIncludes): @"~=",
+						  @(CSSAttributeSelectorBegins): @"^=",
+						  @(CSSAttributeSelectorEnds): @"$=",
+						  @(CSSAttributeSelectorContains): @"*=",
+						  @(CSSAttributeSelectorHyphen): @"|=",
+						  @(CSSAttributeSelectorNot): @"!="}[@(self.type)];
+
+	return [NSString stringWithFormat:@"[%@%@'%@']", self.name, matcher, self.value];
+}
+
+@end

HTMLKit/CSSAttributeSelector.h

@@ -0,0 +1,140 @@
+//
+//  CSSTokenizer	CODEPOINTs.h
+//  HTMLKit
+//
+//  Created by Iska on 08/06/15.
+//  Copyright (c) 2015 BrainCookie. All rights reserved.
+//
+
+#define CODEPOINTS \
+	CODEPOINT( CONTROL, 0x0080 ) \
+	CODEPOINT( CHARACTER_TABULATION, 0x0009 ) \
+	CODEPOINT( LINE_FEED, 0x000A ) \
+	CODEPOINT( SPACE, 0x0020 ) \
+	CODEPOINT( QUOTATION_MARK, 0x0022 ) \
+	CODEPOINT( NUMBER_SIGN, 0x0023 ) \
+	CODEPOINT( DOLLAR_SIGN, 0x0024 ) \
+	CODEPOINT( APOSTROPHE, 0x0027 ) \
+	CODEPOINT( LEFT_PARENTHESIS, 0x0028 ) \
+	CODEPOINT( RIGHT_PARENTHESIS, 0x0029 ) \
+	CODEPOINT( ASTERIX, 0x002A ) \
+	CODEPOINT( PLUS_SIGN, 0x002B ) \
+	CODEPOINT( COMMA, 0x002C ) \
+	CODEPOINT( HYPHEN_MINUS, 0x002D ) \
+	CODEPOINT( FULL_STOP, 0x002E ) \
+	CODEPOINT( DIGIT_ZERO, 0x0030 ) \
+	CODEPOINT( DIGIT_NINE, 0x0039 ) \
+	CODEPOINT( COLON, 0x003A ) \
+	CODEPOINT( EQUALS_SIGN, 0x003D ) \
+	CODEPOINT( GREATER_THAN_SIGN, 0x003E ) \
+	CODEPOINT( LATIN_CAPITAL_LETTER_A, 0x0041 ) \
+	CODEPOINT( LATIN_CAPITAL_LETTER_F, 0x0046 ) \
+	CODEPOINT( LATIN_CAPITAL_LETTER_Z, 0x005A ) \
+	CODEPOINT( LEFT_SQUARE_BRACKET, 0x005B ) \
+	CODEPOINT( REVERSE_SOLIDUS, 0x005C ) \
+	CODEPOINT( RIGHT_SQUARE_BRACKET, 0x005D ) \
+	CODEPOINT( CIRCUMFLEX_ACCENT, 0x005E ) \
+	CODEPOINT( LOW_LINE, 0x005F ) \
+	CODEPOINT( LATIN_SMALL_LETTER_A, 0x0061 ) \
+	CODEPOINT( LATIN_SMALL_LETTER_F, 0x0066 ) \
+	CODEPOINT( LATIN_SMALL_LETTER_Z, 0x007A ) \
+	CODEPOINT( VERTICAL_LINE, 0x007C ) \
+	CODEPOINT( TILDE, 0x007E ) \
+	CODEPOINT( REPLACEMENT_CHARACTER, 0xFFFD )
+
+#define CODEPOINT( name, value ) static UniChar const name = value;
+CODEPOINTS
+#undef CODEPOINT
+
+NS_INLINE BOOL isWhitespace(UTF32Char codePoint)
+{
+	return (codePoint == CHARACTER_TABULATION ||
+			codePoint == LINE_FEED ||
+			codePoint == SPACE);
+}
+
+NS_INLINE BOOL isCombinator(UTF32Char codePoint)
+{
+	return (codePoint == SPACE ||
+			codePoint == PLUS_SIGN ||
+			codePoint == COMMA ||
+			codePoint == GREATER_THAN_SIGN ||
+			codePoint == TILDE);
+}
+
+NS_INLINE BOOL isDigit(UTF32Char codePoint)
+{
+	return codePoint >= DIGIT_ZERO && codePoint <= DIGIT_NINE;
+}
+
+NS_INLINE BOOL isHexDigit(UTF32Char codePoint)
+{
+	return ((codePoint >= DIGIT_ZERO && codePoint <= DIGIT_NINE) ||
+			(codePoint >= LATIN_CAPITAL_LETTER_A && codePoint <= LATIN_CAPITAL_LETTER_F) ||
+			(codePoint >= LATIN_SMALL_LETTER_A && codePoint <= LATIN_SMALL_LETTER_F));
+}
+
+NS_INLINE BOOL isQuote(UTF32Char codePoint)
+{
+	return codePoint == QUOTATION_MARK || codePoint == APOSTROPHE;
+}
+
+NS_INLINE BOOL isNewLine(UTF32Char codePoint)
+{
+	return codePoint == LINE_FEED;
+}
+
+NS_INLINE BOOL isNameStart(UTF32Char codePoint)
+{
+	return ((codePoint >= LATIN_CAPITAL_LETTER_A && codePoint <= LATIN_CAPITAL_LETTER_Z) ||
+			(codePoint >= LATIN_SMALL_LETTER_A && codePoint <= LATIN_SMALL_LETTER_Z) ||
+			codePoint >= CONTROL ||
+			codePoint == LOW_LINE);
+}
+
+NS_INLINE BOOL isName(UTF32Char codePoint)
+{
+	return isNameStart(codePoint) || isDigit(codePoint) || codePoint == HYPHEN_MINUS;
+}
+
+NS_INLINE BOOL isValidEscape(UTF32Char first, UTF32Char second)
+{
+	if (first != REVERSE_SOLIDUS || isNewLine(second)) {
+		return false;
+	}
+
+	return YES;
+}
+
+NS_INLINE BOOL isValidEscapedCodePoint(UTF32Char codePoint)
+{
+	return (codePoint != 0 &&
+			!(codePoint >= 0xD800 && codePoint <= 0x0DFFF) &&
+			codePoint <= 0x10FFFF);
+}
+
+NS_INLINE BOOL isValidIdentifierStart(UTF32Char first, UTF32Char second, UTF32Char third)
+{
+	if (first == HYPHEN_MINUS) {
+		if (isNameStart(second) ||
+			second == HYPHEN_MINUS ||
+			isValidEscape(second, third)) {
+			return YES;
+		} else {
+			return NO;
+		}
+	} else if (isNameStart(first)) {
+		return YES;
+	} else if (first == REVERSE_SOLIDUS) {
+		return isValidEscape(first, second);
+	} else {
+		return NO;
+	}
+}
+
+NS_INLINE void AppendCodePoint(CFMutableStringRef string, UTF32Char codePoint)
+{
+	UniChar pair[2];
+	Boolean isPair = CFStringGetSurrogatePairForLongCharacter(codePoint, pair);
+	CFStringAppendCharacters(string, pair, isPair ? 2 : 1);
+}

HTMLKit/CSSAttributeSelector.m

@@ -0,0 +1,22 @@
+//
+//  CSSCombinatorSelector.h
+//  HTMLKit
+//
+//  Created by Iska on 12/10/15.
+//  Copyright © 2015 BrainCookie. All rights reserved.
+//
+
+#import "CSSSelector.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface CSSCombinatorSelector : CSSSelector
+
++ (instancetype)childOfElementCombinator:(CSSSelector *)selector;
++ (instancetype)descendantOfElementCombinator:(CSSSelector *)selector;
++ (instancetype)adjacentSiblingCombinator:(CSSSelector *)selector;
++ (instancetype)generalSiblingCombinator:(CSSSelector *)selector;
+
+@end
+
+NS_ASSUME_NONNULL_END