Merge pull request #206 from layoutBox/feature/improve_width_height_value_validation

Improve method that validates `width` and `height` values

Author: lucdion

Example/PinLayoutSample.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 48;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -516,7 +516,7 @@
 				};
 			};
 			buildConfigurationList = 249EFE3A1E64FAFE00165E39 /* Build configuration list for PBXProject "PinLayoutSample" */;
-			compatibilityVersion = "Xcode 3.2";
+			compatibilityVersion = "Xcode 8.0";
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (

Podfile.lock

@@ -1,6 +1,6 @@
 PODS:
   - Nimble (8.0.2)
-  - PinLayout (1.8.9)
+  - PinLayout (1.8.10)
   - Quick (2.1.0)
   - SwiftLint (0.35.0)
 
@@ -22,10 +22,10 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Nimble: 622629381bda1dd5678162f21f1368cec7cbba60
-  PinLayout: f7237c104696f409470947fee3ac82e239cac367
+  PinLayout: 641bc9679f73d3da35e04bb5180547cf55fd92d7
   Quick: 4be43f6634acfa727dd106bdf3929ce125ffa79d
   SwiftLint: 5553187048b900c91aa03552807681bb6b027846
 
 PODFILE CHECKSUM: 9b1d14a0f41ae1e8ebc931fa3d033da6c545223e
 
-COCOAPODS: 1.7.1
+COCOAPODS: 1.7.5

Sources/Impl/PinLayout+Coordinates.swift

@@ -328,33 +328,33 @@ extension PinLayout {
     }
 
     internal func validateWidth(_ width: CGFloat, context: Context) -> Bool {
-        if width < 0 {
+        guard width >= 0, width.isFinite else {
             warnWontBeApplied("the width (\(width)) must be greater than or equal to zero.", context)
             return false
-        } else {
-            return true
         }
+        
+        return true
     }
 
     internal func validateComputedWidth(_ width: CGFloat?) -> Bool {
-        if let width = width, width < 0 {
+        if let width = width, !width.isFinite || width < 0 {
             return false
         } else {
             return true
         }
     }
 
     internal func validateHeight(_ height: CGFloat, context: Context) -> Bool {
-        if height < 0 {
+        guard height >= 0, height.isFinite else {
             warnWontBeApplied("the height (\(height)) must be greater than or equal to zero.", context)
             return false
-        } else {
-            return true
         }
+        
+        return true
     }
 
     internal func validateComputedHeight(_ height: CGFloat?) -> Bool {
-        if let height = height, height < 0 {
+        if let height = height, !height.isFinite || height < 0 {
             return false
         } else {
             return true

Tests/Common/AdjustSizeSpec.swift

@@ -114,6 +114,42 @@ class AdjustSizeSpec: QuickSpec {
                 aView.pin.width(of: aViewChild)
                 expect(aView.frame).to(equal(CGRect(x: 140.0, y: 100.0, width: 50.0, height: 60.0)))
             }
+            
+            it("should accept a width of 0") {
+                aView.pin.width(0)
+                expect(Pin.lastWarningText).to(beNil())
+                expect(aView.frame).to(equal(CGRect(x: 140, y: 100.0, width: 0.0, height: 60.0)))
+            }
+            
+            it("should warn about negative width value") {
+                aView.pin.width(-2)
+                expect(Pin.lastWarningText).to(contain(["width", "won't be applied", "the width", "must be greater than or equal to zero"]))
+                expect(aView.frame).to(equal(CGRect(x: 140, y: 100.0, width: 100.0, height: 60.0)))
+            }
+            
+            it("should warn about NaN width value") {
+                aView.pin.width(CGFloat.nan)
+               expect(Pin.lastWarningText).to(contain(["width", "nan", "won't be applied", "the width", "must be greater than or equal to zero"]))
+               expect(aView.frame).to(equal(CGRect(x: 140, y: 100.0, width: 100.0, height: 60.0)))
+            }
+            
+            it("should warn about -NaN width value") {
+                aView.pin.width(-CGFloat.nan)
+               expect(Pin.lastWarningText).to(contain(["width", "nan", "won't be applied", "the width", "must be greater than or equal to zero"]))
+               expect(aView.frame).to(equal(CGRect(x: 140, y: 100.0, width: 100.0, height: 60.0)))
+            }
+            
+            it("should warn about infinity width value") {
+                aView.pin.width(CGFloat.infinity)
+               expect(Pin.lastWarningText).to(contain(["width", "inf", "won't be applied", "the width", "must be greater than or equal to zero"]))
+               expect(aView.frame).to(equal(CGRect(x: 140, y: 100.0, width: 100.0, height: 60.0)))
+            }
+            
+            it("should warn about -infinity width value") {
+                aView.pin.width(-CGFloat.infinity)
+               expect(Pin.lastWarningText).to(contain(["width", "inf", "won't be applied", "the width", "must be greater than or equal to zero"]))
+               expect(aView.frame).to(equal(CGRect(x: 140, y: 100.0, width: 100.0, height: 60.0)))
+            }
         }
 
         describe("the result of the height(...) methods") {
@@ -147,6 +183,42 @@ class AdjustSizeSpec: QuickSpec {
                 aView.pin.height(of: aViewChild)
                 expect(aView.frame).to(equal(CGRect(x: 140.0, y: 100.0, width: 100.0, height: 30.0)))
             }
+            
+            it("should accept a height of 0") {
+                aView.pin.height(0)
+                expect(Pin.lastWarningText).to(beNil())
+                expect(aView.frame).to(equal(CGRect(x: 140, y: 100.0, width: 100.0, height: 0.0)))
+            }
+            
+            it("should warn about negative height value") {
+                aView.pin.height(-2)
+                expect(Pin.lastWarningText).to(contain(["height", "won't be applied", "the height", "must be greater than or equal to zero"]))
+                expect(aView.frame).to(equal(CGRect(x: 140, y: 100.0, width: 100.0, height: 60.0)))
+            }
+            
+            it("should warn about NaN height value") {
+                aView.pin.height(CGFloat.nan)
+               expect(Pin.lastWarningText).to(contain(["height", "nan", "won't be applied", "the height", "must be greater than or equal to zero"]))
+               expect(aView.frame).to(equal(CGRect(x: 140, y: 100.0, width: 100.0, height: 60.0)))
+            }
+            
+            it("should warn about -NaN height value") {
+                aView.pin.height(-CGFloat.nan)
+               expect(Pin.lastWarningText).to(contain(["height", "nan", "won't be applied", "the height", "must be greater than or equal to zero"]))
+               expect(aView.frame).to(equal(CGRect(x: 140, y: 100.0, width: 100.0, height: 60.0)))
+            }
+            
+            it("should warn about infinity height value") {
+                aView.pin.height(CGFloat.infinity)
+               expect(Pin.lastWarningText).to(contain(["height", "inf", "won't be applied", "the height", "must be greater than or equal to zero"]))
+               expect(aView.frame).to(equal(CGRect(x: 140, y: 100.0, width: 100.0, height: 60.0)))
+            }
+            
+            it("should warn about -infinity height value") {
+                aView.pin.height(-CGFloat.infinity)
+               expect(Pin.lastWarningText).to(contain(["height", "inf", "won't be applied", "the height", "must be greater than or equal to zero"]))
+               expect(aView.frame).to(equal(CGRect(x: 140, y: 100.0, width: 100.0, height: 60.0)))
+            }
         }
 
         describe("the result of the size(...) methods") {