generic-library/valijson
1
0
Fork 0
mirror of https://github.com/tristanpenman/valijson.git synced 2024-12-12 18:20:27 +01:00
Code Issues Projects Releases Wiki Activity
561 Commits 1 Branch 11 Tags 7.1 MiB
4d857316f2
Commit Graph

297 Commits

Author SHA1 Message Date
Adam Sunderland
bc8120f531 Add iterator accessor 
Move iterators to results class
 2016-11-07 17:13:03 -06:00
Tristan Penman
c04b82c47a Remove unnecessary destructor from ValidationResults class 2016-11-04 09:04:36 -07:00
Adam Sunderland
b4940a6e91 Add #include cstring 2016-10-31 12:21:56 -05:00
Martin Robinson
2e9d147c99 Added an empty virtual destructor to the ConstraintVisitor class. 2016-09-13 10:23:07 +01:00
Nicolas Witczak
8adbe3e959 Using std::function instead of function pointer in type FunctionPtrs 2016-09-12 10:19:07 +02:00
Tristan Penman
fe7e19494c Fix decrement operator in PropertyTreeObjectMemberIterator 2016-08-15 22:32:47 -07:00
Tristan Penman
29721d5538 Minor tweaks for consistency with coding style 2016-08-15 22:32:47 -07:00
Tristan Penman
3d3f76df10 Add missing #includes and remove usage of json_parser_error type for boost property_trees 2016-08-15 22:32:47 -07:00
Lars Immisch
b6854612a4 This patch drops boost as a dependency from the valijson core. 
It is based on https://github.com/tristanpenman/valijson/pull/28, but squashed and rebased for simplicity.

See the original https://github.com/tristanpenman/valijson/pull/28 for history.
 2016-08-15 22:32:47 -07:00
Tristan Penman
521a1033fa Add space between two > characters for compiler friendliness 2016-04-08 08:40:56 +10:00
Tristan Penman
836f17c827 Use more appropriate itr dereference operator in SchemaParser destructor 2016-04-08 08:29:04 +10:00
Tristan Penman
40f0f4868c Make custom constraint loop C++03 friendly 2016-04-08 08:26:57 +10:00
Tristan Penman
078ee62301 Move ConstraintBuilder to its own header file and update SchemaParser to explicitly take ownership of a ConstraintBuilder by pointer 2016-04-08 08:24:05 +10:00
Tristan Penman
9ad441dfbe Remove potentially risky overloads of addConstraint function and make existing impl more exception safe 2016-04-08 08:22:32 +10:00
James Jensen
94cd71fe09 Allow subclassing ValidationResults. 
I use this because our Path constraint needs information global to the current validator(the root of the document).
The natural place for this would be in a subclass of Validator, but by the time we are in the validation visitor we don't have access to that.
I prefer not to use a global because that would introduce threading issues.  That leaves putting the state in the results.
 2016-04-07 11:49:57 -04:00
James Jensen
acffebd74e Add ConstraintBuilder, allowing the user to add constraints to the json schema language 2016-04-07 11:40:11 -04:00
James Jensen
f3eb9edb7b fix some more -wall warnings. 2016-04-07 11:40:10 -04:00
James Jensen
ade9662e1f make cloneInto private, because calling it with the wrong size allocation would be bad. 2016-04-07 11:36:39 -04:00
Tristan Penman
e66413e97f Alphabetise class names 2016-04-07 09:56:57 +10:00
Tristan Penman
32e89abcda Remove potentially risky overloads of addConstraintToSubschema function 2016-04-07 09:56:24 +10:00
Tristan Penman
99e870ca5d Flesh out API for PolyConstraint concept, simplify test cases and add new files to Xcode project 2016-04-07 09:55:13 +10:00
James Jensen
8f446704f7 Add polymorphic constraint, and modifications neccessary for using them 
Modify CMakeLists.txt to make third party include files be included by -isystem.  This reduces external warnings/errors.

Add a unit test for the PolyConstraints.  The test doesn't pass, because the right method for inserting a constraint isn't clear to me.

Add Authors file for tracking modifications

Add Akamai to the License file.
 2016-04-06 16:20:39 -04:00
Tristan Penman
e2a011edc0 Fix errors introduced during rebase 2016-03-20 14:10:07 +11:00
Tristan Penman
9f94ad5883 Update doxygen comment for SchemaParser::makeOrReuseSchema, and wrap several lines of code to match coding style 2016-03-20 14:10:06 +11:00
Tristan Penman
c81403df80 Fix handling of schema scope (based on 'id' attribute) and enable refRemote tests 2016-03-20 14:10:06 +11:00
Tristan Penman
193c58da02 Update document fetch interface to use underlying document type rather than Adapter 2016-03-20 14:10:06 +11:00
Tristan Penman
bee57e1f90 Update SchemaParser to fully support schema caching 2016-03-20 14:10:06 +11:00
Tristan Penman
bc14ef8064 Split makeOrReuseSchema function in SchemaParser class to allow JSON Reference chains to be cached 2016-03-20 14:10:06 +11:00
Tristan Penman
8796b563fe Update SchemaParser so that constraints will be able to re-use existing subschemas in schema cache 2016-03-20 14:10:06 +11:00
Tristan Penman
a74ce3fb2c Add helper function to SchemaParser to sanitise JSON Pointers (and ensure that they have consistent endings) 2016-03-20 14:10:06 +11:00
Tristan Penman
39da77d17e Add helper function to SchemaParser to handle extraction of JSON References 2016-03-20 14:10:06 +11:00
Tristan Penman
7f4db481c7 Remove shared_ptrs from fetch document interface, and add a 'free' callback that is used to release memory after parsing 2016-03-20 14:10:06 +11:00
Tristan Penman
348ba26596 Add placeholder data structures to SchemaParser class to eventually support document/schema caches 2016-03-20 14:10:06 +11:00
Tristan Penman
c4d0c063c7 Merge branch 'jhjensen-warnfix' 2016-03-03 08:34:01 +11:00
Tristan Penman
1ade1c55ef Ensure validation of 'properties' constraint resumes after failure if validation results are being collected 2016-03-03 08:15:36 +11:00
Tristan Penman
85ea0d581d Add missing spaces to validation error messages 2016-03-03 08:14:30 +11:00
James Jensen
910b0da48e fix warning-errors exposed by -Wall -Werror in gcc4.9 
it doesn't like unused variables, misordered initializers, and comparing signed with unsigned.
 2016-03-01 11:39:23 -05:00
Tristan Penman
e9b50162bf Ensure validation state is not discarded after checking for an 'additionalProperties' constraint 2016-02-17 08:47:13 -08:00
Tristan Penman
b241b37d7a Ensure empty arrays are handled correctly for uniqueItems constraint 2016-02-17 08:38:42 -08:00
Tristan Penman
70f066b3f9 Only enable clang-specific pragmas when clang is actually being used 2016-02-02 22:21:08 -08:00
Tristan Penman
5085804d80 Minor variation in spelling of warning to be ignored 2016-02-02 22:15:16 -08:00
Tristan Penman
c3da89bbd7 Try ignoring -Wunused-local-typedef from within schema_parser.hpp file 2016-02-02 22:07:46 -08:00
Tristan Penman
282fbd0c7b Add missing #includes to util headers 2016-02-02 15:06:17 -08:00
Tristan Penman
171820d1fe Fix inconsistencies in error messages for cardinality/length constraints in SchemaParser 2016-02-02 15:06:17 -08:00
Tristan Penman
f039e269dc Fix signed/unsigned comparison in json_pointer namespace 2016-02-02 15:06:17 -08:00
Tristan Penman
a92f8bf60a Update various cardinality and length constraints to use unsigned integer types 2016-02-02 15:06:17 -08:00
Tristan Penman
f2eed08cab Add compiler flags for -Wall and -Werror to Xcode project files and CMake configuration 2016-02-02 15:06:17 -08:00
Tristan Penman
6c8907ce5f Remove unused forward declaration of FormatConstraint struct 2016-02-02 15:06:17 -08:00
Tristan Penman
0f81f72a26 Add range check to MaxItemsConstraint and MaxLengthConstraint classes 2016-02-02 15:06:17 -08:00
Tristan Penman
2bcaaac344 Improve encapsulation in MinPropertiesConstraint and MaxPropertiesConstraint classes 2016-02-02 15:06:16 -08:00
Tristan Penman
8f4dbc63c9 Fix inconsistencies in Doxygen comments 2016-02-02 15:06:16 -08:00
Tristan Penman
7aa0ccb468 Split MultipleOfConstraint into separate classes for integers and doubles, with improved encapsulation 2016-02-02 15:06:16 -08:00
Tristan Penman
14e31be16d Improve encapsulation in MinLengthConstraint and MaxLengthConstraint classes 2016-02-02 15:06:16 -08:00
Tristan Penman
31c0fce2b3 Improve encapsulation in MinItemsConstraint and MaxItemsConstraint classes 2016-02-02 15:06:16 -08:00
Tristan Penman
4d0d38566c Improve encapsulation in MinimumConstraint class 2016-02-02 15:06:16 -08:00
Tristan Penman
65e2c662cc Improve encapsulation in MaximumConstraint class 2016-02-02 15:06:16 -08:00
Tristan Penman
38c540a5d0 Fix memory leak in EnumConstraint 2016-02-02 15:06:16 -08:00
Tristan Penman
b71de6dec0 Update PropertiesConstraint class to use custom allocator, with better encapsulation 2016-02-02 15:06:16 -08:00
Tristan Penman
23ff06541e Make argument names and ordering more consistent across validation functors 2016-02-02 15:06:16 -08:00
Tristan Penman
f779b0780c Update EnumConstraint to use custom allocator for collection (but not frozen values) 2016-02-02 15:06:16 -08:00
Tristan Penman
99a5c2f604 Update NotConstraint to use custom allocator, with better encapsulation 2016-02-02 15:06:16 -08:00
Tristan Penman
05ba5bf711 Update RequiredConstraint to use custom allocator, with better encapsulation 2016-02-02 15:06:16 -08:00
Tristan Penman
a0e1a2f74a Add custom allocator constructor to UniqueItemConstraint 2016-02-02 15:06:15 -08:00
Tristan Penman
00e5c051f1 Update TypeConstraint to use custom allocator for internal list of sub-schemas 2016-02-02 15:06:15 -08:00
Tristan Penman
000a1efc9a Fix errors in Doxygen comments 2016-02-02 15:06:15 -08:00
Tristan Penman
db33cb833f Update PatternConstraint to use custom allocator for pattern string 2016-02-02 15:06:15 -08:00
Tristan Penman
2bb7ce19b2 Fix bug caused by ValidationVisitor incorrectly storing target adapter by reference 2016-02-02 15:06:15 -08:00
Tristan Penman
995fc96b0d Add constructor for custom alloc and free functions to SingularItemsConstraint 2016-02-02 15:06:15 -08:00
Tristan Penman
2ecb9c8b6b Add comments to functors in ValidationVisitor 2016-02-02 15:06:15 -08:00
Tristan Penman
579b0708ee Split ItemsConstraint into SingularItemsConstraint and LinearItemsConstraint, using CustomAllocator where necessary 2016-02-02 15:06:15 -08:00
Tristan Penman
a02048cfcf Use ValidateSubschemas functor for AllOfConstraint 2016-02-02 15:06:15 -08:00
Tristan Penman
c53268ba77 Update OneOfConstraint to use custom allocator, with better encapsulation 2016-02-02 15:06:15 -08:00
Tristan Penman
d534c49393 Update AllOfConstraint and AnyOfConstraint classes to use custom allocator 2016-02-02 15:06:15 -08:00
Tristan Penman
c54bf3ba87 Fix const-ness of == and != operators in CustomAllocator 2016-02-02 15:06:15 -08:00
Tristan Penman
40df802ba8 Add arguments for set and map constructors to compile without C++11 extensions 2016-02-02 15:06:15 -08:00
Tristan Penman
b7e33b249a Remove unwanted propagate_on_container_move_assignment declaration from CustomAllocator 2016-02-02 15:06:15 -08:00
Tristan Penman
c7f2f9b802 Refactor DependenciesConstraint to use custom allocator, hidden behind a more robust encapsulation strategy 2016-02-02 15:06:14 -08:00
Tristan Penman
76f8655d21 Allow use of custom alloc/free functions within Schema class for allocation of memory for Subschemas 2016-02-02 15:06:14 -08:00
Tristan Penman
49fa41ba23 Allow use of custom alloc/free functions within Subschema class, specifically for allocating memory for Constraints 2016-02-02 15:06:14 -08:00
Tristan Penman
99455298d8 Disable copy assignment and copy construction in Subschema class 2016-02-02 15:06:14 -08:00
Tristan Penman
b1755309d2 Refactor memory management for schemas and constraints to improve API and allow for future improvements 2016-02-02 15:06:14 -08:00
Tristan Penman
015d463d0c Basic memory management for Subschema instances in Schema class 2016-02-02 15:06:14 -08:00
Tristan Penman
3e0a2d667e Add #pragma once to header files 2016-02-02 08:11:03 -08:00
Tristan Penman
491bafe256 Minor stylistic changes for consistency with existing code 2016-02-02 08:05:57 -08:00
Tengiz Sharafiev
8b069ccd23 Implement nlohmann/json utils 2016-02-02 17:50:35 +03:00
Tengiz Sharafiev
c1ac8ba194 Implement adapter for nlohmann/json 2016-02-02 17:50:35 +03:00
Tengiz Sharafiev
992fa11736 Add empty header from nlohmann/json adapter 
Based on json11_adapter.hpp
 2016-02-02 17:50:35 +03:00
Tristan Penman
564f9df30f Remove redundant const references that didn't really aid readability 2016-01-29 17:30:43 -08:00
Tristan Penman
b9570e92c1 Minor tweak to capitalisation of json11 in comment 2016-01-29 17:30:11 -08:00
hotwatermorning
67e93e21ae Fix condition of isInteger. 2016-01-26 14:49:42 +09:00
hotwatermorning
04dc77b87c Support dropbox/json11. 2016-01-26 14:43:09 +09:00
Tristan Penman
a64c3c4e30 Update type checks in ValidatorVisitor to use allow loose type conversions when strictTypes flag is not set 2016-01-16 12:58:52 +11:00
Tristan Penman
222e593733 Use asBool() instead of getBool() when parsing 'additionalItems' and 'required' constraints 2016-01-14 21:47:54 +11:00
Tristan Penman
29367ccf0b Use asBool() instead of getBool() to get value of uniqueItems constraint 2016-01-14 21:41:17 +11:00
Tristan Penman
476d2c645a Remove unnecessary include form property_tree_utils.hpp 2016-01-13 17:17:51 +11:00
Tristan Penman
71a6b64e0e Allow SchemaParser to track path to current node in recursive populateSchema calls 2015-12-22 18:25:07 +11:00
Tristan Penman
cdabbe5549 Update SchemaParser to pass optional resolution scope with recursive fn calls 2015-12-22 17:40:45 +11:00
Tristan Penman
79267593f3 Remove unwanted arguments from publicly accessible populateSchema function 2015-12-22 17:33:24 +11:00
Tristan Penman
00686e26f0 Add header file with placeholder functions for working with absolute and relative URIs 2015-12-22 11:06:15 +11:00
Tristan Penman
3365287ef0 Add support for decoding %-encoded characters in JSON Pointer path fragments 2015-12-22 10:36:20 +11:00
Tristan Penman
592e6db083 Move functionality from Schema class to a new Subschema class (superclass for Schema), and remove dead code 2015-12-22 10:26:51 +11:00
Tristan Penman
0227384534 Add support for 'description' and 'title' attributes 2015-12-21 23:20:29 +11:00
Tristan Penman
9ec9a37222 Fix minor issues raised by Doxygen and add a few missing doc-comments 2015-12-20 08:16:16 +11:00
Tristan Penman
6546a9a945 Adapt existing tests to cover GenericRapidJsonAdapter when using a value type backed by RapidJson's CrtAllocator 2015-12-07 22:01:06 +11:00
Tristan Penman
414c46b423 Rename RapidJsonAdapter template class to GenericRapidJsonAdapter and add typedefs for old class names 2015-12-04 08:18:17 +11:00
Michael Smith
e7da07f60a (#7) Generalize rapidjson adapter for GenericValue 
We've found the rapidjson MemoryPoolAllocator is buggy on SPARC, and for
the moment we're avoiding it as not being a large performance benefit.
The adapter assumes MemoryPoolAllocator, so we can't use valijson
without it. Templatize the rapidjson adapter so it can be used more
generically.
 2015-12-04 08:18:17 +11:00
Tristan Penman
650f122a79 Fix incorrect return value for maybeObject() method in BasicAdapter template class 2015-11-24 14:28:56 +11:00
Tristan Penman
6b8a394cbf Update BasicAdapter to use strtod instead of istringstream for string-to-double conversions 2015-10-19 11:55:21 +11:00
Tristan Penman
cd21f7b250 Fix uninitialised value issues detected by Valgrind when using older versions of RapidJson 2015-10-18 20:29:16 +11:00
Tristan Penman
9216f5f6f1 Fix build issues and compiler warnings with MSVC 2013 2015-10-17 08:27:39 +11:00
Tristan Penman
9b3779a57b Move functions for parsing/unpacking JSON Reference strings to separate header file 2015-10-16 21:33:40 +11:00
Tristan Penman
b54e0b85ae Rename compiler guard for json_pointer.hpp and correct comment after closing of namespace 2015-10-15 14:37:21 +11:00
Tristan Penman
05214c6630 Include property name in validation error when unmatched against properties or regexes in PropertiesConstraint 2015-10-13 13:10:43 +11:00
Tristan Penman
43f7be480a Allow schema parser to resolve local JSON references from root of document 2015-10-13 12:09:46 +11:00
Hiroyuki Kobayashi
04ff1dec15 Push oneOf constraint error only when validation fails actually 2015-07-06 22:52:55 +09:00
Tristan Penman
7c4d935f4c Add check for hyphen used as array index in JSON Pointer 2015-06-19 08:54:49 +10:00
Tristan Penman
5387aaf076 Support ~0 and ~1 character escape sequences in JSON Reference tokens 2015-06-17 10:00:13 +10:00
Tristan Penman
e601e10af2 Replace usage of u_int32_t with uint32_t in utf8_utils.h 2015-05-19 22:16:00 +10:00
Hiroyuki Kobayashi
24d993dcd2 Support picojson library 2015-05-09 00:41:44 +09:00
Tristan Penman
3900596a72 Check array bounds when dereferencing JSON Pointer containing array index 2015-05-07 09:35:28 +10:00
Tristan Penman
b4c2dbd875 Fix array indexing bug in JSON Pointer implementation 2015-05-07 09:07:26 +10:00
Tristan Penman
c43c8568f5 Rename json_reference namespace to json_pointer and move unrelated functionality back into SchemaParser class 2015-05-06 18:46:39 +10:00
Tristan Penman
4f88bb8941 Allow for redundant slashes in reference tokens, as per spec 2015-05-06 14:33:14 +10:00
Tristan Penman
b4d7f76b25 Simplify JSON Pointer resolution, improve comments / wording for consistency with spec 2015-05-06 12:50:07 +10:00
Tristan Penman
feaea37aee Move JSON Pointer leading slash check out of recursive function 2015-05-06 07:02:27 +10:00
Tristan Penman
e1add18889 Reduce string copying in JSON pointer resolution 2015-05-05 20:52:29 +10:00
Tristan Penman
f42a4f9458 Lift rough JSON Pointer resolution functions into separate file 2015-05-05 16:18:21 +10:00
Tristan Penman
d206f79760 Refactor handling of JSON References and fetching of remote documents 2015-05-04 11:01:03 +10:00
Tristan Penman
46d496b5fb Update SchemaParser to return Adapter instances for JSON reference deref 2015-05-01 15:11:12 +10:00
Tristan Penman
1ea6c9b185 Implement draft 3 divisibleBy constraint based on draft 4 multipleOf constraint 2015-04-02 06:32:06 +11:00
Tristan Penman
04cebebcfd Add char* constructor to RapidJsonFrozenValue to further remove ambiguity 2015-03-23 17:37:21 +11:00
Tristan Penman
f647e75557 Make construction of frozen value from rapidjson::Value explicit to remove ambiguity 2015-03-23 17:28:45 +11:00
Tristan Penman
9cd913a5cd Update RapidJsonAdapter to be compatible with both embedded and latest versions of RapidJSON 2015-03-23 17:01:10 +11:00
Tristan Penman
d538c698c9 Update Doxygen configuration to include README and fix misplaced @deprecated tag 2015-03-23 14:28:19 +11:00
Tristan Penman
88d9edc136 Remove invalid @todos 2015-03-22 22:31:22 +11:00
Tristan Penman
2f332e4223 Use remainder from cmath instead of numeric (which is only defined for C++11) 2015-03-22 22:23:39 +11:00
Tristan Penman
b377609efa Implement multipleOf constraint using std::remainder 2015-03-22 22:10:19 +11:00
Tristan Penman
7a6d22ebeb Suppress warning about implicit unsigned long to int conversion in boost::property_tree 2015-03-17 13:17:23 +11:00
Richard Clamp
ae4127d530 Fixup for compilation on boost 1.57 
In boost 1.57 the + and - operations are no longer overloaded on the iterator
constants by default causing the following error:

   .../include/valijson/validation_visitor.hpp:930:76:
   error: no match for ‘operator-’ (operand types are ‘const const_iterator {aka const valijson::adapters::RapidJsonArrayValueIterator}’ and ‘int’)
         const typename AdapterType::Array::const_iterator secondLast = end - 1;

The ++ operator is still valid, so here we rework in terms of it.
 2015-02-04 13:00:32 +00:00
Richard Clamp
2ac5d96852 Fix compatibility with boost 1.56+ 
In boost 1.56 the optional library is no longer happy with the implicit
conversion from boost::optional<std::string> to bool, so we get the following
errors:

    valijson/include/valijson/schema.hpp:177:16: error: no viable conversion from 'const boost::optional<std::string>' to 'bool'
            return id;
                   ^~

    valijson/include/valijson/schema.hpp:188:16: error: no viable conversion from 'const boost::optional<std::string>' to 'bool'
                    return title;
                           ^~~~~
    2 errors generated.

Here we explicitly test against boost::none instead.
 2014-11-26 13:54:05 +00:00
Tristan Penman
467368d022 Improve contexts for error reporting, and fix unicode bug. 2014-06-15 22:09:38 +10:00
Tristan Penman
031ca48079 Make min/max length constraints unicode-aware so that strings containing non-ASCII characters are handled correctly. 2014-06-15 13:35:16 +10:00
Tristan Penman
f604f11ada Fix memory corruption issue in schema parser. 2014-04-17 23:06:48 +00:00
Tristan Penman
11af5466f0 Fix Ubuntu 12.04 build issues. 2014-04-17 21:31:18 +00:00
Tristan Penman
68d0ebf866 Update gtest to version 1.7.0 and fix xcode build errors. 2014-04-17 10:58:06 +10:00
Tristan Penman
5b29f915a1 Cleanup whitespace. 2014-03-01 09:03:39 +11:00
Tristan Penman
4c9864de73 Initial commit. 
This commit contains the third major design of a C++ library for JSON Schema validation.

It is definitely not what I would consider production-ready, but I do think that the overall design of the library is robust.
 2013-10-30 07:51:11 +11:00