Skip to content

Commit 98fe073

Browse files
committed
Simplify and make the grammar assert more correct
1 parent 613bc40 commit 98fe073

File tree

1 file changed

+12
-17
lines changed

1 file changed

+12
-17
lines changed

Src/SwiftyTimer.swift

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -91,31 +91,26 @@ extension NSTimer {
9191

9292
// MARK: - Time extensions
9393

94-
private let milliDivider: Double = 1000
95-
private let secondsInMinute: Double = 60
96-
private let minutesInHour: Double = 60
97-
private let hoursInDay: Double = 24
98-
9994
extension Double {
10095

101-
private func assertOneOrLess(value: Double) -> Double {
102-
assert(self <= 1, "🤓 Use plural property for numbers above 1.")
96+
private func assertOne(value: Double) -> Double {
97+
assert(self == 1, "🤓 Use plural property for numbers other than 1")
10398
return value
10499
}
105100

106-
public var millisecond: NSTimeInterval { return assertOneOrLess(milliseconds) }
107-
public var milliseconds: NSTimeInterval { return self / milliDivider }
108-
public var ms: NSTimeInterval { return milliseconds }
101+
public var millisecond: NSTimeInterval { return assertOne(milliseconds) }
102+
public var milliseconds: NSTimeInterval { return self / 1000 }
103+
public var ms: NSTimeInterval { return self / 1000 }
109104

110-
public var second: NSTimeInterval { return assertOneOrLess(seconds) }
105+
public var second: NSTimeInterval { return assertOne(seconds) }
111106
public var seconds: NSTimeInterval { return self }
112107

113-
public var minute: NSTimeInterval { return assertOneOrLess(minutes) }
114-
public var minutes: NSTimeInterval { return self * secondsInMinute }
108+
public var minute: NSTimeInterval { return assertOne(minutes) }
109+
public var minutes: NSTimeInterval { return self * 60 }
115110

116-
public var hour: NSTimeInterval { return assertOneOrLess(hours)}
117-
public var hours: NSTimeInterval { return minutes * minutesInHour }
111+
public var hour: NSTimeInterval { return assertOne(hours) }
112+
public var hours: NSTimeInterval { return self * 3600 }
118113

119-
public var day: NSTimeInterval { return assertOneOrLess(days) }
120-
public var days: NSTimeInterval { return hours * hoursInDay }
114+
public var day: NSTimeInterval { return assertOne(days) }
115+
public var days: NSTimeInterval { return self * 3600 * 24 }
121116
}

0 commit comments

Comments
 (0)