From 5bbf37e1b50ab968b0c8d2c9f1a7495ea65451d2 Mon Sep 17 00:00:00 2001
From: "Andrew G. Brown" <andrew.g.brown@usda.gov>
Date: Fri, 10 Jun 2022 12:50:23 -0700
Subject: [PATCH] soilDB 2.7.1

---
 NEWS.md                         | 5 ++++-
 README.Rmd                      | 2 +-
 README.md                       | 6 +++---
 inst/CITATION                   | 4 ++--
 tests/testthat/test-SDA_query.R | 2 +-
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index 59a951f8..de846287 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,8 +1,11 @@
 # soilDB 2.7.1 (2022-06-10)
    - `get_SDA_coecoclass()` better handling of `NULL` `ecoclassref`; support for filtering on `ecoclasstypename`; `not_assigned_value` now applies to `ecoclassname`, `ecoclasstypename` and `ecoclassref` columns in addition to `ecoclassid`; Thanks to Andy Paolucci and Jason Nemecek. Also, added additional columns from legend/mapunit tables (`areasymbol`, `lkey`, `muname`).
    - `fetchNASIS(from="components")` now returns mapunit and legend information (if loaded in local NASIS database); results now contain `mustatus` and `repdmu` which can be used to remove components from additional mapunits and non-representative data mapunits; thanks to Nathan Roe
-   - Convert UTF8 strings in `us_ss_timeline` result to ASCII
+   - Convert UTF-8 strings in `us_ss_timeline` result to ASCII
    - `SDA_query()`: Fixed POST request that could produce unhandled errors on network failure (now returns `try-error` like other error-causing code)
+   - `SDA_query()`: In the event of a syntax error, error contents are now returned as a message, not a warning. 
+   - `uncode()` and `code()` now work with `data.table` and `tibble` objects.
+   - Various fixes to tests and error handling code to reduce likelihood of thrown errors from network problems or missing suggested packages.
 
 # soilDB 2.7.0 (2022-05-18)
  * Spatial 
diff --git a/README.Rmd b/README.Rmd
index 5ac185a9..c143d8e6 100644
--- a/README.Rmd
+++ b/README.Rmd
@@ -26,7 +26,7 @@ citEntry(
   note = "R package version %s",
   url = "https://CRAN.R-project.org/package=soilDB",
   year = "%s",
-  textVersion = "Dylan Beaudette, Jay Skovlin, Stephen Roecker and Andrew Brown (%s). soilDB: Soil Database Interface. R package version %s. <https://CRAN.R-project.org/package=soilDB>"
+  textVersion = "Beaudette, D., Skovlin, J., Roecker, S., Brown, A. (%s). soilDB: Soil Database Interface. R package version %s. <https://CRAN.R-project.org/package=soilDB>"
 )
 ', version, format(Sys.time(), "%Y"), format(Sys.time(), "%Y"), version)
   suppressWarnings(writeLines(strsplit(x, "\n")[[1]], "inst/CITATION"))
diff --git a/README.md b/README.md
index 0577a58f..7e33ff27 100644
--- a/README.md
+++ b/README.md
@@ -38,8 +38,8 @@ Citation
     ## 
     ## To cite soilDB in publications use:
     ## 
-    ##   Dylan Beaudette, Jay Skovlin, Stephen Roecker and Andrew Brown
-    ##   (2022). soilDB: Soil Database Interface. R package version 2.7.0.
+    ##   Beaudette, D., Skovlin, J., Roecker, S., Brown, A. (2022). 
+    ##   soilDB: Soil Database Interface. R package version 2.7.1.
     ##   <https://CRAN.R-project.org/package=soilDB>
     ## 
     ## A BibTeX entry for LaTeX users is
@@ -47,7 +47,7 @@ Citation
     ##   @Manual{,
     ##     title = {soilDB: Soil Database Interface},
     ##     author = {Dylan Beaudette and Jay Skovlin and Stephen Roecker and Andrew Brown},
-    ##     note = {R package version 2.7.0},
+    ##     note = {R package version 2.7.1},
     ##     url = {https://CRAN.R-project.org/package=soilDB},
     ##     year = {2022},
     ##   }
diff --git a/inst/CITATION b/inst/CITATION
index 2ded54b2..dca08dc8 100644
--- a/inst/CITATION
+++ b/inst/CITATION
@@ -4,8 +4,8 @@ citEntry(
   entry = "Manual",
   title = "soilDB: Soil Database Interface",
   author = "Dylan Beaudette, Jay Skovlin, Stephen Roecker and Andrew Brown",
-  note = "R package version 2.7.0",
+  note = "R package version 2.7.1",
   url = "https://CRAN.R-project.org/package=soilDB",
   year = "2022",
-  textVersion = "Dylan Beaudette, Jay Skovlin, Stephen Roecker and Andrew Brown (2022). soilDB: Soil Database Interface. R package version 2.7.0. <https://CRAN.R-project.org/package=soilDB>"
+  textVersion = "Beaudette, D., Skovlin, J., Roecker, S., Brown, A. (2022). soilDB: Soil Database Interface. R package version 2.7.1. <https://CRAN.R-project.org/package=soilDB>"
 )
diff --git a/tests/testthat/test-SDA_query.R b/tests/testthat/test-SDA_query.R
index 70b32a4b..8fda2fd5 100644
--- a/tests/testthat/test-SDA_query.R
+++ b/tests/testthat/test-SDA_query.R
@@ -214,7 +214,7 @@ test_that("SDA_query() works with multi-line records", {
 
   skip_on_cran()
   
-  skip_if(inherits(x.3, 'try-error'))
+  skip_if(inherits(x.4, 'try-error'))
   
   # https://github.com/ncss-tech/soilDB/issues/28
   expect_true(inherits(x.4, 'data.frame'))