version 1.0.4

cran · Sep 24, 2023 · 624a030 · 624a030
1 parent 36025cd
commit 624a030
Show file tree

Hide file tree

Showing 7 changed files with 83 additions and 79 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: countries
 Type: Package
 Title: Deal with Country Data in an Easy Way
-Version: 1.0.3
+Version: 1.0.4
 Authors@R: 
     person("Francesco Saverio", "Bellelli", , "fsabellelli@gmail.com", role = c("aut", "cre", "cph"),
            comment = c(Website = "https://fbellelli.com/"))
@@ -24,8 +24,8 @@ BugReports: https://github.com/fbellelli/countries/issues
 Config/testthat/edition: 3
 LazyData: true
 NeedsCompilation: no
-Packaged: 2023-09-01 13:31:41 UTC; FSB
+Packaged: 2023-09-24 16:51:15 UTC; FSB
 Author: Francesco Saverio Bellelli [aut, cre, cph] (https://fbellelli.com/)
 Maintainer: Francesco Saverio Bellelli <fsabellelli@gmail.com>
 Repository: CRAN
-Date/Publication: 2023-09-01 15:50:02 UTC
+Date/Publication: 2023-09-24 17:40:02 UTC
diff --git a/MD5 b/MD5
@@ -1,6 +1,6 @@
-b947eb5cdb99f4e362d6b6b5a1ca8b4e *DESCRIPTION
+a78c33f88f25528851586f911bf045c8 *DESCRIPTION
 a95ab0a827028110692a7dae2aa99101 *NAMESPACE
-0e6122e6aa53c9d8e83c9c47e1bbc3ae *NEWS.md
+c0c72f922790054e32b01a5121f05756 *NEWS.md
 44d2cae832bf363be8ac99818104adc8 *R/auto_melt.R
 3438b2c41e9c5a049d9b31e0714995d3 *R/auto_merge.R
 b263764e99818915c3af9f626a0bc694 *R/check_wide_format.R
@@ -21,18 +21,18 @@ ef073b1907f50c76632b62e95c098bf3 *R/list_fields.R
 b7c879f029d3c13a69879f5b16aa3626 *R/map_palettes_and_themes.R
 903deb275bbbe443a65c0f6db06b8904 *R/match_table.R
 2f85ce9471994478ff99642ee385f953 *R/mode.R
-99f98f0605b128410f1bb9139b9d018e *R/parse.by.order.R
+801ce683187752219c523bce5ddbeb8a *R/parse.by.order.R
 5a37546d74ead984da1179870df4876c *R/quick_map.R
 97cb01db7d9786585a3ae48dbcebed68 *R/sysdata.rda
 8aa6f00a0f289c0cb7a690d701708e6f *R/which_min-max-mode.R
-a7bdc2e35aef141bb473fb4719f4fe6f *README.md
+19cf5809388a8ad0a028a39979e101a7 *README.md
 e2f048aeb1ff5b9f5ad7f33c914ad454 *build/vignette.rds
 1e375b313bfda9eb653a05ffd9924cda *data/country_reference_list.rda
 0cf365f67f04b8a449ae14008f43f268 *data/country_reference_list_long.rda
 1f0663373d69793da7b98914a2a9ed16 *data/world.rda
 71b16632b064c42439c8c869a1f639e3 *inst/doc/auto_merge.R
 c5cfe6ac0e8888634d23da4f1dfec0be *inst/doc/auto_merge.Rmd
-1048f4c99ba33ecd0f55bdac05ff0a9f *inst/doc/auto_merge.html
+8264ab2566b2e8a0fd09a01914e34aca *inst/doc/auto_merge.html
 dc91c637da076712507555f7d80a32c3 *inst/doc/data_structure.R
 d876d0ec1d539156ca867838b51583ed *inst/doc/data_structure.Rmd
 6247c039b19eb7f8dd1ae76f35599d38 *inst/doc/data_structure.html
@@ -41,7 +41,7 @@ ee51f9ba307b28bb2acaf315a81a06cb *inst/doc/dealing_with_names.R
 820e1a3ba367d48dad727f95169b0afe *inst/doc/dealing_with_names.html
 7356195d829dfe56994b6b58b3e46d92 *inst/doc/quick_map.R
 19e68c3cc34e35e63a7d46c4ff215d6e *inst/doc/quick_map.Rmd
-e1e8493cee4063f1868b6e726c35f05f *inst/doc/quick_map.html
+a00b91710316338104b728716bfd6ea9 *inst/doc/quick_map.html
 0c1d510e5c29173f65fd62d049283568 *man/Mode.Rd
 a733f14d4c729e69d74ce50312799e02 *man/auto_melt.Rd
 b35bafe1f838b98969a0be6c59e3541e *man/auto_merge.Rd

diff --git a/NEWS.md b/NEWS.md
@@ -1,6 +1,10 @@
+# countries 1.0.4
+* Fixed bug in *auto_merge* that was preventing column names to be passed in *by* order for regular expressions.
+
 # countries 1.0.3
 * Fixed hyperlinks in for resubmission
 * Eliminated references to unexported objects in documentation
+* Package accepted on CRAN!!
 
 # countries 1.0
 * First CRAN submission

diff --git a/R/parse.by.order.R b/R/parse.by.order.R
@@ -43,7 +43,7 @@ parse.by.order <- function(data, by = NULL){
 
         #add identified columns to list preserving original destination name
         new_by[[length(new_by)+1]] <- temp
-        names(new_by)[length(new_by)] <- if (!is.null(names(i))) names(i) else temp[!is.na(temp)][1]
+        names(new_by)[length(new_by)] <- if (!is.null(names(by))) names(by)[length(new_by)] else temp[!is.na(temp)][1]
       }
       by <- new_by
     }

diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ data from different sources, and easily make world maps.
 
 ## Installing and loading the package
 
-The package can soon be installed from CRAN.
+The package can be installed from CRAN.
 
 ``` r
 # Install package from CRAN
@@ -168,14 +168,14 @@ auto_merge(tab1, tab2, tab3, tab4)
 #>    country world_cups HS_chapter volume time Table4_pivoted_values
 #> 1      ITA          4          9   1000   NA                    NA
 #> 2      ITA          4         85   2000   NA                    NA
-#> 3      PAK          0         NA     NA 2010             0.3456468
-#> 4      PAK          0         NA     NA 2011             0.4289851
-#> 5      BRA          5         NA     NA 2010             0.9541858
-#> 6      BRA          5         NA     NA 2011             0.7919756
-#> 7      DEU         NA          9    800 2010             0.7880156
-#> 8      DEU         NA          9    800 2011             0.0687606
-#> 9      DEU         NA         85   5000 2010             0.7880156
-#> 10     DEU         NA         85   5000 2011             0.0687606
+#> 3      PAK          0         NA     NA 2010          0.5190354490
+#> 4      PAK          0         NA     NA 2011          0.5737651435
+#> 5      BRA          5         NA     NA 2010          0.0003948507
+#> 6      BRA          5         NA     NA 2011          0.6425720844
+#> 7      DEU         NA          9    800 2010          0.2276211940
+#> 8      DEU         NA          9    800 2011          0.5273500693
+#> 9      DEU         NA         85   5000 2010          0.2276211940
+#> 10     DEU         NA         85   5000 2011          0.5273500693
 #>             Description
 #> 1  Coffee, tea and mate
 #> 2  Electrical machinery