Merge a87b207 into 47c9bd0

AlexeyGrishin · Jan 6, 2017 · 98ec877 · 98ec877
2 parents 47c9bd0 + a87b207
commit 98ec877
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/schemasaurus.js b/schemasaurus.js
@@ -544,9 +544,9 @@ SchemaPartProcessor.prototype.processProperties = function (step) {
     for (k in step.schema.properties) {
         if (step.schema.properties.hasOwnProperty(k)) {
             newvar = this.createVar();
-            this.code("%% = %% ? %%.%% : undefined", newvar, step.varName, step.varName, k);
+            this.code("%% = %% ? %%['%%'] : undefined", newvar, step.varName, step.varName, k);
             if (!this.options.ignoreAdditionalItems) {
-                this.code("%%.%% = true", propsVar, k);
+                this.code("%%['%%'] = true", propsVar, k);
             }
             step.next(step.schema.properties[k], newvar, k);
         }

diff --git a/src/int/processor.js b/src/int/processor.js
@@ -75,9 +75,9 @@ SchemaPartProcessor.prototype.processProperties = function (step) {
     for (k in step.schema.properties) {
         if (step.schema.properties.hasOwnProperty(k)) {
             newvar = this.createVar();
-            this.code("%% = %% ? %%.%% : undefined", newvar, step.varName, step.varName, k);
+            this.code("%% = %% ? %%['%%'] : undefined", newvar, step.varName, step.varName, k);
             if (!this.options.ignoreAdditionalItems) {
-                this.code("%%.%% = true", propsVar, k);
+                this.code("%%['%%'] = true", propsVar, k);
             }
             step.next(step.schema.properties[k], newvar, k);
         }

diff --git a/test/validator_spec.js b/test/validator_spec.js
@@ -65,6 +65,17 @@ describe("validator", function() {
         });
     });
 
+    describe("for object type", function() {
+        it("shall not die on types with dashes", function() {
+            schema({
+                type: 'object',
+                properties:{ "with-dash": {type: "boolean"} }
+            })
+                .validate({'with-dash': true}, Ok)
+                .validate({'with-dash': false}, Ok)
+        });
+    });
+
     describe("for numeric types", function() {
         it("shall distinguish integer values", function() {
             schema({type: "integer"})