Commit: 4eaf17a300a4cb461aeee7d4039480e9ca07892c - CDEvents (git)

An Objective-C wrapper for Mac OS X’s FSEvents C API.

Commit MetaInfo

• Revision: 4eaf17a300a4cb461aeee7d4039480e9ca07892c (tree)
• Time: 2013-07-03 04:43:35
• Author: Aron Cedercrantz <aron@cede...>
• Commiter: Aron Cedercrantz

Log Message

Merge tag '1.2.0'

1.2.0 - Requires ARC and blocks. Does not support GC.

* tag '1.2.0': (32 commits)

Bump copyright years.
Change framework version to 1.2.0.
Update podspec to 1.2.0.
Add compile time check of ARC and blocks.
Update Xcode project.
Fix ARC setting in podspec.
Add podspec by @dwlnetnl (#13).
Remove link to GitHub messages.
Correctly handle path that contains spaces
Made CDEvents class create CDEvent objects with file URLs instead of normal URLs (allows easier comparison with NSURL objects returned by eg. NSFileManager)
Update README.mdown
Fix contributors URL.
Change the authors section in the readme.
Update readme with link to new website.
Ignore "docs" directory.
Update readme to reflect online documentation.
Add license file.
Add script to generate documentation using appledoc.
Update the read me to reflect the new changes.
Update the test app to be able to use blocks API.
...

Change Summary

• modified: .gitattributes
• modified: .gitignore
• modified: CDEvent.h
• modified: CDEvent.m
• modified: CDEvents.h
• modified: CDEvents.m
• add: CDEvents.podspec
• modified: CDEvents.xcodeproj/project.pbxproj
• modified: CDEventsDelegate.h
• modified: Info.plist
• add: LICENSE
• modified: README.mdown
• modified: TestApp/CDEventsTestAppController.m
• add: api.appledoc.sh

Incremental Difference

--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,2 @@
-*.pbxproj	binary
 *.m		diff=objc
 *.mm		diff=objc

--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@ build
 *~.xib
 
 api
+docs

--- a/CDEvent.h
+++ b/CDEvent.h
@@ -1,7 +1,7 @@
 /**
  * CDEvents
  *
- * Copyright (c) 2010 Aron Cedercrantz
+ * Copyright (c) 2010-2012 Aron Cedercrantz
  * http://github.com/rastersize/CDEvents/
  *
  * Permission is hereby granted, free of charge, to any person
@@ -67,13 +67,7 @@ typedef FSEventStreamEventFlags CDEventFlags;
  *
  * @since 1.0.0
  */
-@interface CDEvent : NSObject <NSCoding, NSCopying> {
-@private
-	CDEventIdentifier			_identifier;
-	NSDate						*_date;
-	NSURL						*_URL;
-	CDEventFlags				_flags;
-}
+@interface CDEvent : NSObject <NSCoding, NSCopying> {}
 
 #pragma mark Properties
 /** @name Getting Event Properties */
@@ -95,7 +89,7 @@ typedef FSEventStreamEventFlags CDEventFlags;
  *
  * @since 1.0.0
  */
-@property (readonly) NSDate						*date;
+@property (unsafe_unretained, readonly) NSDate	*date;
 
 /**
  * The URL of the item which changed.
@@ -104,7 +98,7 @@ typedef FSEventStreamEventFlags CDEventFlags;
  *
  * @since 1.0.0
  */
-@property (readonly) NSURL						*URL;
+@property (unsafe_unretained, readonly) NSURL	*URL;
 
 
 /** @name Getting Event Flags */

--- a/CDEvent.m
+++ b/CDEvent.m
@@ -1,7 +1,7 @@
 /**
  * CDEvents
  *
- * Copyright (c) 2010 Aron Cedercrantz
+ * Copyright (c) 2010-2012 Aron Cedercrantz
  * http://github.com/rastersize/CDEvents/
  *
  * Permission is hereby granted, free of charge, to any person
@@ -44,22 +44,14 @@
 							 URL:(NSURL *)URL
 						   flags:(CDEventFlags)flags
 {
-	return [[[CDEvent alloc] initWithIdentifier:identifier
+	return [[CDEvent alloc] initWithIdentifier:identifier
 										   date:date
 											URL:URL
-										  flags:flags]
-			autorelease];
+										  flags:flags];
 }
 
 
 #pragma mark Init/dealloc methods
-- (void)dealloc
-{
-	[_date release];
-	[_URL release];
-	
-	[super dealloc];
-}
 
 - (id)initWithIdentifier:(NSUInteger)identifier
 					date:(NSDate *)date
@@ -69,8 +61,8 @@
 	if ((self = [super init])) {
 		_identifier	= identifier;
 		_flags		= flags;
-		_date		= [date retain];
-		_URL		= [URL retain];
+		_date		= date;
+		_URL		= URL;
 	}
 	
 	return self;
@@ -101,7 +93,7 @@
 - (id)copyWithZone:(NSZone *)zone
 {
 	// We can do this since we are immutable.
-	return [self retain];
+	return self;
 }
 
 #pragma mark Specific flag properties 

--- a/CDEvents.h
+++ b/CDEvents.h
@@ -1,7 +1,7 @@
 /**
  * CDEvents
  *
- * Copyright (c) 2010 Aron Cedercrantz
+ * Copyright (c) 2010-2012 Aron Cedercrantz
  * http://github.com/rastersize/CDEvents/
  *
  * Permission is hereby granted, free of charge, to any person
@@ -95,6 +95,17 @@ extern const CDEventIdentifier kCDEventsSinceEventNow;
 
 
 #pragma mark -
+#pragma mark CDEvents Block Type
+@class CDEvents;
+/**
+ * Type of the block which gets called when an event occurs.
+ *
+ * @since head
+ */
+typedef void (^CDEventsEventBlock)(CDEvents *watcher, CDEvent *event);
+
+
+#pragma mark -
 #pragma mark CDEvents interface
 /**
  * An Objective-C wrapper for the <code>FSEvents</code> C API.
@@ -105,23 +116,7 @@ extern const CDEventIdentifier kCDEventsSinceEventNow;
  *
  * @since 1.0.0
  */
-@interface CDEvents : NSObject <NSCopying> {
-@private
-	__weak id<CDEventsDelegate>	_delegate;
-	
-	FSEventStreamRef			_eventStream;
-	CFTimeInterval				_notificationLatency;
-	
-	CDEventIdentifier			_sinceEventIdentifier;
-	NSUInteger					_eventStreamCreationFlags;
-	
-	BOOL						_ignoreEventsFromSubDirectories;
-	
-	CDEvent						*_lastEvent;
-	
-	NSArray						*_watchedURLs;
-	NSArray						*_excludedURLs;
-}
+@interface CDEvents : NSObject <NSCopying> {}
 
 #pragma mark Properties
 /** @name Managing the Delegate */
@@ -135,7 +130,17 @@ extern const CDEventIdentifier kCDEventsSinceEventNow;
  *
  * @since 1.0.0
  */
-@property (assign) __weak id<CDEventsDelegate>	delegate;
+@property (unsafe_unretained) id<CDEventsDelegate>	delegate;
+
+/** @name Getting Event Block */
+/**
+ * The event block.
+ *
+ * @return The CDEventsEventBlock block which is executed when an event occurs.
+ *
+ * @since head
+ */
+@property (readonly) CDEventsEventBlock				eventBlock;
 
 /** @name Getting Event Watcher Properties */
 /**
@@ -145,7 +150,7 @@ extern const CDEventIdentifier kCDEventsSinceEventNow;
  *
  * @since 1.0.0
  */
-@property (readonly) CFTimeInterval				notificationLatency;
+@property (readonly) CFTimeInterval					notificationLatency;
 
 /**
  * The event identifier from which events will be supplied to the delegate.
@@ -154,16 +159,16 @@ extern const CDEventIdentifier kCDEventsSinceEventNow;
  *
  * @since 1.0.0
  */
-@property (readonly) CDEventIdentifier			sinceEventIdentifier;
+@property (readonly) CDEventIdentifier				sinceEventIdentifier;
 
 /**
- * The last event that occured and thas has been delivered to the delegate.
+ * The last event that occured and has been delivered to the delegate.
  *
- * @return The last event that occured and thas has been delivered to the delegate.
+ * @return The last event that occured and has been delivered to the delegate.
  *
  * @since 1.0.0
  */
-@property (retain, readonly) CDEvent			*lastEvent;
+@property (strong, readonly) CDEvent				*lastEvent;
 
 /**
  * The URLs that we watch for events.
@@ -172,7 +177,7 @@ extern const CDEventIdentifier kCDEventsSinceEventNow;
  *
  * @since 1.0.0
  */
-@property (readonly) NSArray					*watchedURLs;
+@property (copy, readonly) NSArray					*watchedURLs;
 
 
 /** @name Configuring the Event watcher */
@@ -184,7 +189,7 @@ extern const CDEventIdentifier kCDEventsSinceEventNow;
  *
  * @since 1.0.0
  */
-@property (copy) NSArray						*excludedURLs;
+@property (copy) NSArray							*excludedURLs;
 
 /**
  * Wheter events from sub-directories of the watched URLs should be ignored or not.
@@ -194,7 +199,7 @@ extern const CDEventIdentifier kCDEventsSinceEventNow;
  *
  * @since 1.0.0
  */
-@property (assign) BOOL							ignoreEventsFromSubDirectories;
+@property (assign) BOOL								ignoreEventsFromSubDirectories;
 
 
 #pragma mark Event identifier class methods
@@ -211,8 +216,8 @@ extern const CDEventIdentifier kCDEventsSinceEventNow;
 + (CDEventIdentifier)currentEventIdentifier;
 
 
-#pragma mark Init methods
-/** @name Creating CDEvents Objects */
+#pragma mark Creating CDEvents Objects With a Delegate
+/** @name Creating CDEvents Objects With a Delegate */
 /**
  * Returns an <code>CDEvents</code> object initialized with the given URLs to watch.
  *
@@ -271,8 +276,6 @@ extern const CDEventIdentifier kCDEventsSinceEventNow;
 			delegate:(id<CDEventsDelegate>)delegate
 		  onRunLoop:(NSRunLoop *)runLoop;
 
-
-
 /**
  * Returns an <code>CDEvents</code> object initialized with the given URLs to watch, URLs to exclude, wheter events from sub-directories are ignored or not and schedules the watcher on the given run loop.
  *
@@ -311,6 +314,104 @@ ignoreEventsFromSubDirs:(BOOL)ignoreEventsFromSubDirs
 		 excludeURLs:(NSArray *)exludeURLs
  streamCreationFlags:(CDEventsEventStreamCreationFlags)streamCreationFlags;
 
+#pragma mark Creating CDEvents Objects With a Block
+/** @name Creating CDEvents Objects With a Block */
+/**
+ * Returns an <code>CDEvents</code> object initialized with the given URLs to watch.
+ *
+ * @param URLs An array of URLs we want to watch.
+ * @param block The block which the CDEvents object executes when it recieves an event.
+ * @return An CDEvents object initialized with the given URLs to watch. 
+ * @throws NSInvalidArgumentException if <em>URLs</em> is empty or points to <code>nil</code>.
+ * @throws NSInvalidArgumentException if <em>delegate</em>is <code>nil</code>.
+ * @throws CDEventsEventStreamCreationFailureException if we failed to create a event stream.
+ *
+ * @see initWithURLs:delegate:onRunLoop:
+ * @see initWithURLs:delegate:onRunLoop:sinceEventIdentifier:notificationLantency:ignoreEventsFromSubDirs:excludeURLs:streamCreationFlags:
+ * @see CDEventsEventBlock
+ * @see kCDEventsDefaultEventStreamFlags
+ * @see kCDEventsSinceEventNow
+ *
+ * @discussion Calls initWithURLs:block:onRunLoop:sinceEventIdentifier:notificationLantency:ignoreEventsFromSubDirs:excludeURLs:streamCreationFlags:
+ * with <code>sinceEventIdentifier</code> with the event identifier for "event
+ * since now", <code>notificationLatency</code> set to 3.0 seconds,
+ * <code>ignoreEventsFromSubDirectories</code> set to <code>NO</code>,
+ * <code>excludedURLs</code> to <code>nil</code>, the event stream creation
+ * flags will be set to <code>kCDEventsDefaultEventStreamFlags</code> and
+ * schedueled on the current run loop.
+ *
+ * @since head
+ */
+- (id)initWithURLs:(NSArray *)URLs block:(CDEventsEventBlock)block;
+
+/**
+ * Returns an <code>CDEvents</code> object initialized with the given URLs to watch and schedules the watcher on the given run loop.
+ *
+ * @param URLs An array of URLs we want to watch.
+ * @param block The block which the CDEvents object executes when it recieves an event.
+ * @param runLoop The run loop which the which the watcher should be schedueled on.
+ * @return An CDEvents object initialized with the given URLs to watch.
+ * @throws NSInvalidArgumentException if <em>URLs</em> is empty or points to <code>nil</code>.
+ * @throws NSInvalidArgumentException if <em>delegate</em>is <code>nil</code>.
+ * @throws CDEventsEventStreamCreationFailureException if we failed to create a event stream.
+ *
+ * @see initWithURLs:delegate:
+ * @see initWithURLs:delegate:onRunLoop:sinceEventIdentifier:notificationLantency:ignoreEventsFromSubDirs:excludeURLs:streamCreationFlags:
+ * @see CDEventsEventBlock
+ * @see kCDEventsDefaultEventStreamFlags
+ * @see kCDEventsSinceEventNow
+ *
+ * @discussion Calls initWithURLs:delegate:onRunLoop:sinceEventIdentifier:notificationLantency:ignoreEventsFromSubDirs:excludeURLs:streamCreationFlags:
+ * with <code>sinceEventIdentifier</code> with the event identifier for "event
+ * since now", <code>notificationLatency</code> set to 3.0 seconds,
+ * <code>ignoreEventsFromSubDirectories</code> set to <code>NO</code>,
+ * <code>excludedURLs</code> to <code>nil</code> and the event stream creation
+ * flags will be set to <code>kCDEventsDefaultEventStreamFlags</code>.
+ *
+ * @since head
+ */
+- (id)initWithURLs:(NSArray *)URLs
+			 block:(CDEventsEventBlock)block
+		 onRunLoop:(NSRunLoop *)runLoop;
+
+/**
+ * Returns an <code>CDEvents</code> object initialized with the given URLs to watch, URLs to exclude, wheter events from sub-directories are ignored or not and schedules the watcher on the given run loop.
+ *
+ * @param URLs An array of URLs (<code>NSURL</code>) we want to watch.
+ * @param block The block which the CDEvents object executes when it recieves an event.
+ * @param runLoop The run loop which the which the watcher should be schedueled on.
+ * @param sinceEventIdentifier Events that have happened after the given event identifier will be supplied.
+ * @param notificationLatency The (approximate) time intervall between notifications sent to the delegate.
+ * @param ignoreEventsFromSubDirs Wheter events from sub-directories of the watched URLs should be ignored or not.
+ * @param exludeURLs An array of URLs that we should ignore events from. Pass <code>nil</code> if none should be excluded.
+ * @param streamCreationFlags The event stream creation flags.
+ * @return An CDEvents object initialized with the given URLs to watch, URLs to exclude, wheter events from sub-directories are ignored or not and run on the given run loop.
+ * @throws NSInvalidArgumentException if the parameter URLs is empty or points to <code>nil</code>.
+ * @throws NSInvalidArgumentException if <em>delegate</em>is <code>nil</code>.
+ * @throws CDEventsEventStreamCreationFailureException if we failed to create a event stream.
+ *
+ * @see initWithURLs:delegate:
+ * @see initWithURLs:delegate:onRunLoop:
+ * @see ignoreEventsFromSubDirectories
+ * @see excludedURLs
+ * @see CDEventsEventBlock
+ * @see FSEventStreamCreateFlags
+ *
+ * @discussion To ask for events "since now" pass the return value of
+ * currentEventIdentifier as the parameter <code>sinceEventIdentifier</code>.
+ * CDEventStreamCreationFailureException should be extremely rare.
+ *
+ * @since head
+ */
+- (id)initWithURLs:(NSArray *)URLs
+			 block:(CDEventsEventBlock)block
+		 onRunLoop:(NSRunLoop *)runLoop
+sinceEventIdentifier:(CDEventIdentifier)sinceEventIdentifier
+notificationLantency:(CFTimeInterval)notificationLatency
+ignoreEventsFromSubDirs:(BOOL)ignoreEventsFromSubDirs
+	   excludeURLs:(NSArray *)exludeURLs
+streamCreationFlags:(CDEventsEventStreamCreationFlags)streamCreationFlags;
+
 #pragma mark Flush methods
 /** @name Flushing Events */
 /**

--- a/CDEvents.m
+++ b/CDEvents.m
@@ -1,15 +1,48 @@
-//
-//  CDEvents.m
-//  CDEvents
-//
-//  Created by Aron Cedercrantz on 03/04/10.
-//  Copyright 2010 __MyCompanyName__. All rights reserved.
-//
+/**
+ * CDEvents
+ *
+ * Copyright (c) 2010-2012 Aron Cedercrantz
+ * http://github.com/rastersize/CDEvents/
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
 
 #import "CDEvents.h"
 
 #import "CDEventsDelegate.h"
 
+#ifndef __has_feature
+	#define __has_feature(x) 0
+#endif
+
+#if !__has_feature(objc_arc)
+	#error CDEvents must be built with ARC.
+#endif
+
+#if !__has_feature(blocks)
+	#error CDEvents must be built with support for blocks.
+#endif
+
+
 #pragma mark CDEvents custom exceptions
 NSString *const CDEventsEventStreamCreationFailureException = @"CDEventsEventStreamCreationFailureException";
 
@@ -25,9 +58,17 @@ const CDEventIdentifier kCDEventsSinceEventNow = kFSEventStreamEventIdSinceNow;
 #pragma mark -
 #pragma mark Private API
 // Private API
-@interface CDEvents ()
+@interface CDEvents () {
+@private
+	CDEventsEventBlock	_eventBlock;
+	
+	FSEventStreamRef	_eventStream;
+	NSUInteger			_eventStreamCreationFlags;
+}
 
-@property (retain, readwrite) CDEvent *lastEvent;
+// Redefine the properties that should be writeable.
+@property (strong, readwrite) CDEvent *lastEvent;
+@property (copy, readwrite) NSArray *watchedURLs;
 
 // The FSEvents callback function
 static void CDEventsCallback(
@@ -73,12 +114,6 @@ static void CDEventsCallback(
 	[self disposeEventStream];
 	
 	_delegate = nil;
-	
-	[_lastEvent release];
-	[_watchedURLs release];
-	[_excludedURLs release];
-	
-	[super dealloc];
 }
 
 - (void)finalize
@@ -113,22 +148,73 @@ static void CDEventsCallback(
 
 - (id)initWithURLs:(NSArray *)URLs
 		  delegate:(id<CDEventsDelegate>)delegate
-		   onRunLoop:(NSRunLoop *)runLoop
+		 onRunLoop:(NSRunLoop *)runLoop
 sinceEventIdentifier:(CDEventIdentifier)sinceEventIdentifier
 notificationLantency:(CFTimeInterval)notificationLatency
 ignoreEventsFromSubDirs:(BOOL)ignoreEventsFromSubDirs
-		 excludeURLs:(NSArray *)exludeURLs
- streamCreationFlags:(CDEventsEventStreamCreationFlags)streamCreationFlags
+	   excludeURLs:(NSArray *)exludeURLs
+streamCreationFlags:(CDEventsEventStreamCreationFlags)streamCreationFlags
 {
-	if (delegate == nil || URLs == nil || [URLs count] == 0) {
+	if (delegate == nil) {
+		[NSException raise:NSInvalidArgumentException
+					format:@"Invalid arguments passed to CDEvents init-method."];
+	}
+	
+	_delegate = delegate;
+	
+	return [self initWithURLs:URLs
+						block:^(CDEvents *watcher, CDEvent *event){
+							if ([(id)[watcher delegate] conformsToProtocol:@protocol(CDEventsDelegate)]) {
+								[[watcher delegate] URLWatcher:watcher eventOccurred:event];
+							}
+						}
+					onRunLoop:runLoop
+		 sinceEventIdentifier:sinceEventIdentifier
+		 notificationLantency:notificationLatency
+	  ignoreEventsFromSubDirs:ignoreEventsFromSubDirs
+				  excludeURLs:exludeURLs
+		  streamCreationFlags:streamCreationFlags];
+}
+
+
+#pragma mark Creating CDEvents Objects With a Block
+- (id)initWithURLs:(NSArray *)URLs block:(CDEventsEventBlock)block
+{
+	return [self initWithURLs:URLs block:block onRunLoop:[NSRunLoop currentRunLoop]];
+}
+
+- (id)initWithURLs:(NSArray *)URLs
+			 block:(CDEventsEventBlock)block
+		 onRunLoop:(NSRunLoop *)runLoop
+{
+	return [self initWithURLs:URLs
+						block:block
+					onRunLoop:runLoop
+		 sinceEventIdentifier:kCDEventsSinceEventNow
+		 notificationLantency:CD_EVENTS_DEFAULT_NOTIFICATION_LATENCY
+	  ignoreEventsFromSubDirs:CD_EVENTS_DEFAULT_IGNORE_EVENT_FROM_SUB_DIRS
+				  excludeURLs:nil
+		  streamCreationFlags:kCDEventsDefaultEventStreamFlags];
+}
+
+- (id)initWithURLs:(NSArray *)URLs
+			 block:(CDEventsEventBlock)block
+		 onRunLoop:(NSRunLoop *)runLoop
+sinceEventIdentifier:(CDEventIdentifier)sinceEventIdentifier
+notificationLantency:(CFTimeInterval)notificationLatency
+ignoreEventsFromSubDirs:(BOOL)ignoreEventsFromSubDirs
+	   excludeURLs:(NSArray *)exludeURLs
+streamCreationFlags:(CDEventsEventStreamCreationFlags)streamCreationFlags
+{
+	if (block == NULL || URLs == nil || [URLs count] == 0) {
 		[NSException raise:NSInvalidArgumentException
 					format:@"Invalid arguments passed to CDEvents init-method."];
 	}
 	
 	if ((self = [super init])) {
 		_watchedURLs = [URLs copy];
-		[self setExcludedURLs:exludeURLs];
-		[self setDelegate:delegate];
+		_excludedURLs = [exludeURLs copy];
+		_eventBlock = block;
 		
 		_sinceEventIdentifier = sinceEventIdentifier;
 		_eventStreamCreationFlags = streamCreationFlags;
@@ -157,7 +243,7 @@ ignoreEventsFromSubDirs:(BOOL)ignoreEventsFromSubDirs
 - (id)copyWithZone:(NSZone *)zone
 {
 	CDEvents *copy = [[CDEvents alloc] initWithURLs:[self watchedURLs]
-										   delegate:[self delegate]
+											  block:[self eventBlock]
 										  onRunLoop:[NSRunLoop currentRunLoop]
 							   sinceEventIdentifier:[self sinceEventIdentifier]
 							   notificationLantency:[self notificationLatency]
@@ -168,6 +254,12 @@ ignoreEventsFromSubDirs:(BOOL)ignoreEventsFromSubDirs
 	return copy;
 }
 
+#pragma mark Block
+- (CDEventsEventBlock)eventBlock
+{
+	return _eventBlock;
+}
+
 
 #pragma mark Flush methods
 - (void)flushSynchronously
@@ -193,10 +285,10 @@ ignoreEventsFromSubDirs:(BOOL)ignoreEventsFromSubDirs
 - (NSString *)streamDescription
 {
 	CFStringRef streamDescriptionCF = FSEventStreamCopyDescription(_eventStream);
-	NSString *returnString = [[NSString alloc] initWithString:(NSString *)streamDescriptionCF];
+	NSString *returnString = [[NSString alloc] initWithString:(__bridge NSString *)streamDescriptionCF];
 	CFRelease(streamDescriptionCF);
 	
-	return [returnString autorelease];
+	return returnString;
 }
 
 
@@ -205,7 +297,7 @@ ignoreEventsFromSubDirs:(BOOL)ignoreEventsFromSubDirs
 {
 	FSEventStreamContext callbackCtx;
 	callbackCtx.version			= 0;
-	callbackCtx.info			= (void *)self;
+	callbackCtx.info			= (__bridge void *)self;
 	callbackCtx.retain			= NULL;
 	callbackCtx.release			= NULL;
 	callbackCtx.copyDescription	= NULL;
@@ -218,7 +310,7 @@ ignoreEventsFromSubDirs:(BOOL)ignoreEventsFromSubDirs
 	_eventStream = FSEventStreamCreate(kCFAllocatorDefault,
 									   &CDEventsCallback,
 									   &callbackCtx,
-									   (CFArrayRef)watchedPaths,
+									   (__bridge CFArrayRef)watchedPaths,
 									   (FSEventStreamEventId)[self sinceEventIdentifier],
 									   [self notificationLatency],
 									   _eventStreamCreationFlags);
@@ -240,39 +332,40 @@ static void CDEventsCallback(
 	ConstFSEventStreamRef streamRef,
 	void *callbackCtxInfo,
 	size_t numEvents,
-	void *eventPaths,
+	void *eventPaths, // CFArrayRef
 	const FSEventStreamEventFlags eventFlags[],
 	const FSEventStreamEventId eventIds[])
 {
-	CDEvents *watcher = (CDEvents *)callbackCtxInfo;
-	
+	CDEvents *watcher			= (__bridge CDEvents *)callbackCtxInfo;
+	NSArray *eventPathsArray	= (__bridge NSArray *)eventPaths;
 	NSArray *watchedURLs		= [watcher watchedURLs];
 	NSArray *excludedURLs		= [watcher excludedURLs];
-	NSArray *eventPathsArray	= (NSArray *)eventPaths;
-	BOOL shouldIgnore			= NO;
 	CDEvent *lastEvent			= nil;
-	
+
 	for (NSUInteger i = 0; i < numEvents; ++i) {
-		shouldIgnore = NO;
+		BOOL shouldIgnore = NO;
+		FSEventStreamEventFlags flags = eventFlags[i];
+		FSEventStreamEventId identifier = eventIds[i];
 		
-		NSString *eventPath = [[eventPathsArray objectAtIndex:i]
-							   stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
-		NSURL *eventURL		= [NSURL URLWithString:eventPath];
 		// We do this hackery to ensure that the eventPath string doesn't
 		// contain any trailing slash.
-		eventPath			= [eventURL path];
+		NSURL *eventURL		= [NSURL fileURLWithPath:[[eventPathsArray objectAtIndex:i] stringByStandardizingPath]];
+		NSString *eventPath	= [eventURL path];
 		
+		// Ignore all events except for the URLs we are explicitly watching.
 		if ([watcher ignoreEventsFromSubDirectories]) {
 			shouldIgnore = YES;
-			for (NSURL *URL in watchedURLs) {
-				if ([[URL path] isEqualToString:eventPath]) {
+			for (NSURL *url in watchedURLs) {
+				if ([[url path] isEqualToString:eventPath]) {
 					shouldIgnore = NO;
 					break;
 				}
 			}
+		// Ignore all explicitly excludeded URLs (not required to check if we
+		// ignore all events from sub-directories).
 		} else if (excludedURLs != nil) {
-			for (NSURL *URL in excludedURLs) {
-				if ([eventPath hasPrefix:[URL path]]) {
+			for (NSURL *url in excludedURLs) {
+				if ([eventPath hasPrefix:[url path]]) {
 					shouldIgnore = YES;
 					break;
 				}
@@ -280,30 +373,16 @@ static void CDEventsCallback(
 		}
 		
 		if (!shouldIgnore) {
-			CDEvent *event = [[CDEvent alloc] initWithIdentifier:eventIds[i]
-												   date:[NSDate date]
-													URL:eventURL
-												  flags:eventFlags[i]];
-			// Dispose of old lastEvent and retain the currently last
-			[lastEvent release];
-			lastEvent = [event retain];
-			
-			if ([(id)[watcher delegate] conformsToProtocol:@protocol(CDEventsDelegate)]) {
-				[[watcher delegate] URLWatcher:watcher eventOccurred:event];
-			}
-			
-			// Last event?
-			if (i == (numEvents - 1)) {
-				[watcher setLastEvent:event];
-			}
+			CDEvent *event = [[CDEvent alloc] initWithIdentifier:identifier date:[NSDate date] URL:eventURL flags:flags];
+			lastEvent = event;
 			
-			[event release];
+			CDEventsEventBlock eventBlock = [watcher eventBlock];
+			eventBlock(watcher, event);
 		}
 	}
 	
 	if (lastEvent) {
 		[watcher setLastEvent:lastEvent];
-		[lastEvent release];
 	}
 }
 

--- /dev/null
+++ b/CDEvents.podspec
@@ -0,0 +1,13 @@
+Pod::Spec.new do |s|
+  s.name         = "CDEvents"
+  s.version      = "1.2.0"
+  s.summary      = "An Objective-C wrapper for Mac OS X’s FSEvents C API."
+  s.homepage     = "http://rastersize.github.com/CDEvents"
+  s.license      = { :type => 'MIT', :file => 'LICENSE' }
+  s.author       = { "Aron Cedercrantz" => "[e-mail]" }
+  s.source       = { :git => "https://github.com/rastersize/CDEvents.git", :tag => "1.2.0" }
+  s.platform     = :osx, '10.6'
+  s.source_files = '*.{h,m}'
+  s.framework    = 'CoreServices'
+  s.requires_arc = true
+end
\ No newline at end of file

--- a/CDEvents.xcodeproj/project.pbxproj
+++ b/CDEvents.xcodeproj/project.pbxproj
@@ -242,7 +242,8 @@
 		0867D690FE84028FC02AAC07 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0420;
+				LastUpgradeCheck = 0460;
+				ORGANIZATIONNAME = "Aron Cedercrantz";
 			};
 			buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "CDEvents" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -328,17 +329,19 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				FRAMEWORK_VERSION = A;
 				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_OBJC_GC = supported;
-				GCC_MODEL_TUNING = G5;
+				GCC_ENABLE_OBJC_GC = unsupported;
+				GCC_MODEL_TUNING = "";
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = CDEvents_Prefix.pch;
-				GCC_PREPROCESSOR_DEFINITIONS = NS_BUILD_32_LIKE_64;
+				GCC_PREPROCESSOR_DEFINITIONS = "";
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "@loader_path/../Frameworks";
 				PRODUCT_NAME = CDEvents;
@@ -350,15 +353,17 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				COMBINE_HIDPI_IMAGES = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				FRAMEWORK_VERSION = A;
-				GCC_ENABLE_OBJC_GC = supported;
-				GCC_MODEL_TUNING = G5;
+				GCC_ENABLE_OBJC_GC = unsupported;
+				GCC_MODEL_TUNING = "";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = CDEvents_Prefix.pch;
-				GCC_PREPROCESSOR_DEFINITIONS = NS_BUILD_32_LIKE_64;
+				GCC_PREPROCESSOR_DEFINITIONS = "";
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "@loader_path/../Frameworks";
 				PRODUCT_NAME = CDEvents;
@@ -369,16 +374,19 @@
 		1DEB91B208733DA50010E9CD /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = (
-					x86_64,
-					i386,
-				);
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_ENABLE_SSE3_EXTENSIONS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.5;
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				ONLY_ACTIVE_ARCH = YES;
 				RUN_CLANG_STATIC_ANALYZER = YES;
 				SDKROOT = macosx;
@@ -388,15 +396,18 @@
 		1DEB91B308733DA50010E9CD /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = (
-					x86_64,
-					i386,
-				);
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_ENABLE_SSE3_EXTENSIONS = YES;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.5;
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				RUN_CLANG_STATIC_ANALYZER = YES;
 				SDKROOT = macosx;
 			};
@@ -406,14 +417,15 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_OBJC_GC = unsupported;
-				GCC_MODEL_TUNING = G5;
+				GCC_MODEL_TUNING = "";
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
-				GCC_PREPROCESSOR_DEFINITIONS = NS_BUILD_32_LIKE_64;
+				GCC_PREPROCESSOR_DEFINITIONS = "";
 				INFOPLIST_FILE = "CDEventsTestApp-Info.plist";
 				INSTALL_PATH = "$(HOME)/Applications";
 				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
@@ -424,6 +436,7 @@
 					AppKit,
 				);
 				PRODUCT_NAME = CDEventsTestApp;
+				ZERO_LINK = NO;
 			};
 			name = Debug;
 		};
@@ -431,13 +444,14 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_ENABLE_OBJC_GC = unsupported;
-				GCC_MODEL_TUNING = G5;
+				GCC_MODEL_TUNING = "";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
-				GCC_PREPROCESSOR_DEFINITIONS = NS_BUILD_32_LIKE_64;
+				GCC_PREPROCESSOR_DEFINITIONS = "";
 				INFOPLIST_FILE = "CDEventsTestApp-Info.plist";
 				INSTALL_PATH = "$(HOME)/Applications";
 				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";

--- a/CDEventsDelegate.h
+++ b/CDEventsDelegate.h
@@ -1,7 +1,7 @@
 /**
- * SCEvents
+ * CDEvents
  *
- * Copyright (c) 2010 Aron Cedercrantz
+ * Copyright (c) 2010-2012 Aron Cedercrantz
  * http://github.com/rastersize/CDEvents/
  *
  * Permission is hereby granted, free of charge, to any person

--- a/Info.plist
+++ b/Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.2</string>
+	<string>1.2.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.1.2</string>
+	<string>1.2.0</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>

--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,7 @@
+Copyright (c) 2010, 2011 Aron Cedercrantz
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

--- a/README.mdown
+++ b/README.mdown
@@ -1,26 +1,92 @@
-# CDEvents ![Project status](http://stillmaintained.com/rastersize/CDEvents.png) #
+# CDEvents
+***Note:*** The `develop` branch **requires Mac OS X 10.6 or newer** as the framework relies on  [ARC](http://clang.llvm.org/docs/AutomaticReferenceCounting.html "Automatic Reference Counting Technical Specification") and [blocks](http://developer.apple.com/library/mac/#documentation/Cocoa/Conceptual/Blocks/Articles/00_Introduction.html "Blocks Programming Topics").
 
-## What is this? ##
-It's an Objective-C wrapper for Mac OS X's [FSEvents C API](http://developer.apple.com/mac/library/documentation/Darwin/Reference/FSEvents_Ref/FSEvents_h/index.html). Inspired and based upon the ([MIT-licensed](http://www.opensource.org/licenses/mit-license.php)) open source project [SCEvents](http://stuconnolly.com/projects/code/) created by [Stuart Connolly](http://stuconnolly.com/).
+Website: http://rastersize.github.com/CDEvents
 
-## Requirements ##
-Requires Mac OS X 10.5, since FSEvents were introduced in 10.5, and an Intel CPU. Supports both manual memory management and garbage collection.
+## What is this?
+It's an Objective-C wrapper for Mac OS X's [FSEvents C API](http://developer.apple.com/mac/library/documentation/Darwin/Reference/FSEvents_Ref/FSEvents_h/index.html) with support for blocks. Furthermore, all the classes are immutable and it should be thread-safe.
 
-## What differentiates CDEvents from SCEvents then? ##
-Not all that much but a few things differentiate the two. The (event data wrapper) class `CDEvent` is immutable in contrast to `SCEvent` which is mutable. The next difference, which were the initial reason why I decided to rewrite `SCEvents` is that the class `SCEvents`' is a singleton class, where's `CDEvents` is a "normal" class. I couldn't find a good reason as to why `SCEvents` had been designed that way and for my project a "normal" non-singleton class would be and is better.
 
-Another difference between `CDEvents` and `SCEvents` is that `CDEvents` is available for both manual memory management and environments using garbage collection.
+## Requirements
+Requires Mac OS X 10.6 (Snow Leopard) and an Intel 64-bit CPU. The requirements stems from that automatic reference counting (ARC) is supported from 10.6 and up as long as the modern (i.e. 64-bit) Objective-C runtime is used since ARC requires the non-fragile ABI. Although the built product works on 10.6 and up it must be built on a machine running 10.7 (Lion) using Xcode 4.2 and the 10.7 SDK as the 10.6 SDK does not include ARC. The built product support both manual memory management and automatic reference counting.
 
-So I've written some of the code from scratch and "borrowed" some from `SCEvents`.
+If you need to support older versions of OS X or garbage collection please see the branch `support/1.1`. All _1.1.x_ version will support garbage collection and OS X 10.5.
 
-## API documentation ##
-You can generate API documentation with the help of [Doxygen](http://www.stack.nl/~dimitri/doxygen/). In Doxygen open the file `api.doxygen`, click the `Run` tab and then the `Run doxygen` button. When it's done you should have a directory (ignored by git) in the root of the project named `api` with a sub-directory `html` in which you will find `index.html` double-click and enjoy.
 
-## Authors ##
+## Usage
+You can use either the block based version (recommended) or the delegate based. Using both systems at the same time is not supported.
+
+### Block based (recommended)
+1. Add CDEvents to your project,
+ * either by compiling the project and dragging the `CDEvents.framework` into your project or
+ * by dragging the entire CDEvents project into your project as a sub-project.
+2. Import the `CDEvents.h` header where you need it.
+3. Set up your `CDEvents` instance and give it a block to execute when a event occurs.
+
+Easy example code:
+
+    self.events = [[CDEvents alloc]] initWithURLs:<NSArray of URLs to watch>
+                                            block:^(CDEvents *watcher, CDEvent *event) {
+	                                            <Your code here>
+	                                        }];
+
+Or use all the all-options initiator:
+
+    self.events = [[CDEvents alloc] initWithURLs:<NSArray of URLs to watch>
+                                           block:^(CDEvents *watcher, CDEvent *event) {
+                                               <Your code here>
+                                           }
+                                       onRunLoop:[NSRunLoop currentRunLoop]
+                            sinceEventIdentifier:kCDEventsSinceEventNow
+                            notificationLantency:CD_EVENTS_DEFAULT_NOTIFICATION_LATENCY
+                         ignoreEventsFromSubDirs:CD_EVENTS_DEFAULT_IGNORE_EVENT_FROM_SUB_DIRS
+                                     excludeURLs:<NSArray of URLs to exlude>
+                             streamCreationFlags:kCDEventsDefaultEventStreamFlags];
+
+See the test app (`TestApp`) for an example on how to use the framework.
+
+### Delegate based
+***This is the same behavior as pre ARC and blocks.***
+
+1. Add CDEvents to your project,
+ * either by compiling the project and dragging the `CDEvents.framework` into your project or
+ * by dragging the entire CDEvents project into your project as a sub-project.
+2. Import the `CDEvents.h` header where you need it.
+3. Import the `CDEventsDelegate.h` header where you need it (i.e. in the file which declares your delegate).
+4. Implement the delegate (`-URLWatcher:eventOccurred:`) and create your `CDEvents` instance.
+5. Zero out the delegate when you no longer need it.
+
+Example code:
+
+    self.events = [[CDEvents alloc] initWithURLs:<NSArray of URLs to watch>
+                                        delegate:<Your delegate>
+                                       onRunLoop:[NSRunLoop currentRunLoop]
+                            sinceEventIdentifier:kCDEventsSinceEventNow
+                            notificationLantency:CD_EVENTS_DEFAULT_NOTIFICATION_LATENCY
+                         ignoreEventsFromSubDirs:CD_EVENTS_DEFAULT_IGNORE_EVENT_FROM_SUB_DIRS
+                                     excludeURLs:<NSArray of URLs to exlude>
+                             streamCreationFlags:kCDEventsDefaultEventStreamFlags];
+
+See the test app (`TestApp`) for an example on how to use the framework.
+
+**Important:** Since Mac OS X 10.6 is set as the deployment target automatic zeroing of weak references is not available. Thus you must set the `delegate` of  `CDEvents` to `nil` when you no longer want to receive events. That is, at least in your `-dealloc` method. This is also required when using 10.7 and up! (`delegate` is an `unsafe_unretained` property.)
+
+For more details please refer to the documentation in the header files and the section "API documentation" below.
+
+
+## API documentation
+Read the latest [API documentation](http://rastersize.github.com/CDEvents/docs/api/head) or [browse for each version](http://rastersize.github.com/CDEvents/docs/api) of CDEvents. Alternatively you can generate it yourself, please see below.
+
+### appledoc
+Run the script `api.appledoc.sh` from the root of the project. The script takes one optional argument, the version of the project as a string. If the version string is empty "HEAD" will be used instead.
+
+### Doxygen
+You can generate API documentation with the help of [Doxygen](http://www.stack.nl/~dimitri/doxygen/). In Doxygen open the file `api.doxygen`, click the `Run` tab and then the `Run doxygen` button. When it's done you should have a directory (ignored by git) in the root of the project named `api` with a sub-directory `html` in which you will find `index.html` double-click and enjoy.
 
-* Aron Cedercrantz
+## Contributors
+See GitHubs [contributors to rastersize/CDEvents](https://github.com/rastersize/CDEvents/contributors) statistics page.
 
-## License ##
+## License
 The code is released under the [MIT-license](http://www.opensource.org/licenses/mit-license.php).
 
-If you want, even though you really don't have to, I would love hearing what you use CDEvents for! Send me an email (first name @ last name dot se) or a [message via GitHub](http://github.com/inbox/new/rastersize).
+If you want, even though you really don't have to, I would love to hear what you use CDEvents for! Send me an email (first name (i.e. aron) @ last name (i.e. cedercrantz) dot se).

--- a/TestApp/CDEventsTestAppController.m
+++ b/TestApp/CDEventsTestAppController.m
@@ -31,6 +31,9 @@
 #import <CDEvents/CDEvents.h>
 
 
+#define CD_EVENTS_TEST_APP_USE_BLOCKS_API				1
+
+
 bool systemVersionIsAtLeast(SInt32 major, SInt32 minor)
 {
     static SInt32 versionMajor = 0, versionMinor = 0;
@@ -69,6 +72,16 @@ bool systemVersionIsAtLeast(SInt32 major, SInt32 minor)
         creationFlags |= kFSEventStreamCreateFlagFileEvents;
     }
 
+#if CD_EVENTS_TEST_APP_USE_BLOCKS_API
+	_events = [[CDEvents alloc] initWithURLs:watchedURLs
+									   block:^(CDEvents *watcher, CDEvent *event){ NSLog(@"[Block] URLWatcher: %@\nEvent: %@", watcher, event); }
+								   onRunLoop:[NSRunLoop currentRunLoop]
+						sinceEventIdentifier:kCDEventsSinceEventNow
+						notificationLantency:CD_EVENTS_DEFAULT_NOTIFICATION_LATENCY
+					 ignoreEventsFromSubDirs:CD_EVENTS_DEFAULT_IGNORE_EVENT_FROM_SUB_DIRS
+								 excludeURLs:excludeURLs
+						 streamCreationFlags:creationFlags];
+#else
 	_events = [[CDEvents alloc] initWithURLs:watchedURLs
 									delegate:self
 								   onRunLoop:[NSRunLoop currentRunLoop]
@@ -78,6 +91,7 @@ bool systemVersionIsAtLeast(SInt32 major, SInt32 minor)
 								 excludeURLs:excludeURLs
 						 streamCreationFlags:creationFlags];
 	//[_events setIgnoreEventsFromSubDirectories:YES];
+#endif
 	
 	NSLog(@"-[CDEventsTestAppController run]:\n%@\n------\n%@",
 		  _events,
@@ -92,9 +106,9 @@ bool systemVersionIsAtLeast(SInt32 major, SInt32 minor)
 	[super dealloc];
 }
 
-- (void)URLWatcher:(CDEvents *)URLWatcher eventOccurred:(CDEvent *)event
+- (void)URLWatcher:(CDEvents *)urlWatcher eventOccurred:(CDEvent *)event
 {
-	NSLog(@"URLWatcher: %@\nEvent: %@", URLWatcher, event);
+	NSLog(@"[Delegate] URLWatcher: %@\nEvent: %@", urlWatcher, event);
 }
 
 @end

--- /dev/null
+++ b/api.appledoc.sh
@@ -0,0 +1,45 @@
+#!/bin/sh
+
+##
+# USAGE
+# ./api.appledoc.sh [version-string]
+#
+# Execute it from the root of the CDEvents project.
+
+
+PROJECT_VERSION="HEAD"
+if [ "$#" -gt "0" ]
+then
+	PROJECT_VERSION=$1
+fi
+
+API_DOCS_DIR="./api/appledoc"
+#HEADER_FILES=`find . -name '*.h'`
+HEADER_FILES=`ls *.h`
+
+
+echo "API documentation generator for CDEvents v1"
+echo "Will save generated documentation to \"${API_DOCS_DIR}\""
+echo "Removing old API documentation"
+rm -r $API_DOCS_DIR/html 2> /dev/null
+rm -r $API_DOCS_DIR/docset 2> /dev/null
+
+echo "Will generate API documentation based on:"
+echo ${HEADER_FILES}
+
+echo "Generating for version \"${PROJECT_VERSION}\"..."
+appledoc \
+  --output ${API_DOCS_DIR} \
+  --project-name "CDEvents" \
+  --project-version ${PROJECT_VERSION} \
+  --project-company "Aron Cedercrantz" \
+  --company-id "com.cedercrantz" \
+  --create-html \
+  --keep-intermediate-files \
+  --no-install-docset \
+  ${HEADER_FILES}
+echo "Done!"
+
+echo "You can open the HTML documentation with:"
+echo "\"open ${API_DOCS_DIR}/html/index.html\""
+