From 9b8c2e0e369d5d9eb401745558e00bddc068732a Mon Sep 17 00:00:00 2001 From: Pauli Jokela Date: Sun, 2 Oct 2016 17:40:33 +0300 Subject: [PATCH 1/4] Renamed a handful of classes to avoid naming clashes --- .DS_Store | Bin 0 -> 6148 bytes BRYHTMLParser.podspec | 2 +- BRYHTMLParser.xcodeproj/project.pbxproj | 48 ++++++++++-------- BRYHTMLParser/BRYHTMLParser.h | 4 +- .../{LibXMLHTMLNode.h => BRYLibXMLHTMLNode.h} | 4 +- .../{LibXMLHTMLNode.m => BRYLibXMLHTMLNode.m} | 48 +++++++++--------- BRYHTMLParser/{HTMLNode.h => BRYNode.h} | 18 +++---- BRYHTMLParser/{HTMLParser.h => BRYParser.h} | 14 ++--- BRYHTMLParser/{HTMLParser.m => BRYParser.m} | 16 +++--- README.md | 8 +-- 10 files changed, 84 insertions(+), 78 deletions(-) create mode 100644 .DS_Store rename BRYHTMLParser/{LibXMLHTMLNode.h => BRYLibXMLHTMLNode.h} (84%) rename BRYHTMLParser/{LibXMLHTMLNode.m => BRYLibXMLHTMLNode.m} (85%) rename BRYHTMLParser/{HTMLNode.h => BRYNode.h} (80%) rename BRYHTMLParser/{HTMLParser.h => BRYParser.h} (66%) rename BRYHTMLParser/{HTMLParser.m => BRYParser.m} (91%) diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..4856f6145b81ae388b814ff1e380bde1dc8b9211 GIT binary patch literal 6148 zcmeHK!AiqG5Pe%KR7B`WJqElB{euu9cu)}Q#al}w6=}O6S`kk<`Ez>oOZ)=g>@1}v z_D~O^G6OSjGntum-@;A@fXn7Z59k8uPz75%G+&6k7i~x@dbWu!)VRVq&TxStsz$Uq zej@{Nc6-QhiEEr<`TXv2gX*zg%_e>}W)x2t2kRqoj3dPj3|9wD7y*cFx`S{nvxMX%5z~mZBHvJ)rV=&P#Sz14I{itE zOC#2bnhqC-4;R1e;)LSD*I7Ra;c%&KAG^~3Pu9=>t4a1`3>X9diUHTo z`+3GK#opT3ob=j+I-rV3T&=iB;UctR#!4$bqz0iskp(f0SS!*)u|EQV1~bOMk23HH D3}i_q literal 0 HcmV?d00001 diff --git a/BRYHTMLParser.podspec b/BRYHTMLParser.podspec index 146b879..0eade61 100644 --- a/BRYHTMLParser.podspec +++ b/BRYHTMLParser.podspec @@ -4,7 +4,7 @@ Pod::Spec.new do |s| s.license = 'MIT' s.platform = :ios s.homepage = 'https://github.com/irace/BRYHTMLParser' - s.version = '2.1.2' + s.version = '2.1.3' s.summary = 'An Objective-C wrapper around libxml for parsing HTML.' s.source = { :git => 'https://github.com/irace/BRYHTMLParser.git', :tag => "#{s.version}" } s.source_files = 'BRYHTMLParser/*.{h,m}' diff --git a/BRYHTMLParser.xcodeproj/project.pbxproj b/BRYHTMLParser.xcodeproj/project.pbxproj index cda7b84..15a8bd6 100644 --- a/BRYHTMLParser.xcodeproj/project.pbxproj +++ b/BRYHTMLParser.xcodeproj/project.pbxproj @@ -7,23 +7,23 @@ objects = { /* Begin PBXBuildFile section */ - 9356891F1B56E36E00DEAEF3 /* HTMLNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 9356891E1B56E36E00DEAEF3 /* HTMLNode.h */; }; - 939D8AA21B56D69100504F60 /* LibXMLHTMLNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 939D8A9E1B56D69100504F60 /* LibXMLHTMLNode.h */; }; - 939D8AA31B56D69100504F60 /* LibXMLHTMLNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 939D8A9F1B56D69100504F60 /* LibXMLHTMLNode.m */; }; - 939D8AA41B56D69100504F60 /* HTMLParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 939D8AA01B56D69100504F60 /* HTMLParser.h */; }; - 939D8AA51B56D69100504F60 /* HTMLParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 939D8AA11B56D69100504F60 /* HTMLParser.m */; }; + 9356891F1B56E36E00DEAEF3 /* BRYNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 9356891E1B56E36E00DEAEF3 /* BRYNode.h */; }; + 939D8AA21B56D69100504F60 /* BRYLibXMLHTMLNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 939D8A9E1B56D69100504F60 /* BRYLibXMLHTMLNode.h */; }; + 939D8AA31B56D69100504F60 /* BRYLibXMLHTMLNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 939D8A9F1B56D69100504F60 /* BRYLibXMLHTMLNode.m */; }; + 939D8AA41B56D69100504F60 /* BRYParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 939D8AA01B56D69100504F60 /* BRYParser.h */; }; + 939D8AA51B56D69100504F60 /* BRYParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 939D8AA11B56D69100504F60 /* BRYParser.m */; }; 939D8AA91B56D71500504F60 /* BRYHTMLParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 939D8AA81B56D6FB00504F60 /* BRYHTMLParser.h */; }; 939D8AAB1B56D76100504F60 /* libxml2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 939D8AAA1B56D76100504F60 /* libxml2.dylib */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 9356891E1B56E36E00DEAEF3 /* HTMLNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLNode.h; sourceTree = ""; }; + 9356891E1B56E36E00DEAEF3 /* BRYNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BRYNode.h; sourceTree = ""; }; 939D8A821B56D5D500504F60 /* BRYHTMLParser.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = BRYHTMLParser.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 939D8A861B56D5D500504F60 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 939D8A9E1B56D69100504F60 /* LibXMLHTMLNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LibXMLHTMLNode.h; sourceTree = ""; }; - 939D8A9F1B56D69100504F60 /* LibXMLHTMLNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LibXMLHTMLNode.m; sourceTree = ""; }; - 939D8AA01B56D69100504F60 /* HTMLParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLParser.h; sourceTree = ""; }; - 939D8AA11B56D69100504F60 /* HTMLParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLParser.m; sourceTree = ""; }; + 939D8A9E1B56D69100504F60 /* BRYLibXMLHTMLNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BRYLibXMLHTMLNode.h; sourceTree = ""; }; + 939D8A9F1B56D69100504F60 /* BRYLibXMLHTMLNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BRYLibXMLHTMLNode.m; sourceTree = ""; }; + 939D8AA01B56D69100504F60 /* BRYParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BRYParser.h; sourceTree = ""; }; + 939D8AA11B56D69100504F60 /* BRYParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BRYParser.m; sourceTree = ""; }; 939D8AA81B56D6FB00504F60 /* BRYHTMLParser.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BRYHTMLParser.h; sourceTree = ""; }; 939D8AAA1B56D76100504F60 /* libxml2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libxml2.dylib; path = usr/lib/libxml2.dylib; sourceTree = SDKROOT; }; /* End PBXFileReference section */ @@ -60,11 +60,11 @@ isa = PBXGroup; children = ( 939D8AA81B56D6FB00504F60 /* BRYHTMLParser.h */, - 9356891E1B56E36E00DEAEF3 /* HTMLNode.h */, - 939D8AA01B56D69100504F60 /* HTMLParser.h */, - 939D8AA11B56D69100504F60 /* HTMLParser.m */, - 939D8A9E1B56D69100504F60 /* LibXMLHTMLNode.h */, - 939D8A9F1B56D69100504F60 /* LibXMLHTMLNode.m */, + 9356891E1B56E36E00DEAEF3 /* BRYNode.h */, + 939D8AA01B56D69100504F60 /* BRYParser.h */, + 939D8AA11B56D69100504F60 /* BRYParser.m */, + 939D8A9E1B56D69100504F60 /* BRYLibXMLHTMLNode.h */, + 939D8A9F1B56D69100504F60 /* BRYLibXMLHTMLNode.m */, 939D8A851B56D5D500504F60 /* Supporting Files */, ); path = BRYHTMLParser; @@ -86,10 +86,10 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 939D8AA41B56D69100504F60 /* HTMLParser.h in Headers */, - 939D8AA21B56D69100504F60 /* LibXMLHTMLNode.h in Headers */, + 939D8AA41B56D69100504F60 /* BRYParser.h in Headers */, + 939D8AA21B56D69100504F60 /* BRYLibXMLHTMLNode.h in Headers */, 939D8AA91B56D71500504F60 /* BRYHTMLParser.h in Headers */, - 9356891F1B56E36E00DEAEF3 /* HTMLNode.h in Headers */, + 9356891F1B56E36E00DEAEF3 /* BRYNode.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -120,7 +120,7 @@ 939D8A791B56D5D400504F60 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0730; + LastUpgradeCheck = 0800; ORGANIZATIONNAME = "Bryan Irace"; TargetAttributes = { 939D8A811B56D5D500504F60 = { @@ -160,8 +160,8 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 939D8AA31B56D69100504F60 /* LibXMLHTMLNode.m in Sources */, - 939D8AA51B56D69100504F60 /* HTMLParser.m in Sources */, + 939D8AA31B56D69100504F60 /* BRYLibXMLHTMLNode.m in Sources */, + 939D8AA51B56D69100504F60 /* BRYParser.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -181,8 +181,10 @@ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; @@ -229,8 +231,10 @@ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; @@ -261,6 +265,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_OBJC_ARC = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -283,6 +288,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_OBJC_ARC = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; diff --git a/BRYHTMLParser/BRYHTMLParser.h b/BRYHTMLParser/BRYHTMLParser.h index a3d0813..2e9fcab 100644 --- a/BRYHTMLParser/BRYHTMLParser.h +++ b/BRYHTMLParser/BRYHTMLParser.h @@ -6,5 +6,5 @@ // Copyright (c) 2015 Bryan Irace. All rights reserved. // -#import "HTMLNode.h" -#import "HTMLParser.h" +#import "BRYNode.h" +#import "BRYParser.h" diff --git a/BRYHTMLParser/LibXMLHTMLNode.h b/BRYHTMLParser/BRYLibXMLHTMLNode.h similarity index 84% rename from BRYHTMLParser/LibXMLHTMLNode.h rename to BRYHTMLParser/BRYLibXMLHTMLNode.h index 9c90cd6..0c935c0 100644 --- a/BRYHTMLParser/LibXMLHTMLNode.h +++ b/BRYHTMLParser/BRYLibXMLHTMLNode.h @@ -7,9 +7,9 @@ // #import -#import "HTMLNode.h" +#import "BRYNode.h" -@interface LibXMLHTMLNode : NSObject +@interface BRYLibXMLHTMLNode : NSObject struct _xmlNode; diff --git a/BRYHTMLParser/LibXMLHTMLNode.m b/BRYHTMLParser/BRYLibXMLHTMLNode.m similarity index 85% rename from BRYHTMLParser/LibXMLHTMLNode.m rename to BRYHTMLParser/BRYLibXMLHTMLNode.m index dd37431..c40eff3 100644 --- a/BRYHTMLParser/LibXMLHTMLNode.m +++ b/BRYHTMLParser/BRYLibXMLHTMLNode.m @@ -6,28 +6,28 @@ // Copyright 2010 Ben Reeves. All rights reserved. // -#import "LibXMLHTMLNode.h" +#import "BRYLibXMLHTMLNode.h" #import -@interface LibXMLHTMLNode () +@interface BRYLibXMLHTMLNode () @property (nonatomic) xmlNode * node; @end -@implementation LibXMLHTMLNode +@implementation BRYLibXMLHTMLNode --(LibXMLHTMLNode*)parent +-(BRYLibXMLHTMLNode*)parent { - return [[LibXMLHTMLNode alloc] initWithXMLNode:_node->parent]; + return [[BRYLibXMLHTMLNode alloc] initWithXMLNode:_node->parent]; } --(LibXMLHTMLNode*)nextSibling { - return [[LibXMLHTMLNode alloc] initWithXMLNode:_node->next]; +-(BRYLibXMLHTMLNode*)nextSibling { + return [[BRYLibXMLHTMLNode alloc] initWithXMLNode:_node->next]; } --(LibXMLHTMLNode*)previousSibling { - return [[LibXMLHTMLNode alloc] initWithXMLNode:_node->prev]; +-(BRYLibXMLHTMLNode*)previousSibling { + return [[BRYLibXMLHTMLNode alloc] initWithXMLNode:_node->prev]; } void setAttributeNamed(xmlNode * node, const char * nameStr, const char * value) { @@ -107,9 +107,9 @@ -(NSString*)tagName } --(LibXMLHTMLNode*)firstChild +-(BRYLibXMLHTMLNode*)firstChild { - return [[LibXMLHTMLNode alloc] initWithXMLNode:_node->children]; + return [[BRYLibXMLHTMLNode alloc] initWithXMLNode:_node->children]; } @@ -138,7 +138,7 @@ -(void)findChildrenWithAttribute:(const char*)attribute matchingName:(const char if (match) { //Found node - LibXMLHTMLNode * nNode = [[LibXMLHTMLNode alloc] initWithXMLNode:cur_node]; + BRYLibXMLHTMLNode * nNode = [[BRYLibXMLHTMLNode alloc] initWithXMLNode:cur_node]; [array addObject:nNode]; break; } @@ -164,7 +164,7 @@ -(void)findChildTags:(NSString*)tagName inXMLNode:(xmlNode *)node inArray:(NSMut { if (cur_node->name && strcmp((char*)cur_node->name, tagNameStr) == 0) { - LibXMLHTMLNode * node = [[LibXMLHTMLNode alloc] initWithXMLNode:cur_node]; + BRYLibXMLHTMLNode * node = [[BRYLibXMLHTMLNode alloc] initWithXMLNode:cur_node]; [array addObject:node]; } @@ -183,7 +183,7 @@ -(NSArray*)findChildTags:(NSString*)tagName return array; } --(LibXMLHTMLNode*)findChildTag:(NSString*)tagName inXMLNode:(xmlNode *)node +-(BRYLibXMLHTMLNode*)findChildTag:(NSString*)tagName inXMLNode:(xmlNode *)node { xmlNode *cur_node = NULL; const char * tagNameStr = [tagName UTF8String]; @@ -192,10 +192,10 @@ -(LibXMLHTMLNode*)findChildTag:(NSString*)tagName inXMLNode:(xmlNode *)node { if (cur_node && cur_node->name && strcmp((char*)cur_node->name, tagNameStr) == 0) { - return [[LibXMLHTMLNode alloc] initWithXMLNode:cur_node]; + return [[BRYLibXMLHTMLNode alloc] initWithXMLNode:cur_node]; } - LibXMLHTMLNode * cNode = [self findChildTag:tagName inXMLNode:cur_node->children]; + BRYLibXMLHTMLNode * cNode = [self findChildTag:tagName inXMLNode:cur_node->children]; if (cNode != NULL) { return cNode; @@ -205,7 +205,7 @@ -(LibXMLHTMLNode*)findChildTag:(NSString*)tagName inXMLNode:(xmlNode *)node return NULL; } --(LibXMLHTMLNode*)findChildTag:(NSString*)tagName +-(BRYLibXMLHTMLNode*)findChildTag:(NSString*)tagName { return [self findChildTag:tagName inXMLNode:_node->children]; } @@ -218,7 +218,7 @@ -(NSArray*)children for (cur_node = _node->children; cur_node; cur_node = cur_node->next) { - LibXMLHTMLNode * node = [[LibXMLHTMLNode alloc] initWithXMLNode:cur_node]; + BRYLibXMLHTMLNode * node = [[BRYLibXMLHTMLNode alloc] initWithXMLNode:cur_node]; [array addObject:node]; } @@ -240,7 +240,7 @@ -(NSString*)description return string; }*/ --(LibXMLHTMLNode*)findChildWithAttribute:(const char*)attribute matchingName:(const char*)name inXMLNode:(xmlNode *)node allowPartial:(BOOL)partial +-(BRYLibXMLHTMLNode*)findChildWithAttribute:(const char*)attribute matchingName:(const char*)name inXMLNode:(xmlNode *)node allowPartial:(BOOL)partial { xmlNode *cur_node = NULL; const char * classNameStr = name; @@ -266,14 +266,14 @@ -(LibXMLHTMLNode*)findChildWithAttribute:(const char*)attribute matchingName:(co if (match) { - return [[LibXMLHTMLNode alloc] initWithXMLNode:cur_node]; + return [[BRYLibXMLHTMLNode alloc] initWithXMLNode:cur_node]; } } break; } } - LibXMLHTMLNode * cNode = [self findChildWithAttribute:attribute matchingName:name inXMLNode:cur_node->children allowPartial:partial]; + BRYLibXMLHTMLNode * cNode = [self findChildWithAttribute:attribute matchingName:name inXMLNode:cur_node->children allowPartial:partial]; if (cNode != NULL) { return cNode; @@ -283,14 +283,14 @@ -(LibXMLHTMLNode*)findChildWithAttribute:(const char*)attribute matchingName:(co return NULL; } --(LibXMLHTMLNode*)findChildWithAttribute:(NSString*)attribute matchingName:(NSString*)className allowPartial:(BOOL)partial +-(BRYLibXMLHTMLNode*)findChildWithAttribute:(NSString*)attribute matchingName:(NSString*)className allowPartial:(BOOL)partial { return [self findChildWithAttribute:[attribute UTF8String] matchingName:[className UTF8String] inXMLNode:_node->children allowPartial:partial]; } --(LibXMLHTMLNode*)findChildOfClass:(NSString*)className +-(BRYLibXMLHTMLNode*)findChildOfClass:(NSString*)className { - LibXMLHTMLNode * node = [self findChildWithAttribute:"class" matchingName:[className UTF8String] inXMLNode:_node->children allowPartial:NO]; + BRYLibXMLHTMLNode * node = [self findChildWithAttribute:"class" matchingName:[className UTF8String] inXMLNode:_node->children allowPartial:NO]; return node; } diff --git a/BRYHTMLParser/HTMLNode.h b/BRYHTMLParser/BRYNode.h similarity index 80% rename from BRYHTMLParser/HTMLNode.h rename to BRYHTMLParser/BRYNode.h index fd79e82..9e2ef03 100644 --- a/BRYHTMLParser/HTMLNode.h +++ b/BRYHTMLParser/BRYNode.h @@ -1,5 +1,5 @@ // -// HTMLNode.h +// BRYNode.h // BRYHTMLParser // // Created by Bryan Irace on 7/15/15. @@ -37,10 +37,10 @@ typedef NS_ENUM(unsigned int, HTMLNodeType) { HTMLCodeNode, }; -@protocol HTMLNode +@protocol BRYNode /// Returns the first child element -@property (nonatomic, readonly) id firstChild; +@property (nonatomic, readonly) id firstChild; /// Returns the plaintext contents of node @property (nonatomic, readonly, copy) NSString *contents; @@ -52,10 +52,10 @@ typedef NS_ENUM(unsigned int, HTMLNodeType) { @property (nonatomic, readonly, copy) NSString *rawContents; /// Returns next sibling in tree -@property (nonatomic, readonly) id nextSibling; +@property (nonatomic, readonly) id nextSibling; /// Returns previous sibling in tree -@property (nonatomic, readonly) id previousSibling; +@property (nonatomic, readonly) id previousSibling; /// Returns the class name @property (nonatomic, readonly, copy) NSString *className; @@ -64,7 +64,7 @@ typedef NS_ENUM(unsigned int, HTMLNodeType) { @property (nonatomic, readonly, copy) NSString *tagName; /// Returns the parent -@property (nonatomic, readonly) id parent; +@property (nonatomic, readonly) id parent; /// Returns the first level of children @property (nonatomic, readonly, copy) NSArray *children; @@ -79,16 +79,16 @@ typedef NS_ENUM(unsigned int, HTMLNodeType) { - (NSArray *)findChildTags:(NSString *)tagName; /// Looks for a tag name e.g. "h3" -- (id )findChildTag:(NSString *)tagName; +- (id )findChildTag:(NSString *)tagName; /// Returns a single child of class -- (id )findChildOfClass:(NSString *)className; +- (id )findChildOfClass:(NSString *)className; /// Returns all children of class - (NSArray *)findChildrenOfClass:(NSString *)className; /// Finds a single child with a matching attribute. Set `allowPartial` to match partial matches, e.g. )findChildWithAttribute:(NSString *)attribute matchingName:(NSString *)className allowPartial:(BOOL)partial; +- (id )findChildWithAttribute:(NSString *)attribute matchingName:(NSString *)className allowPartial:(BOOL)partial; /// Finds all children with a matching attribute - (NSArray *)findChildrenWithAttribute:(NSString *)attribute matchingName:(NSString *)className allowPartial:(BOOL)partial; diff --git a/BRYHTMLParser/HTMLParser.h b/BRYHTMLParser/BRYParser.h similarity index 66% rename from BRYHTMLParser/HTMLParser.h rename to BRYHTMLParser/BRYParser.h index f8242d2..e216c60 100644 --- a/BRYHTMLParser/HTMLParser.h +++ b/BRYHTMLParser/BRYParser.h @@ -1,5 +1,5 @@ // -// HTMLParser.h +// BRYParser.h // StackOverflow // // Created by Ben Reeves on 09/03/2010. @@ -7,21 +7,21 @@ // #import -#import "HTMLNode.h" +#import "BRYNode.h" -@interface HTMLParser : NSObject +@interface BRYParser : NSObject /// Returns the doc tag -@property (nonatomic, readonly) id doc; +@property (nonatomic, readonly) id doc; /// Returns the body tag -@property (nonatomic, readonly) id body; +@property (nonatomic, readonly) id body; /// Returns the html tag -@property (nonatomic, readonly) id html; +@property (nonatomic, readonly) id html; /// Returns the head tag -@property (nonatomic, readonly) id head; +@property (nonatomic, readonly) id head; - (instancetype)initWithContentsOfURL:(NSURL *)url error:(NSError **)error; diff --git a/BRYHTMLParser/HTMLParser.m b/BRYHTMLParser/BRYParser.m similarity index 91% rename from BRYHTMLParser/HTMLParser.m rename to BRYHTMLParser/BRYParser.m index 4d09028..dc7ab83 100644 --- a/BRYHTMLParser/HTMLParser.m +++ b/BRYHTMLParser/BRYParser.m @@ -6,23 +6,23 @@ // Copyright 2010 Ben Reeves. All rights reserved. // -#import "LibXMLHTMLNode.h" -#import "HTMLParser.h" +#import "BRYLibXMLHTMLNode.h" +#import "BRYParser.h" #import -@implementation HTMLParser { +@implementation BRYParser { htmlDocPtr _doc; } --(LibXMLHTMLNode*)doc +-(BRYLibXMLHTMLNode*)doc { if (_doc == NULL) return NULL; - return [[LibXMLHTMLNode alloc] initWithXMLNode:(xmlNode*)_doc]; + return [[BRYLibXMLHTMLNode alloc] initWithXMLNode:(xmlNode*)_doc]; } --(LibXMLHTMLNode*)html +-(BRYLibXMLHTMLNode*)html { if (_doc == NULL) return NULL; @@ -30,7 +30,7 @@ -(LibXMLHTMLNode*)html return [[self doc] findChildTag:@"html"]; } --(LibXMLHTMLNode*)head +-(BRYLibXMLHTMLNode*)head { if (_doc == NULL) return NULL; @@ -38,7 +38,7 @@ -(LibXMLHTMLNode*)head return [[self doc] findChildTag:@"head"]; } --(LibXMLHTMLNode*)body +-(BRYLibXMLHTMLNode*)body { if (_doc == NULL) return NULL; diff --git a/README.md b/README.md index ead648e..7240119 100644 --- a/README.md +++ b/README.md @@ -27,18 +27,18 @@ NSString *html = "" "Hello World 1" "Hello World 2"; -HTMLParser *parser = [[HTMLParser alloc] initWithString:html error:&error]; +BRYParser *parser = [[BRYParser alloc] initWithString:html error:&error]; if (error) { NSLog(@"Error: %@", error); return; } -HTMLNode *bodyNode = [parser body]; +BRYNode *bodyNode = [parser body]; NSArray *inputNodes = [bodyNode findChildTags:@"input"]; -for (HTMLNode *inputNode in inputNodes) { +for (BRYNode *inputNode in inputNodes) { if ([[inputNode getAttributeNamed:@"name"] isEqualToString:@"input2"]) { NSLog(@"%@", [inputNode getAttributeNamed:@"value"]); //Answer to first question } @@ -46,7 +46,7 @@ for (HTMLNode *inputNode in inputNodes) { NSArray *spanNodes = [bodyNode findChildTags:@"span"]; -for (HTMLNode *spanNode in spanNodes) { +for (BRYNode *spanNode in spanNodes) { if ([[spanNode getAttributeNamed:@"class"] isEqualToString:@"spantext"]) { NSLog(@"%@", [spanNode rawContents]); //Answer to second question } From b8e8bfbc25b23866e81118a7a30d81fc3e279787 Mon Sep 17 00:00:00 2001 From: Pauli Jokela Date: Sun, 2 Oct 2016 17:40:52 +0300 Subject: [PATCH 2/4] Removed .DS_Store --- .DS_Store | Bin 6148 -> 0 bytes .gitignore | 3 +++ 2 files changed, 3 insertions(+) delete mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 4856f6145b81ae388b814ff1e380bde1dc8b9211..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK!AiqG5Pe%KR7B`WJqElB{euu9cu)}Q#al}w6=}O6S`kk<`Ez>oOZ)=g>@1}v z_D~O^G6OSjGntum-@;A@fXn7Z59k8uPz75%G+&6k7i~x@dbWu!)VRVq&TxStsz$Uq zej@{Nc6-QhiEEr<`TXv2gX*zg%_e>}W)x2t2kRqoj3dPj3|9wD7y*cFx`S{nvxMX%5z~mZBHvJ)rV=&P#Sz14I{itE zOC#2bnhqC-4;R1e;)LSD*I7Ra;c%&KAG^~3Pu9=>t4a1`3>X9diUHTo z`+3GK#opT3ob=j+I-rV3T&=iB;UctR#!4$bqz0iskp(f0SS!*)u|EQV1~bOMk23HH D3}i_q diff --git a/.gitignore b/.gitignore index 05096f6..3c848c7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +.DS_Store +Thumbs.db + # Xcode # # gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore From 44b55cc4856b2fedb23ca3dbea917caa253cd916 Mon Sep 17 00:00:00 2001 From: Pauli Jokela Date: Sun, 2 Oct 2016 17:54:11 +0300 Subject: [PATCH 3/4] Renamed different node types --- BRYHTMLParser/BRYLibXMLHTMLNode.m | 44 +++++++++++++++---------------- BRYHTMLParser/BRYNode.h | 42 ++++++++++++++--------------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/BRYHTMLParser/BRYLibXMLHTMLNode.m b/BRYHTMLParser/BRYLibXMLHTMLNode.m index c40eff3..8f8e0ea 100644 --- a/BRYHTMLParser/BRYLibXMLHTMLNode.m +++ b/BRYHTMLParser/BRYLibXMLHTMLNode.m @@ -351,54 +351,54 @@ -(NSString*)contents return nil; } -HTMLNodeType nodeType(xmlNode * _node) +BRYNodeType nodeType(xmlNode * _node) { if (_node == NULL || _node->name == NULL) - return HTMLUnkownNode; + return BRYUnkownNode; const char * tagName = (const char*)_node->name; if (strcmp(tagName, "a") == 0) - return HTMLHrefNode; + return BRYHrefNode; else if (strcmp(tagName, "text") == 0) - return HTMLTextNode; + return BRYTextNode; else if (strcmp(tagName, "code") == 0) - return HTMLCodeNode; + return BRYCodeNode; else if (strcmp(tagName, "span") == 0) - return HTMLSpanNode; + return BRYSpanNode; else if (strcmp(tagName, "p") == 0) - return HTMLPNode; + return BRYPNode; else if (strcmp(tagName, "ul") == 0) - return HTMLUlNode; + return BRYUlNode; else if (strcmp(tagName, "li") == 0) - return HTMLLiNode; + return BRYLiNode; else if (strcmp(tagName, "img") == 0) - return HTMLImageNode; + return BRYImageNode; else if (strcmp(tagName, "ol") == 0) - return HTMLOlNode; + return BRYOlNode; else if (strcmp(tagName, "strong") == 0) - return HTMLStrongNode; + return BRYStrongNode; else if (strcmp(tagName, "pre") == 0) - return HTMLPreNode; + return BRYPreNode; else if (strcmp(tagName, "blockquote") == 0) - return HTMLBlockQuoteNode; + return BRYBlockQuoteNode; else if (strcmp(tagName, "b") == 0) - return HTMLBoldNode; + return BRYBoldNode; else if (strcmp(tagName, "i") == 0) - return HTMLItalicNode; + return BRYItalicNode; else if (strcmp(tagName, "strike") == 0) - return HTMLStrikeNode; + return BRYStrikeNode; else if (strcmp(tagName, "br") == 0) - return HTMLBrNode; + return BRYBrNode; else if (strcmp(tagName, "em") == 0) - return HTMLEmNode; + return BRYEmNode; else if (strcmp(tagName, "del") == 0) - return HTMLDelNode; + return BRYDelNode; else - return HTMLUnkownNode; + return BRYUnkownNode; } --(HTMLNodeType)nodetype +-(BRYNodeType)nodetype { return nodeType(_node); } diff --git a/BRYHTMLParser/BRYNode.h b/BRYHTMLParser/BRYNode.h index 9e2ef03..9855add 100644 --- a/BRYHTMLParser/BRYNode.h +++ b/BRYHTMLParser/BRYNode.h @@ -8,33 +8,33 @@ #import -typedef NS_ENUM(unsigned int, HTMLNodeType) { - HTMLUnkownNode, +typedef NS_ENUM(unsigned int, BRYNodeType) { + BRYUnkownNode, - HTMLHrefNode, - HTMLTextNode, - HTMLSpanNode, + BRYHrefNode, + BRYTextNode, + BRYSpanNode, - HTMLOlNode, - HTMLUlNode, - HTMLLiNode, + BRYOlNode, + BRYUlNode, + BRYLiNode, - HTMLImageNode, + BRYImageNode, - HTMLStrongNode, - HTMLEmNode, - HTMLDelNode, + BRYStrongNode, + BRYEmNode, + BRYDelNode, - HTMLBoldNode, - HTMLItalicNode, - HTMLStrikeNode, + BRYBoldNode, + BRYItalicNode, + BRYStrikeNode, - HTMLPNode, - HTMLBrNode, - HTMLBlockQuoteNode, + BRYPNode, + BRYBrNode, + BRYBlockQuoteNode, - HTMLPreNode, - HTMLCodeNode, + BRYPreNode, + BRYCodeNode, }; @protocol BRYNode @@ -70,7 +70,7 @@ typedef NS_ENUM(unsigned int, HTMLNodeType) { @property (nonatomic, readonly, copy) NSArray *children; /// Returns the node type if know -@property (nonatomic, readonly) HTMLNodeType nodetype; +@property (nonatomic, readonly) BRYNodeType nodetype; /// Gets the attribute value matching tha name - (NSString *)getAttributeNamed:(NSString *)name; From 3b11c12dc3d4f1dbbe15a9b7bb7248601b81b968 Mon Sep 17 00:00:00 2001 From: Pauli Jokela Date: Sun, 2 Oct 2016 17:58:21 +0300 Subject: [PATCH 4/4] Bumping up version --- BRYHTMLParser.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BRYHTMLParser.podspec b/BRYHTMLParser.podspec index 0eade61..811c847 100644 --- a/BRYHTMLParser.podspec +++ b/BRYHTMLParser.podspec @@ -4,7 +4,7 @@ Pod::Spec.new do |s| s.license = 'MIT' s.platform = :ios s.homepage = 'https://github.com/irace/BRYHTMLParser' - s.version = '2.1.3' + s.version = '2.1.4' s.summary = 'An Objective-C wrapper around libxml for parsing HTML.' s.source = { :git => 'https://github.com/irace/BRYHTMLParser.git', :tag => "#{s.version}" } s.source_files = 'BRYHTMLParser/*.{h,m}'