Merge pull request #33 from ropensci/misc

Misc fixes and tweaks

.github/CONTRIBUTING.md

@@ -7,8 +7,8 @@ and be available under an open license.
 It is much preferred that you contribute the dataset via a pull request. 
 To add a dataset:
 
-1.  Add the raw data and an R script to load and save it as an R data
-    object to `data-raw/`. The `.rda` file should be saved to `data/`.
-    See `data-raw/sarna.R` as a model.
-2.  Add the documentation using [{roxygen2}](https://roxygen2.r-lib.org/)
-    to a file in `R/`. Use `R/sarna.R` as a model. Be sure to include a citation.
+1.  Add the raw data to `data-raw` and an R script to load and save it as an R data
+    object to `data-raw/scripts`. The `.rda` file should be saved to `data/`.
+    See `data-raw/scripts/sarna.R` as a model.
+1.  Add the documentation using `devtools::document()`. Be sure to include a citation.
+1.  Run `R-CMD-check` using `devtools::check()`.

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: historydata
 Type: Package
 Title: Datasets for Historians
-Version: 0.2.9001
+Version: 0.2.9002
 Authors@R: c(person("Lincoln", "Mullen",
     role = c("aut", "cre"),
     email = "[email protected]",

NEWS.md

@@ -1,10 +1,10 @@
 # historydata 0.2 (in development)
 
--   Fix geocoding Mackenzie-Fort Smith in `catholic-dioceses`
--   Fix incorrect date in `catholic-dioceses`
+-   Fix geocoding for Mackenzie-Fort Smith in `catholic-dioceses` (#2)
+-   Fix incorrect date in `catholic-dioceses` (#8)
 -   Add `us_military_strengths` (thanks @CB1789, #21)
 -   Fix typo in `catholic_dioceses` docs
--   Add `minneapolisfed_cpi`
+-   Add `minneapolisfed_cpi` (#3, #13)
 -   Add `.gitignore`
 -   Updated {pkgdown} GitHub site
 -   Updated `.Rbuildignore`
@@ -15,7 +15,7 @@
 -   Added `dijon_prices` and `dijon_prices_wide`
 -   Added `presbyterians`
 -   Fixed data formatting of `paulist_missions`
--   Added `methodists`
+-   Added `methodists` (#14)
 
 # historydata 0.1
 

R/minneapolisfed_cpi.R

@@ -1,7 +1,7 @@
-#' Consumer Price Index, 1800-
+#' Consumer Price Index, 1800-2024
 #'
 #' This dataset contains historic consumer price index (CPI) data
-#' including estimates before the modern U.S. CPI, retrieved from 
+#' including estimates before the modern U.S. CPI, retrieved from
 #' the Federal Reserve Bank of Minneapolis.
 #'
 #' @section Variables:

README.md

@@ -5,8 +5,10 @@
 # {historydata}
 
 <!-- badges: start -->
-[![CRAN_Status_Badge](https://www.r-pkg.org/badges/version/historydata.png)](https://cran.r-project.org/package=historydata)
+
 [![R-CMD-check](https://github.com/ropensci/historydata/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/ropensci/historydata/actions/workflows/R-CMD-check.yaml)
+[![CRAN
+status](https://www.r-pkg.org/badges/version/historydata)](https://CRAN.R-project.org/package=historydata)
 <!-- badges: end -->
 
 ## Overview

README.qmd

@@ -1,5 +1,6 @@
 ---
 format: gfm
+default-image-extension: ""
 ---
 
 <!-- README.md is rendered from README.qmd. Edit README.qmd and render to update README.md -->
@@ -17,7 +18,7 @@ knitr::opts_chunk$set(
 
 <!-- badges: start -->
 [![R-CMD-check](https://github.com/ropensci/historydata/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/ropensci/historydata/actions/workflows/R-CMD-check.yaml)
-[![CRAN_Status_Badge](https://www.r-pkg.org/badges/version/historydata)](https://cran.r-project.org/package=historydata)
+[![CRAN status](https://www.r-pkg.org/badges/version/historydata)](https://CRAN.R-project.org/package=historydata)
 <!-- badges: end -->
 
 ## Overview

data-raw/catholic-dioceses.R → data-raw/scripts/catholic-dioceses.R

@@ -2,8 +2,8 @@ library(dplyr)
 library(lubridate)
 library(tidyr)
 
-catholic_dioceses <- read.csv("data-raw/catholic.dioceses.geocoded.csv",
-                              stringsAsFactors = FALSE)
+data_file <- file.path("data-raw", "catholic.dioceses.geocoded.csv")
+catholic_dioceses <- read.csv(data_file, stringsAsFactors = FALSE)
 catholic_dioceses <-
   catholic_dioceses %>%
   select(diocese,

data-raw/cesta-cities.R → data-raw/scripts/cesta-cities.R

@@ -2,12 +2,14 @@ library(readr)
 library(dplyr)
 library(tidyr)
 
-if (!file.exists("data-raw/cesta-cities.csv")) {
+
+data_file <- file.path("data-raw", "cesta-cities.csv")
+if (!file.exists(data_file)) {
   download.file("https://raw.githubusercontent.com/cestastanford/historical-us-city-populations/master/data/1790-2010_MASTER.csv",
-                destfile = "data-raw/cesta-cities.csv")
+                destfile = data_file)
 }
 
-cities <- read_csv("data-raw/cesta-cities.csv")
+cities <- read_csv(data_file)
 
 cities <- cities %>%
   gather(year, population, -ID, -ST, -City, -CityST, -STPLFIPS_2010, -Name_2010,

data-raw/dijon-prices-prep.R → data-raw/scripts/dijon-prices-prep.R

@@ -4,8 +4,8 @@ library(dplyr)
 library(tibble)
 library(stringr)
 
-dijon_prices_wide <- read_csv("data-raw/dijon-prices-wide.csv")
-dijon_citations <- read_csv("data-raw/dijon-citations.csv") %>%
+dijon_prices_wide <- read_csv(file.path("data-raw", "dijon-prices-wide.csv"))
+dijon_citations <- read_csv(file.path("data-raw", "dijon-citations.csv")) %>%
   select(-1) %>%
   t() %>%
   as.data.frame() %>%

data-raw/early-colleges.R → data-raw/scripts/early-colleges.R

@@ -1,5 +1,5 @@
 library(dplyr)
-early_colleges <- read.csv("data-raw/early-colleges.csv", stringsAsFactors = FALSE,
+early_colleges <- read.csv(file.path("data-raw", "early-colleges.csv"), stringsAsFactors = FALSE,
                            na.strings = "")
 early_colleges <- early_colleges %>%
   as_tibble()

data-raw/federal-judges.R → data-raw/scripts/federal-judges.R

@@ -5,10 +5,11 @@ library(dplyr)
 library(tidyr)
 library(devtools)
 
+data_file <- file.path("data-raw", "judges.csv")
 export_url <- "http://www.fjc.gov/history/export/jb.txt"
-download.file(export_url, destfile = "data-raw/judges.csv")
+download.file(export_url, destfile = data_file)
 
-judges <- read.csv("data-raw/judges.csv", stringsAsFactors = FALSE) %>%
+judges <- read.csv(data_file, stringsAsFactors = FALSE) %>%
   as_tibble()
 
 judges_people <- judges %>%

data-raw/methodists.R → data-raw/scripts/methodists.R

@@ -5,7 +5,7 @@ replace_na <- function(x, val = 0L) {
   ifelse(is.na(x), val, x)
 }
 
-methodists <- read_csv("data-raw/methodists.csv") %>%
+methodists <- read_csv(file.path("data-raw", "methodists.csv")) %>%
   filter(minutes_year != 1778,
          minutes_year != 1779,
          minutes_year != 1785) %>%

data-raw/naval-promotions.R → data-raw/scripts/naval-promotions.R

@@ -1,6 +1,6 @@
 library(dplyr)
 library(tidyr)
-naval_promotions <- read.csv("data-raw/naval-promotions.csv",
+naval_promotions <- read.csv(file.path("data-raw", "naval-promotions.csv"),
                              stringsAsFactors = FALSE)
 # Assign a unique ID to each person:
 naval_promotions$id <- 1:nrow(naval_promotions)

data-raw/paulists.R → data-raw/scripts/paulists.R

@@ -13,7 +13,7 @@ to_weeks <- function(x) {
   x
 }
 
-paulist_missions <- read_csv("data-raw/paulist-missions.geocoded.csv") %>%
+paulist_missions <- read_csv(file.path("data-raw", "paulist-missions.geocoded.csv")) %>%
   mutate(start_date = mdy(start_date),
          end_date = mdy(end_date)) %>%
   mutate(year = year(start_date)) %>%

data-raw/presbyterians.R → data-raw/scripts/presbyterians.R

@@ -1,6 +1,6 @@
 library(readr)
 library(dplyr)
-pres <- read_csv("data-raw/weber-1927.csv")
+pres <- read_csv(file.path("data-raw", "weber-1927.csv"))
 
 presbyterians <- pres %>%
   mutate(denomination = ifelse(denomination == "Reunited Presbyterians",

data-raw/quasi-war.R → data-raw/scripts/quasi-war.R

@@ -1,7 +1,7 @@
 library(readr)
 library(lubridate)
 library(dplyr)
-quasi_war <- read_csv("data-raw/quasi-war.csv")
+quasi_war <- read_csv(file.path("data-raw", "quasi-war.csv"))
 
 quasi_war <- quasi_war %>%
   mutate(year = year(date),

data-raw/sarna.R → data-raw/scripts/sarna.R

@@ -1,6 +1,6 @@
 library(dplyr)
 library(tidyr)
-sarna <- read.csv("data-raw/sarna.csv", stringsAsFactors = FALSE)
+sarna <- read.csv(file.path("data-raw", "sarna.csv"), stringsAsFactors = FALSE)
 sarna <- sarna %>%
   as_tibble() %>%
   select(year,

data-raw/scripts/tudors.R

@@ -0,0 +1,5 @@
+library(dplyr)
+
+tudors <- read.csv(file.path("data-raw", "tudors.csv"), stringsAsFactors = FALSE) %>%
+  as_tibble
+usethis::use_data(tudors, overwrite = TRUE)

data-raw/us-national-population.R → data-raw/scripts/us-national-population.R

@@ -1,5 +1,5 @@
 library(dplyr)
-us_state_populations <- read.csv("data-raw/nhgis0011_ts_state.csv",
+us_state_populations <- read.csv(file.path("data-raw", "nhgis0011_ts_state.csv"),
                                  stringsAsFactors = FALSE)
 us_national_population <- us_state_populations %>%
   select(year = YEAR,

data-raw/us-state-populations.R → data-raw/scripts/us-state-populations.R

@@ -1,5 +1,5 @@
 library(dplyr)
-us_state_populations <- read.csv("data-raw/nhgis0011_ts_state.csv",
+us_state_populations <- read.csv(file.path("data-raw", "nhgis0011_ts_state.csv"),
                                  stringsAsFactors = FALSE)
 us_state_populations <- us_state_populations %>%
   select(GISJOIN,