Mobee 952: New reset helper method

Package.swift

@@ -0,0 +1,45 @@
+// swift-tools-version:5.5
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "wiser-ios-utils",
+    platforms: [
+          .macOS(.v10_10), .iOS(.v12)
+        ],
+    products: [
+        // Products define the executables and libraries a package produces, and make them visible to other packages.
+        .library(
+            name: "WiseMock",
+            targets: ["WiseMock"]
+        ),
+        .library(
+            name: "DIWise",
+            targets: ["DIWise"]
+        ),
+    ],
+    dependencies: [
+        .package(url: "https://github.com/Quick/Nimble.git", from: "9.2.1"),
+        .package(url: "https://github.com/Quick/Quick.git", from: "5.0.1"),
+    ],
+    targets: [
+        // Targets are the basic building blocks of a package. A target can define a module or a test suite.
+        // Targets can depend on other targets in this package, and on products in packages this package depends on.
+        .target(
+            name: "WiseMock",
+            dependencies: [
+                .product(name: "Nimble", package: "Nimble",
+                                         condition: .when(platforms: [.macOS, .iOS])),
+            ]
+        ),
+        .testTarget(
+            name: "WiseMockTests",
+            dependencies: [ "Quick", "Nimble", "WiseMock" ]
+        ),
+        .target(
+            name: "DIWise"
+        )
+
+    ]
+)

README

@@ -1,34 +0,0 @@
-This framework provides:
-    - iOS Mocker
-    - WebRequest
-        - HTTP MultiPart
-        - HTTP Methods (ex. GET/POST/PUT/etc)
-        - HTTP-Redirection
-    - Mock WebRequest
-    - Util Functions
-        - DataFromHexString
-        - SplitString
-
-IMPORTANT:
-    This project contains two frameworks, one for development and another for production.
-        The production version is portable to the Apple App Store, but is incompatible with iOS-Simulators.
-        The development version is compatible with both iOS-Devices and the iOS-Simulators, but is NOT compatible with the Apple App Store.
-
-
-Build:
-    Development (Non App Store):
-        1. Select the "SwiftLibsFramework" project from the target-menu.
-        2. Select any non-generic simulator from the build-target. (i.e. "iPhone 5s")
-        3. Copy the built framework from bin/development into your project's directory.
-        4. Add the framework as an embedded-binary into your application.
-    Production (App Store):
-        1. Select the "SwiftLibsFrameworkProduction" project from the target-menu.
-        2. Select any the generic simulator from the build-target. (i.e. "Generic iOS Device")
-        3. Copy the built framework from bin/production into your project's directory.
-        4. Add the framework as an embedded-binary into your application.
-
-
-Pre-Built Binaries:
-    Located:
-        ./release/<version>/
-

Sources/DIWise/DIConfigurator.swift

@@ -0,0 +1,29 @@
+//
+//  DIConfigurator.swift
+//  mobee
+//
+//  Created by Daniel Oancea on 2/8/22.
+//
+
+import Foundation
+import Segment
+import UIKit
+import CoreLocation
+
+@objcMembers
+public open class DIConfigurator: NSObject {
+
+    private static let container: DIContainerProtocol = DIContainer.shared
+
+    public static func configuredComponentSingleton<Component>(_ type: Component.Type, factory: () -> Component) -> Component {
+        if let it = container.resolve(type: type) {
+            return it
+        } else {
+            let it = factory()
+
+            container.register(type: type, component: it)
+
+            return it
+        }
+    }
+}

Sources/DIWise/DIContainer.swift

@@ -0,0 +1,35 @@
+//
+//  DIContainer.swift
+//  mobee
+//
+//  Created by Daniel Oancea on 2/8/22.
+
+/**
+ Dependency Injection approach originally taken from here:
+ https://www.raywenderlich.com/14223279-dependency-injection-tutorial-for-ios-getting-started
+
+ Testing this out as a solution to DI for iOS, which is very helpful in writing testable code
+ */
+
+import Foundation
+
+protocol DIContainerProtocol {
+  func register<Component>(type: Component.Type, component: Any)
+  func resolve<Component>(type: Component.Type) -> Component?
+}
+
+final class DIContainer: DIContainerProtocol {
+  static let shared = DIContainer()
+
+  private init() {}
+
+  var components: [String: Any] = [:]
+
+  func register<Component>(type: Component.Type, component: Any) {
+    components["\(type)"] = component
+  }
+
+  func resolve<Component>(type: Component.Type) -> Component? {
+    return components["\(type)"] as? Component
+  }
+}

Sources/WiseMock/.gitignore

@@ -0,0 +1,7 @@
+.DS_Store
+/.build
+/Packages
+/*.xcodeproj
+xcuserdata/
+DerivedData/
+.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata

SwiftLibsFramework/Info.plist → Sources/WiseMock/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.5</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

Sources/WiseMock/Matchers/DateMatchers.swift

@@ -0,0 +1,36 @@
+//
+//  File.swift
+//  
+//
+//  Created by Daniel Oancea on 5/17/22.
+//
+
+import Foundation
+import Nimble
+
+
+public func beTheSameDayAs(_ expectedDate: Date) -> Predicate<Date> {
+    return Predicate<Date>.define { actualExpression in
+        var expectationMessage: ExpectationMessage!
+        var status: PredicateStatus!
+
+        if let actualDate = try? actualExpression.evaluate() {
+            let actualMessage = String(describing: actualDate)
+
+            expectationMessage = .expectedActualValueTo(actualMessage)
+
+
+            status = PredicateStatus(bool: isSameDay(date1: actualDate, date2: expectedDate))
+        } else {
+            status = .fail
+            expectationMessage = .fail("something else happened")
+        }
+        return PredicateResult(status: status, message: expectationMessage)
+    }
+}
+
+fileprivate func isSameDay(date1: Date, date2: Date) -> Bool {
+    let diff = Calendar.current.dateComponents([.year, .month, .day], from: date1, to: date2)
+
+    return diff.day == 0 && diff.month == 0 && diff.year == 0
+}

Sources/WiseMock/Matchers/NimbleMatchers.swift

@@ -0,0 +1,83 @@
+import Foundation
+import Nimble
+
+///Invocation Count
+public func invoke<T: Mockable>(_ name: T.MockedMethod, times: Int = 1) -> Predicate<T> {
+
+    return Predicate<T>.define { actualExpression in
+        var expectationMessage: ExpectationMessage!
+        var status: PredicateStatus!
+
+        if let mockable = try? actualExpression.evaluate() {
+            let failureExpectationMessage = "invoke \(name) \(times) times"
+            let actualMessage = "\(mockable.invocationCount(for: name)) invocations"
+            status = PredicateStatus(bool: mockable.invocationCount(for: name) == times)
+            expectationMessage = .expectedCustomValueTo(failureExpectationMessage, actual: actualMessage)
+        } else {
+            status = .fail
+            expectationMessage = .fail("something else happened")
+        }
+        return PredicateResult(status: status, message: expectationMessage)
+    }
+
+}
+
+///Equality
+public func invoke<T: Mockable, E: Equatable>(_ name: T.MockedMethod, atInvocation invocationIndex: Int = 0, withParameter parameter: E?, at parameterIndex: Int = 0) -> Predicate<T> {
+    return Predicate<T>.define { actualExpression in
+        var expectationMessage: ExpectationMessage!
+        var status: PredicateStatus!
+
+        if let mockable = try? actualExpression.evaluate() {
+            let actualParameter: E? = mockable.parameter(for: name, at: parameterIndex, andInvocation: invocationIndex)
+            let actualMessage = String(describing: actualParameter)
+
+            expectationMessage = .expectedActualValueTo(actualMessage)
+            status = PredicateStatus(bool: actualParameter == parameter)
+        } else {
+            status = .fail
+            expectationMessage = .fail("something else happened")
+        }
+        return PredicateResult(status: status, message: expectationMessage)
+    }
+
+}
+
+///Identity
+public func invoke<T: Mockable, E: AnyObject>(_ name: T.MockedMethod, atInvocation invocationIndex: Int = 0, withIdenticalParameter parameter: E?, at parameterIndex: Int = 0) -> Predicate<T> {
+    return Predicate<T>.define { actualExpression in
+        var expectationMessage: ExpectationMessage!
+        var status: PredicateStatus!
+
+        if let mockable = try? actualExpression.evaluate() {
+            let actualParameter: E? = mockable.parameter(for: name, at: parameterIndex, andInvocation: invocationIndex)
+            let actualMessage = String(describing: actualParameter)
+
+            expectationMessage = .expectedActualValueTo(actualMessage)
+            status = PredicateStatus(bool: actualParameter === parameter)
+        } else {
+            status = .fail
+            expectationMessage = .fail("something else happened")
+        }
+        return PredicateResult(status: status, message: expectationMessage)
+    }
+}
+
+/// Closure Matcher
+public func invoke<T: Mockable, U>(_ name: T.MockedMethod, atInvocation invocationIndex: Int = 0, atParameterIndex parameterIndex: Int = 0, withMatcher matcher: @escaping ((U?) -> Bool)) -> Predicate<T> {
+    return Predicate<T>.define { actualExpression in
+        var expectationMessage: ExpectationMessage!
+        var status: PredicateStatus!
+
+        if let mockable = try? actualExpression.evaluate() {
+            let actualParameter: U? = mockable.parameter(for: name, at: parameterIndex, andInvocation: invocationIndex)
+
+            expectationMessage = .fail("parameter as \(String(describing: actualParameter)) does not match")
+            status = PredicateStatus(bool: matcher(actualParameter))
+        } else {
+            status = .fail
+            expectationMessage = .fail("something else happened")
+        }
+        return PredicateResult(status: status, message: expectationMessage)
+    }
+}