Merge pull request #382 from lindsaycarr/landing-page-date

Fixes what is on dev & brings Harvey/Irma back

R/publish.R

@@ -460,12 +460,13 @@ publish.header <- function(viz) {
 #' @rdname publish
 #' @export
 publish.landing <- function(viz){
-
+  
   repos <- setdiff(getRepoNames(viz[['org']]), c('vizlab', 'D3Learners', 'viz-scratch')) # we know some aren't vizzies
   viz_info <- lapply(setNames(nm=repos), function(repo) {
     tryCatch(getVizInfo(repo, org=viz[['org']], viz[['dev']]),
-             error=function(e) message(paste0("in getVizInfo(", repo, "): ", e$message), appendLF=TRUE),
-             warning=function(w) if(grepl("\\. is not a real", w$message)) return() else warning(w))
+             error=function(e) message(paste0("in getVizInfo(", repo, "): ", e$message), appendLF=TRUE)
+             # warning=function(w) if(grepl("\\. is not a real", w$message)) return() else warning(w)
+             )
   })
   # rm null
   viz_info <- viz_info[!sapply(viz_info, is.null)]

R/publishLandingPage.R

@@ -59,23 +59,24 @@ getVizInfo <- function(org, repo, dev){
   viz.yaml <- yaml.load_file(url(viz.yaml_url))
 
   has_publish_date <- !is.null(viz.yaml$info$`publish-date`)
-  if(!dev){
-    if(has_publish_date){
-      publish_date <- as.Date(viz.yaml$info$`publish-date`)
+  if(has_publish_date) {
+    publish_date <- as.Date(viz.yaml$info$`publish-date`)
+    if(!dev){
+      # for prod, verify that the publish date is today or already past
       is_published <- publish_date <= Sys.Date()  
-      if(!is_published){
-        return()
-      } 
     } else {
-      return()
+      # for dev, publish anything that actually has a date in the field
+      is_published <- TRUE
     }
   } else {
-    publish_date <- as.Date(viz.yaml$info$`publish-date`)
-    is_published <- TRUE
-    if(is.null(publish_date) | is.na(publish_date)){
-      publish_date <- Sys.Date()
-    }
+    is_published <- FALSE
   }
+
+  if(!is_published){
+    # if it is not going to be published, jump out of this function
+    return()
+  }
+
   viz_info <- viz.yaml$info
 
   viz_url <- viz_info$url