diff --git a/.gitignore b/.gitignore index 408ac80..50471e5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,16 +1,15 @@ -/.settings +/.git /.project +/.Rbuildignore.Rcheck /.README.md.html +/.settings +/DESCRIPTION.Rcheck /man -/.git -/RSocrata_*.tar.gz -/RCheck /out +/RCheck +/RSocrata_*.tar.gz /RSocrata.Rcheck *.pdf -/DESCRIPTION.Rcheck -/.Rbuildignore.Rcheck -*.Rproj.user *.Rproj *.Rproj.user *.Rhistory diff --git a/DESCRIPTION b/DESCRIPTION index 62ad2b5..7bb12b5 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -8,18 +8,18 @@ Description: Provides easier interaction with returns an R data frame. Converts dates to 'POSIX' format. Manages throttling by 'Socrata'. -Version: 1.6.0-12 -Date: 2015-4-20 +Version: 1.6.0-13 +Date: 2015-6-5 URL: https://github.com/Chicago/RSocrata BugReports: https://github.com/Chicago/RSocrata/issues -Depends: +Imports: httr (>= 0.3), jsonlite (>= 0.9.14), - mime (>= 0.2) -Imports: + mime (>= 0.2), +Depends: curl (>= 0.5) Suggests: RUnit Author: Hugh Devlin, Ph. D. and Tom Schenk, Jr. Maintainer: "Tom Schenk Jr." -License: MIT + file LICENSE \ No newline at end of file +License: MIT + file LICENSE diff --git a/NAMESPACE b/NAMESPACE index f995a38..a722644 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -2,7 +2,7 @@ export(fieldName) export(posixify) export(read.socrata) export(ls.socrata) -import(jsonlite) -import(httr) -import(mime) -import(curl) \ No newline at end of file +importFrom("httr", "parse_url", "build_url", "http_status", "stop_for_status", "GET", "content") +importFrom("mime", "guess_type") +importFrom("jsonlite", "fromJSON") +import("curl") diff --git a/R/RSocrata.R b/R/RSocrata.R index 9a30d23..df3d035 100644 --- a/R/RSocrata.R +++ b/R/RSocrata.R @@ -3,9 +3,9 @@ # Author: Hugh J. Devlin, Ph. D. 2013-08-28 ############################################################################### -library('httr') # for access to the HTTP header -library('jsonlite') # for parsing data types from Socrata -library('mime') # for guessing mime type +# library('httr') # for access to the HTTP header +# library('jsonlite') # for parsing data types from Socrata +# library('mime') # for guessing mime type #' Time-stamped message #' @@ -89,7 +89,7 @@ validateUrl <- function(url, app_token) { #' @export #' @author Hugh J. Devlin, Ph. D. \email{Hugh.Devlin@@cityofchicago.org} #' @examples -#' fieldName("Number.of.Stations") # number_of_stations +#' #fieldName("Number.of.Stations") # number_of_stations fieldName <- function(humanName) { tolower(gsub('\\.', '_', as.character(humanName))) }