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

Split functions and other smaller improvements for 1.6.3 #53

Merged
merged 23 commits into from
Jul 25, 2015

Conversation

dmpe
Copy link
Contributor

@dmpe dmpe commented Jul 16, 2015

Merge after code review. This is a tentative changelog:

  • Bump to 1.6.x (future release), which as described in [META: Ideas for near future] #50 should have better error handling and splitted functions (ErrorHandling.R).
  • 4x4 is now improved as one test in the test-fourByFour - the isFourByFour("4334-!gaj") - would fail (on my PC) with RSocrata CRAN version.
  • RSocrata.R is renamed into returnData.R, the same is with the getResponse -> checkResponse (this function is now quite unnecessary though)
  • Added 3rd. regex for the http://dev.socrata.com/docs/datatypes/floating_timestamp.html
  • Added some examples & tests and some general formatting according to style guide
  • Added vignette (with geo example & move all examples out of the readme file)
    • Tests on Travis take long, but it is ok
    • other small changes to .md files

Before merging/releasing on CRAN, this can/needs to be done:


Current File Structure in R folder:

returnData.R has 4 functions:

  • read.socrata
  • checkResponse
  • getContentAsDataFrame
  • getSodaTypes

utils.R has 2 functions:

  • fieldName
  • posixify
  • isFourByFour

validateURL.R has 1 function:

  • validateUrl

listDatasets.R has 1 function:

  • ls.socrata

errorHandling.R has 1 function:

  • errorHandling

@@ -0,0 +1,6 @@
Hi @tomschenkjr,
Can I just ask something ? We have a function called posixify which "Converts Socrata calendar_date string to POSIX". Can you give me an example of a such string that is then converted to POSIX ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

already found (see examples)

dmpe added 2 commits July 19, 2015 19:19
and rename getResponse to checkResponse
update test
@dmpe dmpe mentioned this pull request Jul 19, 2015
4 tasks
expect_equal(47, dt$sec, label="seconds")
})

test_that("NA datetime in source", {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

do somehting with the speed and dplyr

@dmpe dmpe changed the title [Ignore please/do not merge] Split functions and other smaller improvements Jul 20, 2015
@dmpe dmpe changed the title Split functions and other smaller improvements Split functions and other smaller improvements for 1.6.3 Jul 20, 2015
@dmpe
Copy link
Contributor Author

dmpe commented Jul 22, 2015

Hello @tomschenkjr & @geneorama,

Above you can find what changes / (smaller) improvements I have made to the package. Can you please take a look at that, over here https://github.com/Chicago/RSocrata/pull/53/files. I went a bit over the sprint7 branch, but did rather very smaller changes to the overall code.

Thank you.

@tomschenkjr tomschenkjr self-assigned this Jul 23, 2015
@tomschenkjr
Copy link
Contributor

Fantastic. I'll take a look at it. Might be a couple of days before I get a chance.

dmpe added 4 commits July 23, 2015 21:48
…be moved to required)

should fix travis

now fix again

second time the same.

give up

give up on travis. wont work

?
update functions, move 4x4 to utils.R
update docu + .md files
@tomschenkjr
Copy link
Contributor

Accepting pull request. Can you separate-out the additional commits from outstanding pull requests, though? It's getting a bit treacherous trying to track the status of the CI status on this one.

tomschenkjr pushed a commit that referenced this pull request Jul 25, 2015
Split functions and other smaller improvements
@tomschenkjr tomschenkjr merged commit 4364566 into Chicago:dev Jul 25, 2015
dmpe added a commit to dmpe/RSocrata that referenced this pull request Dec 24, 2015
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
dmpe added a commit to dmpe/RSocrata that referenced this pull request Dec 24, 2015
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
dmpe added a commit to dmpe/RSocrata that referenced this pull request Dec 24, 2015
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
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

2 participants