json-schema 1.0.11 → 1.0.12

data/README.textile

@@ -18,7 +18,7 @@ From the git repo:
 
 <pre>
 $ gem build json-schema.gemspec
-$ gem install json-schema-1.0.10.gem
+$ gem install json-schema-1.0.12.gem
 </pre>
 
 
@@ -161,6 +161,40 @@ data = {
 JSON::Validator.validate(schema, data, :validate_schema => true)
 </pre>
 
+h3. Validate a JSON object against a JSON schema object, while inserting default values from the schema
+
+With the :insert_defaults option set to true any missing property that has a 
+default value specified in the schema will be inserted into the validated data. The inserted default value is validated hence catching a schema that specifies an invalid default value.
+
+<pre>
+require 'rubygems'
+require 'json-schema'
+
+schema = {
+  "type" => "object",
+  "properties" => { 
+    "a" => {"type" => "integer", "default" => 42, "required" => "true"},
+    "b" => {"type" => "integer"}
+  }
+}
+
+# Would not normally validate because "a" is missing and required by schema, 
+# but "default" option allows insertion of valid default.
+data = {
+  "b" => 5
+}
+
+JSON::Validator.validate(schema, data)
+# false
+
+JSON::Validator.validate(schema, data, :insert_defaults => true)
+# true
+# data = { 
+#   "a" => 42, 
+#   "b" => 5 
+# }
+
+</pre>
 h3. Validate an object against a JSON Schema Draft 2 schema
 
 <pre>

data/lib/json-schema/attributes/properties.rb

@@ -4,7 +4,12 @@ module JSON
       def self.validate(current_schema, data, fragments, validator, options = {})
         if data.is_a?(Hash)
           current_schema.schema['properties'].each do |property,property_schema|
-            if (property_schema['required'] && !data.has_key?(property))
+            if !data.has_key?(property) and property_schema['default'] and !property_schema['readonly'] and options[:insert_defaults]
+              default = property_schema['default']
+              data[property] = (default.is_a?(Hash) ? default.clone : default)
+            end
+
+            if property_schema['required'] and !data.has_key?(property)
               message = "The property '#{build_fragment(fragments)}' did not contain a required property of '#{property}'"
               validation_error(message, fragments, current_schema, self, options[:record_errors])
             end
@@ -20,4 +25,4 @@ module JSON
       end
     end
   end
-end
+end

data/lib/json-schema/validator.rb

@@ -109,7 +109,8 @@ module JSON
       :version => nil,
       :validate_schema => false,
       :record_errors => false,
-      :errors_as_objects => false
+      :errors_as_objects => false,
+      :insert_defaults => false
     }
     @@validators = {}
     @@default_validator = nil
@@ -150,6 +151,7 @@ module JSON
       end
 
       @validation_options = @options[:record_errors] ? {:record_errors => true} : {}
+      @validation_options[:insert_defaults] = true if @options[:insert_defaults]
       
       # validate the schema, if requested
       if @options[:validate_schema]

data/test/test_jsonschema_draft3.rb

@@ -1012,6 +1012,74 @@ class JSONSchemaDraft3Test < Test::Unit::TestCase
     data = {"a" => 1, "b" => 2, "c" => 3}
     assert(JSON::Validator.validate(schema,data))
   end
+
+  def test_default
+    schema = {
+      "type" => "object",
+      "properties" => {
+        "a" => {"type" => "integer", "default" => 42},
+        "b" => {"type" => "integer"}
+      }
+    }
+    
+    data = {"b" => 2}
+    assert(JSON::Validator.validate(schema,data))
+    assert_nil(data["a"])
+    assert(JSON::Validator.validate(schema,data, :insert_defaults => true))
+    assert_equal(42, data["a"])
+
+    schema = {
+      "type" => "object",
+      "properties" => {
+        "a" => {"type" => "integer", "default" => 42, "required" => true},
+        "b" => {"type" => "integer"}
+      }
+    }
+    
+    data = {"b" => 2}
+    assert(!JSON::Validator.validate(schema,data))
+    assert_nil(data["a"])
+    assert(JSON::Validator.validate(schema,data, :insert_defaults => true))
+    assert_equal(42, data["a"])
+
+    schema = {
+      "type" => "object",
+      "properties" => {
+        "a" => {"type" => "integer", "default" => 42, "required" => true},
+        "b" => {"type" => "integer"}
+      }
+    }
+    
+
+    schema = {
+      "type" => "object",
+      "properties" => {
+        "a" => {"type" => "integer", "default" => 42, "required" => true, "readonly" => true},
+        "b" => {"type" => "integer"}
+      }
+    }
+    
+    data = {"b" => 2}
+    assert(!JSON::Validator.validate(schema,data))
+    assert_nil(data["a"])
+    assert(!JSON::Validator.validate(schema,data, :insert_defaults => true))
+    assert_nil(data["a"])
+
+    schema = {
+      "type" => "object",
+      "properties" => {
+        "a" => {"type" => "integer", "default" => "42"},
+        "b" => {"type" => "integer"}
+      }
+    }
+    
+    data = {"b" => 2}
+    assert(JSON::Validator.validate(schema,data))
+    assert_nil(data["a"])
+    assert(!JSON::Validator.validate(schema,data, :insert_defaults => true))
+    assert_equal("42",data["a"])
+
+  end
   
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json-schema
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.12
   prerelease: 
 platform: ruby
 authors: