json-schema 2.2.5 → 2.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWEyNDAyZWRhMzlhYTFjZjdhNDA0NTFkOGE5NmY3OWVmN2JlYjFmOA==
+    YzRhZDY5NzVjYTlkZTM4MDU4YjI1Mjg5YWI3MmJkMDdhNjFiZGE3OA==
   data.tar.gz: !binary |-
-    NDg2MjAzYWUxZjYzM2JlNTVkNTY0YTcyNjUwYjk4MDI3OWQyZjVmOA==
+    YWJhZDY3ZWRlZDBlNWFiNDc0ZTM5MzcyZjkyNWJkNWViOGNjN2NiMA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YmNjZDBkNjg0MTVmMmU0NDdkZmI0NjcyODgwNjZmMDIzMTBiMmJkYzUwZDYx
-    NGI3NTY5ZDFmNTI3NmIxMTQyOTVjODNjNWNjOWMyY2E1YmUyMzY5YjJhMmIz
-    MWUwNmJmOGE5YzMxOTNhMjU2ZjIwNjYzNGE1ODgzYzc4NWRkYWI=
+    OTYzYzFkYzlkMjM5NjY0ZjBmNTVjM2IwZmM0ODQxZWQwMDk5OGE5MTliMmQw
+    MmMwYjAwNWE3NzkzMDYzNzUzN2Q0M2RhMjNmNTFlZGYzZDE0MmMxMTRjM2I2
+    NGM2ZWIxMmE0N2NjMjBjMjRmZTk3NDYyY2Q2YTcyMjNhYzEzMTY=
   data.tar.gz: !binary |-
-    YzQ0NTQ1NmNiOWUwNDZjNzIzNTY0OGIzMzM3MzRkYzFhNzQxMTVkYjdmYjQ1
-    OGRmYjUzNjhjZjlmMjc3ZGUyODlhYzU0ZjcwMGQ2YjU1NDU0NmYxMGRiNGZj
-    M2E5ZWIwMmMwMDJkNzhlNDQ2YzI0NTJjMDg1YWVkOTBjMjgwNDQ=
+    YWY3ZjZkMTcxMWRhNDA0MWQxODk3MWQwNzc0NjgyZTc2ZjE5YzE4MjYwYjFj
+    NzI5N2I3NDRhYWM0Y2U4MjhmNDMxZTc1YWYwZmRhNWMxODk5ZjU1YzliZmFm
+    YmY4MTA0ZWRlMzYyMWQ1NDA3MDk5MzUwYmJkN2ExNmQ0NDU5ZjA=

data/README.textile

@@ -24,7 +24,7 @@ From the git repo:
 
 <pre>
 $ gem build json-schema.gemspec
-$ gem install json-schema-2.2.5.gem
+$ gem install json-schema-2.3.0.gem
 </pre>
 
 

data/lib/json-schema.rb

@@ -20,5 +20,6 @@ require 'json-schema/util/array_set'
 require 'json-schema/schema'
 require 'json-schema/validator'
 Dir[File.join(File.dirname(__FILE__), "json-schema/attributes/*.rb")].each {|file| require file }
+Dir[File.join(File.dirname(__FILE__), "json-schema/attributes/formats/*.rb")].each {|file| require file }
 Dir[File.join(File.dirname(__FILE__), "json-schema/validators/*.rb")].sort!.each {|file| require file }
 require 'json-schema/uri/file'

data/lib/json-schema/attribute.rb

@@ -0,0 +1,43 @@
+require 'json-schema/errors/validation_error'
+
+module JSON
+  class Schema
+    class Attribute
+      def self.validate(current_schema, data, fragments, processor, validator, options = {})
+      end
+
+      def self.build_fragment(fragments)
+        "#/#{fragments.join('/')}"
+      end
+
+      def self.validation_error(processor, message, fragments, current_schema, failed_attribute, record_errors)
+        error = ValidationError.new(message, fragments, failed_attribute, current_schema)
+        if record_errors
+          processor.validation_error(error)
+        else
+          raise error
+        end
+      end
+
+      def self.validation_errors(validator)
+        validator.validation_errors
+      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

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

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

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

@@ -1,3 +1,4 @@
+require 'json-schema/attribute'
 require 'json-schema/attributes/extends'
 
 module JSON

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

@@ -1,12 +1,14 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class AllOfAttribute < Attribute
       def self.validate(current_schema, data, fragments, processor, validator, options = {})
-        # Create an array to hold errors that are generated during validation
-        errors = []
+        # Create an hash to hold errors that are generated during validation
+        errors = Hash.new { |hsh, k| hsh[k] = [] }
         valid = true
 
-        current_schema.schema['allOf'].each do |element|
+        current_schema.schema['allOf'].each_with_index do |element, schema_index|
           schema = JSON::Schema.new(element,current_schema.uri,validator)
 
           # We're going to add a little cruft here to try and maintain any validation errors that occur in the allOf
@@ -22,7 +24,7 @@ module JSON
           diff = validation_errors(processor).count - pre_validation_error_count
           while diff > 0
             diff = diff - 1
-            errors.push(validation_errors(processor).pop)
+            errors["allOf ##{schema_index}"].push(validation_errors(processor).pop)
           end
         end
 

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

@@ -1,12 +1,14 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class AnyOfAttribute < Attribute
       def self.validate(current_schema, data, fragments, processor, validator, options = {})
-        # Create an array to hold errors that are generated during validation
-        errors = []
+        # Create a hash to hold errors that are generated during validation
+        errors = Hash.new { |hsh, k| hsh[k] = [] }
         valid = false
 
-        current_schema.schema['anyOf'].each do |element|
+        current_schema.schema['anyOf'].each_with_index do |element, schema_index|
           schema = JSON::Schema.new(element,current_schema.uri,validator)
 
           # We're going to add a little cruft here to try and maintain any validation errors that occur in the anyOf
@@ -24,7 +26,7 @@ module JSON
           valid = false if diff > 0
           while diff > 0
             diff = diff - 1
-            errors.push(validation_errors(processor).pop)
+            errors["anyOf ##{schema_index}"].push(validation_errors(processor).pop)
           end
 
           break if valid
@@ -38,4 +40,4 @@ module JSON
       end
     end
   end
-end
+end

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

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

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

@@ -1,3 +1,5 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class DependenciesV4Attribute < Attribute
@@ -17,4 +19,4 @@ module JSON
       end
     end
   end
-end
+end

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

@@ -1,3 +1,5 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class DisallowAttribute < Attribute
@@ -8,4 +10,4 @@ module JSON
       end
     end
   end
-end
+end

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

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

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

@@ -1,3 +1,5 @@
+require 'json-schema/attribute'
+
 module JSON
   class Schema
     class EnumAttribute < Attribute
@@ -21,4 +23,4 @@ module JSON
       end
     end
   end
-end
+end

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

@@ -1,3 +1,4 @@
+require 'json-schema/attribute'
 require 'json-schema/attributes/ref'
 
 module JSON

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

@@ -1,121 +1,15 @@
+require 'json-schema/attribute'
 require 'uri'
 
 module JSON
   class Schema
     class FormatAttribute < Attribute
-      def self.validate(current_schema, data, fragments, processor, validator, options = {})
-        case current_schema.schema['format']
-
-        # Timestamp in restricted ISO-8601 YYYY-MM-DDThh:mm:ssZ with optional decimal fraction of the second
-        when 'date-time'
-          if data.is_a?(String)
-            error_message = "The property '#{build_fragment(fragments)}' must be a date/time in the ISO-8601 format of YYYY-MM-DDThh:mm:ssZ or YYYY-MM-DDThh:mm:ss.ssZ"
-            r = Regexp.new('^\d\d\d\d-\d\d-\d\dT(\d\d):(\d\d):(\d\d)([\.,]\d+)?(Z|[+-](\d\d)(:?\d\d)?)?$')
-            if (m = r.match(data))
-              parts = data.split("T")
-              begin
-                Date.parse(parts[0])
-              rescue Exception
-                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])
-                return
-              end
-            else
-              validation_error(processor, error_message, fragments, current_schema, self, options[:record_errors])
-              return
-            end
-          end
-        # Date in the format of YYYY-MM-DD
-        when 'date'
-          if data.is_a?(String)
-            error_message = "The property '#{build_fragment(fragments)}' must be a date in the format of YYYY-MM-DD"
-            r = Regexp.new('^\d\d\d\d-\d\d-\d\d$')
-            if (m = r.match(data))
-              begin
-                Date.parse(data)
-              rescue Exception
-                validation_error(processor, error_message, fragments, current_schema, self, options[:record_errors])
-                return
-              end
-            else
-              validation_error(processor, error_message, fragments, current_schema, self, options[:record_errors])
-              return
-            end
-          end
-
-        # Time in the format of HH:MM:SS
-        when 'time'
-          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
-
-        # IPv4 in dotted-quad format
-        when 'ip-address', 'ipv4'
-          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
 
-        # IPv6 in standard format (including abbreviations)
-        when 'ipv6'
-          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 (m = 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
-
-        when 'uri'
-          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
-
-        when 'hostname'
-
-        when 'email'
+      def self.validate(current_schema, data, fragments, processor, validator, options = {})
+        if self.data_valid_for_type?(data, current_schema.schema['type'])
+          format = current_schema.schema['format'].to_s
+          validator = validator.formats[format]
+          validator.validate(current_schema, data, fragments, processor, validator, options) unless validator.nil?
         end
       end
     end

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

@@ -0,0 +1,22 @@
+require 'json-schema/attribute'
+require 'json-schema/errors/custom_format_error'
+
+require 'uri'
+module JSON
+  class Schema
+    class CustomFormat < FormatAttribute
+      def initialize(validation_proc)
+        @validation_proc = validation_proc
+      end
+
+      def validate(current_schema, data, fragments, processor, validator, options = {})
+        begin
+          @validation_proc.call data
+        rescue JSON::Schema::CustomFormatError => e
+          message = "The property '#{self.class.build_fragment(fragments)}' #{e.message}"
+          self.class.validation_error(processor, message, fragments, current_schema, self, options[:record_errors])
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+require 'json-schema/attribute'
+require 'uri'
+module JSON
+  class Schema
+    class DateFormat < 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 date in the format of YYYY-MM-DD"
+          r = Regexp.new('^\d\d\d\d-\d\d-\d\d$')
+          if (r.match(data))
+            begin
+              Date.parse(data)
+            rescue Exception
+              validation_error(processor, error_message, fragments, current_schema, self, options[:record_errors])
+              return
+            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/date_time.rb

@@ -0,0 +1,35 @@
+require 'json-schema/attribute'
+require 'uri'
+module JSON
+  class Schema
+    class DateTimeFormat < FormatAttribute
+      def self.validate(current_schema, data, fragments, processor, validator, options = {})
+        # Timestamp in restricted ISO-8601 YYYY-MM-DDThh:mm:ssZ with optional decimal fraction of the second
+        if data.is_a?(String)
+          error_message = "The property '#{build_fragment(fragments)}' must be a date/time in the ISO-8601 format of YYYY-MM-DDThh:mm:ssZ or YYYY-MM-DDThh:mm:ss.ssZ"
+          r = Regexp.new('^\d\d\d\d-\d\d-\d\dT(\d\d):(\d\d):(\d\d)([\.,]\d+)?(Z|[+-](\d\d)(:?\d\d)?)?$')
+          if (m = r.match(data))
+            parts = data.split("T")
+            begin
+              Date.parse(parts[0])
+            rescue Exception
+              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])
+              return
+            end
+          else
+            validation_error(processor, error_message, fragments, current_schema, self, options[:record_errors])
+            return
+          end
+        end
+      end
+    end
+  end
+end