json_schema 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a228323c155619099b250dca5490ad4a133c8c5
-  data.tar.gz: f4f387127f174dd6e7bf70dc083683e21e267f8d
+  metadata.gz: 3ad0b2694247ed71b5163e4cb0e13799bc976c74
+  data.tar.gz: 8cb84d6e25a4badfd97a8b59dd81b75cb75bb88c
 SHA512:
-  metadata.gz: 1221fc9ae3074dfbf3696e95264f5991dc31d6eb19fe391e6945f5ea41c86a8c50e07bcda4b48ea89ffa38c35fd8781e57075a81af6bf073742676a9396caca1
-  data.tar.gz: 3b53f66e639b027b4fb482b32c6132d9c91003713519250bb6b75d0a52d06002007ee35042abda4157e37ab077e5e23214bcafeb1141347db9c15cdfd23e531e
+  metadata.gz: 7db5975866312faf10720b8cc1e188f3fc8b12c2d06507dd3536411870e90ea9524f437400730071aff6687b38cc5616849ab47b22e257f60fee8ec7643e942c
+  data.tar.gz: 05d7b10c66a92eb00d6e3baafe1d37d5a471e7e25e0554b46a0922338703abc37523c55e36671b8e7b5517e3aa59654a591ba8cb621c3824527f60a11aaedc41

data/lib/json_pointer/evaluator.rb

@@ -16,7 +16,7 @@ module JsonPointer
       end
 
       if path[0] != "/"
-        raise %{Path must begin with a leading "/": #{original_path}.}
+        raise ArgumentError, %{Path must begin with a leading "/": #{original_path}.}
       end
 
       path_parts = split(path)
@@ -35,7 +35,7 @@ module JsonPointer
         key = transform_key(path_parts.shift)
         if data.is_a?(Array)
           unless key =~ /^\d+$/
-            raise %{Key operating on an array must be a digit or "-": #{key}.}
+            raise ArgumentError, %{Key operating on an array must be a digit or "-": #{key}.}
           end
           evaluate_segment(data[key.to_i], path_parts)
         else

data/lib/json_schema.rb

@@ -1,9 +1,9 @@
 require_relative "json_schema/configuration"
 require_relative "json_schema/document_store"
+require_relative "json_schema/error"
 require_relative "json_schema/parser"
 require_relative "json_schema/reference_expander"
 require_relative "json_schema/schema"
-require_relative "json_schema/schema_error"
 require_relative "json_schema/validator"
 
 module JsonSchema

data/lib/json_schema/document_store.rb

@@ -13,7 +13,7 @@ module JsonSchema
     end
 
     def add_schema(schema)
-      raise "can't add nil URI" if schema.uri.nil?
+      raise ArgumentError, "can't add nil URI" if schema.uri.nil?
       uri = schema.uri.chomp('#')
       @schema_map[uri] = schema
     end

data/lib/json_schema/{schema_error.rb → error.rb}

@@ -1,5 +1,20 @@
 module JsonSchema
-  class SchemaError
+  class Error < RuntimeError
+  end
+
+  class AggregateError < Error
+    attr_accessor :errors
+
+    def initialize(errors)
+      @errors = errors
+    end
+
+    def to_s
+      @errors.join(" ")
+    end
+  end
+
+  class SchemaError < Error
     attr_accessor :message, :schema, :type
 
     def self.aggregate(errors)

data/lib/json_schema/parser.rb

@@ -37,7 +37,7 @@ module JsonSchema
     def parse!(data, parent = nil)
       schema = parse(data, parent)
       if !schema
-        raise @errors.join(" ")
+        raise AggregateError.new(@errors)
       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 @errors.join(" ")
+        raise AggregateError.new(@errors)
       end
       true
     end

data/lib/json_schema/validator.rb

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

data/test/json_pointer/evaluator_test.rb

@@ -31,14 +31,14 @@ describe JsonPointer::Evaluator do
   end
 
   it "raises when a path doesn't being with /" do
-    e = assert_raises(RuntimeError) { @evaluator.evaluate("foo") }
+    e = assert_raises(ArgumentError) { @evaluator.evaluate("foo") }
     assert_equal %{Path must begin with a leading "/": foo.}, e.message
-    e = assert_raises(RuntimeError) { @evaluator.evaluate("#foo") }
+    e = assert_raises(ArgumentError) { @evaluator.evaluate("#foo") }
     assert_equal %{Path must begin with a leading "/": #foo.}, e.message
   end
 
   it "raises when a non-digit is specified on an array" do
-    e = assert_raises(RuntimeError) { @evaluator.evaluate("/foo/bar") }
+    e = assert_raises(ArgumentError) { @evaluator.evaluate("/foo/bar") }
     assert_equal %{Key operating on an array must be a digit or "-": bar.},
       e.message
   end

data/test/json_schema/parser_test.rb

@@ -307,6 +307,18 @@ describe JsonSchema::Parser do
     assert_includes error_types, :unknown_format
   end
 
+  it "raises an aggregate error with parse!" do
+    schema_sample["id"] = 4
+
+    parser = JsonSchema::Parser.new
+
+    # don't bother checking the particulars of the error here because we have
+    # other tests for that above
+    assert_raises JsonSchema::AggregateError do
+      parser.parse!(schema_sample)
+    end
+  end
+
   def error_messages
     @parser.errors.map { |e| e.message }
   end

data/test/json_schema/reference_expander_test.rb

@@ -212,6 +212,21 @@ describe JsonSchema::ReferenceExpander do
     assert_includes error_types, :unresolved_references
   end
 
+  it "raises an aggregate error with expand!" do
+    pointer("#/properties").merge!(
+      "app" => { "$ref" => "#/definitions/nope" }
+    )
+
+    schema = JsonSchema::Parser.new.parse!(schema_sample)
+    expander = JsonSchema::ReferenceExpander.new
+
+    # don't bother checking the particulars of the error here because we have
+    # other tests for that above
+    assert_raises JsonSchema::AggregateError do
+      expander.expand!(schema)
+    end
+  end
+
   def error_messages
     @expander.errors.map { |e| e.message }
   end

data/test/json_schema/validator_test.rb

@@ -841,6 +841,23 @@ describe JsonSchema::Validator do
     assert_includes error_types, :invalid_format
   end
 
+  it "raises an aggregate error with validate!" do
+    pointer("#/definitions/app").merge!(
+      "type" => ["object"]
+    )
+
+    schema = JsonSchema.parse!(schema_sample)
+    schema.expand_references!
+    schema = schema.definitions["app"]
+    validator = JsonSchema::Validator.new(schema)
+
+    # don't bother checking the particulars of the error here because we have
+    # other tests for that above
+    assert_raises JsonSchema::AggregateError do
+      validator.validate!(4)
+    end
+  end
+
   def data_sample
     @data_sample ||= DataScaffold.data_sample
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_schema
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Brandur
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-16 00:00:00.000000000 Z
+date: 2016-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ecma-re-validator
@@ -70,10 +70,10 @@ files:
 - lib/json_schema.rb
 - lib/json_schema/configuration.rb
 - lib/json_schema/document_store.rb
+- lib/json_schema/error.rb
 - lib/json_schema/parser.rb
 - lib/json_schema/reference_expander.rb
 - lib/json_schema/schema.rb
-- lib/json_schema/schema_error.rb
 - lib/json_schema/validator.rb
 - schemas/hyper-schema.json
 - schemas/schema.json
@@ -107,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A JSON Schema V4 and Hyperschema V4 parser and validator.