Start exploring a quick-xml based implementation of xml2json
This has one passing test, and I'm thinking that quick-xml is too primitive to do what I want to do.
This commit is contained in:
parent
365c0c1e90
commit
f90fef495e
|
@ -1,2 +1,3 @@
|
|||
/target
|
||||
Cargo.lock
|
||||
*.sw*
|
||||
|
|
|
@ -4,6 +4,11 @@ version = "0.1.0"
|
|||
authors = ["R. Tyler Croy <rtyler@brokenco.de>"]
|
||||
edition = "2018"
|
||||
|
||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||
|
||||
[dependencies]
|
||||
log = "~0.4.8"
|
||||
serde = { version = "~1.0.116", features = ["rc"] }
|
||||
serde_json = "~1.0.0"
|
||||
quick-xml = { version = "~0.19.0", features = ["serde"] }
|
||||
|
||||
[dev-dependencies]
|
||||
pretty_env_logger = "~0.3.1"
|
||||
|
|
|
@ -0,0 +1,165 @@
|
|||
GNU LESSER GENERAL PUBLIC LICENSE
|
||||
Version 3, 29 June 2007
|
||||
|
||||
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
|
||||
This version of the GNU Lesser General Public License incorporates
|
||||
the terms and conditions of version 3 of the GNU General Public
|
||||
License, supplemented by the additional permissions listed below.
|
||||
|
||||
0. Additional Definitions.
|
||||
|
||||
As used herein, "this License" refers to version 3 of the GNU Lesser
|
||||
General Public License, and the "GNU GPL" refers to version 3 of the GNU
|
||||
General Public License.
|
||||
|
||||
"The Library" refers to a covered work governed by this License,
|
||||
other than an Application or a Combined Work as defined below.
|
||||
|
||||
An "Application" is any work that makes use of an interface provided
|
||||
by the Library, but which is not otherwise based on the Library.
|
||||
Defining a subclass of a class defined by the Library is deemed a mode
|
||||
of using an interface provided by the Library.
|
||||
|
||||
A "Combined Work" is a work produced by combining or linking an
|
||||
Application with the Library. The particular version of the Library
|
||||
with which the Combined Work was made is also called the "Linked
|
||||
Version".
|
||||
|
||||
The "Minimal Corresponding Source" for a Combined Work means the
|
||||
Corresponding Source for the Combined Work, excluding any source code
|
||||
for portions of the Combined Work that, considered in isolation, are
|
||||
based on the Application, and not on the Linked Version.
|
||||
|
||||
The "Corresponding Application Code" for a Combined Work means the
|
||||
object code and/or source code for the Application, including any data
|
||||
and utility programs needed for reproducing the Combined Work from the
|
||||
Application, but excluding the System Libraries of the Combined Work.
|
||||
|
||||
1. Exception to Section 3 of the GNU GPL.
|
||||
|
||||
You may convey a covered work under sections 3 and 4 of this License
|
||||
without being bound by section 3 of the GNU GPL.
|
||||
|
||||
2. Conveying Modified Versions.
|
||||
|
||||
If you modify a copy of the Library, and, in your modifications, a
|
||||
facility refers to a function or data to be supplied by an Application
|
||||
that uses the facility (other than as an argument passed when the
|
||||
facility is invoked), then you may convey a copy of the modified
|
||||
version:
|
||||
|
||||
a) under this License, provided that you make a good faith effort to
|
||||
ensure that, in the event an Application does not supply the
|
||||
function or data, the facility still operates, and performs
|
||||
whatever part of its purpose remains meaningful, or
|
||||
|
||||
b) under the GNU GPL, with none of the additional permissions of
|
||||
this License applicable to that copy.
|
||||
|
||||
3. Object Code Incorporating Material from Library Header Files.
|
||||
|
||||
The object code form of an Application may incorporate material from
|
||||
a header file that is part of the Library. You may convey such object
|
||||
code under terms of your choice, provided that, if the incorporated
|
||||
material is not limited to numerical parameters, data structure
|
||||
layouts and accessors, or small macros, inline functions and templates
|
||||
(ten or fewer lines in length), you do both of the following:
|
||||
|
||||
a) Give prominent notice with each copy of the object code that the
|
||||
Library is used in it and that the Library and its use are
|
||||
covered by this License.
|
||||
|
||||
b) Accompany the object code with a copy of the GNU GPL and this license
|
||||
document.
|
||||
|
||||
4. Combined Works.
|
||||
|
||||
You may convey a Combined Work under terms of your choice that,
|
||||
taken together, effectively do not restrict modification of the
|
||||
portions of the Library contained in the Combined Work and reverse
|
||||
engineering for debugging such modifications, if you also do each of
|
||||
the following:
|
||||
|
||||
a) Give prominent notice with each copy of the Combined Work that
|
||||
the Library is used in it and that the Library and its use are
|
||||
covered by this License.
|
||||
|
||||
b) Accompany the Combined Work with a copy of the GNU GPL and this license
|
||||
document.
|
||||
|
||||
c) For a Combined Work that displays copyright notices during
|
||||
execution, include the copyright notice for the Library among
|
||||
these notices, as well as a reference directing the user to the
|
||||
copies of the GNU GPL and this license document.
|
||||
|
||||
d) Do one of the following:
|
||||
|
||||
0) Convey the Minimal Corresponding Source under the terms of this
|
||||
License, and the Corresponding Application Code in a form
|
||||
suitable for, and under terms that permit, the user to
|
||||
recombine or relink the Application with a modified version of
|
||||
the Linked Version to produce a modified Combined Work, in the
|
||||
manner specified by section 6 of the GNU GPL for conveying
|
||||
Corresponding Source.
|
||||
|
||||
1) Use a suitable shared library mechanism for linking with the
|
||||
Library. A suitable mechanism is one that (a) uses at run time
|
||||
a copy of the Library already present on the user's computer
|
||||
system, and (b) will operate properly with a modified version
|
||||
of the Library that is interface-compatible with the Linked
|
||||
Version.
|
||||
|
||||
e) Provide Installation Information, but only if you would otherwise
|
||||
be required to provide such information under section 6 of the
|
||||
GNU GPL, and only to the extent that such information is
|
||||
necessary to install and execute a modified version of the
|
||||
Combined Work produced by recombining or relinking the
|
||||
Application with a modified version of the Linked Version. (If
|
||||
you use option 4d0, the Installation Information must accompany
|
||||
the Minimal Corresponding Source and Corresponding Application
|
||||
Code. If you use option 4d1, you must provide the Installation
|
||||
Information in the manner specified by section 6 of the GNU GPL
|
||||
for conveying Corresponding Source.)
|
||||
|
||||
5. Combined Libraries.
|
||||
|
||||
You may place library facilities that are a work based on the
|
||||
Library side by side in a single library together with other library
|
||||
facilities that are not Applications and are not covered by this
|
||||
License, and convey such a combined library under terms of your
|
||||
choice, if you do both of the following:
|
||||
|
||||
a) Accompany the combined library with a copy of the same work based
|
||||
on the Library, uncombined with any other library facilities,
|
||||
conveyed under the terms of this License.
|
||||
|
||||
b) Give prominent notice with the combined library that part of it
|
||||
is a work based on the Library, and explaining where to find the
|
||||
accompanying uncombined form of the same work.
|
||||
|
||||
6. Revised Versions of the GNU Lesser General Public License.
|
||||
|
||||
The Free Software Foundation may publish revised and/or new versions
|
||||
of the GNU Lesser General Public License from time to time. Such new
|
||||
versions will be similar in spirit to the present version, but may
|
||||
differ in detail to address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the
|
||||
Library as you received it specifies that a certain numbered version
|
||||
of the GNU Lesser General Public License "or any later version"
|
||||
applies to it, you have the option of following the terms and
|
||||
conditions either of that published version or of any later version
|
||||
published by the Free Software Foundation. If the Library as you
|
||||
received it does not specify a version number of the GNU Lesser
|
||||
General Public License, you may choose any version of the GNU Lesser
|
||||
General Public License ever published by the Free Software Foundation.
|
||||
|
||||
If the Library as you received it specifies that a proxy can decide
|
||||
whether future versions of the GNU Lesser General Public License shall
|
||||
apply, that proxy's public statement of acceptance of any version is
|
||||
permanent authorization for you to choose that version for the
|
||||
Library.
|
156
src/lib.rs
156
src/lib.rs
|
@ -1,7 +1,155 @@
|
|||
/*
|
||||
* This library helps convert an XML String into a serde_json::Value which can be
|
||||
* used to generate JSON
|
||||
*/
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
#[test]
|
||||
fn it_works() {
|
||||
assert_eq!(2 + 2, 4);
|
||||
#[macro_use]
|
||||
extern crate serde_json;
|
||||
|
||||
use log::*;
|
||||
use quick_xml::Reader;
|
||||
use quick_xml::events::Event;
|
||||
use serde_json::{Map, Value};
|
||||
|
||||
#[derive(Debug)]
|
||||
pub struct Error {
|
||||
}
|
||||
|
||||
|
||||
fn read<'a>(mut reader: &mut Reader<&'a [u8]>) -> Value {
|
||||
let mut buf = Vec::new();
|
||||
let mut values = Vec::new();
|
||||
let mut node = Map::new();
|
||||
|
||||
loop {
|
||||
match reader.read_event(&mut buf) {
|
||||
Ok(Event::Start(ref e)) => {
|
||||
let mut attrs = Map::new();
|
||||
|
||||
if let Ok(name) = String::from_utf8(e.name().to_vec()) {
|
||||
let child = read(&mut reader);
|
||||
let mut has_attrs = false;
|
||||
|
||||
e.attributes().map(|a| {
|
||||
if let Ok(attr) = a {
|
||||
let key = String::from_utf8(attr.key.to_vec());
|
||||
let value = String::from_utf8(attr.value.to_vec());
|
||||
|
||||
// Only bother adding the attribute if both key and value are valid utf8
|
||||
if key.is_ok() && value.is_ok() {
|
||||
has_attrs = true;
|
||||
attrs.insert(format!("@{}", key.unwrap()), Value::String(value.unwrap()));
|
||||
}
|
||||
}
|
||||
}).collect::<Vec<_>>();
|
||||
|
||||
/*
|
||||
* nodes with attributes need to be handled special
|
||||
*/
|
||||
if attrs.len() > 0 {
|
||||
if child.is_string() {
|
||||
attrs.insert("#text".to_string(), child);
|
||||
}
|
||||
if let Ok(attrs) = serde_json::to_value(attrs) {
|
||||
node.insert(name, attrs);
|
||||
}
|
||||
}
|
||||
else {
|
||||
node.insert(name, child);
|
||||
}
|
||||
}
|
||||
|
||||
if let Ok(node_value) = serde_json::to_value(&node) {
|
||||
values.push(node_value);
|
||||
}
|
||||
},
|
||||
Ok(Event::Text(e)) => {
|
||||
if let Ok(decoded) = e.unescape_and_decode(&reader) {
|
||||
values.push(Value::String(decoded));
|
||||
}
|
||||
},
|
||||
Ok(Event::End(ref _e)) => break,
|
||||
Ok(Event::Eof) => break,
|
||||
_ => (),
|
||||
}
|
||||
}
|
||||
|
||||
info!("node: {:?}", node);
|
||||
|
||||
match values.len() {
|
||||
0 => Value::Null,
|
||||
1 => values.pop().unwrap(),
|
||||
_ => {
|
||||
Value::Array(values)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* to_json() will take an input string and attempt to convert it into a form
|
||||
* of JSON
|
||||
*/
|
||||
pub fn to_json(xml: &str) -> Result<Value, Error> {
|
||||
let mut reader = Reader::from_str(xml);
|
||||
reader.trim_text(true);
|
||||
|
||||
Ok(read(&mut reader))
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
fn json_eq(left: Value, right: Result<Value, Error>) {
|
||||
assert!(right.is_ok());
|
||||
assert_eq!(left, right.unwrap());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn single_node() {
|
||||
json_eq(
|
||||
json!({"e" : null}),
|
||||
to_json("<e></e>")
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn node_with_text() {
|
||||
json_eq(
|
||||
json!({"e" : "foo"}),
|
||||
to_json("<e>foo</e>")
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn node_with_attr() {
|
||||
json_eq(
|
||||
json!({"e" : {"@name":"value"}}),
|
||||
to_json("<e name=\"value\"></e>")
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn node_with_attr_and_text() {
|
||||
json_eq(
|
||||
json!({"e": {"@name":"value", "#text" : "text"}}),
|
||||
to_json(r#"<e name="value">text</e>"#)
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn node_with_children() {
|
||||
let _ = pretty_env_logger::try_init();
|
||||
json_eq(
|
||||
json!(
|
||||
{
|
||||
"e":{
|
||||
"a":"text1",
|
||||
"b":"text2"
|
||||
}
|
||||
}),
|
||||
to_json(r#"<e> <a>text1</a> <b>text2</b> </e>"#)
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue