Merge branch 'httr2'

.Rbuildignore

@@ -46,3 +46,4 @@ codemeta.json
 ^.tar.gz
 ^.zip
 ^CITATION\.cff$
+^RAQSAPI\.code-workspace$

.github/workflows/R-CMD-check.yaml

@@ -2,9 +2,9 @@
 # Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
 on:
   push:
-    branches: [main, httr2]
+    branches: [main, httr2, test_github_workflow]
   pull_request:
-    branches: [main, httr2]
+    branches: [main, httr2, test_github_workflow]
 
 name: R-CMD-check
 
@@ -26,8 +26,8 @@ jobs:
 
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
-      RAQSAPIKEY: ${{ secrets.RAQSAPIKEY }}
-      RAQSAPIUSERNAME: ${{ secrets.RAQSAPIUSERNAME }}
+      RAQSAPIKEY: "${{ secrets.RAQSAPIKEY }}"
+      RAQSAPIUSERNAME: "${{ secrets.RAQSAPIUSERNAME }}"
       R_KEEP_PKG_SOURCE: yes
 
     steps:

.gitignore

@@ -55,3 +55,4 @@ dev/.experimental.R
 # RAQSAPI package files
 *.tar.gz
 *.zip
+RAQSAPI.code-workspace

CITATION.cff

@@ -2,7 +2,7 @@
 # CITATION file created with {cffr} R package, v0.5.0
 # See also: https://docs.ropensci.org/cffr/
 # -----------------------------------------------------------
- 
+
 cff-version: 1.2.0
 message: 'To cite package "RAQSAPI" in publications use:'
 type: software
@@ -274,31 +274,6 @@ references:
     email: [email protected]
     orcid: https://orcid.org/0000-0002-6983-2759
   year: '2023'
-- type: software
-  title: goodpractice
-  abstract: 'goodpractice: Advice on R Package Building'
-  notes: Suggests
-  url: https://github.com/mangothecat/goodpractice
-  repository: https://CRAN.R-project.org/package=goodpractice
-  authors:
-  - family-names: Marks
-    given-names: Karina
-    email: [email protected]
-  - family-names: de Bortoli
-    given-names: Daniel
-  - family-names: Csardi
-    given-names: Gabor
-    email: [email protected]
-  - family-names: Frick
-    given-names: Hannah
-    email: [email protected]
-  - family-names: Jones
-    given-names: Owen
-    email: [email protected]
-  - family-names: Alexander
-    given-names: Hannah
-    email: [email protected]
-  year: '2023'
 - type: software
   title: keyring
   abstract: 'keyring: Access the System Credential Store from R'

DESCRIPTION

@@ -45,8 +45,8 @@ Authors@R: c(person(given="Clinton", family="Mccrowey",
                     comment = "West Virginia Department of Environmental Protection, Division of Air Quality"
                   )
              )
-URL: <https://github.com/USEPA/RAQSAPI>,
-     <https://aqs.epa.gov/aqsweb/documents/data_api.html>
+URL: https://github.com/USEPA/RAQSAPI/,
+     https://aqs.epa.gov/aqsweb/documents/data_api.html
 BugReports: https://github.com/USEPA/RAQSAPI/issues
 Depends: R (>= 4.0.0)
 Imports: 
@@ -63,7 +63,6 @@ Imports:
 Suggests:
     covr,
     devtools,
-    goodpractice,
     keyring,
     knitr,
     markdown,
@@ -73,8 +72,9 @@ Suggests:
     testthat (>= 3.0.0),
     usethis,
     withr
-SystemRequirements: package manual requires pandoc (>= 1.14) http://pandoc.org
-RoxygenNote: 7.2.3
+SystemRequirements: package manual and Vignettes require pandoc 
+                    (>= 1.14) http://pandoc.org)
+RoxygenNote: 7.3.1
 VignetteBuilder: knitr
 BuildVignettes: true
 ByteCompile: true

MD5

@@ -1,16 +1,16 @@
-2d3e0e574783202b33c52d6feba58dd3 *CITATION.cff
-d3a7f7cc6aca27a043309d5bf9f32edc *codemeta.json
-bfa24dfc7e0f2f217163fa917e8d2392 *cran-comments.md
-bfa24dfc7e0f2f217163fa917e8d2392 *cran-comments.Rmd
-7b3092d9d1ec246090f159fd55deeb57 *DESCRIPTION
+3fe0b2d4c41b6a7ddea1fcc2dc0742a0 *CITATION.cff
+f4ff2345ea66f98028bea8e07bb9b6fa *codemeta.json
+6e5839d0c24939143566d26d7f427fce *cran-comments.md
+6e5839d0c24939143566d26d7f427fce *cran-comments.Rmd
+8d3b9fa84140908686c8837fa1056041 *DESCRIPTION
 1dc95961c4c280f8645a65d15662725f *dev/contributing.md
 4fc13def6ec5d889261f1f22a13ba542 *dev/contributing.Rmd
 74e297a0dc0b508ed18e3821264958d0 *dev/countlinesofcode.R
-6ff6ae2460202c94a0dab25c4cc178de *dev/install_RAQSAPI.R
+ed21caa73378a9cdf8de4df12cc848c0 *dev/install_RAQSAPI.R
 3c41777493d242206848842b6ba74fde *inst/CITATION
 3df907b50c4f00bc26ee6d988e0c849f *inst/codecov.yml
 dd65d70b425fb86f7c8b6d8841a837d8 *inst/schemaorg.json
-f8856800f427562ecf965aa9c4899e8f *inst/WORDLIST
+c249300fd572e8b3c57b98e3d3c8745b *inst/WORDLIST
 e5b82cf7f3c21891bc0643f662a3f1ba *LICENSE
 9b3dc9e54281bcaa0a530371869f506c *LICENSE.md
 e7ec2b281fcab3d1b34b26031438438a *man/aqs_annualsummary_by_box.Rd
@@ -91,7 +91,7 @@ a8f79ece8b275d2f60fc09a58239e661 *man/aqs_quarterlysummary_by_site.Rd
 4232385c24cb5041c7ad57ec9279a798 *man/aqs_sampledata_by_county.Rd
 d6bccf166ae844172cf9b241c89093e2 *man/aqs_sampledata_by_site.Rd
 a10c5684e68d35cebb418f849c058609 *man/aqs_sampledata_by_state.Rd
-0557bd694ffc18246eda85f4813fc2d1 *man/aqs_sampledurations.Rd
+e18bec0d4aa22d14a5c796adc3998d91 *man/aqs_sampledurations.Rd
 f9d84d9671e9c011e40dcf3567f3aa47 *man/aqs_services_by_box.Rd
 9291322a3bd3a17248904a0bfcf32d2f *man/aqs_services_by_cbsa.Rd
 9ca1f01ed3c413b5c8cd1f9f2bec9f3d *man/aqs_services_by_county.Rd
@@ -116,10 +116,9 @@ f41ed996be135fb35afe00641621da61 *man/figures/lifecycle-questioning.svg
 306bef67d1c636f209024cf2403846fd *man/figures/lifecycle-soft-deprecated.svg
 ed42e3fbd7cc30bc6ca8fa9b658e24a8 *man/figures/lifecycle-stable.svg
 bf2f1ad432ecccee3400afe533404113 *man/figures/lifecycle-superseded.svg
-7ce4525010156c02adaf819a8c835134 *man/RAQSAPI.Rd
-797940f405cb85557ee355e7eae5894d *NAMESPACE
-904839971aff979c1716322c7d8bcdff *NEWS.md
-b63d94a18d37de10925e09e6c3bb2eeb *R/AQSAPI_helperfunctions.R
+14dea302d2901ec5384577249f059654 *man/RAQSAPI.Rd
+eef9bd75f39b496fcfd63a36be7fb5a8 *NAMESPACE
+68f4c551ed9b572bb7c6a3ab9228b75c *R/AQSAPI_helperfunctions.R
 a3558975d0256839b174ab7868833075 *R/bybox.R
 bd8b36cc7325d4fc8b8ed894f0046678 *R/bycbsa.R
 253ea551f88c65c1c49feff3cb33f552 *R/bycounty.R
@@ -128,13 +127,14 @@ d82b1ff8ee144afca1879e5b8dc58840 *R/byma.R
 6acae078848030131e628154099e5f53 *R/bysite.R
 2e6e59d801dc3b6bd5e415ada7268469 *R/bystate.R
 5b01d32e630b9b68041a139e4ae6f748 *R/deprecated.R
-87275ab3c5bd1af63ecfbd835ea8f53b *R/RAQSAPI-package.R
-8bf50a551dbb3798f968436f95e3c343 *R/RAQSAPIlistfunctions.R
+6fb9bc5a422698bef6bdd147006c0439 *R/RAQSAPI-package.R
+cebed24e7ab755d8642a74c7e9b80fd5 *R/RAQSAPIlistfunctions.R
 e6e3b87e48f4403642382987b0f40714 *R/setupfunctions.R
 6e659bb3bbf313dc819d4c029f0b22d0 *R/zzz.R
+25bf50b0ec79d01de8b83b7b5801b4ac *RAQSAPI.code-workspace
 a69de5455537022556f014579766be59 *RAQSAPI.Rproj
-feb8f6defa51349e6110273bedcc046b *README.md
-b2370e0e3f63a29557cd8f74746d74f6 *README.Rmd
+1ef6fd253bab1a2805a72a3777e9eff2 *README.md
+9e80ce935498c732a40296459634eb91 *README.Rmd
 7ed08f3fb96a77ec01c95c2ad7964250 *revdep/data.sqlite
 34952a5944548ea4fc132a9899f8e6ab *revdep/email.yml
 b7715aa47f5635cfb52f34937886aedf *revdep/library/RAQSAPI/old/askpass/DESCRIPTION
@@ -890,7 +890,7 @@ d6c68f1fe41ced6e98a766a3757313da *revdep/library/RAQSAPI/old/R6/R/R6
 9a2c1961edcf2968e9e17856ed21f7ce *revdep/library/RAQSAPI/old/R6/R/R6.rdx
 5f3c708ae9a7e3610961d99f3375e60f *revdep/library/RAQSAPI/old/RAQSAPI/CITATION
 3df907b50c4f00bc26ee6d988e0c849f *revdep/library/RAQSAPI/old/RAQSAPI/codecov.yml
-70e30c409e2788090f475bef50b5022f *revdep/library/RAQSAPI/old/RAQSAPI/DESCRIPTION
+ee3578e05ac28d372c75425e260fcecb *revdep/library/RAQSAPI/old/RAQSAPI/DESCRIPTION
 cf125d5812045cd97093aee831e5c5f5 *revdep/library/RAQSAPI/old/RAQSAPI/doc/Acknowledgements.html
 49025d261826350f3050e677eab9dbac *revdep/library/RAQSAPI/old/RAQSAPI/doc/Acknowledgements.Rmd
 4b9af1f3b9da96988881ddf1c8d9ee9d *revdep/library/RAQSAPI/old/RAQSAPI/doc/EPA_Disclaimer.html
@@ -1318,22 +1318,22 @@ b2d403f29050e86e8efa021931ef8649 *revdep/README.md
 9566921a96ff55c1a51b6eb898d25884 *tests/spelling.R
 846f989b5f8b7a32fa520e52b4675635 *tests/test-RAQSAPI.R.blob
 84732d71bac50c96565c4894a24ecc59 *tests/testthat.R
-56891c92989166a785013a8953da96a3 *tests/testthat/helper.R
-00b1828926ec94b2537bb2343df723d5 *tests/testthat/local.R
-522ea3f8b07f6f4d206ce3fe38f1fbd8 *tests/testthat/test-bybox.R
-c883634140b22f5fb97c08f909ce377e *tests/testthat/test-byCBSA.R
-50d37429e9bf99ad5be17e09d92e16e8 *tests/testthat/test-bycounty.R
-19a199f8020db0329fe289a41aa71598 *tests/testthat/test-byMA.R
-f7ea691da1baf266047ed7af4b0c4629 *tests/testthat/test-bypqao.R
-41e407548ac72ec4f41e678d23a566dd *tests/testthat/test-bysite.R
-051416af24d0386f084eb13a14053ce1 *tests/testthat/test-bystate.R
-014b81fb9c8d2350e1347841f41b24a3 *tests/testthat/test-helperfunctions.R
-e897203bb026b43141e5bc00dfe3cecd *tests/testthat/test-RAQSAPlistfunctions.R
-183ed69a443baffdf0454255cade3fcc *vignettes/Acknowledgements.html
-18cea3348cace002e6c706d373beb524 *vignettes/Acknowledgements.Rmd
+89ff48b08754c7fc927acb5b6691bdb1 *tests/testthat/helper.R
+2a4012f9bf99ddc63f745bd8e4f845dc *tests/testthat/local.R
+309a8c9de99e4f0c0d5c280cb7583dd6 *tests/testthat/test-bybox.R
+635cfa38957358d566d9e5d17057df7b *tests/testthat/test-byCBSA.R
+61e14922bc589edf93a461a7fe4112cc *tests/testthat/test-bycounty.R
+bfcb21038f480e4e9638486f99b45efa *tests/testthat/test-byMA.R
+16213bfccb07c9052826097a6b24407c *tests/testthat/test-bypqao.R
+257512f5b5e206aa789cf85fd3f616dd *tests/testthat/test-bysite.R
+273dda836db047478bc65a94c7e0a05d *tests/testthat/test-bystate.R
+9ac730cce5b9a3d7b4b877512bc4de25 *tests/testthat/test-helperfunctions.R
+2391f6b331d4bc3e5e9e6a0b73980eba *tests/testthat/test-RAQSAPlistfunctions.R
+ce44f2334218eff76881442d89ebdee0 *vignettes/Acknowledgements.html
+36ae3777b8fd72d52f8a4a6bfa756207 *vignettes/Acknowledgements.Rmd
 22d607e5d49e10047a911e5d42183c34 *vignettes/acs-nano.csl
 0ec78b946a45069323acf54a24c77566 *vignettes/american-chemical-society.csl
-e1df58c4692ce8a6e9743bf9d594ff9e *vignettes/AQSAPI.bib
+847af4aba6af007f68c8173be0275e23 *vignettes/AQSAPI.bib
 de323c3deb36e066a7583c5b756ae49b *vignettes/EPA_Disclaimer.html
 a79d926b2ab509e6a9e575539b205280 *vignettes/EPA_Disclaimer.Rmd
 9f8f6638c5178a9bec62665b4cef5e1d *vignettes/figures/AQS_LOGO.png
@@ -1347,9 +1347,9 @@ ad142c2e81fca7371499f09e294c1dba *vignettes/pyaqsapi.R
 733ccd06aa9a7988d1ea78f52c528e55 *vignettes/pyaqsapi.Rmd
 8774f9c513ba8110c612b8ccfb9603e3 *vignettes/RAQSAPIFunctions-Brief.html
 1dbae57a3f574ccd77b4d2af2c76e831 *vignettes/RAQSAPIFunctions-Brief.Rmd
-9b96ebd481321226caedaa7ab4472d05 *vignettes/RAQSAPIFunctions-Long.html
-d7c4cb348a250e4f40d1d510cec2df3d *vignettes/RAQSAPIFunctions-Long.R
-e923e364682d337856051526b5b8b3a6 *vignettes/RAQSAPIFunctions-Long.Rmd
+f1b8ea1d165c0d47b105678c37b32c57 *vignettes/RAQSAPIFunctions-Long.html
+7146486d6cb6c29314f88f0e2bbb5ab2 *vignettes/RAQSAPIFunctions-Long.R
+e845be67ff86dba758853123789979e5 *vignettes/RAQSAPIFunctions-Long.Rmd
 d375e86106c359f735a25d53764b7f8e *vignettes/RAQSAPIPurpose.html
 2a912d01a36839facb5c2c6dff2d1c7f *vignettes/RAQSAPIPurpose.R
 9d564369cb22e187ed61da9fafcac002 *vignettes/RAQSAPIPurpose.Rmd
@@ -1360,7 +1360,7 @@ d375e86106c359f735a25d53764b7f8e *vignettes/RAQSAPIPurpose.html
 95acca4cbbfe5ebbfcb4c0a3978038bf *vignettes/RAQSAPIvignette.Rmd
 42a066ce73b20f2538877f8e4eac1d84 *vignettes/TimelinessofAQSData.html
 fddf2cec564191b24c0213f260c0f932 *vignettes/TimelinessofAQSData.Rmd
-4a6f61ae81515d8b770f30841ef17fc1 *vignettes/Troubleshooting.html
-1fee66dbee4d04b47a0b7747ea282a5b *vignettes/Troubleshooting.Rmd
+3c09aefb6ebd2dd7f1e623f3eb341b6e *vignettes/Troubleshooting.html
+9388c6af388ceb5b62fee3e414452c83 *vignettes/Troubleshooting.Rmd
 2f01e9fde3b3c8b82aafc174e2b66833 *vignettes/UsingRAQSAPI.html
 969189538d2ec6a0e10ea6d7350ab612 *vignettes/UsingRAQSAPI.Rmd

NAMESPACE

@@ -139,6 +139,7 @@ importFrom(rlang,format_error_bullets)
 importFrom(rlang,is_character)
 importFrom(stringr,str_c)
 importFrom(stringr,str_detect)
+importFrom(stringr,str_replace_all)
 importFrom(tibble,as_tibble)
 importFrom(tibble,tibble)
 importFrom(utils,tail)

R/AQSAPI_helperfunctions.R

@@ -327,6 +327,7 @@ format_multiple_params_for_api <- function(x, separator=",")
 #' @importFrom glue glue
 #' @importFrom httr2 last_response resp_body_json
 #' @importFrom magrittr `%<>%`
+#' @importFrom stringr str_replace_all
 #'
 #' @description A helper function that is called by httr2::req_error when an
 #'              error is encountered performing a request. This function returns
@@ -345,12 +346,13 @@ RAQSAPI_error_msg <- function(AQSresponse)
   AQSerr <- last_response() %>%
               resp_body_json()
 
+  #debug
   msg <- glue("At server request time: {AQSresponse$headers$Date}
-              RAQSAPI experienced an error while processing the following url:
-              {AQSresponse$url}\n
-              with status_code: {AQSresponse$status_code}
-              and status message: {AQSresponse$status}
-              Server error message: {AQSerr$Header[[1]]$error}")
+               RAQSAPI experienced an error while processing the following url:
+               {AQSresponse$url}
+               with status_code: {AQSresponse$status_code}
+               and status message: {AQSresponse$status}
+               Server error message: {AQSerr$Header[[1]]$error}")
 
      return(msg)
   #nocov end

R/RAQSAPI-package.R

@@ -3,7 +3,7 @@
 
 
 #' @title RAQSAPI: A R Interface to The United States Environmental Protection
-#' Agency's Air Quality System Data Mart RESTful API server.
+#' Agency's Air Quality System Data Mart RESTful API server
 #'
 #' @description RAQSAPI is a package for R that connects the R programming
 #' environment to the United State's Environmental protection agency's

R/RAQSAPIlistfunctions.R

@@ -415,7 +415,7 @@ aqs_fields_by_service <- function(service, return_header = FALSE)
 #' @description \lifecycle{stable}
 #'                 Returns a table of sample durations and their
 #'                 associated duration codes. Returned values are not calculated
-#'                 durations such as 8 hour CO or O${_3}$ rolling averages, 3/6
+#'                 durations such as 8 hour CO or O$_3$ rolling averages, 3/6
 #'                 day PM averages or Pb 3 month rolling averages.
 #' @importFrom magrittr `%<>%`
 #' @param return_header If FALSE (default) only returns data requested.

README.Rmd

@@ -36,7 +36,7 @@ knitr::opts_chunk$set(
   [![metacran downloads](https://cranlogs.r-pkg.org/badges/RAQSAPI)](
                          https://cran.r-project.org/package=RAQSAPI)
   [![lifecycle](https://img.shields.io/badge/lifecycle-maturing-blue.svg)](
-  https://www.tidyverse.org/lifecycle/#maturing)
+  https://lifecycle.r-lib.org/articles/stages.html)
   [![license](https://img.shields.io/badge/license-CC0-lightgrey.svg)](
   https://choosealicense.com/)
   "[![Last-changedate](https://img.shields.io/badge/last%20change-

README.md

@@ -37,9 +37,9 @@ developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.re
 status](https://www.r-pkg.org/badges/version/RAQSAPI)](https://CRAN.R-project.org/package=RAQSAPI)
 [![metacran
 downloads](https://cranlogs.r-pkg.org/badges/RAQSAPI)](https://cran.r-project.org/package=RAQSAPI)
-[![lifecycle](https://img.shields.io/badge/lifecycle-maturing-blue.svg)](https://www.tidyverse.org/lifecycle/#maturing)
+[![lifecycle](https://img.shields.io/badge/lifecycle-maturing-blue.svg)](https://lifecycle.r-lib.org/articles/stages.html)
 [![license](https://img.shields.io/badge/license-CC0-lightgrey.svg)](https://choosealicense.com/)
-“[![Last-changedate](https://img.shields.io/badge/last%20change-%202024--01--03-yellowgreen.svg)](/commits/master)”
+“[![Last-changedate](https://img.shields.io/badge/last%20change-%202024--06--10-yellowgreen.svg)](/commits/master)”
 <!-- badges: end -->
 
 # EPA Disclaimer
@@ -408,19 +408,20 @@ those sources with them RAQSAPI would not be possible.
 - README badges are provided by R package `badgecreator`<sup>5</sup>.
 - The R package `usethis`<sup>6</sup> was used to generate GitHub
   actions for Continuous integration (CI).
-- Code cleanup was assisted by the R package
-  `lintr`<sup>7</sup><data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAYAAABWzo5XAAAAWElEQVR42mNgGPTAxsZmJsVqQApgmGw1yApwKcQiT7phRBuCzzCSDSHGMKINIeDNmWQlA2IigKJwIssQkHdINgxfmBBtGDEBS3KCxBc7pMQgMYE5c/AXPwAwSX4lV3pTWwAAAABJRU5ErkJggg==>
+- Code cleanup was assisted by the R package `lintr`<sup>7</sup>
 - the function *install.packages* are provided by the R package
   `utils`<sup>8</sup>
 - the function *install_github* are provided by the R package
   `remotes`<sup>9</sup>
 - .gitignore file borrowed examples from
   <https://github.com/github/gitignore/blob/master/R.gitignore>
 - . CITATION.cff file was generated by the R package `cffr`<sup>10</sup>
+- R package `urlchecker`<sup>11</sup> was used to check urls in RAQSAPI
+  documentation
 
 # References
 
-<div id="refs" class="references csl-bib-body">
+<div id="refs" class="references csl-bib-body" entry-spacing="0">
 
 <div id="ref-AQSDataMartWelcome" class="csl-entry">
 
@@ -513,6 +514,14 @@ Pérez-Suárez, D.; Konovalov, A. Citation File Format, 2021.
 
 </div>
 
+<div id="ref-package:urlchecker" class="csl-entry">
+
+<span class="csl-left-margin">(11)
+</span><span class="csl-right-inline">R-Lib/Urlchecker on Github.
+<https://github.com/r-lib/urlchecker> (accessed 2023-11-30).</span>
+
+</div>
+
 </div>
 
 [^1]: RAQSAPI’s rate limit does not guarantee that the user will not go

codemeta.json

@@ -105,18 +105,6 @@
       },
       "sameAs": "https://CRAN.R-project.org/package=devtools"
     },
-    {
-      "@type": "SoftwareApplication",
-      "identifier": "goodpractice",
-      "name": "goodpractice",
-      "provider": {
-        "@id": "https://cran.r-project.org",
-        "@type": "Organization",
-        "name": "Comprehensive R Archive Network (CRAN)",
-        "url": "https://cran.r-project.org"
-      },
-      "sameAs": "https://CRAN.R-project.org/package=goodpractice"
-    },
     {
       "@type": "SoftwareApplication",
       "identifier": "keyring",

cran-comments.Rmd

@@ -7,6 +7,7 @@ output: md_document
 
 # cran-comments for RAQSAPI
 ## RAQSAPI 2.0.5
+  - remove depricated package:goodpractice from SUGGESTS
   - Added the ability to display server side messages for errors in API calls.
   - Added a new CITATION.cff for thanks to R package cffr.
   - New hexstciker.

cran-comments.md

@@ -7,6 +7,7 @@ output: md_document
 
 # cran-comments for RAQSAPI
 ## RAQSAPI 2.0.5
+  - remove depricated package:goodpractice from SUGGESTS
   - Added the ability to display server side messages for errors in API calls.
   - Added a new CITATION.cff for thanks to R package cffr.
   - New hexstciker.