json-schema 2.1.4 → 2.1.5

data/README.textile

@@ -22,7 +22,7 @@ From the git repo:
 
 <pre>
 $ gem build json-schema.gemspec
-$ gem install json-schema-2.1.4.gem
+$ gem install json-schema-2.1.5.gem
 </pre>
 
 

data/lib/json-schema.rb

@@ -8,7 +8,7 @@ if begin
     Gem.available?('multi_json')
   end
   require 'multi_json'
-  
+
   # Force MultiJson to load an engine before we define the JSON constant here; otherwise,
   # it looks for things that are under the JSON namespace that aren't there (since we have defined it here)
   MultiJson.respond_to?(:adapter) ? MultiJson.adapter : MultiJson.engine
@@ -17,6 +17,7 @@ end
 $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/json-schema"
 
 require 'rubygems'
+require 'util/hash'
 require 'schema'
 require 'validator'
 Dir[File.join(File.dirname(__FILE__), "json-schema/attributes/*.rb")].each {|file| require file }

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

@@ -4,7 +4,7 @@ module JSON
       def self.validate(current_schema, data, fragments, processor, validator, options = {})
         if !current_schema.schema['enum'].include?(data)
           message = "The property '#{build_fragment(fragments)}' value #{data.inspect} did not match one of the following values:"
-          current_schema.schema['enum'].each {|val|
+          current_schema.schema['enum'].each_key {|val|
             if val.is_a?(NilClass)
               message += " null,"
             elsif val.is_a?(Array)

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

@@ -5,12 +5,18 @@ module JSON
 
         schema = JSON::Schema.new(current_schema.schema['not'],current_schema.uri,validator)
         failed = true
+        errors_copy = processor.validation_errors.clone
         begin
           schema.validate(data,fragments,processor,options)
-          message = "The property '#{build_fragment(fragments)}' of type #{data.class} matched the disallowed schema"
-          failed = false
+          # If we're recording errors, we don't throw an exception. Instead, check the errors array length
+          if options[:record_errors] && errors_copy.length != processor.validation_errors.length
+            processor.validation_errors.replace(errors_copy)
+          else
+            message = "The property '#{build_fragment(fragments)}' of type #{data.class} matched the disallowed schema"
+            failed = false
+          end
         rescue
-          # Yay, we failed validation
+          # Yay, we failed validation.
         end
 
         unless failed

data/lib/json-schema/util/hash.rb

@@ -0,0 +1,8 @@
+class Hash
+	if !{}.respond_to?("default_proc=")
+		def default_proc=(blk)
+            self.replace(Hash.new(&blk).merge(self))
+  		end
+	end
+end
+

data/lib/json-schema/validator.rb

@@ -5,6 +5,7 @@ require 'bigdecimal'
 require 'digest/sha1'
 require 'date'
 require 'thread'
+require 'yaml'
 
 module JSON
 
@@ -336,6 +337,15 @@ module JSON
         end
       end
 
+      # Convert enum to a hash
+      if parent_schema.schema["enum"] && parent_schema.schema["enum"].is_a?(Array)
+        enum_hash = {}
+        parent_schema.schema["enum"].each do |item|
+          enum_hash[item] = true
+        end
+        parent_schema.schema["enum"] = enum_hash
+      end
+
       # Each of these might be schemas
       ["additionalProperties", "additionalItems", "dependencies", "extends"].each do |key|
         if parent_schema.schema[key].is_a?(Hash)
@@ -527,7 +537,9 @@ module JSON
         if @@json_backend == 'yajl'
           @@serializer = lambda{|o| Yajl::Encoder.encode(o) }
         else
-          @@serializer = lambda{|o| Marshal.dump(o) }
+          @@serializer = lambda{|o|
+            YAML.dump(o)
+          }
         end
       end
     end

data/test/schemas/all_of_ref_base_schema.json

@@ -1,4 +1,6 @@
-{"type": "object",
- "properties" : {
-   "name" : { "type": "integer" }
- }
+{
+	"type": "object",
+	"properties" : {
+   		"name" : { "type": "integer" }
+ 	}
+}

data/test/test_jsonschema_draft4.rb

@@ -1203,6 +1203,24 @@ class JSONSchemaDraft4Test < Test::Unit::TestCase
     assert(JSON::Validator.validate(schema,data))
   end
 
+  def test_not_fully_validate
+    # Start with a simple not
+    schema = {
+      "$schema" => "http://json-schema.org/draft-04/schema#",
+      "properties" => {
+        "a" => {"not" => { "type" => ["string", "boolean"]}}
+      }
+    }
+
+    data = {"a" => 1}
+    errors = JSON::Validator.fully_validate(schema,data)
+    puts errors
+    assert_equal(0, errors.length)
+
+    data = {"a" => "taco"}
+    errors = JSON::Validator.fully_validate(schema,data)
+    assert_equal(1, errors.length)
+  end
 
   def test_definitions
     schema = {

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: json-schema
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.1.5
+  prerelease: 
 platform: ruby
 authors:
 - Kenny Hoxworth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-31 00:00:00.000000000 Z
+date: 2014-01-01 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: hoxworth@gmail.com
@@ -57,6 +58,7 @@ files:
 - lib/json-schema/schema.rb
 - lib/json-schema/uri/file.rb
 - lib/json-schema/uri/uuid.rb
+- lib/json-schema/util/hash.rb
 - lib/json-schema/validator.rb
 - lib/json-schema/validators/draft1.rb
 - lib/json-schema/validators/draft2.rb
@@ -110,26 +112,27 @@ files:
 homepage: http://github.com/hoxworth/json-schema/tree/master
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Ruby JSON Schema Validator
 test_files:
 - test/test_all_of_ref_schema.rb

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NWQ0NmRiOWRjODkxOWJiYTU4MmVhMTI4NmI1MDQyZDkzMzU2ZWQ1Zg==
-  data.tar.gz: !binary |-
-    MDcwZGNmZjk4YmY1ZjVjZjIwNGFlNGQ4MjNmYTllOGY5MzRjZWE0YQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    YzFkOGY5ZWZlOGIxOTVkYzUyOTU3MDRiYTljN2IwN2UyOGI4MTY2YmVkM2Iy
-    ZmU3MzZkODI2ZDlkYmQ4YTZjOWE2MTYwZTc2Mjc1MjhkN2QxZDA5ZTliNmMz
-    YTc1YzMzYzEzNzMxNDQ1ZTU2YWU2NDEyZGRkMThjMTMyMjI1Mzc=
-  data.tar.gz: !binary |-
-    YWIzMjE4ZGZkYTA3NjIzODg2OGNmMWZmNDJkM2VjNzhhYzZlZDZjMTU1Yzgw
-    NzA0NzlkYjFhNjJjZDZjMmQ5OTBiYjUzMWVmOTQyM2U3YzIzMzQyOTIyNDUz
-    OTM1MzhiNTkxODlmMmVlMjEzYWQ4MWIzYWRhZjM5OTQxMTEwOWQ=