json-schema 2.8.1 → 4.1.1

data/lib/json-schema/attributes/type.rb

@@ -25,14 +25,14 @@ module JSON
             valid = data_valid_for_type?(data, type)
           elsif type.is_a?(Hash) && union
             # Validate as a schema
-            schema = JSON::Schema.new(type,current_schema.uri,validator)
+            schema = JSON::Schema.new(type, current_schema.uri, validator)
 
             # We're going to add a little cruft here to try and maintain any validation errors that occur in this union type
             # We'll handle this by keeping an error count before and after validation, extracting those errors and pushing them onto a union error
             pre_validation_error_count = validation_errors(processor).count
 
             begin
-              schema.validate(data,fragments,processor,options.merge(:disallow => false))
+              schema.validate(data, fragments, processor, options.merge(disallow: false))
               valid = true
             rescue ValidationError
               # We don't care that these schemas don't validate - we only care that one validated
@@ -51,6 +51,7 @@ module JSON
 
         if options[:disallow]
           return if !valid
+
           message = "The property '#{build_fragment(fragments)}' matched one or more of the following types: #{list_types(types)}"
           validation_error(processor, message, fragments, current_schema, self, options[:record_errors])
         elsif !valid

data/lib/json-schema/attributes/type_v4.rb

@@ -19,7 +19,7 @@ module JSON
           build_fragment(fragments),
           type_of_data(data),
           union ? 'one or more of the following types' : 'the following type',
-          types
+          types,
         )
 
         validation_error(processor, message, fragments, current_schema, self, options[:record_errors])

data/lib/json-schema/errors/validation_error.rb

@@ -1,7 +1,7 @@
 module JSON
   class Schema
     class ValidationError < StandardError
-      INDENT = "    "
+      INDENT = '    '
       attr_accessor :fragments, :schema, :failed_attribute, :sub_errors, :message
 
       def initialize(message, fragments, failed_attribute, schema)
@@ -27,12 +27,11 @@ module JSON
       end
 
       def to_hash
-        base = {:schema => @schema.uri, :fragment => ::JSON::Schema::Attribute.build_fragment(fragments), :message => message_with_schema, :failed_attribute => @failed_attribute.to_s.split(":").last.split("Attribute").first}
+        base = { schema: @schema.uri, fragment: ::JSON::Schema::Attribute.build_fragment(fragments), message: message_with_schema, failed_attribute: @failed_attribute.to_s.split(':').last.split('Attribute').first }
         if !@sub_errors.empty?
-          base[:errors] = @sub_errors.inject({}) do |hsh, (subschema, errors)|
+          base[:errors] = @sub_errors.each_with_object({}) do |(subschema, errors), hsh|
             subschema_sym = subschema.downcase.gsub(/\W+/, '_').to_sym
-            hsh[subschema_sym] = Array(errors).map{|e| e.to_hash}
-            hsh
+            hsh[subschema_sym] = Array(errors).map { |e| e.to_hash }
           end
         end
         base

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

@@ -28,6 +28,7 @@ module JSON
     # a schema should not be read.
     class ReadRefused < ReadError
       private
+
       def error_message
         "Read of #{type_string} at #{location} refused"
       end
@@ -36,6 +37,7 @@ module JSON
     # Raised by {JSON::Schema::Reader} when an attempt to read a schema fails
     class ReadFailed < ReadError
       private
+
       def error_message
         "Read of #{type_string} at #{location} failed"
       end
@@ -118,7 +120,7 @@ module JSON
 
       def read_uri(uri)
         if accept_uri?(uri)
-          open(uri.to_s).read
+          URI.open(uri.to_s).read
         else
           raise JSON::Schema::ReadRefused.new(uri.to_s, :uri)
         end

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

@@ -4,7 +4,7 @@ module JSON
       attr_accessor :attributes, :formats, :uri, :names
       attr_reader :default_formats
 
-      def initialize()
+      def initialize
         @attributes = {}
         @formats = {}
         @default_formats = {}
@@ -14,13 +14,13 @@ module JSON
       end
 
       def extend_schema_definition(schema_uri)
-        warn "[DEPRECATION NOTICE] The preferred way to extend a Validator is by subclassing, rather than #extend_schema_definition. This method will be removed in version >= 3."
+        warn '[DEPRECATION NOTICE] The preferred way to extend a Validator is by subclassing, rather than #extend_schema_definition. This method will be removed in version >= 3.'
         validator = JSON::Validator.validator_for_uri(schema_uri)
         @attributes.merge!(validator.attributes)
       end
 
       def validate(current_schema, data, fragments, processor, options = {})
-        current_schema.schema.each do |attr_name,attribute|
+        current_schema.schema.each do |attr_name, attribute|
           if @attributes.has_key?(attr_name.to_s)
             @attributes[attr_name.to_s].validate(current_schema, data, fragments, processor, self, options)
           end

data/lib/json-schema/schema.rb

@@ -2,15 +2,14 @@ require 'pathname'
 
 module JSON
   class Schema
-
     attr_accessor :schema, :uri, :validator
 
-    def initialize(schema,uri,parent_validator=nil)
+    def initialize(schema, uri, parent_validator = nil)
       @schema = schema
       @uri = uri
 
       # If there is an ID on this schema, use it to generate the URI
-      if @schema['id'] && @schema['id'].kind_of?(String)
+      if @schema['id'].is_a?(String)
         temp_uri = JSON::Util::URI.parse(@schema['id'])
         if temp_uri.relative?
           temp_uri = uri.join(temp_uri)
@@ -36,7 +35,7 @@ module JSON
     def self.stringify(schema)
       case schema
       when Hash then
-        Hash[schema.map { |key, value| [key.to_s, stringify(schema[key])] }]
+        schema.map { |key, value| [key.to_s, stringify(schema[key])] }.to_h
       when Array then
         schema.map do |schema_item|
           stringify(schema_item)

data/lib/json-schema/util/array_set.rb

@@ -7,7 +7,7 @@ class ArraySet < Array
   def include?(obj)
     if !defined? @values
       @values = Set.new
-      self.each { |x| @values << convert_to_float_if_numeric(x) }
+      each { |x| @values << convert_to_float_if_numeric(x) }
     end
     @values.include?(convert_to_float_if_numeric(obj))
   end

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

@@ -14,7 +14,7 @@ module JSON
           # Check for absolute path
           if normalized_uri.relative?
             data = normalized_uri
-            data = File.join(base_path, data) if data.path[0,1] != "/"
+            data = File.join(base_path, data) if data.path[0, 1] != '/'
             normalized_uri = file_uri(data)
           end
           @normalize_cache[uri] = normalized_uri.freeze
@@ -42,10 +42,10 @@ module JSON
             ref_uri.merge!(base_uri)
 
             # Check for absolute path
-            path, fragment = ref.to_s.split("#")
+            path, fragment = ref.to_s.split('#')
             if path.nil? || path == ''
               ref_uri.path = base_uri.path
-            elsif path[0,1] == "/"
+            elsif path[0, 1] == '/'
               ref_uri.path = Pathname.new(path).cleanpath.to_s
             else
               ref_uri.join!(path)
@@ -54,7 +54,7 @@ module JSON
             ref_uri.fragment = fragment
           end
 
-          ref_uri.fragment = "" if ref_uri.fragment.nil? || ref_uri.fragment.empty?
+          ref_uri.fragment = '' if ref_uri.fragment.nil? || ref_uri.fragment.empty?
         end
 
         ref_uri
@@ -62,7 +62,7 @@ module JSON
 
       def self.parse(uri)
         if uri.is_a?(Addressable::URI)
-          return uri.dup
+          uri.dup
         else
           @parse_cache ||= {}
           parsed_uri = @parse_cache[uri]
@@ -73,7 +73,7 @@ module JSON
           end
         end
       rescue Addressable::URI::InvalidURIError => e
-        raise JSON::Schema::UriError.new(e.message)
+        raise JSON::Schema::UriError, e.message
       end
 
       def self.strip_fragment(uri)
@@ -81,7 +81,7 @@ module JSON
         if parsed_uri.fragment.nil? || parsed_uri.fragment.empty?
           parsed_uri
         else
-          parsed_uri.merge(:fragment => "")
+          parsed_uri.merge(fragment: '')
         end
       end