json_schema 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e8787587141b0db7b6aa5b94a55ea79c1033136
-  data.tar.gz: 053257c0da80f8729d30784a8d60adfdee208cd2
+  metadata.gz: 1a21245deb4478d1114d452584d127d681691287
+  data.tar.gz: c73611c6e500ecb1162e6ae7050a2d4e76e207b3
 SHA512:
-  metadata.gz: 5edd2fd7082b669c9df06ea9b628dd5caa58027cba8b5041908dc6211111a6b4e0bec65ef256f470f875b20984fa7535f5712024fcfaa88141e8bc2a90ac6ace
-  data.tar.gz: 15296350dfd5f30a2187b3f6da5327210c9d8e83fb9718638275beee049ec18d8b119d264dc50f92954a4fefe76d484e0105d16070aef2e3f2c5cc11352c11be
+  metadata.gz: bdba472b585f8625f2cf96eb9f179b5e9123bca8fe8640c1450148aee1ae2b2dacab80605879e485581374dfcdb40040889d758346c5834b33fd52ce6a85fed6
+  data.tar.gz: a618f82b9e585fa7dfa2bf8f2e56ff73b7aa9aaea4729108989eafeedda615c579a6c03cd7354f672241c61aa7d7c2a14db1abed1521346b54a8408f4792a991

data/lib/commands/validate_schema.rb

@@ -73,7 +73,7 @@ module Commands
 
     # Builds a JSON Reference + message like "/path/to/file#/path/to/data".
     def map_schema_errors(file, errors)
-      JsonSchema::SchemaError.aggregate(errors).map { |m| "#{file}#{m}" }
+      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).join(" ")
+        raise @errors.join(" ")
       end
       schema
     end

data/lib/json_schema/reference_expander.rb

@@ -33,7 +33,7 @@ module JsonSchema
 
     def expand!(schema, options = {})
       if !expand(schema, options)
-        raise SchemaError.aggregate(@errors).join(" ")
+        raise @errors.join(" ")
       end
       true
     end

data/lib/json_schema/schema_error.rb

@@ -4,19 +4,17 @@ module JsonSchema
     attr_accessor :schema
 
     def self.aggregate(errors)
-      errors.map { |e|
-        if e.is_a?(ValidationError)
-          "#{e.pointer}: failed schema #{e.schema.pointer}: #{e.message}"
-        else
-          "#{e.schema.pointer}: #{e.message}"
-        end
-      }
+      errors.map(&:to_s)
     end
 
     def initialize(schema, message)
       @schema = schema
       @message = message
     end
+
+    def to_s
+      "#{schema.pointer}: #{message}"
+    end
   end
 
   class ValidationError < SchemaError
@@ -30,5 +28,9 @@ module JsonSchema
     def pointer
       path.join("/")
     end
+
+    def to_s
+      "#{pointer}: failed schema #{schema.pointer}: #{message}"
+    end
   end
 end

data/lib/json_schema/validator.rb

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

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: json_schema
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Brandur
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-24 00:00:00.000000000 Z
-dependencies: []
+date: 2014-07-26 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.3'
 description: 
 email:
 - brandur@mutelight.org