Skip to content
This repository was archived by the owner on Aug 10, 2024. It is now read-only.

fix parsing dates with more than 3 digits for second fraction, resolves #67 #78

Merged
merged 1 commit into from
Apr 8, 2024
Merged

fix parsing dates with more than 3 digits for second fraction, resolves #67 #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions Sources/ObjC/RSDateParser.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,9 @@ static NSInteger parsedTimeZoneOffset(const char *bytes, NSUInteger numberOfByte
if (hasMilliseconds) {
milliseconds = nextNumericValue(bytes, numberOfBytes, currentIndex, 3, &finalIndex);
currentIndex = finalIndex + 1;

// Igore more than 3 digits for fraction of a second
while (currentIndex < numberOfBytes && isdigit(bytes[currentIndex])) currentIndex++;
}

timeZoneOffset = parsedTimeZoneOffset(bytes, numberOfBytes, currentIndex);
Expand Down
13 changes: 7 additions & 6 deletions Tests/RSParserTests/RSDateParserTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import RSParser

class RSDateParserTests: XCTestCase {

static func dateWithValues(_ year: Int, _ month: Int, _ day: Int, _ hour: Int, _ minute: Int, _ second: Int) -> Date {
static func dateWithValues(_ year: Int, _ month: Int, _ day: Int, _ hour: Int, _ minute: Int, _ second: Int, _ milliseconds: Int = 0) -> Date {
var dateComponents = DateComponents()
dateComponents.calendar = Calendar.current
dateComponents.timeZone = TimeZone(secondsFromGMT: 0)
Expand All @@ -22,6 +22,7 @@ class RSDateParserTests: XCTestCase {
dateComponents.hour = hour
dateComponents.minute = minute
dateComponents.second = second
dateComponents.nanosecond = milliseconds * 1000000

return dateComponents.date!
}
Expand Down Expand Up @@ -100,9 +101,9 @@ class RSDateParserTests: XCTestCase {
XCTAssertEqual(d, expectedDateResult)
}

// func testHighMillisecondDate() {
// let expectedDateResult = Self.dateWithValues(2021, 03, 29, 10, 46, 56)
// let d = RSDateWithString("2021-03-29T10:46:56.516941+00:00")
// XCTAssertEqual(d, expectedDateResult)
// }
func testHighMillisecondDate() {
let expectedDateResult = Self.dateWithValues(2021, 03, 29, 10, 46, 56, 516)
let d = RSDateWithString("2021-03-29T10:46:56.516941+00:00")
XCTAssertEqual(d!.timeIntervalSince1970, expectedDateResult.timeIntervalSince1970, accuracy: 0.000001)
}
}