Closes #107 - Convert logical fields to character for JSON API

Chicago · Oct 11, 2016 · 4d1c283 · 4d1c283
1 parent d6e307f
commit 4d1c283
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -10,8 +10,8 @@ Description: Provides easier interaction with
     format and manages throttling by 'Socrata'.
     Users can upload data to Socrata portals directly
     from R.
-Version: 1.7.1-15
-Date: 2016-10-06
+Version: 1.7.1-16
+Date: 2016-10-11
 Author: Hugh Devlin, Ph. D., Tom Schenk, Jr., and John Malc
 Maintainer: "Tom Schenk Jr." <developers@cityofchicago.org>
 Depends:

diff --git a/R/RSocrata.R b/R/RSocrata.R
@@ -281,6 +281,11 @@ read.socrata <- function(url, app_token = NULL, email = NULL, password = NULL,
   for(columnName in colnames(page)[!is.na(dataTypes[fieldName(colnames(page))]) & dataTypes[fieldName(colnames(page))] == 'money']) {
     result[[columnName]] <- no_deniro(result[[columnName]])
   }
+	# convert logical fields to character
+	for(columnName in colnames(result)) {
+	  if(typeof(result[,columnName]) == "logical")
+	    result[,columnName] <- as.character(result[,columnName])
+	}
   if(stringsAsFactors){
 	  result <- data.frame(unclass(result), stringsAsFactors = stringsAsFactors)
 	}

diff --git a/tests/testthat/test-all.R b/tests/testthat/test-all.R
@@ -125,7 +125,7 @@ test_that("read Socrata JSON as default", {
   expect_equal(1007, nrow(df), label="rows")
   expect_equal(11, ncol(df), label="columns")
   expect_equal(c("character", "character", "character", "character", "character", 
-                 "character", "logical", "character", "character", "character", 
+                 "character", "character", "character", "character", "character", 
                  "character"), 
                unname(sapply(sapply(df, class),`[`, 1)))
 })
@@ -137,7 +137,7 @@ test_that("read Socrata JSON as character", {
   expect_equal(1007, nrow(df), label="rows")
   expect_equal(11, ncol(df), label="columns")
   expect_equal(c("character", "character", "character", "character", "character", 
-                 "character", "logical", "character", "character", "character", 
+                 "character", "character", "character", "character", "character", 
                  "character"), 
                unname(sapply(sapply(df, class),`[`, 1)))
 })
@@ -149,7 +149,7 @@ test_that("read Socrata JSON as factor", {
   expect_equal(1007, nrow(df), label="rows")
   expect_equal(11, ncol(df), label="columns")
   expect_equal(c("factor", "factor", "factor", "factor", "factor", "factor", 
-                 "logical", "factor", "factor", "factor", "factor"), 
+                 "factor", "factor", "factor", "factor", "factor"), 
                unname(sapply(sapply(df, class),`[`, 1)))
 })