json_schema 0.0.12 → 0.0.13

data/lib/commands/validate_schema.rb

@@ -79,13 +79,7 @@ module Commands
 
     # Builds a JSON Reference + message like "/path/to/file#/path/to/data".
     def map_schema_errors(file, errors)
-      errors.map { |e|
-        if e.is_a?(JsonSchema::ValidationError)
-          "#{file}#{e.pointer}: failed #{e.schema.pointer}: #{e.message}"
-        else
-          "#{file}#{e.schema.pointer}: #{e.message}"
-        end
-      }
+      JsonSchema::SchemaError.aggregate(errors).map { |m| "#{file}#{m}" }
     end
 
     def parse(file)

data/lib/json_schema/parser.rb

@@ -35,7 +35,7 @@ module JsonSchema
     def parse!(data, parent = nil)
       schema = parse(data, parent)
       if !schema
-        raise SchemaError.aggregate(@errors)
+        raise SchemaError.aggregate(@errors).join(" ")
       end
       schema
     end

data/lib/json_schema/reference_expander.rb

@@ -24,7 +24,7 @@ module JsonSchema
 
     def expand!(schema)
       if !expand(schema)
-        raise SchemaError.aggregate(@errors)
+        raise SchemaError.aggregate(@errors).join(" ")
       end
       true
     end

data/lib/json_schema/schema_error.rb

@@ -4,17 +4,13 @@ module JsonSchema
     attr_accessor :schema
 
     def self.aggregate(errors)
-      # May want to eventually use a JSON Pointer instead to help user narrow
-      # down the location of the error. It's slightly tricky to ascend the
-      # schema hierarchy to raise build one though, so I'm punting on that
-      # for now.
       errors.map { |e|
-        if e.schema
-          %{#{e.schema.pointer}: #{e.message}}
+        if e.is_a?(ValidationError)
+          "#{e.pointer}: failed schema #{e.schema.pointer}: #{e.message}"
         else
-          e.message
+          "#{e.schema.pointer}: #{e.message}"
         end
-      }.join(" ")
+      }
     end
 
     def initialize(schema, message)

data/lib/json_schema/validator.rb

@@ -26,7 +26,7 @@ module JsonSchema
 
     def validate!(data)
       if !validate(data)
-        raise SchemaError.aggregate(@errors)
+        raise SchemaError.aggregate(@errors).join(" ")
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json_schema
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
   prerelease: 
 platform: ruby
 authors: