Upgrade to v201802

Author: StevenMMortimer

DESCRIPTION

@@ -25,13 +25,16 @@ Imports:
     plyr (>= 1.8.3),
     XML (>= 3.98-1.2),
     utils (>= 3.1.0),
-    methods (>= 3.1.0)
+    methods (>= 3.1.0), 
+    xml2,
+    dplyr, 
+    purrr, 
+    readr
 Suggests:
     knitr,
     testthat,
     rmarkdown,
-    lubridate,
-    dplyr
+    lubridate
 RoxygenNote: 6.0.1
 Collate: 
     'ActivityGroupService.R'
@@ -89,5 +92,6 @@ Collate:
     'dfp_options_settings.R'
     'dfp_service_endpoints.R'
     'dfp_utils.R'
+    'dfp_utils_xml.R'
     'rdfp.R'
 VignetteBuilder: knitr

NAMESPACE

@@ -1,5 +1,7 @@
 # Generated by roxygen2: do not edit by hand
 
+export(build_xml_from_list)
+export(catch_errors)
 export(dfp_auth)
 export(dfp_createActivities)
 export(dfp_createActivityGroups)
@@ -193,20 +195,43 @@ export(dfp_updateReconciliationReports)
 export(dfp_updateTeams)
 export(dfp_updateUserTeamAssociations)
 export(dfp_updateUsers)
+export(execute_soap_request)
+export(form_request_body)
+export(get_google_token)
+export(parse_soap_response)
+export(token_exists)
+export(xmlToList2)
+export(xml_nodeset_to_df)
 importFrom(XML,"xmlValue<-")
 importFrom(XML,newXMLNode)
 importFrom(XML,newXMLTextNode)
+importFrom(XML,xmlApply)
+importFrom(XML,xmlAttrs)
 importFrom(XML,xmlChildren)
+importFrom(XML,xmlParse)
 importFrom(XML,xmlRoot)
+importFrom(XML,xmlSApply)
+importFrom(XML,xmlSize)
 importFrom(XML,xmlToList)
 importFrom(XML,xmlTreeParse)
 importFrom(XML,xmlValue)
 importFrom(curl,curl_download)
+importFrom(dplyr,"%>%")
+importFrom(dplyr,as_data_frame)
+importFrom(dplyr,as_tibble)
 importFrom(httr,POST)
 importFrom(httr,content)
+importFrom(httr,http_error)
+importFrom(httr,status_code)
 importFrom(methods,as)
 importFrom(plyr,alply)
-importFrom(plyr,ldply)
-importFrom(plyr,llply)
+importFrom(purrr,map)
+importFrom(purrr,map_df)
+importFrom(readr,type_convert)
+importFrom(utils,capture.output)
 importFrom(utils,read.table)
-importFrom(utils,tail)
+importFrom(xml2,xml_find_all)
+importFrom(xml2,xml_find_first)
+importFrom(xml2,xml_length)
+importFrom(xml2,xml_ns_strip)
+importFrom(xml2,xml_text)

NEWS.md

@@ -2,11 +2,14 @@
 
 ### Features
 
-  * Nothing Yet!
+  * Upgraded to API version `v201802`
+  * Created more efficient parsers `parse_soap_response()`
 
 ### Bug Fixes
 
-  * Nothing Yet!
+  * Line item targeting does not come back as a matrix. It is preserved as a list 
+  so it can be directly passed back into the ForecastService functions or LineItemService 
+  to get detailed availability
 
 ---
 

R/ActivityGroupService.R

@@ -12,9 +12,7 @@
 #' 
 #' Creates a new ActivityGroup objects.
 #' 
-#' @importFrom plyr llply ldply
-#' @importFrom utils tail
-#' @seealso \href{https://developers.google.com/doubleclick-publishers/docs/reference/v201711/ActivityGroupService#createActivityGroups}{Google Documentation for createActivityGroups}
+#' @seealso \href{https://developers.google.com/doubleclick-publishers/docs/reference/v201802/ActivityGroupService#createActivityGroups}{Google Documentation for createActivityGroups}
 #' 
 #' @param request_data a \code{list} or \code{data.frame} of data elements
 #' to be formatted for a SOAP
@@ -25,43 +23,9 @@
 #' @return a \code{data.frame} or \code{list} containing all the elements of a createActivityGroupsResponse 
 #' @export
 dfp_createActivityGroups <- function(request_data, as_df=TRUE, verbose=FALSE){
- request_body <- make_request_body(service='ActivityGroupService', root_name='createActivityGroups', data=request_data)
-  request <- build_soap_request(body = request_body, verbose=verbose)
-
-  null_root <- is.null(request)
-  response <- NULL
-  response <- try(xmlChildren(xmlChildren(xmlChildren(xmlRoot(request))$Body)[['createActivityGroupsResponse']]), silent=T)
-  result <- if(null_root | is.null(response)){
-    NULL
-  } else if(is.null(response$rval)){
-    NULL
-  } else if (as_df){
-      if(length(response[grepl('rval', names(response))])==1 &
-          names(response[grepl('rval', names(response))][[1]])[1]=='totalResultSetSize' &
-           names(response[grepl('rval', names(response))][[1]])[2]=='startIndex'){
-            ldply(tail(response[grepl('rval', names(response))]$rval, -2),
-             .fun=function(x){
-                 x <- xmlToList(x)
-                 x[sapply(x, is.null)] <- NA
-                 new_x <- as.data.frame(x, stringsAsFactors = F)
-                 return(new_x)
-             }, .id=NULL)
-      } else {
-      ldply(response[grepl('rval', names(response))],
-            .fun=function(x){
-               x <- xmlToList(x)
-               x[sapply(x, is.null)] <- NA
-               new_x <- as.data.frame(x, stringsAsFactors = F)
-               return(new_x)
-             }, .id=NULL)
-      }
-  } else {
-      llply(response[grepl('rval', names(response))],
-            .fun=function(x){
-               x <- xmlToList(x)
-               return(x)
-             })
-  }
+  request_body <- form_request_body(service='ActivityGroupService', root_name='createActivityGroups', data=request_data)
+  response <- execute_soap_request(body=request_body, verbose=verbose)
+  result <- parse_soap_response(httr_response=response, resp_element='createActivityGroupsResponse', as_df=as_df)
   return(result)
 }
 #' 
@@ -76,9 +40,7 @@ dfp_createActivityGroups <- function(request_data, as_df=TRUE, verbose=FALSE){
 #'   \item{status}
 #' }
 #' 
-#' @importFrom plyr llply ldply
-#' @importFrom utils tail
-#' @seealso \href{https://developers.google.com/doubleclick-publishers/docs/reference/v201711/ActivityGroupService#getActivityGroupsByStatement}{Google Documentation for getActivityGroupsByStatement}
+#' @seealso \href{https://developers.google.com/doubleclick-publishers/docs/reference/v201802/ActivityGroupService#getActivityGroupsByStatement}{Google Documentation for getActivityGroupsByStatement}
 #' 
 #' @param request_data a \code{list} or \code{data.frame} of data elements
 #' to be formatted for a SOAP
@@ -89,53 +51,17 @@ dfp_createActivityGroups <- function(request_data, as_df=TRUE, verbose=FALSE){
 #' @return a \code{data.frame} or \code{list} containing all the elements of a getActivityGroupsByStatementResponse 
 #' @export
 dfp_getActivityGroupsByStatement <- function(request_data, as_df=TRUE, verbose=FALSE){
- request_body <- make_request_body(service='ActivityGroupService', root_name='getActivityGroupsByStatement', data=request_data)
-  request <- build_soap_request(body = request_body, verbose=verbose)
-
-  null_root <- is.null(request)
-  response <- NULL
-  response <- try(xmlChildren(xmlChildren(xmlChildren(xmlRoot(request))$Body)[['getActivityGroupsByStatementResponse']]), silent=T)
-  result <- if(null_root | is.null(response)){
-    NULL
-  } else if(is.null(response$rval)){
-    NULL
-  } else if (as_df){
-      if(length(response[grepl('rval', names(response))])==1 &
-          names(response[grepl('rval', names(response))][[1]])[1]=='totalResultSetSize' &
-           names(response[grepl('rval', names(response))][[1]])[2]=='startIndex'){
-            ldply(tail(response[grepl('rval', names(response))]$rval, -2),
-             .fun=function(x){
-                 x <- xmlToList(x)
-                 x[sapply(x, is.null)] <- NA
-                 new_x <- as.data.frame(x, stringsAsFactors = F)
-                 return(new_x)
-             }, .id=NULL)
-      } else {
-      ldply(response[grepl('rval', names(response))],
-            .fun=function(x){
-               x <- xmlToList(x)
-               x[sapply(x, is.null)] <- NA
-               new_x <- as.data.frame(x, stringsAsFactors = F)
-               return(new_x)
-             }, .id=NULL)
-      }
-  } else {
-      llply(response[grepl('rval', names(response))],
-            .fun=function(x){
-               x <- xmlToList(x)
-               return(x)
-             })
-  }
+  request_body <- form_request_body(service='ActivityGroupService', root_name='getActivityGroupsByStatement', data=request_data)
+  response <- execute_soap_request(body=request_body, verbose=verbose)
+  result <- parse_soap_response(httr_response=response, resp_element='getActivityGroupsByStatementResponse', as_df=as_df)
   return(result)
 }
 #' 
 #' updateActivityGroups
 #' 
 #' Updates the specified ActivityGroup objects.
 #' 
-#' @importFrom plyr llply ldply
-#' @importFrom utils tail
-#' @seealso \href{https://developers.google.com/doubleclick-publishers/docs/reference/v201711/ActivityGroupService#updateActivityGroups}{Google Documentation for updateActivityGroups}
+#' @seealso \href{https://developers.google.com/doubleclick-publishers/docs/reference/v201802/ActivityGroupService#updateActivityGroups}{Google Documentation for updateActivityGroups}
 #' 
 #' @param request_data a \code{list} or \code{data.frame} of data elements
 #' to be formatted for a SOAP
@@ -146,43 +72,9 @@ dfp_getActivityGroupsByStatement <- function(request_data, as_df=TRUE, verbose=F
 #' @return a \code{data.frame} or \code{list} containing all the elements of a updateActivityGroupsResponse 
 #' @export
 dfp_updateActivityGroups <- function(request_data, as_df=TRUE, verbose=FALSE){
- request_body <- make_request_body(service='ActivityGroupService', root_name='updateActivityGroups', data=request_data)
-  request <- build_soap_request(body = request_body, verbose=verbose)
-
-  null_root <- is.null(request)
-  response <- NULL
-  response <- try(xmlChildren(xmlChildren(xmlChildren(xmlRoot(request))$Body)[['updateActivityGroupsResponse']]), silent=T)
-  result <- if(null_root | is.null(response)){
-    NULL
-  } else if(is.null(response$rval)){
-    NULL
-  } else if (as_df){
-      if(length(response[grepl('rval', names(response))])==1 &
-          names(response[grepl('rval', names(response))][[1]])[1]=='totalResultSetSize' &
-           names(response[grepl('rval', names(response))][[1]])[2]=='startIndex'){
-            ldply(tail(response[grepl('rval', names(response))]$rval, -2),
-             .fun=function(x){
-                 x <- xmlToList(x)
-                 x[sapply(x, is.null)] <- NA
-                 new_x <- as.data.frame(x, stringsAsFactors = F)
-                 return(new_x)
-             }, .id=NULL)
-      } else {
-      ldply(response[grepl('rval', names(response))],
-            .fun=function(x){
-               x <- xmlToList(x)
-               x[sapply(x, is.null)] <- NA
-               new_x <- as.data.frame(x, stringsAsFactors = F)
-               return(new_x)
-             }, .id=NULL)
-      }
-  } else {
-      llply(response[grepl('rval', names(response))],
-            .fun=function(x){
-               x <- xmlToList(x)
-               return(x)
-             })
-  }
+  request_body <- form_request_body(service='ActivityGroupService', root_name='updateActivityGroups', data=request_data)
+  response <- execute_soap_request(body=request_body, verbose=verbose)
+  result <- parse_soap_response(httr_response=response, resp_element='updateActivityGroupsResponse', as_df=as_df)
   return(result)
 }
-#'
+#'