json_schema 0.1.2 → 0.1.3

data/lib/json_schema/validator.rb

@@ -20,6 +20,7 @@ module JsonSchema
 
     def validate(data)
       @errors = []
+      @visits = {}
       validate_data(@schema, data, @errors, ['#'])
       @errors.size == 0
     end
@@ -32,6 +33,19 @@ module JsonSchema
 
     private
 
+    def first_visit(schema, errors, path)
+      pointer = schema.pointer
+      if !@visits.key?(pointer) || !@visits[pointer].key?(path.join("/"))
+        @visits[pointer] ||= {}
+        @visits[pointer][path] = true
+        true
+      else
+        message = %{Validation loop detected.}
+        errors << ValidationError.new(schema, path, message)
+        false
+      end
+    end
+
     # for use with additionalProperties and strictProperties
     def get_extra_keys(schema, data)
       extra = data.keys - schema.properties.keys
@@ -53,6 +67,11 @@ module JsonSchema
     def validate_data(schema, data, errors, path)
       valid = true
 
+      # detect a validation loop
+      if !first_visit(schema, errors, path)
+        return false
+      end
+
       # validation: any
       valid = strict_and valid, validate_all_of(schema, data, errors, path)
       valid = strict_and valid, validate_any_of(schema, data, errors, path)

data/test/json_schema/validator_test.rb

@@ -680,6 +680,15 @@ describe JsonSchema::Validator do
     assert_equal "#/visibility", @validator.errors[0].pointer
   end
 
+  it "handles a validation loop" do
+    pointer("#/definitions/app").merge!(
+      "not" => { "$ref" => "#/definitions/app" }
+    )
+    data_sample["visibility"] = "personal"
+    refute validate
+    assert_includes error_messages, %{Validation loop detected.}
+  end
+
   def data_sample
     @data_sample ||= DataScaffold.data_sample
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json_schema
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-27 00:00:00.000000000 Z
+date: 2014-05-28 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: