Skip to content

Commit

Permalink
Moved most 'Depends' packages to 'Imports' in DESCRIPTION. Added 'Imp…
Browse files Browse the repository at this point in the history
…ortFrom' in NAMESPACE. Strangely, had to comment out fieldNames examplein the documentation.
  • Loading branch information
geneorama committed Jun 5, 2015
1 parent b37d679 commit 632ef04
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 21 deletions.
13 changes: 6 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -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
Expand Down
12 changes: 6 additions & 6 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -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

This comment has been minimized.

Copy link
@tomschenkjr

tomschenkjr Jun 5, 2015

Contributor

Can you bump this to the first build of 1.6.1 since it's a bug fix?

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." <developers@cityofchicago.org>
License: MIT + file LICENSE
License: MIT + file LICENSE
8 changes: 4 additions & 4 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ export(fieldName)
export(posixify)
export(read.socrata)
export(ls.socrata)
import(jsonlite)
import(httr)
import(mime)
import(curl)
importFrom("httr", "parse_url", "build_url", "http_status", "stop_for_status", "GET", "content")
importFrom("mime", "guess_type")
importFrom("jsonlite", "fromJSON")
import("curl")
8 changes: 4 additions & 4 deletions R/RSocrata.R
Original file line number Diff line number Diff line change
Expand Up @@ -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
#'
Expand Down Expand Up @@ -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)))
}
Expand Down

0 comments on commit 632ef04

Please sign in to comment.