yaml-schema 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 579d1085952dfe8a826de14f05a2af2073da12bf45ef5d5959155447a02a9c0d
-  data.tar.gz: 165be9ca5619b56f47f54ba456e31213662a35fff3f41a21b9d03e0e400feae5
+  metadata.gz: e7079554145bf81aef3f0fb89dfa5ad5e0867336866989da48e9217cbae1f114
+  data.tar.gz: e6bc2b714f98cce44632e17fc6b9d4d8bbaebea4583427897019ce8d28f81293
 SHA512:
-  metadata.gz: eadb3ccf99d89937351e506a95dc95d3527e19569e1e89b6dad29f66a2b5f9ade673015838526494a7a3c5c2b4f487bb5b386236505542759f0330e60207dd44
-  data.tar.gz: 79132f662fe6b73bed894481f10df139b89839fd7cf97ccd972c8e66bbbaaea6184ef248735c4d5b2695609d72826fa0ff247894f468030a02e1d2548b6d9ee3
+  metadata.gz: 347fe6c4f3a01eefc61b4f6a18570893c472fa815f942b9ec57ac9ccd8abd6d7f06d73b0f757dd38dee5c9da5f6e01d8c4dd76e5e726d4b92aa0e4a966126f89
+  data.tar.gz: 62a7ec295631d838f06c8932f4c1ae614650cfb635b1bd9bb2539425a53575e1bf87a9af748d1632e082c0f25dc93c7cc311173300c5bf47bfbf3cd11dbc6d41

data/lib/yaml-schema.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module YAMLSchema
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 
   class Pointer
     include Enumerable
@@ -68,6 +68,7 @@ module YAMLSchema
     class UnexpectedProperty < Exception; end
     class UnexpectedTag < Exception; end
     class UnexpectedValue < Exception; end
+    class UnexpectedAlias < Exception; end
     class InvalidSchema < Exception; end
     class InvalidString < Exception; end
     class InvalidPattern < Exception; end
@@ -78,8 +79,8 @@ module YAMLSchema
     ##
     # Given a particular schema, validate that the node conforms to the
     # schema. Raises an exception if it is invalid
-    def self.validate(schema, node)
-      INSTANCE.validate schema, node
+    def self.validate(schema, node, aliases: true)
+      INSTANCE.validate schema, node, aliases: aliases
     end
 
     module NodeInfo # :nodoc:
@@ -97,8 +98,8 @@ module YAMLSchema
     ##
     # Given a particular schema, validate that the node conforms to the
     # schema. Raises an exception if it is invalid
-    def validate(schema, node)
-      val = _validate(schema["type"], schema, node, Valid, {}, ["root"])
+    def validate(schema, node, aliases: true)
+      val = _validate(schema["type"], schema, node, Valid, {}, ["root"], aliases)
       if val.exception
         raise val
       else
@@ -109,8 +110,8 @@ module YAMLSchema
     ##
     # Given a particular schema, validate that the node conforms to the
     # schema. Returns an error object if the node is invalid, otherwise false.
-    def invalid?(schema, node)
-      res = _validate(schema["type"], schema, node, Valid, {}, ["root"])
+    def invalid?(schema, node, aliases: true)
+      res = _validate(schema["type"], schema, node, Valid, {}, ["root"], aliases)
       if Valid == res
         false
       else
@@ -126,11 +127,12 @@ module YAMLSchema
       ex
     end
 
-    def _validate(type, schema, node, valid, aliases, path)
+    def _validate(type, schema, node, valid, aliases, path, allow_aliases)
       return valid if valid.exception
 
       if node.anchor
         if node.alias?
+          raise UnexpectedAlias unless allow_aliases
           node = aliases[node.anchor]
         else
           aliases[node.anchor] = node
@@ -142,7 +144,7 @@ module YAMLSchema
       if Array === type
         v = valid
         type.each do |t|
-          v = _validate t, schema, node, valid, aliases, path
+          v = _validate t, schema, node, valid, aliases, path, allow_aliases
           unless v.exception
             break
           end
@@ -178,7 +180,7 @@ module YAMLSchema
           properties = schema["properties"].dup
           key_restriction = schema["propertyNames"] || {}
           node.children.each_slice(2) do |key, val|
-            valid = _validate("string", key_restriction, key, valid, aliases, path)
+            valid = _validate("string", key_restriction, key, valid, aliases, path, allow_aliases)
 
             return valid if valid.exception
 
@@ -190,7 +192,7 @@ module YAMLSchema
               end
             }
 
-            valid = _validate(sub_schema["type"], sub_schema, val, valid, aliases, path + [key.value])
+            valid = _validate(sub_schema["type"], sub_schema, val, valid, aliases, path + [key.value], allow_aliases)
 
             return valid if valid.exception
           end
@@ -205,9 +207,9 @@ module YAMLSchema
           if schema["items"]
             sub_schema = schema["items"]
             node.children.each_slice(2) do |key, val|
-              valid = _validate("string", {}, key, valid, aliases, path)
+              valid = _validate("string", {}, key, valid, aliases, path, allow_aliases)
               return valid if valid.exception
-              valid = _validate(sub_schema["type"], sub_schema, val, valid, aliases, path + [key.value])
+              valid = _validate(sub_schema["type"], sub_schema, val, valid, aliases, path + [key.value], allow_aliases)
               return valid if valid.exception
             end
           else
@@ -230,12 +232,12 @@ module YAMLSchema
         if schema["items"]
           node.children.each_with_index { |item, i|
             sub_schema = schema["items"]
-            valid = _validate sub_schema["type"], sub_schema, item, valid, aliases, path + [i]
+            valid = _validate sub_schema["type"], sub_schema, item, valid, aliases, path + [i], allow_aliases
           }
         elsif schema["prefixItems"]
           node.children.each_with_index { |item, i|
             sub_schema = schema["prefixItems"][i]
-            valid = _validate sub_schema["type"], sub_schema, item, valid, aliases, path + [i]
+            valid = _validate sub_schema["type"], sub_schema, item, valid, aliases, path + [i], allow_aliases
           }
         else
           raise NotImplementedError

data/test/validator_test.rb

@@ -1,6 +1,7 @@
 require "minitest/autorun"
 require "yaml-schema"
 require "psych"
+require "date"
 
 module YAMLSchema
   class Validator
@@ -690,6 +691,24 @@ bar: *1
         }, ast.children.first)
       end
 
+      def test_optionally_disallow_aliases
+        ast = Psych.parse(<<-eoyml)
+---
+foo: &1
+- foo
+bar: *1
+        eoyml
+        assert_raises UnexpectedAlias do
+          Validator.validate({
+            "type" => "object",
+            "properties" => {
+              "foo" => { "type" => "array", "items" => { "type" => "string" } },
+              "bar" => { "type" => "array", "items" => { "type" => "string" } },
+            },
+          }, ast.children.first, aliases: false)
+        end
+      end
+
       class CustomInfo
         def read_tag(node)
           if node.tag == "!aaron"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yaml-schema
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Aaron Patterson