From 6e0bd90c3ae18fad73fe3ee154db7cb42f1af4e3 Mon Sep 17 00:00:00 2001
From: calcita <calcita@gmx.li>
Date: Wed, 23 Feb 2022 18:48:11 -0300
Subject: [PATCH] fix organize_names after dplyr updated

---
 .Rbuildignore    |  1 +
 DESCRIPTION      |  4 ++--
 NEWS.md          |  3 +++
 R/organize.R     | 18 +++++++++---------
 cran-comments.md |  5 -----
 5 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/.Rbuildignore b/.Rbuildignore
index 5de9129..73a1ab7 100644
--- a/.Rbuildignore
+++ b/.Rbuildignore
@@ -17,3 +17,4 @@
 ^man/figures$
 ^inst/tutorials/intro/intro\.Rmd$
 ^\.github$
+^CRAN-SUBMISSION$
diff --git a/DESCRIPTION b/DESCRIPTION
index 548e669..f217e3a 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: ech
 Title: Toolbox for ECH with R
-Version: 0.1.1.2
+Version: 0.1.1.3
 Authors@R: 
     c(person(given = "Gabriela",
              family = "Mathieu",
@@ -56,7 +56,7 @@ VignetteBuilder:
 ByteCompile: true
 Encoding: UTF-8
 LazyData: true
-RoxygenNote: 7.1.1
+RoxygenNote: 7.1.2
 SystemRequirements: 'unrar' (Linux/macOS) or '7-Zip' (Windows)
     to work with '.rar' files, GDAL (>= 3.0.2), GEOS (>= 3.8.0), PROJ (>=
     6.2.1)
diff --git a/NEWS.md b/NEWS.md
index eb929e1..d6c25f5 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,8 @@
 # log history of ech package development
 
+## ech v0.1.1.3
+*minor changes. fix organize_names
+
 ## ech v0.1.1.2
 * ommited get_* functions for bug in macos
 * removed some dependences
diff --git a/R/organize.R b/R/organize.R
index 907cef5..4e47b27 100644
--- a/R/organize.R
+++ b/R/organize.R
@@ -23,25 +23,25 @@ organize_names <- function(data, year, level = "hyp"){
     nh <- n %>%
       dplyr::filter(!duplicated(var17)) %>%
       dplyr::select(paste0("var", c(substr(year,3,4), 17))) %>%
-      dplyr::filter(!. == "" & !.== " ")
-    data <- data %>% dplyr::select(nh[,1])
-    names(data) <- nh[,2]
+      tidyr::drop_na()
+    #data <- data %>% dplyr::select(vars(nh[,1]))
+    #names(data) <- nh[,2]
   }
   if(level %in% c("hogar","h")){
     nh <- n %>%
       dplyr::filter((unidad == "H" | unidad == "G") & !duplicated(var17)) %>%
       dplyr::select(paste0("var", c(substr(year,3,4), 17))) %>%
-      dplyr::filter(!. == "" & !.== " ")
-    data <- data %>% dplyr::select(nh[,1])
-    names(data) <- nh[,2]
+      tidyr::drop_na()
+    #data <- data %>% dplyr::select(c(nh[,1]))
+    #names(data) <- nh[,2]
   }
   if(level %in% c("individual", "i")){
     nh <- n %>%
       dplyr::filter((unidad == "P" | unidad == "G") & !duplicated(var17)) %>%
       dplyr::select(paste0("var", c(substr(year,3,4), 17))) %>%
-      dplyr::filter(!. == "" & !.== " ")
-    data <- data %>% dplyr::select(nh[,1])
-    names(data) <- nh[,2]
+      tidyr::drop_na()
+    #data <- data %>% dplyr::select(nh[,1])
+    #names(data) <- nh[,2]
   }
   return(data)
 }
diff --git a/cran-comments.md b/cran-comments.md
index cbf541d..858617d 100644
--- a/cran-comments.md
+++ b/cran-comments.md
@@ -1,8 +1,3 @@
-## Test environments
-* local OS X install, R 3.5.1
-* ubuntu 14.04 (on travis-ci), R 3.5.1
-* win-builder (devel and release)
-
 ## R CMD check results
 
 0 errors | 0 warnings | 1 note