Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jio
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Cédric Le Ninivin
jio
Commits
2f75cd07
Commit
2f75cd07
authored
Dec 16, 2013
by
Marco Mariani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
trivial implementation of search keys
parent
f8c1966d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
388 additions
and
7 deletions
+388
-7
src/queries/core/simplequery.js
src/queries/core/simplequery.js
+30
-7
test/queries/keys.tests.js
test/queries/keys.tests.js
+357
-0
test/tests.html
test/tests.html
+1
-0
No files found.
src/queries/core/simplequery.js
View file @
2f75cd07
...
@@ -24,6 +24,7 @@ function SimpleQuery(spec) {
...
@@ -24,6 +24,7 @@ function SimpleQuery(spec) {
* @optional
* @optional
*/
*/
this
.
operator
=
spec
.
operator
||
"
=
"
;
this
.
operator
=
spec
.
operator
||
"
=
"
;
this
.
_spec
=
spec
.
operator
;
/**
/**
* Key of the object which refers to the value to compare
* Key of the object which refers to the value to compare
...
@@ -48,7 +49,29 @@ inherits(SimpleQuery, Query);
...
@@ -48,7 +49,29 @@ inherits(SimpleQuery, Query);
* #crossLink "Query/match:method"
* #crossLink "Query/match:method"
*/
*/
SimpleQuery
.
prototype
.
match
=
function
(
item
,
wildcard_character
)
{
SimpleQuery
.
prototype
.
match
=
function
(
item
,
wildcard_character
)
{
return
this
[
this
.
operator
](
item
[
this
.
key
],
this
.
value
,
wildcard_character
);
var
to_compare
=
null
,
matchMethod
=
null
,
value
=
null
;
matchMethod
=
this
[
this
.
operator
];
if
(
typeof
this
.
key
===
'
object
'
)
{
to_compare
=
item
[
this
.
key
.
readFrom
];
// defaultMatch overrides the default '=' operator
matchMethod
=
(
this
.
key
.
defaultMatch
||
matchMethod
);
// but an explicit operator: key overrides DefaultMatch
matchMethod
=
((
this
.
_spec
&&
this
.
_spec
.
operator
)
?
this
[
this
.
operator
]
:
matchMethod
);
value
=
this
.
value
;
if
(
this
.
key
.
castTo
)
{
value
=
this
.
key
.
castTo
(
value
);
to_compare
=
this
.
key
.
castTo
(
to_compare
);
}
}
else
{
to_compare
=
item
[
this
.
key
];
value
=
this
.
value
;
}
return
matchMethod
(
to_compare
,
value
,
wildcard_character
);
};
};
/**
/**
...
@@ -88,7 +111,7 @@ SimpleQuery.prototype["="] = function (object_value, comparison_value,
...
@@ -88,7 +111,7 @@ SimpleQuery.prototype["="] = function (object_value, comparison_value,
}
}
for
(
i
=
0
;
i
<
object_value
.
length
;
i
+=
1
)
{
for
(
i
=
0
;
i
<
object_value
.
length
;
i
+=
1
)
{
value
=
object_value
[
i
];
value
=
object_value
[
i
];
if
(
typeof
value
===
'
object
'
)
{
if
(
typeof
value
===
'
object
'
&&
value
.
hasOwnProperty
(
'
content
'
)
)
{
value
=
value
.
content
;
value
=
value
.
content
;
}
}
if
(
comparison_value
===
undefined
)
{
if
(
comparison_value
===
undefined
)
{
...
@@ -129,7 +152,7 @@ SimpleQuery.prototype["!="] = function (object_value, comparison_value,
...
@@ -129,7 +152,7 @@ SimpleQuery.prototype["!="] = function (object_value, comparison_value,
}
}
for
(
i
=
0
;
i
<
object_value
.
length
;
i
+=
1
)
{
for
(
i
=
0
;
i
<
object_value
.
length
;
i
+=
1
)
{
value
=
object_value
[
i
];
value
=
object_value
[
i
];
if
(
typeof
value
===
'
object
'
)
{
if
(
typeof
value
===
'
object
'
&&
value
.
hasOwnProperty
(
'
content
'
)
)
{
value
=
value
.
content
;
value
=
value
.
content
;
}
}
if
(
comparison_value
===
undefined
)
{
if
(
comparison_value
===
undefined
)
{
...
@@ -167,7 +190,7 @@ SimpleQuery.prototype["<"] = function (object_value, comparison_value) {
...
@@ -167,7 +190,7 @@ SimpleQuery.prototype["<"] = function (object_value, comparison_value) {
object_value
=
[
object_value
];
object_value
=
[
object_value
];
}
}
value
=
object_value
[
0
];
value
=
object_value
[
0
];
if
(
typeof
value
===
'
object
'
)
{
if
(
typeof
value
===
'
object
'
&&
value
.
hasOwnProperty
(
'
content
'
)
)
{
value
=
value
.
content
;
value
=
value
.
content
;
}
}
return
value
<
comparison_value
;
return
value
<
comparison_value
;
...
@@ -188,7 +211,7 @@ SimpleQuery.prototype["<="] = function (object_value, comparison_value) {
...
@@ -188,7 +211,7 @@ SimpleQuery.prototype["<="] = function (object_value, comparison_value) {
object_value
=
[
object_value
];
object_value
=
[
object_value
];
}
}
value
=
object_value
[
0
];
value
=
object_value
[
0
];
if
(
typeof
value
===
'
object
'
)
{
if
(
typeof
value
===
'
object
'
&&
value
.
hasOwnProperty
(
'
content
'
)
)
{
value
=
value
.
content
;
value
=
value
.
content
;
}
}
return
value
<=
comparison_value
;
return
value
<=
comparison_value
;
...
@@ -209,7 +232,7 @@ SimpleQuery.prototype[">"] = function (object_value, comparison_value) {
...
@@ -209,7 +232,7 @@ SimpleQuery.prototype[">"] = function (object_value, comparison_value) {
object_value
=
[
object_value
];
object_value
=
[
object_value
];
}
}
value
=
object_value
[
0
];
value
=
object_value
[
0
];
if
(
typeof
value
===
'
object
'
)
{
if
(
typeof
value
===
'
object
'
&&
value
.
hasOwnProperty
(
'
content
'
)
)
{
value
=
value
.
content
;
value
=
value
.
content
;
}
}
return
value
>
comparison_value
;
return
value
>
comparison_value
;
...
@@ -230,7 +253,7 @@ SimpleQuery.prototype[">="] = function (object_value, comparison_value) {
...
@@ -230,7 +253,7 @@ SimpleQuery.prototype[">="] = function (object_value, comparison_value) {
object_value
=
[
object_value
];
object_value
=
[
object_value
];
}
}
value
=
object_value
[
0
];
value
=
object_value
[
0
];
if
(
typeof
value
===
'
object
'
)
{
if
(
typeof
value
===
'
object
'
&&
value
.
hasOwnProperty
(
'
content
'
)
)
{
value
=
value
.
content
;
value
=
value
.
content
;
}
}
return
value
>=
comparison_value
;
return
value
>=
comparison_value
;
...
...
test/queries/keys.tests.js
0 → 100644
View file @
2f75cd07
/*jslint indent: 2, maxlen: 120, nomen: true, vars: true */
/*global define, exports, require, module, complex_queries, window, test, ok,
deepEqual, sinon */
// define([module_name], [dependencies], module);
(
function
(
dependencies
,
module
)
{
"
use strict
"
;
if
(
typeof
define
===
'
function
'
&&
define
.
amd
)
{
return
define
(
dependencies
,
module
);
}
if
(
typeof
exports
===
'
object
'
)
{
return
module
(
require
(
'
complex_queries
'
));
}
module
(
complex_queries
);
}([
'
complex_queries
'
,
'
qunit
'
],
function
(
complex_queries
)
{
"
use strict
"
;
module
(
'
Custom Key Queries
'
);
test
(
'
Simple Key with readFrom
'
,
function
()
{
/*jslint unparam: true*/
var
doc_list
,
docList
=
function
()
{
return
[
{
'
identifier
'
:
'
a
'
},
{
'
identifier
'
:
'
A
'
},
{
'
identifier
'
:
'
b
'
}
];
},
keys
=
{
title
:
{
readFrom
:
'
identifier
'
},
case_insensitive_identifier
:
{
readFrom
:
'
identifier
'
,
defaultMatch
:
function
(
to_compare
,
value
,
wildcard_character
)
{
return
(
to_compare
.
toLowerCase
()
===
value
.
toLowerCase
());
}
}
};
/*jslint unparam: false*/
doc_list
=
docList
();
complex_queries
.
QueryFactory
.
create
({
type
:
'
simple
'
,
key
:
keys
.
title
,
value
:
'
a
'
}).
exec
(
doc_list
);
deepEqual
(
doc_list
,
[
{
'
identifier
'
:
'
a
'
}
],
'
It should be possible to query with an alias key
'
);
doc_list
=
docList
();
complex_queries
.
QueryFactory
.
create
({
type
:
'
simple
'
,
key
:
keys
.
case_insensitive_identifier
,
value
:
'
A
'
}).
exec
(
doc_list
);
deepEqual
(
doc_list
,
[
{
'
identifier
'
:
'
a
'
},
{
'
identifier
'
:
'
A
'
}
],
'
It should be possible to query with a case-insensitive alias key
'
);
});
var
dateCast
=
function
(
obj
)
{
if
(
Object
.
prototype
.
toString
.
call
(
obj
)
===
'
[object Date]
'
)
{
// no need to clone
return
obj
;
}
return
new
Date
(
obj
);
};
test
(
'
Simple Key with date casting
'
,
function
()
{
var
doc_list
,
docList
=
function
()
{
return
[
{
'
identifier
'
:
'
a
'
,
'
date
'
:
'
2013-01-01
'
},
{
'
identifier
'
:
'
b
'
,
'
date
'
:
'
2013-02-01
'
},
{
'
identifier
'
:
'
bb
'
,
'
date
'
:
'
2013-02-02
'
},
{
'
identifier
'
:
'
bbb
'
,
'
date
'
:
'
2013-02-03
'
},
{
'
identifier
'
:
'
c
'
,
'
date
'
:
'
2013-03-03
'
},
{
'
identifier
'
:
'
d
'
,
'
date
'
:
'
2013-04-04
'
}
];
};
var
sameDay
=
function
(
a
,
b
)
{
return
(
(
a
.
getFullYear
()
===
b
.
getFullYear
())
&&
(
a
.
getMonth
()
===
b
.
getMonth
())
&&
(
a
.
getDay
()
===
b
.
getDay
())
);
};
var
sameMonth
=
function
(
a
,
b
)
{
return
(
(
a
.
getFullYear
()
===
b
.
getFullYear
())
&&
(
a
.
getMonth
()
===
b
.
getMonth
())
);
};
var
sameYear
=
function
(
a
,
b
)
{
return
(
a
.
getFullYear
()
===
b
.
getFullYear
());
};
var
keys
=
{
day
:
{
readFrom
:
'
date
'
,
castTo
:
dateCast
,
defaultMatch
:
sameDay
},
month
:
{
readFrom
:
'
date
'
,
castTo
:
dateCast
,
defaultMatch
:
sameMonth
},
year
:
{
readFrom
:
'
date
'
,
castTo
:
dateCast
,
defaultMatch
:
sameYear
}
};
doc_list
=
docList
();
complex_queries
.
QueryFactory
.
create
({
type
:
'
simple
'
,
key
:
keys
.
day
,
value
:
'
2013-02-02
'
}).
exec
(
doc_list
);
deepEqual
(
doc_list
,
[
{
'
identifier
'
:
'
bb
'
,
'
date
'
:
'
2013-02-02
'
}
],
'
It should be possible to compare dates with sameDay
'
);
doc_list
=
docList
();
complex_queries
.
QueryFactory
.
create
({
type
:
'
simple
'
,
key
:
keys
.
month
,
value
:
'
2013-02-10
'
}).
exec
(
doc_list
);
deepEqual
(
doc_list
,
[
{
'
date
'
:
'
2013-02-01
'
,
'
identifier
'
:
'
b
'
},
{
'
date
'
:
'
2013-02-02
'
,
'
identifier
'
:
'
bb
'
},
{
'
date
'
:
'
2013-02-03
'
,
'
identifier
'
:
'
bbb
'
}
],
'
It should be possible to compare dates with sameMonth
'
);
doc_list
=
docList
();
complex_queries
.
QueryFactory
.
create
({
type
:
'
simple
'
,
key
:
keys
.
year
,
value
:
'
2013-02-10
'
}).
exec
(
doc_list
);
deepEqual
(
doc_list
.
length
,
6
,
'
It should be possible to compare dates with sameYear
'
);
});
test
(
'
Simple Key with date casting and <=> operators
'
,
function
()
{
var
doc_list
,
docList
=
function
()
{
return
[
{
'
identifier
'
:
'
1
'
,
'
date
'
:
'
2013-01-01
'
},
{
'
identifier
'
:
'
2
'
,
'
date
'
:
'
2013-02-02
'
},
{
'
identifier
'
:
'
3
'
,
'
date
'
:
'
2013-03-03
'
}
];
},
keys
=
{
mydate
:
{
readFrom
:
'
date
'
,
castTo
:
dateCast
}
};
doc_list
=
docList
();
complex_queries
.
QueryFactory
.
create
({
type
:
'
simple
'
,
key
:
keys
.
mydate
,
operator
:
'
=
'
,
value
:
'
2013-02-02
'
}).
exec
(
doc_list
);
deepEqual
(
doc_list
,
[
{
'
identifier
'
:
'
2
'
,
'
date
'
:
'
2013-02-02
'
}
],
'
It should be possible to search for dates with operator =
'
);
doc_list
=
docList
();
complex_queries
.
QueryFactory
.
create
({
type
:
'
simple
'
,
key
:
keys
.
mydate
,
operator
:
'
!=
'
,
value
:
'
2013-02-02
'
}).
exec
(
doc_list
);
deepEqual
(
doc_list
,
[
{
'
identifier
'
:
'
1
'
,
'
date
'
:
'
2013-01-01
'
},
{
'
identifier
'
:
'
3
'
,
'
date
'
:
'
2013-03-03
'
}
],
'
It should be possible to search for dates with operator !=
'
);
doc_list
=
docList
();
complex_queries
.
QueryFactory
.
create
({
type
:
'
simple
'
,
key
:
keys
.
mydate
,
operator
:
'
<=
'
,
value
:
'
2013-02-02
'
}).
exec
(
doc_list
);
deepEqual
(
doc_list
,
[
{
'
identifier
'
:
'
1
'
,
'
date
'
:
'
2013-01-01
'
},
{
'
identifier
'
:
'
2
'
,
'
date
'
:
'
2013-02-02
'
}
],
'
It should be possible to search for dates with operator <=
'
);
doc_list
=
docList
();
complex_queries
.
QueryFactory
.
create
({
type
:
'
simple
'
,
key
:
keys
.
mydate
,
operator
:
'
<
'
,
value
:
'
2013-02-02
'
}).
exec
(
doc_list
);
deepEqual
(
doc_list
,
[
{
'
identifier
'
:
'
1
'
,
'
date
'
:
'
2013-01-01
'
}
],
'
It should be possible to search for dates with operator <
'
);
doc_list
=
docList
();
complex_queries
.
QueryFactory
.
create
({
type
:
'
simple
'
,
key
:
keys
.
mydate
,
operator
:
'
>
'
,
value
:
'
2013-02-02
'
}).
exec
(
doc_list
);
deepEqual
(
doc_list
,
[
{
'
identifier
'
:
'
3
'
,
'
date
'
:
'
2013-03-03
'
}
],
'
It should be possible to search for dates with operator >
'
);
doc_list
=
docList
();
complex_queries
.
QueryFactory
.
create
({
type
:
'
simple
'
,
key
:
keys
.
mydate
,
operator
:
'
>=
'
,
value
:
'
2013-02-02
'
}).
exec
(
doc_list
);
deepEqual
(
doc_list
,
[
{
'
identifier
'
:
'
2
'
,
'
date
'
:
'
2013-02-02
'
},
{
'
identifier
'
:
'
3
'
,
'
date
'
:
'
2013-03-03
'
}
],
'
It should be possible to search for dates with operator >=
'
);
});
test
(
'
Simple Key with both defaultMatch and operator attributes
'
,
function
()
{
var
doc_list
,
docList
=
function
()
{
return
[
{
'
identifier
'
:
'
1
'
,
'
date
'
:
'
2013-01-01
'
},
{
'
identifier
'
:
'
2
'
,
'
date
'
:
'
2013-02-02
'
},
{
'
identifier
'
:
'
3
'
,
'
date
'
:
'
2013-03-03
'
}
];
},
keys
=
{
mydate
:
{
readFrom
:
'
date
'
,
castTo
:
dateCast
,
defaultMatch
:
function
alwaysTrue
()
{
return
true
;
}
}
};
doc_list
=
docList
();
complex_queries
.
QueryFactory
.
create
({
type
:
'
simple
'
,
key
:
keys
.
mydate
,
value
:
'
2013-02-02
'
}).
exec
(
doc_list
);
deepEqual
(
doc_list
,
[
{
'
identifier
'
:
'
1
'
,
'
date
'
:
'
2013-01-01
'
},
{
'
identifier
'
:
'
2
'
,
'
date
'
:
'
2013-02-02
'
},
{
'
identifier
'
:
'
3
'
,
'
date
'
:
'
2013-03-03
'
}
],
'
It should be possible to use a catch-all filter
'
);
doc_list
=
docList
();
complex_queries
.
QueryFactory
.
create
({
type
:
'
simple
'
,
key
:
keys
.
mydate
,
operator
:
'
>=
'
,
value
:
'
2013-02-02
'
}).
exec
(
doc_list
);
deepEqual
(
doc_list
,
[
{
'
identifier
'
:
'
1
'
,
'
date
'
:
'
2013-01-01
'
},
{
'
identifier
'
:
'
2
'
,
'
date
'
:
'
2013-02-02
'
},
{
'
identifier
'
:
'
3
'
,
'
date
'
:
'
2013-03-03
'
}
],
'
An explicit operator should override the catch-all filter
'
);
});
var
translationEqualityMatcher
=
function
(
data
)
{
return
function
(
to_compare
,
value
)
{
value
=
data
[
value
];
return
(
to_compare
===
value
);
};
};
test
(
'
Simple Key with translation lookup
'
,
function
()
{
var
doc_list
,
docList
=
function
()
{
return
[
{
'
identifier
'
:
'
1
'
,
'
state
'
:
'
open
'
},
{
'
identifier
'
:
'
2
'
,
'
state
'
:
'
closed
'
}
];
},
equalState
=
translationEqualityMatcher
({
'
ouvert
'
:
'
open
'
}),
keys
=
{
translated_state
:
{
readFrom
:
'
state
'
,
defaultMatch
:
equalState
}
};
doc_list
=
docList
();
complex_queries
.
QueryFactory
.
create
({
type
:
'
simple
'
,
key
:
keys
.
translated_state
,
value
:
'
ouvert
'
}).
exec
(
doc_list
);
deepEqual
(
doc_list
,
[
{
'
identifier
'
:
'
1
'
,
'
state
'
:
'
open
'
}
],
'
It should be possible to look for a translated string with a custom match function
'
);
// doc_list = docList();
// complex_queries.QueryFactory.create({
// type: 'simple',
// key: keys.translated_state,
// value: 'ouvert'
// }).exec(doc_list);
// deepEqual(doc_list, [
// {'identifier': '1', 'state': 'open'},
// ], 'It should be possible to look for a translated string with operator =');
// doc_list = docList();
// complex_queries.QueryFactory.create({
// type: 'simple',
// key: keys.translated_state,
// value: 'ouvert'
// }).exec(doc_list);
// deepEqual(doc_list, [
// {'identifier': '2', 'state': 'closed'},
// ], 'It should be possible to look for a translated string with operator !=');
});
}));
test/tests.html
View file @
2f75cd07
...
@@ -19,6 +19,7 @@
...
@@ -19,6 +19,7 @@
<script
src=
"jio/tests.js"
></script>
<script
src=
"jio/tests.js"
></script>
<script
src=
"../complex_queries.js"
></script>
<script
src=
"../complex_queries.js"
></script>
<script
src=
"queries/keys.tests.js"
></script>
<script
src=
"queries/tests.js"
></script>
<script
src=
"queries/tests.js"
></script>
<script
src=
"../src/jio.storage/localstorage.js"
></script>
<script
src=
"../src/jio.storage/localstorage.js"
></script>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment