Simplify adding requirements

PrinceOfVersionsMacSample/PrinceOfVersionsMacSample/ObjectiveC Implementation/ConfigurationViewController/ObjCConfigurationController.m

@@ -44,26 +44,16 @@ - (void)checkAppVersion
     NSURL *princeOfVersionsURL = [NSURL URLWithString:Constant.princeOfVersionsURL];
 
     PoVRequestOptions *options = [PoVRequestOptions new];
-    [options addRequirementWithKey:@"region" requirementCheck:^BOOL (id value) {
-
-        // Check OS localisation
-
-        if (![value isKindOfClass:[NSString class]]) {
-            return NO;
-        }
-
-        return [(NSString *)value isEqualToString:@"hr"];
+    [options addRequirementWithKey:@"region"
+                            ofType:[NSString class]
+                  requirementCheck:^BOOL(NSString *value) {
+        return [value isEqualToString:@"hr"];
     }];
 
-    [options addRequirementWithKey:@"bluetooth" requirementCheck:^BOOL (id value) {
-
-        // Check device bluetooth version
-
-        if (![value isKindOfClass:[NSString class]]) {
-            return NO;
-        }
-
-        return [(NSString *)value hasPrefix:@"5"];
+    [options addRequirementWithKey:@"bluetooth"
+                            ofType:[NSString class]
+                  requirementCheck:^BOOL(NSString *value) {
+        return [value hasPrefix:@"5"];
     }];
 
     __weak __typeof(self) weakSelf = self;

PrinceOfVersionsMacSample/PrinceOfVersionsMacSample/Swift Implementation/ConfigurationController.swift

@@ -42,17 +42,10 @@ private extension ConfigurationController {
 
         let options = PoVRequestOptions()
 
-        options.addRequirement(key: "region") { (value) -> Bool in
-            guard let value = value as? String else { return false }
-            // Check OS localisation
-            return value == "hr"
-        }
+        options.addRequirement(key: "region", ofType: String.self) { $0.starts(with: "hr") }
+
+        options.addRequirement(key: "bluetooth", ofType: String.self) { $0.starts(with: "5") }
 
-        options.addRequirement(key: "bluetooth") { (value) -> Bool in
-            guard let value = value as? String else { return false }
-            // Check device bluetooth version
-            return value.starts(with: "5")
-        }
 
         let princeOfVersionsURL = URL(string: Constants.princeOfVersionsURL)!
 

PrinceOfVersionsSample/PrinceOfVersionsIosSample/ObjectiveC Implementation/ConfigurationViewController/ObjCConfigurationViewController.m

@@ -45,26 +45,18 @@ - (void)checkAppVersion
     NSURL *princeOfVersionsURL = [NSURL URLWithString:Constant.princeOfVersionsURL];
 
     PoVRequestOptions *options = [PoVRequestOptions new];
-    [options addRequirementWithKey:@"region" requirementCheck:^BOOL (id value) {
-
+    [options addRequirementWithKey:@"region"
+                            ofType:[NSString class]
+                  requirementCheck:^BOOL(NSString *value) {
         // Check OS localisation
-
-        if (![value isKindOfClass:[NSString class]]) {
-            return NO;
-        }
-
-        return [(NSString *)value isEqualToString:@"hr"];
+        return [value isEqualToString:@"hr"];
     }];
 
-    [options addRequirementWithKey:@"bluetooth" requirementCheck:^BOOL (id value) {
-
+    [options addRequirementWithKey:@"bluetooth"
+                            ofType:[NSString class]
+                  requirementCheck:^BOOL(NSString *value) {
         // Check device bluetooth version
-
-        if (![value isKindOfClass:[NSString class]]) {
-            return NO;
-        }
-
-        return [(NSString *)value hasPrefix:@"5"];
+        return [value hasPrefix:@"5"];
     }];
 
     __weak __typeof(self) weakSelf = self;

PrinceOfVersionsSample/PrinceOfVersionsIosSample/Swift Implementation/ConfigurationViewController.swift

@@ -44,17 +44,8 @@ private extension ConfigurationViewController {
 
         let options = PoVRequestOptions()
 
-        options.addRequirement(key: "region") { (value) -> Bool in
-            guard let value = value as? String else { return false }
-            // Check OS localisation
-            return value == "hr"
-        }
-
-        options.addRequirement(key: "bluetooth") { (value) -> Bool in
-            guard let value = value as? String else { return false }
-            // Check device bluetooth version
-            return value.starts(with: "5")
-        }
+        options.addRequirement(key: "region", ofType: String.self) { $0.starts(with: "hr") }
+        options.addRequirement(key: "bluetooth", ofType: String.self) { $0.starts(with: "5") }
 
         let princeOfVersionsURL = URL(string: Constants.princeOfVersionsURL)!
 

README.md

@@ -118,17 +118,9 @@ Here is the example of how to add requirement check closures.
   ```swift
   let options = PoVRequestOptions()
 
-  options.addRequirement(key: "region") { (value) -> Bool in
-      guard let value = value as? String else { return false }
-      // Check OS localisation
-      return value == "hr"
-  }
-
-  options.addRequirement(key: "bluetooth") { (value) -> Bool in
-      guard let value = value as? String else { return false }
-      // Check device bluetooth version
-      return value.starts(with: "5")
-  }
+  options.addRequirement(key: "region", ofType: String.self) { $0.starts(with: "hr") }
+
+  options.addRequirement(key: "bluetooth", ofType: String.self) { $0.starts(with: "5") }
 
   let princeOfVersionsURL = URL(string: "https://pastebin.com/raw/0MfYmWGu")!
 

Sources/PrinceOfVersions/PoVDataTypes/PoVRequestOptions.swift

@@ -31,16 +31,40 @@ public class PoVRequestOptions: NSObject {
     // MARK: - Public methods
 
     /**
-    Adds requirement check for configuration.
+     Adds requirement check for configuration.
 
      Use this method to add custom requirement by which configuration must comply with.
 
      - parameter key: String that matches key in requirements array in JSON with `requirementsCheck` parameter,
-     - parameter requirementCheck: A block used to check if a configuration meets requirement. This block returns `true` if configuration meets the requirement, and takes the any value as input parameter by which .
+     - parameter type: The expected type of the value.
+     - parameter requirementCheck: A block used to check if a configuration meets the requirement. This block returns `true` if the configuration meets the requirement, and takes the typed value as input.
 
      */
-    public func addRequirement(key: String, requirementCheck: @escaping ((Any) -> Bool)) {
-        userRequirements.updateValue(requirementCheck, forKey: key)
+    public func addRequirement<T>(key: String, ofType type: T.Type, requirementCheck: @escaping (T) -> Bool) {
+        userRequirements.updateValue({ value in
+            guard let typedValue = value as? T else { return false }
+            return requirementCheck(typedValue)
+        }, forKey: key)
+    }
+
+    /**
+     Adds requirement check for configuration (Objective-C compatible).
+
+     Use this method to add a custom requirement by which configuration must comply with.
+
+     - parameter key: String that matches the key in the requirements array in JSON with the `requirementCheck` parameter.
+     - parameter type: The expected class of the value (e.g., `NSString.class`).
+     - parameter requirementCheck: A block used to check if a configuration meets the requirement. This block returns `true` if the configuration meets the requirement, and takes the value as input.
+
+     This method is designed for Objective-C compatibility and uses runtime type checking (`isKindOfClass:`) to validate the value.
+     */
+    @available(swift, obsoleted: 1.0, message: "Use the generic addRequirement(key:ofType:requirementCheck:) method in Swift.")
+    @objc(addRequirementWithKey:ofType:requirementCheck:)
+    public func addRequirementWithKey(key: String, ofType type: AnyClass, requirementCheck: @escaping (Any) -> Bool) {
+        userRequirements.updateValue({ value in
+            guard let value = value as? NSObject, value.isKind(of: type) else { return false }
+            return requirementCheck(value)
+        }, forKey: key)
     }
 
 }