yaml-schema 1.2.0 → 1.3.0

data/test/validator_test.rb

@@ -322,7 +322,10 @@ module YAMLSchema
         assert_raises UnexpectedTag do
           Validator.validate({
             "type" => "object",
-            "tag" => "aaron"
+            "tag" => "aaron",
+            "properties" => {
+              "foo" => { "type" => "string" }
+            }
           }, ast.children.first)
         end
       end
@@ -332,7 +335,10 @@ module YAMLSchema
         ex = assert_raises UnexpectedTag do
           Validator.validate({
             "type" => "object",
-            "tag" => "aaron"
+            "tag" => "aaron",
+            "properties" => {
+              "foo" => { "type" => "string" }
+            }
           }, ast.children.first)
         end
         assert_match(/lolol/, ex.message)
@@ -351,6 +357,9 @@ module YAMLSchema
         ex = assert_raises UnexpectedType do
           Validator.validate({
             "type" => "object",
+            "properties" => {
+              "foo" => { "type" => "string" }
+            }
           }, ast.children.first)
         end
         assert_match(/Mapping/, ex.message)
@@ -359,6 +368,7 @@ module YAMLSchema
         ex = assert_raises UnexpectedType do
           Validator.validate({
             "type" => "array",
+            "items" => { "type" => "string" }
           }, ast.children.first)
         end
         assert_match(/Sequence/, ex.message)
@@ -468,6 +478,17 @@ module YAMLSchema
         end
       end
 
+      def test_extra_prefix_items_are_allowed
+        ast = Psych.parse("- foo\n- 1\n- extra")
+        assert Validator.validate({
+          "type" => "array",
+          "prefixItems" => [
+            { "type" => "string" },
+            { "type" => "integer" },
+          ]
+        }, ast.children.first)
+      end
+
       def test_invalid_string
         ast = Psych.parse("1")
         assert_raises UnexpectedValue do
@@ -731,5 +752,134 @@ bar: *1
         }, ast.children.first)
       end
     end
+
+    class SchemaValidationTest < Minitest::Test
+      def test_missing_type
+        assert_raises InvalidSchema do
+          Validator.validate({}, Psych.parse("foo").children.first)
+        end
+      end
+
+      def test_invalid_type_value
+        assert_raises InvalidSchema do
+          Validator.validate({ "type" => 42 }, Psych.parse("foo").children.first)
+        end
+      end
+
+      def test_unknown_type
+        assert_raises InvalidSchema do
+          Validator.validate({ "type" => "map" }, Psych.parse("foo").children.first)
+        end
+      end
+
+      def test_object_without_properties_or_items
+        assert_raises InvalidSchema do
+          Validator.validate({
+            "type" => "object",
+          }, Psych.parse("foo: bar").children.first)
+        end
+      end
+
+      def test_array_without_items_or_prefix
+        assert_raises InvalidSchema do
+          Validator.validate({
+            "type" => "array",
+          }, Psych.parse("- foo").children.first)
+        end
+      end
+
+      def test_invalid_required_type
+        assert_raises InvalidSchema do
+          Validator.validate({
+            "type" => "object",
+            "properties" => { "foo" => { "type" => "string" } },
+            "required" => "foo",
+          }, Psych.parse("foo: bar").children.first)
+        end
+      end
+
+      def test_invalid_min_length_type
+        assert_raises InvalidSchema do
+          Validator.validate({
+            "type" => "string",
+            "minLength" => "5",
+          }, Psych.parse("foo").children.first)
+        end
+      end
+
+      def test_invalid_max_items_type
+        assert_raises InvalidSchema do
+          Validator.validate({
+            "type" => "array",
+            "items" => { "type" => "string" },
+            "maxItems" => "2",
+          }, Psych.parse("- foo").children.first)
+        end
+      end
+
+      def test_invalid_pattern_type
+        assert_raises InvalidSchema do
+          Validator.validate({
+            "type" => "string",
+            "pattern" => "foo",
+          }, Psych.parse("foo").children.first)
+        end
+      end
+
+      def test_invalid_tag_type
+        assert_raises InvalidSchema do
+          Validator.validate({
+            "type" => "object",
+            "tag" => 42,
+            "properties" => { "foo" => { "type" => "string" } },
+          }, Psych.parse("foo: bar").children.first)
+        end
+      end
+
+      def test_invalid_nested_schema
+        assert_raises InvalidSchema do
+          Validator.validate({
+            "type" => "object",
+            "properties" => {
+              "foo" => { "type" => "bogus" }
+            }
+          }, Psych.parse("foo: bar").children.first)
+        end
+      end
+
+      def test_invalid_prefix_items_type
+        assert_raises InvalidSchema do
+          Validator.validate({
+            "type" => "array",
+            "prefixItems" => { "type" => "string" },
+          }, Psych.parse("- foo").children.first)
+        end
+      end
+
+      def test_invalid_additional_properties_type
+        assert_raises InvalidSchema do
+          Validator.validate({
+            "type" => "object",
+            "properties" => { "foo" => { "type" => "string" } },
+            "additionalProperties" => "string",
+          }, Psych.parse("foo: bar").children.first)
+        end
+      end
+
+      def test_valid_union_types
+        ast = Psych.parse("foo")
+        assert Validator.validate({
+          "type" => ["null", "string"],
+        }, ast.children.first)
+      end
+
+      def test_invalid_union_type_entry
+        assert_raises InvalidSchema do
+          Validator.validate({
+            "type" => ["string", "bogus"],
+          }, Psych.parse("foo").children.first)
+        end
+      end
+    end
   end
 end

data/yaml-schema.gemspec

@@ -15,5 +15,5 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'rake', '~> 13.0'
   s.add_development_dependency 'psych', '~> 5.0'
-  s.add_development_dependency 'minitest', '~> 5.15'
+  s.add_development_dependency 'minitest', '>= 5.15'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yaml-schema
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Aaron Patterson
@@ -41,14 +41,14 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.15'
 description: If you need to validate YAML against a schema, use this
@@ -65,6 +65,9 @@ files:
 - README.md
 - Rakefile
 - lib/yaml-schema.rb
+- lib/yaml-schema/compiler.rb
+- lib/yaml-schema/runtime.rb
+- test/compiler_test.rb
 - test/pointer_test.rb
 - test/validator_test.rb
 - yaml-schema.gemspec
@@ -86,9 +89,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Validate YAML against a schema
 test_files:
+- test/compiler_test.rb
 - test/pointer_test.rb
 - test/validator_test.rb