Merge pull request #14 from brandur/brandur-fix-definitions
Parse individual definition values as subschemas
diff --git a/LICENSE-2.0.txt b/LICENSE-2.0.txt
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/LICENSE-2.0.txt
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/README.md b/README.md
index 2d770c5..6389d4b 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@
### Quick example
-```
+```go
package main
@@ -59,13 +59,13 @@
Schemas can be loaded remotely from a Http Url:
-```
+```go
schemaDocument, err := gojsonschema.NewJsonSchemaDocument("http://myhost/schema.json")
```
Or a local file, using the file URI scheme:
-```
+```go
schemaDocument, err := gojsonschema.NewJsonSchemaDocument("file:///home/me/schema.json")
```
@@ -74,7 +74,7 @@
Note that schemas loaded that way are subject to limitations, they need to be standalone schemas;
Which means references to local files and/or remote files within this schema will not work.
-```
+```go
schemaMap := map[string]interface{}{
"type": "string"}
@@ -95,20 +95,20 @@
You may declare your Json from within your code:
-```
+```go
jsonDocument := map[string]interface{}{
"name": "john"}
```
Helper functions are also available to load from a Http URL:
-```
+```go
jsonDocument, err := gojsonschema.GetHttpJson("http://host/data.json")
```
Or a local file:
-```
+```go
jsonDocument, err := gojsonschema.GetFileJson("/home/me/data.json")
```
@@ -116,13 +116,13 @@
Once the schema and the Json to validate are loaded, validation phase becomes easy:
-```
+```go
result := schemaDocument.Validate(jsonDocument)
```
Check the result validity with:
-```
+```go
if result.Valid() {
// Your Json is valid
}
@@ -130,7 +130,7 @@
If not valid, you can loop through the error messages returned by the validation phase:
-```
+```go
for _, desc := range result.Errors() {
fmt.Printf("Error: %s\n", desc)
}
diff --git a/jsonContext.go b/jsonContext.go
index 986c042..777d106 100644
--- a/jsonContext.go
+++ b/jsonContext.go
@@ -65,7 +65,3 @@
buf.WriteString(c.head)
}
-
-
-
-
diff --git a/json_schema_test_suite/maxLength/data_04.json b/json_schema_test_suite/maxLength/data_04.json
new file mode 100644
index 0000000..7d62b4d
--- /dev/null
+++ b/json_schema_test_suite/maxLength/data_04.json
@@ -0,0 +1 @@
+"世界"
\ No newline at end of file
diff --git a/json_schema_test_suite/minLength/data_04.json b/json_schema_test_suite/minLength/data_04.json
new file mode 100644
index 0000000..62db65a
--- /dev/null
+++ b/json_schema_test_suite/minLength/data_04.json
@@ -0,0 +1 @@
+"世"
\ No newline at end of file
diff --git a/schema.go b/schema.go
index ec4f21a..9d91ef1 100644
--- a/schema.go
+++ b/schema.go
@@ -28,9 +28,10 @@
import (
"errors"
- "github.com/sigu-399/gojsonreference"
"regexp"
"strings"
+
+ "github.com/sigu-399/gojsonreference"
)
type jsonSchema struct {
diff --git a/schemaDocument.go b/schemaDocument.go
index e3960b7..897f991 100644
--- a/schemaDocument.go
+++ b/schemaDocument.go
@@ -29,9 +29,10 @@
import (
"errors"
"fmt"
- "github.com/sigu-399/gojsonreference"
"reflect"
"regexp"
+
+ "github.com/sigu-399/gojsonreference"
)
func NewJsonSchemaDocument(document interface{}) (*JsonSchemaDocument, error) {
@@ -356,6 +357,9 @@
if isKind(m[KEY_MINIMUM], reflect.Float64) {
minimumValue := m[KEY_MINIMUM].(float64)
currentSchema.minimum = &minimumValue
+ } else if isKind(m[KEY_MINIMUM], reflect.Int) {
+ minimumValue := float64(m[KEY_MINIMUM].(int))
+ currentSchema.minimum = &minimumValue
} else {
return errors.New("minimum must be a number")
}
@@ -377,6 +381,9 @@
if isKind(m[KEY_MAXIMUM], reflect.Float64) {
maximumValue := m[KEY_MAXIMUM].(float64)
currentSchema.maximum = &maximumValue
+ } else if isKind(m[KEY_MAXIMUM], reflect.Int) {
+ maximumValue := float64(m[KEY_MAXIMUM].(int))
+ currentSchema.maximum = &maximumValue
} else {
return errors.New("maximum must be a number")
}
diff --git a/schemaPool.go b/schemaPool.go
index 3137d98..66b0e1d 100644
--- a/schemaPool.go
+++ b/schemaPool.go
@@ -29,8 +29,9 @@
import (
"errors"
"fmt"
- "github.com/sigu-399/gojsonreference"
"strings"
+
+ "github.com/sigu-399/gojsonreference"
)
type schemaPoolDocument struct {
diff --git a/schema_test.go b/schema_test.go
index 2c335c0..880e5c5 100644
--- a/schema_test.go
+++ b/schema_test.go
@@ -123,10 +123,12 @@
map[string]string{"phase": "minLength validation", "test": "exact length is valid", "schema": "minLength/schema_0.json", "data": "minLength/data_01.json", "valid": "true"},
map[string]string{"phase": "minLength validation", "test": "too short is invalid", "schema": "minLength/schema_0.json", "data": "minLength/data_02.json", "valid": "false"},
map[string]string{"phase": "minLength validation", "test": "ignores non-strings", "schema": "minLength/schema_0.json", "data": "minLength/data_03.json", "valid": "true"},
+ map[string]string{"phase": "minLength validation", "test": "counts utf8 length correctly", "schema": "minLength/schema_0.json", "data": "minLength/data_04.json", "valid": "false"},
map[string]string{"phase": "maxLength validation", "test": "shorter is valid", "schema": "maxLength/schema_0.json", "data": "maxLength/data_00.json", "valid": "true"},
map[string]string{"phase": "maxLength validation", "test": "exact length is valid", "schema": "maxLength/schema_0.json", "data": "maxLength/data_01.json", "valid": "true"},
map[string]string{"phase": "maxLength validation", "test": "too long is invalid", "schema": "maxLength/schema_0.json", "data": "maxLength/data_02.json", "valid": "false"},
map[string]string{"phase": "maxLength validation", "test": "ignores non-strings", "schema": "maxLength/schema_0.json", "data": "maxLength/data_03.json", "valid": "true"},
+ map[string]string{"phase": "maxLength validation", "test": "counts utf8 length correctly", "schema": "maxLength/schema_0.json", "data": "maxLength/data_04.json", "valid": "true"},
map[string]string{"phase": "minimum validation", "test": "above the minimum is valid", "schema": "minimum/schema_0.json", "data": "minimum/data_00.json", "valid": "true"},
map[string]string{"phase": "minimum validation", "test": "below the minimum is invalid", "schema": "minimum/schema_0.json", "data": "minimum/data_01.json", "valid": "false"},
map[string]string{"phase": "minimum validation", "test": "ignores non-numbers", "schema": "minimum/schema_0.json", "data": "minimum/data_02.json", "valid": "true"},
diff --git a/types.go b/types.go
index a1aa795..d80431a 100644
--- a/types.go
+++ b/types.go
@@ -25,8 +25,6 @@
package gojsonschema
-import ()
-
const (
KEY_SCHEMA = "$schema"
KEY_ID = "$id"
diff --git a/validation.go b/validation.go
index 11bfe6c..053b4c5 100644
--- a/validation.go
+++ b/validation.go
@@ -31,6 +31,7 @@
"regexp"
"strconv"
"strings"
+ "unicode/utf8"
)
func (v *JsonSchemaDocument) Validate(document interface{}) *ValidationResult {
@@ -46,6 +47,24 @@
return result
}
+func convertDocumentNode(val interface{}) interface{} {
+ if lval, ok := val.([]interface{}); ok {
+ res := []interface{}{}
+ for _, v := range lval {
+ res = append(res, convertDocumentNode(v))
+ }
+ return res
+ }
+ if mval, ok := val.(map[interface{}]interface{}); ok {
+ res := map[string]interface{}{}
+ for k, v := range mval {
+ res[k.(string)] = convertDocumentNode(v)
+ }
+ return res
+ }
+ return val
+}
+
// Walker function to validate the json recursively against the schema
func (v *jsonSchema) validateRecursive(currentSchema *jsonSchema, currentNode interface{}, result *ValidationResult, context *jsonContext) {
@@ -97,7 +116,10 @@
return
}
- castCurrentNode := currentNode.(map[string]interface{})
+ castCurrentNode, ok := currentNode.(map[string]interface{})
+ if !ok {
+ castCurrentNode = convertDocumentNode(currentNode).(map[string]interface{})
+ }
currentSchema.validateSchema(currentSchema, castCurrentNode, result, context)
@@ -505,12 +527,12 @@
// minLength & maxLength:
if currentSchema.minLength != nil {
- if len(stringValue) < *currentSchema.minLength {
+ if utf8.RuneCount([]byte(stringValue)) < *currentSchema.minLength {
result.addError(context, value, fmt.Sprintf(ERROR_MESSAGE_STRING_LENGTH_MUST_BE_GREATER_OR_EQUAL, *currentSchema.minLength))
}
}
if currentSchema.maxLength != nil {
- if len(stringValue) > *currentSchema.maxLength {
+ if utf8.RuneCount([]byte(stringValue)) > *currentSchema.maxLength {
result.addError(context, value, fmt.Sprintf(ERROR_MESSAGE_STRING_LENGTH_MUST_BE_LOWER_OR_EQUAL, *currentSchema.maxLength))
}
}
