Commit: d560344d1039c2091252717eb870a45dc81ed1dc - CDEvents (git)

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

Commit MetaInfo

• Révision: d560344d1039c2091252717eb870a45dc81ed1dc (tree)
• l'heure: 2011-10-25 02:34:06
• Auteur: Aron Cedercrantz <aron@cede...>
• Commiter: Aron Cedercrantz

Message de Log

Merge branch 'release/1.1.2'

* release/1.1.2: (21 commits)

Bumb version to 1.1.2.
Fix lastEvent not getting set.
compatibility shim, runtime checking example, file-level events ---------------------------------------------------------------
validate project settings, update to xcode 3.2
Fixed "missing base SDK".
Fixed a bug in the CDEventsCallback(...) code which could cause the excludedURLs to be disregarded.
Changed the lastEvent property of the CDEvents class to readonly in public and readwrite in private.
Fixed a bug in the test app which could cause an exception to be raised.
Fixed a lot of small formatting and cross reference errors in the API doc.
Fixed a dup symbols bug properly, thanks to Kirk Kerekes.
Defined MACOSX_DEPLOYMENT_TARGET to 10.5.
Added some Xcode 4 stuff to the git ignore file.
Revert "Changed two "const <type> <name>" constants to macros (they caused duplicate symbol linking errors when the header was included more than once for the same product)."
Fixed small markdown error.
Added still maintained image.
Changed two "const <type> <name>" constants to macros (they caused duplicate symbol linking errors when the header was included more than once for the same product).
Changed test application to use full CDEvents init method.
Fixed missing weak code mark in the delegate property declaration.
Changed the compiler to LLVM 1.5.
Marked CDEventsDelegate pointer as a weak pointer (for GC).
...

Conflicts:
CDEvents.xcodeproj/project.pbxproj

Change Summary

• modified: .gitignore
• modified: CDEvent.h
• modified: CDEvent.m
• modified: CDEvents.h
• modified: CDEvents.m
• modified: CDEvents.xcodeproj/project.pbxproj
• modified: CDEventsDelegate.h
• modified: Info.plist
• modified: README.mdown
• modified: TestApp/CDEventsTestAppController.m
• add: compat.h

Modification

--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,13 @@
+.svn
+
+*.swp
+*.o
+*.lo
+.libs
+*.la
+
+.DS_Store
+
 build
 
 *.perspectivev3
@@ -6,6 +16,8 @@ build
 *.mode1v3
 *.mode2v3
 *.tm_build_errors
+*.xcodeproj/xcuserdata
+*.xcodeproj/project.xcworkspace
 !default.pbxuser
 !default.perspectivev3
 !default.mode1v3
@@ -14,6 +26,4 @@ build
 *~.nib
 *~.xib
 
-.DS_Store
-
 api

--- a/CDEvent.h
+++ b/CDEvent.h
@@ -38,7 +38,6 @@
 #import <Foundation/Foundation.h>
 #import <CoreServices/CoreServices.h>
 
-
 #pragma mark -
 #pragma mark CDEvent types
 /**
@@ -77,6 +76,7 @@ typedef FSEventStreamEventFlags CDEventFlags;
 }
 
 #pragma mark Properties
+/** @name Getting Event Properties */
 /**
  * The event identifier.
  *
@@ -106,6 +106,8 @@ typedef FSEventStreamEventFlags CDEventFlags;
  */
 @property (readonly) NSURL						*URL;
 
+
+/** @name Getting Event Flags */
 /**
  * The flags of the event.
  *
@@ -119,18 +121,26 @@ typedef FSEventStreamEventFlags CDEventFlags;
  */
 @property (readonly) CDEventFlags				flags;
 
+#pragma mark flag macros
+
+#define FLAG_CHECK(flags, flag) ((flags) & (flag))
+
+#define FLAG_PROPERTY(name, flag)                   \
+- (BOOL)name                                        \
+{ return (FLAG_CHECK(_flags, flag) ? YES : NO); }
+
 #pragma mark Specific flag properties
 /**
  * Wheter there was some change in the directory at the specific path supplied in this event.
  *
- * @return <code>YES</code> if there was some change in the directory, otherwise <code>NO</code>
+ * @return <code>YES</code> if there was some change in the directory, otherwise <code>NO</code>.
  *
  * @see kFSEventStreamEventFlagNone
  * @see flags
  * @see mustRescanSubDirectories
  * @see isUserDropped
  * @see isKernelDropped
- * @see isEventIdsWrapped
+ * @see isEventIdentifiersWrapped
  * @see isHistoryDone
  * @see isRootChanged
  * @see didVolumeMount
@@ -148,19 +158,19 @@ typedef FSEventStreamEventFlags CDEventFlags;
  * events were coalesced hierarchically. For example, an event in
  * <code>/Users/jsmith/Music</code> and an event in
  * <code>/Users/jsmith/Pictures</code> might be coalesced into an event with
- * this flag set and <i>URL</i><code>=/Users/jsmith</code>. If this flag is set
+ * this flag set and URL <code>= /Users/jsmith</code>. If this flag is set
  * you may be able to get an idea of whether the bottleneck happened in the
  * kernel (less likely) or in your client (more likely) by checking if
- * flagUserDropped or flagKernelDropped returns <code>YES</code>.
+ * isUserDropped or isKernelDropped returns <code>YES</code>.
  *
- * @return <code>YES</code> if you must rescan the whole directory including its children, otherwise <code>NO</code>
+ * @return <code>YES</code> if you must rescan the whole directory including its children, otherwise <code>NO</code>.
  *
  * @see kFSEventStreamEventFlagMustScanSubDirs
  * @see flags
  * @see isGenericChange
  * @see isUserDropped
  * @see isKernelDropped
- * @see isEventIdsWrapped
+ * @see isEventIdentifiersWrapped
  * @see isHistoryDone
  * @see isRootChanged
  * @see didVolumeMount
@@ -173,14 +183,14 @@ typedef FSEventStreamEventFlags CDEventFlags;
 /**
  * Provides some information as to what might have caused the need to rescan the URL including its children.
  *
- * @return <code>YES</code> if mustRescanSubDirectories returns <code>YES</code> and the cause were in userland, otherwise <code>NO</code>
+ * @return <code>YES</code> if mustRescanSubDirectories returns <code>YES</code> and the cause were in userland, otherwise <code>NO</code>.
  *
  * @see kFSEventStreamEventFlagUserDropped
  * @see flags
  * @see isGenericChange
  * @see mustRescanSubDirectories
  * @see isKernelDropped
- * @see isEventIdsWrapped
+ * @see isEventIdentifiersWrapped
  * @see isHistoryDone
  * @see isRootChanged
  * @see didVolumeMount
@@ -193,14 +203,14 @@ typedef FSEventStreamEventFlags CDEventFlags;
 /**
  * Provides some information as to what might have caused the need to rescan the URL including its children.
  *
- * @return <code>YES</code> if mustRescanSubDirectories returns <code>YES</code> and the cause were in kernelspace, otherwise <code>NO</code>
+ * @return <code>YES</code> if mustRescanSubDirectories returns <code>YES</code> and the cause were in kernelspace, otherwise <code>NO</code>.
  *
  * @see kFSEventStreamEventFlagKernelDropped
  * @see flags
  * @see isGenericChange
  * @see mustRescanSubDirectories
  * @see isUserDropped
- * @see isEventIdsWrapped
+ * @see isEventIdentifiersWrapped
  * @see isHistoryDone
  * @see isRootChanged
  * @see didVolumeMount
@@ -217,7 +227,7 @@ typedef FSEventStreamEventFlags CDEventFlags;
  * previously-issued event identifiers are no longer valid arguments for the
  * sinceEventIdentifier parameter of the CDEvents init methods.
  *
- * @return <code>YES</code> if the 64-bit event identifier counter has wrapped around, otherwise <code>NO</code>
+ * @return <code>YES</code> if the 64-bit event identifier counter has wrapped around, otherwise <code>NO</code>.
  *
  * @see kFSEventStreamEventFlagEventIdsWrapped
  * @see flags
@@ -241,7 +251,7 @@ typedef FSEventStreamEventFlags CDEventFlags;
  * as a result of specifying a <i>sinceEventIdentifier</i> argument other than
  * kCDEventsSinceEventNow with the CDEvents init methods.
  *
- * @return <code>YES</code> if if the event is sent to mark the end of the "historical" events sent, otherwise <code>NO</code>
+ * @return <code>YES</code> if if the event is sent to mark the end of the "historical" events sent, otherwise <code>NO</code>.
  *
  * @see kFSEventStreamEventFlagHistoryDone
  * @see flags
@@ -249,7 +259,7 @@ typedef FSEventStreamEventFlags CDEventFlags;
  * @see mustRescanSubDirectories
  * @see isUserDropped
  * @see isKernelDropped
- * @see isEventIdsWrapped
+ * @see isEventIdentifiersWrapped
  * @see isRootChanged
  * @see didVolumeMount
  * @see didVolumeUnmount
@@ -271,7 +281,7 @@ typedef FSEventStreamEventFlags CDEventFlags;
  * with this flag set will only be sent if you passed the flag
  * <code>kFSEventStreamCreateFlagWatchRoot</code> to the CDEvents.
  *
- * @return <code>YES</code> if there is a change to one of the URLs you asked to watch, otherwise <code>NO</code>
+ * @return <code>YES</code> if there is a change to one of the URLs you asked to watch, otherwise <code>NO</code>.
  *
  * @see kFSEventStreamEventFlagRootChanged
  * @see flags
@@ -279,7 +289,7 @@ typedef FSEventStreamEventFlags CDEventFlags;
  * @see mustRescanSubDirectories
  * @see isUserDropped
  * @see isKernelDropped
- * @see isEventIdsWrapped
+ * @see isEventIdentifiersWrapped
  * @see isHistoryDone
  * @see didVolumeMount
  * @see didVolumeUnmount
@@ -304,7 +314,7 @@ typedef FSEventStreamEventFlags CDEventFlags;
  * Also be aware of the <code>MNT_DONTBROWSE</code> flag that is set for volumes
  * which should not be displayed by user interface elements.
  *
- * @return <code>YES</code> if a volumen is mounted underneath one of the URLs being watched, otherwise <code>NO</code>
+ * @return <code>YES</code> if a volumen is mounted underneath one of the URLs being watched, otherwise <code>NO</code>.
  *
  * @see kFSEventStreamEventFlagMount
  * @see flags
@@ -312,7 +322,7 @@ typedef FSEventStreamEventFlags CDEventFlags;
  * @see mustRescanSubDirectories
  * @see isUserDropped
  * @see isKernelDropped
- * @see isEventIdsWrapped
+ * @see isEventIdentifiersWrapped
  * @see isHistoryDone
  * @see isRootChanged
  * @see didVolumeUnmount
@@ -333,7 +343,7 @@ typedef FSEventStreamEventFlags CDEventFlags;
  * could uncover an arbitrarily large directory hierarchy, although Mac OS X
  * never does that.
  *
- * @return <code>YES</code> if a volume is unmounted underneath one of the URLs being watched, otherwise <code>NO</code>
+ * @return <code>YES</code> if a volume is unmounted underneath one of the URLs being watched, otherwise <code>NO</code>.
  *
  * @see kFSEventStreamEventFlagUnmount
  * @see flags
@@ -341,7 +351,7 @@ typedef FSEventStreamEventFlags CDEventFlags;
  * @see mustRescanSubDirectories
  * @see isUserDropped
  * @see isKernelDropped
- * @see isEventIdsWrapped
+ * @see isEventIdentifiersWrapped
  * @see isHistoryDone
  * @see isRootChanged
  * @see didVolumeMount
@@ -351,8 +361,26 @@ typedef FSEventStreamEventFlags CDEventFlags;
 @property (readonly) BOOL						didVolumeUnmount;
 
 
-#pragma mark Class object creators
+/**
+ * The entirety of the documentation on file level events in lion is 3 sentences
+ * long. Rename behavior is odd, making the combination of events and flags
+ * somewhat confusing for atomic writes. It also appears possible to get a
+ * singular event where a file has been created, modified, and removed.
+ */
+@property (readonly) BOOL                       isCreated;
+@property (readonly) BOOL                       isRemoved;
+@property (readonly) BOOL                       isInodeMetadataModified;
+@property (readonly) BOOL                       isRenamed;
+@property (readonly) BOOL                       isModified;
+@property (readonly) BOOL                       isFinderInfoModified;
+@property (readonly) BOOL                       didChangeOwner;
+@property (readonly) BOOL                       isXattrModified;
+@property (readonly) BOOL                       isFile;
+@property (readonly) BOOL                       isDir;
+@property (readonly) BOOL                       isSymlink;
 
+#pragma mark Class object creators
+/** @name Creating CDEvent Objects */
 /**
  * Returns an <code>CDEvent</code> created with the given identifier, date, URL and flags.
  *

--- a/CDEvent.m
+++ b/CDEvent.m
@@ -27,7 +27,7 @@
  */
 
 #import "CDEvent.h"
-
+#import "compat.h"
 
 @implementation CDEvent
 
@@ -104,52 +104,33 @@
 	return [self retain];
 }
 
-
 #pragma mark Specific flag properties 
 - (BOOL)isGenericChange
 {
 	return (kFSEventStreamEventFlagNone == _flags);
 }
 
-- (BOOL)mustRescanSubDirectories
-{
-	return (_flags & kFSEventStreamEventFlagMustScanSubDirs);
-}
-
-- (BOOL)isUserDropped
-{
-	return (_flags & kFSEventStreamEventFlagUserDropped);
-}
-
-- (BOOL)isKernelDropped
-{
-	return (_flags & kFSEventStreamEventFlagKernelDropped);
-}
-
-- (BOOL)isEventIdentifiersWrapped
-{
-	return (_flags & kFSEventStreamEventFlagEventIdsWrapped);
-}
-
-- (BOOL)isHistoryDone
-{
-	return (_flags & kFSEventStreamEventFlagHistoryDone);
-}
-
-- (BOOL)isRootChanged
-{
-	return (_flags & kFSEventStreamEventFlagRootChanged);
-}
-
-- (BOOL)didVolumeMount
-{
-	return (_flags & kFSEventStreamEventFlagMount);
-}
-
-- (BOOL)didVolumeUnmount
-{
-	return (_flags & kFSEventStreamEventFlagUnmount);
-}
+FLAG_PROPERTY(mustRescanSubDirectories,     kFSEventStreamEventFlagMustScanSubDirs)
+FLAG_PROPERTY(isUserDropped,                kFSEventStreamEventFlagUserDropped)
+FLAG_PROPERTY(isKernelDropped,              kFSEventStreamEventFlagKernelDropped)
+FLAG_PROPERTY(isEventIdentifiersWrapped,    kFSEventStreamEventFlagEventIdsWrapped)
+FLAG_PROPERTY(isHistoryDone,                kFSEventStreamEventFlagHistoryDone)
+FLAG_PROPERTY(isRootChanged,                kFSEventStreamEventFlagRootChanged)
+FLAG_PROPERTY(didVolumeMount,               kFSEventStreamEventFlagMount)
+FLAG_PROPERTY(didVolumeUnmount,             kFSEventStreamEventFlagUnmount)
+
+// file-level events introduced in 10.7
+FLAG_PROPERTY(isCreated,                    kFSEventStreamEventFlagItemCreated)
+FLAG_PROPERTY(isRemoved,                    kFSEventStreamEventFlagItemRemoved)
+FLAG_PROPERTY(isInodeMetadataModified,      kFSEventStreamEventFlagItemInodeMetaMod)
+FLAG_PROPERTY(isRenamed,                    kFSEventStreamEventFlagItemRenamed)
+FLAG_PROPERTY(isModified,                   kFSEventStreamEventFlagItemModified)
+FLAG_PROPERTY(isFinderInfoModified,         kFSEventStreamEventFlagItemFinderInfoMod)
+FLAG_PROPERTY(didChangeOwner,               kFSEventStreamEventFlagItemChangeOwner)
+FLAG_PROPERTY(isXattrModified,              kFSEventStreamEventFlagItemXattrMod)
+FLAG_PROPERTY(isFile,                       kFSEventStreamEventFlagItemIsFile)
+FLAG_PROPERTY(isDir,                        kFSEventStreamEventFlagItemIsDir)
+FLAG_PROPERTY(isSymlink,                    kFSEventStreamEventFlagItemIsSymlink)
 
 #pragma mark Misc
 - (NSString *)description

--- a/CDEvents.h
+++ b/CDEvents.h
@@ -70,7 +70,7 @@ extern NSString *const CDEventsEventStreamCreationFailureException;
  *
  * @since 1.0.0
  */
-#define CD_EVENTS_DEFAULT_NOTIFICATION_LATENCY			(NSTimeInterval)3.0
+#define CD_EVENTS_DEFAULT_NOTIFICATION_LATENCY			((NSTimeInterval)3.0)
 
 /**
  * The default value wheter events from sub directories should be ignored or not.
@@ -84,16 +84,14 @@ extern NSString *const CDEventsEventStreamCreationFailureException;
  *
  * @since 1.0.0
  */
-const CDEventsEventStreamCreationFlags kCDEventsDefaultEventStreamFlags =
-	(kFSEventStreamCreateFlagUseCFTypes |
-	 kFSEventStreamCreateFlagWatchRoot);
+extern const CDEventsEventStreamCreationFlags kCDEventsDefaultEventStreamFlags;
 
 /**
  * Use this to get all event since now when initializing a CDEvents object.
  *
  * @since 1.1.0
  */
-const CDEventIdentifier kCDEventsSinceEventNow = kFSEventStreamEventIdSinceNow;
+extern const CDEventIdentifier kCDEventsSinceEventNow;
 
 
 #pragma mark -
@@ -109,7 +107,7 @@ const CDEventIdentifier kCDEventsSinceEventNow = kFSEventStreamEventIdSinceNow;
  */
 @interface CDEvents : NSObject <NSCopying> {
 @private
-	id<CDEventsDelegate>		_delegate;
+	__weak id<CDEventsDelegate>	_delegate;
 	
 	FSEventStreamRef			_eventStream;
 	CFTimeInterval				_notificationLatency;
@@ -126,16 +124,20 @@ const CDEventIdentifier kCDEventsSinceEventNow = kFSEventStreamEventIdSinceNow;
 }
 
 #pragma mark Properties
+/** @name Managing the Delegate */
 /**
  * The delegate object the <code>CDEvents</code> object calls when it recieves an event.
  *
- * @param delegate Delegate for the events object. <code>nil</code> removed the delegate.
+ * @param delegate Delegate for the events object. <code>nil</code> removes the delegate.
  * @return The events's delegate.
  *
+ * @see CDEventsDelegate
+ *
  * @since 1.0.0
  */
-@property (assign) id<CDEventsDelegate>		delegate;
+@property (assign) __weak id<CDEventsDelegate>	delegate;
 
+/** @name Getting Event Watcher Properties */
 /**
  * The (approximate) time intervall between notifications sent to the delegate.
  *
@@ -143,7 +145,7 @@ const CDEventIdentifier kCDEventsSinceEventNow = kFSEventStreamEventIdSinceNow;
  *
  * @since 1.0.0
  */
-@property (readonly) CFTimeInterval			notificationLatency;
+@property (readonly) CFTimeInterval				notificationLatency;
 
 /**
  * The event identifier from which events will be supplied to the delegate.
@@ -152,17 +154,7 @@ const CDEventIdentifier kCDEventsSinceEventNow = kFSEventStreamEventIdSinceNow;
  *
  * @since 1.0.0
  */
-@property (readonly) CDEventIdentifier		sinceEventIdentifier;
-
-/**
- * Wheter events from sub-directories of the watched URLs should be ignored or not.
- *
- * @param flag Wheter events from sub-directories of the watched URLs shouled be ignored or not.
- * @return <code>YES</code> if events from sub-directories should be ignored, otherwise <code>NO</code>.
- *
- * @since 1.0.0
- */
-@property (assign) BOOL						ignoreEventsFromSubDirectories;
+@property (readonly) CDEventIdentifier			sinceEventIdentifier;
 
 /**
  * The last event that occured and thas has been delivered to the delegate.
@@ -171,7 +163,7 @@ const CDEventIdentifier kCDEventsSinceEventNow = kFSEventStreamEventIdSinceNow;
  *
  * @since 1.0.0
  */
-@property (retain) CDEvent					*lastEvent;
+@property (retain, readonly) CDEvent			*lastEvent;
 
 /**
  * The URLs that we watch for events.
@@ -180,8 +172,10 @@ const CDEventIdentifier kCDEventsSinceEventNow = kFSEventStreamEventIdSinceNow;
  *
  * @since 1.0.0
  */
-@property (readonly) NSArray				*watchedURLs;
+@property (readonly) NSArray					*watchedURLs;
 
+
+/** @name Configuring the Event watcher */
 /**
  * The URLs that we should ignore events from. 
  *
@@ -190,10 +184,21 @@ const CDEventIdentifier kCDEventsSinceEventNow = kFSEventStreamEventIdSinceNow;
  *
  * @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.
+ *
+ * @param flag Wheter events from sub-directories of the watched URLs shouled be ignored or not.
+ * @return <code>YES</code> if events from sub-directories should be ignored, otherwise <code>NO</code>.
+ *
+ * @since 1.0.0
+ */
+@property (assign) BOOL							ignoreEventsFromSubDirectories;
 
 
 #pragma mark Event identifier class methods
+/** @name Current Event Identifier */
 /**
  * The current event identifier.
  *
@@ -207,28 +212,30 @@ const CDEventIdentifier kCDEventsSinceEventNow = kFSEventStreamEventIdSinceNow;
 
 
 #pragma mark Init methods
+/** @name Creating CDEvents Objects */
 /**
  * Returns an <code>CDEvents</code> object initialized with the given URLs to watch.
  *
  * @param URLs An array of URLs we want to watch.
- * @param delegate The delegate object the <code>CDEvents</code> object calls when it recieves an event.
- * @return An <code>CDEvents</code> object initialized with the given URLs to watch. 
+ * @param delegate The delegate object the CDEvents object calls 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:notificationLantency:ignoreEventsFromSubDirs:excludeURLs:streamCreationFlags:
+ * @see initWithURLs:delegate:onRunLoop:sinceEventIdentifier:notificationLantency:ignoreEventsFromSubDirs:excludeURLs:streamCreationFlags:
+ * @see CDEventsDelegate
  * @see kCDEventsDefaultEventStreamFlags
  * @see kCDEventsSinceEventNow
  *
- * @discussion Calls startWatchingURLs:onRunLoop:notificationLantency:ignoreEventsFromSubDirs:excludeURLs:streamCreationFlags:
- * with <em>sinceEventIdentifier</em> with the event identifier for "event since
- * now", <em>notificationLatency</em> set to 3.0 seconds,
- * <em>ignoreEventsFromSubDirectories</em> set to <code>NO</code>,
- * <em>excludedURLs</em> to no URLs, the event stream creation flags will be set
- * to <code>kCDEventsDefaultEventStreamFlags</code> and schedueled on the
- * current run loop.
+ * @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>, the event stream creation
+ * flags will be set to <code>kCDEventsDefaultEventStreamFlags</code> and
+ * schedueled on the current run loop.
  *
  * @since 1.0.0
  */
@@ -238,24 +245,25 @@ const CDEventIdentifier kCDEventsSinceEventNow = kFSEventStreamEventIdSinceNow;
  * 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 delegate The delegate object the <code>CDEvents</code> object calls when it recieves an event.
- * @param The run loop which the which the watcher should be schedueled on.
- * @return An <code>CDEvents</code> object initialized with the given URLs to watch.
+ * @param delegate The delegate object the CDEvents object calls 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:
- * @see initWithURLs:onRunLoop:notificationLantency:ignoreEventsFromSubDirs:excludeURLs:streamCreationFlags:
+ * @see initWithURLs:delegate:
+ * @see initWithURLs:delegate:onRunLoop:sinceEventIdentifier:notificationLantency:ignoreEventsFromSubDirs:excludeURLs:streamCreationFlags:
+ * @see CDEventsDelegate
  * @see kCDEventsDefaultEventStreamFlags
  * @see kCDEventsSinceEventNow
  *
- * @discussion Calls startWatchingURLs:onRunLoop:notificationLantency:ignoreEventsFromSubDirs:excludeURLs:streamCreationFlags:
- * with <em>runLoop</em> set to the current run loop, <em>sinceEventIdentifier</em>
- * with the event identifier for "event since now", <em>notificationLatency</em>
- * set to 3.0 seconds, <em>ignoreEventsFromSubDirectories</em> set to
- * <code>NO</code>, <em>excludedURLs</em> to no URLs and the event stream
- * creation flags will be set to <code>kCDEventsDefaultEventStreamFlags</code>.
+ * @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 1.0.0
  */
@@ -263,30 +271,33 @@ const CDEventIdentifier kCDEventsSinceEventNow = kFSEventStreamEventIdSinceNow;
 			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.
  *
- * @param URLs An array of URLs we want to watch.
- * @param delegate The delegate object the <code>CDEvents</code> object calls when it recieves an event.
+ * @param URLs An array of URLs (<code>NSURL</code>) we want to watch.
+ * @param delegate The delegate object the CDEvents object calls 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 <code>CDEvents</code> 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.
+ * @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:
- * @see initWithURLs:onRunLoop:
+ * @see initWithURLs:delegate:
+ * @see initWithURLs:delegate:onRunLoop:
  * @see ignoreEventsFromSubDirectories
  * @see excludedURLs
+ * @see CDEventsDelegate
  * @see FSEventStreamCreateFlags
  *
  * @discussion To ask for events "since now" pass the return value of
- * currentEventIdentifier as the parameter sinceEventIdentifier.
+ * currentEventIdentifier as the parameter <code>sinceEventIdentifier</code>.
  * CDEventStreamCreationFailureException should be extremely rare.
  *
  * @since 1.0.0
@@ -301,7 +312,7 @@ ignoreEventsFromSubDirs:(BOOL)ignoreEventsFromSubDirs
  streamCreationFlags:(CDEventsEventStreamCreationFlags)streamCreationFlags;
 
 #pragma mark Flush methods
-
+/** @name Flushing Events */
 /**
  * Flushes the event stream synchronously.
  *
@@ -325,6 +336,7 @@ ignoreEventsFromSubDirs:(BOOL)ignoreEventsFromSubDirs
 - (void)flushAsynchronously;
 
 #pragma mark Misc methods
+/** @name Events Description */
 /**
  * Returns a NSString containing the description of the current event stream.
  *

--- a/CDEvents.m
+++ b/CDEvents.m
@@ -13,12 +13,22 @@
 #pragma mark CDEvents custom exceptions
 NSString *const CDEventsEventStreamCreationFailureException = @"CDEventsEventStreamCreationFailureException";
 
+#pragma -
+#pragma mark Default values
+const CDEventsEventStreamCreationFlags kCDEventsDefaultEventStreamFlags =
+	(kFSEventStreamCreateFlagUseCFTypes |
+	 kFSEventStreamCreateFlagWatchRoot);
+
+const CDEventIdentifier kCDEventsSinceEventNow = kFSEventStreamEventIdSinceNow;
+
 
 #pragma mark -
 #pragma mark Private API
 // Private API
 @interface CDEvents ()
 
+@property (retain, readwrite) CDEvent *lastEvent;
+
 // The FSEvents callback function
 static void CDEventsCallback(
 	ConstFSEventStreamRef streamRef,
@@ -236,9 +246,11 @@ static void CDEventsCallback(
 {
 	CDEvents *watcher = (CDEvents *)callbackCtxInfo;
 	
-	NSArray *excludedURLs = [watcher excludedURLs];
-	NSArray *eventPathsArray = (NSArray *)eventPaths;
-	BOOL shouldIgnore;
+	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;
@@ -246,10 +258,19 @@ static void CDEventsCallback(
 		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];
 		
-		if ([excludedURLs containsObject:eventURL]) {
+		if ([watcher ignoreEventsFromSubDirectories]) {
 			shouldIgnore = YES;
-		} else if (excludedURLs != nil && [watcher ignoreEventsFromSubDirectories]) {
+			for (NSURL *URL in watchedURLs) {
+				if ([[URL path] isEqualToString:eventPath]) {
+					shouldIgnore = NO;
+					break;
+				}
+			}
+		} else if (excludedURLs != nil) {
 			for (NSURL *URL in excludedURLs) {
 				if ([eventPath hasPrefix:[URL path]]) {
 					shouldIgnore = YES;
@@ -263,6 +284,9 @@ static void CDEventsCallback(
 												   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];
@@ -277,7 +301,10 @@ static void CDEventsCallback(
 		}
 	}
 	
-	
+	if (lastEvent) {
+		[watcher setLastEvent:lastEvent];
+		[lastEvent release];
+	}
 }
 
 @end

--- a/CDEvents.xcodeproj/project.pbxproj
+++ b/CDEvents.xcodeproj/project.pbxproj
@@ -3,10 +3,11 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 45;
+	objectVersion = 46;
 	objects = {
 
 /* Begin PBXBuildFile section */
+		6A05775A1400F49900BF73C4 /* compat.h in Headers */ = {isa = PBXBuildFile; fileRef = 6A0577591400F49900BF73C4 /* compat.h */; };
 		8DC2EF530486A6940098B216 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C1666FE841158C02AAC07 /* InfoPlist.strings */; };
 		9C6D03031166AFFA00343E46 /* CDEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C6D03011166AFFA00343E46 /* CDEvent.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		9C6D03041166AFFA00343E46 /* CDEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 9C6D03021166AFFA00343E46 /* CDEvent.m */; };
@@ -50,6 +51,7 @@
 		089C1667FE841158C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
 		32DBCF5E0370ADEE00C91783 /* CDEvents_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDEvents_Prefix.pch; sourceTree = "<group>"; };
+		6A0577591400F49900BF73C4 /* compat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = compat.h; sourceTree = "<group>"; };
 		8DC2EF5A0486A6940098B216 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		8DC2EF5B0486A6940098B216 /* CDEvents.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CDEvents.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		9C6D03011166AFFA00343E46 /* CDEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDEvent.h; sourceTree = "<group>"; };
@@ -163,6 +165,7 @@
 		32C88DFF0371C24200C91783 /* Other Sources */ = {
 			isa = PBXGroup;
 			children = (
+				6A0577591400F49900BF73C4 /* compat.h */,
 				32DBCF5E0370ADEE00C91783 /* CDEvents_Prefix.pch */,
 			);
 			name = "Other Sources";
@@ -188,6 +191,7 @@
 				9C6D03031166AFFA00343E46 /* CDEvent.h in Headers */,
 				9C6D051D1166BD5800343E46 /* CDEventsDelegate.h in Headers */,
 				9C6D05241166BF5300343E46 /* CDEvents.h in Headers */,
+				6A05775A1400F49900BF73C4 /* compat.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -237,9 +241,19 @@
 /* Begin PBXProject section */
 		0867D690FE84028FC02AAC07 /* Project object */ = {
 			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0420;
+			};
 			buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "CDEvents" */;
-			compatibilityVersion = "Xcode 3.1";
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
+			knownRegions = (
+				English,
+				Japanese,
+				French,
+				German,
+			);
 			mainGroup = 0867D691FE84028FC02AAC07 /* CDEvents */;
 			productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
 			projectDirPath = "";
@@ -319,14 +333,12 @@
 				DYLIB_CURRENT_VERSION = 1;
 				FRAMEWORK_VERSION = A;
 				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = YES;
 				GCC_ENABLE_OBJC_GC = supported;
 				GCC_MODEL_TUNING = G5;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = CDEvents_Prefix.pch;
 				GCC_PREPROCESSOR_DEFINITIONS = NS_BUILD_32_LIKE_64;
-				GCC_VERSION = "";
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "@loader_path/../Frameworks";
 				PRODUCT_NAME = CDEvents;
@@ -347,7 +359,6 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = CDEvents_Prefix.pch;
 				GCC_PREPROCESSOR_DEFINITIONS = NS_BUILD_32_LIKE_64;
-				GCC_VERSION = "";
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "@loader_path/../Frameworks";
 				PRODUCT_NAME = CDEvents;
@@ -364,13 +375,13 @@
 				);
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_VERSION = "";
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.5;
 				ONLY_ACTIVE_ARCH = YES;
-				PREBINDING = NO;
 				RUN_CLANG_STATIC_ANALYZER = YES;
-				SDKROOT = macosx10.5;
+				SDKROOT = macosx;
 			};
 			name = Debug;
 		};
@@ -382,12 +393,12 @@
 					i386,
 				);
 				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_VERSION = "";
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				PREBINDING = NO;
+				MACOSX_DEPLOYMENT_TARGET = 10.5;
 				RUN_CLANG_STATIC_ANALYZER = YES;
-				SDKROOT = macosx10.5;
+				SDKROOT = macosx;
 			};
 			name = Release;
 		};
@@ -397,8 +408,7 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				COPY_PHASE_STRIP = NO;
 				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = YES;
-				GCC_ENABLE_OBJC_GC = supported;
+				GCC_ENABLE_OBJC_GC = unsupported;
 				GCC_MODEL_TUNING = G5;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -406,13 +416,13 @@
 				GCC_PREPROCESSOR_DEFINITIONS = NS_BUILD_32_LIKE_64;
 				INFOPLIST_FILE = "CDEventsTestApp-Info.plist";
 				INSTALL_PATH = "$(HOME)/Applications";
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
 				OTHER_LDFLAGS = (
 					"-framework",
 					Foundation,
 					"-framework",
 					AppKit,
 				);
-				PREBINDING = NO;
 				PRODUCT_NAME = CDEventsTestApp;
 			};
 			name = Debug;
@@ -423,7 +433,6 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
 				GCC_ENABLE_OBJC_GC = unsupported;
 				GCC_MODEL_TUNING = G5;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -431,13 +440,13 @@
 				GCC_PREPROCESSOR_DEFINITIONS = NS_BUILD_32_LIKE_64;
 				INFOPLIST_FILE = "CDEventsTestApp-Info.plist";
 				INSTALL_PATH = "$(HOME)/Applications";
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
 				OTHER_LDFLAGS = (
 					"-framework",
 					Foundation,
 					"-framework",
 					AppKit,
 				);
-				PREBINDING = NO;
 				PRODUCT_NAME = CDEventsTestApp;
 				ZERO_LINK = NO;
 			};

--- a/CDEventsDelegate.h
+++ b/CDEventsDelegate.h
@@ -43,7 +43,7 @@
  * The CDEventsDelegate protocol defines the required methods implemented by delegates of CDEvents objects.
  *
  * @see CDEvents
- * @see CDevent
+ * @see CDEvent
  *
  * @since 1.0.0
  */
@@ -57,7 +57,7 @@
  * @param event The event data.
  *
  * @see CDEvents
- * @see CDevent
+ * @see CDEvent
  *
  * @discussion Conforming objects' implementation of this method will be called
  * whenever an event occurs. The instance of CDEvents which received the event

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

--- a/README.mdown
+++ b/README.mdown
@@ -1,4 +1,4 @@
-# CDEvents #
+# CDEvents ![Project status](http://stillmaintained.com/rastersize/CDEvents.png) #
 
 ## 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/).
@@ -7,11 +7,11 @@ It's an Objective-C wrapper for Mac OS X's [FSEvents C API](http://developer.app
 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 differentiates CDEvents from SCEvents then? ##
-Not all that much but a litle. First of all all classes and protocols are prefixed with `CD` instead of `SC`, I hope that won't be to hard to remember? Secondly `CDEvent` (the event data wrapper-class) 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 something `CDEvents` isn't. 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.
+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.
 
-So I've written some of the code from scratch and "taken" some from `SCEvents`.
+So I've written some of the code from scratch and "borrowed" some from `SCEvents`.
 
 ## 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.

--- a/TestApp/CDEventsTestAppController.m
+++ b/TestApp/CDEventsTestAppController.m
@@ -31,20 +31,53 @@
 #import <CDEvents/CDEvents.h>
 
 
+bool systemVersionIsAtLeast(SInt32 major, SInt32 minor)
+{
+    static SInt32 versionMajor = 0, versionMinor = 0;
+
+    if (versionMajor == 0) {
+        Gestalt(gestaltSystemVersionMajor, &versionMajor);
+    }
+
+    if (versionMinor == 0) {
+        Gestalt(gestaltSystemVersionMinor, &versionMinor);
+    }
+
+    return ((versionMajor > major) ||
+            ((versionMajor == major) && (versionMinor >= minor)));
+}
+
+
 @implementation CDEventsTestAppController
 
 - (void)run
-{
+{	
 	NSArray *watchedURLs = [NSArray arrayWithObject:
 							[NSURL URLWithString:[NSHomeDirectory()
 							 stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]]];
 	NSArray *excludeURLs = [NSMutableArray arrayWithObject:
-							[[NSHomeDirectory() stringByAppendingPathComponent:@"Downloads"]
-							 stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]];
+							[NSURL URLWithString:[[NSHomeDirectory() stringByAppendingPathComponent:@"Downloads"]
+									stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]]];
 	
+    CDEventsEventStreamCreationFlags creationFlags = kCDEventsDefaultEventStreamFlags;
+
+    if (systemVersionIsAtLeast(10,6)) {
+        creationFlags |= kFSEventStreamCreateFlagIgnoreSelf;
+    }
+
+    if (systemVersionIsAtLeast(10,7)) {
+        creationFlags |= kFSEventStreamCreateFlagFileEvents;
+    }
+
 	_events = [[CDEvents alloc] initWithURLs:watchedURLs
-									delegate:self];
-	[_events setExcludedURLs:excludeURLs];
+									delegate:self
+								   onRunLoop:[NSRunLoop currentRunLoop]
+						sinceEventIdentifier:kCDEventsSinceEventNow
+						notificationLantency:CD_EVENTS_DEFAULT_NOTIFICATION_LATENCY
+					 ignoreEventsFromSubDirs:CD_EVENTS_DEFAULT_IGNORE_EVENT_FROM_SUB_DIRS
+								 excludeURLs:excludeURLs
+						 streamCreationFlags:creationFlags];
+	//[_events setIgnoreEventsFromSubDirectories:YES];
 	
 	NSLog(@"-[CDEventsTestAppController run]:\n%@\n------\n%@",
 		  _events,

--- /dev/null
+++ b/compat.h
@@ -0,0 +1,32 @@
+/**
+ * @headerfile compat.h
+ * FSEventStream flag compatibility shim
+ *
+ * In order to compile a binary against an older SDK yet still support the
+ * features present in later OS releases, we need to define any missing enum
+ * constants not present in the older SDK. This allows us to safely defer
+ * feature detection to runtime (and avoid recompilation).
+ */
+
+#import <CoreServices/CoreServices.h>
+
+#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060
+// ignoring events originating from the current process introduced in 10.6
+FSEventStreamCreateFlags kFSEventStreamCreateFlagIgnoreSelf = 0x00000008;
+#endif
+
+#if MAC_OS_X_VERSION_MAX_ALLOWED < 1070
+// file-level events introduced in 10.7
+FSEventStreamCreateFlags kFSEventStreamCreateFlagFileEvents = 0x00000010;
+FSEventStreamEventFlags kFSEventStreamEventFlagItemCreated = 0x00000100,
+                        kFSEventStreamEventFlagItemRemoved = 0x00000200,
+                        kFSEventStreamEventFlagItemInodeMetaMod = 0x00000400,
+                        kFSEventStreamEventFlagItemRenamed = 0x00000800,
+                        kFSEventStreamEventFlagItemModified = 0x00001000,
+                        kFSEventStreamEventFlagItemFinderInfoMod = 0x00002000,
+                        kFSEventStreamEventFlagItemChangeOwner = 0x00004000,
+                        kFSEventStreamEventFlagItemXattrMod = 0x00008000,
+                        kFSEventStreamEventFlagItemIsFile = 0x00010000,
+                        kFSEventStreamEventFlagItemIsDir = 0x00020000,
+                        kFSEventStreamEventFlagItemIsSymlink = 0x00040000;
+#endif