[refactor] Move the stopifnot checks into tibble definitions

Author: Dominique Quatravaux

confluence.R

@@ -97,6 +97,13 @@ classful_props_tibble <- function(objects_nodeset) {
         select(-row)
 }
 
+content_properties <- {
+    ns <- entities_xml %>% xml_find_all('//object[@class="ContentProperty"]')
+    tibble(property_id = ns %>% confluence_id) %>%
+        mutate(ns %>% props_tibble) %>%
+        mutate(ns %>% classful_props_tibble)
+}
+
 ## Again, stuff like
 ##
 ##      object_pages <- entities %>%
@@ -109,7 +116,8 @@ classful_props_tibble <- function(objects_nodeset) {
 
 page_versions <- {
     ns <- entities_xml %>% xml_find_all('//object[@class="Page"]')
-    tibble(content_id = ns %>% confluence_id) %>%
+    page_versions <-
+        tibble(content_id = ns %>% confluence_id) %>%
         mutate(ns %>% props_tibble) %>%
         mutate(ns %>% classful_props_tibble) %>%
         mutate(ns %>%
@@ -120,35 +128,29 @@ page_versions <- {
                             flatten = FALSE) %>%
                tibble(ids = .) %>% rowwise %>%
                transmute(content_property_ids = xml_text(ids) %>% list))
+    ## page_versions$content_property_ids (as a “multivalued foreign key”)
+    ## ought to contain the same information as
+    ## content_properties[c("content.Page", "property_id")]:
+    stopifnot({
+        relation1 <-
+            page_versions %>%
+            transmute(content_id, property_id = content_property_ids) %>%
+            unnest_longer(property_id)
+        relation2 <-
+            content_properties %>%
+            filter(! is.na(content.Page)) %>%
+            transmute(content_id = content.Page, property_id)
+        by <- join_by(content_id, property_id)
+        anti_join(relation1, relation2, by = by) %>% nrow == 0 &&
+            anti_join(relation2, relation1, by = by) %>% nrow == 0
+    })
+    page_versions
 }
 
-content_properties <- {
-    ns <- entities_xml %>% xml_find_all('//object[@class="ContentProperty"]')
-    tibble(property_id = ns %>% confluence_id) %>%
-        mutate(ns %>% props_tibble) %>%
-        mutate(ns %>% classful_props_tibble)
-}
-
-## page_versions$content_property_ids (as a “multivalued foreign key”)
-## ought to contain the same information as
-## content_properties[c("content.Page", "property_id")]:
-stopifnot({
-    relation1 <-
-        page_versions %>%
-        transmute(content_id, property_id = content_property_ids) %>%
-        unnest_longer(property_id)
-    relation2 <-
-        content_properties %>%
-        filter(! is.na(content.Page)) %>%
-        transmute(content_id = content.Page, property_id)
-    by <- join_by(content_id, property_id)
-    anti_join(relation1, relation2, by = by) %>% nrow == 0 &&
-        anti_join(relation2, relation1, by = by) %>% nrow == 0
-})
-
 bodies <- {
     ns <- entities_xml %>% xml_find_all('//object[@class="BodyContent"]')
-    tibble(body_id = ns %>% confluence_id) %>%
+    bodies <-
+        tibble(body_id = ns %>% confluence_id) %>%
         mutate(ns %>% props_tibble) %>%
         mutate(.keep = "unused",
                type = case_when(
@@ -157,20 +159,20 @@ bodies <- {
                    bodyType == 2 ~ "PageEtc") %>%
                as_factor) %>%
         mutate(ns %>% classful_props_tibble)
+    stopifnot(bodies %>%
+              filter(is.na(type)) %>%
+              nrow == 0)
+    stopifnot(bodies %>%
+              filter(! is.na(content.SpaceDescription)) %>%
+              filter(type != "SpaceDescription") %>%
+              nrow == 0)
+    stopifnot(bodies %>%
+              filter(! is.na(content.CustomContentEntityObject)) %>%
+              filter(type != "CustomContentEntityObject") %>%
+              nrow == 0)
+    bodies
 }
 
-stopifnot(bodies %>%
-          filter(is.na(type)) %>%
-          nrow == 0)
-stopifnot(bodies %>%
-          filter(! is.na(content.SpaceDescription)) %>%
-          filter(type != "SpaceDescription") %>%
-          nrow == 0)
-stopifnot(bodies %>%
-          filter(! is.na(content.CustomContentEntityObject)) %>%
-          filter(type != "CustomContentEntityObject") %>%
-          nrow == 0)
-
 user2content <- {
     ns <- entities_xml %>%
         xml_find_all('//object[@class="User2ContentRelationEntity"]')