Fixes #15; NS*Array is a can of worms

mxcl · Feb 2, 2015 · 78ab423 · 78ab423
1 parent 5c77fba
commit 78ab423
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/NSArray+map.m b/NSArray+map.m
@@ -3,7 +3,7 @@
 @implementation NSArray (YOLO)
 
 - (NSArray *(^)(id))map {
-    return ^(id frock) {
+    return ^id(id frock) {
         NSMethodSignature *sig = YOLOMS(frock);
         id (^block)(id, NSUInteger) = ^{
             switch (sig.numberOfArguments){
@@ -28,7 +28,14 @@ @implementation NSArray (YOLO)
             if (o)
                 mapped[jj++] = o;
         }
-        return [[self.class alloc] initWithObjects:mapped count:jj];
+
+        if ([self respondsToSelector:@selector(initWithObjects:count:)]) {
+            return [[self.class alloc] initWithObjects:mapped count:jj];
+        } else {
+            // some secret implementations of NSArray don't respond to the
+            // above selector.
+            return [NSArray arrayWithObjects:mapped count:jj];
+        }
     };
 }
 

diff --git a/NSSet+fmap.m b/NSSet+fmap.m
@@ -3,15 +3,19 @@
 @implementation NSSet (YOLO)
 
 - (NSSet *(^)(id (^)(id)))fmap {
-    return ^(id (^block)(id)) {
+    return ^id(id (^block)(id)) {
         id mapped[self.count];
         NSUInteger ii = 0;
         for (id mappable in self) {
             id o = block(mappable);
             if (o)
                 mapped[ii++] = o;
         }
-        return [[self.class alloc] initWithObjects:mapped count:ii];
+        if ([self respondsToSelector:@selector(initWithObjects:count:)]) {
+            return [[self.class alloc] initWithObjects:mapped count:ii];
+        } else {
+            return [[NSSet alloc] initWithObjects:mapped count:ii];
+        }
     };
 }
 

diff --git a/YOLOKit.podspec b/YOLOKit.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'YOLOKit'
-  s.version      = '11.1'
+  s.version      = '11.1.1'
   s.source       = { :git => 'https://github.com/mxcl/YOLOKit.git', :tag => s.version }
   s.requires_arc = true
   s.summary      = 'A delightful library for enumerating Foundation objects.'