json-schema 0.1.9 → 0.1.10

data/lib/json-schema/schema.rb

@@ -15,7 +15,7 @@ module JSON
       if @schema['id']
         temp_uri = URI.parse(@schema['id'])
         if temp_uri.relative?
-          uri.path = (Pathname.new(uri.path).parent + @schema['id']).cleanpath
+          uri.path = (Pathname.new(uri.path).parent + @schema['id']).cleanpath.to_s
           temp_uri = uri
         end
         @uri = temp_uri

data/lib/json-schema/validator.rb

@@ -15,6 +15,9 @@ module JSON
       super(message)
     end
   end
+  
+  class SchemaError < Exception
+  end
 
   class Validator
 
@@ -197,7 +200,7 @@ module JSON
     
     # Validate the minimum number of items in an array
     def validate_minItems(current_schema, data, fragments)
-      if data.is_a?(Array) && (data.nitems < current_schema.schema['minItems'])
+      if data.is_a?(Array) && (data.compact.size < current_schema.schema['minItems'])
         message = "The property '#{build_fragment(fragments)}' did not contain a minimum number of items #{current_schema.schema['minItems']}"
         raise ValidationError.new(message, fragments, current_schema)
       end
@@ -206,7 +209,7 @@ module JSON
     
     # Validate the maximum number of items in an array
     def validate_maxItems(current_schema, data, fragments)
-      if data.is_a?(Array) && (data.nitems > current_schema.schema['maxItems'])
+      if data.is_a?(Array) && (data.compact.size > current_schema.schema['maxItems'])
         message = "The property '#{build_fragment(fragments)}' did not contain a minimum number of items #{current_schema.schema['minItems']}"
         raise ValidationError.new(message, fragments, current_schema)
       end
@@ -456,9 +459,9 @@ module JSON
         # Check for absolute path
         path = current_schema.schema['$ref'].split("#")[0]
         if path[0,1] == "/"
-          temp_uri.path = Pathname.new(path).cleanpath
+          temp_uri.path = Pathname.new(path).cleanpath.to_s
         else
-          temp_uri.path = (Pathname.new(current_schema.uri.path).parent + path).cleanpath
+          temp_uri.path = (Pathname.new(current_schema.uri.path).parent + path).cleanpath.to_s
         end
         temp_uri.fragment = current_schema.schema['$ref'].split("#")[1]
       end
@@ -472,6 +475,7 @@ module JSON
         # Perform fragment resolution to retrieve the appropriate level for the schema
         target_schema = ref_schema.schema
         fragments = temp_uri.fragment.split("/")
+        fragment_path = ''
         fragments.each do |fragment|
           if fragment && fragment != ''
             if target_schema.is_a?(Array)
@@ -479,6 +483,10 @@ module JSON
             else
               target_schema = target_schema[fragment]
             end
+            fragment_path = fragment_path + "/#{fragment}"
+            if target_schema.nil?
+              raise SchemaError.new("The fragment '#{fragment_path}' does not exist on schema #{ref_schema.uri.to_s}")
+            end
           end
         end
         
@@ -503,9 +511,9 @@ module JSON
         # Check for absolute path
         path = ref.split("#")[0]
         if path[0,1] == '/'
-          uri.path = Pathname.new(path).cleanpath
+          uri.path = Pathname.new(path).cleanpath.to_s
         else
-          uri.path = (Pathname.new(parent_schema.uri.path).parent + path).cleanpath
+          uri.path = (Pathname.new(parent_schema.uri.path).parent + path).cleanpath.to_s
         end
         uri.fragment = nil
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: json-schema
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 1
-  - 9
-  version: 0.1.9
+  - 10
+  version: 0.1.10
 platform: ruby
 authors: 
 - Kenny Hoxworth
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-14 00:00:00 -05:00
+date: 2011-01-09 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency