Skip to content

Commit

Permalink
Merge pull request #2 from tomschenkjr/master
Browse files Browse the repository at this point in the history
Partial fix for #1
  • Loading branch information
vforgione authored Nov 9, 2018
2 parents 48bccca + ad9db8f commit e639439
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 18 deletions.
19 changes: 14 additions & 5 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,13 +1,22 @@
Package: AotClient
Type: Package
Title: Office Array of Things API Client
Title: Official 'Array of Things' API Client
Version: 0.1.0
Author: Vince Forgione
Date: 2018-11-09
Authors@R: person("Vince", "Forgione", email = "[email protected]",
role = c("aut", "cre"))
Maintainer: "Vince Forgione" <[email protected]>
Description: HTTP API Client
License: Apache 2
Description: The library serves as the official client
for the 'Array of Things' API <http://arrayofthings.github.io>.
It allows users to list available node and get detailed
statistics for each node.
License: Apache License 2.0
Encoding: UTF-8
LazyData: true
Imports:
httr,
jsonlite
Suggests:
testthat
RoxygenNote: 6.1.0
RoxygenNote: 6.1.1
URL: https://github.com/UrbanCCD-UChicago/aot-client-r
13 changes: 0 additions & 13 deletions LICENSE

This file was deleted.

2 changes: 2 additions & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@ export(ls.sensors)
export(stat.node)
export(stat.project)
export(stat.sensor)
importFrom(httr,GET)
importFrom(jsonlite,fromJSON)
2 changes: 2 additions & 0 deletions R/AotClient.R
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ log_msg <- function (msg) {
#' @param url - The URL to send the request to
#' @param filters - A list of tuples to build filters/query params
#' @return The entire response
#' @importFrom httr GET
#' @noRd
send_request <- function (url, filters = NULL) {
# send request; get response
Expand Down Expand Up @@ -48,6 +49,7 @@ send_request <- function (url, filters = NULL) {
#'
#' @param resp - The response object
#' @return The parsed JSON body
#' @importFrom jsonlite fromJSON
#' @noRd
parse_content <- function (resp) {
content <- httr::content(resp, as="text")
Expand Down

0 comments on commit e639439

Please sign in to comment.