adiwg-mdjson_schemas 2.0.0.pre.alpha.2 → 2.0.0.pre.alpha.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ed64f9aaef3e2938d7acc6be34ed091be662481
-  data.tar.gz: deff92931b41fe071a4309aefe1ad1faac02d329
+  metadata.gz: e3cdae95dcf0a460bc93654369b5cf59dfb832a3
+  data.tar.gz: e50163ac9bf8b00fa5a2b44742306167ff9e9377
 SHA512:
-  metadata.gz: 597a4975b76df8a187e3f6dd8d94e5f0d92eddcefcab92484b7cf5238f0bd814ab93b0abe9706b5dc8de4fd54e144bee193c9b6d5d4f3c0ae44d9588c6d9fa57
-  data.tar.gz: d48a83321d27bac628e41662d9326627f804f9c38a2186e7688a47ed863193528979b613b4337a880841293e7cdf0e0cf332a8b32d5ee9a41488504346e5d372
+  metadata.gz: f484a68bef624eee01a6b950631efe1a2573858e038e36b8e87da82c416883afd5d82440ebbb10baffc652767bb0b57b19985371261481a2b2139b53de7c76db
+  data.tar.gz: 38a6edb6458cfb3a3351f9196be4d449027fbdf2e363db97b536bbd0e6cf7ac44c2936fa29183a09b5415f8fea8d9bf76a2352ba0a056e30b754e05951ce572a

data/lib/adiwg/mdjson_schemas/utils.rb

@@ -38,16 +38,18 @@ module ADIWG
       #
       # @param [Boolean] strict If true, will disallow additional properties
       # @return [nil]
-      def self.load_schemas(strict=false)
+      def self.load_schemas(strict = false)
         Dir.glob(schema_dir + '*.json') do |schema|
           loaded = Utils.load_json(schema)
           name = File.basename(schema)
 
           if strict
             loaded['additionalProperties'] = false
-            loaded['definitions'].each do |_key, val|
-              val['additionalProperties'] = false
-            end unless loaded['definitions'].nil?
+            unless loaded['definitions'].nil?
+              loaded['definitions'].each do |_key, val|
+                val['additionalProperties'] = false
+              end
+            end
           end
 
           jschema = JSON::Schema.new(loaded, Addressable::URI.parse(name))
@@ -55,6 +57,26 @@ module ADIWG
           JSON::Validator.add_schema(jschema)
         end
       end
+
+      # Load one schema and make it strict, i.e. additionalProperties=false and
+      # all properties required
+      #
+      # @param [String] schema The filename of the schema to load
+      # @return [Hash] The schema as Ruby hash
+      def self.load_strict(schema)
+        loaded = load_json(schema_dir + schema)
+        loaded['additionalProperties'] = false
+        loaded['required'] = loaded['properties'].keys unless loaded['properties'].nil?
+
+        unless loaded['definitions'].nil?
+          loaded['definitions'].each do |_key, val|
+            val['additionalProperties'] = false
+            val['required'] = val['properties'].keys unless val['properties'].nil?
+          end
+        end
+
+        loaded
+      end
     end
   end
 end

data/lib/adiwg/mdjson_schemas/version.rb

@@ -1,6 +1,6 @@
 module ADIWG
     module MdjsonSchemas
         # Current schema version number
-        VERSION = "2.0.0-alpha.2"
+        VERSION = "2.0.0-alpha.3"
     end
 end

data/test/tu_utils.rb

@@ -6,27 +6,41 @@ require 'minitest/autorun'
 require File.join(File.dirname(__FILE__), '..', 'lib', 'adiwg-mdjson_schemas.rb')
 
 class TestUtils < Minitest::Test
-    def test_examples_dir
-        errors = File.exist?(ADIWG::MdjsonSchemas::Utils.examples_dir)
-        assert_equal(true, errors, 'Examples directory does not exist.')
-    end
+  def test_examples_dir
+    errors = File.exist?(ADIWG::MdjsonSchemas::Utils.examples_dir)
+    assert_equal(true, errors, 'Examples directory does not exist.')
+  end
 
-    def test_schema_path
-        errors = File.file?(ADIWG::MdjsonSchemas::Utils.schema_path)
-        assert_equal(true, errors, 'File schema.json does not exist.')
-    end
+  def test_schema_path
+    errors = File.file?(ADIWG::MdjsonSchemas::Utils.schema_path)
+    assert_equal(true, errors, 'File schema.json does not exist.')
+  end
 
-    def test_schema_dir
-        errors = File.exist?(ADIWG::MdjsonSchemas::Utils.schema_dir)
-        assert_equal(true, errors, 'Schema directory does not exist.')
-    end
+  def test_schema_dir
+    errors = File.exist?(ADIWG::MdjsonSchemas::Utils.schema_dir)
+    assert_equal(true, errors, 'Schema directory does not exist.')
+  end
 
-    def test_load_schemas
-        assert_nil(ADIWG::MdjsonSchemas::Utils.load_schemas, 'Failed to load schemas.')
+  def test_load_schemas
+    assert_nil(ADIWG::MdjsonSchemas::Utils.load_schemas, 'Failed to load schemas.')
 
-        JSON::Validator.clear_cache
+    JSON::Validator.clear_cache
 
-        assert_nil(ADIWG::MdjsonSchemas::Utils.load_schemas(true), 'Failed to load schemas.')
-        assert_nil(JSON::Validator::schemas.detect { |schema| schema[1].schema['additionalProperties'] }, 'Failed to set additionalProperties.')
-    end
+    assert_nil(ADIWG::MdjsonSchemas::Utils.load_schemas(true), 'Failed to load schemas.')
+    assert_nil(JSON::Validator.schemas.detect { |schema| schema[1].schema['additionalProperties'] }, 'Failed to set additionalProperties.')
+  end
+
+  def test_load_strict
+    loaded = ADIWG::MdjsonSchemas::Utils.load_strict('contact.json')
+
+    assert_kind_of(Hash, loaded, 'Failed to load schema.')
+
+    refute(loaded['additionalProperties'], 'additionalProperties is true')
+    refute_nil(loaded['additionalProperties'], 'additionalProperties is nil')
+    assert_equal(loaded['required'], loaded['properties'].keys, 'All properties not required in main schema')
+
+    refute(loaded['definitions']['address']['additionalProperties'], 'Address additionalProperties is true')
+    refute_nil(loaded['definitions']['address']['additionalProperties'], 'additionalProperties is nil')
+    assert_equal(loaded['definitions']['address']['required'], loaded['definitions']['address']['properties'].keys, 'All properties not required in address schema')
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adiwg-mdjson_schemas
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.alpha.2
+  version: 2.0.0.pre.alpha.3
 platform: ruby
 authors:
 - Josh Bradley, Stan Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-08 00:00:00.000000000 Z
+date: 2017-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler