json_schemer 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73e909cd3b478fdfd80f7b4cf6f662e2b2089f9e4d36e53545250e08d6108ded
-  data.tar.gz: ce95d5099ca09f52616555570b014c4d4501f4ef3742fb70c06f61846d061aeb
+  metadata.gz: ad4883bcdfb3cac627d3b20c3ab74c0ebf4a3b3ce9f95b59cc653b60f2771580
+  data.tar.gz: bbb0a784d78974b3a812becdb354222e145a642ef9162c6e8bd6d74578994024
 SHA512:
-  metadata.gz: 5b6e683f487d15ac6c88bed99e18ef73e949816a980abfe2edf066e2f92831e08d8245c9685104fe6df2d51e00de9b1670909681f1785704faf8adc17ec3ca26
-  data.tar.gz: dc9d610aade61f19a6f168d64945f0c90021548f9ead54bd8a76d9dfae2f0d2aa35c3e534fdd724b087faf8ed318704654dda63eedc531a37be0669e1f46c9e8
+  metadata.gz: cf54450f55764c1c50751173db9008babda7befde4012b1e434ed7087134e2e5f053cbc35977cf58b96a8a4b7176302ed03731bddeb192e8aca3f29e79622eff
+  data.tar.gz: 464a4611a5261cba8e5a4c1acac299eb51342b1c06da90950e9f6aa826dabf4256feed1959247262310b66c061776a4f1f262bdc0028e29205097efec328b3c9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    json_schemer (0.2.2)
+    json_schemer (0.2.3)
       ecma-re-validator (~> 0.2)
       hana (~> 1.3)
       regexp_parser (~> 1.5)
@@ -22,10 +22,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16)
+  bundler (~> 2.0)
   json_schemer!
   minitest (~> 5.0)
   rake (~> 10.0)
 
 BUNDLED WITH
-   1.17.2
+   2.0.2

data/README.md

@@ -47,6 +47,22 @@ schemer.valid?({ 'abc' => 10 })
 schemer.validate({ 'abc' => 10 }).to_a
 # => [{"data"=>10, "schema"=>{"type"=>"integer", "minimum"=>11}, "pointer"=>"#/abc", "type"=>"minimum"}]
 
+# default property values
+
+data = {}
+JSONSchemer.schema(
+  {
+    'properties' => {
+      'foo' => {
+        'default' => 'bar'
+      }
+    }
+  },
+  insert_property_defaults: true
+).valid?(data)
+data
+# => {"foo"=>"bar"}
+
 # schema files
 
 require 'pathname'
@@ -71,6 +87,11 @@ JSONSchemer.schema(
   # default: true
   format: true,
 
+  # insert default property values during validation
+  # true/false
+  # default: false
+  insert_property_defaults: true,
+
   # resolve external references
   # 'net/http'/proc/lambda/respond_to?(:call)
   # 'net/http': proc { |uri| JSON.parse(Net::HTTP.get(uri)) }

data/json_schemer.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
 

data/lib/json_schemer/schema/base.rb

@@ -31,6 +31,7 @@ module JSONSchemer
       def initialize(
         schema,
         format: true,
+        insert_property_defaults: false,
         formats: nil,
         keywords: nil,
         ref_resolver: DEFAULT_REF_RESOLVER
@@ -38,6 +39,7 @@ module JSONSchemer
         raise InvalidSymbolKey, 'schemas must use string keys' if schema.is_a?(Hash) && !schema.first.first.is_a?(String)
         @root = schema
         @format = format
+        @insert_property_defaults = insert_property_defaults
         @formats = formats
         @keywords = keywords
         @ref_resolver = ref_resolver == 'net/http' ? CachedRefResolver.new(&NET_HTTP_REF_RESOLVER) : ref_resolver
@@ -93,6 +95,8 @@ module JSONSchemer
           validate_custom_format(instance, formats.fetch(format), &block)
         end
 
+        data = instance.data
+
         if keywords
           keywords.each do |keyword, callable|
             if schema.key?(keyword)
@@ -106,8 +110,6 @@ module JSONSchemer
           end
         end
 
-        data = instance.data
-
         yield error(instance, 'enum') if enum && !enum.include?(data)
         yield error(instance, 'const') if schema.key?('const') && schema['const'] != data
 
@@ -177,6 +179,10 @@ module JSONSchemer
         !!@format
       end
 
+      def insert_property_defaults?
+        !!@insert_property_defaults
+      end
+
       def custom_format?(format)
         !!(formats && formats.key?(format))
       end
@@ -189,6 +195,7 @@ module JSONSchemer
         JSONSchemer.schema(
           schema,
           format: format?,
+          insert_property_defaults: insert_property_defaults?,
           formats: formats,
           keywords: keywords,
           ref_resolver: ref_resolver
@@ -460,6 +467,14 @@ module JSONSchemer
         dependencies = schema['dependencies']
         property_names = schema['propertyNames']
 
+        if insert_property_defaults?
+          properties.each do |property, property_schema|
+            if !data.key?(property) && property_schema.key?('default')
+              data[property] = property_schema.fetch('default').clone
+            end
+          end
+        end
+
         if dependencies
           dependencies.each do |key, value|
             next unless data.key?(key)

data/lib/json_schemer/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module JSONSchemer
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_schemer
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - David Harsha
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-10 00:00:00.000000000 Z
+date: 2019-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement