RubyGems - json-schema - Versions diffs - 2.5.2 → 2.6.0 - Mend

json-schema 2.5.2 → 2.6.0

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.

Files changed (22) hide show

checksums.yaml +4 -4
data/README.textile +1 -1
data/lib/json-schema/attributes/formats/date.rb +2 -1
data/lib/json-schema/attributes/formats/date_time.rb +6 -8
data/lib/json-schema/attributes/formats/uri.rb +4 -3
data/lib/json-schema/attributes/not.rb +1 -1
data/lib/json-schema/attributes/ref.rb +17 -14
data/lib/json-schema/errors/json_load_error.rb +6 -0
data/lib/json-schema/errors/schema_parse_error.rb +8 -0
data/lib/json-schema/errors/uri_error.rb +6 -0
data/lib/json-schema/schema.rb +2 -3
data/lib/json-schema/schema/reader.rb +5 -6
data/lib/json-schema/util/uri.rb +56 -8
data/lib/json-schema/validator.rb +51 -33
data/lib/json-schema/validators/draft1.rb +4 -4
data/lib/json-schema/validators/draft2.rb +4 -4
data/lib/json-schema/validators/draft3.rb +4 -4
data/lib/json-schema/validators/draft4.rb +1 -1
data/lib/json-schema/validators/hyper-draft1.rb +1 -1
data/lib/json-schema/validators/hyper-draft2.rb +1 -1
data/lib/json-schema/validators/hyper-draft4.rb +1 -1
metadata +7 -3

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0448122a379f2472a1f14ca8cc02dfe622f64c4d
-  data.tar.gz: b9ef1a82305726ab44107d6fd078aad9517d33de
+  metadata.gz: a58ce34e91bb60549bef3c7018d69636c87052a8
+  data.tar.gz: 22573ae4c67684bc8e180876fe7485cf24baed19
 SHA512:
-  metadata.gz: 86eeeb455c88470dd99dfe377e30f12f750dc55b62085131995b5079fbd2cd91515b9eb27a06fe15ffb6084f39cba5c6026cef8c78491a8d344279c621cf3886
-  data.tar.gz: 8d3cce427d1c3d1526bfa8b46ccb62a54683ac7cc19e0eb64a7b5a2bc3da8130343db1807fd227c814a64e7141f6fb983cb705fa4660faf46c5201250d662303
+  metadata.gz: 074129e7c341baadf05037ef05b9bc3a7c72f0414e420d92b74f4e25acbb6a42da478bfb7d658e4150887156455cb71575e3a02d877be50a0a482210ef08c6e5
+  data.tar.gz: c05121d91c8cd2f2a0d3a21e91fccb4a902b24b30bf8f594c6ef3f3c434b586422565cb526894632c10f91ea0248c9ca062d8b1afb8048ae64843bfaac7b9b01

data/README.textile CHANGED

@@ -214,7 +214,7 @@ schema = {
   "type" => "object",
   "required" => ["a"],
   "properties" => {
-    "a" => {"type" => "integer"}  # This will fail schema validation!
+    "a" => {"type" => "integer", "required" => "true"}  # This will fail schema validation!
   }
 }

data/lib/json-schema/attributes/formats/date.rb CHANGED

@@ -11,7 +11,8 @@ module JSON
           if REGEXP.match(data)
             begin
               Date.parse(data)
-            rescue Exception
+            rescue ArgumentError => e
+              raise e unless e.message == 'invalid date'
               validation_error(processor, error_message, fragments, current_schema, self, options[:record_errors])
             end
           else

data/lib/json-schema/attributes/formats/date_time.rb CHANGED

@@ -14,18 +14,16 @@ module JSON
             begin
               Date.parse(parts[0])
-            rescue Exception
+            rescue ArgumentError => e
+              raise e unless e.message == 'invalid date'
               validation_error(processor, error_message, fragments, current_schema, self, options[:record_errors])
               return
             end
-            begin
-              validation_error(processor, error_message, fragments, current_schema, self, options[:record_errors]) and return if m[1].to_i > 23
-              validation_error(processor, error_message, fragments, current_schema, self, options[:record_errors]) and return if m[2].to_i > 59
-              validation_error(processor, error_message, fragments, current_schema, self, options[:record_errors]) and return if m[3].to_i > 59
-            rescue Exception
-              validation_error(processor, error_message, fragments, current_schema, self, options[:record_errors])
-            end
+            validation_error(processor, error_message, fragments, current_schema, self, options[:record_errors]) and return if m.length < 4
+            validation_error(processor, error_message, fragments, current_schema, self, options[:record_errors]) and return if m[1].to_i > 23
+            validation_error(processor, error_message, fragments, current_schema, self, options[:record_errors]) and return if m[2].to_i > 59
+            validation_error(processor, error_message, fragments, current_schema, self, options[:record_errors]) and return if m[3].to_i > 59
           else
             validation_error(processor, error_message, fragments, current_schema, self, options[:record_errors])
           end

data/lib/json-schema/attributes/formats/uri.rb CHANGED

@@ -1,5 +1,6 @@
 require 'json-schema/attribute'
-require 'addressable/uri'
+require 'json-schema/errors/uri_error'
 module JSON
   class Schema
     class UriFormat < FormatAttribute
@@ -7,8 +8,8 @@ module JSON
         return unless data.is_a?(String)
         error_message = "The property '#{build_fragment(fragments)}' must be a valid URI"
         begin
-          Addressable::URI.parse(data)
-        rescue Addressable::URI::InvalidURIError
+          JSON::Util::URI.parse(data)
+        rescue JSON::Schema::UriError
           validation_error(processor, error_message, fragments, current_schema, self, options[:record_errors])
         end
       end

data/lib/json-schema/attributes/not.rb CHANGED

@@ -17,7 +17,7 @@ module JSON
             message = "The property '#{build_fragment(fragments)}' of type #{data.class} matched the disallowed schema"
             failed = false
           end
-        rescue
+        rescue ValidationError
           # Yay, we failed validation.
         end

data/lib/json-schema/attributes/ref.rb CHANGED

@@ -1,5 +1,6 @@
 require 'json-schema/attribute'
 require 'json-schema/errors/schema_error'
+require 'json-schema/util/uri'
 module JSON
   class Schema
@@ -21,21 +22,23 @@ module JSON
       def self.get_referenced_uri_and_schema(s, current_schema, validator)
         uri,schema = nil,nil
-        temp_uri = Addressable::URI.parse(s['$ref'])
-        if temp_uri.relative?
-          temp_uri = current_schema.uri.clone
-          # Check for absolute path
-          path = s['$ref'].split("#")[0]
-          if path.nil? || path == ''
-            temp_uri.path = current_schema.uri.path
-          elsif path[0,1] == "/"
-            temp_uri.path = Pathname.new(path).cleanpath.to_s
-          else
-            temp_uri = current_schema.uri.join(path)
+        temp_uri = JSON::Util::URI.parse(s['$ref'])
+        temp_uri.defer_validation do
+          if temp_uri.relative?
+            temp_uri.merge!(current_schema.uri)
+            # Check for absolute path
+            path, fragment = s['$ref'].split("#")
+            if path.nil? || path == ''
+              temp_uri.path = current_schema.uri.path
+            elsif path[0,1] == "/"
+              temp_uri.path = Pathname.new(path).cleanpath.to_s
+            else
+              temp_uri.join!(path)
+            end
+            temp_uri.fragment = fragment
           end
-          temp_uri.fragment = s['$ref'].split("#")[1]
+          temp_uri.fragment = "" if temp_uri.fragment.nil? || temp_uri.fragment.empty?
         end
-        temp_uri.fragment = "" if temp_uri.fragment.nil?
         # Grab the parent schema from the schema list
         schema_key = temp_uri.to_s.split("#")[0] + "#"
@@ -49,7 +52,7 @@ module JSON
           fragment_path = ''
           fragments.each do |fragment|
             if fragment && fragment != ''
-              fragment = Addressable::URI.unescape(fragment.gsub('~0', '~').gsub('~1', '/'))
+              fragment = JSON::Util::URI.unescaped_uri(fragment.gsub('~0', '~').gsub('~1', '/'))
               if target_schema.is_a?(Array)
                 target_schema = target_schema[fragment.to_i]
               else

data/lib/json-schema/errors/json_load_error.rb ADDED

@@ -0,0 +1,6 @@
+module JSON
+  class Schema
+    class JsonLoadError < StandardError
+    end
+  end
+end

data/lib/json-schema/errors/schema_parse_error.rb ADDED

@@ -0,0 +1,8 @@
+require 'json/common'
+module JSON
+  class Schema
+    class SchemaParseError < JSON::ParserError
+    end
+  end
+end

data/lib/json-schema/errors/uri_error.rb ADDED

@@ -0,0 +1,6 @@
+module JSON
+  class Schema
+    class UriError < StandardError
+    end
+  end
+end

data/lib/json-schema/schema.rb CHANGED

@@ -11,13 +11,13 @@ module JSON
       # If there is an ID on this schema, use it to generate the URI
       if @schema['id'] && @schema['id'].kind_of?(String)
-        temp_uri = Addressable::URI.parse(@schema['id'])
+        temp_uri = JSON::Util::URI.parse(@schema['id'])
         if temp_uri.relative?
           temp_uri = uri.join(temp_uri)
         end
         @uri = temp_uri
       end
-      @uri.fragment = ''
+      @uri = JSON::Util::URI.strip_fragment(@uri)
       # If there is a $schema on this schema, use it to determine which validator to use
       if @schema['$schema']
@@ -60,4 +60,3 @@ module JSON
     end
   end
 end

data/lib/json-schema/schema/reader.rb CHANGED

@@ -1,5 +1,4 @@
 require 'open-uri'
-require 'addressable/uri'
 require 'pathname'
 module JSON
@@ -57,12 +56,12 @@ module JSON
       # @param location [#to_s] The location from which to read the schema
       # @return [JSON::Schema]
       # @raise [JSON::Schema::ReadRefused] if +accept_uri+ or +accept_file+
-      #   indicated the schema should not be readed
-      # @raise [JSON::ParserError] if the schema was not a valid JSON object
+      #   indicated the schema could not be read
+      # @raise [JSON::Schema::ParseError] if the schema was not a valid JSON object
       def read(location)
-        uri  = Addressable::URI.parse(location.to_s)
+        uri  = JSON::Util::URI.parse(location.to_s)
         body = if uri.scheme.nil? || uri.scheme == 'file'
-                 uri = Addressable::URI.convert_path(uri.path)
+                 uri = JSON::Util::URI.file_uri(uri)
                  read_file(Pathname.new(uri.path).expand_path)
                else
                  read_uri(uri)
@@ -103,7 +102,7 @@ module JSON
       def read_file(pathname)
         if accept_file?(pathname)
-          File.read(Addressable::URI.unescape(pathname.to_s))
+          File.read(JSON::Util::URI.unescaped_uri(pathname.to_s))
         else
           raise JSON::Schema::ReadRefused.new(pathname.to_s, :file)
         end

data/lib/json-schema/util/uri.rb CHANGED

@@ -1,15 +1,63 @@
+require 'addressable/uri'
 module JSON
   module Util
     module URI
-      def self.normalized_uri(uri)
-        uri = Addressable::URI.parse(uri) unless uri.is_a?(Addressable::URI)
-        # Check for absolute path
-        if uri.relative?
-          data = uri.to_s
-          data = "#{Dir.pwd}/#{data}" if data[0,1] != '/'
-          uri = Addressable::URI.convert_path(data)
+      SUPPORTED_PROTOCOLS = %w(http https ftp tftp sftp ssh svn+ssh telnet nntp gopher wais ldap prospero)
+      def self.normalized_uri(uri, base_path = Dir.pwd)
+        @normalize_cache ||= {}
+        normalized_uri = @normalize_cache[uri]
+        if !normalized_uri
+          normalized_uri = parse(uri)
+          # Check for absolute path
+          if normalized_uri.relative?
+            data = normalized_uri
+            data = File.join(base_path, data) if data.path[0,1] != "/"
+            normalized_uri = file_uri(data)
+          end
+          @normalize_cache[uri] = normalized_uri.freeze
         end
-        uri
+        normalized_uri
+      end
+      def self.parse(uri)
+        if uri.is_a?(Addressable::URI)
+          return uri.dup
+        else
+          @parse_cache ||= {}
+          parsed_uri = @parse_cache[uri]
+          if parsed_uri
+            parsed_uri.dup
+          else
+            @parse_cache[uri] = Addressable::URI.parse(uri)
+          end
+        end
+      rescue Addressable::URI::InvalidURIError => e
+        raise JSON::Schema::UriError.new(e.message)
+      end
+      def self.strip_fragment(uri)
+        parsed_uri = parse(uri)
+        if parsed_uri.fragment.nil? || parsed_uri.fragment.empty?
+          parsed_uri
+        else
+          parsed_uri.merge(:fragment => "")
+        end
+      end
+      def self.file_uri(uri)
+        parsed_uri = parse(uri)
+        Addressable::URI.convert_path(parsed_uri.path)
+      end
+      def self.unescaped_uri(uri)
+        parsed_uri = parse(uri)
+        Addressable::URI.unescape(parsed_uri.path)
       end
     end
   end

data/lib/json-schema/validator.rb CHANGED

@@ -1,4 +1,3 @@
-require 'addressable/uri'
 require 'open-uri'
 require 'pathname'
 require 'bigdecimal'
@@ -9,7 +8,10 @@ require 'yaml'
 require 'json-schema/schema/reader'
 require 'json-schema/errors/schema_error'
+require 'json-schema/errors/schema_parse_error'
+require 'json-schema/errors/json_load_error'
 require 'json-schema/errors/json_parse_error'
+require 'json-schema/util/uri'
 module JSON
@@ -55,17 +57,13 @@ module JSON
       # validate the schema, if requested
       if @options[:validate_schema]
-        begin
-          if @base_schema.schema["$schema"]
-            base_validator = JSON::Validator.validator_for_name(@base_schema.schema["$schema"])
-          end
-          metaschema = base_validator ? base_validator.metaschema : validator.metaschema
-          # Don't clear the cache during metaschema validation!
-          meta_validator = JSON::Validator.new(metaschema, @base_schema.schema, {:clear_cache => false})
-          meta_validator.validate
-        rescue JSON::Schema::ValidationError, JSON::Schema::SchemaError
-          raise $!
+        if @base_schema.schema["$schema"]
+          base_validator = JSON::Validator.validator_for_name(@base_schema.schema["$schema"])
         end
+        metaschema = base_validator ? base_validator.metaschema : validator.metaschema
+        # Don't clear the cache during metaschema validation!
+        meta_validator = JSON::Validator.new(metaschema, @base_schema.schema, {:clear_cache => false})
+        meta_validator.validate
       end
       # If the :fragment option is set, try and validate against the fragment
@@ -138,15 +136,13 @@ module JSON
     end
     def absolutize_ref_uri(ref, parent_schema_uri)
-      ref_uri = Addressable::URI.parse(ref)
-      ref_uri.fragment = ''
+      ref_uri = JSON::Util::URI.strip_fragment(ref)
       return ref_uri if ref_uri.absolute?
       # This is a self reference and thus the schema does not need to be re-loaded
       return parent_schema_uri if ref_uri.path.empty?
-      uri = parent_schema_uri.clone
-      uri.fragment = ''
+      uri = JSON::Util::URI.strip_fragment(parent_schema_uri.dup)
       Util::URI.normalized_uri(uri.join(ref_uri.path))
     end
@@ -222,7 +218,7 @@ module JSON
     # Either load a reference schema or create a new schema
     def handle_schema(parent_schema, obj)
       if obj.is_a?(Hash)
-        schema_uri = parent_schema.uri.clone
+        schema_uri = parent_schema.uri.dup
         schema = JSON::Schema.new(obj, schema_uri, parent_schema.validator)
         if obj['id']
           Validator.add_schema(schema)
@@ -344,7 +340,7 @@ module JSON
       def validator_for_uri(schema_uri)
         return default_validator unless schema_uri
-        u = Addressable::URI.parse(schema_uri)
+        u = JSON::Util::URI.parse(schema_uri)
         validator = validators["#{u.scheme}://#{u.host}#{u.path}"]
         if validator.nil?
           raise JSON::Schema::SchemaError.new("Schema not found: #{schema_uri}")
@@ -416,15 +412,27 @@ module JSON
       def parse(s)
         if defined?(MultiJson)
-          MultiJson.respond_to?(:adapter) ? MultiJson.load(s) : MultiJson.decode(s)
+          begin
+            MultiJson.respond_to?(:adapter) ? MultiJson.load(s) : MultiJson.decode(s)
+          rescue MultiJson::ParseError => e
+            raise JSON::Schema::JsonParseError.new(e.message)
+          end
         else
           case @@json_backend.to_s
           when 'json'
-            JSON.parse(s, :quirks_mode => true)
+            begin
+              JSON.parse(s, :quirks_mode => true)
+            rescue JSON::ParserError => e
+              raise JSON::Schema::JsonParseError.new(e.message)
+            end
           when 'yajl'
-            json = StringIO.new(s)
-            parser = Yajl::Parser.new
-            parser.parse(json) or raise JSON::Schema::JsonParseError.new("The JSON could not be parsed by yajl")
+            begin
+              json = StringIO.new(s)
+              parser = Yajl::Parser.new
+              parser.parse(json) or raise JSON::Schema::JsonParseError.new("The JSON could not be parsed by yajl")
+            rescue Yajl::ParseError => e
+              raise JSON::Schema::JsonParseError.new(e.message)
+            end
           else
             raise JSON::Schema::JsonParseError.new("No supported JSON parsers found. The following parsers are suported:\n * yajl-ruby\n * json")
           end
@@ -474,6 +482,8 @@ module JSON
         if @@json_backend == 'yajl'
           @@serializer = lambda{|o| Yajl::Encoder.encode(o) }
+        elsif @@json_backend == 'json'
+          @@serializer = lambda{|o| JSON.dump(o) }
         else
           @@serializer = lambda{|o| YAML.dump(o) }
         end
@@ -522,13 +532,13 @@ module JSON
       if schema.is_a?(String)
         begin
           # Build a fake URI for this
-          schema_uri = Addressable::URI.parse(fake_uuid(schema))
+          schema_uri = JSON::Util::URI.parse(fake_uuid(schema))
           schema = JSON::Schema.new(JSON::Validator.parse(schema), schema_uri, @options[:version])
           if @options[:list] && @options[:fragment].nil?
             schema = schema.to_array_schema
           end
           Validator.add_schema(schema)
-        rescue
+        rescue JSON::Schema::JsonParseError
           # Build a uri for it
           schema_uri = Util::URI.normalized_uri(schema)
           if !self.class.schema_loaded?(schema_uri)
@@ -544,14 +554,14 @@ module JSON
             schema = self.class.schema_for_uri(schema_uri)
             if @options[:list] && @options[:fragment].nil?
               schema = schema.to_array_schema
-              schema.uri = Addressable::URI.parse(fake_uuid(serialize(schema.schema)))
+              schema.uri = JSON::Util::URI.parse(fake_uuid(serialize(schema.schema)))
               Validator.add_schema(schema)
             end
             schema
           end
         end
       elsif schema.is_a?(Hash)
-        schema_uri = Addressable::URI.parse(fake_uuid(serialize(schema)))
+        schema_uri = JSON::Util::URI.parse(fake_uuid(serialize(schema)))
         schema = JSON::Schema.stringify(schema)
         schema = JSON::Schema.new(schema, schema_uri, @options[:version])
         if @options[:list] && @options[:fragment].nil?
@@ -559,7 +569,7 @@ module JSON
         end
         Validator.add_schema(schema)
       else
-        raise "Invalid schema - must be either a string or a hash"
+        raise SchemaParseError, "Invalid schema - must be either a string or a hash"
       end
       schema
@@ -575,12 +585,12 @@ module JSON
         elsif data.is_a?(String)
           begin
             data = JSON::Validator.parse(data)
-          rescue
+          rescue JSON::Schema::JsonParseError
             begin
               json_uri = Util::URI.normalized_uri(data)
               data = JSON::Validator.parse(custom_open(json_uri))
-            rescue
-              # Silently discard the error - the data will not change
+            rescue JSON::Schema::JsonLoadError
+              # Silently discard the error - use the data as-is
             end
           end
         end
@@ -590,10 +600,18 @@ module JSON
     def custom_open(uri)
       uri = Util::URI.normalized_uri(uri) if uri.is_a?(String)
-      if uri.absolute? && uri.scheme != 'file'
-        open(uri.to_s).read
+      if uri.absolute? && Util::URI::SUPPORTED_PROTOCOLS.include?(uri.scheme)
+        begin
+          open(uri.to_s).read
+        rescue OpenURI::HTTPError, Timeout::Error => e
+          raise JSON::Schema::JsonLoadError, e.message
+        end
       else
-        File.read(Addressable::URI.unescape(uri.path))
+        begin
+          File.read(JSON::Util::URI.unescaped_uri(uri))
+        rescue SystemCallError => e
+          raise JSON::Schema::JsonLoadError, e.message
+        end
       end
     end
   end

data/lib/json-schema/validators/draft1.rb CHANGED

@@ -2,7 +2,7 @@ require 'json-schema/schema/validator'
 module JSON
   class Schema
     class Draft1 < Validator
       def initialize
         super
@@ -33,13 +33,13 @@ module JSON
           'uri' => UriFormat
         }
         @formats = @default_formats.clone
-        @uri = Addressable::URI.parse("http://json-schema.org/draft-01/schema#")
+        @uri = JSON::Util::URI.parse("http://json-schema.org/draft-01/schema#")
         @names = ["draft1"]
         @metaschema_name = "draft-01.json"
       end
       JSON::Validator.register_validator(self.new)
     end
   end
 end

data/lib/json-schema/validators/draft2.rb CHANGED

@@ -2,7 +2,7 @@ require 'json-schema/schema/validator'
 module JSON
   class Schema
     class Draft2 < Validator
       def initialize
         super
@@ -34,13 +34,13 @@ module JSON
           'uri' => UriFormat
         }
         @formats = @default_formats.clone
-        @uri = Addressable::URI.parse("http://json-schema.org/draft-02/schema#")
+        @uri = JSON::Util::URI.parse("http://json-schema.org/draft-02/schema#")
         @names = ["draft2"]
         @metaschema_name = "draft-02.json"
       end
       JSON::Validator.register_validator(self.new)
     end
   end
 end

data/lib/json-schema/validators/draft3.rb CHANGED

@@ -2,7 +2,7 @@ require 'json-schema/schema/validator'
 module JSON
   class Schema
     class Draft3 < Validator
       def initialize
         super
@@ -38,13 +38,13 @@ module JSON
           'uri' => UriFormat
         }
         @formats = @default_formats.clone
-        @uri = Addressable::URI.parse("http://json-schema.org/draft-03/schema#")
+        @uri = JSON::Util::URI.parse("http://json-schema.org/draft-03/schema#")
         @names = ["draft3", "http://json-schema.org/draft-03/schema#"]
         @metaschema_name = "draft-03.json"
       end
       JSON::Validator.register_validator(self.new)
     end
   end
 end

data/lib/json-schema/validators/draft4.rb CHANGED

@@ -43,7 +43,7 @@ module JSON
           'uri' => UriFormat
         }
         @formats = @default_formats.clone
-        @uri = Addressable::URI.parse("http://json-schema.org/draft-04/schema#")
+        @uri = JSON::Util::URI.parse("http://json-schema.org/draft-04/schema#")
         @names = ["draft4", "http://json-schema.org/draft-04/schema#"]
         @metaschema_name = "draft-04.json"
       end

data/lib/json-schema/validators/hyper-draft1.rb CHANGED

@@ -4,7 +4,7 @@ module JSON
     class HyperDraft1 < Draft1
       def initialize
         super
-        @uri = Addressable::URI.parse("http://json-schema.org/draft-01/hyper-schema#")
+        @uri = JSON::Util::URI.parse("http://json-schema.org/draft-01/hyper-schema#")
       end
       JSON::Validator.register_validator(self.new)

data/lib/json-schema/validators/hyper-draft2.rb CHANGED

@@ -4,7 +4,7 @@ module JSON
     class HyperDraft2 < Draft2
       def initialize
         super
-        @uri = Addressable::URI.parse("http://json-schema.org/draft-02/hyper-schema#")
+        @uri = JSON::Util::URI.parse("http://json-schema.org/draft-02/hyper-schema#")
       end
       JSON::Validator.register_validator(self.new)

data/lib/json-schema/validators/hyper-draft4.rb CHANGED

@@ -4,7 +4,7 @@ module JSON
     class HyperDraft4 < Draft4
       def initialize
         super
-        @uri = Addressable::URI.parse("http://json-schema.org/draft-04/hyper-schema#")
+        @uri = JSON::Util::URI.parse("http://json-schema.org/draft-04/hyper-schema#")
       end
       JSON::Validator.register_validator(self.new)

metadata CHANGED

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-schema
 version: !ruby/object:Gem::Version
-  version: 2.5.2
+  version: 2.6.0
 platform: ruby
 authors:
 - Kenny Hoxworth
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-11-24 00:00:00.000000000 Z
+date: 2016-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -125,8 +125,11 @@ files:
 - lib/json-schema/attributes/type_v4.rb
 - lib/json-schema/attributes/uniqueitems.rb
 - lib/json-schema/errors/custom_format_error.rb
+- lib/json-schema/errors/json_load_error.rb
 - lib/json-schema/errors/json_parse_error.rb
 - lib/json-schema/errors/schema_error.rb
+- lib/json-schema/errors/schema_parse_error.rb
+- lib/json-schema/errors/uri_error.rb
 - lib/json-schema/errors/validation_error.rb
 - lib/json-schema/schema.rb
 - lib/json-schema/schema/reader.rb
@@ -166,8 +169,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '1.8'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key:
 specification_version: 4
 summary: Ruby JSON Schema Validator
 test_files: []
+has_rdoc: