update package

DESCRIPTION

@@ -14,7 +14,9 @@ Imports:
     readr,
     stringr
 Suggests:
-    rtweet 
+    rtweet,
+    dplyr (>= 0.8.0), 
+    usethis (>= 1.5.0)
 License: GPL-2
 Encoding: UTF-8
 LazyData: true

NAMESPACE

@@ -1,6 +1,7 @@
 # Generated by roxygen2: do not edit by hand
 
 export("%>%")
+export(meme_add)
 export(meme_explain)
 export(meme_get)
 export(meme_list)

R/add-meme.R

@@ -1,24 +1,31 @@
 #' Add meme to `memer` package
 #'
-#' @param name Name of the meme in CamelCase. 
+#' @param name Name of the meme in CamelCase.
 #' @param file Filename including the file extension.
-#' 
+#'
 #' @keywords internal
-#' 
+#'
 #' @details `memer` uses `memer::blankmemes` to resolve filenames, so to use a
 #' new meme you must build and install the package after running `meme_add()`.
 #'
 #' @examples
 #' \dontrun{
-#' meme_add("YoDawg", "yodawg.png")
+#' memer::meme_add("YoDawg", "yodawg.png")
 #' }
+#' @export
 meme_add <- function(name, file) {
-
+
+  if (name %in% memer::blankmemes$name) {
+    stop(paste0("Error: The ", name, " meme is already present in memer::blankmemes"))
+  }
+
   cat('Make sure you have added the image file to the inst/extdata directory')
-
-  blankmemes <- dplyr::add_row(blankmemes, filename = file, name = name) %>%
-    dplyr::arrange(filename)
-
+
+  blankmemes <- memer::blankmemes %>%
+    dplyr::add_row(filename = file, name = name) %>%
+    dplyr::arrange(filename) %>%
+    dplyr::distinct() # make sure there aren't duplicates
+
   usethis::use_data(blankmemes, overwrite = T)
-  
-}
+
+}

R/memer.R

@@ -10,5 +10,6 @@
 #' @name memer
 NULL
 
+##  from https://github.com/STAT545-UBC/Discussion/issues/451:
 ## quiets concerns of R CMD check re: the .'s that appear in pipelines
-if(getRversion() >= "2.15.1")  utils::globalVariables(c("blankmemes"))
+if(getRversion() >= "2.15.1")  utils::globalVariables(c("blankmemes", "filename", "name"))

cran-comments.md

@@ -5,14 +5,12 @@
 
 ## R CMD check results
 
-The warnings are inherited from the way the magick::image_annotate function is documented. 
-
 0 errors | 0 warnings | 1 note
 
 NOTE:
-  installed size is  9.1Mb
+  installed size is  9.0Mb
     sub-directories of 1Mb or more:
-      extdata   8.9Mb
+      extdata   8.8Mb
 
 The extdata folder contains all of the meme images. Unfortunately, the large size of the folder is unavoidable because of this. 
 

data-raw/know-your-meme-links.R

@@ -2,8 +2,8 @@ library(readr)
 library(usethis)
 
 meme_links <- read_csv(
-  "data-raw/know-your-meme-links.csv", 
+  "data-raw/know-your-meme-links.csv",
   col_types = cols(.default = col_character())
 )
 
-use_data(meme_links, internal = TRUE)
+use_data(meme_links)