Updates in senadores, actions and fixing typos

rOpenSpain · Apr 13, 2024 · 679e2f1 · 679e2f1
2 parents 6299954 + 038791e
commit 679e2f1
Show file tree

Hide file tree

Showing 16 changed files with 77 additions and 141 deletions.
diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
@@ -29,7 +29,7 @@ jobs:
       R_KEEP_PKG_SOURCE: yes
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: r-lib/actions/setup-pandoc@v2
 
@@ -47,3 +47,4 @@ jobs:
       - uses: r-lib/actions/check-r-package@v2
         with:
           upload-snapshots: true
+          build_args: 'c("--no-manual","--compact-vignettes=gs+qpdf")'
diff --git a/.github/workflows/roscron-check-standard.yaml b/.github/workflows/roscron-check-standard.yaml
diff --git a/.github/workflows/rostemplate-gh-pages.yaml b/.github/workflows/rostemplate-gh-pages.yaml
@@ -1,19 +1,21 @@
 # Workflow derived from https://github.com/r-lib/actions/tree/master/examples
 # Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
 on:
+  workflow_dispatch:
   push:
     branches: [main, master]
     tags: ['*']
 
 name: rostemplate-gh-pages
+permissions: write-all
 
 jobs:
   rostemplate-gh-pages:
     runs-on: ubuntu-latest
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - uses: r-lib/actions/setup-pandoc@v2
 
@@ -31,6 +33,6 @@ jobs:
 
       - name: Deploy package
         run: |
-          git config --local user.name "$GITHUB_ACTOR"
-          git config --local user.email "$GITHUB_ACTOR@users.noreply.github.com"
-          Rscript -e 'pkgdown::deploy_to_branch(new_process = FALSE, run_dont_run = TRUE)'
+          git config --local user.name "github-actions[bot]"
+          git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          Rscript -e 'pkgdown::deploy_to_branch(new_process = FALSE, clean = TRUE, run_dont_run = TRUE)'
diff --git a/.github/workflows/test-coverage.yaml b/.github/workflows/test-coverage.yaml
@@ -15,7 +15,7 @@ jobs:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: r-lib/actions/setup-r@v2
         with:
@@ -31,20 +31,20 @@ jobs:
           covr::codecov(
             quiet = FALSE,
             clean = FALSE,
-            install_path = file.path(Sys.getenv("RUNNER_TEMP"), "package")
+            install_path = file.path(normalizePath(Sys.getenv("RUNNER_TEMP"), winslash = "/"), "package")
           )
         shell: Rscript {0}
 
       - name: Show testthat output
         if: always()
         run: |
           ## --------------------------------------------------------------------
-          find ${{ runner.temp }}/package -name 'testthat.Rout*' -exec cat '{}' \; || true
+          find '${{ runner.temp }}/package' -name 'testthat.Rout*' -exec cat '{}' \; || true
         shell: bash
 
       - name: Upload test results
         if: failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: coverage-test-failures
           path: ${{ runner.temp }}/package
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -31,6 +31,5 @@ VignetteBuilder:
     knitr
 Encoding: UTF-8
 Language: en-US
-LazyData: true
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.2.3
+RoxygenNote: 7.3.1
diff --git a/R/comisiones_ponencias.R b/R/comisiones_ponencias.R
@@ -1,7 +1,7 @@
 #' *Comisiones*
 #'
 #' Look up the *comisiones* and *ponencias* of a legislature.
-#' Rellevant to know the code of the work groups.
+#' Relevant to know the code of the work groups.
 #' @inheritParams plenarias
 #' @return A `data.frame` with the *comisiones* and *ponencias* of that legislature.
 #' @export

diff --git a/R/composicion.R b/R/composicion.R
@@ -33,26 +33,40 @@ grupos <- function(legislatura){
 #'
 #' Past and current appointed members.
 #' @return A `data.frame` with the information available.
+#' @inheritParams plenarias
 #' @importFrom xml2 read_xml
 #' @importFrom xml2 xml_text
 #' @importFrom xml2 xml_find_all
 #' @export
 #' @examples
 #' if (interactive()) {
-#'     head(senadores())
+#'     head(senadores(12))
 #' }
-senadores <- function() {
-    x <- read_xml(compose_url(tipoFich = 10))
-    s <- data.frame(nombre = xml_text(xml_find_all(x, "//senador/nombre")),
-                    apellidos = xml_text(xml_find_all(x, "//senador/apellidos")),
-                    legislatura = as.numeric(xml_text(xml_find_all(x, "//senador/legislatura"))),
-                    ultCredencial = xml_text(xml_find_all(x, "//senador/ultCredencial")),
-                    procedTipo = xml_text(xml_find_all(x, "//senador/procedTipo")),
-                    procedLiteral = xml_text(xml_find_all(x, "//senador/procedLiteral")),
-                    procedLugar = xml_text(xml_find_all(x, "//senador/procedLugar")),
-                    grupoCod = xml_text(xml_find_all(x, "//senador/grupoCod")),
-                    grupoSiglas = xml_text(xml_find_all(x, "//senador/grupoSiglas")),
-                    grupoNombre = xml_text(xml_find_all(x, "//senador/grupoNombre")))
+senadores <- function(legislatura = 12:14) {
+    stopifnot(!is.numeric(legislatura) || all(legislatura >= 0) || !is.null(legislatura))
+    senad_list <- lapply(legislatura, senadores_legis)
+    senad_df <- do.call(rbind, senad_list)
+    # The API return the same data twice
+    # Even there is a person LÓPEZ CONDÉS Legis = 3, ultCredencial 284 that is
+    # returned with accent and without it.
+    unique(senad_df)
+}
+
+# Converted from senadores, iterator
+senadores_legis <- function(legislatura) {
+    x <- read_xml(compose_url(tipoFich = 10, legis = legislatura))
+    s <- data.frame(
+        nombre = xml_text(xml_find_all(x, "//senador/nombre")),
+        apellidos = xml_text(xml_find_all(x, "//senador/apellidos")),
+        legislatura = as.numeric(xml_text(xml_find_all(x, "//senador/legislatura"))),
+        ultCredencial = xml_text(xml_find_all(x, "//senador/ultCredencial")),
+        procedTipo = xml_text(xml_find_all(x, "//senador/procedTipo")),
+        procedLiteral = xml_text(xml_find_all(x, "//senador/procedLiteral")),
+        procedLugar = xml_text(xml_find_all(x, "//senador/procedLugar")),
+        grupoCod = xml_text(xml_find_all(x, "//senador/grupoCod")),
+        grupoSiglas = xml_text(xml_find_all(x, "//senador/grupoSiglas")),
+        grupoNombre = xml_text(xml_find_all(x, "//senador/grupoNombre"))
+    )
     s$procedLugar <- gsub(pattern = ".+: ", "", s$procedLugar)
     s$grupoCod <- gsub(pattern = ".+: ", "", s$grupoCod)
     s$sex <- NA

diff --git a/R/diario.R b/R/diario.R
@@ -1,7 +1,7 @@
 #' Retrieve the document of _sumario_
 #'
 #' Returns the summary of a session in a tidy way.
-#' If multiple autors are involved in a disposicion and multiple documents they
+#' If multiple authors are involved in a disposition and multiple documents they
 #' get mixed.
 #' @param cve The character of the CVE of the document.
 #' @return A data.frame with a summary of the session, date, documents, authors.

diff --git a/R/votos.R b/R/votos.R
@@ -7,8 +7,10 @@
 #' @returns A votos class with information about who voted what.
 #' @export
 #' @examples
+#' \donttest{
 #' votos_64 <- votos(14, 64)
 #' votos_3_8 <- votos(14, 3, 8)
+#' }
 votos <- function(legislatura, sesion, votacion = NULL) {
     # if (!endsWith(x, ".xml")) {
     #     url <- paste0(force(BASE_URL), x)

diff --git a/README.md b/README.md
@@ -50,27 +50,27 @@ This function return the members of the Senate:
 ``` r
 ts <- senadores()
 head(ts)
-#>         nombre       apellidos legislatura ultCredencial procedTipo
-#> 1     FERNANDO    ABAD BÉCQUER           5           260          D
-#> 2      ENRIQUE  ABAD BENEDICTO          10           034          E
-#> 3     ELISABET     ABAD GIRALT          12           051          D
-#> 4 JOSÉ ANTONIO ABAD LÓPEZ-BREA           3           039          E
-#> 5     PATRICIA ABASCAL JIMÉNEZ          14           199          E
-#> 6       ADOLFO   ABEJÓN ORTEGA           9           081          E
-#>   procedLiteral            procedLugar               grupoCod grupoSiglas
-#> 1     Designado     Asamblea de Madrid     Asamblea de Madrid         800
-#> 2        Electo                Sevilla                Sevilla         800
-#> 3     Designada Parlamento de Cataluña Parlamento de Cataluña         807
-#> 4        Electo                 Zamora                 Zamora          CP
-#> 5        Electa     Eivissa-Formentera     Eivissa-Formentera         800
-#> 6        Electo             Valladolid             Valladolid         801
-#>   grupoNombre    sex
-#> 1         GPS   male
-#> 2         GPS   male
-#> 3         GPN female
-#> 4        GPCP   male
-#> 5         GPS female
-#> 6         GPP   male
+#>         nombre        apellidos legislatura ultCredencial procedTipo
+#> 1     FERNANDO     ABAD BÉCQUER           5           260          D
+#> 2      ENRIQUE   ABAD BENEDICTO          10           034          E
+#> 3     ELISABET      ABAD GIRALT          12           051          D
+#> 4 JOSÉ ANTONIO  ABAD LÓPEZ-BREA           3           039          E
+#> 5       ADOLFO    ABEJÓN ORTEGA           9           081          E
+#> 6    FRANCISCO ABELLÁN MARTÍNEZ           9           242          D
+#>   procedLiteral                 procedLugar                    grupoCod
+#> 1     Designado          Asamblea de Madrid          Asamblea de Madrid
+#> 2        Electo                     Sevilla                     Sevilla
+#> 3     Designada      Parlamento de Cataluña      Parlamento de Cataluña
+#> 4        Electo                      Zamora                      Zamora
+#> 5        Electo                  Valladolid                  Valladolid
+#> 6     Designado Asamblea Regional de Murcia Asamblea Regional de Murcia
+#>   grupoSiglas grupoNombre    sex
+#> 1         800         GPS   male
+#> 2         800         GPS   male
+#> 3         807         GPN female
+#> 4          CP        GPCP   male
+#> 5         801         GPP   male
+#> 6         800         GPS   male
 ```
 
 We can see the increase of females on the Senate along the legislatures:

diff --git a/man/comisiones.Rd b/man/comisiones.Rd
diff --git a/man/figures/README-senadoras-1.png b/man/figures/README-senadoras-1.png
diff --git a/man/senadores.Rd b/man/senadores.Rd
diff --git a/man/sumario.Rd b/man/sumario.Rd
diff --git a/man/votos.Rd b/man/votos.Rd
diff --git a/vignettes/senadoRES.Rmd b/vignettes/senadoRES.Rmd
@@ -45,8 +45,7 @@ ts %>%
     scale_y_continuous(breaks = seq(from = 0, to = 0.7, by = .1),
                        expand = expansion(add = c(0, 0.01)), limits = c(0, NA)) +
     theme_minimal() +
-    labs(title = "Ratio of women", x  = "Legislatura", y = "Ratio of women") +
-    guides(col = FALSE, shape = FALSE)
+    labs(title = "Ratio of women", x  = "Legislatura", y = "Ratio of women")
 ```
 
 
@@ -107,7 +106,7 @@ sessions <- do.call(rbind, s)
 ggplot(sessions) +
     stat_sum(aes(sesionLegislatura, sesionHoraInicio, 
                  fill = after_stat(n), size = 1), geom = "tile") +
-    guides(size = FALSE) +
+    guides(size = "none") +
     theme_minimal() +
     labs(title = "Hour of sessions", x = "Legislature", y = "Starting hour",
          fill = "Sessions") +
@@ -119,7 +118,7 @@ So most of the times they meet at the afternoon.
 If you want more detailed information of each session you can use the fichUrlDetalleSesion details:
 
 ```{r detalles}
-details <- detalles(paste0("https://www.senado.es", sessions$fichUrlDetalleSesion[1]))
+details <- detalles(paste0("https://www.senado.es", sessions$fichUrlDetalleSesion[3]))
 details[1:5, c("asunto_id", "asunto_hora_inicio", "asunto_hora_fin", "punto_literal", "intervencion_orador_desc", "intervencion_orador_idWeb")]
 ```