1.3.2 Update

- fixed bugs which prevented some CGStructs from being updated when using Motion’s statesForProperties convenience initializer
- added targetsNestedStruct static method to CGStructAssistant, which determines whether a specified keyPath targets a struct of a CGRect
- added and improved tests
- improved readability and streamlined some code

Author: poetmountain

MotionMachine.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'MotionMachine'
-  s.version = '1.3.1'
+  s.version = '1.3.2'
   s.swift_version = '4.0'
   s.license = { :type => 'MIT' }
   s.summary = 'An elegant, powerful, and modular animation library for Swift.'

Sources/EasingTypes/EasingBack.swift

@@ -27,8 +27,9 @@
 import Foundation
 
 /**
- *  EasingBack provides easing equations which move beyond the specified starting and ending values and snap back, as if attached to a rubber band.
+ *  EasingBack provides easing equations which move beyond the specified starting and ending values and snap back, as if attached to a rubber band. With modest overshoot values, this easing type can provide a more organic feel when animating visual elements like UIViews and UI.
  *
+ *  - remark: See http://easings.net for visual examples.
  *  - warning: These equations produce easing values extending beyond the starting and ending values, which may produce unpredictable results for properties which have strict bounds limits.
  */
 public struct EasingBack {

Sources/EasingTypes/EasingBounce.swift

@@ -29,6 +29,8 @@ import Foundation
 /**
  *  EasingBounce provides easing equations that have successively smaller value peaks, like a bouncing ball.
  *
+ *  - remark: See http://easings.net for visual examples.
+ *
  */
 public struct EasingBounce {
 

Sources/EasingTypes/EasingCircular.swift

@@ -28,6 +28,8 @@ import Foundation
 
 /**
  *  EasingCircular provides circular easing equations.
+ *
+ *  - remark: See http://easings.net for visual examples.
  */
 public struct EasingCircular {
 

Sources/EasingTypes/EasingCubic.swift

@@ -28,6 +28,8 @@ import Foundation
 
 /**
  *  EasingCubic provides cubic easing equations.
+ *
+ *  - remark: See http://easings.net for visual examples.
  */
 public struct EasingCubic {
 

Sources/EasingTypes/EasingElastic.swift

@@ -28,6 +28,8 @@ import Foundation
 
 /**
  *  EasingElastic provides easing equations that behave in an elastic fashion.
+ *
+ *  - remark: See http://easings.net for visual examples.
  */
 public struct EasingElastic {
 

Sources/EasingTypes/EasingExpo.swift

@@ -28,6 +28,8 @@ import Foundation
 
 /**
  *  EasingExpo provides exponential easing equations.
+ *
+ *  - remark: See http://easings.net for visual examples.
  */
 public struct EasingExpo {
 

Sources/EasingTypes/EasingLinear.swift

@@ -27,7 +27,9 @@
 import Foundation
 
 /**
- *  EasingLinear provides a linear easing equation.
+ *  EasingLinear provides a linear easing equation, which increments by a constant value over time.
+ *
+ *  - remark: See http://easings.net for visual examples.
  */
 public struct EasingLinear {
 

Sources/EasingTypes/EasingQuadratic.swift

@@ -28,6 +28,8 @@ import Foundation
 
 /**
  *  EasingQuadratic provides quadratic easing equations.
+ *
+ *  - remark: See http://easings.net for visual examples.
  */
 public struct EasingQuadratic {
 

Sources/EasingTypes/EasingQuartic.swift

@@ -28,6 +28,8 @@ import Foundation
 
 /**
  *  EasingQuartic provides quartic easing equations.
+ *
+ *  - remark: See http://easings.net for visual examples.
  */
 public struct EasingQuartic {
 

Sources/EasingTypes/EasingQuintic.swift

@@ -28,6 +28,8 @@ import Foundation
 
 /**
  *  EasingQuintic provides quintic easing equations.
+ *
+ *  - remark: See http://easings.net for visual examples.
  */
 public struct EasingQuintic {
 

Sources/EasingTypes/EasingSine.swift

@@ -28,6 +28,8 @@ import Foundation
 
 /**
  *  EasingSine provides sine easing equations.
+ *
+ *  - remark: See http://easings.net for visual examples.
  */
 public struct EasingSine {
 

Sources/Motion.swift

@@ -588,7 +588,7 @@ public class Motion: Moveable, Additive, TempoDriven, PropertyDataDelegate {
         _tempo?.delegate = self
 
         if let unwrapped_states = statesForProperties {
-            properties = buildPropertyData(forObject: targetObject,  propertyStates: unwrapped_states)
+            properties = buildPropertyData(forObject: targetObject,  statesForProperties: unwrapped_states)
         }
 
         for property in properties {
@@ -692,18 +692,24 @@ public class Motion: Moveable, Additive, TempoDriven, PropertyDataDelegate {
      *  Builds `PropertyData` objects for the supplied PropertyStates objects.
      *
      *  - parameter forObject: The object to be modified, and the base object for the paths of the `PropertyStates` objects.
-     *  - parameter propertyStates: An Array of `PropertyStates` objects that define how the `PropertyData` objects are constructed.
+     *  - parameter statesForProperties: An Array of `PropertyStates` objects that define how the `PropertyData` objects are constructed.
      *  - remark: This method is used internally by the initializer when the `statesForProperties` convenience method is used, but you can also call it directly to build an array of `PropertyData` objects.
      *  - returns: An Array of `PropertyData` objects.
      */
-    public func buildPropertyData(forObject targetObject: AnyObject, propertyStates: [PropertyStates]) -> [PropertyData] {
+    public func buildPropertyData(forObject targetObject: AnyObject, statesForProperties: [PropertyStates]) -> [PropertyData] {
         var data: [PropertyData] = []
 
-        for var property_states in propertyStates {
+        for var property_states in statesForProperties {
             var tobj: AnyObject = targetObject
             if (property_states.path != "" && valueAssistant.acceptsKeypath(targetObject)) {
-                if let tvalue = targetObject.value(forKeyPath: property_states.path) as AnyObject? {
-                    tobj = tvalue
+                
+                // here we search for a nested struct by traversing the keyPath
+                // protects from a runtime exception since calling value(forKeyPath:) on a nested CG struct (aka CGRect) will tend to do that
+                let is_nested_struct = CGStructAssistant.targetsNestedStruct(object: targetObject, path: property_states.path)
+                if (!is_nested_struct) {
+                    if let tvalue = targetObject.value(forKeyPath: property_states.path) as AnyObject? {
+                        tobj = tvalue
+                    }
                 }
             }
 
@@ -885,7 +891,7 @@ public class Motion: Moveable, Additive, TempoDriven, PropertyDataDelegate {
      *  - parameter property: The `PropertyData` instance to modify.
      */
     private func assignStartingPropertyValue(_ property: inout PropertyData) {
-        if (property.useExistingStartValue && completedCount == 0) {
+        if ((property.useExistingStartValue || property.start == 0) && completedCount == 0) {
             if let current_value = valueAssistant.retrieveCurrentObjectValue(forProperty: property) {
                 property.start = current_value
             }
@@ -931,7 +937,7 @@ public class Motion: Moveable, Additive, TempoDriven, PropertyDataDelegate {
 
     }
 
-    
+
 
 
     /**

Sources/MotionMachine.swift

@@ -587,6 +587,9 @@ func ≈≈ (a: Double, b: Double) -> Bool {
 
 }
 
+/// Custom operators to do a "fuzzy" not-equal comparison of floating-point numbers.
+/// The fuzzy equal character is created using the Option-X key combination.
+/// see: http://stackoverflow.com/questions/4915462/how-should-i-do-floating-point-comparison
 infix operator !≈ : ComparisonPrecedence
 
 func !≈ (a: Float, b: Float) -> Bool {

Sources/MotionSupport.swift

@@ -186,6 +186,34 @@ public struct MotionSupport {
         return selector
     }
 
+    /**
+     *  Builds and returns a `PropertyData` object if the values you supply pass one of the following tests: 1) there's a specified start value and that value is different than either the original value or the ending value, or 2) there's just an original value and that value is different than the ending value, or 3) there's no start value passed in, which will return a `PropertyData` object with only an end value. In cases 1 and 2, a `PropertyData` object with both start and end values will be returned. In the third case, a `PropertyData` object that only has an ending value will be returned. If all those tests fail, no object will be returned.
+     *
+     *  - parameter path: A base path to be used for the `PropertyData`'s `path` property.
+     *  - parameter originalValue: An optional value representing the current value of the target object property.
+     *  - parameter startValue: An optional value to be supplied to the `PropertyData`'s `start` property.
+     *  - parameter endValue: A value to be supplied to the `PropertyData`'s `end` property.
+     *  - returns: An optional `PropertyData` object using the supplied values.
+     */
+    public static func buildPropertyData(path: String, originalValue: Double?=nil, startValue: Double?, endValue: Double) -> PropertyData? {
+        var data: PropertyData?
+        
+        if let unwrapped_start = startValue {
+            if ((originalValue != nil && unwrapped_start !≈ originalValue!) || endValue !≈ unwrapped_start) {
+                data = PropertyData(path: path, start: unwrapped_start, end: endValue)
+            }
+        } else if let unwrapped_org = originalValue {
+            if (endValue !≈ unwrapped_org) {
+                data = PropertyData(path: path, start: unwrapped_org, end: endValue)
+            }
+        } else {
+            data = PropertyData(path: path, end: endValue)
+
+        }
+        
+        return data
+    }
+    
 }
 
 // MARK: - Declarations
@@ -205,21 +233,21 @@ public enum ValueStructTypes {
     #endif
     case unsupported
 
-    static var valueTypes: [ValueStructTypes: UnsafePointer<Int8>] = [ValueStructTypes.number : NSNumber.init(value: 0).objCType,
-                                                                  ValueStructTypes.point : NSValue(cgPoint: CGPoint.zero).objCType,
-                                                                  ValueStructTypes.size : NSValue(cgSize: CGSize.zero).objCType,
-                                                                  ValueStructTypes.rect : NSValue(cgRect: CGRect.zero).objCType,
-                                                                  ValueStructTypes.vector : NSValue(cgVector: CGVector(dx: 0.0, dy: 0.0)).objCType,
-                                                                  ValueStructTypes.affineTransform : NSValue(cgAffineTransform: CGAffineTransform.identity).objCType,
-                                                                  ValueStructTypes.transform3D : NSValue.init(caTransform3D: CATransform3DIdentity).objCType
+    static var valueTypes: [ValueStructTypes: NSValue] = [ValueStructTypes.number : NSNumber.init(value: 0),
+                                                                  ValueStructTypes.point : NSValue(cgPoint: CGPoint.zero),
+                                                                  ValueStructTypes.size : NSValue(cgSize: CGSize.zero),
+                                                                  ValueStructTypes.rect : NSValue(cgRect: CGRect.zero),
+                                                                  ValueStructTypes.vector : NSValue(cgVector: CGVector(dx: 0.0, dy: 0.0)),
+                                                                  ValueStructTypes.affineTransform : NSValue(cgAffineTransform: CGAffineTransform.identity),
+                                                                  ValueStructTypes.transform3D : NSValue.init(caTransform3D: CATransform3DIdentity)
     ]
 
 
     /**
      *  Provides a C string returned by Foundation's `objCType` method for a specific ValueStructTypes type; this represents a specific Objective-C type. This is useful for Foundation structs which can't be used with Swift's `as` type checking.
      */
     func toObjCType() -> UnsafePointer<Int8> {
-        guard let type_value = ValueStructTypes.valueTypes[self] else { return NSNumber(value: false).objCType }
+        guard let type_value = ValueStructTypes.valueTypes[self]?.objCType else { return NSNumber(value: false).objCType }
 
         return type_value
     }