Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Validate JSON input and expression #110

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions docs/_static/html/jmespath_2col_demo.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,10 @@ <h5>Result</h5>
type="text" placeholder="Expression"
value="{expression}" />
</div>

<textarea class="form-control jmespath-input" rows="{num_rows}">
<div>
<textarea class="form-control jmespath-input" rows="{num_rows}">
{jmespath_data}</textarea>
</div>
</form>

</div>
Expand Down
26 changes: 21 additions & 5 deletions docs/_templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
<span class="glyphicon glyphicon-search"></span>
<input class="form-control jmespath-expression" type="text" placeholder="Expression" value="locations[?state == 'WA'].name | sort(@) | {WashingtonCities: join(', ', @)}" size="40"/>
</div>
<textarea class="form-control jmespath-input" rows="8">
<div>
<textarea class="form-control jmespath-input" rows="8">
{
"locations": [
{"name": "Seattle", "state": "WA"},
Expand All @@ -33,6 +34,7 @@
{"name": "Olympia", "state": "WA"}
]
}</textarea>
</div>
</form>
<h3>Result</h3>
<pre class="jmespath-result"></pre>
Expand Down Expand Up @@ -87,10 +89,24 @@ <h3 class="section-distinct">Libraries in Multiple Languages</h3>
$(document).ready(function() {
$('.jmespath-demo').each(function(i, el) {
function evaluateDemo(el) {
var expression = $(el).find('.jmespath-expression').val();
var inputData = JSON.parse($(el).find('.jmespath-input').val());
var result = jmespath.search(inputData, expression);
$(el).find('.jmespath-result').text(JSON.stringify(result, null, 2));
var expressionTextArea = $(el).find('.jmespath-expression');
var expression = expressionTextArea.val();
try {
jmespath.search({}, expression);
expressionTextArea.parent().removeClass('has-error');
} catch {
expressionTextArea.parent().addClass('has-error');
}
var input = $(el).find('.jmespath-input');
var inputData = {};
try {
inputData = JSON.parse(input.val());
input.parent().removeClass('has-error');
} catch {
input.parent().addClass('has-error');
}
var result = jmespath.search(inputData, expression);
$(el).find('.jmespath-result').text(JSON.stringify(result, null, 2));
}
$(el).find('.jmespath-expression').bind('keyup', function() {
evaluateDemo(el);
Expand Down
22 changes: 18 additions & 4 deletions docs/_themes/jmespath/layout.html
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,24 @@
$(document).ready(function() {
$('.jmespath-demo').each(function(i, el) {
function evaluateDemo(el) {
var expression = $(el).find('.jmespath-expression').val();
var inputData = JSON.parse($(el).find('.jmespath-input').val());
var result = jmespath.search(inputData, expression);
$(el).find('.jmespath-result').text(JSON.stringify(result, null, 2));
var expressionTextArea = $(el).find('.jmespath-expression');
var expression = expressionTextArea.val();
try {
jmespath.search({}, expression);
expressionTextArea.parent().removeClass('has-error');
} catch {
expressionTextArea.parent().addClass('has-error');
}
var input = $(el).find('.jmespath-input');
var inputData = {};
try {
inputData = JSON.parse(input.val());
input.parent().removeClass('has-error');
} catch {
input.parent().addClass('has-error');
}
var result = jmespath.search(inputData, expression);
$(el).find('.jmespath-result').text(JSON.stringify(result, null, 2));
}
$(el).find('.jmespath-expression').bind('keyup', function() {
evaluateDemo(el);
Expand Down