Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #85 - posixify now works with JSON downloads #106

Merged
merged 4 commits into from
Oct 18, 2016
Merged

Fixes #85 - posixify now works with JSON downloads #106

merged 4 commits into from
Oct 18, 2016

Conversation

nicklucius
Copy link
Contributor

@nicklucius nicklucius commented Oct 7, 2016

Fixes #85

@coveralls
Copy link

coveralls commented Oct 7, 2016

Coverage Status

Coverage increased (+0.2%) to 97.08% when pulling 621b182 on issue85 into d6e307f on dev.

@tomschenkjr tomschenkjr added this to the v1.7.1 milestone Oct 10, 2016
@tomschenkjr
Copy link
Contributor

I re-built the pull request in AppVeyor and it now passes.

@geneorama - can you do a review of this pull request? Click "Add Your Review" to make any notes. It's for the v1.7.1 milestone that we'll submit on 10/31.

Copy link
Member

@geneorama geneorama left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor changes, I made the changes and pushed to issue85. Please review and if you agree, then I also approve.

@@ -3,18 +3,29 @@ library(RSocrata)
library(httr)
library(jsonlite)
library(mime)
library(plyr)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

plyr is not needed for the tests. If it's a package dependency it belongs in the appropriate places in the NAMESPACE and DESCRIPTION files.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

plyr is in NAMESPACE and DESCRIPTION so looks good to me.

as.POSIXct(strptime(x, format="%m/%d/%Y")) # short date format
patternJSON <- paste0("^[[:digit:]]{4}-[[:digit:]]{2}-[[:digit:]]{2}T",
"[[:digit:]]{2}:[[:digit:]]{2}:[[:digit:]]{2}.[[:digit:]]{3}","$")
## Find number of matches with grep
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

indenting (mentioned in commit message)

@coveralls
Copy link

coveralls commented Oct 14, 2016

Coverage Status

Coverage increased (+0.2%) to 97.08% when pulling a3d0d0c on issue85 into d6e307f on dev.

@nicklucius
Copy link
Contributor Author

Thanks, Gene. The changes look good to me.

Copy link
Member

@geneorama geneorama left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The tests pass, so I'm accepting the pull request.

@@ -275,10 +281,12 @@ read.socrata <- function(url, app_token = NULL, email = NULL, password = NULL,
result <- rbind.fill(result, page) # accumulate
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(We discussed this in the analytics meeting)
I'm not sure when this changed, but this depends on plyr, and would be more clear if it were fully specified with plyr::rbind.fill. Also, I don't see what problem this solves because if I revert this line to result <- rbind(result, page) all the tests still pass.
However, this is not part of the pull request.

@coveralls
Copy link

coveralls commented Oct 17, 2016

Coverage Status

Coverage increased (+0.2%) to 97.08% when pulling aaa5acd on issue85 into d6e307f on dev.

@geneorama
Copy link
Member

I was going to do a "squash merge" but I don't want to lose authorship. @nicklucius would you mind doing that? In the commit message please take out my "removing plyr" and "adding plyr" messages.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants