Skip to content

Commit

Permalink
Use tidy style
Browse files Browse the repository at this point in the history
  • Loading branch information
clente committed Jan 31, 2022
1 parent ad6101b commit cbed154
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 15 deletions.
6 changes: 3 additions & 3 deletions R/cnj.R
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,8 @@ verify_cnj <- function(cnj) {
#'
#' @examples
#' \dontrun{
#' extract_parts("001040620018260004", "N")
#' extract_parts("001040620018260004", c("N", "A", "O"))
#' extract_parts("001040620018260004", "N")
#' extract_parts("001040620018260004", c("N", "A", "O"))
#' }
#' @export
extract_parts <- function(id, parts = "") {
Expand Down Expand Up @@ -218,7 +218,7 @@ build_id <- function(id) {
#' @export
separate_cnj <- function(data, col, ...) {
tidyr::separate(
data, {{col}},
data, {{ col }},
into = c("N", "D", "A", "J", "T", "O"), sep = "[\\-\\.]", ...
)
}
Expand Down
6 changes: 2 additions & 4 deletions R/test_fun.R
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,10 @@ test_fun <- function(f, force_default = FALSE) {
if (force_default) {
assign(args[[i]], eval(vals[[i]]), envir = rlang::env_parent())
}
}
else if (!rlang::is_missing(vals[[i]])) {
} else if (!rlang::is_missing(vals[[i]])) {
assign(args[[i]], eval(vals[[i]]), envir = rlang::env_parent())
does_exist[[i]] <- TRUE
}
else {
} else {
message(paste0("Argument named '", args[[i]], "' needs a value!"))
}
}
Expand Down
12 changes: 8 additions & 4 deletions R/utils.R
Original file line number Diff line number Diff line change
Expand Up @@ -82,15 +82,19 @@ rm_accent <- function(x) {
#' @export
lsos <- function(pos = 1, pattern, order.by = "Size",
decreasing = TRUE, head = TRUE, n = 10) {
napply <- function(names, fn) sapply(names, function(x)
fn(get(x, pos = pos)))
napply <- function(names, fn) {
sapply(names, function(x) {
fn(get(x, pos = pos))
})
}
names <- ls(pos = pos, pattern = pattern)
obj.class <- napply(names, function(x) as.character(class(x))[1])
obj.mode <- napply(names, mode)
obj.type <- ifelse(is.na(obj.class), obj.mode, obj.class)
obj.size <- napply(names, object.size)
obj.dim <- t(napply(names, function(x)
as.numeric(dim(x))[1:2]))
obj.dim <- t(napply(names, function(x) {
as.numeric(dim(x))[1:2]
}))
vec <- is.na(obj.dim)[, 1] & (obj.type != "function")
obj.dim[vec, 1] <- napply(names, length)[vec]
out <- data.frame(obj.type, obj.size, obj.dim)
Expand Down
8 changes: 4 additions & 4 deletions tests/testthat/test-separate_cnj.R
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ test_that("separate_cnj funciona sem warning", {
da <- tibble::tibble(
a = "1000315-72.2016.8.26.0156"
)


testthat::expect_warning(resp <- separate_cnj(da, a), regexp = NA)

testthat::expect_equal(class(resp), c("tbl_df", "tbl", "data.frame"))
testthat::expect_equal(dim(resp), c(1,6))
testthat::expect_equal(dim(resp), c(1, 6))
})

0 comments on commit cbed154

Please sign in to comment.