maybe bad ?

Merge pull request Chicago#51 from Chicago/dev

Pull request for v1.6.1
Remove NEWS.md from build to avoid NOTE

Build number bump and date change

R 3.2.1 wants all URLs in canonical form--has been changed

Fix type-o in Coveralls badge
Merge remote-tracking branch 'upstream/dev' into dev

split & improve 4x4 logic (tests pass)
bump to 1.6.3
Add new Floatin Timestamp format for posixify + add test

split validate + test

validate url split test

fix travis

don't run, not do not run
fix travis again

add errorHandling function
and rename getResponse to checkResponse
update test

else if [skip ci]

add not finished test for Chicago#27, Chicago#24
[skip ci]

go over sprint7 branch [skip ci]

text/plain [skip ci]

fix paste -> paste0 because of sep="" which I deleted

delete note.md + update date [skip ci]

geo readme

Merge remote-tracking branch 'upstream/dev' into dev

Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	DESCRIPTION

add geojson example & vignette (dependencies are suggested, later to be moved to required)

should fix travis

now fix again

second time the same.

give up

give up on travis. wont work

?

fix last time

again

tests and comments (geo too)
update functions, move 4x4 to utils.R
update docu + .md files

add geojson support. not finished

Merge pull request Chicago#53 from dmpe/dev

Split functions and other smaller improvements
fix leaflet example, not SP object but the list and add a new contributor
fix test [skip ci]

Merge pull request Chicago#56 from dmpe/dev-geojson-big

bind -> rbind.fill; getMetadata; GeoJSON method
Fixed version number scheme

Using building numbers, x.y.z-b. The "z" should only be incremented on bug releases being planned.
Human-readable URLs are not being deprecated

Fixes build url under certain domain cases

Re-added human-readable URL

Added unit tests for broken-out URLs

Removed unnecessary library listings

Cleaned-up documentation

Increment build info

Updated help files

Removed vignettes, updated documentation for style

Example formatting issues, cleaned-up comments

Turned on tests

Examples on read.socrata taking too long, stopped their run

Merge pull request #4 from Chicago/dev

Dev

.Rbuildignore

@@ -10,4 +10,7 @@ RSocrata.Rcheck
 .DS_Store
 ^\.travis\.yml$
 appveyor.yml
-CONTRIBUTING.md
+CONTRIBUTING.md
+vignettes/rsconnect
+vignettes/bench.rmd
+^.*\.o$

.gitignore

@@ -13,3 +13,5 @@
 *.Rproj.user
 *.Rhistory
 .Rproj.user
+inst/doc
+/vignettes/rsconnect

.travis.yml

@@ -1,22 +1,44 @@
-# Sample .travis.yml for R projects.
-#
-# See README.md for instructions, or for more configuration options,
-# see the wiki:
-#   http://docs.travis-ci.com/user/languages/r/
-
-language: R
+language: c
 sudo: required
-warnings_are_errors: true
+dist: trusty
+script: ./travis-tool.sh run_tests
+
+before_script:
+  - sudo apt-get --yes --force-yes update -qq
+  - sudo apt-get install -y gdal-bin libgdal-dev libgdal1-dev netcdf-bin libproj-dev libv8-dev
+  - curl -OL http://raw.github.com/craigcitro/r-travis/master/scripts/travis-tool.sh
+  - chmod 755 ./travis-tool.sh
+  - ./travis-tool.sh bootstrap
+  - ./travis-tool.sh install_deps
 
 r_github_packages:
   - hadley/httr
   - jeroenooms/jsonlite
   - jeroenooms/curl
   - klutometis/roxygen
   - jimhester/covr
+  - yihui/mime
+  - ropensci/geojsonio
+
+after_failure:
+  - ./travis-tool.sh dump_logs
+
+env:
+   global:
+     - R_LIBS="http://cran.rstudio.com"
+     - R_BUILD_ARGS="--no-build-vignettes --no-manual"
+     - R_CHECK_ARGS="--no-build-vignettes --no-manual --as-cran"
+     - BOOTSTRAP_LATEX=""
+
+#language: R
+#warnings_are_errors: true
+
+#before_install:
+#  - sudo apt-get --yes --force-yes update -qq
+# - sudo apt-get install -y gdal-bin libgdal-dev libgdal1-dev netcdf-bin libproj-dev libv8-dev
 
-after_success:
-  - Rscript -e 'library(covr);coveralls()'
+#after_success:
+#  - Rscript -e 'library(covr);coveralls()'
 
 notifications:
   email:

CONTRIBUTING.md

@@ -1,4 +1,3 @@
-
 # How to contribute
 
 We really appreciate when users [fix bugs](https://github.com/Chicago/RSocrata/pull/25) or [provide new features](https://github.com/Chicago/RSocrata/pull/21). When submitting changes, please read below to help the development team keep on top of issues and changes.
@@ -18,8 +17,8 @@ If you have multiple issues, please submit multiple requests. Once you submit yo
 
 When you want to make a change, either to fix a bug or introduce a new feature, please follow the instructions below
 
-* Create a branch or fork of the project based off of the `dev` branch.
+* Create a branch or fork of the project based off of the **`dev`** branch.
 * Make commits of logical units
 * Add unit tests for any new features
-* Run all tests in `tests/testthat/`
+* Run all tests in `tests/testthat/` (CTRL+SHIFT+T)
 * Create a pull request with a robust description or [reference the issue number](https://github.com/Chicago/RSocrata/issues)

DESCRIPTION

@@ -5,23 +5,26 @@ Description: Provides easier interaction with
     Socrata open data portals http://dev.socrata.com.
     Users can provide a 'Socrata' data set resource URL,
     or a 'Socrata' Open Data API (SoDA) web query,
-    or a 'Socrata' "human-friendly" URL,
-    returns an R data frame.
-    Converts dates to 'POSIX' format.
-    Manages throttling by 'Socrata'.
-Version: 1.6.2-9
-Date: 2015-7-10
-Author: Hugh Devlin, Ph. D., Tom Schenk, Jr., and John Malc
+    or a 'Socrata' "human-friendly" URL, all of which
+    return a R data frame.
+    Additionally, it converts dates to 'POSIX' format,
+    manages throttling by 'Socrata' and supports geospacial data.
+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." <developers@cityofchicago.org>
 Depends:
-    R (>= 3.0.0)
+    R (>= 3.2.2)
 Imports:
     httr (>= 1.0.0),
-    jsonlite (>= 0.9.16),
-    mime (>= 0.3)
+    jsonlite (>= 0.9.19),
+    mime (>= 0.4),
+    geojsonio (>= 0.1.4),
+    plyr (>= 1.8.3)
 Suggests:
-    testthat (>= 0.10.0),
-    roxygen2 (>= 4.1.0)
+    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
+RoxygenNote: 5.0.1

NAMESPACE

@@ -1,16 +1,19 @@
-# Generated by roxygen2 (4.1.1): do not edit by hand
+# Generated by roxygen2: do not edit by hand
 
-export(fieldName)
+export(getMetadata)
 export(isFourByFour)
 export(ls.socrata)
-export(posixify)
 export(read.socrata)
+export(read.socrataGEO)
 export(validateUrl)
+importFrom(geojsonio,geojson_read)
 importFrom(httr,GET)
+importFrom(httr,add_headers)
 importFrom(httr,build_url)
+importFrom(httr,config)
 importFrom(httr,content)
-importFrom(httr,http_status)
 importFrom(httr,parse_url)
 importFrom(httr,stop_for_status)
 importFrom(jsonlite,fromJSON)
 importFrom(mime,guess_type)
+importFrom(plyr,rbind.fill)

NEWS.md → NEWS

@@ -38,8 +38,11 @@ Deprecated ```httr::guess_media()``` and implemented ```mime::guess_type()```
 * Migrate Travis-CI to "proper" R YAML ([#46](https://github.com/Chicago/RSocrata/issues/46))
 
 
-
-
-
-
-
+### 1.7.0 Several changes, bug fixes and new features:
+
+* New function, `read.socrataGEO()`, which allows downloading GeoJSON data from Socrata data portals.
+* Downloads now default to JSON for any requests for improved speed ([#53](https://github.com/Chicago/RSocrata/pull/53))
+* Add support of a "floating timestamp"
+* Improved error handling and warnings
+* Fixed errors when "NA" was present in date columns ([#27](https://github.com/Chicago/RSocrata/issues/27) and [#24](https://github.com/Chicago/RSocrata/pull/25)) 
+* Use `plyr` to improve the speed and performance of downloads [in some cases](https://github.com/Chicago/RSocrata/pull/56).