Merge branch 'release/2.5.0'

Framezilla.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
     spec.name           = "Framezilla"
-    spec.version        = "2.4.1"
+    spec.version        = "2.5.0"
     spec.summary        = "Comfortable syntax for working with frames."
 
     spec.homepage       = "https://github.com/Otbivnoe/Framezilla"

Sources/Array+Stack.swift

@@ -11,7 +11,7 @@ public enum StackAxis: Int {
     case vertical
 }
 
-public extension Array where Element: UIView {
+public extension Collection where Iterator.Element: UIView, Self.Index == Int, Self.IndexDistance == Int {
 
     /// Arranges views in the order of list along a vertical or horizontal axis, with spacing property.
     ///

Sources/Maker.swift

@@ -25,7 +25,7 @@ public final class Maker {
 
     unowned let view: UIView
 
-    var handlers: [(priority: HandlerPriority, handler: HandlerType)] = []
+    var handlers = ContiguousArray<(priority: HandlerPriority, handler: HandlerType)>()
     var newRect: CGRect
 
     private var widthParameter: ValueParameter?
@@ -391,7 +391,25 @@ public final class Maker {
         setHighPriorityValue(view.bounds.height, for: .height)
         return self
     }
-
+
+    /// Calculates the size that best fits the specified size.
+    ///
+    /// ```
+    ///     maker.sizeThatFits(size: CGSize(width: cell.frame.width, height: cell.frame.height)
+    /// ```
+    /// - parameter size: The size for best-fitting.
+    ///
+    /// - returns: `Maker` instance for chaining relations.
+
+    @discardableResult public func sizeThatFits(size: CGSize) -> Maker {
+        let fitSize = view.sizeThatFits(size)
+        let width = min(size.width, fitSize.width)
+        let height = min(size.height, fitSize.height)
+        setHighPriorityValue(width, for: .width)
+        setHighPriorityValue(height, for: .height)
+        return self
+    }
+
     /// Resizes and moves the receiver view so it just encloses its subviews only for height.
     ///
     /// - returns: `Maker` instance for chaining relations.
@@ -401,7 +419,17 @@ public final class Maker {
         setHighPriorityValue(view.bounds.height, for: .height)
         return self
     }
-
+
+    /// Calculates the height that best fits the specified size.
+    ///
+    /// - returns: `Maker` instance for chaining relations.
+
+    @discardableResult public func heightThatFits(height: Number) -> Maker {
+        view.sizeToFit()
+        setHighPriorityValue(min(view.bounds.height, height.value), for: .height)
+        return self
+    }
+
     /// Resizes and moves the receiver view so it just encloses its subviews only for width.
     ///
     /// - returns: `Maker` instance for chaining relations.
@@ -411,25 +439,17 @@ public final class Maker {
         setHighPriorityValue(view.bounds.width, for: .width)
         return self
     }
-
-    /// Calculates the size that best fits the specified size.
-    ///
-    /// ```
-    ///     maker.sizeThatFits(size: CGSize(width: cell.frame.width, height: cell.frame.height)
-    /// ```
-    /// - parameter size: The size for best-fitting.
+
+    /// Calculates the width that best fits the specified size.
     ///
     /// - returns: `Maker` instance for chaining relations.
-
-    @discardableResult public func sizeThatFits(size: CGSize) -> Maker {
-        let fitSize = view.sizeThatFits(size)
-        let width = min(size.width, fitSize.width)
-        let height = min(size.height, fitSize.height)
-        setHighPriorityValue(width, for: .width)
-        setHighPriorityValue(height, for: .height)
+
+    @discardableResult public func widthThatFits(width: Number) -> Maker {
+        view.sizeToFit()
+        setHighPriorityValue(min(view.bounds.width, width.value), for: .width)
         return self
     }
-    
+
     // MARK: Middle priority
 
     /// Creates margin relation for superview.

Sources/UIView+Installer.swift

@@ -86,7 +86,7 @@ public extension UIView {
     }
 }
 
-public extension Array where Element: UIView {
+public extension Sequence where Iterator.Element: UIView {
 
     /// Configures frames of the views for special state.
     ///

Tests/MakerWidthHeightTests.swift

@@ -154,4 +154,80 @@ class MakerWidthHeightTests: BaseTest {
         }
         XCTAssertEqual(testingView.frame, CGRect(x: 125, y: 187.5, width: 250, height: 125))
     }
+
+    /* width / height to fit */
+
+    func testWidthToFit() {
+
+        let label = UILabel()
+        label.text = "HelloHelloHelloHello"
+
+        label.configureFrame { maker in
+            maker.widthToFit()
+        }
+        XCTAssertTrue(label.bounds.width > 0)
+        XCTAssertEqual(label.bounds.height, 0)
+    }
+
+    func testHeightToFit() {
+
+        let label = UILabel()
+        label.text = "HelloHelloHelloHello"
+
+        label.configureFrame { maker in
+            maker.heightToFit()
+        }
+        XCTAssertTrue(label.bounds.height > 0)
+        XCTAssertEqual(label.bounds.width, 0)
+    }
+
+    /* width / height that fits */
+
+    func testThat_widthThatFits_correctlyConfiguresRelativeLowMaxWidth() {
+
+        let label = UILabel()
+        label.text = "HelloHelloHelloHello"
+
+        label.configureFrame { maker in
+            maker.widthThatFits(width: 30)
+        }
+        XCTAssertEqual(label.bounds.width, 30)
+        XCTAssertEqual(label.bounds.height, 0)
+    }
+
+    func testThat_widthThatFits_correctlyConfiguresRelativeHighMaxWidth() {
+
+        let label = UILabel()
+        label.text = "HelloHelloHelloHello"
+
+        label.configureFrame { maker in
+            maker.widthThatFits(width: 300)
+        }
+        XCTAssertTrue(label.bounds.width != 300)
+        XCTAssertEqual(label.bounds.height, 0)
+    }
+
+    func testThat_heightThatFits_correctlyConfiguresRelativeLowMaxHeight() {
+
+        let label = UILabel()
+        label.text = "HelloHelloHelloHello"
+
+        label.configureFrame { maker in
+            maker.heightThatFits(height: 5)
+        }
+        XCTAssertEqual(label.bounds.height, 5)
+        XCTAssertEqual(label.bounds.width, 0)
+    }
+
+    func testThat_heightThatFits_correctlyConfiguresRelativeHighMaxHeight() {
+
+        let label = UILabel()
+        label.text = "HelloHelloHelloHello"
+
+        label.configureFrame { maker in
+            maker.heightThatFits(height: 300)
+        }
+        XCTAssertTrue(label.bounds.height != 300)
+        XCTAssertEqual(label.bounds.width, 0)
+    }
 }