Transactions

Podfile.lock

@@ -7,4 +7,4 @@ DEPENDENCIES:
 SPEC CHECKSUMS:
   OCMock: a6a7dc0e3997fb9f35d99f72528698ebf60d64f2
 
-COCOAPODS: 0.37.1
+COCOAPODS: 0.38.2

README.md

@@ -2,7 +2,7 @@
 
 Pop is an extensible animation engine for iOS and OS X. In addition to basic static animations, it supports spring and decay dynamic animations, making it useful for building realistic, physics-based interactions. The API allows quick integration with existing Objective-C codebases and enables the animation of any property on any object. It's a mature and well-tested framework that drives all the animations and transitions in [Paper](http://www.facebook.com/paper).
 
-[![Build Status](https://travis-ci.org/facebook/pop.svg)](https://travis-ci.org/facebook/pop)
+[![Build Status](https://travis-ci.org/naftaly/pop.svg?branch=implicit_animations)](https://travis-ci.org/naftaly/pop)
 
 ## Installation
 

pop-tests/POPAnimationTests.mm

@@ -23,9 +23,60 @@
 #import "POPBaseAnimationTests.h"
 #import "POPCGUtils.h"
 #import "POPAnimationInternal.h"
+#import "POPGroupAnimation.h"
+#import "POPTransaction.h"
 
 using namespace POP;
 
+@interface POPRandomPropertyGivingObject : NSObject
+
+@property (nonatomic,assign) NSInteger number;
+@property (nonatomic,assign) NSInteger secondNumber;
+
+@end
+
+@implementation POPRandomPropertyGivingObject
+
+@synthesize number, secondNumber;
+
+- (POPAnimatableProperty*)animationPropertyForNumber
+{
+  return [POPAnimatableProperty propertyWithName:@"com.pop.tests.number" initializer:^(POPMutableAnimatableProperty *prop) {
+    prop.readBlock = ^(POPRandomPropertyGivingObject* obj, CGFloat values[]) {
+      values[0] = obj.number;
+    };
+    prop.writeBlock = ^(POPRandomPropertyGivingObject* obj, const CGFloat values[]) {
+      obj.number = values[0];
+    };
+    prop.threshold = 1.0;
+  }];
+}
+
+- (void)setValue:(id)value forKeyPath:(NSString *)keyPath
+{
+  if ( [keyPath isEqualToString:@"number"] ) {
+    self.number = [value integerValue];
+  } else if ( [keyPath isEqualToString:@"secondNumber"] ) {
+    self.secondNumber = [value integerValue];
+  } else {
+    [super setValue:value forKeyPath:keyPath];
+  }
+}
+
+- (id)valueForKeyPath:(NSString *)keyPath
+{
+  if ( [keyPath isEqualToString:@"number"] ) {
+    return @(self.number);
+  } else if ( [keyPath isEqualToString:@"secondNumber"] ) {
+    return @(self.secondNumber);
+  } else {
+    return [super valueForKeyPath:keyPath];
+  }
+  return nil;
+}
+
+@end
+
 @interface POPAnimation (TestExtensions)
 @property (strong, nonatomic) NSString *sampleKey;
 @end
@@ -110,10 +161,10 @@ - (void)testAnimationValues
   anim.roundingFactor = 1.0;
 
   id layer = [OCMockObject niceMockForClass:[CALayer class]];
-  [[layer expect] setPosition:FBTestInterpolateLinear(Vector2r([anim.fromValue CGPointValue]), Vector2r([anim.toValue CGPointValue]), 0.25).cg_point()];
-  [[layer expect] setPosition:FBTestInterpolateLinear(Vector2r([anim.fromValue CGPointValue]), Vector2r([anim.toValue CGPointValue]), 0.5).cg_point()];
-  [[layer expect] setPosition:FBTestInterpolateLinear(Vector2r([anim.fromValue CGPointValue]), Vector2r([anim.toValue CGPointValue]), 0.75).cg_point()];
-  [[layer expect] setPosition:[anim.toValue CGPointValue]];
+  [(CALayer*)[layer expect] setPosition:FBTestInterpolateLinear(Vector2r([anim.fromValue CGPointValue]), Vector2r([anim.toValue CGPointValue]), 0.25).cg_point()];
+  [(CALayer*)[layer expect] setPosition:FBTestInterpolateLinear(Vector2r([anim.fromValue CGPointValue]), Vector2r([anim.toValue CGPointValue]), 0.5).cg_point()];
+  [(CALayer*)[layer expect] setPosition:FBTestInterpolateLinear(Vector2r([anim.fromValue CGPointValue]), Vector2r([anim.toValue CGPointValue]), 0.75).cg_point()];
+  [(CALayer*)[layer expect] setPosition:[anim.toValue CGPointValue]];
 
   [layer pop_addAnimation:anim forKey:@"key"];
   POPAnimatorRenderDuration(self.animator, self.beginTime, 1, 0.25);
@@ -401,8 +452,8 @@ - (void)testReuse
 
   id layer = [OCMockObject niceMockForClass:[CALayer class]];
 
-  [[layer expect] setPosition:FBTestInterpolateLinear(Vector2r([fromValue CGPointValue]), Vector2r([toValue CGPointValue]), testProgress).cg_point()];
-  [[layer expect] setPosition:[toValue CGPointValue]];
+  [(CALayer*)[layer expect] setPosition:FBTestInterpolateLinear(Vector2r([fromValue CGPointValue]), Vector2r([toValue CGPointValue]), testProgress).cg_point()];
+  [(CALayer*)[layer expect] setPosition:[toValue CGPointValue]];
 
   [layer pop_addAnimation:anim forKey:@"key"];
 
@@ -418,8 +469,8 @@ - (void)testReuse
 
   layer = [OCMockObject niceMockForClass:[CALayer class]];
 
-  [[layer expect] setPosition:FBTestInterpolateLinear(Vector2r([fromValue CGPointValue]), Vector2r([toValue CGPointValue]), testProgress).cg_point()];
-  [[layer expect] setPosition:[toValue CGPointValue]];
+  [(CALayer*)[layer expect] setPosition:FBTestInterpolateLinear(Vector2r([fromValue CGPointValue]), Vector2r([toValue CGPointValue]), testProgress).cg_point()];
+  [(CALayer*)[layer expect] setPosition:[toValue CGPointValue]];
 
   [layer pop_addAnimation:anim forKey:@"key"];
 
@@ -754,10 +805,10 @@ - (void)testNilKey
   anim.roundingFactor = 1.0;
 
   id layer = [OCMockObject niceMockForClass:[CALayer class]];
-  [[layer expect] setPosition:FBTestInterpolateLinear(Vector2r([anim.fromValue CGPointValue]), Vector2r([anim.toValue CGPointValue]), 0.25).cg_point()];
-  [[layer expect] setPosition:FBTestInterpolateLinear(Vector2r([anim.fromValue CGPointValue]), Vector2r([anim.toValue CGPointValue]), 0.5).cg_point()];
-  [[layer expect] setPosition:FBTestInterpolateLinear(Vector2r([anim.fromValue CGPointValue]), Vector2r([anim.toValue CGPointValue]), 0.75).cg_point()];
-  [[layer expect] setPosition:[anim.toValue CGPointValue]];
+  [(CALayer*)[layer expect] setPosition:FBTestInterpolateLinear(Vector2r([anim.fromValue CGPointValue]), Vector2r([anim.toValue CGPointValue]), 0.25).cg_point()];
+  [(CALayer*)[layer expect] setPosition:FBTestInterpolateLinear(Vector2r([anim.fromValue CGPointValue]), Vector2r([anim.toValue CGPointValue]), 0.5).cg_point()];
+  [(CALayer*)[layer expect] setPosition:FBTestInterpolateLinear(Vector2r([anim.fromValue CGPointValue]), Vector2r([anim.toValue CGPointValue]), 0.75).cg_point()];
+  [(CALayer*)[layer expect] setPosition:[anim.toValue CGPointValue]];
 
   // verify nil key can be added, same as CA
   [layer pop_addAnimation:anim forKey:nil];
@@ -888,4 +939,171 @@ - (void)testNSCopyingSupportPOPBasicAnimation
   XCTAssertEqualObjects(copy.timingFunction, anim.timingFunction, @"expected equality; value1:%@ value2:%@", copy.timingFunction, anim.timingFunction);
 }
 
+- (void)testNSCopyingSupportPOPBasicAnimationWithKeyPath
+{
+  POPBasicAnimation *anim = [POPBasicAnimation animationWithKeyPath:@"contentOffset"];
+
+  configureConcretePropertyAnimation(anim);
+  [self testCopyingSucceedsForConcretePropertyAnimation:anim];
+
+  anim.duration = 1.8;
+  anim.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut];
+
+  POPBasicAnimation *copy = [anim copy];
+
+  XCTAssertEqual(copy.duration, anim.duration, @"expected equality; value1:%@ value2:%@", @(copy.duration), @(anim.duration));
+  XCTAssertEqualObjects(copy.timingFunction, anim.timingFunction, @"expected equality; value1:%@ value2:%@", copy.timingFunction, anim.timingFunction);
+}
+
+- (void)testAutomatedAnimatedPropertyInBasicAnimation
+{
+  CALayer* layer = [CALayer layer];
+  POPBasicAnimation *anim = [POPBasicAnimation animationWithKeyPath:@"position"];
+  [layer pop_addAnimation:anim forKey:@"test"];
+  XCTAssertNotNil( anim.property, @"expected non-nil property for keyPath:%@", anim.keyPath );
+
+  anim = [POPBasicAnimation animationWithKeyPath:@"nonExistingKeyPath"];
+  [layer pop_addAnimation:anim forKey:@"test"];
+  XCTAssertNil( anim.property, @"expected nil property for keyPath:%@ (%@)", anim.keyPath, anim.property );
+}
+
+- (void)testAutomatedAnimatedPropertyInSpringAnimation
+{
+  CALayer* layer = [CALayer layer];
+  POPSpringAnimation *anim = [POPSpringAnimation animationWithKeyPath:@"position"];
+  [layer pop_addAnimation:anim forKey:@"test"];
+  XCTAssertNotNil( anim.property, @"expected non-nil property for keyPath:%@", anim.keyPath );
+
+  anim = [POPSpringAnimation animationWithKeyPath:@"nonExistingKeyPath"];
+  [layer pop_addAnimation:anim forKey:@"test"];
+  XCTAssertNil( anim.property, @"expected nil property for keyPath:%@ (%@)", anim.keyPath, anim.property );
+}
+
+- (void)testAutomatedAnimatedPropertyInDecayAnimation
+{
+  CALayer* layer = [CALayer layer];
+  POPDecayAnimation *anim = [POPDecayAnimation animationWithKeyPath:@"position"];
+  [layer pop_addAnimation:anim forKey:@"test"];
+  XCTAssertNotNil( anim.property, @"expected non-nil property for keyPath:%@", anim.keyPath );
+
+  anim = [POPDecayAnimation animationWithKeyPath:@"nonExistingKeyPath"];
+  [layer pop_addAnimation:anim forKey:@"test"];
+  XCTAssertNil( anim.property, @"expected nil property for keyPath:%@ (%@)", anim.keyPath, anim.property );
+}
+
+- (void)testAutomatedUserDefinedAnimatedProperty
+{
+  POPRandomPropertyGivingObject* object = [[POPRandomPropertyGivingObject alloc] init];
+  POPBasicAnimation *anim = [POPBasicAnimation animationWithKeyPath:@"number"];
+  [object pop_addAnimation:anim forKey:@"test"];
+  XCTAssertNotNil( anim.property, @"expected non-nil property for keyPath:%@", anim.keyPath );
+}
+
+- (void)testAutomatedKeyValueDefinedAnimatedProperty
+{
+  POPRandomPropertyGivingObject* object = [[POPRandomPropertyGivingObject alloc] init];
+  POPBasicAnimation *anim = [POPBasicAnimation animationWithKeyPath:@"secondNumber"];
+  [object pop_addAnimation:anim forKey:@"test"];
+  XCTAssertNotNil( anim.property, @"expected non-nil property for keyPath:%@", anim.keyPath );
+}
+
+- (void)testGroupAnimation
+{
+  CALayer* layer = [CALayer layer];
+
+  __block NSInteger testValue = 0;
+
+  POPGroupAnimation* group = [POPGroupAnimation animation];
+  group.animationDidStartBlock = ^(POPAnimation* anim) {
+    XCTAssertEqual(testValue, 0, @"expected 0 but got %ld", (long)testValue);
+    testValue++;
+  };
+
+  POPBasicAnimation* test = [POPBasicAnimation animationWithPropertyNamed:kPOPLayerBorderWidth];
+  test.toValue = @(5);
+  test.animationDidStartBlock = ^(POPAnimation* anim) {
+    XCTAssertEqual(testValue, 1, @"expected 1 but got %ld", (long)testValue);
+    testValue++;
+  };
+  test.completionBlock = ^(POPAnimation* anim, BOOL finished) {
+    XCTAssertEqual(testValue, 2, @"expected 2 but got %ld", (long)testValue);
+    testValue++;
+  };
+
+  group.animations = @[ test ];
+
+  group.completionBlock = ^(POPAnimation* anim, BOOL finished) {
+    XCTAssertEqual(testValue, 3, @"expected 3 but got %ld", (long)testValue);
+    testValue++;
+  };
+  [layer pop_addAnimation:group forKey:@"group"];
+
+  POPAnimatorRenderDuration(self.animator, self.beginTime, 5, 0.01);
+}
+
+- (void)testImplicitAnimations
+{
+  POPRandomPropertyGivingObject* obj = [[POPRandomPropertyGivingObject alloc] init];
+  obj.secondNumber = 0;
+
+  XCTAssertTrue(obj.secondNumber == 0, @"expect 0 but got %ld", (long)obj.secondNumber );
+
+  [POPTransaction begin];
+  [POPTransaction setAnimationDuration:10];
+
+  obj.pop_animator.secondNumber = 10;
+
+  [POPTransaction commit];
+
+  POPAnimatorRenderDuration(self.animator, self.beginTime, 20, 0.01);
+
+  XCTAssertTrue(obj.secondNumber == 10, @"expect 10 but got %ld", (long)obj.secondNumber );
+}
+
+- (void)testImplicitAnimationValueChange
+{
+  POPRandomPropertyGivingObject* obj = [[POPRandomPropertyGivingObject alloc] init];
+  obj.secondNumber = 0;
+
+  XCTAssertTrue(obj.secondNumber == 0, @"expect 0 but got %ld", (long)obj.secondNumber );
+
+  [POPTransaction begin];
+  [POPTransaction setAnimationDuration:10];
+
+  obj.pop_animator.secondNumber = 10;
+  obj.pop_animator.secondNumber = 20;
+
+  [POPTransaction commit];
+
+  POPAnimatorRenderDuration(self.animator, self.beginTime, 20, 0.01);
+
+  XCTAssertTrue(obj.secondNumber == 20, @"expect 20 but got %ld", (long)obj.secondNumber );
+}
+
+- (void)testObjectImplicitAnimations
+{
+  POPRandomPropertyGivingObject* obj = [[POPRandomPropertyGivingObject alloc] init];
+  obj.secondNumber = 0;
+
+  XCTAssertTrue(obj.secondNumber == 0, @"expect 0 but got %ld", (long)obj.secondNumber );
+
+  [NSObject pop_animateWithDuration:10 delay:0 options:0 animations:^{
+    obj.pop_animator.secondNumber = 10;
+  } completion:^(BOOL finished) {
+  }];
+
+  POPAnimatorRenderDuration(self.animator, self.beginTime, 20, 0.01);
+
+  XCTAssertTrue(obj.secondNumber == 10, @"expect 10 but got %ld", (long)obj.secondNumber );
+}
+
+- (void)testObjectExplicitAnimations
+{
+  POPRandomPropertyGivingObject* obj = [[POPRandomPropertyGivingObject alloc] init];
+  obj.secondNumber = 0;
+  XCTAssertTrue(obj.secondNumber == 0, @"expect 0 but got %ld", (long)obj.secondNumber );
+  obj.pop_animator.secondNumber = 10;
+  XCTAssertTrue(obj.secondNumber == 10, @"expect 10 but got %ld", (long)obj.secondNumber );
+}
+
 @end

pop-tests/POPBaseAnimationTests.mm

@@ -82,6 +82,7 @@ - (void)testCopyingSucceedsForConcretePropertyAnimation:(POPPropertyAnimation *)
   XCTAssertEqual(copy.roundingFactor, anim.roundingFactor, @"expected equality; value1:%@ value2:%@", @(copy.roundingFactor), @(anim.roundingFactor));
   XCTAssertEqual(copy.clampMode, anim.clampMode, @"expected equality; value1:%@ value2:%@", @(copy.clampMode), @(anim.clampMode));
   XCTAssertEqual(copy.additive, anim.additive, @"expected equality; value1:%@ value2:%@", @(copy.additive), @(anim.additive));
+  XCTAssertEqualObjects(copy.keyPath, anim.keyPath, @"expected equality; value1:%@ value2:%@", copy.keyPath, anim.keyPath);
 }
 
 @end

pop.podspec

@@ -7,7 +7,7 @@ Pod::Spec.new do |spec|
   spec.summary      = 'Extensible animation framework for iOS and OS X.'
   spec.source       = { :git => 'https://github.com/facebook/pop.git', :tag => '1.0.8' }
   spec.source_files = 'pop/**/*.{h,m,mm,cpp}'
-  spec.public_header_files = 'pop/{POP,POPAnimatableProperty,POPAnimation,POPAnimationEvent,POPAnimationExtras,POPAnimationTracer,POPAnimator,POPBasicAnimation,POPCustomAnimation,POPDecayAnimation,POPDefines,POPGeometry,POPLayerExtras,POPPropertyAnimation,POPSpringAnimation}.h'
+  spec.public_header_files = 'pop/{POP,POPAnimatableProperty,POPAnimation,POPAnimationEvent,POPAnimationExtras,POPAnimationTracer,POPAnimator,POPBasicAnimation,POPCustomAnimation,POPDecayAnimation,POPDefines,POPGeometry,POPLayerExtras,POPPropertyAnimation,POPSpringAnimation,POPTransaction,POPGroupAnimation}.h'
   spec.requires_arc = true
   spec.social_media_url = 'https://twitter.com/fbOpenSource'
   spec.library = 'c++'