version 1.2.2

cran · Aug 9, 2019 · 44a5f64 · 44a5f64
1 parent 9827118
commit 44a5f64
Show file tree

Hide file tree

Showing 11 changed files with 94 additions and 30 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: xml2
 Title: Parse XML
-Version: 1.2.1
+Version: 1.2.2
 Authors@R: 
     c(person(given = "Hadley",
              family = "Wickham",
@@ -39,12 +39,12 @@ Collate: 'RcppExports.R' 'S4.R' 'as_list.R' 'xml_parse.R'
         'xml_serialize.R' 'xml_structure.R' 'xml_text.R' 'xml_type.R'
         'xml_url.R' 'xml_write.R' 'zzz.R'
 NeedsCompilation: yes
-Packaged: 2019-07-25 19:58:37 UTC; jhester
+Packaged: 2019-08-06 20:54:39 UTC; jhester
 Author: Hadley Wickham [aut],
   Jim Hester [aut, cre],
   Jeroen Ooms [aut],
   RStudio [cph],
   R Foundation [ctb] (Copy of R-project homepage cached as example)
 Maintainer: Jim Hester <jim.hester@rstudio.com>
 Repository: CRAN
-Date/Publication: 2019-07-29 07:50:02 UTC
+Date/Publication: 2019-08-09 12:10:03 UTC
diff --git a/MD5 b/MD5
@@ -1,14 +1,14 @@
-5660535aefc31dba078fc1213712dcc2 *DESCRIPTION
-15fcb4b8315d8a236ab1535e0d316e15 *NAMESPACE
-76d0fe2fe88ca0c8fec0b928f4358661 *NEWS.md
+8245fb0e48b4761749856ccec1828e62 *DESCRIPTION
+1f8840b8c0576ae87c8df8d7d77e6b9f *NAMESPACE
+fe8f5af34aeb3fa3e70fbf2469920d97 *NEWS.md
 d9cc1d1b37928a8d9a15c882ed11c682 *R/RcppExports.R
-b142feddb0cdfc2d6af1a7e1b04a4c59 *R/S4.R
+e666e6c65a95b36309a45087dbc3c200 *R/S4.R
 4c50d1baef6a82688f67ff03b92d35ef *R/as_list.R
 2e24c60fdf22a2aebfcaab2c91b03452 *R/as_xml_document.R
 a776be244741da4a9e1a697d72fc1732 *R/classes.R
 ce292911c606e32895fd04d184f5fb6f *R/init.R
 1543aa35645349a951aad3364b1949be *R/paths.R
-c27c1182d973084c67d777a5dd4155ba *R/utils.R
+bc52d43c1fa60beaf4c26fb0907f3c5b *R/utils.R
 56ed206c8c138a22ed2569d73b8e9087 *R/xml_attr.R
 edbb165a54ac0d2710a48b446edaef15 *R/xml_children.R
 8e353d52acf3262400ea120e4d979a5a *R/xml_find.R
@@ -27,13 +27,13 @@ c0a6b1f6311631c030088f6271f7f14c *R/xml_write.R
 ba02edba719f666ae5dffeb962b215df *R/zzz.R
 23ea92da92e9ea1376806e70a1388cd4 *README.md
 5dac877b88e6d8d2994c64c73bfd55d7 *build/vignette.rds
-736e92c682c0c9282c23946b93a034dd *build/xml2.pdf
+74c25d09046fa0367b957e3189962ee6 *build/xml2.pdf
 6071edd604dbeb75308cfbedc7790398 *cleanup
 2d20ac228fd2d837e3a277b2187a6f7b *configure
 d41d8cd98f00b204e9800998ecf8427e *configure.win
 da73bf2f37f0f1c5978c47cfb440058f *inst/doc/modification.R
 18393b694a49a411f919c0f457749b0f *inst/doc/modification.Rmd
-24a38e9598c7dd4317394183182db4eb *inst/doc/modification.html
+83c397de1a92475ca6b52c48dff77e1c *inst/doc/modification.html
 f8254da868eddec64a4768db0a43ae14 *inst/extdata/cd_catalog.xml
 aa42c312677d8bd431c9f6055bacc5a2 *inst/extdata/order-doc.xml
 d815540b17662ddb93faa91d78ba0e5f *inst/extdata/order-schema.xml
@@ -42,6 +42,7 @@ d815540b17662ddb93faa91d78ba0e5f *inst/extdata/order-schema.xml
 890574119d12217213ddc7f078ec66b4 *man/as_list.Rd
 e5c2a742f2de7359c54ff9039d2e119e *man/as_xml_document.Rd
 0c0b7b79e8269f7269c2b4d0f1193395 *man/download_xml.Rd
+1d048db5b4a20d0dc6971e05433c4898 *man/oldclass.Rd
 9101f6940e43276981fdced534fd71a9 *man/read_xml.Rd
 24b2935e381103674077d1d9a6ad4e27 *man/url_absolute.Rd
 6223f4d852c642df2b09fc513f30b27e *man/url_escape.Rd
@@ -69,14 +70,14 @@ a9f5428f85b307c4c9fc57a0c2335e81 *man/xml_set_namespace.Rd
 376d10c9316a4b239468b2bff8c9b0c2 *man/xml_url.Rd
 f2db32908ff0cdc1fa672f77eb5c5e7b *man/xml_validate.Rd
 ea947a311b45dd48a131a29570d43265 *src/Makevars.in
-13c933906555977cc665d4299c13112d *src/Makevars.win
+017a968e14d691d667ca3a06693a5d78 *src/Makevars.win
 f7d4ed18db10396557ae8476f18f88aa *src/RcppExports.cpp
 be2c92c3d2a0fb1ded1b2bc32a737fa4 *src/connection.cpp
 80a5ecbb8ae22f699c8d4a9a96833ee5 *src/connection.h
 c4991b82cf0379ffe0feb524b934195d *src/xml2_doc.cpp
 179f97f3a19cb6865922f6219b2b58f0 *src/xml2_init.cpp
 dc83763be48f7b5bbba4c71a99056f79 *src/xml2_namespace.cpp
-feb6aa32c23a3da8121b57c04941babf *src/xml2_node.cpp
+23b88a4bd60aa14941220421f1f62f14 *src/xml2_node.cpp
 b152c611a6f0e9b0b6079b3c19e3a782 *src/xml2_output.cpp
 f842d5236e178aa9ca5928386ce24fee *src/xml2_schema.cpp
 1c198cf53390d534d28d3f1d3507dec2 *src/xml2_url.cpp

diff --git a/NAMESPACE b/NAMESPACE
@@ -207,6 +207,10 @@ export(xml_type)
 export(xml_unserialize)
 export(xml_url)
 export(xml_validate)
+exportClasses(xml_document)
+exportClasses(xml_missing)
+exportClasses(xml_node)
+exportClasses(xml_nodeset)
 importFrom(Rcpp,sourceCpp)
 importFrom(methods,setOldClass)
 useDynLib(xml2, .registration = TRUE)
diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,8 @@
+# xml2 1.2.2
+
+* Export S4 classes with documentation, so they can be used in other packages
+without Warnings (@nuest, #267)
+
 # xml2 1.2.1
 
 ## New Features

diff --git a/R/S4.R b/R/S4.R
@@ -1,5 +1,43 @@
+#' Register S4 classes
+#'
+#' @description
+#' Classes are exported so they can be re-used within S4 classes, see [methods::setOldClass()].
+#'
+#' `xml_document`: a complete document.
+#'
+#' @name xml_document-class
+#' @family xml_document
 #' @importFrom methods setOldClass
+#' @exportClass xml_document
+#' @rdname oldclass
 setOldClass("xml_document")
+
+#' xml_missing class
+#'
+#' `xml_missing`: a missing object, e.g. for an empty result set.
+#'
+#' @name xml_missing-class
+#' @family xml_missing
+#' @exportClass xml_missing
+#' @rdname oldclass
 setOldClass("xml_missing")
+
+#' xml_node Class
+#'
+#' `xml_node`: a single node in a document.
+#'
+#' @name xml_node-class
+#' @family xml_node
+#' @exportClass xml_node
+#' @rdname oldclass
 setOldClass("xml_node")
+
+#' xml_nodeset Class
+#'
+#' `xml_nodeset`: a _set_ of nodes within a document.
+#'
+#' @name xml_nodeset-class
+#' @family xml_nodeset
+#' @exportClass xml_nodeset
+#' @rdname oldclass
 setOldClass("xml_nodeset")
diff --git a/R/utils.R b/R/utils.R
@@ -33,11 +33,11 @@ need_package <- function(pkg) {
 }
 
 # Format the C bitwise flags for display in Rd. The input object is a named
-# integer vector with a 'description' character vector attribute that
+# integer vector with a 'descriptions' character vector attribute that
 # corresponds to each flag.
 describe_options <- function(x) {
   paste0("\\describe{\n",
-    paste0("  \\item{", names(x), "}{", attr(x, "description"), "}", collapse = "\n"),
+    paste0("  \\item{", names(x), "}{", attr(x, "descriptions"), "}", collapse = "\n"),
   "\n}")
 }
 

diff --git a/build/xml2.pdf b/build/xml2.pdf
diff --git a/inst/doc/modification.html b/inst/doc/modification.html
@@ -13,7 +13,7 @@
 
 <meta name="author" content="Jim Hester" />
 
-<meta name="date" content="2019-07-25" />
+<meta name="date" content="2019-08-06" />
 
 <title>Node Modification</title>
 
@@ -306,7 +306,7 @@
 
 <h1 class="title toc-ignore">Node Modification</h1>
 <h4 class="author">Jim Hester</h4>
-<h4 class="date">2019-07-25</h4>
+<h4 class="date">2019-08-06</h4>
 
 
 
@@ -467,8 +467,8 @@ <h2>Removing nodes</h2>
 <a class="sourceLine" id="cb7-6" data-line-number="6"><span class="kw">rm</span>(x1)</a>
 <a class="sourceLine" id="cb7-7" data-line-number="7"><span class="kw">gc</span>()</a>
 <a class="sourceLine" id="cb7-8" data-line-number="8"><span class="co">#&gt;           used (Mb) gc trigger (Mb) limit (Mb) max used (Mb)</span></a>
-<a class="sourceLine" id="cb7-9" data-line-number="9"><span class="co">#&gt; Ncells  545850 29.2    1205781 64.4         NA  1191010 63.7</span></a>
-<a class="sourceLine" id="cb7-10" data-line-number="10"><span class="co">#&gt; Vcells 1066820  8.2    8388608 64.0      16384  1975445 15.1</span></a>
+<a class="sourceLine" id="cb7-9" data-line-number="9"><span class="co">#&gt; Ncells  551857 29.5    1220558 65.2         NA  1220558 65.2</span></a>
+<a class="sourceLine" id="cb7-10" data-line-number="10"><span class="co">#&gt; Vcells 1078090  8.3    8388608 64.0      16384  2035308 15.6</span></a>
 <a class="sourceLine" id="cb7-11" data-line-number="11"></a>
 <a class="sourceLine" id="cb7-12" data-line-number="12">x2</a>
 <a class="sourceLine" id="cb7-13" data-line-number="13"><span class="co">#&gt; {xml_node}</span></a>
@@ -482,8 +482,8 @@ <h2>Removing nodes</h2>
 <a class="sourceLine" id="cb8-5" data-line-number="5"><span class="kw">rm</span>(bees)</a>
 <a class="sourceLine" id="cb8-6" data-line-number="6"><span class="kw">gc</span>()</a>
 <a class="sourceLine" id="cb8-7" data-line-number="7"><span class="co">#&gt;           used (Mb) gc trigger (Mb) limit (Mb) max used (Mb)</span></a>
-<a class="sourceLine" id="cb8-8" data-line-number="8"><span class="co">#&gt; Ncells  545777 29.2    1205781 64.4         NA  1191010 63.7</span></a>
-<a class="sourceLine" id="cb8-9" data-line-number="9"><span class="co">#&gt; Vcells 1066671  8.2    8388608 64.0      16384  1975445 15.1</span></a></code></pre></div>
+<a class="sourceLine" id="cb8-8" data-line-number="8"><span class="co">#&gt; Ncells  552135 29.5    1220558 65.2         NA  1220558 65.2</span></a>
+<a class="sourceLine" id="cb8-9" data-line-number="9"><span class="co">#&gt; Vcells 1078526  8.3    8388608 64.0      16384  2035308 15.6</span></a></code></pre></div>
 </div>
 <div id="namespaces" class="section level2">
 <h2>Namespaces</h2>

diff --git a/man/oldclass.Rd b/man/oldclass.Rd
diff --git a/src/Makevars.win b/src/Makevars.win
@@ -11,6 +11,6 @@ clean:
 	rm -f $(OBJECTS) $(SHLIB)
 
 winlibs:
-	"${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" --vanilla "../tools/winlibs.R" $(VERSION)
+	"${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" "../tools/winlibs.R" $(VERSION)
 
 .PHONY: all winlibs clean
diff --git a/src/xml2_node.cpp b/src/xml2_node.cpp
@@ -295,15 +295,8 @@ void node_set_attr(XPtrNode node_, std::string name, SEXP value, CharacterVector
   }
   if (hasPrefix("xmlns:", name)) {
     std::string prefix = name.substr(6);
-    xmlNsPtr ns = xmlSearchNs(node_->doc, node, asXmlChar(prefix));
-
-    if (ns == NULL) {
-      xmlAddNamespace(node, xmlNewNs(node, asXmlChar(value), asXmlChar(prefix)));
-    } else {
-      ns->href = xmlStrdup(asXmlChar(value));
-      xmlSetNs(node, ns);
-    }
-
+    removeNs(node, asXmlChar(prefix));
+    xmlAddNamespace(node, xmlNewNs(node, asXmlChar(value), asXmlChar(prefix)));
     return;
   }