refactoring done default

This commit is contained in:
freestrings
2019-05-26 23:30:01 +09:00
parent 9a35357ddb
commit d2a5d9092e
20 changed files with 1513 additions and 1172 deletions

View File

@ -10,23 +10,24 @@ use serde_json::Value;
use jsonpath::filter::value_filter::{JsonValueFilter, ValueFilter};
use jsonpath::parser::parser::Parser;
use jsonpath::Selector;
fn setup() {
let _ = env_logger::try_init();
}
fn new_value_filter(file: &str) -> ValueFilter {
let string = read_json(file);
let json: Value = serde_json::from_str(string.as_str()).unwrap();
ValueFilter::new((&json).into(), false, false)
}
//fn new_value_filter(file: &str) -> ValueFilter {
// let string = read_json(file);
// let json: Value = serde_json::from_str(string.as_str()).unwrap();
// ValueFilter::new((&json).into(), false, false)
//}
fn do_filter(path: &str, file: &str) -> JsonValueFilter {
fn selector(path: &str, file: &str) -> Selector {
let string = read_json(file);
let mut jf = JsonValueFilter::new(string.as_str()).unwrap();
let mut parser = Parser::new(path);
parser.parse(&mut jf).unwrap();
jf
let mut s = Selector::new();
let _ = s.path(path);
let _ = s.value_from_str(&string);
s
}
fn read_json(path: &str) -> String {
@ -36,53 +37,53 @@ fn read_json(path: &str) -> String {
contents
}
#[test]
fn step_in() {
setup();
let mut jf = new_value_filter("./benches/data_obj.json");
{
let current = jf.step_in_str("friends");
assert_eq!(current.is_array(), true);
}
let mut jf = new_value_filter("./benches/data_array.json");
{
let current = jf.step_in_num(&1.0);
assert_eq!(current.get_val().is_object(), true);
}
{
let current = jf.step_in_str("friends");
assert_eq!(current.is_array(), true);
}
let mut jf = new_value_filter("./benches/data_obj.json");
{
jf.step_in_str("school");
jf.step_in_str("friends");
jf.step_in_all();
let current = jf.step_in_str("name");
let friends = json!([
"Millicent Norman",
"Vincent Cannon",
"Gray Berry"
]);
assert_eq!(friends, current.into_value());
}
let mut jf = new_value_filter("./benches/data_obj.json");
{
let current = jf.step_leaves_str("name");
let names = json!([
"Leonor Herman",
"Millicent Norman",
"Vincent Cannon",
"Gray Berry",
"Vincent Cannon",
"Gray Berry"
]);
assert_eq!(names, current.into_value());
}
}
//#[test]
//fn step_in() {
// setup();
//
// let mut jf = new_value_filter("./benches/data_obj.json");
// {
// let current = jf.step_in_str("friends");
// assert_eq!(current.is_array(), true);
// }
//
// let mut jf = new_value_filter("./benches/data_array.json");
// {
// let current = jf.step_in_num(&1.0);
// assert_eq!(current.get_val().is_object(), true);
// }
// {
// let current = jf.step_in_str("friends");
// assert_eq!(current.is_array(), true);
// }
// let mut jf = new_value_filter("./benches/data_obj.json");
// {
// jf.step_in_str("school");
// jf.step_in_str("friends");
// jf.step_in_all();
// let current = jf.step_in_str("name");
// let friends = json!([
// "Millicent Norman",
// "Vincent Cannon",
// "Gray Berry"
// ]);
//
// assert_eq!(friends, current.into_value());
// }
// let mut jf = new_value_filter("./benches/data_obj.json");
// {
// let current = jf.step_leaves_str("name");
// let names = json!([
// "Leonor Herman",
// "Millicent Norman",
// "Vincent Cannon",
// "Gray Berry",
// "Vincent Cannon",
// "Gray Berry"
// ]);
// assert_eq!(names, current.into_value());
// }
//}
#[test]
fn array() {
@ -93,33 +94,33 @@ fn array() {
{"id": 2, "name": "Gray Berry"}
]);
let jf = do_filter("$.school.friends[1, 2]", "./benches/data_obj.json");
assert_eq!(friends, jf.into_value());
let s = selector("$.school.friends[1, 2]", "./benches/data_obj.json");
assert_eq!(friends, s.select_as_value().unwrap());
let jf = do_filter("$.school.friends[1:]", "./benches/data_obj.json");
assert_eq!(friends, jf.into_value());
let s = selector("$.school.friends[1:]", "./benches/data_obj.json");
assert_eq!(friends, s.select_as_value().unwrap());
let jf = do_filter("$.school.friends[:-2]", "./benches/data_obj.json");
let s = selector("$.school.friends[:-2]", "./benches/data_obj.json");
let friends = json!([
{"id": 0, "name": "Millicent Norman"}
]);
assert_eq!(friends, jf.into_value());
assert_eq!(friends, s.select_as_value().unwrap());
let jf = do_filter("$..friends[2].name", "./benches/data_obj.json");
let s = selector("$..friends[2].name", "./benches/data_obj.json");
let friends = json!(["Gray Berry", "Gray Berry"]);
assert_eq!(friends, jf.into_value());
assert_eq!(friends, s.select_as_value().unwrap());
let jf = do_filter("$..friends[*].name", "./benches/data_obj.json");
let s = selector("$..friends[*].name", "./benches/data_obj.json");
let friends = json!(["Vincent Cannon","Gray Berry","Millicent Norman","Vincent Cannon","Gray Berry"]);
assert_eq!(friends, jf.into_value());
assert_eq!(friends, s.select_as_value().unwrap());
let jf = do_filter("$['school']['friends'][*].['name']", "./benches/data_obj.json");
let s = selector("$['school']['friends'][*].['name']", "./benches/data_obj.json");
let friends = json!(["Millicent Norman","Vincent Cannon","Gray Berry"]);
assert_eq!(friends, jf.into_value());
assert_eq!(friends, s.select_as_value().unwrap());
let jf = do_filter("$['school']['friends'][0].['name']", "./benches/data_obj.json");
let s = selector("$['school']['friends'][0].['name']", "./benches/data_obj.json");
let friends = json!("Millicent Norman");
assert_eq!(friends, jf.into_value());
assert_eq!(friends, s.select_as_value().unwrap());
}
#[test]
@ -134,32 +135,32 @@ fn return_type() {
]
});
let jf = do_filter("$.school", "./benches/data_obj.json");
assert_eq!(friends, jf.into_value());
let s = selector("$.school", "./benches/data_obj.json");
assert_eq!(friends, s.select_as_value().unwrap());
let jf = do_filter("$.school[?(@.friends[0])]", "./benches/data_obj.json");
assert_eq!(friends, jf.into_value());
let s = selector("$.school[?(@.friends[0])]", "./benches/data_obj.json");
assert_eq!(friends, s.select_as_value().unwrap());
let jf = do_filter("$.school[?(@.friends[10])]", "./benches/data_obj.json");
assert_eq!(Value::Null, jf.into_value());
let s = selector("$.school[?(@.friends[10])]", "./benches/data_obj.json");
assert_eq!(Value::Null, s.select_as_value().unwrap());
let jf = do_filter("$.school[?(1==1)]", "./benches/data_obj.json");
assert_eq!(friends, jf.into_value());
let s = selector("$.school[?(1==1)]", "./benches/data_obj.json");
assert_eq!(friends, s.select_as_value().unwrap());
let jf = do_filter("$.school.friends[?(1==1)]", "./benches/data_obj.json");
let s = selector("$.school.friends[?(1==1)]", "./benches/data_obj.json");
let friends = json!([
{"id": 0, "name": "Millicent Norman"},
{"id": 1, "name": "Vincent Cannon" },
{"id": 2, "name": "Gray Berry"}
]);
assert_eq!(friends, jf.into_value());
assert_eq!(friends, s.select_as_value().unwrap());
}
#[test]
fn op_default() {
setup();
let jf = do_filter("$.school[?(@.friends == @.friends)]", "./benches/data_obj.json");
let s = selector("$.school[?(@.friends == @.friends)]", "./benches/data_obj.json");
let friends = json!({
"friends": [
{"id": 0, "name": "Millicent Norman"},
@ -167,54 +168,55 @@ fn op_default() {
{"id": 2, "name": "Gray Berry"}
]
});
assert_eq!(friends, jf.into_value());
assert_eq!(friends, s.select_as_value().unwrap());
let jf = do_filter("$.friends[?(@.name)]", "./benches/data_obj.json");
let s = selector("$.friends[?(@.name)]", "./benches/data_obj.json");
let friends = json!([
{ "id" : 1, "name" : "Vincent Cannon" },
{ "id" : 2, "name" : "Gray Berry" }
]);
assert_eq!(friends, jf.into_value());
assert_eq!(friends, s.select_as_value().unwrap());
let jf = do_filter("$.friends[?(@.id >= 2)]", "./benches/data_obj.json");
let s = selector("$.friends[?(@.id >= 2)]", "./benches/data_obj.json");
let friends = json!([
{ "id" : 2, "name" : "Gray Berry" }
]);
assert_eq!(friends, jf.into_value());
assert_eq!(friends, s.select_as_value().unwrap());
let jf = do_filter("$.friends[?(@.id >= 2 || @.id == 1)]", "./benches/data_obj.json");
let s = selector("$.friends[?(@.id >= 2 || @.id == 1)]", "./benches/data_obj.json");
let friends = json!([
{ "id" : 2, "name" : "Gray Berry" },
{ "id" : 1, "name" : "Vincent Cannon" }
]);
assert_eq!(friends, jf.into_value());
assert_eq!(friends, s.select_as_value().unwrap());
let jf = do_filter("$.friends[?( (@.id >= 2 || @.id == 1) && @.id == 0)]", "./benches/data_obj.json");
assert_eq!(Value::Null, jf.into_value());
let s = selector("$.friends[?( (@.id >= 2 || @.id == 1) && @.id == 0)]", "./benches/data_obj.json");
assert_eq!(Value::Null, s.select_as_value().unwrap());
let jf = do_filter("$..friends[?(@.id == $.index)].id", "./benches/data_obj.json");
let s = selector("$..friends[?(@.id == $.index)].id", "./benches/data_obj.json");
let friends = json!([0, 0]);
assert_eq!(friends, jf.into_value());
assert_eq!(friends, s.select_as_value().unwrap());
let jf = do_filter("$..book[?($.store.bicycle.price < @.price)].price", "./benches/example.json");
let s = selector("$..book[?($.store.bicycle.price < @.price)].price", "./benches/example.json");
let friends = json!([22.99]);
assert_eq!(friends, jf.into_value());
assert_eq!(friends, s.select_as_value().unwrap());
let jf = do_filter("$..book[?( (@.price == 12.99 || @.category == 'reference') && @.price > 10)].price", "./benches/example.json");
let s = selector("$..book[?( (@.price == 12.99 || @.category == 'reference') && @.price > 10)].price", "./benches/example.json");
let friends = json!([12.99]);
assert_eq!(friends, jf.into_value());
assert_eq!(friends, s.select_as_value().unwrap());
let ref value = json!([
{ "name": "이름1", "age": 40, "phone": "+33 12341234" },
{ "name": "이름2", "age": 42, "phone": "++44 12341234" }
]);
let mut jf = JsonValueFilter::new_from_value(value.into());
let mut parser = Parser::new("$..[?(@.age > 40)]");
parser.parse(&mut jf).unwrap();
let mut s = Selector::new();
let _ = s.path("$..[?(@.age > 40)]");
let _ = s.value(value);
let friends = json!([
{ "name" : "이름2", "age" : 42, "phone" : "++44 12341234" }
]);
assert_eq!(friends, jf.into_value());
assert_eq!(friends, s.select_as_value().unwrap());
let ref value = json!({
"school": {
@ -227,11 +229,11 @@ fn op_default() {
{"name": "친구3", "age": 30},
{"name": "친구4"}
]});
let mut jf = JsonValueFilter::new_from_value(value.into());
let mut parser = Parser::new("$..[?(@.age >= 30)]");
parser.parse(&mut jf).unwrap();
let mut s = Selector::new();
let _ = s.path("$..[?(@.age >= 30)]");
let _ = s.value(value);
let friends = json!([{ "name" : "친구3", "age" : 30 }]);
assert_eq!(friends, jf.into_value());
assert_eq!(friends, s.select_as_value().unwrap());
}
#[test]
@ -314,14 +316,14 @@ fn op_complex() {
fn example() {
setup();
let jf = do_filter("$.store.book[*].author", "./benches/example.json");
let s = selector("$.store.book[*].author", "./benches/example.json");
let ret = json!(["Nigel Rees","Evelyn Waugh","Herman Melville","J. R. R. Tolkien"]);
assert_eq!(ret, jf.into_value());
assert_eq!(ret, s.select_as_value().unwrap());
let jf = do_filter("$..author", "./benches/example.json");
assert_eq!(ret, jf.into_value());
let s = selector("$..author", "./benches/example.json");
assert_eq!(ret, s.select_as_value().unwrap());
let jf = do_filter("$.store.*", "./benches/example.json");
let s = selector("$.store.*", "./benches/example.json");
let ret = json!([
[
{"category" : "reference", "author" : "Nigel Rees","title" : "Sayings of the Century", "price" : 8.95},
@ -331,13 +333,13 @@ fn example() {
],
{"color" : "red","price" : 19.95},
]);
assert_eq!(ret, jf.into_value());
assert_eq!(ret, s.select_as_value().unwrap());
let jf = do_filter("$.store..price", "./benches/example.json");
let s = selector("$.store..price", "./benches/example.json");
let ret = json!([8.95, 12.99, 8.99, 22.99, 19.95]);
assert_eq!(ret, jf.into_value());
assert_eq!(ret, s.select_as_value().unwrap());
let jf = do_filter("$..book[2]", "./benches/example.json");
let s = selector("$..book[2]", "./benches/example.json");
let ret = json!([{
"category" : "fiction",
"author" : "Herman Melville",
@ -345,9 +347,9 @@ fn example() {
"isbn" : "0-553-21311-3",
"price" : 8.99
}]);
assert_eq!(ret, jf.into_value());
assert_eq!(ret, s.select_as_value().unwrap());
let jf = do_filter("$..book[-2]", "./benches/example.json");
let s = selector("$..book[-2]", "./benches/example.json");
let ret = json!([{
"category" : "fiction",
"author" : "Herman Melville",
@ -355,9 +357,9 @@ fn example() {
"isbn" : "0-553-21311-3",
"price" : 8.99
}]);
assert_eq!(ret, jf.into_value());
assert_eq!(ret, s.select_as_value().unwrap());
let jf = do_filter("$..book[0,1]", "./benches/example.json");
let s = selector("$..book[0,1]", "./benches/example.json");
let ret = json!([
{
"category" : "reference",
@ -372,9 +374,9 @@ fn example() {
"price" : 12.99
}
]);
assert_eq!(ret, jf.into_value());
assert_eq!(ret, s.select_as_value().unwrap());
let jf = do_filter("$..book[:2]", "./benches/example.json");
let s = selector("$..book[:2]", "./benches/example.json");
let ret = json!([
{
"category" : "reference",
@ -389,9 +391,9 @@ fn example() {
"price" : 12.99
}
]);
assert_eq!(ret, jf.into_value());
assert_eq!(ret, s.select_as_value().unwrap());
let jf = do_filter("$..book[2:]", "./benches/example.json");
let s = selector("$..book[2:]", "./benches/example.json");
let ret = json!([
{
"category" : "fiction",
@ -408,9 +410,9 @@ fn example() {
"price" : 22.99
}
]);
assert_eq!(ret, jf.into_value());
assert_eq!(ret, s.select_as_value().unwrap());
let jf = do_filter("$..book[?(@.isbn)]", "./benches/example.json");
let s = selector("$..book[?(@.isbn)]", "./benches/example.json");
let ret = json!([
{
"category" : "fiction",
@ -427,9 +429,9 @@ fn example() {
"price" : 22.99
}
]);
assert_eq!(ret, jf.into_value());
assert_eq!(ret, s.select_as_value().unwrap());
let jf = do_filter("$.store.book[?(@.price < 10)]", "./benches/example.json");
let s = selector("$.store.book[?(@.price < 10)]", "./benches/example.json");
let ret = json!([
{
"category" : "reference",
@ -445,28 +447,27 @@ fn example() {
"price" : 8.99
}
]);
assert_eq!(ret, jf.into_value());
assert_eq!(ret, s.select_as_value().unwrap());
let jf = do_filter("$..*", "./benches/example.json");
let s = selector("$..*", "./benches/example.json");
let json: Value = serde_json::from_str(read_json("./benches/giveme_every_thing_result.json").as_str()).unwrap();
assert_eq!(json, jf.into_value());
assert_eq!(json, s.select_as_value().unwrap());
}
#[test]
fn filer_same_obj() {
setup();
let mut jf = JsonValueFilter::new(r#"
let mut s = Selector::new();
let _ = s.path("$..[?(@.a == 1)]");
let _ = s.value_from_str(r#"
{
"a": 1,
"b" : {"a": 1},
"c" : {"a": 1}
}
"#).unwrap();
let mut parser = Parser::new("$..[?(@.a == 1)]");
parser.parse(&mut jf).unwrap();
let ret = jf.into_value();
assert_eq!(ret, json!([
"#);
assert_eq!(s.select_as_value().unwrap(), json!([
{"a": 1},
{"a": 1}
]));

31
tests/modifiable.rs Normal file
View File

@ -0,0 +1,31 @@
//extern crate indexmap;
//extern crate jsonpath_lib;
//#[macro_use]
//extern crate serde_json;
//
//use std::io::Read;
//
//use serde_json::Value;
//
//use jsonpath_lib::filter::value_filter::JsonValueFilter;
//use jsonpath_lib::parser::parser::Parser;
//use jsonpath_lib::ref_value::model::RefValue;
//
//fn setup() {
// let _ = env_logger::try_init();
//}
//
//fn do_filter(path: &str, file: &str) -> JsonValueFilter {
// let string = read_json(file);
// let mut jf = JsonValueFilter::new(string.as_str()).unwrap();
// let mut parser = Parser::new(path);
// parser.parse(&mut jf).unwrap();
// jf
//}
//
//fn read_json(path: &str) -> String {
// let mut f = std::fs::File::open(path).unwrap();
// let mut contents = String::new();
// f.read_to_string(&mut contents).unwrap();
// contents
//}