cloudyr · seanofahey · Dec 24, 2016 · Dec 26, 2016 · Dec 26, 2016 · Dec 26, 2016
diff --git a/.Rapp.history b/.Rapp.history
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,17 +1,30 @@
 Package: Rmonkey
-Version: 0.3.3
-Date: 2016-03-20
+Version: 0.5
+Date: 2016-12-28
 Title: A Survey Monkey R Client
 Authors@R: c(person("Thomas J.", "Leeper", role = c("aut", "cre"),
                     email = "thosjleeper@gmail.com"),
+             person("Sean", "Fahey", role = "ctb", 
+                    email = "seanmfahey@yahoo.com"),
              person("Kevin", "Little", role = "ctb", 
                     email = "klittle@iecodesign.com"),
              person("David", "Robinson", role = "ctb", 
                     email = "drobinson@stackoverflow.com"),
              person("Stephan", "Renatus", role = "ctb"))
 Maintainer: Thomas J. Leeper <thosjleeper@gmail.com>
-Imports: stats, utils, httr, jsonlite, curl, plyr
-Description: Programmatic access to the Survey Monkey API <https://developer.surveymonkey.com/>, which currently provides extensive functionality for monitoring surveys and retrieving survey results and some functionality for creating new surveys and data collectors.
+Imports:
+    stats,
+    utils,
+    httr,
+    jsonlite,
+    curl,
+    plyr
+Description: Programmatic access to the Survey Monkey API <https://
+    developer.surveymonkey.com/>, which currently provides extensive functionality
+    for monitoring surveys and retrieving survey results and some functionality for
+    creating new surveys and data collectors.
 License: GPL-2
 URL: https://github.com/cloudyr/Rmonkey
 BugReports: https://github.com/cloudyr/Rmonkey/issues
+RoxygenNote: 5.0.1
+
diff --git a/NAMESPACE b/NAMESPACE
@@ -1,30 +1,12 @@
-export('smlogin')
-export('userdetails')
-export('surveylist')
-export('surveydetails')
-export('surveyquestions')
-export('surveypreview')
-export('collectors')
-export('createcollector')
-export('responsecounts')
-export('respondentlist')
-export('getresponses')
-export('getallresponses')
-export('templates')
-export('createsurvey')
+# Generated by roxygen2: do not edit by hand
 
-S3method(print, 'sm_survey')
-S3method(print, 'sm_collector')
-S3method(print, 'sm_respondent')
-S3method(print, 'sm_response')
-S3method(print, 'sm_template')
-
-S3method(as.data.frame, 'sm_response')
-S3method(as.data.frame, 'sm_response_list')
-
-importFrom('stats', 'setNames')
-importFrom('utils', 'head', 'browseURL')
-importFrom('plyr', 'rbind.fill')
-importFrom('curl', 'curl_escape')
-import('httr')
-import('jsonlite')
+export(getresponses)
+export(print.sm_response)
+export(print.sm_survey)
+export(smlogin)
+export(surveydetails)
+export(surveylist)
+export(surveypreview)
+export(surveyquestions)
+export(surveyresponses)
+export(userdetails)
diff --git a/NEWS b/NEWS
@@ -1,3 +1,14 @@
+# CHANGES TO Rmonkey 0.5 #
+
+## SIGNIFICANT USER-VISIBLE CHANGES ##
+* Rebuilt several functions to work with SurkeyMonkey API V3 (smlogin, userdetails, surveylist, surveydetails)
+* 
+
+## BUG FIXES ##
+
+## DOCUMENTATION ##
+* added Roxygen comments to new functions
+
 # CHANGES TO Rmonkey 0.4 #
 
 ## SIGNIFICANT USER-VISIBLE CHANGES ##

diff --git a/R/asdataframe.R b/R/asdataframe.R
@@ -12,65 +12,83 @@ as.data.frame.sm_response <- function(x, row.names, optional, details = NULL, st
     } else {
         stop("'details' is missing and cannot be determined automatically")
     }
+
+  survey<-x
+  # These first functions unpack the surveydetails() with questions
+  details <- surveydetails(survey, question_details = TRUE)
+
+
     # extract all questions from the `question` element in all pages
+  # note: this assumes that all data records are identical and so the first can be used as a model
     questions <- do.call('c', lapply(details$pages, function(i) i[['questions']]))
+
     # `type` contains info about each question type
     qtypes <- sapply(questions, function(i) {
-        fam <- i$type$family
+        fam <- i$family
         if (fam == "matrix") {
-            setNames(paste0(fam, "_", i$type$subtype), i$question_id)
+            setNames(paste0(fam, "_", i$subtype), i$id)
         } else {
-            setNames(fam, i$question_id)
+            setNames(fam, i$id)
         }
     })
+
     # set variable names
     varnames <- sapply(questions, function(i) {
         # `heading` is the display text
-        setNames(i$heading, i$question_id)
+        setNames(i$heading, i$id)
     })
 
+    # alternate method which reuses an existing function and cleans HTML tags
+    varnames2 <- surveyquestions(survey)
+
     # extract all answers from the `answers` elements of each subelement of `question`
         # `answer_id` is what is recorded in `sm_response`
         # `text` is the display seen by respondents
         # `answers` is empty for "open_ended" type questions
     answerchoices <- sapply(questions, function(i) {
                         out <- list()
-                        for (k in seq_along(i$answers)) {
-                            if (i$type$family == "matrix") {
-                                if (i$type$subtype == "rating") {
-                                    if (i$answers[[k]]$type == "other") {
-                                        out[[k]] <- setNames(i$answers[[k]]$text, i$answers[[k]]$answer_id)
-                                    } else {
-                                        # exclude "col" values from matrix questions
-                                        if (i$answers[[k]]$type == "row") {
-                                            out[[k]] <- setNames(i$answers[[k]]$text, i$answers[[k]]$answer_id)
-                                        } 
-                                    }
-                                    out[[k]] <- setNames(i$answers[[k]]$text, i$answers[[k]]$answer_id)
-                                } else if (i$type$subtype == "menu") {
-                                    if (i$answers[[k]]$type == "col") {
-                                        tmp_txt <- unlist(lapply(i$answers[[k]]$items, `[`, "text"))
-                                        tmp_ans <- unlist(lapply(i$answers[[k]]$items, `[`, "answer_id"))
-                                        out[[k]] <- setNames(tmp_txt, tmp_ans)
-                                        rm(tmp_txt)
-                                        rm(tmp_ans)
-                                    }
-                                }
-                            } else {
-                                out[[k]] <- setNames(i$answers[[k]]$text, i$answers[[k]]$answer_id)
-                            }
+                        for (k in seq_along(i$answers$choices)) {
+                            # if (i$family == "matrix") {
+                            #     if (i$subtype == "rating") {
+                            #         if (i$answers[[k]]$type == "other") {
+                            #             out[[k]] <- setNames(i$answers[[k]]$text, i$answers[[k]]$id)
+                            #         } else {
+                            #     # exclude "col" values from matrix questions
+                            #     if (i$answers[[k]]$type == "row") {
+                            #         out[[k]] <- setNames(i$answers[[k]]$text, i$answers[[k]]$id)
+                            #     }
+                            # }
+                            #         out[[k]] <- setNames(i$answers[[k]]$text, i$answers[[k]]$id)
+                            #     } else if (i$type$subtype == "menu") {
+                            #         if (i$answers[[k]]$type == "col") {
+                            #             tmp_txt <- unlist(lapply(i$answers[[k]]$items, `[`, "text"))
+                            #             tmp_ans <- unlist(lapply(i$answers[[k]]$items, `[`, "id"))
+                            #             out[[k]] <- setNames(tmp_txt, tmp_ans)
+                            #             rm(tmp_txt)
+                            #             rm(tmp_ans)
+                            #         }
+                            #     }
+                            # } else {
+                                out[[k]] <- setNames(i$answers$choices[[k]]$text, i$answers$choices[[k]]$id)
+                            # }
                         }
                         return(unlist(out))
                      })
     answerchoices <- unlist(do.call(c, answerchoices))
+
     # extract question_ids
-    question_ids <- unlist(sapply(x$questions, `[`, 'question_id'))
-    # count number of answers per question
-    nanswers <- integer()
-    for (i in seq_along(x$questions)) {
-        nanswers[i] <- length(x$questions[[i]]$answers)
-    }
-    rm(i)
+    question_ids <- unlist(sapply(questions, `[`, 'id'))
+
+    # # count number of answers per question
+    # nanswers <- integer()
+    # for (i in seq_along(x$questions)) {
+    #     nanswers[i] <- length(x$questions[[i]]$answers)
+    # }
+    # rm(i)
+
+    # count the number of answer choices per question
+    nanswers <- sapply(questions, function(x) {length(x$answers$choices)})
+
     # create vector of answer names by repeating question names `nanswers` times each
     answer_names <- rep(question_ids, nanswers)