rename iso_week and iso_wday to isoweek and isowday

shrektan · Mar 19, 2022 · 301b720 · 301b720
1 parent 1f2c80c
commit 301b720
Show file tree

Hide file tree

Showing 10 changed files with 128 additions and 111 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: ymd
 Title: Parse 'YMD' Format Number or String to Date
-Version: 0.0.4
+Version: 0.0.5
 Authors@R: c(
     person("Xianying", "Tan", , "shrektan@126.com", role = c("aut", "cre"),
            comment = c(ORCID = "0000-0002-6072-3521")),

diff --git a/NAMESPACE b/NAMESPACE
@@ -3,8 +3,8 @@
 export(bop)
 export(edate)
 export(eop)
-export(iso_wday)
-export(iso_week)
+export(isowday)
+export(isoweek)
 export(mday)
 export(month)
 export(quarter)

diff --git a/NEWS.md b/NEWS.md
@@ -1,7 +1,7 @@
 # ymd 0.1.0
 
 * `ymd()` now supports `...` arguments, which is convinient for interactive use, e.g., `ymd(210101, 220201)`.
-* Implement date part extracting functions, including `year()`, `month()`, `quarter()`, `iso_week()`, `iso_wday()`, `wday()`, `mday()`, `yday()`,
+* Implement date part extracting functions, including `year()`, `month()`, `quarter()`, `isoweek()`, `isowday()`, `wday()`, `mday()`, `yday()`,
 * Redirect the Rust message to R's stderr stream.
 
 # ymd 0.0.1

diff --git a/R/date-part.R b/R/date-part.R
@@ -12,8 +12,8 @@
 #'   * yday: the day of year
 #'   * mday: the day of month
 #'   * wday: the day of the week (Sunday is 1)
-#'   * iso_week: ISO 8601 week
-#'   * iso_wday: the day of week (ISO 8601 weekday number, Monday is 1)
+#'   * isoweek: ISO 8601 week
+#'   * isowday: the day of week (ISO 8601 weekday number, Monday is 1)
 #' @references
 #' ISO week day, https://en.wikipedia.org/wiki/ISO_week_date
 #' ISO 8601, https://en.wikipedia.org/wiki/ISO_8601
@@ -24,8 +24,8 @@
 #' yday(210205)
 #' mday(210205)
 #' wday(210117)
-#' iso_wday(210117)
-#' iso_week(210101)
+#' isowday(210117)
+#' isoweek(210101)
 #'
 #' @name date_part
 NULL
diff --git a/R/extendr-wrappers.R b/R/extendr-wrappers.R
@@ -43,11 +43,11 @@ quarter <- function(ref_date) .Call(wrap__quarter, ref_date)
 
 #' @rdname date_part
 #' @export
-iso_week <- function(ref_date) .Call(wrap__iso_week, ref_date)
+isoweek <- function(ref_date) .Call(wrap__isoweek, ref_date)
 
 #' @rdname date_part
 #' @export
-iso_wday <- function(ref_date) .Call(wrap__iso_wday, ref_date)
+isowday <- function(ref_date) .Call(wrap__isowday, ref_date)
 
 #' @rdname date_part
 #' @export

diff --git a/README.Rmd b/README.Rmd
@@ -174,7 +174,7 @@ run_bmk(
 run_bmk(
   data.table::isoweek(x),
   lubridate::isoweek(x),
-  ymd::iso_week(x)
+  ymd::isoweek(x)
 )
 ```
 

diff --git a/README.md b/README.md
diff --git a/man/date_part.Rd b/man/date_part.Rd
diff --git a/src/rust/src/dateof.rs b/src/rust/src/dateof.rs
@@ -33,7 +33,7 @@ make_fun!(quarter, |date: &NaiveDate| -> i32 {
     to_quarter(date.month())
 });
 
-make_fun!(iso_week, |date: &NaiveDate| -> i32 {
+make_fun!(isoweek, |date: &NaiveDate| -> i32 {
     date.iso_week().week() as i32
 });
 
@@ -45,7 +45,7 @@ make_fun!(mday, |date: &NaiveDate| -> i32 { date.day() as i32 });
 
 make_fun!(yday, |date: &NaiveDate| -> i32 { date.ordinal() as i32 });
 
-make_fun!(iso_wday, |date: &NaiveDate| -> i32 {
+make_fun!(isowday, |date: &NaiveDate| -> i32 {
     date.weekday().number_from_monday() as i32
 });
 
@@ -64,8 +64,8 @@ mod test {
                 Some(date)
             })
             .collect();
-        let iso_wday_expect = vec![Some(1), Some(2), Some(3), Some(4), Some(5), Some(6), Some(7)];
-        assert_eq!(iso_wday(&dates), iso_wday_expect);
+        let isowday_expect = vec![Some(1), Some(2), Some(3), Some(4), Some(5), Some(6), Some(7)];
+        assert_eq!(isowday(&dates), isowday_expect);
         let wday_expect = vec![Some(2), Some(3), Some(4), Some(5), Some(6), Some(7), Some(1)];
         assert_eq!(wday(&dates), wday_expect);
     }

diff --git a/src/rust/src/lib.rs b/src/rust/src/lib.rs
@@ -149,8 +149,8 @@ make_date_part_fun!(quarter, dateof::quarter);
 make_date_part_fun!(wday, dateof::wday);
 make_date_part_fun!(mday, dateof::mday);
 make_date_part_fun!(yday, dateof::yday);
-make_date_part_fun!(iso_week, dateof::iso_week);
-make_date_part_fun!(iso_wday, dateof::iso_wday);
+make_date_part_fun!(isoweek, dateof::isoweek);
+make_date_part_fun!(isowday, dateof::isowday);
 
 #[cfg(test)]
 mod test {
@@ -317,8 +317,8 @@ extendr_module! {
     fn year;
     fn month;
     fn quarter;
-    fn iso_week;
-    fn iso_wday;
+    fn isoweek;
+    fn isowday;
     fn wday;
     fn mday;
     fn yday;