this fixes metadata methods so that Chicago#64 (comment) rowline is now splitted.

update description file & squash all the commits

Author: dmpe

.travis.yml

@@ -8,10 +8,18 @@ language: R
 warnings_are_errors: true
 
 before_install:
+  - sudo apt-get update -qq
   - sudo apt-get install libv8-dev
-  
-r_binary_packages:
-  - rgdal
+  - sudo add-apt-repository -y ppa:marutter/c2d4u
+  - sudo apt-get update -qq
+
+apt_packages:
+  - libgdal-dev 
+  - libproj-dev
+  - libhdf5-serial-dev
+
+r_packages:
+  - rgdal 
 
 r_github_packages:
   - hadley/httr

DESCRIPTION

@@ -13,17 +13,18 @@ Version: 1.7.0-9
 Date: 2015-10-26
 Author: Hugh Devlin, Ph. D., Tom Schenk, Jr. and John Malc (@dmpe)
 Maintainer: "Tom Schenk Jr." <[email protected]>
-Depends: 
+Depends:
     R (>= 3.2.2)
-Imports: 
+Imports:
     httr (>= 1.0.0),
-    jsonlite (>= 0.9.17),
-    mime (>= 0.4), 
-    geojsonio (>= 0.1.4), 
+    jsonlite (>= 0.9.19),
+    mime (>= 0.4),
+    geojsonio (>= 0.1.4),
     plyr (>= 1.8.3)
-Suggests: 
-    testthat (>= 0.10.0),
-    roxygen2 (>= 4.1.1),
+Suggests:
+    testthat (>= 0.11.0),
+    roxygen2 (>= 5.0.1),
 License: MIT + file LICENSE
 URL: https://github.com/Chicago/RSocrata
-BugReports: https://github.com/Chicago/RSocrata/issues
+BugReports: https://github.com/Chicago/RSocrata/issues
+RoxygenNote: 5.0.1

NAMESPACE

@@ -1,4 +1,4 @@
-# Generated by roxygen2 (4.1.1): do not edit by hand
+# Generated by roxygen2: do not edit by hand
 
 export(getMetadata)
 export(isFourByFour)
@@ -10,9 +10,11 @@ importFrom(geojsonio,geojson_read)
 importFrom(httr,GET)
 importFrom(httr,add_headers)
 importFrom(httr,build_url)
+importFrom(httr,config)
 importFrom(httr,content)
 importFrom(httr,parse_url)
 importFrom(httr,stop_for_status)
+importFrom(httr,verbose)
 importFrom(jsonlite,fromJSON)
 importFrom(mime,guess_type)
 importFrom(plyr,rbind.fill)

R/errorHandling.R

@@ -7,9 +7,9 @@
 # See \url{https://github.com/Chicago/RSocrata/issues/16}
 #
 # @param url - SOPA url
-#' @importFrom httr stop_for_status GET add_headers
+#' @importFrom httr stop_for_status GET add_headers verbose config
 errorHandling <- function(url = "", app_token = NULL) {
-  rsp <- httr::GET(url, httr::add_headers("X-App-Token" = app_token))
+  rsp <- httr::GET(url, httr::add_headers("X-App-Token" = app_token), config(fresh_connect = 1L))
 
   if (rsp$status_code == 200) {
     invisible("OK. Your request was successful.")

R/metadata.R

@@ -27,10 +27,9 @@
 getMetadata <- function(url = "") {
 
   urlParsedBase <- httr::parse_url(url)
-  mimeType <- mime::guess_type(urlParsedBase$path)
-  
+ 
   # use function below to get them using =COUNT(*) SODA query
-  gQRC <- getQueryRowCount(urlParsedBase, mimeType) 
+  gQRC <- getQueryRowCount(urlParsedBase) 
 
   # create URL for metadata data frame
   fourByFour <- substr(basename(urlParsedBase$path), 1, 9)
@@ -48,7 +47,7 @@ getMetadata <- function(url = "") {
     suppressWarnings(max(df$cachedContents$non_null + df$cachedContents$null))
   } else {
     # as.numeric(ifelse(is.null(gQRC$count), gQRC$COUNT, gQRC$count)) # the reason
-    as.numeric(tolower(gQRC$COUNT))
+    as.numeric(getQueryRowCount(gQRC))
   }
 
   columns <- as.numeric(nrow(df))
@@ -62,7 +61,11 @@ getMetadata <- function(url = "") {
 # @author Gene Leynes \email{gleynes@@gmail.com}
 #
 #' @importFrom httr GET build_url content
-getQueryRowCount <- function(urlParsed, mimeType) {
+getQueryRowCount <- function(validUrl) {
+  
+  urlParsed <- httr::parse_url(validUrl)
+  mimeType <- mime::guess_type(urlParsed$path)
+  
   ## Construct the count query based on the URL,
   if (is.null(urlParsed[['query']])) {
     ## If there is no query at all, create a simple count
@@ -93,5 +96,5 @@ getQueryRowCount <- function(urlParsed, mimeType) {
   ## Limit the row count to $limit (if the $limit existed). 
   # totalRows <- min(totalRows, as.numeric(rowLimit))
 
-  return(totalRows)
+  return(totalRows[[1]])
 }

R/returnData.R

@@ -111,7 +111,7 @@ read.socrata <- function(url = NULL, app_token = NULL, limit = 50000, domain = N
   results <- getContentAsDataFrame(response)
   dataTypes <- getSodaTypes(response)
 
-  rowCount <- as.numeric(getMetadata(cleanQuest(validUrl))[1])
+  rowCount <- as.numeric(getQueryRowCount(validUrl))
 
   ## More to come? Loop over pages implicitly
   while (nrow(results) < rowCount) {