Fix #22

NEWS.md

@@ -1,12 +1,11 @@
 # datasetjson 0.1.0
 
-- Capability to read and validate Dataset JSON files from URLs has been added (#8)
-- Remove autoset of fileOID using output path (#3)
-- Don't auto-populate optional attributes with NA (#16)
-- Push dependency versions back (#18)
-- Default `pretty` parameter on `write_dataset_json()` to false (#20)
+-  Capability to read and validate Dataset JSON files from URLs has been added (#8)
+-  Remove autoset of fileOID using output path (#3)
+-  Don't auto-populate optional attributes with NA (#16)
+-  Push dependency versions back (#18)
+-  Default `pretty` parameter on `write_dataset_json()` to false (#20)
 
 # datasetjson 0.0.1
 
 Initial development version of datasetjson, introducing core objects, readers and writers.
-

R/read_dataset_json.R

@@ -24,9 +24,14 @@
 read_dataset_json <- function(file) {
 
  if (path_is_url(file)) {
+ # Url?
  file_contents <- read_from_url(file)
- } else {
+ } else if (file.exists(file)) {
+ # File on disk?
  file_contents <- readLines(file)
+ } else {
+ # Direct file contents?
+ file_contents <- file
  }
 
  # Validate the input file against the schema

tests/testthat/test-read_dataset_json.R

@@ -60,3 +60,12 @@ test_that("Dataset JSON can be read from a URL", {
 
  expect_equal(from_disk, from_url)
 })
+
+test_that("Dataset JSON can be read from imported string", {
+ ds_json <- dataset_json(iris[1:5, ], "IG.IRIS", "IRIS", "Iris", iris_items)
+ js <- write_dataset_json(ds_json, pretty=TRUE)
+ expect_silent(dat <- read_dataset_json(js))
+ x <- iris
+ x[5] <- as.character(x[[5]])
+ expect_equal(x[1:5, ], dat, ignore_attr=TRUE)
+})

vignettes/getting_started.Rmd

@@ -44,7 +44,7 @@ iris_items
 
 This data frame has 7 columns, 4 of which are strictly required. This is defined by the [CDISC Dataset JSON Specification](https://www.cdisc.org/dataset-json).
 
-| **Attribute** | **Requirement** | **Description** |
+| **Attribute** | **Requirement** | **Description** |
 |---------------|-----------------|--------------------------------------------------------------------------------------------------------------------------------|
 | OID | Required | OID of a variable (must correspond to the variable OID in the Define-XML file) |
 | name | Required | Variable name |