Skip to content

Use PrimitiveType as values of parameter dictionary #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Use PrimitiveType as values of parameter dictionary #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e04256
Define PrimitiveType
devxoul Sep 8, 2019
a5403bc
Use PrimitiveType as parameter dictionary value type
devxoul Sep 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions Sources/Umbrella/PrimitiveType.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import Foundation
import CoreGraphics

public protocol PrimitiveType {
}

extension String: PrimitiveType {}

extension Bool: PrimitiveType {}

extension Int: PrimitiveType {}
extension Int8: PrimitiveType {}
extension Int16: PrimitiveType {}
extension Int32: PrimitiveType {}
extension Int64: PrimitiveType {}

extension UInt: PrimitiveType {}
extension UInt8: PrimitiveType {}
extension UInt16: PrimitiveType {}
extension UInt32: PrimitiveType {}
extension UInt64: PrimitiveType {}

extension Float: PrimitiveType {}
extension Double: PrimitiveType {}

extension NSNumber: PrimitiveType {}
extension CGFloat: PrimitiveType {}

extension Array: PrimitiveType where Element: PrimitiveType {}
extension Dictionary: PrimitiveType where Value: PrimitiveType {}
2 changes: 1 addition & 1 deletion Sources/Umbrella/RuntimeProviderType.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public extension RuntimeProviderType {
}
}

func log(_ eventName: String, parameters: [String: Any]?) {
func log(_ eventName: String, parameters: [String: PrimitiveType]?) {
guard self.responds else { return }
if let instance = self.instance {
_ = instance.perform(self.selector, with: eventName, with: parameters)
Expand Down
4 changes: 2 additions & 2 deletions Sources/Umbrella/Umbrella.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ public protocol AnalyticsType {
}

public protocol ProviderType {
func log(_ eventName: String, parameters: [String: Any]?)
func log(_ eventName: String, parameters: [String: PrimitiveType]?)
}

public protocol EventType {
func name(for provider: ProviderType) -> String?
func parameters(for provider: ProviderType) -> [String: Any]?
func parameters(for provider: ProviderType) -> [String: PrimitiveType]?
}

open class Analytics<Event: EventType>: AnalyticsType {
Expand Down
7 changes: 4 additions & 3 deletions Tests/UmbrellaTests/Fixtures.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import Umbrella
import Foundation

enum TestEvent: EventType {
case login(username: String)
Expand All @@ -24,7 +25,7 @@ enum TestEvent: EventType {
}
}

func parameters(for provider: ProviderType) -> [String : Any]? {
func parameters(for provider: ProviderType) -> [String: PrimitiveType]? {
switch self {
case let .login(username):
switch provider {
Expand All @@ -46,9 +47,9 @@ enum TestEvent: EventType {
}

class MockProvider: ProviderType {
var events: [(name: String, parameters: [String: Any]?)] = []
var events: [(name: String, parameters: [String: PrimitiveType]?)] = []

func log(_ eventName: String, parameters: [String: Any]?) {
func log(_ eventName: String, parameters: [String: PrimitiveType]?) {
self.events.append((name: eventName, parameters: parameters))
}
}
Expand Down