dnrops
/
Schedule
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make Interval conform Comparable

This commit is contained in:
Quentin 2018-08-27 13:33:10 +08:00
parent 97bf0df856
commit 5c5e931f7c
3 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Schedule.xcodeproj/project.pbxproj
View File

@ -70,17 +70,10 @@
/* End PBXContainerItemProxy section */ /* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
626D761B2113F9D100FCAFFE /* README.zh_cn.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.zh_cn.md; sourceTree = "<group>"; };
62AA63012133970A00A442A5 /* Calendar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Calendar.swift; sourceTree = "<group>"; }; 62AA63012133970A00A442A5 /* Calendar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Calendar.swift; sourceTree = "<group>"; };
62AA63032133A0FB00A442A5 /* CalendarTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalendarTests.swift; sourceTree = "<group>"; }; 62AA63032133A0FB00A442A5 /* CalendarTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalendarTests.swift; sourceTree = "<group>"; };
667D2DF62132C5390071DC89 /* DeinitObserver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeinitObserver.swift; sourceTree = "<group>"; }; 667D2DF62132C5390071DC89 /* DeinitObserver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeinitObserver.swift; sourceTree = "<group>"; };
667D2DF82132C95D0071DC89 /* DeinitObserverTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeinitObserverTests.swift; sourceTree = "<group>"; }; 667D2DF82132C95D0071DC89 /* DeinitObserverTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeinitObserverTests.swift; sourceTree = "<group>"; };
668685ED210DCC0E009305C3 /* .swift-version */ = {isa = PBXFileReference; lastKnownFileType = text; path = ".swift-version"; sourceTree = "<group>"; };
668685EE210DCC0E009305C3 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
668685EF210DCC0E009305C3 /* .codecov.yml */ = {isa = PBXFileReference; lastKnownFileType = text; path = .codecov.yml; sourceTree = "<group>"; };
668685F0210DCC0E009305C3 /* Schedule.podspec */ = {isa = PBXFileReference; lastKnownFileType = text; path = Schedule.podspec; sourceTree = "<group>"; };
668685F1210DCC0F009305C3 /* .travis.yml */ = {isa = PBXFileReference; lastKnownFileType = text; path = .travis.yml; sourceTree = "<group>"; };
668685F2210DCC0F009305C3 /* .swiftlint.yml */ = {isa = PBXFileReference; lastKnownFileType = text; path = .swiftlint.yml; sourceTree = "<group>"; };
668685F3210DCEB0009305C3 /* Schedule.playground */ = {isa = PBXFileReference; lastKnownFileType = file.playground; path = Schedule.playground; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; }; 668685F3210DCEB0009305C3 /* Schedule.playground */ = {isa = PBXFileReference; lastKnownFileType = file.playground; path = Schedule.playground; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
OBJ_10 /* Bucket.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Bucket.swift; sourceTree = "<group>"; }; OBJ_10 /* Bucket.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Bucket.swift; sourceTree = "<group>"; };
OBJ_11 /* Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Extensions.swift; sourceTree = "<group>"; }; OBJ_11 /* Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Extensions.swift; sourceTree = "<group>"; };
@ -138,20 +131,6 @@
name = Platforms; name = Platforms;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
668685EC210DCBD4009305C3 /* Related */ = {
isa = PBXGroup;
children = (
668685EF210DCC0E009305C3 /* .codecov.yml */,
668685ED210DCC0E009305C3 /* .swift-version */,
668685F2210DCC0F009305C3 /* .swiftlint.yml */,
668685F1210DCC0F009305C3 /* .travis.yml */,
668685EE210DCC0E009305C3 /* README.md */,
668685F0210DCC0E009305C3 /* Schedule.podspec */,
626D761B2113F9D100FCAFFE /* README.zh_cn.md */,
);
name = Related;
sourceTree = "<group>";
};
668685F4210DD21A009305C3 /* Utils */ = { 668685F4210DD21A009305C3 /* Utils */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
@ -225,7 +204,6 @@
668685F3210DCEB0009305C3 /* Schedule.playground */, 668685F3210DCEB0009305C3 /* Schedule.playground */,
OBJ_6 /* Package.swift */, OBJ_6 /* Package.swift */,
OBJ_37 /* Products */, OBJ_37 /* Products */,
668685EC210DCBD4009305C3 /* Related */,
OBJ_7 /* Sources */, OBJ_7 /* Sources */,
OBJ_24 /* Tests */, OBJ_24 /* Tests */,
); );

11
Sources/Schedule/Interval.swift
View File

@ -116,6 +116,17 @@ extension Interval {
} }
} }
extension Interval: Comparable {
/// Returns a Boolean value indicating whether the first interval is
/// less than the second interval.
///
/// A negative interval is always less than a positive interval.
public static func < (lhs: Interval, rhs: Interval) -> Bool {
return lhs.compare(rhs) == .orderedAscending
}
}
// MARK: - Adding & Subtracting // MARK: - Adding & Subtracting
extension Interval { extension Interval {
/// Returns a new interval by multipling this interval by the given number. /// Returns a new interval by multipling this interval by the given number.

4
Tests/ScheduleTests/DateTimeTests.swift
View File

@ -21,6 +21,10 @@ final class DateTimeTests: XCTestCase {
XCTAssertEqual(7.day, 1.week) XCTAssertEqual(7.day, 1.week)
XCTAssertEqual((-2).seconds.compare(1.second), .orderedAscending) XCTAssertEqual((-2).seconds.compare(1.second), .orderedAscending)
XCTAssertTrue(1.1.second > 1.0.second)
XCTAssertTrue(3.days < 1.week)
XCTAssertTrue(4.day >= 4.days)
XCTAssertTrue(-2.seconds < 1.seconds)
XCTAssertTrue(1.1.second.isLonger(than: 1.0.second)) XCTAssertTrue(1.1.second.isLonger(than: 1.0.second))
XCTAssertTrue(3.days.isShorter(than: 1.week)) XCTAssertTrue(3.days.isShorter(than: 1.week))