Skip to content

Commit 1449946

Browse files
author
Mario Savarese
committed
v0.1.5
1 parent 54eeb77 commit 1449946

2 files changed

Lines changed: 35 additions & 11 deletions

File tree

src/lib.rs

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,6 @@ impl GuardianContentClient {
422422
/// .send()
423423
/// .await?;
424424
/// ```
425-
///
426425
#[allow(clippy::too_many_arguments)]
427426
pub fn datetime_to(
428427
&mut self,
@@ -436,8 +435,12 @@ impl GuardianContentClient {
436435
) -> &mut GuardianContentClient {
437436
let formatted_datetime =
438437
crate::helpers::datetime(year, month, day, hour, min, sec, timezone);
439-
self.request
440-
.insert(String::from("to-date"), formatted_datetime);
438+
439+
if !formatted_datetime.is_empty() {
440+
self.request
441+
.insert(String::from("to-date"), formatted_datetime);
442+
}
443+
441444
self
442445
}
443446

@@ -780,11 +783,13 @@ mod helpers {
780783

781784
let offset =
782785
offset(timezone.abs() * 3600).unwrap_or_else(|| FixedOffset::west_opt(0).unwrap());
783-
let LocalResult::Single(date) = offset.with_ymd_and_hms(year, month, day, hour, min, sec) else {
784-
return "".to_owned()
785-
};
786786

787-
date.to_rfc3339()
787+
if let LocalResult::Single(date) = offset.with_ymd_and_hms(year, month, day, hour, min, sec)
788+
{
789+
date.to_rfc3339()
790+
} else {
791+
String::new()
792+
}
788793
}
789794

790795
pub(crate) fn mock_response() -> SearchResponse {

src/tests.rs

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,26 @@ mod tests {
153153
}
154154

155155
#[test]
156-
fn test_datetime_to_2() {
156+
fn test_datetime_from_wrong_offset() {
157+
let mut client = setup();
158+
// Invalid offset
159+
client.datetime_from(2021, 12, 31, 0, 0, 0, 1024);
160+
assert_eq!(
161+
client.request.get("from-date").unwrap(),
162+
"2021-12-31T00:00:00+00:00"
163+
);
164+
}
165+
166+
#[test]
167+
fn test_datetime_from_wrong_ymd_hms() {
168+
let mut client = setup();
169+
// Invalid YMD
170+
client.datetime_from(2021, 13, 40, 0, 999, 0, 5);
171+
assert_eq!(client.request.get("from-date"), None);
172+
}
173+
174+
#[test]
175+
fn test_datetime_to_wrong_offset() {
157176
let mut client = setup();
158177
// Invalid offset
159178
client.datetime_to(2021, 12, 31, 0, 0, 0, 999);
@@ -164,11 +183,11 @@ mod tests {
164183
}
165184

166185
#[test]
167-
fn test_datetime_to_3() {
186+
fn test_datetime_to_wrong_ymd_hms() {
168187
let mut client = setup();
169188
// Invalid YMD
170-
client.datetime_to(2021, 13, 40, 0, 0, 0, 5);
171-
assert_eq!(client.request.get("to-date").unwrap(), "");
189+
client.datetime_to(2021, 13, 40, 0, 999, 0, 5);
190+
assert_eq!(client.request.get("to-date"), None);
172191
}
173192

174193
#[test]

0 commit comments

Comments
 (0)