json-schema 2.2.0 → 2.2.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmM0OTNmZTRkM2JmNmNlYWM2MDA0ZjNlZmFlMzZkM2JjOWRmZGQ1ZQ==
+    YTUxNTA3MTA3MmZmODJlZDJhYjk5NzIxM2FjNmY4MjdlODgzNDc0NQ==
   data.tar.gz: !binary |-
-    MTdmODg5Njc3NmRjZDliZGU1YjYxMGQwNWQ1ZGY4NDFhMWEyZjcxZA==
+    ODJlOGI0OTMwNjU5OTU2OTFmMjg5MTE1ODlkYTFhNjI1NGY3ZjNjNA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MjUxNmNmNWUzZWQ1MzgyMDk1YjZiNTkyODM1NzFiNmU2MWI0NDMxY2NkN2Rj
-    M2VhNDBkODlkZDg0MGEyMDZhMWFmZWU2MzIwYTBjNjliYWVkM2Y5YTZhNGM2
-    Y2Y5ZjgzNzJmYzhkZjhlMWI0ODljMzA3Mjk5N2JkNjlhZmIzNWQ=
+    ZmE4OTAxOWJkNTc3ZTcyNWU3MTRkMDdkMzAxMjk2ZDc5ZTBiYTVmY2E5ZDY1
+    NWNjYWM1ZTMxMjU4ZjcyZmMwMWNjNjQ4ZTk1Y2QzNjBkZjRiYThlOTg1NjZk
+    YWI3MDEwYjRmNjBkZWNjZjIwNjBiZWJmNzZjNTVhODY2NDZlNmM=
   data.tar.gz: !binary |-
-    MzQ3NWRlNzJhZWY5NWFjZWRmN2U4N2MxMTlkMjgyNDU3OWMxMWFjOWY2MDk5
-    Njk3YjZjZGQyNTk2MjFhZjczZTRkZDgwZmQ3MWFlZDM3YTVkMTAyYmNlMWI1
-    ZWQ4YTkyZDRlNzY5NGYzMDY3MmZkY2ExYmRiMzdkY2U4MzFjNDU=
+    MGJlODg2YTY5MTgyOTRmYTRmNTMwMzNhOGI1ZDVkY2RhN2VjNzNiYTRjNmMz
+    NjA3NjI1ZDlkNzgxNzVkYzdiNGUzM2IwMTAwZTNjNzlmMWQyYjE2NjIzOTA1
+    NWEzNWU1ZWM0NGM2MjFiMzk3MDA1ODUyZDI2M2IyYjkyNWJmYTQ=

data/README.textile

@@ -22,7 +22,7 @@ From the git repo:
 
 <pre>
 $ gem build json-schema.gemspec
-$ gem install json-schema-2.2.0.gem
+$ gem install json-schema-2.2.1.gem
 </pre>
 
 
@@ -82,8 +82,17 @@ With the <code>:strict</code>code> option, validation fails when an object conta
 require 'rubygems'
 require 'json-schema'
 
-data = ['user','user','user']
-JSON::Validator.validate('user.json', data, :list => true)
+schema = {
+  "type" => "object",
+  "properties" => {
+    "a" => {"type" => "integer"},
+    "b" => {"type" => "integer"}
+  }
+}
+
+JSON::Validator.validate(schema, {"a" => 1, "b" => 2}, :strict => true)            # ==> true
+JSON::Validator.validate(schema, {"a" => 1, "b" => 2, "c" => 3}, :strict => true)  # ==> false
+JSON::Validator.validate(schema, {"a" => 1}, :strict => true)                      # ==> false
 </pre>
 
 h3. Catch a validation error and print it out

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

@@ -30,7 +30,20 @@ module JSON
           # When strict is true, ensure no undefined properties exist in the data
           if (options[:strict] == true && !current_schema.schema.has_key?('additionalProperties'))
             diff = data.select do |k,v|
-              !current_schema.schema['properties'].has_key?(k.to_s) && !current_schema.schema['properties'].has_key?(k.to_sym)
+              if current_schema.schema.has_key?('patternProperties')
+                match = false
+                current_schema.schema['patternProperties'].each do |property,property_schema|
+                  r = Regexp.new(property)
+                  if r.match(k)
+                    match = true
+                    break
+                  end
+                end
+
+                !current_schema.schema['properties'].has_key?(k.to_s) && !current_schema.schema['properties'].has_key?(k.to_sym) && !match
+              else
+                !current_schema.schema['properties'].has_key?(k.to_s) && !current_schema.schema['properties'].has_key?(k.to_sym)
+              end
             end
 
             if diff.size > 0

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

@@ -30,7 +30,20 @@ module JSON
         # When strict is true, ensure no undefined properties exist in the data
         if (options[:strict] == true && !current_schema.schema.has_key?('additionalProperties'))
           diff = data.select do |k,v|
-            !current_schema.schema['properties'].has_key?(k.to_s) && !current_schema.schema['properties'].has_key?(k.to_sym)
+            if current_schema.schema.has_key?('patternProperties')
+              match = false
+              current_schema.schema['patternProperties'].each do |property,property_schema|
+                r = Regexp.new(property)
+                if r.match(k)
+                  match = true
+                  break
+                end
+              end
+
+              !current_schema.schema['properties'].has_key?(k.to_s) && !current_schema.schema['properties'].has_key?(k.to_sym) && !match
+            else
+              !current_schema.schema['properties'].has_key?(k.to_s) && !current_schema.schema['properties'].has_key?(k.to_sym)
+            end
           end
 
           if diff.size > 0

data/test/test_jsonschema_draft3.rb

@@ -528,7 +528,37 @@ class JSONSchemaDraft3Test < Test::Unit::TestCase
     assert(JSON::Validator.validate(schema,data,:strict => true))
   end
 
+  def test_strict_properties_pattern_props
+    schema = {
+      "$schema" => "http://json-schema.org/draft-03/schema#",
+      "properties" => {
+        "a" => {"type" => "string"},
+        "b" => {"type" => "string"}
+      },
+      "patternProperties" => {"\\d+ taco" => {"type" => "integer"}}
+    }
+
+    data = {"a" => "a"}
+    assert(!JSON::Validator.validate(schema,data,:strict => true))
+
+    data = {"b" => "b"}
+    assert(!JSON::Validator.validate(schema,data,:strict => true))
 
+    data = {"a" => "a", "b" => "b"}
+    assert(JSON::Validator.validate(schema,data,:strict => true))
+
+    data = {"a" => "a", "b" => "b", "c" => "c"}
+    assert(!JSON::Validator.validate(schema,data,:strict => true))
+
+    data = {"a" => "a", "b" => "b", "c" => 3}
+    assert(!JSON::Validator.validate(schema,data,:strict => true))
+
+    data = {"a" => "a", "b" => "b", "23 taco" => 3}
+    assert(JSON::Validator.validate(schema,data,:strict => true))
+
+    data = {"a" => "a", "b" => "b", "23 taco" => "cheese"}
+    assert(!JSON::Validator.validate(schema,data,:strict => true))
+  end
 
   def test_pattern
     # Set up the default datatype

data/test/test_jsonschema_draft4.rb

@@ -463,7 +463,37 @@ class JSONSchemaDraft4Test < Test::Unit::TestCase
     assert(JSON::Validator.validate(schema,data,:strict => true))
   end
 
+  def test_strict_properties_pattern_props
+    schema = {
+      "$schema" => "http://json-schema.org/draft-03/schema#",
+      "properties" => {
+        "a" => {"type" => "string"},
+        "b" => {"type" => "string"}
+      },
+      "patternProperties" => {"\\d+ taco" => {"type" => "integer"}}
+    }
 
+    data = {"a" => "a"}
+    assert(!JSON::Validator.validate(schema,data,:strict => true))
+
+    data = {"b" => "b"}
+    assert(!JSON::Validator.validate(schema,data,:strict => true))
+
+    data = {"a" => "a", "b" => "b"}
+    assert(JSON::Validator.validate(schema,data,:strict => true))
+
+    data = {"a" => "a", "b" => "b", "c" => "c"}
+    assert(!JSON::Validator.validate(schema,data,:strict => true))
+
+    data = {"a" => "a", "b" => "b", "c" => 3}
+    assert(!JSON::Validator.validate(schema,data,:strict => true))
+
+    data = {"a" => "a", "b" => "b", "23 taco" => 3}
+    assert(JSON::Validator.validate(schema,data,:strict => true))
+
+    data = {"a" => "a", "b" => "b", "23 taco" => "cheese"}
+    assert(!JSON::Validator.validate(schema,data,:strict => true))
+  end
 
   def test_unique_items
     # Set up the default datatype

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json-schema
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Kenny Hoxworth