update missing phantomjs dep, fix #63

prioritizr · Oct 15, 2022 · cc0cc41 · cc0cc41
1 parent beac292
commit cc0cc41
Show file tree

Hide file tree

Showing 24 changed files with 50 additions and 42 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: wdpar
 Type: Package
-Version: 1.3.3.2
+Version: 1.3.3.3
 Title: Interface to the World Database on Protected Areas
 Description: Fetch and clean data from the World Database on Protected
     Areas (WDPA) and the World Database on Other Effective Area-Based

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,8 @@
+# wdpar 1.3.3.3
+
+- Improve error message for `wdpa_fetch()` when PhantomJS is not
+  installed (#63).
+
 # wdpar 1.3.3.2
 
 - Add URLs to README for citations (#58).

diff --git a/R/wdpa_url.R b/R/wdpa_url.R
@@ -60,8 +60,15 @@ wdpa_url <- function(x, wait = FALSE, page_wait = 2) {
     assertthat::is.flag(wait),
     assertthat::is.count(page_wait),
     assertthat::noNA(page_wait),
-    is_online(),
-    has_phantomjs(silent = FALSE))
+    is_online()
+  )
+  assertthat::assert_that(
+    has_phantomjs(),
+    msg = paste0(
+      "cannot find PhantomJS; please install it using: ",
+      "webdriver::install_phantomjs()"
+    )
+  )
   # declare hidden function
   try_and_find_url <- function(x) {
     ## initialize web driver
@@ -144,7 +151,7 @@ start_phantomjs <- function() {
       pjs <- webdriver::run_phantomjs()
     )
   } else {
-    pjs <- webdriver::run_phantomjs()
+    pjs <- suppressMessages(webdriver::run_phantomjs())
   }
   # return object
   pjs
@@ -155,15 +162,8 @@ stop_phantomjs <- function(pjs) {
   try(pjs$process$kill(), silent = TRUE)
 }
 
-has_phantomjs <- function(silent = TRUE) {
-  assertthat::assert_that(
-    assertthat::is.flag(silent),
-    assertthat::noNA(silent)
-  )
-  pjs <- try(start_phantomjs, silent = TRUE)
-  on.exit(stop_phantomjs(pjs))
-  if (inherits(pjs, "try-error") && !isTRUE(silent)) {
-    stop(pjs)
-  }
+has_phantomjs <- function() {
+  pjs <- suppressMessages(try(start_phantomjs(), silent = TRUE))
+  on.exit(suppressMessages(stop_phantomjs(pjs)))
   !inherits(pjs, "try-error")
 }
diff --git a/README.md b/README.md
@@ -249,7 +249,7 @@ To cite the latest official version, please use:
 To cite the latest development version, please use:
 
 > Hanson JO (2022). wdpar: Interface to the World Database on Protected
-> Areas. R package version 1.3.3.2. Available at
+> Areas. R package version 1.3.3.3. Available at
 > <https://github.com/prioritizr/wdpar>.
 
 To cite the World Database on Protected Areas (WDPA), please use:

diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/CONTRIBUTING.html b/docs/CONTRIBUTING.html
diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html
diff --git a/docs/articles/index.html b/docs/articles/index.html
diff --git a/docs/articles/wdpar.html b/docs/articles/wdpar.html
diff --git a/docs/authors.html b/docs/authors.html
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/news/index.html b/docs/news/index.html
diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml
@@ -3,5 +3,5 @@ pkgdown: 2.0.6
 pkgdown_sha: ~
 articles:
   wdpar: wdpar.html
-last_built: 2022-09-28T15:15Z
+last_built: 2022-10-15T19:50Z
 
diff --git a/docs/reference/index.html b/docs/reference/index.html
diff --git a/docs/reference/st_erase_overlaps.html b/docs/reference/st_erase_overlaps.html
diff --git a/docs/reference/st_repair_geometry.html b/docs/reference/st_repair_geometry.html
diff --git a/docs/reference/wdpa_clean.html b/docs/reference/wdpa_clean.html
diff --git a/docs/reference/wdpa_dissolve.html b/docs/reference/wdpa_dissolve.html
diff --git a/docs/reference/wdpa_fetch.html b/docs/reference/wdpa_fetch.html
diff --git a/docs/reference/wdpa_latest_version.html b/docs/reference/wdpa_latest_version.html
diff --git a/docs/reference/wdpa_read.html b/docs/reference/wdpa_read.html
diff --git a/docs/reference/wdpa_url.html b/docs/reference/wdpa_url.html
diff --git a/docs/reference/wdpar.html b/docs/reference/wdpar.html
diff --git a/inst/doc/wdpar.html b/inst/doc/wdpar.html
@@ -12,7 +12,7 @@
 
 <meta name="author" content="Jeffrey O. Hanson" />
 
-<meta name="date" content="2022-09-28" />
+<meta name="date" content="2022-10-16" />
 
 <title>wdpar: Interface to the World Database on Protected Areas</title>
 
@@ -149,7 +149,7 @@
 
 <h1 class="title toc-ignore">wdpar: Interface to the World Database on Protected Areas</h1>
 <h4 class="author">Jeffrey O. Hanson</h4>
-<h4 class="date">2022-09-28</h4>
+<h4 class="date">2022-10-16</h4>