jsonschema 2.0.1 → 2.0.2

data/README.rdoc

@@ -41,6 +41,11 @@ if you have json library
   gem source -a http://gemcutter.org
   sudo gem install jsonschema
 
+== CONTRIBUTORS:
+
+* Matt Coneybeare
+* hristian Bäuerlein
+
 == LICENSE:
 
 Ruby/jsonschema

data/Rakefile

@@ -3,9 +3,8 @@ require 'rubygems'
 require 'rake'
 require 'rake/clean'
 require 'rake/testtask'
-require 'rake/packagetask'
-require 'rake/gempackagetask'
-require 'rake/rdoctask'
+require 'rubygems/package_task'
+require 'rake/task'
 require 'rake/contrib/rubyforgepublisher'
 require 'rake/contrib/sshpublisher'
 require 'fileutils'
@@ -58,18 +57,11 @@ spec = Gem::Specification.new do |s|
   s.files = %w(README.rdoc Rakefile) + Dir["{bin,test,lib}/**/*"]
 end
 
-Rake::GemPackageTask.new(spec) do |p|
+Gem::PackageTask.new(spec) do |p|
   p.need_tar = true
   p.gem_spec = spec
 end
 
-Rake::RDocTask.new do |rdoc|
-  rdoc.rdoc_dir = 'doc'
-  rdoc.options += $rdoc_opts
-#  rdoc.template = 'resh'
-  rdoc.rdoc_files.include("README.rdoc", "lib/**/*.rb", "ext/**/*.c")
-end
-
 desc "gem spec"
 task :gemspec do
   File.open("#{$github_name}.gemspec", "wb") do |f|

data/lib/jsonschema.rb

@@ -2,7 +2,7 @@
 
 module JSON
   class Schema
-    VERSION = '2.0.1'
+    VERSION = '2.0.2'
     class ValueError < Exception;end
     class Undefined;end
     TypesMap = {
@@ -21,10 +21,19 @@ module JSON
       @refmap = {}
     end
 
+    def keys
+      @keys ||= []
+    end
+
+    def key_path
+      keys.reject{|k| k == 'self'}.join(" > ")
+    end
+
     def check_property value, schema, key, parent
       if schema
+        keys.push key
 #        if @interactive && schema['readonly']
-#          raise ValueError, "#{key} is a readonly field , it can not be changed"
+#          raise ValueError, "#{key_path} is a readonly field , it can not be changed"
 #        end
 
         if schema['id']
@@ -37,7 +46,7 @@ module JSON
 
         if value == Undefined
           unless schema['optional']
-            raise ValueError, "#{key}: is missing and it is not optional"
+            raise ValueError, "#{key_path}: is missing and it is not optional"
           end
 
           # default
@@ -61,21 +70,21 @@ module JSON
             rescue ValueError
               flag = false
             end
-            raise ValueError, "#{key}: disallowed value was matched" if flag
+            raise ValueError, "#{key_path}: disallowed value was matched" if flag
           end
 
           unless value.nil?
-            if value.instance_of? Array
+            if value.kind_of? Array
               if schema['items']
-                if schema['items'].instance_of?(Array)
+                if schema['items'].kind_of?(Array)
                   schema['items'].each_with_index {|val, index|
                     check_property(undefined_check(value, index), schema['items'][index], index, value)
                   }
                   if schema.include?('additionalProperties')
                     additional = schema['additionalProperties']
-                    if additional.instance_of?(FalseClass)
+                    if additional.kind_of?(FalseClass)
                       if schema['items'].size < value.size
-                        raise ValueError, "#{key}: There are more values in the array than are allowed by the items and additionalProperties restrictions."
+                        raise ValueError, "#{key_path}: There are more values in the array than are allowed by the items and additionalProperties restrictions."
                       end
                     else
                       value.each_with_index {|val, index|
@@ -90,46 +99,46 @@ module JSON
                 end
               end
               if schema['minItems'] && value.size < schema['minItems']
-                raise ValueError, "#{key}: There must be a minimum of #{schema['minItems']} in the array"
+                raise ValueError, "#{key_path}: There must be a minimum of #{schema['minItems']} in the array"
               end
               if schema['maxItems'] && value.size > schema['maxItems']
-                raise ValueError, "#{key}: There must be a maximum of #{schema['maxItems']} in the array"
+                raise ValueError, "#{key_path}: There must be a maximum of #{schema['maxItems']} in the array"
               end
             elsif schema['properties']
               check_object(value, schema['properties'], schema['additionalProperties'])
             elsif schema.include?('additionalProperties')
               additional = schema['additionalProperties']
-              unless additional.instance_of?(TrueClass)
-                if additional.instance_of?(Hash) || additional.instance_of?(FalseClass)
+              unless additional.kind_of?(TrueClass)
+                if additional.kind_of?(Hash) || additional.kind_of?(FalseClass)
                   properties = {}
                   value.each {|k, val|
-                    if additional.instance_of?(FalseClass)
-                      raise ValueError, "#{key}: Additional properties not defined by 'properties' are not allowed in field '#{k}'"
+                    if additional.kind_of?(FalseClass)
+                      raise ValueError, "#{key_path}: Additional properties not defined by 'properties' are not allowed in field '#{k}'"
                     else
                       check_property(val, schema['additionalProperties'], k, value)
                     end
                   }
                 else
-                  raise ValueError, "#{key}: additionalProperties schema definition for field '#{}' is not an object"
+                  raise ValueError, "#{key_path}: additionalProperties schema definition for field '#{}' is not an object"
                 end
               end
             end
 
-            if value.instance_of?(String)
+            if value.kind_of?(String)
               # pattern
               if schema['pattern'] && !(value =~ Regexp.new(schema['pattern']))
-                raise ValueError, "#{key}: does not match the regex pattern #{schema['pattern']}"
+                raise ValueError, "#{key_path}: does not match the regex pattern #{schema['pattern']}"
               end
 
               strlen = value.split(//).size
               # maxLength
               if schema['maxLength'] && strlen > schema['maxLength']
-                raise ValueError, "#{key}: may only be #{schema['maxLength']} characters long"
+                raise ValueError, "#{key_path}: may only be #{schema['maxLength']} characters long"
               end
 
               # minLength
               if schema['minLength'] && strlen < schema['minLength']
-                raise ValueError, "#{key}: must be at least #{schema['minLength']} characters long"
+                raise ValueError, "#{key_path}: must be at least #{schema['minLength']} characters long"
               end
             end
 
@@ -140,11 +149,11 @@ module JSON
                 minimumCanEqual = schema.fetch('minimumCanEqual', Undefined)
                 if minimumCanEqual == Undefined || minimumCanEqual
                   if value < schema['minimum']
-                    raise ValueError, "#{key}: must have a minimum value of #{schema['minimum']}"
+                    raise ValueError, "#{key_path}: must have a minimum value of #{schema['minimum']}"
                   end
                 else
                   if value <= schema['minimum']
-                    raise ValueError, "#{key}: must have a minimum value of #{schema['minimum']}"
+                    raise ValueError, "#{key_path}: must have a minimum value of #{schema['minimum']}"
                   end
                 end
               end
@@ -154,11 +163,11 @@ module JSON
                 maximumCanEqual = schema.fetch('maximumCanEqual', Undefined)
                 if maximumCanEqual == Undefined || maximumCanEqual
                   if value > schema['maximum']
-                    raise ValueError, "#{key}: must have a maximum value of #{schema['maximum']}"
+                    raise ValueError, "#{key_path}: must have a maximum value of #{schema['maximum']}"
                   end
                 else
                   if value >= schema['maximum']
-                    raise ValueError, "#{key}: must have a maximum value of #{schema['maximum']}"
+                    raise ValueError, "#{key_path}: must have a maximum value of #{schema['maximum']}"
                   end
                 end
               end
@@ -166,7 +175,7 @@ module JSON
               # maxDecimal
               if schema['maxDecimal'] && schema['maxDecimal'].kind_of?(Numeric)
                 if value.to_s =~ /\.\d{#{schema['maxDecimal']+1},}/
-                  raise ValueError, "#{key}: may only have #{schema['maxDecimal']} digits of decimal places"
+                  raise ValueError, "#{key_path}: may only have #{schema['maxDecimal']} digits of decimal places"
                 end
               end
 
@@ -175,18 +184,18 @@ module JSON
             # enum
             if schema['enum']
               unless(schema['enum'].detect{|enum| enum == value })
-                raise ValueError, "#{key}: does not have a value in the enumeration #{schema['enum'].join(", ")}"
+                raise ValueError, "#{key_path}: does not have a value in the enumeration #{schema['enum'].join(", ")}"
               end
             end
 
             # description
-            if schema['description'] && !schema['description'].instance_of?(String)
-              raise ValueError, "#{key}: The description for field '#{value}' must be a string"
+            if schema['description'] && !schema['description'].kind_of?(String)
+              raise ValueError, "#{key_path}: The description for field '#{value}' must be a string"
             end
 
             # title
-            if schema['title'] && !schema['title'].instance_of?(String)
-              raise ValueError, "#{key}: The title for field '#{value}' must be a string"
+            if schema['title'] && !schema['title'].kind_of?(String)
+              raise ValueError, "#{key_path}: The title for field '#{value}' must be a string"
             end
 
             # format
@@ -195,12 +204,13 @@ module JSON
 
           end
         end
+        keys.pop
       end
     end
 
     def check_object value, object_type_def, additional
-      if object_type_def.instance_of? Hash
-        if !value.instance_of?(Hash) || value.instance_of?(Array)
+      if object_type_def.kind_of? Hash
+        if !value.kind_of?(Hash) || value.kind_of?(Array)
           raise ValueError, "an object is required"
         end
 
@@ -212,13 +222,13 @@ module JSON
       end
       value.each {|key, val|
         if key.index('__') != 0 && object_type_def && !object_type_def[key] && additional == false
-          raise ValueError, "#{value.class} The property #{key} is not defined in the schema and the schema does not allow additional properties"
+          raise ValueError, "The property #{key_path} > #{key} is not defined in the schema and the schema does not allow additional properties"
         end
         requires = object_type_def && object_type_def[key] && object_type_def[key]['requires']
         if requires && !value.include?(requires)
-          raise ValueError, "the presence of the property #{key} requires that #{requires} also be present"
+          raise ValueError, "The presence of the property #{key_path} > #{key} requires that #{requires} also be present"
         end
-        if object_type_def && object_type_def.instance_of?(Hash) && !object_type_def.include?(key)
+        if object_type_def && object_type_def.kind_of?(Hash) && !object_type_def.include?(key)
           check_property(val, additional, key, value)
         end
         if !@interactive && val && val['$schema']
@@ -230,7 +240,7 @@ module JSON
     def check_type value, type, key, parent
       converted_fieldtype = convert_type(type)
       if converted_fieldtype
-        if converted_fieldtype.instance_of? Array
+        if converted_fieldtype.kind_of? Array
           datavalid = false
           converted_fieldtype.each do |t|
             begin
@@ -242,13 +252,13 @@ module JSON
             end
           end
           unless datavalid
-            raise ValueError, "#{key}: #{value.class} value found, but a #{type} is required"
+            raise ValueError, "#{key_path}: #{value.class} value found, but a #{type} is required"
           end
-        elsif converted_fieldtype.instance_of? Hash
+        elsif converted_fieldtype.kind_of? Hash
           check_property(value, type, key, parent)
         else
-          unless value.instance_of? converted_fieldtype
-            raise ValueError, "#{key}: #{value.class} value found, but a #{type} is required"
+          unless value.kind_of? converted_fieldtype
+            raise ValueError, "#{key_path}: #{value.class} value found, but a #{type} is required"
           end
         end
       end

metadata

@@ -1,64 +1,56 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: jsonschema
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 2.0.2
   prerelease: 
-  version: 2.0.1
 platform: ruby
-authors: 
+authors:
 - Constellation
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-03-02 00:00:00 +09:00
-default_executable: 
+date: 2012-02-28 00:00:00.000000000Z
 dependencies: []
-
 description: json schema library ruby porting from http://code.google.com/p/jsonschema/
 email: utatane.tea@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - README.rdoc
 - Rakefile
 - test/jsonschema_test.rb
 - lib/jsonschema.rb
-has_rdoc: true
 homepage: http://github.com/Constellation/ruby-jsonchema/tree/master
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.rdoc
 - --charset
 - utf-8
 - --line-numbers
 - --inline-source
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: jsonschema
-rubygems_version: 1.5.0
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: json schema library ruby porting from http://code.google.com/p/jsonschema/
-test_files: 
+test_files:
 - test/jsonschema_test.rb