Import datasets

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: modules
 Title: Self Contained Units of Source Code
-Version: 0.8.3
+Version: 0.8.4
 Authors@R: person("Sebastian", "Warnholz", email = "wahani@gmail.com", role = c("aut", "cre"))
 Description: Provides modules as an organizational unit for source code. Modules
     enforce to be more rigorous when defining dependencies and have

NAMESPACE

@@ -21,6 +21,7 @@ export(getSearchPathNames)
 export(import)
 export(module)
 export(use)
+importFrom(utils,data)
 importFrom(utils,download.file)
 importFrom(utils,install.packages)
 importFrom(utils,installed.packages)

NEWS

@@ -2,7 +2,8 @@ Version 0.9.0
 - Bugfix from issue #16 on Github: extend a module which has been loaded from a
   file now actually works
 - Extending the export mechanism to allow for renaming: see #19
-- Reattaching a module in the .GlobalEnv now actually works. See #24. 
+- Reattaching a module in the .GlobalEnv now actually works. See #24
+- Importing a complete package now also imports datasets. See #29
 
 Version 0.8.0
 - CRAN release

R/NAMESPACE.R

@@ -1,4 +1,4 @@
-#' @importFrom utils download.file install.packages installed.packages
+#' @importFrom utils data download.file install.packages installed.packages
 #'   packageVersion str
 NULL
 

R/import.R

@@ -74,7 +74,7 @@ importCheckInstall <- function(pkg) {
 
 importGetSelection <- function(mc, pkg) {
   objectsToImport <- importDeparseEllipses(mc)
-  if (length(objectsToImport) == 0) getNamespaceExports(pkg)
+  if (length(objectsToImport) == 0) importGetNamespaceExports(pkg)
   else objectsToImport
 }
 
@@ -87,3 +87,11 @@ importDeparseEllipses <- function(mc) {
   args <- unlist(args)
   deleteQuotes(args)
 }
+
+importGetNamespaceExports <- function(pkg) {
+  nsExports <- getNamespaceExports(pkg)
+  nsDatasets <- data(package = pkg)
+  nsDatasets <- nsDatasets$results[, "Item"]
+  nsDatasets <- gsub(" .*", "", nsDatasets)
+  c(nsExports, nsDatasets)
+}

tests/testthat/test-import.R

@@ -1,3 +1,22 @@
+test_that("Import of datasets: #29", {
+  # import all datasets from a package
+  m <- module({
+    import("datasets")
+    getIris <- function() iris
+  })
+  data("iris", envir = environment())
+  expect_equal(m$getIris(), iris)
+  expect_true("iris" %in% getSearchPathContent(m)[["modules:datasets"]])
+  # import just one dataset, like any other object
+  m <- module({
+    import("datasets", "iris")
+    getIris <- function() iris
+  })
+  data("iris", envir = environment())
+  expect_equal(m$getIris(), iris)
+  expect_true("iris" %in% getSearchPathContent(m)[["modules:datasets"]])
+})
+
 test_that("Imports of module", {
   # import and related functions are part of the parent scope. Not the module
   # itself.