diff --git a/DESCRIPTION b/DESCRIPTION index a0a4a42..4e8ab67 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ -Package: abscorr +Package: strayr Type: Package Title: Ready-to-use Australian common structures and classifications and tools for working with them -Version: 0.1.1 +Version: 0.1.2 Authors@R: c(person("Will", "Mackey", email = "wfmackey@gmail.com", role = c("aut", "cre")), person(given = "Matt", family = "Johnson", diff --git a/NEWS.md b/NEWS.md index 141c776..96fc546 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,6 @@ +# strayr 0.1.2 +* Package renamed from `abscorr` to `strayr`. + # abscorr 0.1.1 * Functions from `strayr` package to wrangle state names + public holidays added diff --git a/R/is_holiday.R b/R/is_holiday.R index 01ad1a8..c55f650 100644 --- a/R/is_holiday.R +++ b/R/is_holiday.R @@ -37,9 +37,9 @@ do_is_holiday <- function(date, jurisdictions = c()) { } if (length(jurisdictions) == 0) { - ret <- abscorr::auholidays[abscorr::auholidays$Date == new_date, ] + ret <- strayr::auholidays[strayr::auholidays$Date == new_date, ] } else { - ret <- abscorr::auholidays[abscorr::auholidays$Date == new_date & (abscorr::auholidays$Jurisdiction %in% jurisdictions | abscorr::auholidays$Jurisdiction == "NAT"), ] + ret <- strayr::auholidays[strayr::auholidays$Date == new_date & (strayr::auholidays$Jurisdiction %in% jurisdictions | strayr::auholidays$Jurisdiction == "NAT"), ] } return(nrow(ret) > 0) diff --git a/R/abscorr-package.R b/R/strayr-package.R similarity index 100% rename from R/abscorr-package.R rename to R/strayr-package.R diff --git a/README.Rmd b/README.Rmd index 0705332..ab2dea4 100644 --- a/README.Rmd +++ b/README.Rmd @@ -16,18 +16,18 @@ knitr::opts_chunk$set( ) ``` -# abscorr +# strayr [![Lifecycle: experimental](https://img.shields.io/badge/lifecycle-experimental-orange.svg)](https://www.tidyverse.org/lifecycle/#experimental) [![R build -status](https://github.com/runapp-aus/abscorr/workflows/R-CMD-check/badge.svg)](https://github.com/runapp-aus/abscorr/actions) +status](https://github.com/runapp-aus/strayr/workflows/R-CMD-check/badge.svg)](https://github.com/runapp-aus/strayr/actions) -The `abscorr` package provides tools to make working with Australian +The `strayr` package provides tools to make working with Australian data easier. This includes: - tidy versions of common structures used by the Australian Bureau of @@ -47,15 +47,15 @@ contribute to this package. ## Installation -You can install the current version of `abscorr` with: +You can install the current version of `strayr` with: ``` r -remotes::install_github("runapp-aus/abscorr") +remotes::install_github("runapp-aus/strayr") ``` ## Structures -Current structures stored in `abscorr` are: +Current structures stored in `strayr` are: - `anzsco`: occupation levels of the [Australian and New Zealand Standard Classification of Occupations (ANZSCO), First Edition, @@ -72,7 +72,7 @@ Current structures stored in `abscorr` are: Classification of Education (ASCED), 2001. Cat. 1272.0](https://www.abs.gov.au/ausstats/abs@.nsf/mf/1272.0). -The `abscorr` package also loads +The `strayr` package also loads [`absmapsdata`](https://github.com/wfmackey/absmapsdata), which contains the following structures *and their geometry* as `sf` objects: @@ -117,7 +117,7 @@ library(dplyr, warn.conflicts = FALSE) ``` ```{r fake-load, eval=FALSE} -library(abscorr) +library(strayr) #> Loading required package: absmapsdata library(dplyr) ``` @@ -150,14 +150,14 @@ x <- c("western Straya", "w. A ", "new soth wailes", "SA", "tazz", "Victoria", To convert this character vector to a vector of abbreviations for State names, use `clean_state()`: -```{r strayr1} +```{r state} clean_state(x) ``` If you want full names for the states rather than abbreviations: -```{r strayr-fullnames} +```{r state-fullnames} clean_state(x, to = "state_name") @@ -169,7 +169,7 @@ to permit exact matching, you can disable fuzzy matching. This means you will never get false matches, but you will also fail to match misspelled state names or malformed abbreviations; you'll get an `NA` if no match can be found. -```{r strayr-exact} +```{r state-exact} clean_state(x, fuzzy_match = FALSE) ``` diff --git a/README.md b/README.md index 1c5a52b..d6a0791 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,19 @@ -# abscorr +# strayr [![Lifecycle: experimental](https://img.shields.io/badge/lifecycle-experimental-orange.svg)](https://www.tidyverse.org/lifecycle/#experimental) [![R build -status](https://github.com/runapp-aus/abscorr/workflows/R-CMD-check/badge.svg)](https://github.com/runapp-aus/abscorr/actions) +status](https://github.com/runapp-aus/strayr/workflows/R-CMD-check/badge.svg)](https://github.com/runapp-aus/strayr/actions) -The `abscorr` package provides tools to make working with Australian -data easier. This includes: +The `strayr` package provides tools to make working with Australian data +easier. This includes: - tidy versions of common structures used by the Australian Bureau of Statistics (ABS), like ANZSIC and ANZSCO: @@ -32,15 +32,15 @@ contribute to this package. ## Installation -You can install the current version of `abscorr` with: +You can install the current version of `strayr` with: ``` r -remotes::install_github("runapp-aus/abscorr") +remotes::install_github("runapp-aus/strayr") ``` ## Structures -Current structures stored in `abscorr` are: +Current structures stored in `strayr` are: - `anzsco`: occupation levels of the [Australian and New Zealand Standard Classification of Occupations (ANZSCO), First Edition, @@ -57,7 +57,7 @@ Current structures stored in `abscorr` are: Classification of Education (ASCED), 2001. Cat. 1272.0](https://www.abs.gov.au/ausstats/abs@.nsf/mf/1272.0). -The `abscorr` package also loads +The `strayr` package also loads [`absmapsdata`](https://github.com/wfmackey/absmapsdata), which contains the following structures *and their geometry* as `sf` objects: @@ -95,7 +95,7 @@ Loading the package will lazily load the structures listed above. Call them with their name: ``` r -library(abscorr) +library(strayr) #> Loading required package: absmapsdata library(dplyr) ``` diff --git a/_pkgdown.yml b/_pkgdown.yml index 3d6e7c0..236dd7b 100644 --- a/_pkgdown.yml +++ b/_pkgdown.yml @@ -1,4 +1,4 @@ -URL: https://runapp-aus.github.io/abscorr/ +URL: https://runapp-aus.github.io/strayr/ navbar: type: default @@ -11,9 +11,9 @@ navbar: repo: url: - home: https://github.com/runapp-aus/abscorr/ - source: https://github.com/runapp-aus/abscorr/blob/master/ - issue: https://github.com/runapp-aus/abscorr/issues/ + home: https://github.com/runapp-aus/strayr/ + source: https://github.com/runapp-aus/strayr/blob/master/ + issue: https://github.com/runapp-aus/strayr/issues/ user: https://github.com/runapp-aus/ development: @@ -27,7 +27,7 @@ home: strip_header: false reference: - - title: "Runapp-aus abscorr Package" + - title: "Runapp-aus strayr Package" desc: "Internal Data Structures." contents: - starts_with("anz") diff --git a/abscorr.Rproj b/strayr.Rproj similarity index 100% rename from abscorr.Rproj rename to strayr.Rproj diff --git a/tests/testthat.R b/tests/testthat.R index 0d2a506..3886a22 100644 --- a/tests/testthat.R +++ b/tests/testthat.R @@ -1,6 +1,6 @@ library(testthat) -library(abscorr) +library(strayr) library(dplyr) library(here) -test_check("abscorr") +test_check("strayr") diff --git a/tests/testthat/test-anzsco.R b/tests/testthat/test-anzsco.R index 7cc5b73..33790ab 100644 --- a/tests/testthat/test-anzsco.R +++ b/tests/testthat/test-anzsco.R @@ -1,5 +1,5 @@ library(testthat) -library(abscorr) +library(strayr) library(dplyr) diff --git a/tests/testthat/test-asced.R b/tests/testthat/test-asced.R index 84d3c02..ac50a08 100644 --- a/tests/testthat/test-asced.R +++ b/tests/testthat/test-asced.R @@ -1,5 +1,5 @@ library(testthat) -library(abscorr) +library(strayr) library(dplyr) diff --git a/tests/testthat/test-seifa.R b/tests/testthat/test-seifa.R index c8b9a12..a01de6b 100644 --- a/tests/testthat/test-seifa.R +++ b/tests/testthat/test-seifa.R @@ -29,7 +29,7 @@ test_that("can Import SEIFA LGA scores", { test_that('sa1 spreadsheet can be parsed', { df <- get_seifa_index_sheet(system.file('extdata', 'sa1_seifa_indexes_test.xls', - package = 'abscorr', + package = 'strayr', mustWork = TRUE), 'Table 2', 'sa1')