json-schema 2.2.5 → 2.3.0

data/lib/json-schema/attributes/formats/ip4.rb

@@ -0,0 +1,22 @@
+require 'json-schema/attribute'
+require 'uri'
+module JSON
+  class Schema
+    class IP4Format < FormatAttribute
+      def self.validate(current_schema, data, fragments, processor, validator, options = {})
+        if data.is_a?(String)
+          error_message = "The property '#{build_fragment(fragments)}' must be a valid IPv4 address"
+          r = Regexp.new('^(\d+){1,3}\.(\d+){1,3}\.(\d+){1,3}\.(\d+){1,3}$')
+          if (m = r.match(data))
+            1.upto(4) do |x|
+              validation_error(processor, error_message, fragments, current_schema, self, options[:record_errors]) and return if m[x].to_i > 255
+            end
+          else
+            validation_error(processor, error_message, fragments, current_schema, self, options[:record_errors])
+            return
+          end
+        end
+      end
+    end
+  end
+end

data/lib/json-schema/attributes/formats/ip6.rb

@@ -0,0 +1,30 @@
+require 'json-schema/attribute'
+require 'uri'
+module JSON
+  class Schema
+    class IP6Format < FormatAttribute
+      def self.validate(current_schema, data, fragments, processor, validator, options = {})
+        if data.is_a?(String)
+          error_message = "The property '#{build_fragment(fragments)}' must be a valid IPv6 address"
+          r = Regexp.new('^[a-f0-9:]+$')
+          if (r.match(data))
+            # All characters are valid, now validate structure
+            parts = data.split(":")
+            validation_error(processor, error_message, fragments, current_schema, self, options[:record_errors]) and return if parts.length > 8
+            condensed_zeros = false
+            parts.each do |part|
+              if part.length == 0
+                validation_error(processor, error_message, fragments, current_schema, self, options[:record_errors]) and return if condensed_zeros
+                condensed_zeros = true
+              end
+              validation_error(processor, error_message, fragments, current_schema, self, options[:record_errors]) and return if part.length > 4
+            end
+          else
+            validation_error(processor, error_message, fragments, current_schema, self, options[:record_errors])
+            return
+          end
+        end
+      end
+    end
+  end
+end

data/lib/json-schema/attributes/formats/time.rb

@@ -0,0 +1,22 @@
+require 'json-schema/attribute'
+require 'uri'
+module JSON
+  class Schema
+    class TimeFormat < FormatAttribute
+      def self.validate(current_schema, data, fragments, processor, validator, options = {})
+        if data.is_a?(String)
+          error_message = "The property '#{build_fragment(fragments)}' must be a time in the format of hh:mm:ss"
+          r = Regexp.new('^(\d\d):(\d\d):(\d\d)$')
+          if (m = r.match(data))
+            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])
+            return
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+require 'json-schema/attribute'
+require 'uri'
+module JSON
+  class Schema
+    class UriFormat < FormatAttribute
+      def self.validate(current_schema, data, fragments, processor, validator, options = {})
+        if data.is_a?(String)
+          error_message = "The property '#{build_fragment(fragments)}' must be a valid URI"
+          begin
+            URI.parse(URI.escape(data))
+          rescue URI::InvalidURIError
+            validation_error(processor, error_message, fragments, current_schema, self, options[:record_errors])
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,3 +1,5 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class ItemsAttribute < Attribute
@@ -22,4 +24,4 @@ module JSON
       end
     end
   end
-end
+end

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

@@ -1,3 +1,5 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class MaxDecimalAttribute < Attribute
@@ -12,4 +14,4 @@ module JSON
       end
     end
   end
-end
+end

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

@@ -1,3 +1,5 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class MaximumAttribute < Attribute
@@ -12,4 +14,4 @@ module JSON
       end
     end
   end
-end
+end

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

@@ -1,3 +1,5 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class MaximumInclusiveAttribute < Attribute

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

@@ -1,3 +1,5 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class MaxItemsAttribute < Attribute

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

@@ -1,3 +1,5 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class MaxLengthAttribute < Attribute
@@ -11,4 +13,4 @@ module JSON
       end
     end
   end
-end
+end

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

@@ -1,3 +1,5 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class MaxPropertiesAttribute < Attribute
@@ -9,4 +11,4 @@ module JSON
       end
     end
   end
-end
+end

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

@@ -1,3 +1,5 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class MinimumAttribute < Attribute
@@ -12,4 +14,4 @@ module JSON
       end
     end
   end
-end
+end

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

@@ -1,3 +1,5 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class MinimumInclusiveAttribute < Attribute
@@ -12,4 +14,4 @@ module JSON
       end
     end
   end
-end
+end

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

@@ -1,12 +1,14 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class MinItemsAttribute < Attribute
       def self.validate(current_schema, data, fragments, processor, validator, options = {})
-        if data.is_a?(Array) && (data.compact.size < current_schema.schema['minItems'])
+        if data.is_a?(Array) && (data.size < current_schema.schema['minItems'])
           message = "The property '#{build_fragment(fragments)}' did not contain a minimum number of items #{current_schema.schema['minItems']}"
           validation_error(processor, message, fragments, current_schema, self, options[:record_errors])
         end
       end
     end
   end
-end
+end

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

@@ -1,3 +1,5 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class MinLengthAttribute < Attribute
@@ -11,4 +13,4 @@ module JSON
       end
     end
   end
-end
+end

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

@@ -1,3 +1,5 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class MinPropertiesAttribute < Attribute
@@ -9,4 +11,4 @@ module JSON
       end
     end
   end
-end
+end

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

@@ -1,3 +1,5 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class MultipleOfAttribute < Attribute
@@ -13,4 +15,4 @@ module JSON
       end
     end
   end
-end
+end

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

@@ -1,3 +1,5 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class NotAttribute < Attribute
@@ -25,4 +27,4 @@ module JSON
       end
     end
   end
-end
+end

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

@@ -1,3 +1,5 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class OneOfAttribute < Attribute

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

@@ -1,3 +1,5 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class PatternAttribute < Attribute
@@ -12,4 +14,4 @@ module JSON
       end
     end
   end
-end
+end

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

@@ -1,3 +1,5 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class PatternPropertiesAttribute < Attribute
@@ -20,4 +22,4 @@ module JSON
       end
     end
   end
-end
+end

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

@@ -1,3 +1,5 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class PropertiesAttribute < Attribute
@@ -13,8 +15,8 @@ module JSON
               data[property.to_s] = (default.is_a?(Hash) ? default.clone : default)
             end
 
-
-            if (property_schema['required'] || options[:strict] == true) && !data.has_key?(property.to_s) && !data.has_key?(property.to_sym)
+            if property_schema.fetch('required') { options[:strict] } &&
+               !data.has_key?(property.to_s) && !data.has_key?(property.to_sym)
               message = "The property '#{build_fragment(fragments)}' did not contain a required property of '#{property}'"
               validation_error(processor, message, fragments, current_schema, self, options[:record_errors])
             end

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

@@ -1,3 +1,5 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class PropertiesOptionalAttribute < Attribute
@@ -20,4 +22,4 @@ module JSON
       end
     end
   end
-end
+end

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

@@ -1,3 +1,5 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class PropertiesV4Attribute < Attribute

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

@@ -1,3 +1,6 @@
+require 'json-schema/attribute'
+require 'json-schema/errors/schema_error'
+
 module JSON
   class Schema
     class RefAttribute < Attribute

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

@@ -1,3 +1,5 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class RequiredAttribute < Attribute

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

@@ -1,3 +1,5 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class TypeAttribute < Attribute
@@ -15,10 +17,10 @@ module JSON
         end
         valid = false
 
-        # Create an array to hold errors that are generated during union validation
-        union_errors = []
+        # Create a hash to hold errors that are generated during union validation
+        union_errors = Hash.new { |hsh, k| hsh[k] = [] }
 
-        types.each do |type|
+        types.each_with_index do |type, type_index|
           if type.is_a?(String)
             valid = data_valid_for_type?(data, type)
           elsif type.is_a?(Hash) && union
@@ -40,7 +42,7 @@ module JSON
             valid = false if diff > 0
             while diff > 0
               diff = diff - 1
-              union_errors.push(validation_errors(processor).pop)
+              union_errors["type ##{type_index}"].push(validation_errors(processor).pop)
             end
           end
 
@@ -70,22 +72,6 @@ module JSON
         end
       end
 
-      TYPE_CLASS_MAPPINGS = {
-        "string" => String,
-        "number" => Numeric,
-        "integer" => Integer,
-        "boolean" => [TrueClass, FalseClass],
-        "object" => Hash,
-        "array" => Array,
-        "null" => NilClass,
-        "any" => Object
-      }
-
-      def self.data_valid_for_type?(data, type)
-        valid_classes = TYPE_CLASS_MAPPINGS.fetch(type) { return true }
-        Array(valid_classes).any? { |c| data.is_a?(c) }
-      end
-
       # Lookup Schema type of given class instance
       def self.type_of_data(data)
         type, klass = TYPE_CLASS_MAPPINGS.map { |k,v| [k,v] }.sort_by { |i|

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

@@ -1,3 +1,5 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class TypeV4Attribute < Attribute
@@ -10,9 +12,6 @@ module JSON
         end
         valid = false
 
-        # Create an array to hold errors that are generated during union validation
-        union_errors = []
-
         types.each do |type|
           valid = data_valid_for_type?(data, type)
           break if valid
@@ -24,7 +23,6 @@ module JSON
             types.each {|type| message += type.is_a?(String) ? " #{type}," : " (schema)," }
             message.chop!
             validation_error(processor, message, fragments, current_schema, self, options[:record_errors])
-            validation_errors(processor).last.sub_errors = union_errors
           else
             message = "The property '#{build_fragment(fragments)}' of type #{data.class} did not match the following type:"
             types.each {|type| message += type.is_a?(String) ? " #{type}," : " (schema)," }
@@ -33,22 +31,6 @@ module JSON
           end
         end
       end
-
-      TYPE_CLASS_MAPPINGS = {
-        "string" => String,
-        "number" => Numeric,
-        "integer" => Integer,
-        "boolean" => [TrueClass, FalseClass],
-        "object" => Hash,
-        "array" => Array,
-        "null" => NilClass,
-        "any" => Object
-      }
-
-      def self.data_valid_for_type?(data, type)
-        valid_classes = TYPE_CLASS_MAPPINGS.fetch(type) { return true }
-        Array(valid_classes).any? { |c| data.is_a?(c) }
-      end
     end
   end
-end
+end