Skip to content

Commit

Permalink
Merge 4b124e2 into 1b92240
Browse files Browse the repository at this point in the history
  • Loading branch information
dmpe committed Jul 8, 2015
2 parents 1b92240 + 4b124e2 commit d34f6bd
Show file tree
Hide file tree
Showing 6 changed files with 222 additions and 207 deletions.
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,13 @@ r_github_packages:
- jeroenooms/jsonlite
- jeroenooms/curl
- klutometis/roxygen
- jimhester/covr

before_install:
- Rscript -e "install.packages('roxygen2', repos='http://cran.us.r-project.org'); library(roxygen2); roxygen2::roxygenize(package.dir='.', roclets=c('rd', 'collate', 'namespace'))"
after_success:
- Rscript -e 'source("R/tests/testRSocrata.R"); runAllTestsCI()'

after_success:
- Rscript -e 'library(covr);coveralls()'

notifications:
email:
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.1-3
Date: 2015-6-7
Version: 1.6.1-4
Date: 2015-7-10
URL: https://github.com/Chicago/RSocrata
BugReports: https://github.com/Chicago/RSocrata/issues
Imports:
Imports:
httr (>= 0.3),
jsonlite (>= 0.9.14),
mime (>= 0.2),
Depends:
Depends:
curl (>= 0.5)
Suggests:
RUnit
Suggests:
testthat (>= 0.10.0)
Author: Hugh Devlin, Ph. D. and Tom Schenk, Jr.
Maintainer: Tom Schenk Jr <developers@cityofchicago.org>
License: MIT + file LICENSE
196 changes: 0 additions & 196 deletions R/tests/testRSocrata.R

This file was deleted.

7 changes: 5 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ RSocrata

[![Linux build - Dev](https://img.shields.io/travis/Chicago/RSocrata/dev.svg?style=flat-square&label=Linux build)](https://travis-ci.org/Chicago/RSocrata)[![Windows build - Dev](https://img.shields.io/appveyor/ci/tomschenkjr/RSocrata/dev.svg?style=flat-square&label=Windows build)](https://ci.appveyor.com/project/tomschenkjr/rsocrata/branch/dev)

[![Coverage Status](https://img.shields.io/coveralls/Chicago/RSocrata.svg)](https://coveralls.io/r/Chicago/RSocrata?branch=master)


A tool for downloading Socrata datasets as R data frames
--------------------------------------------------------

Expand Down Expand Up @@ -69,10 +72,10 @@ If you would like to contribute to this project, please see the [contributing do

1.3 Added support for human-readable URL.

1.4 Add json file format for Socrata downloads. Switch to RJSONIO rom rjson.
1.4 Add json file format for Socrata downloads. Switch from `RJSONIO` to ```rjson`.

1.5 Several changes:
* Swapped ```jsonlite``` to ```RJSONIO```
* Swapped ```jsonlite``` from ```RJSONIO```
* Added handling for long and short dates
* Added unit test for reading private datasets

Expand Down
4 changes: 4 additions & 0 deletions tests/testthat.R
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
library(testthat)
library(RSocrata)

test_check("RSocrata")
Loading

0 comments on commit d34f6bd

Please sign in to comment.