Skip to content

Add support for RFC 3339 style time #248

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

Merged
kou merged 4 commits into from
Jun 29, 2022
+86 −3
Merged

Add support for RFC 3339 style time #248

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
efc1cbb
simplify DateTimeMatcher regexp, matching patterns recognized by Date…
thyresias Jun 15, 2022
a3864f8
* refer to RFC-3339
thyresias Jun 28, 2022
7b029e4
change variable name in RFC3339 tests
thyresias Jun 29, 2022
5b16eaa
Remove a needless empty line
kou Jun 29, 2022
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
5 changes: 2 additions & 3 deletions lib/csv.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -875,10 +875,9 @@ def initialize(message, line_number)
# A Regexp used to find and convert some common DateTime formats.
DateTimeMatcher =
/ \A(?: (\w+,?\s+)?\w+\s+\d{1,2}\s+\d{1,2}:\d{1,2}:\d{1,2},?\s+\d{2,4} |
\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2} |
# ISO-8601
# ISO-8601 and RFC-3339 (space instead of T) recognized by DateTime.parse
\d{4}-\d{2}-\d{2}
(?:T\d{2}:\d{2}(?::\d{2}(?:\.\d+)?(?:[+-]\d{2}(?::\d{2})|Z)?)?)?
(?:[T\s]\d{2}:\d{2}(?::\d{2}(?:\.\d+)?(?:[+-]\d{2}(?::\d{2})|Z)?)?)?
)\z /x

# The encoding used by all converters.
Expand Down
85 changes: 85 additions & 0 deletions test/csv/test_data_converters.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,4 +103,89 @@ def test_builtin_date_time_converter_iso8601_utc
assert_equal(datetime,
CSV::Converters[:date_time][iso8601_string])
end

def test_builtin_date_time_converter_rfc3339_minute
iso8601_string = "2018-01-14 22:25"
Copy link
Copy Markdown
Member

@kou kou Jun 28, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you use rfc3339_string instead of iso8601_string because this is not ISO 8601 format?

Copy link
Copy Markdown
Contributor Author

@thyresias thyresias Jun 29, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done.

datetime = DateTime.new(2018, 1, 14, 22, 25)
assert_equal(datetime,
CSV::Converters[:date_time][iso8601_string])
end

def test_builtin_date_time_converter_rfc3339_second
iso8601_string = "2018-01-14 22:25:19"
datetime = DateTime.new(2018, 1, 14, 22, 25, 19)
assert_equal(datetime,
CSV::Converters[:date_time][iso8601_string])
end

def test_builtin_date_time_converter_rfc3339_under_second
iso8601_string = "2018-01-14 22:25:19.1"
datetime = DateTime.new(2018, 1, 14, 22, 25, 19.1)
assert_equal(datetime,
CSV::Converters[:date_time][iso8601_string])
end

def test_builtin_date_time_converter_rfc3339_under_second_offset
iso8601_string = "2018-01-14 22:25:19.1+09:00"
datetime = DateTime.new(2018, 1, 14, 22, 25, 19.1, "+9")
assert_equal(datetime,
CSV::Converters[:date_time][iso8601_string])
end

def test_builtin_date_time_converter_rfc3339_offset
iso8601_string = "2018-01-14 22:25:19+09:00"
datetime = DateTime.new(2018, 1, 14, 22, 25, 19, "+9")
assert_equal(datetime,
CSV::Converters[:date_time][iso8601_string])
end

def test_builtin_date_time_converter_rfc3339_utc
iso8601_string = "2018-01-14 22:25:19Z"
datetime = DateTime.new(2018, 1, 14, 22, 25, 19)
assert_equal(datetime,
CSV::Converters[:date_time][iso8601_string])
end

def test_builtin_date_time_converter_rfc3339_tab_minute
iso8601_string = "2018-01-14\t22:25"
datetime = DateTime.new(2018, 1, 14, 22, 25)
assert_equal(datetime,
CSV::Converters[:date_time][iso8601_string])
end

def test_builtin_date_time_converter_rfc3339_tab_second
iso8601_string = "2018-01-14\t22:25:19"
datetime = DateTime.new(2018, 1, 14, 22, 25, 19)
assert_equal(datetime,
CSV::Converters[:date_time][iso8601_string])
end

def test_builtin_date_time_converter_rfc3339_tab_under_second
iso8601_string = "2018-01-14\t22:25:19.1"
datetime = DateTime.new(2018, 1, 14, 22, 25, 19.1)
assert_equal(datetime,
CSV::Converters[:date_time][iso8601_string])
end

def test_builtin_date_time_converter_rfc3339_tab_under_second_offset
iso8601_string = "2018-01-14\t22:25:19.1+09:00"
datetime = DateTime.new(2018, 1, 14, 22, 25, 19.1, "+9")
assert_equal(datetime,
CSV::Converters[:date_time][iso8601_string])
end

def test_builtin_date_time_converter_rfc3339_tab_offset
iso8601_string = "2018-01-14\t22:25:19+09:00"
datetime = DateTime.new(2018, 1, 14, 22, 25, 19, "+9")
assert_equal(datetime,
CSV::Converters[:date_time][iso8601_string])
end

def test_builtin_date_time_converter_rfc3339_tab_utc
iso8601_string = "2018-01-14\t22:25:19Z"
datetime = DateTime.new(2018, 1, 14, 22, 25, 19)
assert_equal(datetime,
CSV::Converters[:date_time][iso8601_string])
end

Comment thread
kou marked this conversation as resolved.
Outdated
end