Merge pull request #335 from jread-usgs/master

gets rid of No encoding supplied: defaulting to UTF-8.

NAMESPACE

@@ -80,7 +80,6 @@ importFrom(XML,xmlParse)
 importFrom(XML,xmlParseString)
 importFrom(XML,xmlRoot)
 importFrom(XML,xmlToList)
-importFrom(XML,xmlTreeParse)
 importFrom(XML,xmlValue)
 importFrom(XML,xpathApply)
 importFrom(curl,curl_version)

R/03-geojob-obj.R

@@ -78,9 +78,12 @@ setMethod("geojob", signature("XMLDocument"), function(xml, ...) {
 setMethod("geojob", signature("character"), function(xml, ...) {
   #parse based on xml class
   if(length(xml == 1) && startsWith(x = xml, prefix= "http")){
-    xml <- gGET(xml)
-  } 
-  doc <- xmlTreeParse(xml)
+    response <- gGET(xml)
+    doc <- gcontent(response, useInternalNodes = FALSE)
+  } else {
+    doc <- xmlParse(xml, useInternalNodes = FALSE)
+  }
+
   job <- geojob(xml = doc, ...) 
   return(job)
 })

R/check.R

@@ -13,7 +13,7 @@
 #'@aliases check
 #'@author Jordan S. Read
 #'@seealso \code{\link{start}}
-#'@importFrom XML xmlTreeParse xmlNamespaceDefinitions xmlRoot
+#'@importFrom XML xmlNamespaceDefinitions xmlRoot
 #' @importFrom httr http_error
 #'@rdname check-geojob
 #'@examples 

R/email-geojob.R

@@ -17,7 +17,7 @@ setGeneric(name="email",def=function(geojob, knife){standardGeneric("email")})
 setMethod(f = "email",signature = c("geojob",'webprocess'), 
           definition = function(geojob, knife){
 
-            doc <- xmlTreeParse(xml(geojob), useInternalNodes = TRUE)
+            doc <- xmlParse(xml(geojob))
             root <- xmlRoot(doc)
             removeNodes(root[names(root) == "DataInputs"])
             removeNodes(root[names(root) == "ResponseForm"])

R/geoknifeUtils.R

@@ -66,6 +66,6 @@ gPOST <- function(url, config = list(), ...){
 #' @param response the result of httr::GET(url)
 #' @keywords internal
 #' @importFrom XML xmlParse
-gcontent <- function(response){
-  XML::xmlParse(iconv(readBin(response$content, character()), from = "UTF-8", to = "UTF-8"))
+gcontent <- function(response, useInternalNodes = TRUE){
+  XML::xmlParse(iconv(readBin(response$content, character()), from = "UTF-8", to = "UTF-8"), useInternalNodes = useInternalNodes)
 }

tests/testthat/test-show_object.R

@@ -1,36 +1,36 @@
 context("show webdata")
 
 test_that("show webdata", {
-  webdata()
+  expect_output(show(webdata()))
 })
 
 context("show webgeom")
 
 test_that("show webgeom", {
-  webgeom()
+  expect_output(show(webgeom()))
 })
 
 context("show simplegeom")
 
 test_that("show simplegeom", {
-  simplegeom(c(-88.6, 45.2))
+  expect_output(show(simplegeom(c(-88.6, 45.2))))
   expect_error(simplegeom(c(-88.6, 45.2,99)))
 })
 
 context("show datagroup")
 
 test_that("show datagroup", {
-  query('webdata')
+  expect_output(show(query('webdata')))
 })
 
 context("show geojob")
 
 test_that("show geojob", {
-  geojob()
+  expect_output(show(geojob()))
 })
 
 context("show webprocess")
 
 test_that("show webprocess", {
-  webprocess()
+  expect_output(show(webprocess()))
 })