json_schema 0.1.6 → 0.1.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 7e8787587141b0db7b6aa5b94a55ea79c1033136
4
- data.tar.gz: 053257c0da80f8729d30784a8d60adfdee208cd2
3
+ metadata.gz: 1a21245deb4478d1114d452584d127d681691287
4
+ data.tar.gz: c73611c6e500ecb1162e6ae7050a2d4e76e207b3
5
5
  SHA512:
6
- metadata.gz: 5edd2fd7082b669c9df06ea9b628dd5caa58027cba8b5041908dc6211111a6b4e0bec65ef256f470f875b20984fa7535f5712024fcfaa88141e8bc2a90ac6ace
7
- data.tar.gz: 15296350dfd5f30a2187b3f6da5327210c9d8e83fb9718638275beee049ec18d8b119d264dc50f92954a4fefe76d484e0105d16070aef2e3f2c5cc11352c11be
6
+ metadata.gz: bdba472b585f8625f2cf96eb9f179b5e9123bca8fe8640c1450148aee1ae2b2dacab80605879e485581374dfcdb40040889d758346c5834b33fd52ce6a85fed6
7
+ data.tar.gz: a618f82b9e585fa7dfa2bf8f2e56ff73b7aa9aaea4729108989eafeedda615c579a6c03cd7354f672241c61aa7d7c2a14db1abed1521346b54a8408f4792a991
@@ -73,7 +73,7 @@ module Commands
73
73
 
74
74
  # Builds a JSON Reference + message like "/path/to/file#/path/to/data".
75
75
  def map_schema_errors(file, errors)
76
- JsonSchema::SchemaError.aggregate(errors).map { |m| "#{file}#{m}" }
76
+ errors.map { |m| "#{file}#{m}" }
77
77
  end
78
78
 
79
79
  def parse(file)
@@ -35,7 +35,7 @@ module JsonSchema
35
35
  def parse!(data, parent = nil)
36
36
  schema = parse(data, parent)
37
37
  if !schema
38
- raise SchemaError.aggregate(@errors).join(" ")
38
+ raise @errors.join(" ")
39
39
  end
40
40
  schema
41
41
  end
@@ -33,7 +33,7 @@ module JsonSchema
33
33
 
34
34
  def expand!(schema, options = {})
35
35
  if !expand(schema, options)
36
- raise SchemaError.aggregate(@errors).join(" ")
36
+ raise @errors.join(" ")
37
37
  end
38
38
  true
39
39
  end
@@ -4,19 +4,17 @@ module JsonSchema
4
4
  attr_accessor :schema
5
5
 
6
6
  def self.aggregate(errors)
7
- errors.map { |e|
8
- if e.is_a?(ValidationError)
9
- "#{e.pointer}: failed schema #{e.schema.pointer}: #{e.message}"
10
- else
11
- "#{e.schema.pointer}: #{e.message}"
12
- end
13
- }
7
+ errors.map(&:to_s)
14
8
  end
15
9
 
16
10
  def initialize(schema, message)
17
11
  @schema = schema
18
12
  @message = message
19
13
  end
14
+
15
+ def to_s
16
+ "#{schema.pointer}: #{message}"
17
+ end
20
18
  end
21
19
 
22
20
  class ValidationError < SchemaError
@@ -30,5 +28,9 @@ module JsonSchema
30
28
  def pointer
31
29
  path.join("/")
32
30
  end
31
+
32
+ def to_s
33
+ "#{pointer}: failed schema #{schema.pointer}: #{message}"
34
+ end
33
35
  end
34
36
  end
@@ -27,7 +27,7 @@ module JsonSchema
27
27
 
28
28
  def validate!(data)
29
29
  if !validate(data)
30
- raise SchemaError.aggregate(@errors).join(" ")
30
+ raise @errors.join(" ")
31
31
  end
32
32
  end
33
33
 
metadata CHANGED
@@ -1,15 +1,43 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: json_schema
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.6
4
+ version: 0.1.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Brandur
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-07-24 00:00:00.000000000 Z
12
- dependencies: []
11
+ date: 2014-07-26 00:00:00.000000000 Z
12
+ dependencies:
13
+ - !ruby/object:Gem::Dependency
14
+ name: minitest
15
+ requirement: !ruby/object:Gem::Requirement
16
+ requirements:
17
+ - - "~>"
18
+ - !ruby/object:Gem::Version
19
+ version: '5.3'
20
+ type: :development
21
+ prerelease: false
22
+ version_requirements: !ruby/object:Gem::Requirement
23
+ requirements:
24
+ - - "~>"
25
+ - !ruby/object:Gem::Version
26
+ version: '5.3'
27
+ - !ruby/object:Gem::Dependency
28
+ name: rake
29
+ requirement: !ruby/object:Gem::Requirement
30
+ requirements:
31
+ - - "~>"
32
+ - !ruby/object:Gem::Version
33
+ version: '10.3'
34
+ type: :development
35
+ prerelease: false
36
+ version_requirements: !ruby/object:Gem::Requirement
37
+ requirements:
38
+ - - "~>"
39
+ - !ruby/object:Gem::Version
40
+ version: '10.3'
13
41
  description:
14
42
  email:
15
43
  - brandur@mutelight.org