From 9059af5e8c7928b37831ce31d82629faef4cc527 Mon Sep 17 00:00:00 2001 From: Tony Fujs Date: Tue, 19 Jul 2022 16:43:48 +0200 Subject: [PATCH 1/4] Increment version number to 0.0.1.9000 --- DESCRIPTION | 3 +-- NEWS.md | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 6357419..c335b53 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: pipr Title: Client for the PIP API -Version: 0.0.1 +Version: 0.0.1.9000 Authors@R: c(person(given = "Tony", family = "Fujs", @@ -56,4 +56,3 @@ Depends: VignetteBuilder: knitr Config/testthat/edition: 3 Date: 2022-04-08 - diff --git a/NEWS.md b/NEWS.md index 5392d36..f19308c 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,5 @@ +# pipr (development version) + # pipr 0.0.1 * [CRAN release](https://github.com/worldbank/pipr/issues/18) From 64c7f45646929a13fcf0e322f43a926e5e835ddf Mon Sep 17 00:00:00 2001 From: Tony Fujs Date: Tue, 19 Jul 2022 16:49:28 +0200 Subject: [PATCH 2/4] fix popshare not being passed to get_stats() --- NEWS.md | 3 +++ R/get_stats.R | 11 ++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/NEWS.md b/NEWS.md index f19308c..bbbdf82 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,8 @@ # pipr (development version) +## Bug fixes +* Fix `popshare` argument not being passed to `get_stats()` + # pipr 0.0.1 * [CRAN release](https://github.com/worldbank/pipr/issues/18) diff --git a/R/get_stats.R b/R/get_stats.R index 965bf87..5fd5833 100644 --- a/R/get_stats.R +++ b/R/get_stats.R @@ -93,11 +93,16 @@ get_stats <- function(country = "all", # Build query string args <- build_args( - country = country, year = year, povline = povline, - fill_gaps = fill_gaps, group_by = group_by, + country = country, + year = year, + povline = povline, + popshare = popshare, + fill_gaps = fill_gaps, + group_by = group_by, welfare_type = welfare_type, reporting_level = reporting_level, - version = version, format = format + version = version, + format = format ) u <- build_url(server, endpoint, api_version) From 6fad69bbad85f1ace07384e2c356e05aeb7230a4 Mon Sep 17 00:00:00 2001 From: Ronak Shah Date: Wed, 20 Jul 2022 09:43:40 +0800 Subject: [PATCH 3/4] test case for popshare argument --- tests/testthat/test-get_stats.R | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/testthat/test-get_stats.R b/tests/testthat/test-get_stats.R index 627db7a..86e9bef 100644 --- a/tests/testthat/test-get_stats.R +++ b/tests/testthat/test-get_stats.R @@ -42,6 +42,9 @@ test_that("get_stats() works w/ fill_gaps = TRUE", { test_that("get_stats() works w/ popshare option", { df <- get_stats("AGO", year = "all", popshare = .5) expect_gte(nrow(df), 3) + #Ensure there are different values for headcount generated + #to confirm popshare is being passed to get_stats() function. + expect_gte(length(unique(df$headcount)), 1) }) test_that("get_stats() works w/ subgroup = 'wb_regions'", { From 126f735bd36b155c3b13cff00393fbd596ab756e Mon Sep 17 00:00:00 2001 From: Tony Fujs Date: Wed, 20 Jul 2022 10:53:20 +0200 Subject: [PATCH 4/4] Increment version number to 0.0.2 --- DESCRIPTION | 2 +- NEWS.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index c335b53..107c13e 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: pipr Title: Client for the PIP API -Version: 0.0.1.9000 +Version: 0.0.2 Authors@R: c(person(given = "Tony", family = "Fujs", diff --git a/NEWS.md b/NEWS.md index bbbdf82..aaf25ec 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# pipr (development version) +# pipr 0.0.2 ## Bug fixes * Fix `popshare` argument not being passed to `get_stats()`