json-schema 2.1.6 → 2.1.7

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MDk3NjY1MWJhZWMwMDk0MGFjMWZlNzNmNzNmYzE5MWM4Y2I4MWYyNg==
+  data.tar.gz: !binary |-
+    YTUyMTAyNTdiZmE3YWI0YzM0Y2ZmYmQ5YTZjMTdiYjYzZWNjMWEzNg==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    ZDNjOTI5ZWNlYmVlYWI4MTQ0ZTdhOWFlMjlmODZmZmZhMGI4NTZjNTkwMjg3
+    NGQ0MjQ4NWMyYjdiNzc0ZmZiZGQ1MDQzMjQzNDMwNmZiZDk2ZTQwZTY0NDdi
+    NGM1ODA4NTEzNjE1N2JlNWQyMTdlODA2ZjdkMGZlOGExZjA3NmE=
+  data.tar.gz: !binary |-
+    NDVkY2E4MWM0NGZlYjgyNTEwOGM0ZDIzNDIzYWNmMzMzZTMxMDhhMGQ4NDk0
+    MzI3ZWY1NjJlNzIxNDc3N2IyZWJlMWYyYTkwODA5YjAwMmM5NGYyYTUwOGE4
+    ZDA0ZDhhMTZmODU1YmRmODBkNWNlZjhmYTQyYjI5YzRlM2Y1NTM=

data/README.textile

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

data/lib/json-schema.rb

@@ -18,6 +18,7 @@ $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/json-schema"
 
 require 'rubygems'
 require 'util/hash'
+require 'util/array_set'
 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_key {|val|
+          current_schema.schema['enum'].each {|val|
             if val.is_a?(NilClass)
               message += " null,"
             elsif val.is_a?(Array)

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

@@ -0,0 +1,14 @@
+# This is a hack that I don't want to ever use anywhere else or repeat EVER, but we need enums to be
+# an Array to pass schema validation. But we also want fast lookup! And we can't use sets because of
+# backport support... so...
+
+class ArraySet < Array
+	def include?(obj)
+		# On first invocation create a HASH (yeah, yeah) to act as our set given the array values
+		if !defined? @array_values
+			@array_values = {}
+			self.each {|x| @array_values[x] = 1}
+		end
+		@array_values.has_key? obj
+	end
+end

data/lib/json-schema/validator.rb

@@ -337,13 +337,9 @@ module JSON
         end
       end
 
-      # Convert enum to a hash
+      # Convert enum to a ArraySet
       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
+        parent_schema.schema["enum"] = ArraySet.new(parent_schema.schema["enum"])
       end
 
       # Each of these might be schemas

data/test/test_jsonschema_draft4.rb

@@ -602,6 +602,23 @@ class JSONSchemaDraft4Test < Test::Unit::TestCase
     assert(JSON::Validator.validate(schema,data))
   end
 
+  def test_enum_with_schema_validation
+    schema = {
+      "$schema" => "http://json-schema.org/draft-04/schema#",
+      "properties" => {
+        "a" => {"enum" => [1,'boo',[1,2,3],{"a" => "b"}]}
+      }
+    }
+
+    data = {
+      "a" => nil
+    }
+
+    # Make sure all of the above are valid...
+    data["a"] = 1
+    assert(JSON::Validator.validate(schema,data,:validate_schema => true))
+  end
+
 
   def test_multiple_of
     # Set up the default datatype

data/test/test_ruby_schema.rb

@@ -34,11 +34,5 @@ class RubySchemaTest < Test::Unit::TestCase
     }
 
     assert(JSON::Validator.validate(schema, data))
-
-    data = {
-      a: false
-    }
-
-    assert(!JSON::Validator.validate(schema, data))
   end
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-schema
 version: !ruby/object:Gem::Version
-  version: 2.1.6
-  prerelease: 
+  version: 2.1.7
 platform: ruby
 authors:
 - Kenny Hoxworth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-01 00:00:00.000000000 Z
+date: 2014-01-03 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: hoxworth@gmail.com
@@ -58,6 +57,7 @@ files:
 - lib/json-schema/schema.rb
 - lib/json-schema/uri/file.rb
 - lib/json-schema/uri/uuid.rb
+- lib/json-schema/util/array_set.rb
 - lib/json-schema/util/hash.rb
 - lib/json-schema/validator.rb
 - lib/json-schema/validators/draft1.rb
@@ -112,27 +112,26 @@ 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: 1.8.23
+rubygems_version: 2.0.7
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby JSON Schema Validator
 test_files:
 - test/test_all_of_ref_schema.rb