Merge pull request topfunky#7 from zadr/master

Fixes the build, a lot of code cleanup and add some new methods

Author: topfunky

Hpple.xcodeproj/project.pbxproj

@@ -119,7 +119,6 @@
 			children = (
 				32CA4F630368D1EE00C91783 /* Hpple_Prefix.pch */,
 				29B97316FDCFA39411CA2CEA /* main.m */,
-				75D786350F34E8A600173CB6 /* libxml2.2.dylib */,
 			);
 			name = "Other Sources";
 			sourceTree = "<group>";
@@ -136,6 +135,7 @@
 		29B97323FDCFA39411CA2CEA /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				75D786350F34E8A600173CB6 /* libxml2.2.dylib */,
 				1DF5F4DF0D08C38300B7A737 /* UIKit.framework */,
 				1D30AB110D05D00D00671497 /* Foundation.framework */,
 				288765FC0DF74451002DB57D /* CoreGraphics.framework */,
@@ -232,7 +232,11 @@
 			isa = PBXProject;
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Hpple" */;
 			compatibilityVersion = "Xcode 3.1";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
+			knownRegions = (
+				en,
+			);
 			mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -311,29 +315,60 @@
 		1D6058940D05DD3E006BFB54 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Geoffrey Grosenbach";
+				ALWAYS_SEARCH_USER_PATHS = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_DYNAMIC_NO_PIC = YES;
+				GCC_ENABLE_CPP_EXCEPTIONS = NO;
+				GCC_ENABLE_CPP_RTTI = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = NO;
+				GCC_FAST_MATH = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = Hpple_Prefix.pch;
+				GCC_UNROLL_LOOPS = YES;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
+				GCC_WARN_PEDANTIC = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				HEADER_SEARCH_PATHS = /usr/include/libxml2;
 				INFOPLIST_FILE = Info.plist;
+				LLVM_LTO = YES;
 				PRODUCT_NAME = Hpple;
-				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "CD1F1B03-3E48-4552-ABEF-FDFFFA2F6956";
-				SDKROOT = iphoneos3.0;
+				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
+				RUN_CLANG_STATIC_ANALYZER = YES;
+				SDKROOT = iphoneos;
 			};
 			name = Debug;
 		};
 		1D6058950D05DD3E006BFB54 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
+				ALWAYS_SEARCH_USER_PATHS = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
 				COPY_PHASE_STRIP = YES;
+				GCC_DYNAMIC_NO_PIC = YES;
+				GCC_ENABLE_CPP_EXCEPTIONS = NO;
+				GCC_ENABLE_CPP_RTTI = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = NO;
+				GCC_FAST_MATH = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = Hpple_Prefix.pch;
+				GCC_UNROLL_LOOPS = YES;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
+				GCC_WARN_PEDANTIC = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
 				INFOPLIST_FILE = Info.plist;
+				LLVM_LTO = YES;
 				PRODUCT_NAME = Hpple;
+				RUN_CLANG_STATIC_ANALYZER = YES;
+				SDKROOT = iphoneos;
 			};
 			name = Release;
 		};
@@ -390,14 +425,14 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Geoffrey Grosenbach";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS2.2.sdk/usr/include/libxml2;
 				ONLY_ACTIVE_ARCH = YES;
 				PREBINDING = NO;
-				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "CD1F1B03-3E48-4552-ABEF-FDFFFA2F6956";
+				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
 				SDKROOT = iphoneos2.2.1;
 			};
 			name = Debug;

TFHpple.h

@@ -33,15 +33,21 @@
 #import "TFHppleElement.h"
 
 @interface TFHpple : NSObject {
+@private
   NSData * data;
   BOOL isXML;
 }
 
 - (id) initWithData:(NSData *)theData isXML:(BOOL)isDataXML;
-- (id) initWithHTMLData:(NSData *)theData;
 - (id) initWithXMLData:(NSData *)theData;
-- (NSArray *) search:(NSString *)xPathOrCSS;
-- (TFHppleElement *) at:(NSString *)xPathOrCSS;
+- (id) initWithHTMLData:(NSData *)theData;
+
++ (TFHpple *) hppleWithData:(NSData *)theData isXML:(BOOL)isDataXML;
++ (TFHpple *) hppleWithXMLData:(NSData *)theData;
++ (TFHpple *) hppleWithHTMLData:(NSData *)theData;
+
+- (NSArray *) searchWithXPathQuery:(NSString *)xPathOrCSS;
+- (TFHppleElement *) peekAtSearchWithXPathQuery:(NSString *)xPathOrCSS;
 
 @property (retain) NSData * data;
 

TFHpple.m

@@ -42,10 +42,12 @@ - (void) dealloc
 
 - (id) initWithData:(NSData *)theData isXML:(BOOL)isDataXML
 {
-  if (!(self = [super init]))
+  if (!(self = [super init])) {
     return nil;
+  }
 
-  self.data = theData;
+  [theData retain];
+  data = theData;
   isXML = isDataXML;
 
   return self;
@@ -61,10 +63,24 @@ - (id) initWithHTMLData:(NSData *)theData
   return [self initWithData:theData isXML:NO];
 }
 
++ (TFHpple *) hppleWithData:(NSData *)theData isXML:(BOOL)isDataXML {
+  return [[[[self class] alloc] initWithData:theData isXML:isDataXML] autorelease];
+}
+
++ (TFHpple *) hppleWithHTMLData:(NSData *)theData {
+  return [[self class] hppleWithData:theData isXML:NO];
+}
+
++ (TFHpple *) hppleWithXMLData:(NSData *)theData {
+  return [[self class] hppleWithData:theData isXML:YES];
+}
+
+#pragma mark -
+
 // Returns all elements at xPath.
-- (NSArray *) search:(NSString *)xPathOrCSS
+- (NSArray *) searchWithXPathQuery:(NSString *)xPathOrCSS
 {
-  NSArray * detailNodes;
+  NSArray * detailNodes = nil;
   if (isXML) {
     detailNodes = PerformXMLXPathQuery(data, xPathOrCSS);
   } else {
@@ -73,19 +89,18 @@ - (NSArray *) search:(NSString *)xPathOrCSS
 
   NSMutableArray * hppleElements = [NSMutableArray array];
   for (id node in detailNodes) {
-    TFHppleElement * e = [[TFHppleElement alloc] initWithNode:node];
-    [hppleElements addObject:e];
-    [e release];
+    [hppleElements addObject:[TFHppleElement hppleElementWithNode:node]];
   }
   return hppleElements;
 }
 
 // Returns first element at xPath
-- (TFHppleElement *) at:(NSString *)xPathOrCSS
+- (TFHppleElement *) peekAtSearchWithXPathQuery:(NSString *)xPathOrCSS
 {
-  NSArray * elements = [self search:xPathOrCSS];
-  if ([elements count] >= 1)
+  NSArray * elements = [self searchWithXPathQuery:xPathOrCSS];
+  if ([elements count] >= 1) {
     return [elements objectAtIndex:0];
+  }
 
   return nil;
 }

TFHppleElement.h

@@ -31,21 +31,33 @@
 
 
 @interface TFHppleElement : NSObject {
+@private
   NSDictionary * node;
 }
 
 - (id) initWithNode:(NSDictionary *) theNode;
 
++ (TFHppleElement *) hppleElementWithNode:(NSDictionary *) theNode;
+
 // Returns this tag's innerHTML content.
-- (NSString *) content;
+@property (nonatomic, readonly) NSString *content;
 
 // Returns the name of the current tag, such as "h3".
-- (NSString *) tagName;
+@property (nonatomic, readonly) NSString *tagName;
 
 // Returns tag attributes with name as key and content as value.
 //   href  = 'http://peepcode.com'
 //   class = 'highlight'
-- (NSDictionary *) attributes;
+@property (nonatomic, readonly) NSDictionary *attributes;
+
+// Returns the children of a given node
+@property (nonatomic, readonly) NSArray *children;
+
+// Returns the first child of a given node
+@property (nonatomic, readonly) TFHppleElement *firstChild;
+
+// the parent of a node
+@property (nonatomic, retain, readonly) TFHppleElement *parent;
 
 // Provides easy access to the content of a specific attribute, 
 // such as 'href' or 'class'.

TFHppleElement.m

@@ -30,17 +30,23 @@
 
 #import "TFHppleElement.h"
 
-NSString * const TFHppleNodeContentKey           = @"nodeContent";
-NSString * const TFHppleNodeNameKey              = @"nodeName";
-NSString * const TFHppleNodeAttributeArrayKey    = @"nodeAttributeArray";
-NSString * const TFHppleNodeAttributeNameKey     = @"attributeName";
+static NSString * const TFHppleNodeContentKey           = @"nodeContent";
+static NSString * const TFHppleNodeNameKey              = @"nodeName";
+static NSString * const TFHppleNodeChildrenKey          = @"nodeChildArray";
+static NSString * const TFHppleNodeAttributeArrayKey    = @"nodeAttributeArray";
+static NSString * const TFHppleNodeAttributeNameKey     = @"attributeName";
+
+@interface TFHppleElement ()
+@property (nonatomic, retain, readwrite) TFHppleElement *parent;
+@end
 
 @implementation TFHppleElement
+@synthesize parent;
 
 - (void) dealloc
 {
   [node release];
-
+  [parent release];
   [super dealloc];
 }
 
@@ -55,6 +61,11 @@ - (id) initWithNode:(NSDictionary *) theNode
   return self;
 }
 
++ (TFHppleElement *) hppleElementWithNode:(NSDictionary *) theNode {
+  return [[[[self class] alloc] initWithNode:theNode] autorelease];
+}
+
+#pragma mark -
 
 - (NSString *) content
 {
@@ -67,6 +78,26 @@ - (NSString *) tagName
   return [node objectForKey:TFHppleNodeNameKey];
 }
 
+- (NSArray *) children
+{
+  NSMutableArray *children = [NSMutableArray array];
+  for (NSDictionary *child in [node objectForKey:TFHppleNodeChildrenKey]) {
+      TFHppleElement *element = [TFHppleElement hppleElementWithNode:child];
+      element.parent = self;
+      [children addObject:element];
+  }
+  return children;
+}
+
+- (TFHppleElement *) firstChild
+{
+  NSArray * children = self.children;
+  if (children.count)
+    return [children objectAtIndex:0];
+  return nil;
+}
+
+
 - (NSDictionary *) attributes
 {
   NSMutableDictionary * translatedAttributes = [NSMutableDictionary dictionary];

XPathQuery.h

@@ -7,4 +7,4 @@
 //
 
 NSArray *PerformHTMLXPathQuery(NSData *document, NSString *query);
-NSArray *PerformXMLXPathQuery(NSData *document, NSString *query);
+NSArray *PerformXMLXPathQuery(NSData *document, NSString *query);

XPathQuery.m

@@ -14,6 +14,9 @@
 #import <libxml/xpath.h>
 #import <libxml/xpathInternals.h>
 
+NSDictionary *DictionaryForNode(xmlNodePtr currentNode, NSMutableDictionary *parentResult);
+NSArray *PerformXPathQuery(xmlDocPtr doc, NSString *query);
+
 NSDictionary *DictionaryForNode(xmlNodePtr currentNode, NSMutableDictionary *parentResult)
 {
   NSMutableDictionary *resultForNode = [NSMutableDictionary dictionary];
@@ -150,7 +153,7 @@
   xmlDocPtr doc;
 
   /* Load XML document */
-  doc = htmlReadMemory([document bytes], [document length], "", NULL, HTML_PARSE_NOWARNING | HTML_PARSE_NOERROR);
+  doc = htmlReadMemory([document bytes], (int)[document length], "", NULL, HTML_PARSE_NOWARNING | HTML_PARSE_NOERROR);
 
   if (doc == NULL)
     {
@@ -169,7 +172,7 @@
   xmlDocPtr doc;
 
   /* Load XML document */
-  doc = xmlReadMemory([document bytes], [document length], "", NULL, XML_PARSE_RECOVER);
+  doc = xmlReadMemory([document bytes], (int)[document length], "", NULL, XML_PARSE_RECOVER);
 
   if (doc == NULL)
     {