Not currently working

itsthejb · Jan 4, 2015 · 689b8af · 689b8af
1 parent bd96e50
commit 689b8af
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/ObjcAssociatedObjectHelpers/ObjcAssociatedObjectHelpers.h b/ObjcAssociatedObjectHelpers/ObjcAssociatedObjectHelpers.h
@@ -126,8 +126,7 @@ static void* getterName##Key = _OBJC_ASC_QUOTE(getterName); \
 #define SYNTHESIZE_ASC_OBJ_WEAK_BLOCK(getterName, setterName, getterBlock, setterBlock) \
 static void* getterName##Key = _OBJC_ASC_QUOTE(getterName); \
 - (void)setterName:(id)value { \
-  value = setterBlock(value); \
-  id wrapped = [__ObjCAscWeakContainer wrapObject:value]; \
+  id wrapped = [__ObjCAscWeakContainer wrapObject:setterBlock(value)]; \
   @synchronized(self) { \
     _OBJC_ASC_WRAP_KVO_SETTER(getterName, objc_setAssociatedObject(self, getterName##Key, wrapped, OBJC_ASSOCIATION_RETAIN)); \
   } \

diff --git a/ObjcAssociatedObjectHelpers/ObjcAssociatedObjectHelpers.m b/ObjcAssociatedObjectHelpers/ObjcAssociatedObjectHelpers.m
@@ -28,7 +28,7 @@
 @implementation __ObjCAscWeakContainer
 + (instancetype)wrapObject:(id)object {
 	__ObjCAscWeakContainer *wrapper = [[self alloc] init];
-  wrapper._object = object;
+//  wrapper._object = object;
 	return wrapper;
 }
 @end
diff --git a/UnitTests/Specs.m b/UnitTests/Specs.m
@@ -267,16 +267,18 @@
 
 describe(@"weak container", ^{
 
-  NSMutableArray *array = [NSMutableArray arrayWithObject:@"foo"];
-
   it(@"should get and set a value as normal", ^{
+    NSMutableArray *array = [NSMutableArray arrayWithObject:@"foo"];
     testObject.weakObject = array.firstObject;
-    expect(testObject.weakObject && testObject.weakObject == array.firstObject).to.beTruthy();
+    expect(testObject.weakObject).notTo.beNil();
+    expect(testObject.weakObject == array.firstObject).to.beTruthy();
   });
 
   it(@"should nil the weak property", ^{
+    NSMutableArray *array = [NSMutableArray arrayWithObject:@"foo"];
     testObject.weakObject = array.firstObject;
-    expect(testObject.weakObject && testObject.weakObject == array.firstObject).to.beTruthy();
+    expect(testObject.weakObject).notTo.beNil();
+    expect(testObject.weakObject == array.firstObject).to.beTruthy();
     [array removeAllObjects];
     expect(testObject.weakObject).to.beNil();
   });