Skip to content

Offset was unexposed in air_get() #8

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.

Sign up for GitHub

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

Open
vhorvath wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Offset was unexposed in air_get() #8

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
00d93e5
Making offset available for air_get()
vhorvath Oct 24, 2020
2dcba40
Exposing offset when returned in air_select()
vhorvath Oct 24, 2020
36dacfd
Guar pattern for air_parse()
vhorvath Oct 24, 2020
ce74f8d
Guard pattern for air_parse()
vhorvath Oct 24, 2020
e652465
Merge branch 'master' of https://github.com/vhorvath/airtabler
vhorvath Oct 24, 2020
801b5b1
Guard pattern for air_parse()
vhorvath Oct 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions R/airtabler.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ air_get <- function(base, table_name, record_id = NULL,
)
air_validate(res) # throws exception (stop) if error
ret <- air_parse(res) # returns R object
offset <- attr(ret, "offset")
if(combined_result && is.null(record_id)) {
# combine ID, Fields and CreatedTime in the same data frame:
ret <-
Expand All @@ -97,6 +98,7 @@ air_get <- function(base, table_name, record_id = NULL,
stringsAsFactors =FALSE
)
}
attr(ret, "offset") <- offset
ret
}

Expand Down Expand Up @@ -214,8 +216,8 @@ air_select <- function(
id = ret$id, ret$fields, createdTime = ret$createdTime,
stringsAsFactors =FALSE
)
attr(ret, "offset") <- offset
}
attr(ret, "offset") <- offset
ret
}

Expand Down Expand Up @@ -256,13 +258,16 @@ air_validate <- function(res) {

air_parse <- function(res) {
res_obj <- jsonlite::fromJSON(httr::content(res, as = "text"))
if(!is.null(res_obj$records)) {
res <- res_obj$records
if(!is.null(res_obj$offset)) {
attr(res, "offset") <- res_obj$offset
}
} else {
res <- res_obj

# Single entry returned, terminate early: expose all key-value pairs
if(is.null(res_obj$records)) { return(res_obj) }

# Multiple entries returned: expose values under 'records' key
res <- res_obj$records

# Add offset, if available
if(!is.null(res_obj$offset)) {
attr(res, "offset") <- res_obj$offset
}
res
}
Expand Down