json-schema 0.9.10 → 0.9.11

data/README.textile

@@ -18,7 +18,7 @@ From the git repo:
 
 <pre>
 $ gem build json-schema.gemspec
-$ gem install json-schema-0.9.10.gem
+$ gem install json-schema-0.9.11.gem
 </pre>
 
 

data/lib/json-schema/attributes/dependencies.rb

@@ -5,9 +5,11 @@ module JSON
         if data.is_a?(Hash)
           current_schema.schema['dependencies'].each do |property,dependency_value|
             if data.has_key?(property)
-              if dependency_value.is_a?(String) && !data.has_key?(dependency_value)
-                message = "The property '#{build_fragment(fragments)}' has a property '#{property}' that depends on a missing property '#{dependency_value}'"
-                raise ValidationError.new(message, fragments, current_schema)
+              if dependency_value.is_a?(String)
+                if !data.has_key?(dependency_value)
+                  message = "The property '#{build_fragment(fragments)}' has a property '#{property}' that depends on a missing property '#{dependency_value}'"
+                  raise ValidationError.new(message, fragments, current_schema)
+                end
               elsif dependency_value.is_a?(Array)
                 dependency_value.each do |value|
                   if !data.has_key?(value)

data/test/test_jsonschema_draft3.rb

@@ -932,6 +932,41 @@ class JSONSchemaDraft3Test < Test::Unit::TestCase
     assert(JSON::Validator.validate(schema,data))
   end
   
+  def test_dependency
+    schema = {
+      "type" => "object",
+      "properties" => {
+        "a" => {"type" => "integer"},
+        "b" => {"type" => "integer"}
+      },
+      "dependencies" => {
+        "a" => "b"
+      }
+    }
+    
+    data = {"a" => 1, "b" => 2}
+    assert(JSON::Validator.validate(schema,data))
+    data = {"a" => 1}
+    assert(!JSON::Validator.validate(schema,data))
+    
+    schema = {
+      "type" => "object",
+      "properties" => {
+        "a" => {"type" => "integer"},
+        "b" => {"type" => "integer"},
+        "c" => {"type" => "integer"}
+      },
+      "dependencies" => {
+        "a" => ["b","c"]
+      }
+    }
+    
+    data = {"a" => 1, "c" => 2}
+    assert(!JSON::Validator.validate(schema,data))
+    data = {"a" => 1, "b" => 2, "c" => 3}
+    assert(JSON::Validator.validate(schema,data))
+  end
+  
   
 end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 10
-  version: 0.9.10
+  - 11
+  version: 0.9.11
 platform: ruby
 authors: 
 - Kenny Hoxworth
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-26 00:00:00 -04:00
+date: 2011-10-24 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -64,16 +64,6 @@ files:
 - resources/draft-02.json
 - resources/draft-03.json
 - README.textile
-- test/test_extended_schema.rb
-- test/test_files.rb
-- test/test_jsonschema_draft1.rb
-- test/test_jsonschema_draft2.rb
-- test/test_jsonschema_draft3.rb
-- test/test_schema_validation.rb
-- test/data/bad_data_1.json
-- test/data/good_data_1.json
-- test/schemas/good_schema_1.json
-- test/schemas/good_schema_2.json
 has_rdoc: true
 homepage: http://github.com/hoxworth/json-schema/tree/master
 licenses: []
@@ -84,7 +74,6 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -92,7 +81,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -102,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Ruby JSON Schema Validator